Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

deps: upgrade bitcoin, bitcoincore-rpc-json, jsonrpc_client, and testcontainers #25

Merged
merged 2 commits into from
Sep 11, 2022
Merged

deps: upgrade bitcoin, bitcoincore-rpc-json, jsonrpc_client, and testcontainers #25

merged 2 commits into from
Sep 11, 2022

Conversation

delta1
Copy link
Contributor

@delta1 delta1 commented Aug 19, 2022

Hey!

I'm working on a bunch of dependency upgrades xmr-btc-swap, which includes comit-network/xmr-btc-swap#1107

BDK 0.21 uses Bitcoin 0.28, so following the yak shave landed me here :)

  • bitcoin 0.28
  • bitcoincore-rpc-json 0.15
  • jsonrpc_client 0.7
  • testcontainers 0.14

delta1 added a commit to delta1/xmr-btc-swap that referenced this pull request Aug 27, 2022
@delta1
build(deps): upgrade bdk, ecdsa_fun, sigma_fun, bitcoin-harness
8e9b6eb 
- bdk to 0.21.0 comit-network#1107
- ecdsa_fun to f8250a2 comit-network#1112
- sigma_fun to f8250a2 comit-network#1113
- bitcoin-harness upgrade was required, waiting for merge at coblox/bitcoin-harness-rs#25
@delta1 delta1 mentioned this pull request Aug 27, 2022
Merged
delta1 added a commit to delta1/xmr-btc-swap that referenced this pull request Aug 27, 2022
@delta1
build(deps): upgrade bdk, ecdsa_fun, sigma_fun, bitcoin-harness
4e325d8 
- bdk to 0.21.0 comit-network#1107
- ecdsa_fun to f8250a2 comit-network#1112
- sigma_fun to f8250a2 comit-network#1113
- bitcoin-harness upgrade was required, waiting for merge at coblox/bitcoin-harness-rs#25
delta1 added a commit to delta1/xmr-btc-swap that referenced this pull request Sep 6, 2022
@delta1
build(deps): upgrade bdk, ecdsa_fun, sigma_fun, bitcoin-harness
67fd705 
- bdk to 0.21.0 comit-network#1107
- ecdsa_fun to a44969a comit-network#1121
- sigma_fun to a44969a comit-network#1120
- bitcoin-harness upgrade was required, waiting for merge at coblox/bitcoin-harness-rs#25
delta1 added a commit to delta1/xmr-btc-swap that referenced this pull request Sep 6, 2022
@delta1
build(deps): upgrade bdk, ecdsa_fun, sigma_fun, bitcoin-harness
f978179 
- bdk to 0.21.0 comit-network#1107
- ecdsa_fun to a44969a comit-network#1121
- sigma_fun to a44969a comit-network#1120
- bitcoin-harness upgrade was required, waiting for merge at coblox/bitcoin-harness-rs#25
delta1 added a commit to delta1/xmr-btc-swap that referenced this pull request Sep 8, 2022
@delta1
build(deps): upgrade bdk, ecdsa_fun, sigma_fun, bitcoin-harness
a0d8c15 
- bdk to 0.22.0 comit-network#1107
- ecdsa_fun to a44969a comit-network#1121
- sigma_fun to a44969a comit-network#1120
- bitcoin-harness upgrade was required, waiting for merge at coblox/bitcoin-harness-rs#25

Revert "ci: specify previous dprint version until fixed"
This reverts commit 11eb173.
delta1 added a commit to delta1/xmr-btc-swap that referenced this pull request Sep 9, 2022
@delta1
build(deps): upgrade bdk, ecdsa_fun, sigma_fun, sha2, bitcoin-harness…
0467a56 
…, serde

- bdk to 0.22.0 comit-network#1126
- ecdsa_fun to 7c3d592 comit-network#1124
- sigma_fun to 7c3d592 comit-network#1125
- sha2 to 0.10.2 comit-network#948
- serde to 1.0.144 comit-network#1115
- bitcoin-harness upgrade was required, waiting for merge at coblox/bitcoin-harness-rs#25

Revert "ci: specify previous dprint version until fixed"
This reverts commit 11eb173.
da-kami
da-kami approved these changes Sep 9, 2022
View reviewed changes
Copy link
Contributor

