Skip to content

Commit

Permalink
chore: lint + temp image for aggkit
Browse files Browse the repository at this point in the history
Signed-off-by: Ji Hwan <[email protected]>
  • Loading branch information
jhkimqd committed Jan 17, 2025
1 parent b0d160f commit 4cde754
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 12 deletions.
2 changes: 1 addition & 1 deletion input_parser.star
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ DEFAULT_DEPLOYMENT_STAGES = {
DEFAULT_IMAGES = {
"agglayer_image": "ghcr.io/agglayer/agglayer:0.2.1-rc.1", # https://github.com/agglayer/agglayer/tags
"cdk_erigon_node_image": "hermeznetwork/cdk-erigon:v2.60.2", # https://hub.docker.com/r/hermeznetwork/cdk-erigon/tags
"cdk_aggkit_image": "cdk-aggoracle:latest", # https://github.com/0xpolygon/cdk/pkgs/container/cdk
"cdk_aggkit_image": "jhkimqd/cdk-aggkit:latest", # https://github.com/0xpolygon/cdk/pkgs/container/cdk
"cdk_node_image": "ghcr.io/0xpolygon/cdk:0.5.0-beta10", # https://github.com/0xpolygon/cdk/pkgs/container/cdk
"cdk_validium_node_image": "0xpolygon/cdk-validium-node:0.7.0-cdk", # https://hub.docker.com/r/0xpolygon/cdk-validium-node/tags
"zkevm_bridge_proxy_image": "haproxy:3.1-bookworm", # https://hub.docker.com/_/haproxy/tags
Expand Down
36 changes: 25 additions & 11 deletions templates/sovereign-rollup/run-sovereign-setup.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/bash

# Adding Rollup to RollupManager and Prefunding Step
# shellcheck disable=SC2034
sov_admin_addr=0x8281AdB2fC133536ACDC4c923bc573A26f66F260
sov_admin_private_key=0x45f3ccdaff88ab1b3bb41472f09d5cde7cb20a6cbbc9197fddf64e2f3d67aaf2

Expand All @@ -15,6 +16,7 @@ networkName="Soverign Chain"
rollup_manager_addr="0x2F50ef6b8e8Ee4E579B17619A92dE3E2ffbD8AD2"
rollup_admin_key="0x12d7de8621a77640c9241b2595ba78ce443d05e94090365ab3bb5e19df82c625"

# shellcheck disable=SC2086
cast send --private-key $rollup_admin_key --rpc-url http://el-1-geth-lighthouse:8545 $rollup_manager_addr 'createNewRollup(uint32,uint64,address,address,address,string,string)' $rollupTypeID $chainID $admin $sequencer $gasTokenAddress $sequencerURL $networkName

rollup_manager_addr="0x2F50ef6b8e8Ee4E579B17619A92dE3E2ffbD8AD2"
Expand All @@ -24,20 +26,25 @@ cast call --json --rpc-url http://el-1-geth-lighthouse:8545 0x2F50ef6b8e8Ee4E57
bridge_admin_addr=0x72aA7C55e1c7BF4017F22a3bc19722de11911A81
bridge_admin_private_key=0x5f3556010771f2cc34eb2669401ee1109bc05aed993024ed10ff04ba7309e28b
aggoracle_addr=0x2Ac2c49Ee3Ac5f663115C86F405Ea855B365D5Ec
# shellcheck disable=SC2034
aggoracle_private_key=0xd65de4634c214d45673528bf55be28fe43b0664c99cc99089ef75a922b3a22fd
claimtx_addr=0x3754Aa77EE1E8AfB200Ce36a8c943ed8F5AaB7BC
# shellcheck disable=SC2034
claimtx_private_key=0xfa333c42db7bc56277bf67c93ba19e4f414d802ef9886b8b5dc7c450655ae77f

rpc_url=http://op-el-1-op-geth-op-node-op-kurtosis:8545
# This is the default prefunded account for the OP Network
private_key=$(cast wallet private-key --mnemonic 'test test test test test test test test test test test junk')

# shellcheck disable=SC2086
cast send --value 10ether --rpc-url $rpc_url --private-key $private_key $bridge_admin_addr
# shellcheck disable=SC2086
cast send --value 10ether --rpc-url $rpc_url --private-key $private_key $aggoracle_addr
# shellcheck disable=SC2086
cast send --value 100ether --rpc-url $rpc_url --private-key $private_key $claimtx_addr

# Contract Deployment Step

# shellcheck disable=SC2164
cd /opt/zkevm-contracts

echo "[profile.default]
Expand All @@ -46,21 +53,27 @@ out = 'out'
libs = ['node_modules']" > foundry.toml

forge build contracts/v2/sovereignChains/BridgeL2SovereignChain.sol contracts/v2/sovereignChains/GlobalExitRootManagerL2SovereignChain.sol

bridge_impl_nonce=$(cast nonce --rpc-url $rpc_url $bridge_admin_addr)
bridge_impl_addr=$(cast compute-address --nonce $bridge_impl_nonce $bridge_admin_addr | sed 's/.*: //')
ger_impl_addr=$(cast compute-address --nonce $((bridge_impl_nonce+1)) $bridge_admin_addr | sed 's/.*: //')
ger_proxy_addr=$(cast compute-address --nonce $((bridge_impl_nonce+2)) $bridge_admin_addr | sed 's/.*: //')
bridge_proxy_addr=$(cast compute-address --nonce $((bridge_impl_nonce+3)) $bridge_admin_addr | sed 's/.*: //')
# shellcheck disable=SC2086
bridge_impl_nonce=$(cast nonce --rpc-url $rpc_url $bridge_admin_addr)
# shellcheck disable=SC2086
bridge_impl_addr=$(cast compute-address --nonce $bridge_impl_nonce $bridge_admin_addr | sed 's/.*: //')
# shellcheck disable=SC2086
ger_impl_addr=$(cast compute-address --nonce $((bridge_impl_nonce+1)) $bridge_admin_addr | sed 's/.*: //')
# shellcheck disable=SC2086
ger_proxy_addr=$(cast compute-address --nonce $((bridge_impl_nonce+2)) $bridge_admin_addr | sed 's/.*: //')
# shellcheck disable=SC2086
bridge_proxy_addr=$(cast compute-address --nonce $((bridge_impl_nonce+3)) $bridge_admin_addr | sed 's/.*: //')

# This is one way to prefund the bridge. It can also be done with a deposit to some unclaimable network. This step is important and needs to be discussed
# shellcheck disable=SC2086
cast send --value 1000ether --rpc-url $rpc_url --private-key $private_key $bridge_proxy_addr

# shellcheck disable=SC2086
forge create --broadcast --rpc-url $rpc_url --private-key $bridge_admin_private_key BridgeL2SovereignChain

# shellcheck disable=SC2086
forge create --broadcast --rpc-url $rpc_url --private-key $bridge_admin_private_key GlobalExitRootManagerL2SovereignChain --constructor-args $bridge_proxy_addr

# shellcheck disable=SC2086
calldata=$(cast calldata 'initialize(address _globalExitRootUpdater, address _globalExitRootRemover)' $aggoracle_addr $aggoracle_addr)
# shellcheck disable=SC2086
forge create --broadcast --rpc-url $rpc_url --private-key $bridge_admin_private_key TransparentUpgradeableProxy --constructor-args $ger_impl_addr $bridge_admin_addr $calldata

initNetworkID=2
Expand All @@ -73,8 +86,9 @@ initBridgeManager=$bridge_admin_addr
initSovereignWETHAddress=$(cast az)
initSovereignWETHAddressIsNotMintable=false

# shellcheck disable=SC2086
calldata=$(cast calldata 'function initialize(uint32 _networkID, address _gasTokenAddress, uint32 _gasTokenNetwork, address _globalExitRootManager, address _polygonRollupManager, bytes _gasTokenMetadata, address _bridgeManager, address _sovereignWETHAddress, bool _sovereignWETHAddressIsNotMintable)' $initNetworkID $initGasTokenAddress $initGasTokenNetwork $initGlobalExitRootManager $initPolygonRollupManager $initGasTokenMetadata $initBridgeManager $initSovereignWETHAddress $initSovereignWETHAddressIsNotMintable)

# shellcheck disable=SC2086
forge create --broadcast --rpc-url $rpc_url --private-key $bridge_admin_private_key TransparentUpgradeableProxy --constructor-args $bridge_impl_addr $bridge_admin_addr $calldata

jq --arg bridge_impl_addr "$bridge_impl_addr" '. += {"bridge_impl_addr": $bridge_impl_addr}' /opt/zkevm-contracts/sovereign-rollup-out.json > /opt/zkevm-contracts/sovereign-rollup-out.json.temp && mv /opt/zkevm-contracts/sovereign-rollup-out.json.temp /opt/zkevm-contracts/sovereign-rollup-out.json
Expand Down

0 comments on commit 4cde754

Please sign in to comment.