Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ BASE_KEY = --private-key ${PRIVATE_KEY}



custom_ethereum := --with-gas-price 1000000000 # 53 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/
Expand All @@ -26,6 +26,7 @@ custom_ethereum := --with-gas-price 1000000000 # 53 gwei
custom_zksync := --zksync
custom_linea-testnet := --legacy --with-gas-price 27000000000 --force # 1 gwei
custom_linea := --with-gas-price 1000000000 --force # 1 gwei
# custom_bob := --with-gas-price 100000000 --force # 0.1 gwei
custom_ethereum-testnet := --legacy --with-gas-price 27000000000 --force # 1 gwei

# params:
Expand Down Expand Up @@ -164,11 +165,11 @@ deploy-full:

# Deploy Proxy Factories on all networks
deploy-proxy-factory-test:
$(call deploy_fn,InitialDeployments,soneium)
$(call deploy_fn,InitialDeployments,bob)

# Deploy Cross Chain Infra on all networks
deploy-cross-chain-infra-test:
$(call deploy_fn,ccc/DeployCCC,soneium)
$(call deploy_fn,ccc/DeployCCC,bob)

## Deploy CCIP bridge adapters on all networks
deploy-ccip-bridge-adapters-test:
Expand Down Expand Up @@ -222,17 +223,20 @@ deploy-ink-adapters-test:
deploy-soneium-adapters-test:
$(call deploy_fn,adapters/DeploySoneiumAdapter,soneium ethereum)

deploy-bob-adapters-test:
$(call deploy_fn,adapters/DeployBobAdapter,bob)

## Set sender bridge dapters. Only eth pol avax are needed as other networks will only receive
set-ccf-sender-adapters-test:
$(call deploy_fn,ccc/Set_CCF_Sender_Adapters,ethereum)

# Set the bridge adapters allowed to receive messages
set-ccr-receiver-adapters-test:
$(call deploy_fn,ccc/Set_CCR_Receivers_Adapters,soneium)
$(call deploy_fn,ccc/Set_CCR_Receivers_Adapters,bob)

# Sets the required confirmations
set-ccr-confirmations-test:
$(call deploy_fn,ccc/Set_CCR_Confirmations,soneium)
$(call deploy_fn,ccc/Set_CCR_Confirmations,bob)


## Deploy and configure all contracts
Expand Down Expand Up @@ -260,7 +264,7 @@ send-direct-message:
$(call deploy_fn,helpers/Send_Direct_CCMessage,ethereum)

deploy_mock_destination:
$(call deploy_fn,helpers/Deploy_Mock_destination,soneium)
$(call deploy_fn,helpers/Deploy_Mock_destination,bob)

set-approved-ccf-senders:
$(call deploy_fn,helpers/Set_Approved_Senders,ethereum)
Expand All @@ -275,7 +279,7 @@ send-message-via-adapter:
$(call deploy_fn,helpers/Send_Message_Via_Adapter,ethereum)

deploy_ccc_granular_guardian:
$(call deploy_fn,access_control/network_scripts/GranularGuardianNetworkDeploys,soneium)
$(call deploy_fn,access_control/network_scripts/GranularGuardianNetworkDeploys,bob)

deploy-ccc-revision-and-update:
$(call deploy_fn,CCC/UpdateCCC,ethereum)
Expand Down Expand Up @@ -305,4 +309,4 @@ update-owners-and-guardians:
$(call deploy_fn,helpers/Update_Ownership,zksync)

