CAIP-2 Chain ID by jiexi · Pull Request #1489 · MetaMask/core

jiexi · 2023-07-12T23:33:36Z

Explanation

Use CaipChainId type for internal chain representation
- Convert back to hex/dec format only when required
Rename chainId to caipChainId
Add caip helpers to controller-utils for bridging the gap between our current usage of hex/dec chainId to caipChainId

See: MetaMask/utils#116
See: MetaMask/metamask-extension#19991

References

Changelog

NOTE: field change from chainId to caipChainId (or _CHAIN_ID to _CAIP_CHAIN_ID) also implies type change from Hex to CaipChainId

`@metamask/address-book-controller`

BREAKING: this.state.addressBook is now keyed by CaipChainId instead of Hex
BREAKING: this.state.addressBook[CaipChainId][address].chainId field changed to caipChainId
BREAKING: set() defaults the caipChainId arg (previously chainId) to eip155:1

`@metamask/assets-controllers/AssetsContractController`

BREAKING: constructor expects options.chainId to be options.caipChainId
BREAKING: formatIconUrlWithProxy() expects params.chainId to be params.caipChainId
BREAKING: isTokenDetectionSupportedForNetwork expects chainId arg to be caipChainId

`@metamask/assets-controllers/AssetsContractController`

BREAKING: constructor expects options.chainId to be options.caipChainId

`@metamask/assets-controllers/NFTController`

BREAKING: constructor expects options.chainId to be options.caipChainId
BREAKING: this.state. allNftContracts[userAddress] is now keyed by CaipChainId instead of Hex
BREAKING: this.state. allNfts[userAddress] is now keyed by CaipChainId instead of Hex
BREAKING: updateNestedNftState() expects passedConfig.chainId to be passedConfig.caipChainId
BREAKING: onNetworkStateChange() expects providerConfig.chainId to be providerConfig.caipChainId
BREAKING: addNft() expects accountParams.chainId to now be accountParams.caipChainId
BREAKING: checkAndUpdateSingleNftOwnershipStatus() expects accountParams.chainId to be accountParams.caipChainId
BREAKING: findNftByAddressAndTokenId() expects chainId arg to now be caipChainId
BREAKING: updateNft() expects chainId arg to be caipChainId
BREAKING: resetNftTransactionStatusByTransactionId() expects chainId arg to be caipChainId

`@metamask/assets-controllers/NFTDetectionController`

BREAKING: constructor expects options.chainId to be options.caipChainId

`@metamask/assets-controllers/TokenDetectionController`

BREAKING: constructor expects options.chainId to be options.caipChainId
BREAKING: onNetworkStateChange() expects providerConfig.chainId to be providerConfig.caipChainId

`@metamask/assets-controllers/TokenListController`

BREAKING: constructor expects options.chainId to be options.caipChainId
BREAKING: onNetworkStateChange() expects providerConfig.chainId to be providerConfig.caipChainId
BREAKING: this.state.tokensChainsCache is now keyed by CaipChainId instead of Hex

`@metamask/assets-controllers/TokensRatesController`

BREAKING: constructor expects options.chainId to be options.caipChainId
BREAKING: onNetworkStateChange() expects providerConfig.chainId to now be providerConfig.caipChainId
BREAKING: findChainSlug() expects chainId arg to now be caipChainId
BREAKING: this.chainId changed to this.caipChainId

`@metamask/assets-controllers/TokensController`

BREAKING: constructor expects options.chainId to be options.caipChainId
BREAKING: onNetworkStateChange() expects providerConfig.chainId to now be providerConfig.caipChainId
BREAKING: this.state. allTokens is now keyed by CaipChainId instead of Hex
BREAKING: this.state.allIgnoredTokens is now keyed by CaipChainId instead of Hex
BREAKING: this.state.allDetectedTokens is now keyed by CaipChainId instead of Hex
BREAKING: addDetectedTokens() expects detectionDetails.chainId to now be detectionDetails.caipChainId

`@metamask/controller-utils`

