fix: Added initial structure to deploy shuffle payload

.gitignore

@@ -16,3 +16,5 @@ node_modules
 # ignore foundry deploy artifacts
 broadcast/
 input.json
+
+run-latest.json

Makefile

@@ -12,17 +12,17 @@ test   :; forge test -vvv
 
 # ---------------------------------------------- BASE SCRIPT CONFIGURATION ---------------------------------------------
 
-BASE_LEDGER = --legacy --mnemonics foo --ledger --mnemonic-indexes $(MNEMONIC_INDEX) --sender $(LEDGER_SENDER)
+BASE_LEDGER = --legacy --ledger --mnemonic-indexes $(MNEMONIC_INDEX) --sender $(LEDGER_SENDER)
 BASE_KEY = --private-key ${PRIVATE_KEY}
 
 
 
-custom_ethereum := --with-gas-price 45000000000 # 53 gwei
-custom_polygon :=  --with-gas-price 190000000000 # 560 gwei
-custom_avalanche := --with-gas-price 27000000000 # 27 gwei
-custom_metis-testnet := --legacy --verifier-url https://goerli.explorer.metisdevops.link/api/
-custom_metis := --verifier-url  https://api.routescan.io/v2/network/mainnet/evm/1088/etherscan
-custom_scroll-testnet := --legacy --with-gas-price 1000000000 # 1 gwei
+#custom_ethereum := --with-gas-price 2000000000 # 53 gwei
+#custom_polygon :=  --with-gas-price 190000000000 # 560 gwei
+#custom_avalanche := --with-gas-price 27000000000 # 27 gwei
+#custom_metis-testnet := --legacy --verifier-url https://goerli.explorer.metisdevops.link/api/
+#custom_metis := --verifier-url  https://api.routescan.io/v2/network/mainnet/evm/1088/etherscan
+#custom_scroll-testnet := --legacy --with-gas-price 1000000000 # 1 gwei
 
 # params:
 #  1 - path/file_name
@@ -31,25 +31,25 @@ custom_scroll-testnet := --legacy --with-gas-price 1000000000 # 1 gwei
 #  to define custom params per network add vars custom_network-name
 #  to use ledger, set LEDGER=true to env
 #  default to testnet deployment, to run production, set PROD=true to env
-define deploy_single_fn
-forge script \
- scripts/$(1).s.sol:$(if $(3),$(if $(PROD),$(3),$(3)_testnet),$(shell UP=$(if $(PROD),$(2),$(2)_testnet); echo $${UP} | perl -nE 'say ucfirst')) \
- --rpc-url $(if $(PROD),$(2),$(2)-testnet) --broadcast --verify -vvvv \
- $(if $(LEDGER),$(BASE_LEDGER),$(BASE_KEY)) \
- $(custom_$(if $(PROD),$(2),$(2)-testnet))
-
-endef
-
-# catapulta
 #define deploy_single_fn
-#npx [email protected] script \
-# scripts/$(1).s.sol:$(if $(3),$(3),$(shell UP=$(if $(PROD),$(2),$(2)_testnet); echo $${UP} | perl -nE 'say ucfirst')) \
-# --network $(2) --slow --skip-git \
+#forge script \
+# scripts/$(1).s.sol:$(if $(3),$(if $(PROD),$(3),$(3)_testnet),$(shell UP=$(if $(PROD),$(2),$(2)_testnet); echo $${UP} | perl -nE 'say ucfirst')) \
+# --rpc-url $(if $(PROD),$(2),$(2)-testnet) --broadcast --verify -vvvv \
 # $(if $(LEDGER),$(BASE_LEDGER),$(BASE_KEY)) \
 # $(custom_$(if $(PROD),$(2),$(2)-testnet))
 #
 #endef
 
+# catapulta
+define deploy_single_fn
+npx catapulta@latest script \
+ scripts/$(1).s.sol:$(if $(3),$(3),$(shell UP=$(if $(PROD),$(2),$(2)_testnet); echo $${UP} | perl -nE 'say ucfirst')) \
+ --network $(2) --slow --skip-git \
+ $(if $(LEDGER),$(BASE_LEDGER),$(BASE_KEY)) \
+ $(custom_$(if $(PROD),$(2),$(2)-testnet))
+
+endef
+
 define deploy_fn
  $(foreach network,$(2),$(call deploy_single_fn,$(1),$(network),$(3)))
 endef
@@ -260,3 +260,6 @@ deploy-ccc-revision-and-update:
 
 deploy-ccc-update-payload:
 	$(call deploy_fn,helpers/UpdateCCCImpl_Payload,celo)
+
+deploy-ccc-shuffle-payload:
+	$(call deploy_fn,payloads/ccc/shuffle/Network_Deployments,metis)

