@caravan/psbt 1.9.2 → 1.9.3

package/README.md

@@ -253,22 +253,6 @@ Then copy the resulting built code (ends up in the lib directory) into the vendo
 we just use the asmjs build to avoid wasm complications in
 the build system.
 
-### Experimental VM Modules
-This is related to the tiny-secp256k1 library which has difficulties importing in different environments.
-
-Note that the jest configs and the special prefix in the npm test scripts were needed
-to let jest understand the esmodule imports from the tiny-secp256k1 library.
-
-The npm script prefix in particular may result in a console warning when running tests:
-
-```
-ExperimentalWarning: VM Modules is an experimental feature and might change at any time
-```
-
-This can be safely ignored. See the [documentation in jest](https://jestjs.io/docs/ecmascript-modules)
-for more information on running with `--experimental-vm-modules`.
-
-
 ### What's with the `bitcoinjs-lib-v6` dependency?
 
 npm workspaces and maybe vite have issues with nested dependencies with

package/dist/index.d.ts

@@ -99,9 +99,7 @@ declare class PsbtV2 extends PsbtV2Maps {
     get PSBT_GLOBAL_FALLBACK_LOCKTIME(): number | null;
     set PSBT_GLOBAL_FALLBACK_LOCKTIME(locktime: number | null);
     get PSBT_GLOBAL_INPUT_COUNT(): number;
-    set PSBT_GLOBAL_INPUT_COUNT(count: number);
     get PSBT_GLOBAL_OUTPUT_COUNT(): number;
-    set PSBT_GLOBAL_OUTPUT_COUNT(count: number);
     get PSBT_GLOBAL_TX_MODIFIABLE(): PsbtGlobalTxModifiableBits[];
     set PSBT_GLOBAL_TX_MODIFIABLE(modifiable: PsbtGlobalTxModifiableBits[]);
     get PSBT_GLOBAL_VERSION(): number;
@@ -402,6 +400,14 @@ declare class PsbtV2 extends PsbtV2Maps {
      * this PSBTv2. Accepts optional desired format as a string (default base64).
      */
     toV0(format?: "base64" | "hex"): string;
+    /**
+     * Updates the PSBT_GLOBAL_INPUT_COUNT field in the global map.
+     */
+    private updateGlobalInputCount;
+    /**
+     * Updates the PSBT_GLOBAL_OUTPUT_COUNT field in the global map.
+     */
+    private updateGlobalOutputCount;
 }
 
 interface PsbtInput {

package/dist/index.js

@@ -426,11 +426,6 @@ var PsbtV2 = class _PsbtV2 extends PsbtV2Maps {
     }
     return val.readUInt8(0);
   }
-  set PSBT_GLOBAL_INPUT_COUNT(count) {
-    const bw = new import_bufio3.BufferWriter();
-    bw.writeU8(count);
-    this.globalMap.set("04" /* PSBT_GLOBAL_INPUT_COUNT */, bw.render());
-  }
   get PSBT_GLOBAL_OUTPUT_COUNT() {
     const val = this.globalMap.get("05" /* PSBT_GLOBAL_OUTPUT_COUNT */);
     if (val === void 0) {
@@ -438,11 +433,6 @@ var PsbtV2 = class _PsbtV2 extends PsbtV2Maps {
     }
     return val.readUInt8(0);
   }
-  set PSBT_GLOBAL_OUTPUT_COUNT(count) {
-    const bw = new import_bufio3.BufferWriter();
-    bw.writeU8(count);
-    this.globalMap.set("05" /* PSBT_GLOBAL_OUTPUT_COUNT */, bw.render());
-  }
   get PSBT_GLOBAL_TX_MODIFIABLE() {
     const val = this.globalMap.get("06" /* PSBT_GLOBAL_TX_MODIFIABLE */)?.readUInt8(0) || 0;
     const modifiable = [];
@@ -874,8 +864,8 @@ var PsbtV2 = class _PsbtV2 extends PsbtV2Maps {
   create() {
     this.PSBT_GLOBAL_VERSION = 2;
     this.PSBT_GLOBAL_TX_VERSION = 2;
-    this.PSBT_GLOBAL_INPUT_COUNT = 0;
-    this.PSBT_GLOBAL_OUTPUT_COUNT = 0;
+    this.updateGlobalInputCount();
+    this.updateGlobalOutputCount();
     this.PSBT_GLOBAL_FALLBACK_LOCKTIME = 0;
     this.PSBT_GLOBAL_TX_MODIFIABLE = [
       "INPUTS" /* INPUTS */,
@@ -1102,7 +1092,8 @@ var PsbtV2 = class _PsbtV2 extends PsbtV2Maps {
       bw.writeU32(sighashType);
       map.set("03" /* PSBT_IN_SIGHASH_TYPE */, bw.render());
     }
-    this.PSBT_GLOBAL_INPUT_COUNT = this.inputMaps.push(map);
+    this.inputMaps.push(map);
+    this.updateGlobalInputCount();
   }
   addOutput({
     amount,
@@ -1146,7 +1137,7 @@ var PsbtV2 = class _PsbtV2 extends PsbtV2Maps {
       }
     }
     this.outputMaps.push(map);
-    this.PSBT_GLOBAL_OUTPUT_COUNT = this.outputMaps.length;
+    this.updateGlobalOutputCount();
   }
   /**
    * Updater/Signer Methods
@@ -1167,7 +1158,7 @@ var PsbtV2 = class _PsbtV2 extends PsbtV2Maps {
     }
     const newInputs = this.inputMaps.filter((_4, i6) => i6 !== index);
     this.inputMaps = newInputs;
-    this.PSBT_GLOBAL_INPUT_COUNT = this.inputMaps.length;
+    this.updateGlobalInputCount();
   }
   /**
    * Removes an output-map from outputMaps.
@@ -1188,7 +1179,7 @@ var PsbtV2 = class _PsbtV2 extends PsbtV2Maps {
       this.removePartialSig(index);
     }
     this.outputMaps = newOutputs;
-    this.PSBT_GLOBAL_OUTPUT_COUNT = this.outputMaps.length;
+    this.updateGlobalOutputCount();
   }
   /**
    * Checks that all provided flags are present in PSBT_GLOBAL_TX_MODIFIABLE.
@@ -1442,6 +1433,22 @@ var PsbtV2 = class _PsbtV2 extends PsbtV2Maps {
     converterMap.convertToV0();
     return converterMap.serialize(format2);
   }
+  /**
+   * Updates the PSBT_GLOBAL_INPUT_COUNT field in the global map.
+   */
+  updateGlobalInputCount() {
+    const bw = new import_bufio3.BufferWriter();
+    bw.writeU8(this.inputMaps.length);
+    this.globalMap.set("04" /* PSBT_GLOBAL_INPUT_COUNT */, bw.render());
+  }
+  /**
+   * Updates the PSBT_GLOBAL_OUTPUT_COUNT field in the global map.
+   */
+  updateGlobalOutputCount() {
+    const bw = new import_bufio3.BufferWriter();
+    bw.writeU8(this.outputMaps.length);
+    this.globalMap.set("05" /* PSBT_GLOBAL_OUTPUT_COUNT */, bw.render());
+  }
 };
 
 // src/psbtv0/psbt.ts

package/dist/index.mjs

@@ -385,11 +385,6 @@ var PsbtV2 = class _PsbtV2 extends PsbtV2Maps {
     }
     return val.readUInt8(0);
   }
-  set PSBT_GLOBAL_INPUT_COUNT(count) {
-    const bw = new BufferWriter3();
-    bw.writeU8(count);
-    this.globalMap.set("04" /* PSBT_GLOBAL_INPUT_COUNT */, bw.render());
-  }
   get PSBT_GLOBAL_OUTPUT_COUNT() {
     const val = this.globalMap.get("05" /* PSBT_GLOBAL_OUTPUT_COUNT */);
     if (val === void 0) {
@@ -397,11 +392,6 @@ var PsbtV2 = class _PsbtV2 extends PsbtV2Maps {
     }
     return val.readUInt8(0);
   }
-  set PSBT_GLOBAL_OUTPUT_COUNT(count) {
-    const bw = new BufferWriter3();
-    bw.writeU8(count);
-    this.globalMap.set("05" /* PSBT_GLOBAL_OUTPUT_COUNT */, bw.render());
-  }
   get PSBT_GLOBAL_TX_MODIFIABLE() {
     const val = this.globalMap.get("06" /* PSBT_GLOBAL_TX_MODIFIABLE */)?.readUInt8(0) || 0;
     const modifiable = [];
@@ -833,8 +823,8 @@ var PsbtV2 = class _PsbtV2 extends PsbtV2Maps {
   create() {
     this.PSBT_GLOBAL_VERSION = 2;
     this.PSBT_GLOBAL_TX_VERSION = 2;
-    this.PSBT_GLOBAL_INPUT_COUNT = 0;
-    this.PSBT_GLOBAL_OUTPUT_COUNT = 0;
+    this.updateGlobalInputCount();
+    this.updateGlobalOutputCount();
     this.PSBT_GLOBAL_FALLBACK_LOCKTIME = 0;
     this.PSBT_GLOBAL_TX_MODIFIABLE = [
       "INPUTS" /* INPUTS */,
@@ -1061,7 +1051,8 @@ var PsbtV2 = class _PsbtV2 extends PsbtV2Maps {
       bw.writeU32(sighashType);
       map.set("03" /* PSBT_IN_SIGHASH_TYPE */, bw.render());
     }
-    this.PSBT_GLOBAL_INPUT_COUNT = this.inputMaps.push(map);
+    this.inputMaps.push(map);
+    this.updateGlobalInputCount();
   }
   addOutput({
     amount,
@@ -1105,7 +1096,7 @@ var PsbtV2 = class _PsbtV2 extends PsbtV2Maps {
       }
     }
     this.outputMaps.push(map);
-    this.PSBT_GLOBAL_OUTPUT_COUNT = this.outputMaps.length;
+    this.updateGlobalOutputCount();
   }
   /**
    * Updater/Signer Methods
@@ -1126,7 +1117,7 @@ var PsbtV2 = class _PsbtV2 extends PsbtV2Maps {
     }
     const newInputs = this.inputMaps.filter((_4, i6) => i6 !== index);
     this.inputMaps = newInputs;
-    this.PSBT_GLOBAL_INPUT_COUNT = this.inputMaps.length;
+    this.updateGlobalInputCount();
   }
   /**
    * Removes an output-map from outputMaps.
@@ -1147,7 +1138,7 @@ var PsbtV2 = class _PsbtV2 extends PsbtV2Maps {
       this.removePartialSig(index);
     }
     this.outputMaps = newOutputs;
-    this.PSBT_GLOBAL_OUTPUT_COUNT = this.outputMaps.length;
+    this.updateGlobalOutputCount();
   }
   /**
    * Checks that all provided flags are present in PSBT_GLOBAL_TX_MODIFIABLE.
@@ -1401,6 +1392,22 @@ var PsbtV2 = class _PsbtV2 extends PsbtV2Maps {
     converterMap.convertToV0();
     return converterMap.serialize(format2);
   }
+  /**
+   * Updates the PSBT_GLOBAL_INPUT_COUNT field in the global map.
+   */
+  updateGlobalInputCount() {
+    const bw = new BufferWriter3();
+    bw.writeU8(this.inputMaps.length);
+    this.globalMap.set("04" /* PSBT_GLOBAL_INPUT_COUNT */, bw.render());
+  }
+  /**
+   * Updates the PSBT_GLOBAL_OUTPUT_COUNT field in the global map.
+   */
+  updateGlobalOutputCount() {
+    const bw = new BufferWriter3();
+    bw.writeU8(this.outputMaps.length);
+    this.globalMap.set("05" /* PSBT_GLOBAL_OUTPUT_COUNT */, bw.render());
+  }
 };
 
 // src/psbtv0/psbt.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caravan/psbt",
-  "version": "1.9.2",
+  "version": "1.9.3",
   "description": "typescript library for working with PSBTs",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -12,9 +12,9 @@
   ],
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
       "import": "./dist/index.mjs",
-      "require": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "require": "./dist/index.js"
     }
   },
   "engines": {
@@ -28,11 +28,12 @@
   "scripts": {
     "build": "tsup src/index.ts --format cjs,esm --dts",
     "dev": "npm run build -- --watch",
-    "test": "NODE_OPTIONS=--experimental-vm-modules npx jest src",
-    "lint": "eslint src",
+    "test": "vitest run",
+    "test:watch": "vitest watch",
+    "lint": "eslint src/",
+    "lint:fix": "eslint --fix src/",
     "ci": "npm run lint && npm run test",
-    "test:watch": "npm run test -- --watch",
-    "test:debug": "node --inspect-brk ../../node_modules/.bin/jest --runInBand"
+    "test:debug": "node --inspect-brk ../../node_modules/.bin/vitest run"
   },
   "keywords": [
     "bitcoin",
@@ -55,16 +56,9 @@
     "@caravan/eslint-config": "*",
     "@caravan/multisig": "*",
     "@caravan/typescript-config": "*",
-    "@inrupt/jest-jsdom-polyfills": "^3.2.1",
-    "@jest/globals": "^29.7.0",
-    "@types/jest": "^29.5.12",
     "eslint-plugin-prettier": "^5.1.3",
-    "jest": "^29.4.1",
-    "jsdom": "24.0.0",
-    "jsdom-global": "3.0.2",
     "lodash": "^4.17.21",
     "react-silence": "^1.0.4",
-    "ts-jest": "^29.1.2",
     "ts-node": "^10.9.2",
     "tsup": "^7.2.0",
     "typescript": "^5.2.2"