V2.1

Makefile

@@ -19,23 +19,38 @@ simulate-deploy-implementations-v2:
 	forge script scripts/v2/DeployImplementationsV2.s.sol:DeployImplementationsV2Script --rpc-url ${RPC_URL} --sender ${SENDER}
 
 deploy-implementations-v2:
-	forge script scripts/v2/DeployImplementationsV2.s.sol:DeployImplementationsV2Script --rpc-url ${RPC_URL} --sender ${SENDER} --broadcast
+	forge script scripts/v2/DeployImplementationsV2.s.sol:DeployImplementationsV2Script --rpc-url ${RPC_URL} --sender ${SENDER} --private-key ${CREATE2_FACTORY_OWNER_KEY} --broadcast
+
+deploy-implementations-v2-unlocked:
+	forge script scripts/v2/DeployImplementationsV2.s.sol:DeployImplementationsV2Script --rpc-url ${RPC_URL} --sender 0x0000000000000000000000000000000000000000 --broadcast --unlocked
 
 simulate-deploy-create2-factory:
 	forge script scripts/DeployCreate2Factory.s.sol:DeployCreate2FactoryScript --rpc-url ${RPC_URL} --sender ${SENDER}
 
 deploy-create2-factory:
-	forge script scripts/DeployCreate2Factory.s.sol:DeployCreate2FactoryScript --rpc-url ${RPC_URL} --sender ${SENDER} --broadcast
+	forge script scripts/DeployCreate2Factory.s.sol:DeployCreate2FactoryScript --rpc-url ${RPC_URL} --sender ${SENDER} --broadcast --private-key ${CREATE2_FACTORY_OWNER_KEY}
+
+deploy-create2-factory-unlocked:
+	forge script scripts/DeployCreate2Factory.s.sol:DeployCreate2FactoryScript --rpc-url ${RPC_URL} --sender 0x0000000000000000000000000000000000000000 --broadcast --unlocked
 
 simulate-deploy-proxies-v2:
 	forge script scripts/v2/DeployProxiesV2.s.sol:DeployProxiesV2Script --rpc-url ${RPC_URL} --sender ${SENDER}
 
 deploy-proxies-v2:
-	forge script scripts/v2/DeployProxiesV2.s.sol:DeployProxiesV2Script --rpc-url ${RPC_URL} --sender ${SENDER} --broadcast
+	forge script scripts/v2/DeployProxiesV2.s.sol:DeployProxiesV2Script --rpc-url ${RPC_URL} --sender ${SENDER} --broadcast --private-key ${CREATE2_FACTORY_OWNER_KEY}
+
+deploy-proxies-v2-unlocked:
+	forge script scripts/v2/DeployProxiesV2.s.sol:DeployProxiesV2Script --rpc-url ${RPC_URL} --sender 0x0000000000000000000000000000000000000000 --broadcast --unlocked
 
 simulate-setup-remote-resources-v2:
 	forge script scripts/v2/SetupRemoteResourcesV2.s.sol:SetupRemoteResourcesV2Script --rpc-url ${RPC_URL} --sender ${SENDER}
 
+simulate-configure-token-minter-v2:
+	forge script scripts/v2/DeployProxiesV2.s.sol:DeployProxiesV2Script --sig "configureTokenMinterV2()()"  --rpc-url ${RPC_URL} --sender ${SENDER}
+
+configure-token-minter-v2:
+	forge script scripts/v2/DeployProxiesV2.s.sol:DeployProxiesV2Script --sig "configureTokenMinterV2()()"  --rpc-url ${RPC_URL} --sender ${SENDER} --broadcast
+
 setup-remote-resources-v2:
 	forge script scripts/v2/SetupRemoteResourcesV2.s.sol:SetupRemoteResourcesV2Script --rpc-url ${RPC_URL} --sender ${SENDER} --broadcast
 
@@ -46,10 +61,13 @@ rotate-keys-v2:
 	forge script scripts/v2/RotateKeysV2.s.sol:RotateKeysV2Script --rpc-url ${RPC_URL} --sender ${SENDER} --broadcast
 
 simulate-deploy-address-utils-external:
-	forge script scripts/v2/DeployAddressUtilsExternal.s.sol:DeployAddressUtilsExternalScript --rpc-url ${RPC_URL} --sender ${SENDER}
+	forge script scripts/v2/DeployAddressUtilsExternal.s.sol:DeployAddressUtilsExternalScript --rpc-url ${RPC_URL} --sender ${SENDER} --private-keys ${CREATE2_FACTORY_OWNER_KEY}
 
 deploy-address-utils-external:
-	forge script scripts/v2/DeployAddressUtilsExternal.s.sol:DeployAddressUtilsExternalScript --rpc-url ${RPC_URL} --sender ${SENDER} --broadcast
+	forge script scripts/v2/DeployAddressUtilsExternal.s.sol:DeployAddressUtilsExternalScript --rpc-url ${RPC_URL} --sender ${SENDER} --broadcast --private-keys ${CREATE2_FACTORY_OWNER_KEY}
+
+deploy-address-utils-external-unlocked:
+	forge script scripts/v2/DeployAddressUtilsExternal.s.sol:DeployAddressUtilsExternalScript --rpc-url ${RPC_URL}  --sender 0x0000000000000000000000000000000000000000 --broadcast --unlocked
 
 anvil:
 	docker rm -f anvil || true
@@ -63,6 +81,9 @@ anvil-test-v2: anvil
 	pip3 install -r requirements.txt
 	python anvil/crosschainTransferITV2.py
 
+anvil-impersonate:
+	python ./scripts/impersonateAnvilAccounts.py $(ADDRESSES) --balance 10
+
 deploy-local:
 	@docker exec anvil forge script anvil/scripts/${contract}.s.sol:${contract}Script --rpc-url http://localhost:8545  --private-key 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 --broadcast
 

README.md

@@ -1,4 +1,4 @@
 # evm-cctp-contracts
 
 ## Prerequisites
 
@@ -106,10 +106,10 @@
 
 Deploy Create2Factory first if not yet deployed.
 
-1. Add the environment variable `CREATE2_FACTORY_DEPLOYER_KEY` to your [env](.env) file.
-2. Run `make simulate-deploy-create2-factory RPC_URL=<RPC_URL> SENDER=<SENDER>` to perform a dry run.
+1. Add the environment variable `CREATE2_FACTORY_OWNER` (address) to your [env](.env) file.
+2. Run `make simulate-deploy-create2-factory RPC_URL=<RPC_URL> SENDER=<SENDER> CREATE2_FACTORY_OWNER_KEY=<PRIVATE_KEY>` to perform a dry run.
 3. Run
-    ```make deploy-create2-factory RPC_URL=<RPC_URL> SENDER=<SENDER>```
+    ```make deploy-create2-factory RPC_URL=<RPC_URL> SENDER=<SENDER> CREATE2_FACTORY_OWNER_KEY=<PRIVATE_KEY>```
   to deploy the Create2Factory.
 
 #### V2 Implementation Contracts
@@ -119,18 +119,16 @@
 1. Add the following [env](.env) variables
 
     - `CREATE2_FACTORY_CONTRACT_ADDRESS`
-    - `CREATE2_FACTORY_OWNER_KEY`
-    - `TOKEN_MINTER_V2_OWNER_ADDRESS`
     - `TOKEN_MINTER_V2_OWNER_KEY`
     - `TOKEN_CONTROLLER_ADDRESS`
     - `DOMAIN`
     - `MESSAGE_BODY_VERSION`
     - `VERSION`
 
-2. Run `make simulate-deploy-implementations-v2 RPC_URL=<RPC_URL> SENDER=<SENDER>` to perform a dry run.
+2. Run `make simulate-deploy-implementations-v2 RPC_URL=<RPC_URL> SENDER=<SENDER> CREATE2_FACTORY_OWNER_KEY=<CREATE2_FACTORY_OWNER_KEY>` to perform a dry run.
 
 3. Run
-    ```make deploy-implementations-v2 RPC_URL=<RPC_URL> SENDER=<SENDER>```
+    ```make deploy-implementations-v2 RPC_URL=<RPC_URL> SENDER=<SENDER> CREATE2_FACTORY_OWNER_KEY=<CREATE2_FACTORY_OWNER_KEY>```
   to deploy MessageTransmitterV2, TokenMinterV2, and TokenMessengerV2.
 
 #### V2 Proxies
@@ -148,7 +146,6 @@
     - `REMOTE_TOKEN_MESSENGER_V2_ADDRESSES`
     - `CREATE2_FACTORY_CONTRACT_ADDRESS`
 
-    - `MESSAGE_TRANSMITTER_V2_IMPLEMENTATION_ADDRESS`
     - `MESSAGE_TRANSMITTER_V2_OWNER_ADDRESS`
     - `MESSAGE_TRANSMITTER_V2_PAUSER_ADDRESS`
     - `MESSAGE_TRANSMITTER_V2_RESCUER_ADDRESS`
@@ -157,27 +154,26 @@
     - `MESSAGE_TRANSMITTER_V2_ATTESTER_2_ADDRESS`
     - `MESSAGE_TRANSMITTER_V2_PROXY_ADMIN_ADDRESS`
 
