Merge pull request #34 from bgd-labs/fix/solidity-utils-update

fix: updated branch
bgd-labs · Feb 6, 2025 · 0803d3d · 0803d3d
2 parents 8015cd6 + eacf6c9
commit 0803d3d
Show file tree

Hide file tree

Showing 48 changed files with 97 additions and 62 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,6 @@
 [submodule "lib/aave-delivery-infrastructure"]
 	path = lib/aave-delivery-infrastructure
 	url = https://github.com/bgd-labs/aave-delivery-infrastructure
-	branch = feat/deploy-celo
 [submodule "lib/aave-helpers"]
 	path = lib/aave-helpers
 	url = https://github.com/bgd-labs/aave-helpers
diff --git a/deployments/arbitrum.json b/deployments/arbitrum.json
@@ -8,6 +8,7 @@
   "crossChainController": "0xCbFB78a3Eeaa611b826E37c80E4126c8787D29f0",
   "crossChainControllerImpl": "0x6e633269af45F37c44659D98f382dd0DD524E5Df",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
+  "executor": "0xFF1137243698CaA18EE364Cc966CF0e02A4e6327",
   "gnosisAdapter": "0x0000000000000000000000000000000000000000",
   "granularCCCGuardian": "0x4922093c476CfbCF903C7C4082d2D64bAE8A37cE",
   "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
@@ -19,7 +20,7 @@
   "opAdapter": "0x0000000000000000000000000000000000000000",
   "owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "polAdapter": "0x0000000000000000000000000000000000000000",
-  "proxyAdmin": "0xD3cF979e676265e4f6379749DECe4708B9A22476",
+  "proxyAdminCCC": "0xD3cF979e676265e4f6379749DECe4708B9A22476",
   "proxyFactory": "0xB4e496f70602fE2AC6Ae511D028BA4D194773B29",
   "sameChainAdapter": "0x0000000000000000000000000000000000000000",
   "scrollAdapter": "0x0000000000000000000000000000000000000000",

diff --git a/deployments/avalanche.json b/deployments/avalanche.json
@@ -8,6 +8,7 @@
   "crossChainController": "0x27FC7D54C893dA63C0AE6d57e1B2B13A70690928",
   "crossChainControllerImpl": "0x5Ef80c5eB6CF65Dab8cD1C0ee258a6D2bD38Bd22",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
+  "executor": "0x3C06dce358add17aAf230f2234bCCC4afd50d090",
   "gnosisAdapter": "0x0000000000000000000000000000000000000000",
   "granularCCCGuardian": "0xc1162BCb2E5E3ca4725512008c7522dF8C8B7B65",
   "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
@@ -19,7 +20,7 @@
   "opAdapter": "0x0000000000000000000000000000000000000000",
   "owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "polAdapter": "0x0000000000000000000000000000000000000000",
-  "proxyAdmin": "0xD3cF979e676265e4f6379749DECe4708B9A22476",
+  "proxyAdminCCC": "0xD3cF979e676265e4f6379749DECe4708B9A22476",
   "proxyFactory": "0xB4e496f70602fE2AC6Ae511D028BA4D194773B29",
   "sameChainAdapter": "0x0000000000000000000000000000000000000000",
   "scrollAdapter": "0x0000000000000000000000000000000000000000",

diff --git a/deployments/avalanche_fuji.json b/deployments/avalanche_fuji.json
@@ -8,6 +8,7 @@
   "crossChainController": "0x769174adcc01811F25D988Da57045f77642d0559",
   "crossChainControllerImpl": "0x9D1F951938Ab38af09B0F60684Fe79F2aa0aADd8",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
+  "executor": "0x0000000000000000000000000000000000000000",
   "gnosisAdapter": "0x0000000000000000000000000000000000000000",
   "guardian": "0x6D603081563784dB3f83ef1F65Cc389D94365Ac9",
   "granularCCCGuardian": "0x0000000000000000000000000000000000000000",
@@ -19,7 +20,7 @@
   "opAdapter": "0x0000000000000000000000000000000000000000",
   "owner": "0x6D603081563784dB3f83ef1F65Cc389D94365Ac9",
   "polAdapter": "0x0000000000000000000000000000000000000020",
