Skip to content

Commit db20c25

Browse files
daniel-wong-dfinity-orgbasvandijk
daniel-wong-dfinity-org
authored and
basvandijk
committed
fix(build): Use latest bitcoin-canister release as of 2024-03-27.
1 parent 0b55c1f commit db20c25

File tree

10 files changed

+44
-36
lines changed

10 files changed

+44
-36
lines changed

‎Cargo.Bazel.Fuzzing.json.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"checksum": "3017dd144f9a6795953d484297ee5c6ca015a40842dacd88bd687f79a43cd903",
2+
"checksum": "ebe5c17a33386f0932b5ce0643619b7e5969df62a20f2fde878eaeca593c7526",
33
"crates": {
44
"abnf 0.12.0": {
55
"name": "abnf",
@@ -14744,7 +14744,7 @@
1474414744
"target": "ic_agent"
1474514745
},
1474614746
{
14747-
"id": "ic-btc-interface 0.1.0",
14747+
"id": "ic-btc-interface 0.2.0",
1474814748
"target": "ic_btc_interface"
1474914749
},
1475014750
{
@@ -23710,14 +23710,14 @@
2371023710
},
2371123711
"license": "Apache-2.0"
2371223712
},
23713-
"ic-btc-interface 0.1.0": {
23713+
"ic-btc-interface 0.2.0": {
2371423714
"name": "ic-btc-interface",
23715-
"version": "0.1.0",
23715+
"version": "0.2.0",
2371623716
"repository": {
2371723717
"Git": {
2371823718
"remote": "https://github.com/dfinity/bitcoin-canister",
2371923719
"commitish": {
23720-
"Rev": "9b239d1d67253eb14a35be6061e3967d5ec9db9d"
23720+
"Rev": "62a71e47c491fb842ccc257b1c675651501f4b82"
2372123721
},
2372223722
"strip_prefix": "interface"
2372323723
}
@@ -23756,7 +23756,7 @@
2375623756
"selects": {}
2375723757
},
2375823758
"edition": "2021",
23759-
"version": "0.1.0"
23759+
"version": "0.2.0"
2376023760
},
2376123761
"license": "Apache-2.0"
2376223762
},
@@ -23767,7 +23767,7 @@
2376723767
"Git": {
2376823768
"remote": "https://github.com/dfinity/bitcoin-canister",
2376923769
"commitish": {
23770-
"Rev": "26552e8e7d1b2e23d7195499bd6aed650b263ae7"
23770+
"Rev": "62a71e47c491fb842ccc257b1c675651501f4b82"
2377123771
},
2377223772
"strip_prefix": "test-utils"
2377323773
}
@@ -65011,7 +65011,7 @@
6501165011
"hyper-util 0.1.3",
6501265012
"hyperlocal-next 0.9.0",
6501365013
"ic-agent 0.34.0",
65014-
"ic-btc-interface 0.1.0",
65014+
"ic-btc-interface 0.2.0",
6501565015
"ic-btc-test-utils 0.1.0",
6501665016
"ic-btc-validation 0.1.0",
6501765017
"ic-canister-log 0.2.0",