deployments/arbitrum.json

@@ -9,8 +9,8 @@
   "crossChainControllerImpl": "0x6e633269af45F37c44659D98f382dd0DD524E5Df",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
   "gnosisAdapter": "0x0000000000000000000000000000000000000000",
-  "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "granularCCCGuardian": "0x0000000000000000000000000000000000000000",
+  "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "hlAdapter": "0x0000000000000000000000000000000000000000",
   "lzAdapter": "0x0000000000000000000000000000000000000000",
   "metisAdapter": "0x0000000000000000000000000000000000000000",
@@ -25,4 +25,4 @@
   "wormholeAdapter": "0x0000000000000000000000000000000000000000",
   "zkevmAdapter": "0x0000000000000000000000000000000000000000",
   "zksyncAdapter": "0x0000000000000000000000000000000000000000"
-}
+}

deployments/avalanche.json

@@ -9,8 +9,8 @@
   "crossChainControllerImpl": "0x5Ef80c5eB6CF65Dab8cD1C0ee258a6D2bD38Bd22",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
   "gnosisAdapter": "0x0000000000000000000000000000000000000000",
-  "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "granularCCCGuardian": "0x0000000000000000000000000000000000000000",
+  "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "hlAdapter": "0x617332a777780F546261247F621051d0b98975Eb",
   "lzAdapter": "0x10f02995a399C0dC0FaF29914220E9C1bCdE8640",
   "metisAdapter": "0x0000000000000000000000000000000000000000",
@@ -25,4 +25,4 @@
   "wormholeAdapter": "0x0000000000000000000000000000000000000000",
   "zkevmAdapter": "0x0000000000000000000000000000000000000000",
   "zksyncAdapter": "0x0000000000000000000000000000000000000000"
-}
+}

deployments/base.json

@@ -9,8 +9,8 @@
   "crossChainControllerImpl": "0x9b6f5ef589A3DD08670Dd146C11C4Fb33E04494F",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
   "gnosisAdapter": "0x0000000000000000000000000000000000000000",
-  "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "granularCCCGuardian": "0x0000000000000000000000000000000000000000",
+  "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "hlAdapter": "0x0000000000000000000000000000000000000000",
   "lzAdapter": "0x0000000000000000000000000000000000000000",
   "metisAdapter": "0x0000000000000000000000000000000000000000",
@@ -25,4 +25,4 @@
   "wormholeAdapter": "0x0000000000000000000000000000000000000000",
   "zkevmAdapter": "0x0000000000000000000000000000000000000000",
   "zksyncAdapter": "0x0000000000000000000000000000000000000000"
-}
+}

deployments/binance.json

@@ -9,8 +9,8 @@
   "crossChainControllerImpl": "0xf41193E25408F652AF878c47E4401A01B5E4B682",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
   "gnosisAdapter": "0x0000000000000000000000000000000000000000",
-  "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "granularCCCGuardian": "0x0000000000000000000000000000000000000000",
+  "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "hlAdapter": "0x3F006299eC88985c18E6e885EeA29A49eC579882",
   "lzAdapter": "0xa5cc218513305221201f196760E9e64e9D49d98A",
   "metisAdapter": "0x0000000000000000000000000000000000000000",
@@ -25,4 +25,4 @@
   "wormholeAdapter": "0x0000000000000000000000000000000000000000",
   "zkevmAdapter": "0x0000000000000000000000000000000000000000",
   "zksyncAdapter": "0x0000000000000000000000000000000000000000"
-}
+}

deployments/ethereum.json

@@ -9,8 +9,8 @@
   "crossChainControllerImpl": "0x28559c2F4B038b1E836fA419DCcDe7454d8Fe215",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
   "gnosisAdapter": "0x7238d75fD75bb936E83b75854c653F104Ce9c9d8",
-  "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "granularCCCGuardian": "0x0000000000000000000000000000000000000000",
+  "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "hlAdapter": "0x01dcb90Cf13b82Cde4A0BAcC655585a83Af3cCC1",
   "lzAdapter": "0x8410d9BD353b420ebA8C48ff1B0518426C280FCC",
   "metisAdapter": "0x6B3Dc800E7c813Db3fe8D0F30fDCaE636935dC14",
@@ -25,4 +25,4 @@
   "wormholeAdapter": "0x42206271373675661500F8a4d6A6CE2FDc6b5De5",
   "zkevmAdapter": "0xe0a6Eee6d0c883734A7a7e7B378BD09fffb89EB6",
   "zksyncAdapter": "0x0000000000000000000000000000000000000000"
-}
+}

deployments/gnosis.json