-  "proxyAdmin": "0x2Ddcfbb3b2995657dBf0565a4b30b102039A4202",
+  "proxyAdminCCC": "0x2Ddcfbb3b2995657dBf0565a4b30b102039A4202",
   "proxyFactory": "0x11b5EDBd31e97Fe5d22d47e915d75E3af8016FBe",
   "sameChainAdapter": "0x0000000000000000000000000000000000000000",
   "scrollAdapter": "0x0000000000000000000000000000000000000000",

diff --git a/deployments/base.json b/deployments/base.json
@@ -8,6 +8,7 @@
   "crossChainController": "0x529467C76f234F2bD359d7ecF7c660A2846b04e2",
   "crossChainControllerImpl": "0x9b6f5ef589A3DD08670Dd146C11C4Fb33E04494F",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
+  "executor": "0x9390B1735def18560c509E2d0bc090E9d6BA257a",
   "gnosisAdapter": "0x0000000000000000000000000000000000000000",
   "granularCCCGuardian": "0xa1c6aF35E0205f42256382C05243C543FEDBf4bB",
   "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
@@ -19,7 +20,7 @@
   "opAdapter": "0x0000000000000000000000000000000000000000",
   "owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "polAdapter": "0x0000000000000000000000000000000000000000",
-  "proxyAdmin": "0xc85b1E333aecc99340b2320493Fe2d22b8734795",
+  "proxyAdminCCC": "0xc85b1E333aecc99340b2320493Fe2d22b8734795",
   "proxyFactory": "0x05225Cd708bCa9253789C1374e4337a019e99D56",
   "sameChainAdapter": "0x0000000000000000000000000000000000000000",
   "scrollAdapter": "0x0000000000000000000000000000000000000000",

diff --git a/deployments/binance.json b/deployments/binance.json
@@ -8,6 +8,7 @@
   "crossChainController": "0x9d33ee6543C9b2C8c183b8fb58fB089266cffA19",
   "crossChainControllerImpl": "0xf41193E25408F652AF878c47E4401A01B5E4B682",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
+  "executor": "0x9390B1735def18560c509E2d0bc090E9d6BA257a",
   "gnosisAdapter": "0x0000000000000000000000000000000000000000",
   "granularCCCGuardian": "0xe4FB5e3F506BE0095f38004f993D16fdA8224383",
   "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
@@ -19,7 +20,7 @@
   "opAdapter": "0x0000000000000000000000000000000000000000",
   "owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "polAdapter": "0x0000000000000000000000000000000000000000",
-  "proxyAdmin": "0x39EBFfc7679c62Dfcc4A3E2c09Bcb0be255Ae63c",
+  "proxyAdminCCC": "0x39EBFfc7679c62Dfcc4A3E2c09Bcb0be255Ae63c",
   "proxyFactory": "0x47aAdaAE1F05C978E6aBb7568d11B7F6e0FC4d6A",
   "sameChainAdapter": "0x0000000000000000000000000000000000000000",
   "scrollAdapter": "0x0000000000000000000000000000000000000000",

diff --git a/deployments/binance_testnet.json b/deployments/binance_testnet.json
@@ -8,6 +8,7 @@
   "crossChainController": "0x28401Fae688Bc401248A4904bdDA6ECec1AF40F5",
   "crossChainControllerImpl": "0x0100a140ab5C417a1328A556B271bEF682a4E0e6",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
+  "executor": "0x0000000000000000000000000000000000000000",
   "gnosisAdapter": "0x0000000000000000000000000000000000000000",
   "guardian": "0x6D603081563784dB3f83ef1F65Cc389D94365Ac9",
   "granularCCCGuardian": "0x0000000000000000000000000000000000000000",
@@ -19,7 +20,7 @@
   "opAdapter": "0x0000000000000000000000000000000000000000",
   "owner": "0x6D603081563784dB3f83ef1F65Cc389D94365Ac9",
   "polAdapter": "0x0000000000000000000000000000000000000000",
-  "proxyAdmin": "0x8112eCA9A852300cf98e26568D611e03b7ABB98B",
+  "proxyAdminCCC": "0x8112eCA9A852300cf98e26568D611e03b7ABB98B",
   "proxyFactory": "0x319D156eA750b20D5370ef7b348B6fF1ab5D0256",
   "sameChainAdapter": "0x0000000000000000000000000000000000000000",
   "scrollAdapter": "0x0000000000000000000000000000000000000000",

