diff --git a/.gitignore b/.gitignore index 55a7e57d..d99ffd2a 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ Cargo.lock **/*.profraw /coverage/ /integration_coverage/ +.idea diff --git a/docker-compose.yml b/docker-compose.yml index a4301603..349c7d3f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.4" services: ### BITCOIND bitcoind: - image: ruimarinho/bitcoin-core:0.20.0 + image: polarlightning/bitcoind:27.0 container_name: bitcoin-node command: | -conf=/config/default.conf diff --git a/sample/Readme.md b/sample/Readme.md index fdf6dd0d..ee27f61f 100644 --- a/sample/Readme.md +++ b/sample/Readme.md @@ -8,7 +8,7 @@ Example configurations and contract input are available in the [examples](./exam In order to use the [example contract](./examples/contracts/numerical_contract_input.json) you will need to update the `event_id`. Replace the part after `btcusd` with a UNIX timestamp in the future. -Use the [helper script](../scripts/gen-sample-offer.sh) to create update the example contract 1 hour in the future. This replaces the `event_id` after `btcusd` with a UNIX timestamp 1 hour in the futre. Manually update the value for a longer time period. +Use the [helper script](../scripts/gen-sample-offer.sh) to create the example contract 1 hour in the future. This creates an `event_id` with a UNIX timestamp 1 hour in the future. Manually update the value for a longer time period. ## Quick run diff --git a/scripts/create_wallets.sh b/scripts/create_wallets.sh index fe26368a..850a3c65 100755 --- a/scripts/create_wallets.sh +++ b/scripts/create_wallets.sh @@ -1,10 +1,10 @@ #!/bin/bash bitcoincli=$(command -v bitcoin-cli) -opts=( -rpcuser="testuser" -rpcpassword="lq6zequb-gYTdF2_ZEUtr8ywTXzLYtknzWU4nV8uVoo=" -regtest ) +opts=( -rpcuser="testuser" -rpcpassword="lq6zequb-gYTdF2_ZEUtr8ywTXzLYtknzWU4nV8uVoo=" -regtest -named) -$bitcoincli "${opts[@]}" createwallet "alice" "false" "false" -$bitcoincli "${opts[@]}" createwallet "bob" "false" "false" +$bitcoincli "${opts[@]}" createwallet wallet_name="alice" descriptors="false" +$bitcoincli "${opts[@]}" createwallet wallet_name="bob" descriptors="false" aliceAddress=$($bitcoincli "${opts[@]}" -rpcwallet=alice getnewaddress bec32) $bitcoincli "${opts[@]}" generatetoaddress 101 ${aliceAddress} &> /dev/null diff --git a/testconfig/config/default.conf b/testconfig/config/default.conf index 715492a5..489259b1 100644 --- a/testconfig/config/default.conf +++ b/testconfig/config/default.conf @@ -1,3 +1,5 @@ +deprecatedrpc=create_bdb + [regtest] rpcallowip=0.0.0.0/0 rpcbind=0.0.0.0