Skip to content

Commit 0803d3d

Browse files
authored
Merge pull request #34 from bgd-labs/fix/solidity-utils-update
fix: updated branch
2 parents 8015cd6 + eacf6c9 commit 0803d3d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+97
-62
lines changed

.gitmodules

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[submodule "lib/aave-delivery-infrastructure"]
22
path = lib/aave-delivery-infrastructure
33
url = https://github.com/bgd-labs/aave-delivery-infrastructure
4-
branch = feat/deploy-celo
54
[submodule "lib/aave-helpers"]
65
path = lib/aave-helpers
76
url = https://github.com/bgd-labs/aave-helpers

deployments/arbitrum.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"crossChainController": "0xCbFB78a3Eeaa611b826E37c80E4126c8787D29f0",
99
"crossChainControllerImpl": "0x6e633269af45F37c44659D98f382dd0DD524E5Df",
1010
"emergencyRegistry": "0x0000000000000000000000000000000000000000",
11+
"executor": "0xFF1137243698CaA18EE364Cc966CF0e02A4e6327",
1112
"gnosisAdapter": "0x0000000000000000000000000000000000000000",
1213
"granularCCCGuardian": "0x4922093c476CfbCF903C7C4082d2D64bAE8A37cE",
1314
"guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
@@ -19,7 +20,7 @@
1920
"opAdapter": "0x0000000000000000000000000000000000000000",
2021
"owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
2122
"polAdapter": "0x0000000000000000000000000000000000000000",
22-
"proxyAdmin": "0xD3cF979e676265e4f6379749DECe4708B9A22476",
23+
"proxyAdminCCC": "0xD3cF979e676265e4f6379749DECe4708B9A22476",
2324
"proxyFactory": "0xB4e496f70602fE2AC6Ae511D028BA4D194773B29",
2425
"sameChainAdapter": "0x0000000000000000000000000000000000000000",
2526
"scrollAdapter": "0x0000000000000000000000000000000000000000",

deployments/avalanche.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"crossChainController": "0x27FC7D54C893dA63C0AE6d57e1B2B13A70690928",
99
"crossChainControllerImpl": "0x5Ef80c5eB6CF65Dab8cD1C0ee258a6D2bD38Bd22",
1010
"emergencyRegistry": "0x0000000000000000000000000000000000000000",
11+
"executor": "0x3C06dce358add17aAf230f2234bCCC4afd50d090",
1112
"gnosisAdapter": "0x0000000000000000000000000000000000000000",
1213
"granularCCCGuardian": "0xc1162BCb2E5E3ca4725512008c7522dF8C8B7B65",
1314
"guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
@@ -19,7 +20,7 @@
1920
"opAdapter": "0x0000000000000000000000000000000000000000",
2021
"owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
2122
"polAdapter": "0x0000000000000000000000000000000000000000",
22-
"proxyAdmin": "0xD3cF979e676265e4f6379749DECe4708B9A22476",
23+
"proxyAdminCCC": "0xD3cF979e676265e4f6379749DECe4708B9A22476",
2324
"proxyFactory": "0xB4e496f70602fE2AC6Ae511D028BA4D194773B29",
2425
"sameChainAdapter": "0x0000000000000000000000000000000000000000",
2526
"scrollAdapter": "0x0000000000000000000000000000000000000000",

deployments/avalanche_fuji.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"crossChainController": "0x769174adcc01811F25D988Da57045f77642d0559",
99
"crossChainControllerImpl": "0x9D1F951938Ab38af09B0F60684Fe79F2aa0aADd8",
1010
"emergencyRegistry": "0x0000000000000000000000000000000000000000",
11+
"executor": "0x0000000000000000000000000000000000000000",
1112
"gnosisAdapter": "0x0000000000000000000000000000000000000000",
1213
"guardian": "0x6D603081563784dB3f83ef1F65Cc389D94365Ac9",
1314
"granularCCCGuardian": "0x0000000000000000000000000000000000000000",
@@ -19,7 +20,7 @@
1920
"opAdapter": "0x0000000000000000000000000000000000000000",
2021
"owner": "0x6D603081563784dB3f83ef1F65Cc389D94365Ac9",
2122
"polAdapter": "0x0000000000000000000000000000000000000020",
22-
"proxyAdmin": "0x2Ddcfbb3b2995657dBf0565a4b30b102039A4202",
23+
"proxyAdminCCC": "0x2Ddcfbb3b2995657dBf0565a4b30b102039A4202",
2324
"proxyFactory": "0x11b5EDBd31e97Fe5d22d47e915d75E3af8016FBe",
2425
"sameChainAdapter": "0x0000000000000000000000000000000000000000",
2526
"scrollAdapter": "0x0000000000000000000000000000000000000000",

