feat: merge master into beta

Reduce distance between both branches

Issue: BTC-1829

Author: OttoAllmendinger

packages/wasm-miniscript/test/opdrop.ts

@@ -12,7 +12,10 @@ function getDescriptorOpDropP2ms(locktime: number, keys: utxolib.BIP32Interface[
   return `wsh(and_v(r:after(${locktime}),multi(2,${xpubs.join(",")})))`;
 }
 
-describe("CLV with OP_DROP", () => {
+describe("CLV with OP_DROP", function () {
+  // OP_DROP enabled in this branch
+  // return;
+
   const locktime = 1024;
   const descriptor = Descriptor.fromString(
     getDescriptorOpDropP2ms(locktime, rootWalletKeys.triple),

packages/wasm-miniscript/test/test.ts

@@ -50,15 +50,33 @@ function assertKnownDescriptorType(descriptor: Descriptor) {
   }
 }
 
+function assertIsErrorUnknownWrapper(error: unknown, wrapper: string) {
+  assert.ok(error instanceof Error);
+  assert.ok(error.message.includes(`Error: unknown wrapper «${wrapper}»`));
+}
+
 describe("Descriptor fixtures", function () {
   fixtures.valid.forEach((fixture, i) => {
     describe("fixture " + i, function () {
+      const isOpDropFixture = i === 59;
       let descriptor: Descriptor;
 
       before("setup descriptor", function () {
-        descriptor = Descriptor.fromString(fixture.descriptor, "derivable");
+        try {
+          descriptor = Descriptor.fromString(fixture.descriptor, "derivable");
+        } catch (e) {
+          if (isOpDropFixture) {
+            assertIsErrorUnknownWrapper(e, "r:");
+            return;
+          }
+          throw e;
+        }
       });
 
+      if (isOpDropFixture) {
+        // return;
+      }
+
       it("should round-trip (pkType string)", function () {
         let descriptorString = Descriptor.fromString(fixture.descriptor, "string").toString();
         if (fixture.checksumRequired === false) {