ADDED: isEthCaipChainId() expects any value and returns true if the value is a valid CaipChainId with namespace eip155
ADDED: toEthCaipChainId() expects decimal or 0x prefixed hex string and returns CaipChainId
ADDED: toEthChainId() expects CaipChainId and returns reference as decimal string
ADDED: toEthChainIdHex() expects CaipChainId and returns reference as 0x prefixed hex string
ADDED: toEthChainIdInt()expects CaipChainId and returns reference as number
BREAKING: GANACHE_CHAIN_ID changed to GANACHE_CAIP_CHAIN_ID
BREAKING: BUILT_IN_NETWORKS[networkType].chainId field is now caipChainId
BREAKING: ChainId(hex values) changed to BuiltInCaipChainId
CHANGED: NetworkId renamed to InfuraNetworkId

`@metamask/ens-controller`

I'm not actually certain that this controller should be changed, but I have updated it. Can write changelog after confirming we are keeping these changes or not. I don't think we should though

`@metamask/gas-fee-controller`

BREAKING: constructor expects options.getChainId() to be options.getCaipChainId()
BREAKING: onNetworkStateChange() expects providerConfig.chainId to now be providerConfig.caipChainId
BREAKING: this.messagingSystem.call('NetworkController:getState') expects providerConfig.chainId to now be providerConfig.caipChainId

`@metamask/message-manager/AbstractMessageManager`

BREAKING: constructor expects options.getCurrentChainId() to be options.getCurrentCaipChainId()

`@metamask/message-manager/TypedMessageManager`

BREAKING: constructor expects options.getCurrentChainId() to be options.getCurrentCaipChainId()

`@metamask/network-controller`

BREAKING: ProviderConfig.chainId changed to ProviderConfig.caipChainId
BREAKING: NetworkConfiguration.chainId changed to NetworkConfiguration.caipChainId
BREAKING: this.state.providerConfig.chainId changed to this.state.providerConfig.caipChainId

`@metamask/signature-controller`

BREAKING: constructor expects options.getCurrentChainId() to be options.getCurrentCaipChainId()

`@metamask/transaction-controller`

BREAKING: Transaction.chainId changed to Transaction.caipChainId changed to
BREAKING: constructor expects options.getNetworkState() to return to include providerConfig.caipChainId instead of providerConfig.chainId

Checklist

I've updated the test suite for new or updated code as appropriate
I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate
I've highlighted breaking changes using the "BREAKING" category above as appropriate

packages/network-controller/src/NetworkController.ts

packages/controller-utils/src/types.ts

packages/message-manager/src/TypedMessageManager.ts

packages/transaction-controller/src/TransactionController.ts

jiexi · 2023-07-27T20:25:19Z

packages/ens-controller/src/EnsController.ts

thoughts? I think we revert these changes

I think having this controller take a CAIP chain ID makes sense from a consistency perspective. It also means that the consumer has to do less work in order to use it, even for an Ethereum network. However, we could update the constructor to pull the caipChainId from the network state in addition to the networkId and then notset a provider if it's not an Ethereum chain ID. This wouldn't prevent consumers from using set, get, etc., but they wouldn't do anything, because reverseResolveAddress wouldn't do anything, either. So, I feel like these changes are okay. What are your thoughts?

packages/network-controller/tests/NetworkController.test.ts

github-actions · 2023-08-01T22:50:39Z

Preview builds have been published. See these instructions for more information about preview builds.

Expand for full list of packages and versions.