deployments/base.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"crossChainController": "0x529467C76f234F2bD359d7ecF7c660A2846b04e2",
99
"crossChainControllerImpl": "0x9b6f5ef589A3DD08670Dd146C11C4Fb33E04494F",
1010
"emergencyRegistry": "0x0000000000000000000000000000000000000000",
11+
"executor": "0x9390B1735def18560c509E2d0bc090E9d6BA257a",
1112
"gnosisAdapter": "0x0000000000000000000000000000000000000000",
1213
"granularCCCGuardian": "0xa1c6aF35E0205f42256382C05243C543FEDBf4bB",
1314
"guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
@@ -19,7 +20,7 @@
1920
"opAdapter": "0x0000000000000000000000000000000000000000",
2021
"owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
2122
"polAdapter": "0x0000000000000000000000000000000000000000",
22-
"proxyAdmin": "0xc85b1E333aecc99340b2320493Fe2d22b8734795",
23+
"proxyAdminCCC": "0xc85b1E333aecc99340b2320493Fe2d22b8734795",
2324
"proxyFactory": "0x05225Cd708bCa9253789C1374e4337a019e99D56",
2425
"sameChainAdapter": "0x0000000000000000000000000000000000000000",
2526
"scrollAdapter": "0x0000000000000000000000000000000000000000",

deployments/binance.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"crossChainController": "0x9d33ee6543C9b2C8c183b8fb58fB089266cffA19",
99
"crossChainControllerImpl": "0xf41193E25408F652AF878c47E4401A01B5E4B682",
1010
"emergencyRegistry": "0x0000000000000000000000000000000000000000",
11+
"executor": "0x9390B1735def18560c509E2d0bc090E9d6BA257a",
1112
"gnosisAdapter": "0x0000000000000000000000000000000000000000",
1213
"granularCCCGuardian": "0xe4FB5e3F506BE0095f38004f993D16fdA8224383",
1314
"guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
@@ -19,7 +20,7 @@
1920
"opAdapter": "0x0000000000000000000000000000000000000000",
2021
"owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
2122
"polAdapter": "0x0000000000000000000000000000000000000000",
22-
"proxyAdmin": "0x39EBFfc7679c62Dfcc4A3E2c09Bcb0be255Ae63c",
23+
"proxyAdminCCC": "0x39EBFfc7679c62Dfcc4A3E2c09Bcb0be255Ae63c",
2324
"proxyFactory": "0x47aAdaAE1F05C978E6aBb7568d11B7F6e0FC4d6A",
2425
"sameChainAdapter": "0x0000000000000000000000000000000000000000",
2526
"scrollAdapter": "0x0000000000000000000000000000000000000000",

deployments/binance_testnet.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"crossChainController": "0x28401Fae688Bc401248A4904bdDA6ECec1AF40F5",
99
"crossChainControllerImpl": "0x0100a140ab5C417a1328A556B271bEF682a4E0e6",
1010
"emergencyRegistry": "0x0000000000000000000000000000000000000000",
11+
"executor": "0x0000000000000000000000000000000000000000",
1112
"gnosisAdapter": "0x0000000000000000000000000000000000000000",
1213
"guardian": "0x6D603081563784dB3f83ef1F65Cc389D94365Ac9",
1314
"granularCCCGuardian": "0x0000000000000000000000000000000000000000",
@@ -19,7 +20,7 @@
1920
"opAdapter": "0x0000000000000000000000000000000000000000",
2021
"owner": "0x6D603081563784dB3f83ef1F65Cc389D94365Ac9",
2122
"polAdapter": "0x0000000000000000000000000000000000000000",
22-
"proxyAdmin": "0x8112eCA9A852300cf98e26568D611e03b7ABB98B",
23+
"proxyAdminCCC": "0x8112eCA9A852300cf98e26568D611e03b7ABB98B",
2324
"proxyFactory": "0x319D156eA750b20D5370ef7b348B6fF1ab5D0256",
2425
"sameChainAdapter": "0x0000000000000000000000000000000000000000",
2526
"scrollAdapter": "0x0000000000000000000000000000000000000000",