diff --git a/deployments/celo.json b/deployments/celo.json
@@ -8,6 +8,7 @@
   "crossChainController": "0x50F4dAA86F3c747ce15C3C38bD0383200B61d6Dd",
   "crossChainControllerImpl": "0xB0f963f93bb14C9c7c9061939107989c726E144d",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
+  "executor": "0x0000000000000000000000000000000000000000",
   "gnosisAdapter": "0x0000000000000000000000000000000000000000",
   "granularCCCGuardian": "0xbE815420A63A413BB8D508d8022C0FF150Ea7C39",
   "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
@@ -19,7 +20,7 @@
   "opAdapter": "0x0000000000000000000000000000000000000000",
   "owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "polAdapter": "0x0000000000000000000000000000000000000000",
-  "proxyAdmin": "0x54BDcc37c4143f944A3EE51C892a6cBDF305E7a0",
+  "proxyAdminCCC": "0x54BDcc37c4143f944A3EE51C892a6cBDF305E7a0",
   "proxyFactory": "0xAe13e4DA0952f0B8fE04E21df53716fCF799a923",
   "sameChainAdapter": "0x0000000000000000000000000000000000000000",
   "scrollAdapter": "0x0000000000000000000000000000000000000000",

diff --git a/deployments/celo_alfajores.json b/deployments/celo_alfajores.json
@@ -8,6 +8,7 @@
   "crossChainController": "0xd922F548973426f86A296bDe2a69B006D6c4cb33",
   "crossChainControllerImpl": "0x9F9da8017944081FDAB582f6d510001632c34632",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
+  "executor": "0x0000000000000000000000000000000000000000",
   "gnosisAdapter": "0x0000000000000000000000000000000000000000",
   "guardian": "0x6D603081563784dB3f83ef1F65Cc389D94365Ac9",
   "granularCCCGuardian": "0x0000000000000000000000000000000000000000",
@@ -19,7 +20,7 @@
   "opAdapter": "0x0000000000000000000000000000000000000000",
   "owner": "0x6D603081563784dB3f83ef1F65Cc389D94365Ac9",
   "polAdapter": "0x0000000000000000000000000000000000000000",
-  "proxyAdmin": "0xD048e9C3e3916b7246B24Cc69f5eD479190e759E",
+  "proxyAdminCCC": "0xD048e9C3e3916b7246B24Cc69f5eD479190e759E",
   "proxyFactory": "0x319D156eA750b20D5370ef7b348B6fF1ab5D0256",
   "sameChainAdapter": "0x0000000000000000000000000000000000000000",
   "scrollAdapter": "0x0000000000000000000000000000000000000000",

diff --git a/deployments/ethereum.json b/deployments/ethereum.json
@@ -8,6 +8,7 @@
   "crossChainController": "0xEd42a7D8559a463722Ca4beD50E0Cc05a386b0e1",
   "crossChainControllerImpl": "0x28559c2F4B038b1E836fA419DCcDe7454d8Fe215",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
+  "executor": "0x5300A1a15135EA4dc7aD5a167152C01EFc9b192A",
   "gnosisAdapter": "0x7238d75fD75bb936E83b75854c653F104Ce9c9d8",
   "granularCCCGuardian": "0x4457cA11E90f416Cc1D3a8E1cA41C0cdEcC251d4",
   "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
@@ -19,7 +20,7 @@
   "opAdapter": "0x0e24524778fdc67f53eEf144b8cbf50261E930B3",
   "owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "polAdapter": "0x1562F1b2487F892BBA8Ef325aF054Fd157510a71",
-  "proxyAdmin": "0xD3cF979e676265e4f6379749DECe4708B9A22476",
+  "proxyAdminCCC": "0xD3cF979e676265e4f6379749DECe4708B9A22476",
   "proxyFactory": "0xB4e496f70602fE2AC6Ae511D028BA4D194773B29",
   "sameChainAdapter": "0x6cfbd2aA4691fc18B9C209bDd43DC3943C228FCf",
   "scrollAdapter": "0xA4dC3F123e1c601A19B3DC8382BB9311F678cafA",

diff --git a/deployments/ethereum_sepolia.json b/deployments/ethereum_sepolia.json
@@ -8,6 +8,7 @@
   "crossChainController": "0x80Aab474ee7e3A04A4ee77Be874bCCEAA01B2319",
   "crossChainControllerImpl": "0x51Ca5ADc684f2C23deC1F8f762668D7a0Fd601fd",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
