Merge branch 'master' into cashv5

Author: junderw

CHANGELOG.md

@@ -1,3 +1,10 @@
+# 5.2.0
+__changed__
+- Updated PSBT to allow for witnessUtxo and nonWitnessUtxo simultaneously (Re: segwit psbt bug) (#1563)
+
+__added__
+- PSBT methods `getInputType`, `inputHasPubkey`, `inputHasHDKey`, `outputHasPubkey`, `outputHasHDKey` (#1563)
+
 # 5.1.10
 __fixed__
 - Fixed psbt.signInputAsync (and consequentially all Async signing methods) not handling rejection of keypair.sign properly (#1582)

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "bitcoinforksjs-lib",
-  "version": "5.1.10",
+  "version": "5.2.0",
   "description": "Client-side Bitcoin JavaScript library",
   "main": "./src/index.js",
   "types": "./types/index.d.ts",
@@ -51,7 +51,7 @@
   "dependencies": {
     "bech32": "^1.1.2",
     "big-integer": "^1.6.44",
-    "bip174": "^1.0.1",
+    "bip174": "^2.0.1",
     "bip32": "^2.0.4",
     "bip66": "^1.1.0",
     "bitcoin-ops": "^1.4.0",

package.json

@@ -42,9 +42,9 @@ function reverseBuffer(buffer) {
 }
 exports.reverseBuffer = reverseBuffer;
 function cloneBuffer(buffer) {
-  const clone = Buffer.alloc(buffer.length);
+  const clone = Buffer.allocUnsafe(buffer.length);
   buffer.copy(clone);
-  return buffer;
+  return clone;
 }
 exports.cloneBuffer = cloneBuffer;
 /**