deployments/celo.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"crossChainController": "0x50F4dAA86F3c747ce15C3C38bD0383200B61d6Dd",
99
"crossChainControllerImpl": "0xB0f963f93bb14C9c7c9061939107989c726E144d",
1010
"emergencyRegistry": "0x0000000000000000000000000000000000000000",
11+
"executor": "0x0000000000000000000000000000000000000000",
1112
"gnosisAdapter": "0x0000000000000000000000000000000000000000",
1213
"granularCCCGuardian": "0xbE815420A63A413BB8D508d8022C0FF150Ea7C39",
1314
"guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
@@ -19,7 +20,7 @@
1920
"opAdapter": "0x0000000000000000000000000000000000000000",
2021
"owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
2122
"polAdapter": "0x0000000000000000000000000000000000000000",
22-
"proxyAdmin": "0x54BDcc37c4143f944A3EE51C892a6cBDF305E7a0",
23+
"proxyAdminCCC": "0x54BDcc37c4143f944A3EE51C892a6cBDF305E7a0",
2324
"proxyFactory": "0xAe13e4DA0952f0B8fE04E21df53716fCF799a923",
2425
"sameChainAdapter": "0x0000000000000000000000000000000000000000",
2526
"scrollAdapter": "0x0000000000000000000000000000000000000000",

deployments/celo_alfajores.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"crossChainController": "0xd922F548973426f86A296bDe2a69B006D6c4cb33",
99
"crossChainControllerImpl": "0x9F9da8017944081FDAB582f6d510001632c34632",
1010
"emergencyRegistry": "0x0000000000000000000000000000000000000000",
11+
"executor": "0x0000000000000000000000000000000000000000",
1112
"gnosisAdapter": "0x0000000000000000000000000000000000000000",
1213
"guardian": "0x6D603081563784dB3f83ef1F65Cc389D94365Ac9",
1314
"granularCCCGuardian": "0x0000000000000000000000000000000000000000",
@@ -19,7 +20,7 @@
1920
"opAdapter": "0x0000000000000000000000000000000000000000",
2021
"owner": "0x6D603081563784dB3f83ef1F65Cc389D94365Ac9",
2122
"polAdapter": "0x0000000000000000000000000000000000000000",
22-
"proxyAdmin": "0xD048e9C3e3916b7246B24Cc69f5eD479190e759E",
23+
"proxyAdminCCC": "0xD048e9C3e3916b7246B24Cc69f5eD479190e759E",
2324
"proxyFactory": "0x319D156eA750b20D5370ef7b348B6fF1ab5D0256",
2425
"sameChainAdapter": "0x0000000000000000000000000000000000000000",
2526
"scrollAdapter": "0x0000000000000000000000000000000000000000",

deployments/ethereum.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"crossChainController": "0xEd42a7D8559a463722Ca4beD50E0Cc05a386b0e1",
99
"crossChainControllerImpl": "0x28559c2F4B038b1E836fA419DCcDe7454d8Fe215",
1010
"emergencyRegistry": "0x0000000000000000000000000000000000000000",
11+
"executor": "0x5300A1a15135EA4dc7aD5a167152C01EFc9b192A",
1112
"gnosisAdapter": "0x7238d75fD75bb936E83b75854c653F104Ce9c9d8",
1213
"granularCCCGuardian": "0x4457cA11E90f416Cc1D3a8E1cA41C0cdEcC251d4",
1314
"guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
@@ -19,7 +20,7 @@
1920
"opAdapter": "0x0e24524778fdc67f53eEf144b8cbf50261E930B3",
2021
"owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
2122
"polAdapter": "0x1562F1b2487F892BBA8Ef325aF054Fd157510a71",
22-
"proxyAdmin": "0xD3cF979e676265e4f6379749DECe4708B9A22476",
23+
"proxyAdminCCC": "0xD3cF979e676265e4f6379749DECe4708B9A22476",
2324
"proxyFactory": "0xB4e496f70602fE2AC6Ae511D028BA4D194773B29",
2425
"sameChainAdapter": "0x6cfbd2aA4691fc18B9C209bDd43DC3943C228FCf",
2526
"scrollAdapter": "0xA4dC3F123e1c601A19B3DC8382BB9311F678cafA",

0 commit comments

Comments
 (0)