+  "executor": "0x0000000000000000000000000000000000000000",
   "gnosisAdapter": "0x0000000000000000000000000000000000000000",
   "granularCCCGuardian": "0x0000000000000000000000000000000000000000",
   "guardian": "0x6D603081563784dB3f83ef1F65Cc389D94365Ac9",
@@ -19,7 +20,7 @@
   "opAdapter": "0x0000000000000000000000000000000000000000",
   "owner": "0x6D603081563784dB3f83ef1F65Cc389D94365Ac9",
   "polAdapter": "0x0000000000000000000000000000000000000000",
-  "proxyAdmin": "0x8dDa7a1E3e96EB13BE50bB59e80485227E3DE2e7",
+  "proxyAdminCCC": "0x8dDa7a1E3e96EB13BE50bB59e80485227E3DE2e7",
   "proxyFactory": "0x3Bad08c7b17D77cE12A2e1438Db2353b58F7c4a2",
   "sameChainAdapter": "0x537C3126cf7D93415B69B401B9d4F65cEda9C410",
   "scrollAdapter": "0xba62183cc12d68ca9Cf9a8b2ed64107fAd1F1d2f",

diff --git a/deployments/gnosis.json b/deployments/gnosis.json
@@ -8,6 +8,7 @@
   "crossChainController": "0x8Dc5310fc9D3D7D1Bb3D1F686899c8F082316c9F",
   "crossChainControllerImpl": "0x5e06b10B3b9c3E1c0996D2544A35B9839Be02922",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
+  "executor": "0x1dF462e2712496373A347f8ad10802a5E95f053D",
   "gnosisAdapter": "0x3C06dce358add17aAf230f2234bCCC4afd50d090",
   "granularCCCGuardian": "0x4A9F571E3C1f2F13567bb59e38988e74d7d72602",
   "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
@@ -19,7 +20,7 @@
   "opAdapter": "0x0000000000000000000000000000000000000000",
   "owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "polAdapter": "0x0000000000000000000000000000000000000000",
-  "proxyAdmin": "0xe892E40C92c2E4D281Be59b2E6300F271d824E75",
+  "proxyAdminCCC": "0xe892E40C92c2E4D281Be59b2E6300F271d824E75",
   "proxyFactory": "0x47aAdaAE1F05C978E6aBb7568d11B7F6e0FC4d6A",
   "sameChainAdapter": "0x0000000000000000000000000000000000000000",
   "scrollAdapter": "0x0000000000000000000000000000000000000000",

diff --git a/deployments/linea.json b/deployments/linea.json
@@ -8,6 +8,7 @@
   "crossChainController": "0x0D3f821e9741C8a8Bcac231162320251Db0cdf52",
   "crossChainControllerImpl": "0xcb5C27e1EF28949b354904ee8D3088330D806a6f",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
+  "executor": "0x8c2d95FE7aeB57b86961F3abB296A54f0ADb7F88",
   "gnosisAdapter": "0x0000000000000000000000000000000000000000",
   "granularCCCGuardian": "0xc1cd6faF6e9138b4e6C21d438f9ebF2bd6F6cA16",
   "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
@@ -19,7 +20,7 @@
   "opAdapter": "0x0000000000000000000000000000000000000000",
   "owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "polAdapter": "0x0000000000000000000000000000000000000000",
-  "proxyAdmin": "0x160E35e28fEE90F3656420584e0a990276219b5A",
+  "proxyAdminCCC": "0x160E35e28fEE90F3656420584e0a990276219b5A",
   "proxyFactory": "0xDe090EfCD6ef4b86792e2D84E55a5fa8d49D25D2",
   "sameChainAdapter": "0x0000000000000000000000000000000000000000",
   "scrollAdapter": "0x0000000000000000000000000000000000000000",

diff --git a/deployments/linea_sepolia.json b/deployments/linea_sepolia.json
@@ -8,6 +8,7 @@
   "crossChainController": "0xD64a5b2E6e0a36c8668F5CF8F07638ffF5259d58",
   "crossChainControllerImpl": "0x3725ea99ed189cA3e7C36DD27a895C2A17448Ce7",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
