diff --git a/.env.bitcoin b/.env.bitcoin index e1f51c0c58..62247cd663 100644 --- a/.env.bitcoin +++ b/.env.bitcoin @@ -8,12 +8,8 @@ BITCOIN_BRIDGE_GAS_LIMIT=23333 BITCOIN_DESTINATION=tb1qfhhxljfajcppfhwa09uxwty5dz4xwfptnqmvtv BITCOIN_ENABLE_COMMITTER=false BITCOIN_ENABLE_INDEXER=false -BITCOIN_EVM_CONTRACT_ADDRESS=0x3c950C4D15311dB39F85441316983b3845396C6e BITCOIN_EVM_DEPOSIT=0x01bee1bfa4116bd0440a1108ef6cb6a2f6eb9b611d8f53260aec20d39e84ee89 BITCOIN_EVM_ENABLE_LISTENER=false -BITCOIN_EVM_RPC_HOST=http://127.0.0.1 -BITCOIN_EVM_RPC_PORT=8123 -BITCOIN_EVM_START_HEIGHT=0 BITCOIN_EVM_WITHDRAW=0xda335c6ae73006d1145bdcf9a98bc76d789b653b13fe6200e6fc4c5dd54add86 BITCOIN_INDEXER_LISTEN_ADDRESS=tb1qgm39cu009lyvq93afx47pp4h9wxq5x92lxxgnz BITCOIN_NETWORK_NAME=testnet diff --git a/bitcoin/config_test.go b/bitcoin/config_test.go index af7c2ed7bf..84eb601c13 100644 --- a/bitcoin/config_test.go +++ b/bitcoin/config_test.go @@ -72,10 +72,6 @@ func TestConfigEnv(t *testing.T) { os.Setenv("BITCOIN_BRIDGE_AA_SCA_REGISTRY", "0xB457BF68D71a17Fa5030269Fb895e29e6cD2DF23") os.Setenv("BITCOIN_BRIDGE_AA_KERNEL_FACTORY", "0xB457BF68D71a17Fa5030269Fb895e29e6cD2DF24") os.Setenv("BITCOIN_EVM_ENABLE_LISTENER", "false") - os.Setenv("BITCOIN_EVM_RPC_HOST", "http://127.0.0.1") - os.Setenv("BITCOIN_EVM_RPC_PORT", "8123") - os.Setenv("BITCOIN_EVM_CONTRACT_ADDRESS", "0x3c950C4D15311dB39F85441316983b3845396C6d") - os.Setenv("BITCOIN_EVM_START_HEIGHT", "0") os.Setenv("BITCOIN_EVM_DEPOSIT", "0x01bee1bfa4116bd0440a1108ef6cb6a2f6eb9b611d8f53260aec20d39e84ee88") os.Setenv("BITCOIN_EVM_WITHDRAW", "0xda335c6ae73006d1145bdcf9a98bc76d789b653b13fe6200e6fc4c5dd54add85") diff --git a/bitcoin/testdata/abi.json b/bitcoin/testdata/abi.json index cc822de7b1..dcda47bba9 100644 --- a/bitcoin/testdata/abi.json +++ b/bitcoin/testdata/abi.json @@ -1,35 +1,4 @@ [ - { - "inputs": [], - "name": "AccessControlBadConfirmation", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "account", - "type": "address" - }, - { - "internalType": "bytes32", - "name": "neededRole", - "type": "bytes32" - } - ], - "name": "AccessControlUnauthorizedAccount", - "type": "error" - }, - { - "inputs": [], - "name": "InvalidInitialization", - "type": "error" - }, - { - "inputs": [], - "name": "NotInitializing", - "type": "error" - }, { "anonymous": false, "inputs": [ @@ -60,9 +29,9 @@ "inputs": [ { "indexed": false, - "internalType": "uint64", + "internalType": "uint8", "name": "version", - "type": "uint64" + "type": "uint8" } ], "name": "Initialized", @@ -212,6 +181,29 @@ "stateMutability": "nonpayable", "type": "function" }, + { + "inputs": [ + { + "internalType": "bytes32", + "name": "deposit_uuid", + "type": "bytes32" + }, + { + "internalType": "address", + "name": "b2_to_address", + "type": "address" + }, + { + "internalType": "uint256", + "name": "btc_amount", + "type": "uint256" + } + ], + "name": "depositV2", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, { "inputs": [ { @@ -289,7 +281,7 @@ }, { "internalType": "address", - "name": "callerConfirmation", + "name": "account", "type": "address" } ], @@ -335,6 +327,19 @@ "stateMutability": "view", "type": "function" }, + { + "inputs": [], + "name": "version", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "pure", + "type": "function" + }, { "inputs": [ { @@ -348,6 +353,24 @@ "stateMutability": "payable", "type": "function" }, + { + "inputs": [ + { + "internalType": "bytes32", + "name": "withdraw_uuid", + "type": "bytes32" + }, + { + "internalType": "string", + "name": "btc_address", + "type": "string" + } + ], + "name": "withdrawV2", + "outputs": [], + "stateMutability": "payable", + "type": "function" + }, { "stateMutability": "payable", "type": "receive"