From b0c86ea576f2cdc71520fbec53da5e261813d9c5 Mon Sep 17 00:00:00 2001 From: Alex Gartner Date: Fri, 13 Dec 2024 09:42:07 -0800 Subject: [PATCH] chore: use bitcoin core wallet script --- cmd/zetae2e/config/local.yml | 4 ++-- cmd/zetae2e/config/localnet.yml | 4 ++-- contrib/localnet/docker-compose.yml | 18 ++++++++---------- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/cmd/zetae2e/config/local.yml b/cmd/zetae2e/config/local.yml index e2cc047757..5c1e4fc674 100644 --- a/cmd/zetae2e/config/local.yml +++ b/cmd/zetae2e/config/local.yml @@ -95,8 +95,8 @@ rpcs: evm: "http://localhost:8545" bitcoin: host: "localhost:18443" - user: "smoketest" - pass: "123" + user: "admin" + pass: "admin" http_post_mode: true disable_tls: true params: regnet diff --git a/cmd/zetae2e/config/localnet.yml b/cmd/zetae2e/config/localnet.yml index 111f1ad7df..c8a1bf9e00 100644 --- a/cmd/zetae2e/config/localnet.yml +++ b/cmd/zetae2e/config/localnet.yml @@ -93,8 +93,8 @@ rpcs: evm: "http://eth:8545" bitcoin: host: "bitcoin:18443" - user: "smoketest" - pass: "123" + user: "admin" + pass: "admin" http_post_mode: true disable_tls: true params: regnet diff --git a/contrib/localnet/docker-compose.yml b/contrib/localnet/docker-compose.yml index 2494cc0247..5fc237473e 100644 --- a/contrib/localnet/docker-compose.yml +++ b/contrib/localnet/docker-compose.yml @@ -198,7 +198,7 @@ services: ipv4_address: 172.20.0.102 bitcoin: - image: ghcr.io/zeta-chain/bitcoin-core-docker:28.0 + image: ghcr.io/zeta-chain/bitcoin-core-docker:a94b52f container_name: bitcoin hostname: bitcoin networks: @@ -206,15 +206,13 @@ services: ipv4_address: 172.20.0.101 ports: - "18443:18443" - command: - -printtoconsole - -regtest=1 - -rpcallowip=0.0.0.0/0 - -rpcbind=0.0.0.0 - -rpcauth=smoketest:63acf9b8dccecce914d85ff8c044b78b$$5892f9bbc84f4364e79f0970039f88bdd823f168d4acc76099ab97b14a766a99 - -txindex=1 - -deprecatedrpc=create_bdb - -deprecatedrpc=warnings + command: /opt/wallet.sh + environment: + - CHAIN=regtest + - RPC_USER=smoketest + - RPC_PASSWORD=123 + - ADMIN_RPC_USER=admin + - ADMIN_RPC_PASSWORD=admin solana: image: solana-local:latest