{
  "@metamask/address-book-controller": "3.1.0-preview.19a3a61",
  "@metamask/announcement-controller": "4.0.0-preview.19a3a61",
  "@metamask/approval-controller": "3.5.0-preview.19a3a61",
  "@metamask/assets-controllers": "11.0.1-preview.19a3a61",
  "@metamask/base-controller": "3.2.0-preview.19a3a61",
  "@metamask/composable-controller": "3.0.0-preview.19a3a61",
  "@metamask/controller-utils": "4.3.1-preview.19a3a61",
  "@metamask/ens-controller": "4.1.0-preview.19a3a61",
  "@metamask/gas-fee-controller": "6.1.1-preview.19a3a61",
  "@metamask/keyring-controller": "7.0.0-preview.19a3a61",
  "@metamask/logging-controller": "1.0.0-preview.19a3a61",
  "@metamask/message-manager": "7.3.0-preview.19a3a61",
  "@metamask/network-controller": "12.0.0-preview.19a3a61",
  "@metamask/notification-controller": "3.1.0-preview.19a3a61",
  "@metamask/permission-controller": "4.1.0-preview.19a3a61",
  "@metamask/phishing-controller": "6.0.0-preview.19a3a61",
  "@metamask/preferences-controller": "4.2.0-preview.19a3a61",
  "@metamask/rate-limit-controller": "3.0.0-preview.19a3a61",
  "@metamask/signature-controller": "5.3.0-preview.19a3a61",
  "@metamask/transaction-controller": "8.0.1-preview.19a3a61"
}

packages/controller-utils/src/caip.ts

packages/network-controller/src/create-auto-managed-network-client.test.ts

packages/assets-controllers/src/AssetsContractController.test.ts

packages/assets-controllers/src/AssetsContractController.ts

adonesky1 · 2023-08-05T16:49:15Z

Needs to be a breaking changelog entry indicating that SupportedTokenDetectionNetworks is now CAIP formatted

packages/controller-utils/src/caip.test.ts

packages/controller-utils/src/caip.ts

adonesky1 · 2023-08-05T20:51:52Z

packages/controller-utils/src/constants.ts