@@ -9,8 +9,8 @@
   "crossChainControllerImpl": "0x5e06b10B3b9c3E1c0996D2544A35B9839Be02922",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
   "gnosisAdapter": "0x3C06dce358add17aAf230f2234bCCC4afd50d090",
-  "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "granularCCCGuardian": "0x0000000000000000000000000000000000000000",
+  "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "hlAdapter": "0xA806DA549FcB2B4912a7dFFE4c1aA7A1ed0Bd5C9",
   "lzAdapter": "0x9b6f5ef589A3DD08670Dd146C11C4Fb33E04494F",
   "metisAdapter": "0x0000000000000000000000000000000000000000",
@@ -25,4 +25,4 @@
   "wormholeAdapter": "0x0000000000000000000000000000000000000000",
   "zkevmAdapter": "0x0000000000000000000000000000000000000000",
   "zksyncAdapter": "0x0000000000000000000000000000000000000000"
-}
+}

deployments/metis.json

@@ -9,8 +9,8 @@
   "crossChainControllerImpl": "0xa198Fac58E02A5C5F8F7e877895d50cFa9ad1E04",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
   "gnosisAdapter": "0x0000000000000000000000000000000000000000",
-  "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "granularCCCGuardian": "0x0000000000000000000000000000000000000000",
+  "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "hlAdapter": "0x0000000000000000000000000000000000000000",
   "lzAdapter": "0x0000000000000000000000000000000000000000",
   "metisAdapter": "0xf41193E25408F652AF878c47E4401A01B5E4B682",
@@ -25,4 +25,4 @@
   "wormholeAdapter": "0x0000000000000000000000000000000000000000",
   "zkevmAdapter": "0x0000000000000000000000000000000000000000",
   "zksyncAdapter": "0x0000000000000000000000000000000000000000"
-}
+}

deployments/optimism.json

@@ -9,8 +9,8 @@
   "crossChainControllerImpl": "0xa5cc218513305221201f196760E9e64e9D49d98A",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
   "gnosisAdapter": "0x0000000000000000000000000000000000000000",
-  "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "granularCCCGuardian": "0x0000000000000000000000000000000000000000",
+  "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "hlAdapter": "0x0000000000000000000000000000000000000000",
   "lzAdapter": "0x0000000000000000000000000000000000000000",
   "metisAdapter": "0x0000000000000000000000000000000000000000",
@@ -25,4 +25,4 @@
   "wormholeAdapter": "0x0000000000000000000000000000000000000000",
   "zkevmAdapter": "0x0000000000000000000000000000000000000000",
   "zksyncAdapter": "0x0000000000000000000000000000000000000000"
-}
+}

deployments/polygon.json

@@ -9,8 +9,8 @@
   "crossChainControllerImpl": "0x87a95917DE670088d81B9a8B30E3B36704Ba3043",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
   "gnosisAdapter": "0x0000000000000000000000000000000000000000",
-  "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "granularCCCGuardian": "0x0000000000000000000000000000000000000000",
+  "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "hlAdapter": "0x3e72665008dC237bdd91C04C10782Ed1987a4019",
   "lzAdapter": "0x7FAE7765abB4c8f778d57337bB720d0BC53057e3",
   "metisAdapter": "0x0000000000000000000000000000000000000000",
@@ -25,4 +25,4 @@
   "wormholeAdapter": "0x0000000000000000000000000000000000000000",
   "zkevmAdapter": "0x0000000000000000000000000000000000000000",
   "zksyncAdapter": "0x0000000000000000000000000000000000000000"
-}
+}

deployments/scroll.json

@@ -9,8 +9,8 @@
   "crossChainControllerImpl": "0x5e06b10B3b9c3E1c0996D2544A35B9839Be02922",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
   "gnosisAdapter": "0x0000000000000000000000000000000000000000",
-  "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "granularCCCGuardian": "0x0000000000000000000000000000000000000000",
+  "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "hlAdapter": "0x0000000000000000000000000000000000000000",
   "lzAdapter": "0x0000000000000000000000000000000000000000",
   "metisAdapter": "0x0000000000000000000000000000000000000000",
@@ -25,4 +25,4 @@
   "wormholeAdapter": "0x0000000000000000000000000000000000000000",
   "zkevmAdapter": "0x0000000000000000000000000000000000000000",
   "zksyncAdapter": "0x0000000000000000000000000000000000000000"
-}
+}

diffs/adi_add_shuffle_to_ccc_arbitrum_before_adi_add_shuffle_to_ccc_arbitrum_after.md

@@ -0,0 +1,10 @@
+## Raw diff
+
+```json
+{
+  "crossChainControllerImpl": {
+    "from": "0x6e633269af45F37c44659D98f382dd0DD524E5Df",
+    "to": "0x92F4736b72D131D836B3e4d4C3C23fE53150Ce4d"
+  }
+}
+```