update-ccc-permissions:
$(call deploy_fn,helpers/UpdateCCCPermissions,soneium)
$(call deploy_fn,helpers/UpdateCCCPermissions,bob)
1 change: 1 addition & 0 deletions deployments/arbitrum.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"arbAdapter": "0xc8a2ADC4261c6b669CdFf69E717E77C9cFeB420d",
"baseAdapter": "0x0000000000000000000000000000000000000000",
"bobAdapter": "0x0000000000000000000000000000000000000000",
"ccipAdapter": "0x0000000000000000000000000000000000000000",
"chainId": 42161,
"clEmergencyOracle": "0x0000000000000000000000000000000000000000",
Expand Down
1 change: 1 addition & 0 deletions deployments/avalanche.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"arbAdapter": "0x0000000000000000000000000000000000000000",
"baseAdapter": "0x0000000000000000000000000000000000000000",
"bobAdapter": "0x0000000000000000000000000000000000000000",
"ccipAdapter": "0x2b88C83727B0E290B76EB3F6133994fF81B7f355",
"chainId": 43114,
"clEmergencyOracle": "0x41185495Bc8297a65DC46f94001DC7233775EbEe",
Expand Down
1 change: 1 addition & 0 deletions deployments/base.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"arbAdapter": "0x0000000000000000000000000000000000000000",
"baseAdapter": "0x7120b1f8e5b73c0C0DC99C6e52Fe4937E7EA11e0",
"bobAdapter": "0x0000000000000000000000000000000000000000",
"ccipAdapter": "0x0000000000000000000000000000000000000000",
"chainId": 8453,
"clEmergencyOracle": "0x0000000000000000000000000000000000000000",
Expand Down
1 change: 1 addition & 0 deletions deployments/binance.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"arbAdapter": "0x0000000000000000000000000000000000000000",
"baseAdapter": "0x0000000000000000000000000000000000000000",
"bobAdapter": "0x0000000000000000000000000000000000000000",
"ccipAdapter": "0xAE93BEa44dcbE52B625169588574d31e36fb3A67",
"chainId": 56,
"clEmergencyOracle": "0xcabb46FfB38c93348Df16558DF156e9f68F9F7F1",
Expand Down
34 changes: 34 additions & 0 deletions deployments/bob.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"arbAdapter": "0x0000000000000000000000000000000000000000",
"baseAdapter": "0x0000000000000000000000000000000000000000",
"bobAdapter": "0x2171E8AD4045342AF92DdC1227ADC659f2a00535",
"ccipAdapter": "0x0000000000000000000000000000000000000000",
"chainId": 60808,
"clEmergencyOracle": "0x0000000000000000000000000000000000000000",
"create3Factory": "0x0000000000000000000000000000000000000000",
"crossChainController": "0xf630C8A7bC033FD20fcc45d8B43bFe92dE73154F",
"crossChainControllerImpl": "0x931F1da6E2Bc9Ef1842b3094b908E9E6E24D1198",
"emergencyRegistry": "0x0000000000000000000000000000000000000000",
"executor": "0x90800d1F54384523723eD3962c7Cd59d7866c83d",
"gnosisAdapter": "0x0000000000000000000000000000000000000000",
"granularCCCGuardian": "0xb2C672931Bd1Da226e29997Ec8cEB60Fb1DA3959",
"guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
"hlAdapter": "0x0000000000000000000000000000000000000000",
"inkAdapter": "0x0000000000000000000000000000000000000000",
"lineaAdapter": "0x0000000000000000000000000000000000000000",
"lzAdapter": "0x0000000000000000000000000000000000000000",
"mantleAdapter": "0x0000000000000000000000000000000000000000",
"metisAdapter": "0x0000000000000000000000000000000000000000",
"mockDestination": "0x0000000000000000000000000000000000000000",
"opAdapter": "0x0000000000000000000000000000000000000000",
"owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
"polAdapter": "0x0000000000000000000000000000000000000000",
"proxyAdminCCC": "0x628ca0cB6e8A163bB1C4a50B75D7D4E7D38e8b18",
"proxyFactory": "0xEB0682d148e874553008730f0686ea89db7DA412",
"sameChainAdapter": "0x0000000000000000000000000000000000000000",
"scrollAdapter": "0x0000000000000000000000000000000000000000",
"soneiumAdapter": "0x0000000000000000000000000000000000000000",
"wormholeAdapter": "0x0000000000000000000000000000000000000000",
"zkevmAdapter": "0x0000000000000000000000000000000000000000",
"zksyncAdapter": "0x0000000000000000000000000000000000000000"
}
1 change: 1 addition & 0 deletions deployments/celo.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"arbAdapter": "0x0000000000000000000000000000000000000000",
"baseAdapter": "0x0000000000000000000000000000000000000000",
"bobAdapter": "0x0000000000000000000000000000000000000000",
"ccipAdapter": "0x3d534E8964e7aAcfc702751cc9A2BB6A9fe7d928",
"chainId": 42220,
"clEmergencyOracle": "0x91b21900E91CD302EBeD05E45D8f270ddAED944d",
Expand Down
1 change: 1 addition & 0 deletions deployments/ethereum.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"arbAdapter": "0x88d6D01e08d3e64513b15fD46528dBbA7d755883",
"baseAdapter": "0xa5948b0ac79f72966dFFC5C13E44f6dfDD3D58A0",
"bobAdapter": "0x1e2bFEF32EdAbf6b3EF8B674044DC00f082Addff",
"ccipAdapter": "0xe3a0d9754aD3452D687cf580Ba3674c2D7D2f7AE",
"chainId": 1,
"clEmergencyOracle": "0x0000000000000000000000000000000000000000",
Expand Down
1 change: 1 addition & 0 deletions deployments/gnosis.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"arbAdapter": "0x0000000000000000000000000000000000000000",
"baseAdapter": "0x0000000000000000000000000000000000000000",
"bobAdapter": "0x0000000000000000000000000000000000000000",
"ccipAdapter": "0x0000000000000000000000000000000000000000",
"chainId": 100,
"clEmergencyOracle": "0xF937ffAeA1363e4Fa260760bDFA2aA8Fc911F84D",
Expand Down
1 change: 1 addition & 0 deletions deployments/ink.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"arbAdapter": "0x0000000000000000000000000000000000000000",
"baseAdapter": "0x0000000000000000000000000000000000000000",
"bobAdapter": "0x0000000000000000000000000000000000000000",
"ccipAdapter": "0x0000000000000000000000000000000000000000",
"chainId": 57073,
"clEmergencyOracle": "0x0000000000000000000000000000000000000000",
Expand Down
1 change: 1 addition & 0 deletions deployments/linea.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"arbAdapter": "0x0000000000000000000000000000000000000000",
"baseAdapter": "0x0000000000000000000000000000000000000000",
"bobAdapter": "0x0000000000000000000000000000000000000000",
"ccipAdapter": "0x0000000000000000000000000000000000000000",
"chainId": 59144,
"clEmergencyOracle": "0x0000000000000000000000000000000000000000",
Expand Down
1 change: 1 addition & 0 deletions deployments/mantle.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"arbAdapter": "0x0000000000000000000000000000000000000000",
"baseAdapter": "0x0000000000000000000000000000000000000000",
"bobAdapter": "0x0000000000000000000000000000000000000000",
"ccipAdapter": "0x0000000000000000000000000000000000000000",
"chainId": 5000,
"clEmergencyOracle": "0x0000000000000000000000000000000000000000",
Expand Down
1 change: 1 addition & 0 deletions deployments/metis.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"arbAdapter": "0x0000000000000000000000000000000000000000",
"baseAdapter": "0x0000000000000000000000000000000000000000",
"bobAdapter": "0x0000000000000000000000000000000000000000",
"ccipAdapter": "0x0000000000000000000000000000000000000000",
"chainId": 1088,
"clEmergencyOracle": "0x0000000000000000000000000000000000000000",
Expand Down
1 change: 1 addition & 0 deletions deployments/optimism.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"arbAdapter": "0x0000000000000000000000000000000000000000",
"baseAdapter": "0x0000000000000000000000000000000000000000",
"bobAdapter": "0x0000000000000000000000000000000000000000",
"ccipAdapter": "0x0000000000000000000000000000000000000000",
"chainId": 10,
"clEmergencyOracle": "0x0000000000000000000000000000000000000000",
Expand Down
1 change: 1 addition & 0 deletions deployments/polygon.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"arbAdapter": "0x0000000000000000000000000000000000000000",
"baseAdapter": "0x0000000000000000000000000000000000000000",
"bobAdapter": "0x0000000000000000000000000000000000000000",
"ccipAdapter": "0xe79757D55a1600eF28D816a893E78E9FCDE2019E",
"chainId": 137,
"clEmergencyOracle": "0xDAFA1989A504c48Ee20a582f2891eeB25E2fA23F",
Expand Down
34 changes: 34 additions & 0 deletions deployments/pre_prod_bob.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"arbAdapter": "0x0000000000000000000000000000000000000000",
"baseAdapter": "0x0000000000000000000000000000000000000000",
"bobAdapter": "0x3Cc16f6dBfb973eb8e84a68cc6914b029cD7AcBC",
"ccipAdapter": "0x0000000000000000000000000000000000000000",
"chainId": 60808,
"clEmergencyOracle": "0x0000000000000000000000000000000000000000",
"create3Factory": "0x0000000000000000000000000000000000000000",
"crossChainController": "0xBd28fb717A779e9a5E4CB8023D46C5d0d708d91f",
"crossChainControllerImpl": "0x931F1da6E2Bc9Ef1842b3094b908E9E6E24D1198",
"emergencyRegistry": "0x0000000000000000000000000000000000000000",
"executor": "0x47aAdaAE1F05C978E6aBb7568d11B7F6e0FC4d6A",
"gnosisAdapter": "0x0000000000000000000000000000000000000000",
"granularCCCGuardian": "0x0000000000000000000000000000000000000000",
"guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
"hlAdapter": "0x0000000000000000000000000000000000000000",
"inkAdapter": "0x0000000000000000000000000000000000000000",
"lineaAdapter": "0x0000000000000000000000000000000000000000",
"lzAdapter": "0x0000000000000000000000000000000000000000",
"mantleAdapter": "0x0000000000000000000000000000000000000000",
"metisAdapter": "0x0000000000000000000000000000000000000000",
"mockDestination": "0x81d32B36380e6266e1BDd490eAC56cdB300afBe0",
"opAdapter": "0x0000000000000000000000000000000000000000",
"owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
"polAdapter": "0x0000000000000000000000000000000000000000",
"proxyAdminCCC": "0xA506688Fb1811348fE93048dcF4Efbf57D032688",
"proxyFactory": "0xEB0682d148e874553008730f0686ea89db7DA412",
"sameChainAdapter": "0x0000000000000000000000000000000000000000",
"scrollAdapter": "0x0000000000000000000000000000000000000000",
"soneiumAdapter": "0x0000000000000000000000000000000000000000",
"wormholeAdapter": "0x0000000000000000000000000000000000000000",
"zkevmAdapter": "0x0000000000000000000000000000000000000000",
"zksyncAdapter": "0x0000000000000000000000000000000000000000"
}
1 change: 1 addition & 0 deletions deployments/pre_prod_ethereum.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"arbAdapter": "0x1726C13FB9d89abaD27787480ae597b3Df4D806C",
"baseAdapter": "0x124A93c62dB29C2eF68b79F1709Fe377feAa108D",
"bobAdapter": "0xA23EA77E2feE70CD827731cC30157691e868EC26",
"ccipAdapter": "0xc2422E65af261DCcD993960dc097788E5edF53Df",
"chainId": 1,
"clEmergencyOracle": "0x0000000000000000000000000000000000000000",
Expand Down
1 change: 1 addition & 0 deletions deployments/scroll.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"arbAdapter": "0x0000000000000000000000000000000000000000",
"baseAdapter": "0x0000000000000000000000000000000000000000",
"bobAdapter": "0x0000000000000000000000000000000000000000",
"ccipAdapter": "0x0000000000000000000000000000000000000000",
"chainId": 534352,
"clEmergencyOracle": "0x0000000000000000000000000000000000000000",
Expand Down
1 change: 1 addition & 0 deletions deployments/soneium.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"arbAdapter": "0x0000000000000000000000000000000000000000",
"baseAdapter": "0x0000000000000000000000000000000000000000",
"bobAdapter": "0x0000000000000000000000000000000000000000",
"ccipAdapter": "0x0000000000000000000000000000000000000000",
"chainId": 1868,
"clEmergencyOracle": "0x0000000000000000000000000000000000000000",
Expand Down
1 change: 1 addition & 0 deletions deployments/sonic.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"arbAdapter": "0x0000000000000000000000000000000000000000",
"baseAdapter": "0x0000000000000000000000000000000000000000",
"bobAdapter": "0x0000000000000000000000000000000000000000",
"ccipAdapter": "0x1905fCdDa41241C0871A5eC3f9dcC3E8d247261D",
"chainId": 146,
"clEmergencyOracle": "0xECB564e91f620fBFb59d0C4A41d7f10aDb0D1934",
Expand Down
1 change: 1 addition & 0 deletions deployments/zksync.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"arbAdapter": "0x0000000000000000000000000000000000000000",
"baseAdapter": "0x0000000000000000000000000000000000000000",
"bobAdapter": "0x0000000000000000000000000000000000000000",
"ccipAdapter": "0x0000000000000000000000000000000000000000",
"chainId": 324,
"clEmergencyOracle": "0x0000000000000000000000000000000000000000",
Expand Down
5 changes: 5 additions & 0 deletions foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ optimizer_runs = 200
evm_version = 'shanghai'
bytecode_hash = 'none'


