Skip to content

Commit 05da226

Browse files
Merge pull request #7 from BitGo/BTC-2650.bump-miniscript-crate
feat: bump miniscript crate to 12.3.4
2 parents 3f3646e + f57bda5 commit 05da226

File tree

5 files changed

+10
-13
lines changed

5 files changed

+10
-13
lines changed

packages/wasm-utxo/Cargo.lock

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

packages/wasm-utxo/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
99
[dependencies]
1010
wasm-bindgen = "0.2"
1111
js-sys = "0.3"
12-
miniscript = { git = "https://github.com/BitGo/rust-miniscript", branch = "opdrop" }
12+
miniscript = { git = "https://github.com/BitGo/rust-miniscript", tag = "miniscript-12.3.4-opdrop" }
1313

1414
[dev-dependencies]
1515
base64 = "0.22.1"
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"descriptor": "pkh([deadbeef/1/2'/3/4']03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)#v0p5w8jl",
2+
"descriptor": "pkh(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)#wf36a0pg",
33
"wasmNode": {
44
"Pkh": {
5-
"Single": "[deadbeef/1/2'/3/4']03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd"
5+
"Single": "03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd"
66
}
77
},
88
"ast": {
9-
"pkh": "[deadbeef/1/2'/3/4']03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd"
9+
"pkh": "03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd"
1010
}
1111
}

packages/wasm-utxo/test/opdrop.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ function getDescriptorOpDropP2ms(locktime: number, keys: utxolib.BIP32Interface[
1313
}
1414

1515
describe("CLV with OP_DROP", function () {
16-
// OP_DROP enabled in this branch
17-
// return;
18-
1916
const locktime = 1024;
2017
const descriptor = Descriptor.fromString(
2118
getDescriptorOpDropP2ms(locktime, rootWalletKeys.triple),

packages/wasm-utxo/test/test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@ describe("Descriptor fixtures", function () {
9999
it("should parse (pkType derivable)", async function () {
100100
const descriptor = Descriptor.fromString(fixture.descriptor, "derivable");
101101

102-
assert.doesNotThrow(() =>
103-
Descriptor.fromString(fixture.descriptor, "derivable").atDerivationIndex(0),
104-
);
105-
106102
if (isDerivable(i)) {
103+
assert.doesNotThrow(() =>
104+
Descriptor.fromString(fixture.descriptor, "derivable").atDerivationIndex(0),
105+
);
106+
107107
if (descriptor.descType() !== "Tr") {
108108
assert.doesNotThrow(() => descriptor.atDerivationIndex(0).encode());
109109
}

0 commit comments

Comments
 (0)