+  "executor": "0x0000000000000000000000000000000000000000",
   "gnosisAdapter": "0x0000000000000000000000000000000000000000",
   "granularCCCGuardian": "0x0000000000000000000000000000000000000000",
   "guardian": "0x6D603081563784dB3f83ef1F65Cc389D94365Ac9",
@@ -19,7 +20,7 @@
   "opAdapter": "0x0000000000000000000000000000000000000000",
   "owner": "0x6D603081563784dB3f83ef1F65Cc389D94365Ac9",
   "polAdapter": "0x0000000000000000000000000000000000000000",
-  "proxyAdmin": "0xF0BE129CED2ea9cdFae82807EE8119bF65aE523d",
+  "proxyAdminCCC": "0xF0BE129CED2ea9cdFae82807EE8119bF65aE523d",
   "proxyFactory": "0x319D156eA750b20D5370ef7b348B6fF1ab5D0256",
   "sameChainAdapter": "0x0000000000000000000000000000000000000000",
   "scrollAdapter": "0x0000000000000000000000000000000000000000",

diff --git a/deployments/metis.json b/deployments/metis.json
@@ -8,6 +8,7 @@
   "crossChainController": "0x6fDaFb26915ABD6065a1E1501a37Ac438D877f70",
   "crossChainControllerImpl": "0xa198Fac58E02A5C5F8F7e877895d50cFa9ad1E04",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
+  "executor": "0x6fD45D32375d5aDB8D76275A3932c740F03a8718",
   "gnosisAdapter": "0x0000000000000000000000000000000000000000",
   "granularCCCGuardian": "0x61BE97d3a0550549f67CA7421725fA73Fa2036B5",
   "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
@@ -19,7 +20,7 @@
   "opAdapter": "0x0000000000000000000000000000000000000000",
   "owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "polAdapter": "0x0000000000000000000000000000000000000000",
-  "proxyAdmin": "0x1CabD986cBAbDf12E00128DFf03C80ee62C4fd97",
+  "proxyAdminCCC": "0x1CabD986cBAbDf12E00128DFf03C80ee62C4fd97",
   "proxyFactory": "0x1dad86dC5990BCE5bFe3A150A4E0ece990d6EBcB",
   "sameChainAdapter": "0x0000000000000000000000000000000000000000",
   "scrollAdapter": "0x0000000000000000000000000000000000000000",

diff --git a/deployments/metis_test.json b/deployments/metis_test.json
@@ -7,6 +7,7 @@
   "crossChainController": "0xe4905407788974DB0Cc26847D210e3817EeF68e4",
   "crossChainControllerImpl": "0xc752f3c0941e13C5f72C119203c321070294Bc69",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
+  "executor": "0x0000000000000000000000000000000000000000",
   "guardian": "0x6D603081563784dB3f83ef1F65Cc389D94365Ac9",
   "hlAdapter": "0x0000000000000000000000000000000000000000",
   "lineaAdapter": "0x0000000000000000000000000000000000000000",
@@ -16,7 +17,7 @@
   "opAdapter": "0x0000000000000000000000000000000000000000",
   "owner": "0x6D603081563784dB3f83ef1F65Cc389D94365Ac9",
   "polAdapter": "0x0000000000000000000000000000000000000000",
-  "proxyAdmin": "0xB378B916D304E4C8Bf20c264A6094e5fa77CfaCA",
+  "proxyAdminCCC": "0xB378B916D304E4C8Bf20c264A6094e5fa77CfaCA",
   "proxyFactory": "0xF1a818CE6b4F49452388099e6E671E42F1767AB6",
   "sameChainAdapter": "0x0000000000000000000000000000000000000000"
 }
diff --git a/deployments/optimism.json b/deployments/optimism.json
@@ -8,6 +8,7 @@
   "crossChainController": "0x48A9FE90bce5EEd790f3F4Ce192d1C0B351fd4Ca",
   "crossChainControllerImpl": "0xa5cc218513305221201f196760E9e64e9D49d98A",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
+  "executor": "0x746c675dAB49Bcd5BB9Dc85161f2d7Eb435009bf",
   "gnosisAdapter": "0x0000000000000000000000000000000000000000",
   "granularCCCGuardian": "0x6c5264C380C7022e54f585c4E354ffb6f221a03b",
   "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
@@ -19,7 +20,7 @@
   "opAdapter": "0xAE93BEa44dcbE52B625169588574d31e36fb3A67",
   "owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "polAdapter": "0x0000000000000000000000000000000000000000",