-    - `TOKEN_MINTER_V2_CONTRACT_ADDRESS`
     - `TOKEN_MINTER_V2_PAUSER_ADDRESS`
     - `TOKEN_MINTER_V2_RESCUER_ADDRESS`
 
-    - `TOKEN_MESSENGER_V2_IMPLEMENTATION_ADDRESS`
     - `TOKEN_MESSENGER_V2_OWNER_ADDRESS`
     - `TOKEN_MESSENGER_V2_RESCUER_ADDRESS`
     - `TOKEN_MESSENGER_V2_FEE_RECIPIENT_ADDRESS`
     - `TOKEN_MESSENGER_V2_DENYLISTER_ADDRESS`
     - `TOKEN_MESSENGER_V2_PROXY_ADMIN_ADDRESS`
+    - `TOKEN_MESSENGER_V2_MIN_FEE_CONTROLLER_ADDRESS`
+    - `TOKEN_MESSENGER_V2_MIN_FEE`
 
     - `DOMAIN`
     - `BURN_LIMIT_PER_MESSAGE`
 
-    - `CREATE2_FACTORY_OWNER_KEY`
     - `TOKEN_CONTROLLER_KEY`
     - `TOKEN_MINTER_V2_OWNER_KEY`
 
-2. Run `make simulate-deploy-proxies-v2 RPC_URL=<RPC_URL> SENDER=<SENDER>` to perform a dry run.
+2. Run `make simulate-deploy-proxies-v2 RPC_URL=<RPC_URL> SENDER=<SENDER> CREATE2_FACTORY_OWNER_KEY=<CREATE2_FACTORY_OWNER_KEY>` to perform a dry run.
 
-3. Run `make deploy-proxies-v2 RPC_URL=<RPC_URL> SENDER=<SENDER>` to deploy the contracts
+3. Run `make deploy-proxies-v2 RPC_URL=<RPC_URL> SENDER=<SENDER> CREATE2_FACTORY_OWNER_KEY=<CREATE2_FACTORY_OWNER_KEY>` to deploy the contracts
 
 4. ONLY perform steps 5-7 for additional remote resources NOT already configured above.
 
@@ -221,11 +217,26 @@
 1. Set the following [env](.env) variables:
 
     - `CREATE2_FACTORY_CONTRACT_ADDRESS`
-    - `CREATE2_FACTORY_OWNER_KEY`
 
-2. Run `make simulate-deploy-address-utils-external RPC_URL=<RPC_URL> SENDER=<SENDER>` to perform a dry run.
+2. Run `make simulate-deploy-address-utils-external RPC_URL=<RPC_URL> SENDER=<SENDER> CREATE2_FACTORY_OWNER_KEY=<CREATE2_FACTORY_OWNER_KEY>` to perform a dry run.
+
+3. Run `make deploy-address-utils-external RPC_URL=<RPC_URL> SENDER=<SENDER> CREATE2_FACTORY_OWNER_KEY=<CREATE2_FACTORY_OWNER_KEY>` to deploy.
+
+#### Predicting Create2 Deployment Addresses
+
+The `PredictCreate2Deployments.s.sol` script can help compute expected deployment addresses for various contracts. You can run it like so:
+
+- Predicting MessageTransmitterV2 Implementation: `forge script scripts/v2/PredictCreate2Deployments.s.sol --sig "messageTransmitterV2Impl(address,uint32,uint32)" <create2FactoryAddress> <domain> <message version>`
+
+- Predicting TokenMessengerV2 Implementation: `forge script scripts/v2/PredictCreate2Deployments.s.sol --sig "tokenMessengerV2Impl(address,uint32)" <create2FactoryAddress> <messageBodyVersion>`
+
+- Predicting MessageTransmitterV2 Proxy: `forge script scripts/v2/PredictCreate2Deployments.s.sol --sig "messageTransmitterV2Proxy(address)" <create2FactoryAddress>`
+
+- Predicting TokenMessengerV2 Proxy: `forge script scripts/v2/PredictCreate2Deployments.s.sol --sig "tokenMessengerV2Proxy(address)" <create2FactoryAddress>`
+
+- Predicting TokenMinter: `forge script scripts/v2/PredictCreate2Deployments.s.sol --sig "tokenMinterV2(address)" <create2FactoryAddress>`
 
-3. Run `make deploy-address-utils-external RPC_URL=<RPC_URL> SENDER=<SENDER>` to deploy.
+- Predicting AddressUtilsExternal: `forge script scripts/v2/PredictCreate2Deployments.s.sol --sig "addressUtilsExternal(address)`
 
 ## License