upgrade bitcoinjs

3 files changed, 51 insertions, 4 deletions

diff --git a/package.json b/package.json
index a804428b..6aca424b 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "bcrypt": "^5.0.0",
     "bip32": "^2.0.5",
     "bip39": "^3.0.2",
-    "bitcoinjs-lib": "^5.1.8",
+    "bitcoinjs-lib": "6",
     "body-parser": "^1.19.0",
     "bolt11": "^1.3.2",
     "buffer-reverse": "^1.0.1",
@@ -25,6 +25,7 @@
     "cookie-parser": "^1.4.4",
     "cors": "^2.8.5",
     "date-fns": "^2.21.3",
+    "ecpair": "^2.0.1",
     "express": "4.17.1",
     "express-async-handler": "^1.1.4",
     "express-pino-logger": "^6.0.0",
@@ -54,6 +55,7 @@
     "query-string": "^6.13.1",
     "sequelize": "^5.21.3",
     "sqlite3": "^5.0.2",
+    "tiny-secp256k1": "^2.1.2",
     "uuid": "8",
     "web-push": "^3.4.4",
     "wretch": "^1.7.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7b276f1f..8604f946 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -7,7 +7,7 @@ specifiers:
   bcrypt: ^5.0.0
   bip32: ^2.0.5
   bip39: ^3.0.2
-  bitcoinjs-lib: ^5.1.8
+  bitcoinjs-lib: '6'
   body-parser: ^1.19.0
   bolt11: ^1.3.2
   buffer-reverse: ^1.0.1
@@ -17,6 +17,7 @@ specifiers:
   cookie-parser: ^1.4.4
   cors: ^2.8.5
   date-fns: ^2.21.3
+  ecpair: ^2.0.1
   express: 4.17.1
   express-async-handler: ^1.1.4
   express-pino-logger: ^6.0.0
@@ -47,6 +48,7 @@ specifiers:
   query-string: ^6.13.1
   sequelize: ^5.21.3
   sqlite3: ^5.0.2
+  tiny-secp256k1: ^2.1.2
   uuid: '8'
   web-push: ^3.4.4
   wretch: ^1.7.4
@@ -60,7 +62,7 @@ dependencies:
   bcrypt: 5.0.1
   bip32: 2.0.6
   bip39: 3.0.4
-  bitcoinjs-lib: 5.2.0
+  bitcoinjs-lib: 6.0.1
   body-parser: 1.19.0
   bolt11: 1.3.2
   buffer-reverse: 1.0.1
@@ -70,6 +72,7 @@ dependencies:
   cookie-parser: 1.4.5
   cors: 2.8.5
   date-fns: 2.25.0
+  ecpair: 2.0.1
   express: 4.17.1
   express-async-handler: 1.1.4
   express-pino-logger: 6.0.0
@@ -99,6 +102,7 @@ dependencies:
   query-string: 6.14.1
   sequelize: 5.22.4
   sqlite3: 5.0.2
+  tiny-secp256k1: 2.1.2
   uuid: 8.3.2
   web-push: 3.4.5
   wretch: 1.7.6
@@ -924,6 +928,19 @@ packages:
       wif: 2.0.6
     dev: false
 
+  /bitcoinjs-lib/6.0.1:
+    resolution: {integrity: sha512-x/7D4jDj/MMkmO6t3p2CSDXTqpwZ/jRsRiJDmaiXabrR9XRo7jwby8HRn7EyK1h24rKFFI7vI0ay4czl6bDOZQ==}
+    engines: {node: '>=8.0.0'}
+    dependencies:
+      bech32: 2.0.0
+      bip174: 2.0.1
+      bs58check: 2.1.2
+      create-hash: 1.2.0
+      typeforce: 1.18.0
+      varuint-bitcoin: 1.1.2
+      wif: 2.0.6
+    dev: false
+
   /blech32/1.0.1:
     resolution: {integrity: sha512-1/vr1wwB8jvfVCkLQMVXLaIyx7Lgxh/6IqVuQlSsCNzWNzU+64oXzOQ/9BRnN4GANjx9i0O3OSQonDlL4FraSA==}
     engines: {node: '>=10'}
@@ -1631,6 +1648,15 @@ packages:
       safe-buffer: 5.2.1
     dev: false
 
+  /ecpair/2.0.1:
+    resolution: {integrity: sha512-iT3wztQMeE/nDTlfnAg8dAFUfBS7Tq2BXzq3ae6L+pWgFU0fQ3l0woTzdTBrJV3OxBjxbzjq8EQhAbEmJNWFSw==}
+    engines: {node: '>=8.0.0'}
+    dependencies:
+      randombytes: 2.1.0
+      typeforce: 1.18.0
+      wif: 2.0.6
+    dev: false
+
   /ecurve/1.0.6:
     resolution: {integrity: sha512-/BzEjNfiSuB7jIWKcS/z8FK9jNjmEWvUV2YZ4RLSmcDtP7Lq0m6FvDuSnJpBlDpGRpfRQeTLGLBI8H+kEv0r+w==}
     dependencies:
@@ -4547,6 +4573,13 @@ packages:
       nan: 2.15.0
     dev: false
 
+  /tiny-secp256k1/2.1.2:
+    resolution: {integrity: sha512-8qPw7zDK6Hco2tVGYGQeOmOPp/hZnREwy2iIkcq0ygAuqc9WHo29vKN94lNymh1QbB3nthtAMF6KTIrdbsIotA==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      uint8array-tools: 0.0.6
+    dev: false
+
   /to-readable-stream/1.0.0:
     resolution: {integrity: sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==}
     engines: {node: '>=6'}
@@ -4663,6 +4696,11 @@ packages:
       random-bytes: 1.0.0
     dev: false
 
+  /uint8array-tools/0.0.6:
+    resolution: {integrity: sha512-aIvEHNRX1AlOYAr6qSUjQBn4mCduxx6MtC967aRDTb2UUBPj0Ix2ZFQDcmXUUO/UxRPHcw1f5a5nVbCSKDSOqA==}
+    engines: {node: '>=14.0.0'}
+    dev: false
+
   /undefsafe/2.0.3:
     resolution: {integrity: sha512-nrXZwwXrD/T/JXeygJqdCO6NZZ1L66HrxM/Z7mIq2oPanoN0F1nLx3lwJMu6AwJY69hdixaFQOuoYsMjE5/C2A==}
     dependencies:
diff --git a/routes/liquid/taxi.js b/routes/liquid/taxi.js
index c18ea72f..13429eb8 100644
--- a/routes/liquid/taxi.js
+++ b/routes/liquid/taxi.js
@@ -1,19 +1,26 @@
 const {
   address: Address,
-  ECPair,
   Psbt,
   payments,
   networks
 } = require("liquidjs-lib");
+
+const { ECPairFactory} = require('ecpair');
+const tinysecp = require('tiny-secp256k1');
+
 const wretch = require("wretch");
 const fetch = require("node-fetch");
+
 wretch().polyfills({ fetch });
+
 const url = prod
   ? "https://blockstream.info/liquid/api"
   : "http://electrs-liquid:3002";
+
 const electrs = wretch().url(url);
 const network = prod ? networks.liquid : networks.regtest;
 
+const ECPair = ECPairFactory(tinysecp);
 const key = ECPair.fromPrivateKey(Buffer.from(config.taxi, "hex"));
 
 module.exports = ah(async (req, res) => {