-  "proxyAdmin": "0xD3cF979e676265e4f6379749DECe4708B9A22476",
+  "proxyAdminCCC": "0xD3cF979e676265e4f6379749DECe4708B9A22476",
   "proxyFactory": "0xB4e496f70602fE2AC6Ae511D028BA4D194773B29",
   "sameChainAdapter": "0x0000000000000000000000000000000000000000",
   "scrollAdapter": "0x0000000000000000000000000000000000000000",

diff --git a/deployments/polygon.json b/deployments/polygon.json
@@ -8,6 +8,7 @@
   "crossChainController": "0xF6B99959F0b5e79E1CC7062E12aF632CEb18eF0d",
   "crossChainControllerImpl": "0x87a95917DE670088d81B9a8B30E3B36704Ba3043",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
+  "executor": "0xDf7d0e6454DB638881302729F5ba99936EaAB233",
   "gnosisAdapter": "0x0000000000000000000000000000000000000000",
   "granularCCCGuardian": "0x0D2CccD3dD420dC6DE2f24DB44aA22fADE290a02",
   "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
@@ -19,7 +20,7 @@
   "opAdapter": "0x0000000000000000000000000000000000000000",
   "owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "polAdapter": "0x853649f897383f89d8441346Cf26a9ed02720B02",
-  "proxyAdmin": "0xD3cF979e676265e4f6379749DECe4708B9A22476",
+  "proxyAdminCCC": "0xD3cF979e676265e4f6379749DECe4708B9A22476",
   "proxyFactory": "0xB4e496f70602fE2AC6Ae511D028BA4D194773B29",
   "sameChainAdapter": "0x0000000000000000000000000000000000000000",
   "scrollAdapter": "0x0000000000000000000000000000000000000000",

diff --git a/deployments/pre_prod_arbitrum.json b/deployments/pre_prod_arbitrum.json
@@ -8,6 +8,7 @@
   "crossChainController": "0x8733936392546610e9D63Ee22914D88D95B19776",
   "crossChainControllerImpl": "0xa7b40ed4dfAC9255EA9Dd218A3874f380D9FbBEB",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
+  "executor": "0x0000000000000000000000000000000000000000",
   "gnosisAdapter": "0x0000000000000000000000000000000000000000",
   "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "granularCCCGuardian": "0x0000000000000000000000000000000000000000",
@@ -19,7 +20,7 @@
   "opAdapter": "0x0000000000000000000000000000000000000000",
   "owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "polAdapter": "0x0000000000000000000000000000000000000000",
-  "proxyAdmin": "0x446cEA0b68560644ab88AC1d25B5685677BB1711",
+  "proxyAdminCCC": "0x446cEA0b68560644ab88AC1d25B5685677BB1711",
   "proxyFactory": "0xB4e496f70602fE2AC6Ae511D028BA4D194773B29",
   "sameChainAdapter": "0x0000000000000000000000000000000000000000",
   "scrollAdapter": "0x0000000000000000000000000000000000000000",

diff --git a/deployments/pre_prod_avalanche.json b/deployments/pre_prod_avalanche.json
@@ -8,6 +8,7 @@
   "crossChainController": "0x3e256A505B7B70ce3d24eD31FeA99CCB114890Cf",
   "crossChainControllerImpl": "0xdD07851fCA1D6eAa553b8b3b4B62D6a09dE50de5",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
+  "executor": "0x0000000000000000000000000000000000000000",
   "gnosisAdapter": "0x0000000000000000000000000000000000000000",
   "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "granularCCCGuardian": "0x0000000000000000000000000000000000000000",
@@ -19,7 +20,7 @@
   "opAdapter": "0x0000000000000000000000000000000000000000",
   "owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "polAdapter": "0x0000000000000000000000000000000000000000",
-  "proxyAdmin": "0x446cEA0b68560644ab88AC1d25B5685677BB1711",
+  "proxyAdminCCC": "0x446cEA0b68560644ab88AC1d25B5685677BB1711",
   "proxyFactory": "0xB4e496f70602fE2AC6Ae511D028BA4D194773B29",
   "sameChainAdapter": "0x0000000000000000000000000000000000000000",
   "scrollAdapter": "0x0000000000000000000000000000000000000000",