script_execution_protection = false

[profile.zksync.zksync]
fallback_oz = true
mode = "3"
Expand Down Expand Up @@ -64,6 +67,7 @@ mantle="${RPC_MANTLE}"
mantle-testnet="${RPC_MANTLE_TESTNET}"
ink="${RPC_INK}"
soneium="${RPC_SONEIUM}"
bob="${RPC_BOB}"

[etherscan]
ethereum={key="${ETHERSCAN_API_KEY_MAINNET}", chain=1 }
Expand Down Expand Up @@ -102,6 +106,7 @@ mantle={key="${ETHERSCAN_API_KEY_MANTLE}", chain=5000, url='https://api.mantlesc
mantle-testnet={key="${ETHERSCAN_API_KEY_MANTLE}", chain=5003, url='https://explorer.testnet.mantle.xyz/api'}
ink={key="${ETHERSCAN_API_KEY_INK}", chain=57073, url='https://api.routescan.io/v2/network/mainnet/evm/57073/etherscan'}
soneium={key="${ETHERSCAN_API_KEY_SONEIUM}", chain=1868, url='https://soneium.blockscout.com/api/'}
bob={key="${ETHERSCAN_API_KEY_BOB}", chain=60808, url='https://explorer.gobob.xyz/api/'}

# See more config options https://github.com/gakonst/foundry/tree/master/config
[fuzz]
Expand Down
2 changes: 1 addition & 1 deletion lib/aave-delivery-infrastructure
3 changes: 3 additions & 0 deletions scripts/BaseDeployerScript.sol
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {ChainHelpers} from 'solidity-utils/contracts/utils/ChainHelpers.sol';
struct Addresses {
address arbAdapter;
address baseAdapter;
address bobAdapter;
address ccipAdapter;
uint256 chainId;
address clEmergencyOracle;
Expand Down Expand Up @@ -87,6 +88,7 @@ library DeployerHelpers {
wormholeAdapter: abi.decode(persistedJson.parseRaw('.wormholeAdapter'), (address)),
zksyncAdapter: abi.decode(persistedJson.parseRaw('.zksyncAdapter'), (address)),
mantleAdapter: abi.decode(persistedJson.parseRaw('.mantleAdapter'), (address)),
bobAdapter: abi.decode(persistedJson.parseRaw('.bobAdapter'), (address)),
granularCCCGuardian: abi.decode(persistedJson.parseRaw('.granularCCCGuardian'), (address))
});

Expand All @@ -97,6 +99,7 @@ library DeployerHelpers {
string memory json = 'addresses';
json.serialize('arbAdapter', addresses.arbAdapter);
json.serialize('baseAdapter', addresses.baseAdapter);
json.serialize('bobAdapter', addresses.bobAdapter);
json.serialize('ccipAdapter', addresses.ccipAdapter);
json.serialize('chainId', addresses.chainId);
json.serialize('clEmergencyOracle', addresses.clEmergencyOracle);
Expand Down
14 changes: 14 additions & 0 deletions scripts/InitialDeployments.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,20 @@ contract Soneium is BaseInitialDeployment {
}
}

contract Bob is BaseInitialDeployment {
function TRANSACTION_NETWORK() internal pure override returns (uint256) {
return ChainIds.BOB;
}

function TRANSPARENT_PROXY_FACTORY() internal pure override returns (address) {
return 0xEB0682d148e874553008730f0686ea89db7DA412;
}

function EXECUTOR() internal pure override returns (address) {
return 0x47aAdaAE1F05C978E6aBb7568d11B7F6e0FC4d6A;
}
}

contract Ethereum_testnet is BaseInitialDeployment {
function TRANSACTION_NETWORK() internal pure override returns (uint256) {
return TestNetChainIds.ETHEREUM_SEPOLIA;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -328,3 +328,21 @@ contract Soneium is DeployGranularGuardian {
return ChainIds.SONEIUM;
}
}

contract Bob is DeployGranularGuardian {
function DEFAULT_ADMIN() internal pure override returns (address) {
return 0x90800d1F54384523723eD3962c7Cd59d7866c83d; //GovernanceV3Bob.EXECUTOR_LVL_1;
}

function RETRY_GUARDIAN() internal pure override returns (address) {
return 0xdc62E0e65b2251Dc66404ca717FD32dcC365Be3A; // bgd guardian
}

function SOLVE_EMERGENCY_GUARDIAN() internal pure override returns (address) {
return 0x19CE4363FEA478Aa04B9EA2937cc5A2cbcD44be6; // dao governance guardian
}

function TRANSACTION_NETWORK() internal pure override returns (uint256) {
return ChainIds.BOB;
}
}
Loading
Loading