‎Cargo.Bazel.Fuzzing.toml.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4723,8 +4723,8 @@ dependencies = [
47234723

47244724
[[package]]
47254725
name = "ic-btc-interface"
4726-
version = "0.1.0"
4727-
source = "git+https://github.com/dfinity/bitcoin-canister?rev=9b239d1d67253eb14a35be6061e3967d5ec9db9d#9b239d1d67253eb14a35be6061e3967d5ec9db9d"
4726+
version = "0.2.0"
4727+
source = "git+https://github.com/dfinity/bitcoin-canister?rev=62a71e47c491fb842ccc257b1c675651501f4b82#62a71e47c491fb842ccc257b1c675651501f4b82"
47284728
dependencies = [
47294729
"candid",
47304730
"serde",
@@ -4734,7 +4734,7 @@ dependencies = [
47344734
[[package]]
47354735
name = "ic-btc-test-utils"
47364736
version = "0.1.0"
4737-
source = "git+https://github.com/dfinity/bitcoin-canister?rev=26552e8e7d1b2e23d7195499bd6aed650b263ae7#26552e8e7d1b2e23d7195499bd6aed650b263ae7"
4737+
source = "git+https://github.com/dfinity/bitcoin-canister?rev=62a71e47c491fb842ccc257b1c675651501f4b82#62a71e47c491fb842ccc257b1c675651501f4b82"
47384738
dependencies = [
47394739
"bitcoin 0.28.2",
47404740
]

‎Cargo.Bazel.json.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"checksum": "aeb81f6227f64e2ae5a43956569daf11de1499a27fd10b186f6368bdaf6f3796",
2+
"checksum": "85f798123c6af55a77d3668b4e6bef53e98e1cb262d5ccc946791c51ac703995",
33
"crates": {
44
"abnf 0.12.0": {
55
"name": "abnf",
@@ -14620,7 +14620,7 @@
1462014620
"target": "ic_agent"
1462114621
},
1462214622
{
14623-
"id": "ic-btc-interface 0.1.0",
14623+
"id": "ic-btc-interface 0.2.0",
1462414624
"target": "ic_btc_interface"
1462514625
},
1462614626
{
@@ -23611,14 +23611,14 @@
2361123611
},
2361223612
"license": "Apache-2.0"
2361323613
},
23614-
"ic-btc-interface 0.1.0": {
23614+
"ic-btc-interface 0.2.0": {
2361523615
"name": "ic-btc-interface",
23616-
"version": "0.1.0",
23616+
"version": "0.2.0",
2361723617
"repository": {
2361823618
"Git": {
2361923619
"remote": "https://github.com/dfinity/bitcoin-canister",
2362023620
"commitish": {
23621-
"Rev": "9b239d1d67253eb14a35be6061e3967d5ec9db9d"
23621+
"Rev": "62a71e47c491fb842ccc257b1c675651501f4b82"
2362223622
},
2362323623
"strip_prefix": "interface"
2362423624
}
@@ -23657,7 +23657,7 @@
2365723657
"selects": {}
2365823658
},
2365923659
"edition": "2021",
23660-
"version": "0.1.0"
23660+
"version": "0.2.0"
2366123661
},
2366223662
"license": "Apache-2.0"
2366323663
},
@@ -23668,7 +23668,7 @@
2366823668
"Git": {
2366923669
"remote": "https://github.com/dfinity/bitcoin-canister",
2367023670
"commitish": {
23671-
"Rev": "26552e8e7d1b2e23d7195499bd6aed650b263ae7"
23671+
"Rev": "62a71e47c491fb842ccc257b1c675651501f4b82"
2367223672
},
2367323673
"strip_prefix": "test-utils"
2367423674
}
@@ -64938,7 +64938,7 @@
6493864938
"hyper-util 0.1.3",
6493964939
"hyperlocal-next 0.9.0",
6494064940
"ic-agent 0.34.0",
64941-
"ic-btc-interface 0.1.0",
64941+
"ic-btc-interface 0.2.0",
6494264942
"ic-btc-test-utils 0.1.0",
6494364943
"ic-btc-validation 0.1.0",
6494464944
"ic-canister-log 0.2.0",

‎Cargo.Bazel.toml.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4715,8 +4715,8 @@ dependencies = [
47154715

47164716
[[package]]
47174717
name = "ic-btc-interface"
4718-
version = "0.1.0"
4719-
source = "git+https://github.com/dfinity/bitcoin-canister?rev=9b239d1d67253eb14a35be6061e3967d5ec9db9d#9b239d1d67253eb14a35be6061e3967d5ec9db9d"
4718+
version = "0.2.0"
4719+
source = "git+https://github.com/dfinity/bitcoin-canister?rev=62a71e47c491fb842ccc257b1c675651501f4b82#62a71e47c491fb842ccc257b1c675651501f4b82"
47204720
dependencies = [
47214721
"candid",
47224722
"serde",
@@ -4726,7 +4726,7 @@ dependencies = [
47264726
[[package]]
47274727
name = "ic-btc-test-utils"
47284728
version = "0.1.0"
4729-
source = "git+https://github.com/dfinity/bitcoin-canister?rev=26552e8e7d1b2e23d7195499bd6aed650b263ae7#26552e8e7d1b2e23d7195499bd6aed650b263ae7"
4729+
source = "git+https://github.com/dfinity/bitcoin-canister?rev=62a71e47c491fb842ccc257b1c675651501f4b82#62a71e47c491fb842ccc257b1c675651501f4b82"
47304730
dependencies = [
47314731
"bitcoin 0.28.2",
47324732
]

‎Cargo.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,9 @@ ic-certification = "2.3.0"
469469
ic-cbor = "2.3.0"
470470
ic-stable-structures = "0.6.2"
471471
ic-utils = { version = "0.34.0", features = ["raw"] }
472-
ic-btc-interface = { git = "https://github.com/dfinity/bitcoin-canister", rev = "9b239d1d67253eb14a35be6061e3967d5ec9db9d" }
472+
ic-btc-interface = { git = "https://github.com/dfinity/bitcoin-canister", rev = "62a71e47c491fb842ccc257b1c675651501f4b82" }
473+
ic-btc-validation = { git = "https://github.com/dfinity/bitcoin-canister", rev = "0e996988693f2d55fc9533c44dc20ae5310a1894" }
474+
ic-btc-test-utils = { git = "https://github.com/dfinity/bitcoin-canister", rev = "62a71e47c491fb842ccc257b1c675651501f4b82" }
473475
indexmap = "2.1.0"
474476
itertools = "0.12.0"
475477
k256 = { version = "0.13.3", default_features = false, features = [

‎bazel/external_crates.bzl

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@ def sanitize_external_crates(sanitizers_enabled):
1717
"bincode": FUZZING_ANNOTATION,
1818
}
1919

20+
BITCOIN_CANISTER_REV = "62a71e47c491fb842ccc257b1c675651501f4b82" # tag = "release/2024-01-22"
21+
22+
ICRC_1_REV = "26a80d777e079644cd69e883e18dad1a201f5b1a"
23+
24+
BUILD_INFO_REV = "701a696844fba5c87df162fbbc1ccef96f27c9d7"
25+
2026
def external_crates_repository(name, cargo_lockfile, lockfile, sanitizers_enabled):
2127
CRATE_ANNOTATIONS = {
2228
"ic_bls12_381": [crate.annotation(
@@ -239,11 +245,11 @@ def external_crates_repository(name, cargo_lockfile, lockfile, sanitizers_enable
239245
),
240246
"build-info": crate.spec(
241247
git = "https://github.com/dfinity-lab/build-info",
242-
rev = "701a696844fba5c87df162fbbc1ccef96f27c9d7",
248+
rev = BUILD_INFO_REV,
243249
),
244250
"build-info-build": crate.spec(
245251
git = "https://github.com/dfinity-lab/build-info",
246-
rev = "701a696844fba5c87df162fbbc1ccef96f27c9d7",
252+
rev = BUILD_INFO_REV,
247253
default_features = False,
248254
),
249255
"by_address": crate.spec(
@@ -534,11 +540,11 @@ def external_crates_repository(name, cargo_lockfile, lockfile, sanitizers_enable
534540
),
535541
"icrc1-test-env": crate.spec(
536542
git = "https://github.com/dfinity/ICRC-1",
537-
rev = "26a80d777e079644cd69e883e18dad1a201f5b1a",
543+
rev = ICRC_1_REV,
538544
),
539545
"icrc1-test-suite": crate.spec(
540546
git = "https://github.com/dfinity/ICRC-1",
541-
rev = "26a80d777e079644cd69e883e18dad1a201f5b1a",
547+
rev = ICRC_1_REV,
542548
),
543549
"ic-agent": crate.spec(
544550
version = "^0.34.0",
@@ -550,15 +556,15 @@ def external_crates_repository(name, cargo_lockfile, lockfile, sanitizers_enable
550556
),
551557
"ic-btc-interface": crate.spec(
552558
git = "https://github.com/dfinity/bitcoin-canister",
553-
rev = "9b239d1d67253eb14a35be6061e3967d5ec9db9d",
559+
rev = BITCOIN_CANISTER_REV,
554560
),
555561
"ic-btc-validation": crate.spec(
556562
git = "https://github.com/dfinity/bitcoin-canister",
557-
rev = "0e996988693f2d55fc9533c44dc20ae5310a1894",
563+
rev = "0e996988693f2d55fc9533c44dc20ae5310a1894", # TODO: replace with BITCOIN_CANISTER_REV once the replica supports it.
558564
),
559565
"ic-btc-test-utils": crate.spec(
560566
git = "https://github.com/dfinity/bitcoin-canister",
561-
rev = "26552e8e7d1b2e23d7195499bd6aed650b263ae7",
567+
rev = BITCOIN_CANISTER_REV,
562568
),
563569
"ic-canister-log": crate.spec(
564570
version = "^0.2.0",

‎rs/bitcoin/adapter/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ http = "0.2"
1616
ic-adapter-metrics-server = { path = "../../monitoring/adapter_metrics_server" }
1717
ic-async-utils = { path = "../../async_utils" }
1818
ic-btc-service = { path = "../service" }
19-
ic-btc-validation = { git = "https://github.com/dfinity/bitcoin-canister", rev = "0e996988693f2d55fc9533c44dc20ae5310a1894" }
19+
ic-btc-validation = { workspace = true }
2020
ic-config = { path = "../../config" }
2121
ic-logger = { path = "../../monitoring/logger" }
2222
ic-metrics = { path = "../../monitoring/metrics" }

‎rs/execution_environment/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ assert_matches = { workspace = true }
6262
canister-test = { path = "../rust_canisters/canister_test" }
6363
criterion = { version = "0.5", features = ["html_reports"] }
6464
execution-environment-bench = { path = "benches/lib" }
65-
ic-btc-test-utils = { git = "https://github.com/dfinity/bitcoin-canister", rev = "b1693619e3d4dbc00d8c79e9b6886e1db48b21f7" }
65+
ic-btc-test-utils = { workspace = true }
6666
ic-interfaces-state-manager-mocks = { path = "../interfaces/state_manager/mocks" }
6767
ic-state-machine-tests = { path = "../state_machine_tests" }
6868
ic-test-utilities = { path = "../test_utilities" }

‎rs/replicated_state/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ uuid = { version = "1.2.1", features = ["v4", "serde"] }
5050
assert_matches = { workspace = true }
5151
criterion = "0.5"
5252
criterion-time = { path = "../criterion_time" }
53-
ic-btc-test-utils = { git = "https://github.com/dfinity/bitcoin-canister", rev = "b1693619e3d4dbc00d8c79e9b6886e1db48b21f7" }
53+
ic-btc-test-utils = { workspace = true }
5454
ic-crypto-ed25519 = { path = "../crypto/ed25519" }
5555
ic-test-utilities-io = { path = "../test_utilities/io" }
5656
ic-test-utilities-metrics = { path = "../test_utilities/metrics" }

0 commit comments

Comments
 (0)