diff --git a/Makefile b/Makefile index 2b2df242..1ac2ccd2 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,15 @@ DOCKER_COMPOSE_BRIDGE_DB := xgon-bridge-db DOCKER_COMPOSE_DAC_DB := xgon-data-availability-db DOCKER_COMPOSE_REDIS := xgon-bridge-redis DOCKER_COMPOSE_ZKEVM_NODE := xgon-node + +DOCKER_COMPOSE_SEQ := xgon-sequencer +DOCKER_COMPOSE_SEQ_SENDER := xgon-sequence-sender +DOCKER_COMPOSE_L2_GASP := xgon-l2gaspricer +DOCKER_COMPOSE_AGG := xgon-aggregator +DOCKER_COMPOSE_RPC := xgon-json-rpc +DOCKER_COMPOSE_SYNC := xgon-sync +DOCKER_COMPOSE_ETH_TX_MANAGER := xgon-eth-tx-manager + DOCKER_COMPOSE_L1_NETWORK := xgon-mock-l1-network DOCKER_COMPOSE_ZKPROVER := xgon-prover DOCKER_COMPOSE_BRIDGE := xgon-bridge-service @@ -28,7 +37,13 @@ RUN_DA := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_DA_NODE) RUN_KAFKA := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_KAFKA_NODE) RUN_COIN_KAFKA := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_COIN_KAFKA_NODE) RUN_ZOOKEEPER := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_ZOOKEEPER) -RUN_NODE := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_ZKEVM_NODE) +RUN_SEQUENCER := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_SEQ) +RUN_SEQUENCE_SENDER := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_SEQ_SENDER) +RUN_L2_GAS_PRICER := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_L2_GASP) +RUN_AGGREGATOR := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_AGG) +RUN_JSON_RPC := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_RPC) +RUN_SYNC := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_SYNC) +RUN_ETH_TX_MANAGER := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_ETH_TX_MANAGER) RUN_L1_NETWORK := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_L1_NETWORK) RUN_ZKPROVER := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_ZKPROVER) RUN_BRIDGE := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_BRIDGE) @@ -36,7 +51,13 @@ RUN_BRIDGE := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_BRIDGE) STOP_NODE_DB := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_NODE_DB) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_NODE_DB) STOP_BRIDGE_DB := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_BRIDGE_DB) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_BRIDGE_DB) STOP_DBS := ${STOP_NODE_DB} && ${STOP_BRIDGE_DB} -STOP_NODE := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_ZKEVM_NODE) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_ZKEVM_NODE) +STOP_SEQUENCER := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_SEQ) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_SEQ) +STOP_SEQUENCE_SENDER := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_SEQ_SENDER) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_SEQ_SENDER) +STOP_L2_GAS_PRICER := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_L2_GASP) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_L2_GASP) +STOP_AGGREGATOR := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_AGG) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_AGG) +STOP_JSON_RPC := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_RPC) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_RPC) +STOP_SYNC := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_SYNC) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_SYNC) +STOP_ETH_TX_MANAGER := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_ETH_TX_MANAGER) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_ETH_TX_MANAGER) STOP_NETWORK := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_L1_NETWORK) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_L1_NETWORK) STOP_ZKPROVER := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_ZKPROVER) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_ZKPROVER) STOP_BRIDGE := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_BRIDGE) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_BRIDGE) @@ -108,11 +129,24 @@ stop-dbs: ## Stops the node database .PHONY: run-node run-node: ## Runs the node - $(RUN_NODE) + $(RUN_ETH_TX_MANAGER) + $(RUN_SYNC) + sleep 2 + $(RUN_SEQUENCER) + $(RUN_SEQUENCE_SENDER) + $(RUN_L2_GAS_PRICER) + $(RUN_AGGREGATOR) + $(RUN_JSON_RPC) .PHONY: stop-node stop-node: ## Stops the node - $(STOP_NODE) + $(STOP_SEQUENCER) + $(STOP_SEQUENCE_SENDER) + $(STOP_JSON_RPC) + $(STOP_L2_GAS_PRICER) + $(STOP_AGGREGATOR) + $(STOP_SYNC) + $(STOP_ETH_TX_MANAGER) .PHONY: run-network run-network: ## Runs the l1 network @@ -159,7 +193,14 @@ run: stop ## runs all services sleep 3 $(RUN_DA) sleep 3 - $(RUN_NODE) + $(RUN_SYNC) + sleep 2 + $(RUN_ETH_TX_MANAGER) + $(RUN_SEQUENCER) + $(RUN_SEQUENCE_SENDER) + $(RUN_L2_GAS_PRICER) + $(RUN_AGGREGATOR) + $(RUN_JSON_RPC) sleep 7 $(RUN_BRIDGE) diff --git a/docker-compose.yml b/docker-compose.yml index ce653d6b..52753e38 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,9 +1,123 @@ -version: '3.5' +version: "3.5" networks: default: name: xgon - + services: + xgon-sequencer: + container_name: xgon-sequencer + image: okexchain/xgon-node:e2e_v0.1.0_20231030 + ports: + - 9092:9091 # needed if metrics enabled + - 6060:6060 + environment: + - ZKEVM_NODE_STATEDB_HOST=xgon-state-db + - ZKEVM_NODE_POOL_DB_HOST=xgon-pool-db + volumes: + - ./test/config/node/test.node.config.toml:/app/config.toml + - ./test/config/node/test.genesis.config.json:/app/genesis.json + command: + - "/bin/sh" + - "-c" + - "/app/xgon-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components sequencer" + + xgon-sequence-sender: + container_name: xgon-sequence-sender + image: okexchain/xgon-node:e2e_v0.1.0_20231030 + environment: + - ZKEVM_NODE_STATEDB_HOST=xgon-state-db + - ZKEVM_NODE_POOL_DB_HOST=xgon-pool-db + - ZKEVM_NODE_SEQUENCER_SENDER_ADDRESS=0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266 + volumes: + - ./test/test.keystore.sequencer:/pk/sequencer.keystore + - ./test/config/node/test.node.config.toml:/app/config.toml + - ./test/config/node/test.genesis.config.json:/app/genesis.json + command: + - "/bin/sh" + - "-c" + - "/app/xgon-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components sequence-sender" + + xgon-json-rpc: + container_name: xgon-json-rpc + image: okexchain/xgon-node:e2e_v0.1.0_20231030 + ports: + - 8123:8123 + - 8133:8133 # needed if WebSockets enabled + - 9091:9091 # needed if metrics enabled + environment: + - ZKEVM_NODE_STATEDB_HOST=xgon-state-db + - ZKEVM_NODE_POOL_DB_HOST=xgon-pool-db + volumes: + - ./test/config/node/test.node.config.toml:/app/config.toml + - ./test/config/node/test.genesis.config.json:/app/genesis.json + command: + - "/bin/sh" + - "-c" + - "/app/xgon-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components rpc" + + xgon-aggregator: + container_name: xgon-aggregator + image: okexchain/xgon-node:e2e_v0.1.0_20231030 + ports: + - 50081:50081 + - 9093:9091 # needed if metrics enabled + environment: + - ZKEVM_NODE_STATEDB_HOST=xgon-state-db + - ZKEVM_NODE_AGGREGATOR_SENDER_ADDRESS=0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266 + volumes: + - ./test/config/node/test.node.config.toml:/app/config.toml + - ./test/config/node/test.genesis.config.json:/app/genesis.json + command: + - "/bin/sh" + - "-c" + - "/app/xgon-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components aggregator" + + xgon-sync: + container_name: xgon-sync + image: okexchain/xgon-node:e2e_v0.1.0_20231030 + ports: + - 9095:9091 # needed if metrics enabled + environment: + - ZKEVM_NODE_STATEDB_HOST=xgon-state-db + volumes: + - ./test/config/node/test.node.config.toml:/app/config.toml + - ./test/config/node/test.genesis.config.json:/app/genesis.json + command: + - "/bin/sh" + - "-c" + - "/app/xgon-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components synchronizer" + + xgon-eth-tx-manager: + container_name: xgon-eth-tx-manager + image: okexchain/xgon-node:e2e_v0.1.0_20231030 + ports: + - 9094:9091 # needed if metrics enabled + environment: + - ZKEVM_NODE_STATEDB_HOST=xgon-state-db + volumes: + - ./test/test.keystore.sequencer:/pk/sequencer.keystore + - ./test/test.keystore.aggregator:/pk/aggregator.keystore + - ./test/config/node/test.node.config.toml:/app/config.toml + - ./test/config/node/test.genesis.config.json:/app/genesis.json + command: + - "/bin/sh" + - "-c" + - "/app/xgon-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components eth-tx-manager" + + xgon-l2gaspricer: + container_name: xgon-l2gaspricer + image: okexchain/xgon-node:e2e_v0.1.0_20231030 + environment: + - ZKEVM_NODE_POOL_DB_HOST=xgon-pool-db + volumes: + - ./test/test.keystore.sequencer:/pk/keystore + - ./test/config/node/test.node.config.toml:/app/config.toml + - ./test/config/node/test.genesis.config.json:/app/genesis.json + command: + - "/bin/sh" + - "-c" + - "/app/xgon-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components l2gaspricer" + xgon-state-db: container_name: xgon-state-db image: postgres @@ -16,24 +130,11 @@ services: ports: - 5432:5432 volumes: - - ./test/config/prover/initproverdb.sql:/docker-entrypoint-initdb.d/init.sql + - ./test/config/prover/init_prover_db.sql:/docker-entrypoint-initdb.d/init.sql environment: - POSTGRES_USER=state_user - POSTGRES_PASSWORD=state_password - POSTGRES_DB=state_db - command: ["postgres", "-N", "500"] - - xgon-event-db: - container_name: xgon-event-db - image: postgres - ports: - - 5436:5432 - volumes: - - ./test/config/node/init_event_db.sql:/docker-entrypoint-initdb.d/init.sql - environment: - - POSTGRES_USER=event_user - - POSTGRES_PASSWORD=event_password - - POSTGRES_DB=event_db command: - "postgres" - "-N" @@ -54,7 +155,116 @@ services: - POSTGRES_USER=pool_user - POSTGRES_PASSWORD=pool_password - POSTGRES_DB=pool_db - command: ["postgres", "-N", "500"] + command: + - "postgres" + - "-N" + - "500" + + xgon-event-db: + container_name: xgon-event-db + image: postgres + deploy: + resources: + limits: + memory: 2G + reservations: + memory: 1G + ports: + - 5436:5432 + volumes: + - ./test/config/node/init_event_db.sql:/docker-entrypoint-initdb.d/init.sql + environment: + - POSTGRES_USER=event_user + - POSTGRES_PASSWORD=event_password + - POSTGRES_DB=event_db + command: + - "postgres" + - "-N" + - "500" + + xgon-mock-l1-network: + container_name: xgon-mock-l1-network + image: okexchain/xgon-geth:e2e_v0.1.0_20231030 + ports: + - 8545:8545 + - 8546:8546 + command: + - "--http" + - "--http.api" + - "admin,eth,debug,miner,net,txpool,personal,web3" + - "--http.addr" + - "0.0.0.0" + - "--http.corsdomain" + - "*" + - "--http.vhosts" + - "*" + - "--ws" + - "--ws.origins" + - "*" + - "--ws.addr" + - "0.0.0.0" + - "--dev" + - "--dev.period" + - "1" + - "--datadir" + - "/geth_data" + - "--syncmode" + - "full" + - "--rpc.allow-unprotected-txs" + + xgon-prover: + container_name: xgon-prover + image: hermeznetwork/zkevm-prover:v2.2.0 + ports: + # - 50051:50051 # Prover + - 50052:50052 # Mock prover + - 50061:50061 # MT + - 50071:50071 # Executor + volumes: + - ./test/config/prover/test.prover.config.json:/usr/src/app/config.json + command: > + zkProver -c /usr/src/app/config.json + + xgon-approve: + container_name: xgon-approve + image: okexchain/xgon-node:e2e_v0.1.0_20231030 + environment: + - ZKEVM_NODE_STATEDB_HOST=xgon-state-db + volumes: + - ./test/test.keystore.sequencer:/pk/keystore + - ./test/config/node/test.node.config.toml:/app/config.toml + - ./test/config/node/test.genesis.config.json:/app/genesis.json + command: + - "/bin/sh" + - "-c" + - "/app/xgon-node approve --network custom --custom-network-file /app/genesis.json --key-store-path /pk/keystore --pw testonly --am 115792089237316195423570985008687907853269984665640564039457584007913129639935 -y --cfg /app/config.toml" + + xgon-data-availability: + container_name: xgon-data-availability + image: okexchain/xgon-data-availability:e2e_v0.1.0_20231030 + ports: + - 8444:8444 + volumes: + - ./test/config/node/test.da.toml:/app/config.toml + - ./test/test.keystore.da:/pk/test-member.keystore + command: + - "/bin/sh" + - "-c" + - "/app/xgon-data-availability run --cfg /app/config.toml" + + xgon-data-availability-db: + container_name: xgon-data-availability-db + image: postgres + ports: + - 5438:5432 + environment: + - POSTGRES_USER=committee_user + - POSTGRES_PASSWORD=committee_password + - POSTGRES_DB=committee_db + command: + - "postgres" + - "-N" + - "500" xgon-bridge-db: container_name: xgon-bridge-db @@ -114,48 +324,6 @@ services: KAFKA_ZOOKEEPER_CONNECT: kafka-zookeeper:2181 KAFKA_CREATE_TOPICS: "explorer_chainAddressPrice_push:1:1" - xgon-node: - container_name: xgon-node - image: zjg555543/xgon-dac-node:v0.1.0 - ports: - - 8123:8123 - - 61090:61090 - environment: - - ZKEVM_NODE_STATEDB_HOST=xgon-state-db - - ZKEVM_NODE_POOL_HOST=xgon-pool-db - - ZKEVM_NODE_RPC_DB_HOST=xgon-rpc-db - - ZKEVM_NODE_ETHERMAN_PRIVATEKEYPATH=/pk/keystore - volumes: - - ./test/test.keystore.sequencer:/pk/keystore.sequencer - - ./test/test.keystore.aggregator:/pk/keystore.aggregator - - ./test/config/node/test.node.config.toml:/app/config.toml - - ./test/config/node/test.genesis.config.json:/app/genesis.json - command: - - "/bin/sh" - - "-c" - - "/app/xgon-node approve --network custom --custom-network-file /app/genesis.json --am 115792089237316195423570985008687907853269984665640564039457584007913129639935 -y --cfg /app/config.toml --key-store-path /pk/keystore.sequencer --password testonly && - /app/xgon-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components \"synchronizer,rpc,sequencer,sequence-sender,aggregator,eth-tx-manager,l2gaspricer\"" - - xgon-mock-l1-network: - container_name: xgon-local-l1-network - image: zjg555543/geth:v0.1.0_202310251853 - ports: - - 8545:8545 - - 8546:8546 - - xgon-prover: - container_name: xgon-prover - image: hermeznetwork/zkevm-prover:v2.2.0 - ports: - - 50051:50051 # Prover - - 50052:50052 # MockProver - - 50061:50061 # MT - - 50071:50071 # Executor - volumes: - - ./test/config/prover/test.prover.config.json:/usr/src/app/config.json - command: > - zkProver -c /usr/src/app/config.json - xgon-bridge-service: container_name: xgon-bridge-service image: xgon-bridge-service @@ -188,29 +356,4 @@ services: - "-c" - "/app/xgon-bridge runKafkaConsumer --cfg /app/config.toml" - xgon-data-availability: - container_name: xgon-data-availability - image: zjg555543/xgon-dac:v0.1.0 - ports: - - 8444:8444 - volumes: - - ./test/config/node/test.da.toml:/app/config.toml - - ./test/config/node/test-member.keystore:/pk/test-member.keystore - command: - - "/bin/sh" - - "-c" - - "/app/xgon-data-availability run --cfg /app/config.toml" - - xgon-data-availability-db: - container_name: xgon-data-availability-db - image: postgres - ports: - - 5437:5432 - environment: - - POSTGRES_USER=committee_user - - POSTGRES_PASSWORD=committee_password - - POSTGRES_DB=committee_db - command: - - "postgres" - - "-N" - - "500" + \ No newline at end of file diff --git a/test/config/node/test.node.config.toml b/test/config/node/test.node.config.toml index 0d49e75f..6e7a58ef 100644 --- a/test/config/node/test.node.config.toml +++ b/test/config/node/test.node.config.toml @@ -54,7 +54,7 @@ EnableL2SuggestedGasPricePolling = true [Synchronizer] SyncInterval = "1s" SyncChunkSize = 100 -TrustedSequencerURL = "" # If it is empty or not specified, then the value is read from the smc. +TrustedSequencerURL = "http://xgon-json-rpc:8123" # If it is empty or not specified, then the value is read from the smc. [Sequencer] WaitPeriodPoolIsEmpty = "1s" @@ -102,7 +102,7 @@ MaxTxSizeForL1 = 131072 MaxBatchesForL1 = 10 SenderAddress = "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266" L2Coinbase = "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266" -PrivateKey = {Path = "/pk/keystore.sequencer", Password = "testonly"} +PrivateKey = {Path = "/pk/sequencer.keystore", Password = "testonly"} UseValidium = true [Aggregator] @@ -120,8 +120,8 @@ GeneratingProofCleanupThreshold = "10m" [EthTxManager] ForcedGas = 0 PrivateKeys = [ - {Path = "/pk/keystore.sequencer", Password = "testonly"}, - {Path = "/pk/keystore.aggregator", Password = "testonly"} + {Path = "/pk/sequencer.keystore", Password = "testonly"}, + {Path = "/pk/aggregator.keystore", Password = "testonly"} ] [L2GasPriceSuggester] diff --git a/test/config/prover/initproverdb.sql b/test/config/prover/init_prover_db.sql similarity index 100% rename from test/config/prover/initproverdb.sql rename to test/config/prover/init_prover_db.sql diff --git a/test/e2e/bridge_test.go b/test/e2e/bridge_test.go index d230f445..687dcd3f 100644 --- a/test/e2e/bridge_test.go +++ b/test/e2e/bridge_test.go @@ -74,7 +74,7 @@ func TestE2E(t *testing.T) { // Send L1 deposit var destNetwork uint32 = 1 amount := new(big.Int).SetUint64(10000000000000000000) - okbAddr := common.HexToAddress("0xcFE6D77a653b988203BfAc9C6a69eA9D583bdC2b") // This means is okb + okbAddr := common.HexToAddress("0x82109a709138A2953C720D3d775168717b668ba6") // This means is okb destAddr := common.HexToAddress("0xc949254d682d8c9ad5682521675b8f43b102aec4") err = opsman.ApproveERC20OKB(ctx, okbAddr, amount) @@ -102,18 +102,19 @@ func TestE2E(t *testing.T) { balance, err := opsman.CheckAccountBalance(ctx, operations.L2, &destAddr) require.NoError(t, err) log.Infof("balance:%v", balance.String()) - //initL2Balance := big.NewInt(0) - //require.Equal(t, 0, balance.Cmp(initL2Balance)) + initL2Balance := big.NewInt(0) + require.Equal(t, 0, balance.Cmp(initL2Balance)) t.Log("Deposit: ", deposits[0]) // Check the claim tx err = opsman.CheckL2Claim(ctx, uint(deposits[0].DestNet), uint(deposits[0].DepositCnt)) require.NoError(t, err) // Check L2 funds to see if the amount has been increased + log.Infof("destAddr:%v", destAddr.String()) balance2, err := opsman.CheckAccountBalance(ctx, operations.L2, &destAddr) - result2 := new(big.Int) - result2.Sub(balance2, balance) + log.Infof("balance:%v, balance2:%v, amount:%v", balance.String(), balance2.String(), amount.String()) require.NoError(t, err) - require.Equal(t, amount, result2) + require.NotEqual(t, balance, balance2) + require.Equal(t, amount, balance2) // Check globalExitRoot globalExitRoot3, err := opsman.GetCurrentGlobalExitRootFromSmc(ctx) @@ -124,7 +125,7 @@ func TestE2E(t *testing.T) { l2Balance, err := opsman.CheckAccountBalance(ctx, operations.L2, &l2BridgeAddr) require.NoError(t, err) t.Logf("L2 Bridge Balance: %v", l2Balance) - err = opsman.SendL2Deposit(ctx, okbAddr, amount, destNetwork, &destAddr) + err = opsman.SendL2Deposit(ctx, common.Address{}, amount, destNetwork, &destAddr) require.NoError(t, err) l2Balance, err = opsman.CheckAccountBalance(ctx, operations.L2, &l2BridgeAddr) require.NoError(t, err) diff --git a/test/e2e/edge_test.go b/test/e2e/edge_test.go index d3e96b61..541cce5c 100644 --- a/test/e2e/edge_test.go +++ b/test/e2e/edge_test.go @@ -19,7 +19,7 @@ import ( func depositFromL1(ctx context.Context, opsman *operations.Manager, t *testing.T) { amount := new(big.Int).SetUint64(250000000000000000) - okbAddr := common.HexToAddress("0xcFE6D77a653b988203BfAc9C6a69eA9D583bdC2b") // This means is okb + okbAddr := common.HexToAddress("0x82109a709138A2953C720D3d775168717b668ba6") // This means is okb destAddr := common.HexToAddress("0xc949254d682d8c9ad5682521675b8f43b102aec4") var destNetwork uint32 = 1 // L1 Deposit diff --git a/test/config/node/test-member.keystore b/test/test.keystore.da similarity index 100% rename from test/config/node/test-member.keystore rename to test/test.keystore.da