-  NetworkId,
+  InfuraNetworkId,
  NetworkType
 > = {
-  [NetworkId.goerli]: NetworkType.goerli,
-  [NetworkId.sepolia]: NetworkType.sepolia,
-  [NetworkId.mainnet]: NetworkType.mainnet,
-  [NetworkId['linea-goerli']]: NetworkType['linea-goerli'],
-  [NetworkId['linea-mainnet']]: NetworkType['linea-mainnet'],
+  [InfuraNetworkId.goerli]: NetworkType.goerli,
+  [InfuraNetworkId.sepolia]: NetworkType.sepolia,
+  [InfuraNetworkId.mainnet]: NetworkType.mainnet,
+  [InfuraNetworkId['linea-goerli']]: NetworkType['linea-goerli'],
+  [InfuraNetworkId['linea-mainnet']]: NetworkType['linea-mainnet'],


What was the reason for this change? How does it relate to the CAIP-2 migration?

Oh I see the name just changed for the type

correct. unrelated to CAIP, but wanted to help disambiguate NetworkId and ChainId more by this naming. Happy to revert though

packages/ens-controller/src/EnsController.ts

jiexi · 2023-08-14T16:33:17Z

Needs to be a breaking changelog entry indicating that SupportedTokenDetectionNetworks is now CAIP formatted

SupportedTokenDetectionNetworks isn't exported, but it is used by isTokenDetectionSupportedForNetwork which is exported. ~~Will add an entry for that~~ Nevermind, there was already a line for this

jiexi · 2023-08-14T18:07:56Z

@metamaskbot publish-preview

github-actions · 2023-08-14T18:12:37Z

Preview builds have been published. See these instructions for more information about preview builds.

Expand for full list of packages and versions.

{
  "@metamask/address-book-controller": "3.1.0-preview.b4d7927",
  "@metamask/announcement-controller": "4.0.0-preview.b4d7927",
  "@metamask/approval-controller": "3.5.0-preview.b4d7927",
  "@metamask/assets-controllers": "11.0.1-preview.b4d7927",
  "@metamask/base-controller": "3.2.0-preview.b4d7927",
  "@metamask/composable-controller": "3.0.0-preview.b4d7927",
  "@metamask/controller-utils": "4.3.1-preview.b4d7927",
  "@metamask/ens-controller": "4.1.0-preview.b4d7927",
  "@metamask/gas-fee-controller": "6.1.1-preview.b4d7927",
  "@metamask/keyring-controller": "7.1.0-preview.b4d7927",
  "@metamask/logging-controller": "1.0.0-preview.b4d7927",
  "@metamask/message-manager": "7.3.0-preview.b4d7927",
  "@metamask/network-controller": "12.1.0-preview.b4d7927",
  "@metamask/notification-controller": "3.1.0-preview.b4d7927",
  "@metamask/permission-controller": "4.1.0-preview.b4d7927",
  "@metamask/phishing-controller": "6.0.0-preview.b4d7927",
  "@metamask/preferences-controller": "4.2.0-preview.b4d7927",
  "@metamask/rate-limit-controller": "3.0.0-preview.b4d7927",
  "@metamask/signature-controller": "5.3.0-preview.b4d7927",
  "@metamask/transaction-controller": "8.0.1-preview.b4d7927"
}

mcmire

Did a pass over this. I noticed some questions you asked in code comments as I was going over this and it's possible I didn't catch all of them. I will do another pass later.

One thing that stood out to me, though, was that we are renaming chainId across various pieces of state and configuration, and I wonder whether that is a good idea, or whether it would just be enough to change the names of the types. My concern is that this would spawn a ton of changes across extension and mobile when upgrading to newer versions of these packages (changing the names of the types will spawn enough changes as it is). The more changes we have to make, the more we risk introducing a bug.

So, I'm curious about the reasoning/context. Was it just to hammer home the fact that this is a CAIP chain ID and not a "legacy" chain ID? Was it to ensure that consumers are using the correct chain ID when they upgrade? My understanding is that we are moving to a world in which chain ID always means CAIP-2 chain ID, so when that happens, eventually the "Caip" part of the name will become redundant. But, are we at a point where we can't guarantee that a chain ID is always a CAIP-2 chain ID?

mcmire · 2023-08-14T22:24:16Z

packages/address-book-controller/src/AddressBookController.ts

 * @property address - Hex address of a recipient account
 * @property name - Nickname associated with this address
- * @property chainId - Chain id identifies the current chain
+ * @property caipChainId - CAIP chain ID identifies the current chain


Nit: Since we're already saying "identifies" I wonder if we can make this a little more succinct:

Suggested change

* @property caipChainId - CAIP chain ID identifies the current chain

* @property caipChainId - CAIP-2 identifier for the current chain

mcmire · 2023-08-16T19:54:14Z

packages/address-book-controller/package.json

    "@metamask/base-controller": "workspace:^",
    "@metamask/controller-utils": "workspace:^",
-    "@metamask/utils": "^6.2.0"
+    "@metamask/utils": "^7.1.0"


Should we note this in the changelog?

mcmire · 2023-08-16T19:54:41Z

packages/approval-controller/package.json

  "dependencies": {
    "@metamask/base-controller": "workspace:^",
-    "@metamask/utils": "^6.2.0",
+    "@metamask/utils": "^7.1.0",


Should we note this in the changelog?

mcmire · 2023-08-16T19:54:46Z

packages/assets-controllers/package.json

    "@metamask/preferences-controller": "workspace:^",
    "@metamask/rpc-errors": "^5.1.1",
-    "@metamask/utils": "^6.2.0",
+    "@metamask/utils": "^7.1.0",


Should we note this in the changelog?

mcmire · 2023-08-16T20:11:27Z

packages/controller-utils/src/caip.ts

+import { toHex } from './util';
+
+/**
+ * Checks whether the given value is a valid CAIP chain ID string for Ethereum.


Isn't a CAIP chain ID always a string? If so I wonder whether this would still be understandable:

Suggested change

* Checks whether the given value is a valid CAIP chain ID string for Ethereum.

* Checks whether the given value is a valid CAIP chain ID for Ethereum.

mcmire · 2023-08-16T22:08:56Z

packages/notification-controller/package.json

  "dependencies": {
    "@metamask/base-controller": "workspace:^",
-    "@metamask/utils": "^6.2.0",
+    "@metamask/utils": "^7.1.0",


Should we note this in the changelog?

mcmire · 2023-08-16T22:09:04Z

packages/permission-controller/package.json

    "@metamask/base-controller": "workspace:^",
    "@metamask/controller-utils": "workspace:^",
-    "@metamask/utils": "^6.2.0",
+    "@metamask/utils": "^7.1.0",


Should we note this in the changelog?

mcmire · 2023-08-16T22:09:14Z

packages/signature-controller/package.json

    "@metamask/controller-utils": "workspace:^",
    "@metamask/message-manager": "workspace:^",
-    "@metamask/utils": "^6.2.0",
+    "@metamask/utils": "^7.1.0",


Should we note this in the changelog?

mcmire · 2023-08-16T22:09:28Z

packages/transaction-controller/package.json

    "@metamask/eth-query": "^3.0.1",
    "@metamask/network-controller": "workspace:^",
-    "@metamask/utils": "^6.2.0",
+    "@metamask/utils": "^7.1.0",


Should we note this in the changelog?

mcmire · 2023-08-16T22:11:49Z

packages/transaction-controller/src/TransactionController.ts

-        const key = `${transaction.nonce}-${
-          chainId ? convertHexToDecimal(chainId) : networkID
-        }-${new Date(time).toDateString()}`;
+        const networkChainId = caipChainId || networkID; // is this right?


It might be good to keep the same behavior and convert the CAIP chain ID to decimal so that keys for existing transactions are the same. Otherwise transactions that are already in state might get accidentally dropped.

(Side note: it might be good to ask these questions in GitHub comments rather than code comments so they don't get accidentally committed.)

jiexi · 2023-08-28T18:33:43Z

Postponed. Not sure if/when will be picked back up.

jiexi added 2 commits July 12, 2023 16:31

thread caip chain id changes

603aa48

Merge branch 'main' into jl/mmp-901/caip-2

6734566

jiexi requested a review from a team as a code owner July 12, 2023 23:33

jiexi marked this pull request as draft July 12, 2023 23:33

This was referenced Jul 12, 2023

CAIP-2 Chain ID MetaMask/metamask-extension#19991

Closed

Add Caip Types MetaMask/utils#116

Merged

lint

62300ed

jiexi commented Jul 13, 2023

View reviewed changes

packages/network-controller/src/NetworkController.ts Outdated Show resolved Hide resolved

jiexi added 5 commits July 13, 2023 14:38

It builds

c6f7c7c

lint

9b42cce

Merge branch 'main' into jl/mmp-901/caip-2

c9198b2

More chainId to caipChainId

9abb5ec

lint

69ebc92

jiexi mentioned this pull request Jul 26, 2023

Use Caip Chain ID MetaMask/smart-transactions-controller#184

Closed

Update specs

b20a3b0

jiexi commented Jul 27, 2023

View reviewed changes

packages/controller-utils/src/types.ts Outdated Show resolved Hide resolved

jiexi commented Jul 27, 2023

View reviewed changes

packages/message-manager/src/TypedMessageManager.ts Outdated Show resolved Hide resolved

jiexi commented Jul 27, 2023

View reviewed changes

packages/transaction-controller/src/TransactionController.ts Show resolved Hide resolved

rename var in TypeMessageManager

4d9760e

jiexi commented Jul 27, 2023

View reviewed changes

Merge branch 'main' into jl/mmp-901/caip-2

fc6521f

jiexi commented Jul 28, 2023

View reviewed changes

packages/network-controller/tests/NetworkController.test.ts Outdated Show resolved Hide resolved

Merge branch 'main' into jl/mmp-901/caip-2

73a8ad2

jiexi marked this pull request as ready for review July 28, 2023 22:22

jiexi added 5 commits August 1, 2023 10:48

Merge branch 'main' into jl/mmp-901/caip-2

be9a9a2

utils 7.1.0

a7a0733

Update isEthCaipChainId check valid reference

c7e42ff

lint

0c416ed

bump utils

8c52cd3

jiexi requested a review from a team as a code owner August 1, 2023 20:09

Update incomingtx to caipChainId

87f348b

jiexi commented Aug 2, 2023

View reviewed changes

packages/controller-utils/src/caip.ts Outdated Show resolved Hide resolved

Merge branch 'main' into jl/mmp-901/caip-2

3b66089

adonesky1 requested review from BelfordZ, Gudahtt, mcmire and shanejonas August 2, 2023 20:50

BelfordZ reviewed Aug 3, 2023

View reviewed changes

packages/network-controller/src/create-auto-managed-network-client.test.ts Show resolved Hide resolved

remove network id eip comment

65a26c4

adonesky1 reviewed Aug 5, 2023

View reviewed changes

packages/assets-controllers/src/AssetsContractController.test.ts Show resolved Hide resolved

adonesky1 reviewed Aug 5, 2023

View reviewed changes

packages/assets-controllers/src/AssetsContractController.ts Outdated Show resolved Hide resolved

adonesky1 reviewed Aug 5, 2023

View reviewed changes

packages/controller-utils/src/caip.test.ts Outdated Show resolved Hide resolved

adonesky1 reviewed Aug 5, 2023

View reviewed changes

packages/controller-utils/src/caip.test.ts Show resolved Hide resolved

adonesky1 reviewed Aug 5, 2023

View reviewed changes

packages/controller-utils/src/caip.ts Show resolved Hide resolved

adonesky1 reviewed Aug 5, 2023

View reviewed changes

packages/ens-controller/src/EnsController.ts Outdated Show resolved Hide resolved

jiexi added 4 commits August 14, 2023 09:55

Remove comments

96e1062

Make buildEthCaipChainId return value if already Eth CAIP Chain ID

3f3f0ba

Rename helpers to to_ format

4a65d10

Merge branch 'main' into jl/mmp-901/caip-2

b4d7927

jiexi changed the title ~~Jl/mmp 901/caip 2~~ CAIP-2 Aug 14, 2023

jiexi changed the title ~~CAIP-2~~ CAIP-2 Chain ID Aug 15, 2023

mcmire reviewed Aug 16, 2023

View reviewed changes

jiexi closed this Aug 28, 2023

	* @property caipChainId - CAIP chain ID identifies the current chain
	* @property caipChainId - CAIP-2 identifier for the current chain

	* Checks whether the given value is a valid CAIP chain ID string for Ethereum.
	* Checks whether the given value is a valid CAIP chain ID for Ethereum.

Uh oh!

Conversation

jiexi commented Jul 12, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation

References

Changelog

@metamask/address-book-controller

@metamask/assets-controllers/AssetsContractController

@metamask/assets-controllers/AssetsContractController

@metamask/assets-controllers/NFTController

@metamask/assets-controllers/NFTDetectionController

@metamask/assets-controllers/TokenDetectionController

@metamask/assets-controllers/TokenListController

@metamask/assets-controllers/TokensRatesController

@metamask/assets-controllers/TokensController

@metamask/controller-utils

@metamask/ens-controller

@metamask/gas-fee-controller

@metamask/message-manager/AbstractMessageManager

@metamask/message-manager/TypedMessageManager

@metamask/network-controller

@metamask/signature-controller

@metamask/transaction-controller

Checklist

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Aug 1, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

adonesky1 commented Aug 5, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jiexi commented Aug 14, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jiexi commented Aug 14, 2023

Uh oh!

github-actions bot commented Aug 14, 2023

Uh oh!

mcmire left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jiexi commented Jul 12, 2023 •

edited

Loading

`@metamask/address-book-controller`

`@metamask/assets-controllers/AssetsContractController`

`@metamask/assets-controllers/AssetsContractController`

`@metamask/assets-controllers/NFTController`

`@metamask/assets-controllers/NFTDetectionController`

`@metamask/assets-controllers/TokenDetectionController`

`@metamask/assets-controllers/TokenListController`

`@metamask/assets-controllers/TokensRatesController`

`@metamask/assets-controllers/TokensController`

`@metamask/controller-utils`

`@metamask/ens-controller`

`@metamask/gas-fee-controller`

`@metamask/message-manager/AbstractMessageManager`

`@metamask/message-manager/TypedMessageManager`

`@metamask/network-controller`

`@metamask/signature-controller`

`@metamask/transaction-controller`

jiexi commented Aug 14, 2023 •

edited

Loading

mcmire left a comment •

edited

Loading