@da-kami da-kami left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

nit: Would have made review easier to see the cleanup / refactoring changes in separate commits

bors bot added a commit to comit-network/xmr-btc-swap that referenced this pull request Sep 9, 2022
@bors @delta1
Merge #1116
08fd314 
1116: build(deps): upgrade bdk, ecdsa_fun, sigma_fun, bitcoin-harness, sha2, serde r=delta1 a=delta1

upgrades the following dependencies 

- bdk to 0.22.0 #1126  
- ecdsa_fun to 7c3d592 #1124
- sigma_fun to 7c3d592 #1125
- sha2 to 0.10.2 #948
- serde to 1.0.144 #1115
- bitcoin-harness upgrade was required, waiting for merge at coblox/bitcoin-harness-rs#25
- revert 11eb173 "ci: specify previous dprint version until fixed"
   

Co-authored-by: Byron Hambly <bhambly@blockstream.com>
@delta1
Copy link
Contributor Author

delta1 commented Sep 9, 2022

Thanks @da-kami - just spotted the fmt failure so I'll run cargo fmt and split out the cleanup you referred to

@delta1
build(deps): upgrade bitcoin, bitcoincore-rpc-json, jsonrpc_client, t…
e2af69d 
…estcontainers

- bitcoin 0.28
- bitcoincore-rpc-json 0.15
- jsonrpc_client 0.7
- testcontainers 0.14
@da-kami
Copy link
Contributor

da-kami commented Sep 9, 2022

Seems some tests are still failing and it looks like this is related to the changes. Did you run the tests locally?

@delta1
Copy link
Contributor Author

delta1 commented Sep 9, 2022

Seems some tests are still failing and it looks like this is related to the changes. Did you run the tests locally?

I did run them locally, will check again

@delta1
Copy link
Contributor Author

delta1 commented Sep 9, 2022

Fixed the new clippy warn, ran tests locally

running 6 tests
test bitcoind_rpc::test::get_median_time ... ok
test bitcoind_rpc::test::get_network_info ... ok
test wallet::test::get_wallet_transaction ... ok
test wallet::test::two_party_psbt_test ... ok
test bitcoind_rpc::test::blockcount ... ok
test wallet::test::transaction_block_height ... ok

test result: ok. 6 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 6.11s

   Doc-tests bitcoin-harness

running 2 tests
test src/lib.rs - (line 23) ... ok
test src/lib.rs - (line 39) ... ok

test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 7.09s

@delta1
Copy link
Contributor Author

delta1 commented Sep 9, 2022

@da-kami CI run passed on my fork here https://github.com/delta1/bitcoin-harness-rs/actions/runs/3021589770

@bonomat bonomat merged commit bff9a64 into coblox:master Sep 11, 2022
@delta1
Copy link
Contributor Author

delta1 commented Sep 12, 2022

Thanks @bonomat - any plan for a new release to crates.io ?

@delta1 delta1 mentioned this pull request Sep 12, 2022
Closed
bors bot added a commit to comit-network/xmr-btc-swap that referenced this pull request Sep 12, 2022
@bors @delta1
Merge #1116
fdb83ad 
1116: build(deps): upgrade bdk, ecdsa_fun, sigma_fun, bitcoin-harness, sha2, serde r=delta1 a=delta1

upgrades the following dependencies 

- bdk to 0.22.0 #1126  
- ecdsa_fun to 7c3d592 #1127
- sigma_fun to 7c3d592 #1128
- sha2 to 0.10.2 #948
- serde to 1.0.144 #1115
- bitcoin-harness was upgraded coblox/bitcoin-harness-rs#25
- revert 11eb173 "ci: specify previous dprint version until fixed"
   

Co-authored-by: Byron Hambly <bhambly@blockstream.com>
@bonomat
Copy link
Member

bonomat commented Sep 19, 2022

Thanks @bonomat - any plan for a new release to crates.io ?

Sorry for the delay. It's released now.

@delta1
Copy link
Contributor Author

delta1 commented Sep 19, 2022

No worries! Cheers

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@da-kami da-kami da-kami approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@delta1 @da-kami @bonomat