diffs/adi_add_shuffle_to_ccc_avalanche_before_adi_add_shuffle_to_ccc_avalanche_after.md

@@ -0,0 +1,10 @@
+## Raw diff
+
+```json
+{
+  "crossChainControllerImpl": {
+    "from": "0x5Ef80c5eB6CF65Dab8cD1C0ee258a6D2bD38Bd22",
+    "to": "0x23F5150ace7382C7160a2192c3F9f77444F420D9"
+  }
+}
+```

diffs/adi_add_shuffle_to_ccc_base_before_adi_add_shuffle_to_ccc_base_after.md

@@ -0,0 +1,10 @@
+## Raw diff
+
+```json
+{
+  "crossChainControllerImpl": {
+    "from": "0x9b6f5ef589A3DD08670Dd146C11C4Fb33E04494F",
+    "to": "0x92F4736b72D131D836B3e4d4C3C23fE53150Ce4d"
+  }
+}
+```

diffs/adi_add_shuffle_to_ccc_binance_before_adi_add_shuffle_to_ccc_binance_after.md

@@ -0,0 +1,10 @@
+## Raw diff
+
+```json
+{
+  "crossChainControllerImpl": {
+    "from": "0xf41193E25408F652AF878c47E4401A01B5E4B682",
+    "to": "0xdA81fb369942E43D4797E79F2C4CBeF9Fe58B90a"
+  }
+}
+```

diffs/adi_add_shuffle_to_ccc_ethereum_before_adi_add_shuffle_to_ccc_ethereum_after.md

@@ -0,0 +1,10 @@
+## Raw diff
+
+```json
+{
+  "crossChainControllerImpl": {
+    "from": "0x28559c2F4B038b1E836fA419DCcDe7454d8Fe215",
+    "to": "0x92F4736b72D131D836B3e4d4C3C23fE53150Ce4d"
+  }
+}
+```

diffs/adi_add_shuffle_to_ccc_gnosis_before_adi_add_shuffle_to_ccc_gnosis_after.md

@@ -0,0 +1,10 @@
+## Raw diff
+
+```json
+{
+  "crossChainControllerImpl": {
+    "from": "0x5e06b10B3b9c3E1c0996D2544A35B9839Be02922",
+    "to": "0x88e9f8E208BA5ae72b56861D63cBF70Fd2320F5c"
+  }
+}
+```

diffs/adi_add_shuffle_to_ccc_metis_before_adi_add_shuffle_to_ccc_metis_after.md

@@ -0,0 +1,10 @@
+## Raw diff
+
+```json
+{
+  "crossChainControllerImpl": {
+    "from": "0xa198Fac58E02A5C5F8F7e877895d50cFa9ad1E04",
+    "to": "0x92F4736b72D131D836B3e4d4C3C23fE53150Ce4d"
+  }
+}
+```

diffs/adi_add_shuffle_to_ccc_optimism_before_adi_add_shuffle_to_ccc_optimism_after.md

@@ -0,0 +1,10 @@
+## Raw diff
+
+```json
+{
+  "crossChainControllerImpl": {
+    "from": "0xa5cc218513305221201f196760E9e64e9D49d98A",
+    "to": "0x92F4736b72D131D836B3e4d4C3C23fE53150Ce4d"
+  }
+}
+```

diffs/adi_add_shuffle_to_ccc_polygon_before_adi_add_shuffle_to_ccc_polygon_after.md

@@ -0,0 +1,10 @@
+## Raw diff
+
+```json
+{
+  "crossChainControllerImpl": {
+    "from": "0x87a95917DE670088d81B9a8B30E3B36704Ba3043",
+    "to": "0x191f2bd27F1cE4318f9A0c6b82688C66CD7aD3ba"
+  }
+}
+```

diffs/adi_add_shuffle_to_ccc_scroll_before_adi_add_shuffle_to_ccc_scroll_after.md

@@ -0,0 +1,10 @@
+## Raw diff
+
+```json
+{
+  "crossChainControllerImpl": {
+    "from": "0x5e06b10B3b9c3E1c0996D2544A35B9839Be02922",
+    "to": "0x92F4736b72D131D836B3e4d4C3C23fE53150Ce4d"
+  }
+}
+```

diffs/adi_test_adi_diffs_before_adi_test_adi_diffs_after.md

@@ -4,9 +4,9 @@
 {
   "receiverAdaptersByChain": {
     "1": {
-      "0x1Cfe182fa075EF185adFD605806241e2d181ffC2": {
+      "0xa8a778DB196AE2A5997c30d2081C2B48c3532bC2": {
         "from": null,
-        "to": true
+        "to": "true"
       }
     }
   }