Fix for e2e setup (#1219)

* Fix for e2e setup * More fixes * Add profile for production * Set ETHERSCAN_API_KEY * Update polkadot-api * Increase beacon interval * Chore
Snowfork · Jun 4, 2024 · ed49363 · ed49363
1 parent b1f972e
commit ed49363
Show file tree

Hide file tree

Showing 8 changed files with 254 additions and 37 deletions.
diff --git a/contracts/foundry.toml b/contracts/foundry.toml
@@ -1,16 +1,19 @@
 [profile.default]
 solc_version = "0.8.25"
 optimizer = true
-optimizer_runs = 20_000
+optimizer_runs = 200
 via_ir = true
 test = 'test'
 script = 'scripts'
-fs_permissions = [{ access = "read-write", path = "test/data"}, { access = "read", path = "./"}]
+fs_permissions = [{ access = "read-write", path = "test/data" }, { access = "read", path = "./" }]
 
 ignored_error_codes = [
     # DeployLocal.sol is never deployed
-    5574
+    5574,
 ]
 
-# [etherscan]
-# mainnet = { key = "${ETHERSCAN_API_KEY}" }
+[profile.production]
+optimizer_runs = 20_000
+
+[profile.production.etherscan]
+mainnet = { key = "${ETHERSCAN_API_KEY}" }
diff --git a/relayer/relays/beacon/header/header.go b/relayer/relays/beacon/header/header.go
@@ -73,7 +73,7 @@ func (h *Header) Sync(ctx context.Context, eg *errgroup.Group) error {
 
 	log.Info("starting to sync finalized headers")
 
-	ticker := time.NewTicker(time.Second * 10)
+	ticker := time.NewTicker(time.Second * 30)
 
 	eg.Go(func() error {
 		for {

diff --git a/web/packages/test/.envrc-example b/web/packages/test/.envrc-example
@@ -12,21 +12,21 @@ source_up_if_exists
 
 ## Eth config for production
 # export INFURA_PROJECT_ID=            # Your Infura project id
-# export ETH_NETWORK=goerli
-# export ETH_NETWORK_ID=5
+# export ETH_NETWORK=sepolia
+# export ETH_NETWORK_ID=11155111
+# export FOUNDRY_PROFILE=production
 # export ETHERSCAN_API_KEY=             # Your etherscan api key
-# export ETH_RPC_ENDPOINT=https://goerli.infura.io/v3
-# export ETH_WS_ENDPOINT=wss://goerli.infura.io/ws/v3
-# export BEACON_HTTP_ENDPOINT=https://lodestar-goerli.chainsafe.io
+# export ETH_RPC_ENDPOINT=https://sepolia.infura.io/v3
+# export ETH_WS_ENDPOINT=wss://sepolia.infura.io/ws/v3
+# export BEACON_HTTP_ENDPOINT=https://lodestar-sepolia.chainsafe.io
 # export ACTIVE_SPEC=mainnet            # For real network just uncomment and set as mainnet here
 # export DEPLOYER_ETH_KEY=              # Your private key to deploy contracts
 # export BEEFY_RELAY_ETH_KEY=           # Your Beefy relayer account private key
 # export PARACHAIN_RELAY_ETH_KEY=       # Your Parachain relayer account private key
 # export E2E_TEST_ETH_KEY=              # Your E2E test account private key
 # export ETH_RANDAO_DELAY=128           # 4 epochs=128 slots=25.6mins
 # export ETH_RANDAO_EXP=6               # 6 slots before expired
-# export MINIMUM_REQUIRED_SIGNATURES=16 # The minimum number of signatures. See ~/scripts/beefy_signature_sampling.py 
-
+# export MINIMUM_REQUIRED_SIGNATURES=16 # The minimum number of signatures. See ~/scripts/beefy_signature_sampling.py
 
 ## For local dev setup
 # export CUMULUS_VER=snowbridge       # For dev setup change to some feature branch

diff --git a/web/packages/test/package.json b/web/packages/test/package.json
@@ -9,10 +9,10 @@
     "directory": "web/packages/test"
   },
   "devDependencies": {
-    "@polkadot/api": "^10.12.1",
-    "@polkadot/api-cli": "^0.56.2",
+    "@polkadot/api": "^11.2.1",
+    "@polkadot/api-cli": "^0.56.11",
     "@polkadot/keyring": "^12.6.2",
-    "@polkadot/types": "^10.12.1",
+    "@polkadot/types": "^11.2.1",
     "@polkadot/util": "^12.6.2",
     "@polkadot/util-crypto": "^12.6.2",
     "@types/keccak": "^3.0.1",

diff --git a/web/packages/test/scripts/deploy-contracts.sh b/web/packages/test/scripts/deploy-contracts.sh
@@ -18,6 +18,7 @@ deploy_command() {
     else
         forge script \
             --rpc-url $eth_endpoint_http \
+            --legacy \
             --broadcast \
             -vvv \
             $deploy_script

diff --git a/web/packages/test/scripts/deploy-ethereum.sh b/web/packages/test/scripts/deploy-ethereum.sh
@@ -13,7 +13,7 @@ start_geth() {
             .config.CancunTime = $timestamp
             ' \
             config/genesis.json >$output_dir/genesis.json
-        geth init --datadir "$ethereum_data_dir" "$output_dir/genesis.json"
+        geth init --datadir "$ethereum_data_dir" --state.scheme=hash "$output_dir/genesis.json"
         geth --vmdebug --datadir "$ethereum_data_dir" --networkid 11155111 \
             --http --http.api debug,personal,eth,net,web3,txpool,engine,miner --ws --ws.api debug,eth,net,web3 \
             --rpc.allow-unprotected-txs --mine \
@@ -29,6 +29,7 @@ start_geth() {
             --trace "$ethereum_data_dir/trace" \
             --gcmode archive \
             --syncmode=full \
+            --state.scheme=hash \
             >"$output_dir/geth.log" 2>&1 &
     fi
 }

diff --git a/web/packages/test/scripts/set-env.sh b/web/packages/test/scripts/set-env.sh
@@ -80,6 +80,7 @@ execution_relayer_penpal_pub_key="${EXECUTION_RELAYER_PENPAL_PUB_KEY:-0xf8aed186
 
 ## Deployment key
 export PRIVATE_KEY="${DEPLOYER_ETH_KEY:-0x4e9444a6efd6d42725a250b650a781da2737ea308c839eaccb0f7f3dbd2fea77}"
+export ETHERSCAN_API_KEY="${ETHERSCAN_API_KEY:-0x0}"
 
 ## BeefyClient
 # For max safety delay should be MAX_SEED_LOOKAHEAD=4 epochs=4*8*6=192s