chore: update dependencies (#79)

.github/workflows/CI.yml

@@ -7,7 +7,7 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-latest]
-        node-version: [14, 16]
+        node-version: [16, 18]
 
     runs-on: ${{ matrix.platform }}
 

hardhat.config.ts

@@ -41,12 +41,12 @@ const config: HardhatUserConfig = {
 
 if (mnemonics && infuraKey) {
   config.networks = {
-    rinkeby: {
+    goerli: {
       accounts: {
         count: 1,
         mnemonic: mnemonics.testnet,
       },
-      url: `https://rinkeby.infura.io/v3/${infuraKey}`,
+      url: `https://goerli.infura.io/v3/${infuraKey}`,
     },
     mainnet: {
       accounts: {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "boltz-core",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Core library of Boltz",
   "main": "dist/lib/Boltz.js",
   "scripts": {
@@ -40,43 +40,44 @@
   ],
   "dependencies": {
     "@boltz/bitcoin-ops": "^2.0.0",
-    "bip32": "^3.0.1",
+    "bip32": "^3.1.0",
     "bip65": "^1.0.3",
     "bip66": "^1.1.5",
-    "bitcoinjs-lib": "^6.0.0",
-    "bn.js": "^5.2.0",
-    "ecpair": "^1.0.1",
+    "bitcoinjs-lib": "^6.1.0",
+    "bn.js": "^5.2.1",
+    "ecpair": "^2.1.0",
     "varuint-bitcoin": "^1.1.2"
   },
   "devDependencies": {
-    "@nomiclabs/hardhat-ethers": "^2.0.2",
-    "@nomiclabs/hardhat-etherscan": "^2.1.7",
-    "@nomiclabs/hardhat-waffle": "^2.0.1",
-    "@openzeppelin/contracts": "^4.3.3",
-    "@typechain/ethers-v5": "8.0.3",
-    "@types/chai": "^4.2.22",
-    "@types/jest": "^27.0.3",
-    "@types/mocha": "^9.0.0",
-    "@types/node": "^16.11.9",
-    "@types/ws": "^8.2.0",
-    "@typescript-eslint/eslint-plugin": "^5.4.0",
-    "@typescript-eslint/parser": "^5.4.0",
-    "chai": "^4.3.4",
-    "conventional-changelog-cli": "^2.1.1",
-    "cross-os": "^1.4.0",
-    "eslint": "^8.3.0",
-    "eslint-plugin-import": "^2.25.3",
-    "eslint-plugin-jest": "^25.2.4",
+    "@nomiclabs/hardhat-ethers": "^2.2.2",
+    "@nomiclabs/hardhat-etherscan": "^3.1.5",
+    "@nomiclabs/hardhat-waffle": "^2.0.3",
+    "@openzeppelin/contracts": "^4.8.1",
+    "@typechain/ethers-v5": "10.2.0",
+    "@types/chai": "^4.3.4",
+    "@types/jest": "^29.4.0",
+    "@types/mocha": "^10.0.1",
+    "@types/node": "^18.11.18",
+    "@types/ws": "^8.5.4",
+    "@typescript-eslint/eslint-plugin": "^5.49.0",
+    "@typescript-eslint/parser": "^5.49.0",
+    "chai": "^4.3.7",
+    "conventional-changelog-cli": "^2.2.2",
+    "cross-os": "^1.5.0",
+    "eslint": "^8.33.0",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-jest": "^27.2.1",
     "eslint-plugin-node": "^11.1.0",
     "ethereum-waffle": "^3.4.0",
-    "ethers": "^5.5.1",
-    "hardhat": "^2.6.8",
-    "hardhat-gas-reporter": "^1.0.4",
-    "jest": "^27.3.1",
-    "ts-jest": "^27.0.7",
-    "ts-node": "^10.4.0",
-    "typechain": "^6.0.3",
-    "typescript": "^4.5.2",
-    "ws": "^8.2.3"
+    "ethers": "^5.7.2",
+    "hardhat": "^2.12.6",
+    "hardhat-gas-reporter": "^1.0.9",
+    "jest": "^29.4.1",
+    "tiny-secp256k1": "^2.2.1",
+    "ts-jest": "^29.0.5",
+    "ts-node": "^10.9.1",
+    "typechain": "^8.1.1",
+    "typescript": "^4.9.4",
+    "ws": "^8.12.0"
   }
 }

startRegtest.sh

@@ -4,7 +4,7 @@ container_name='boltz-bitcoin'
 config_argument='--conf=/config/bitcoin.conf'
 
 echo "Creating container"
-docker run -v `pwd`/docker:/config -d --name $container_name -p 18443:18443 boltz/bitcoin-core:22.0 $config_argument
+docker run -v `pwd`/docker:/config -d --name $container_name -p 18443:18443 boltz/bitcoin-core:24.0.1 $config_argument
 
 sleep 1
 

test-lib/integration/Utils.ts

@@ -1,5 +1,6 @@
-import { ECPair, ECPairInterface } from 'ecpair';
+import { ECPairInterface } from 'ecpair';
 import { crypto, address, Transaction } from 'bitcoinjs-lib';
+import { ECPair } from '../unit/swap/Utils';
 import ChainClient from './utils/ChainClient';
 import { ClaimDetails, RefundDetails } from '../../lib/consts/Types';
 import { p2wpkhOutput, p2shOutput, p2wshOutput, p2shP2wshOutput } from '../../lib/swap/Scripts';

test-lib/integration/reverseswapscript/ReverseSwapScript.spec.ts

@@ -1,5 +1,5 @@
-import { ECPair } from 'ecpair';
 import { crypto } from 'bitcoinjs-lib';
+import { ECPair } from '../../unit/swap/Utils';
 import { getHexBuffer } from '../../../lib/Utils';
 import { p2wshOutput } from '../../../lib/swap/Scripts';
 import { ClaimDetails, RefundDetails } from '../../../lib/consts/Types';

test-lib/integration/swapscript/SwapScript.spec.ts

@@ -1,5 +1,5 @@
-import { ECPair } from 'ecpair';
 import { crypto } from 'bitcoinjs-lib';
+import { ECPair } from '../../unit/swap/Utils';
 import { getHexBuffer } from '../../../lib/Utils';
 import { Networks, swapScript } from '../../../lib/Boltz';
 import { bitcoinClient, createSwapDetails } from '../Utils';

test-lib/unit/swap/PreimageDetector.spec.ts

@@ -1,9 +1,8 @@
-import { ECPair } from 'ecpair';
 import { Transaction, crypto } from 'bitcoinjs-lib';
-import { getScriptHashFunction } from './Utils';
 import { getHexBuffer } from '../../../lib/Utils';
 import swapScript from '../../../lib/swap/SwapScript';
 import { OutputType } from '../../../lib/consts/Enums';
+import { ECPair, getScriptHashFunction } from './Utils';
 import { p2wpkhOutput } from '../../../lib/swap/Scripts';
 import { detectPreimage } from '../../../lib/swap/PreimageDetector';
 import { constructClaimTransaction } from '../../../lib/swap/Claim';

test-lib/unit/swap/SwapDetector.spec.ts

@@ -1,7 +1,6 @@
-import { ECPair } from 'ecpair';
 import { Transaction, crypto } from 'bitcoinjs-lib';
-import { getScriptHashFunction } from './Utils';
 import swapScript from '../../../lib/swap/SwapScript';
+import { ECPair, getScriptHashFunction } from './Utils';
 import { detectSwap } from '../../../lib/swap/SwapDetector';
 
 describe('SwapDetector', () => {

test-lib/unit/swap/SwapUtils.spec.ts

@@ -1,6 +1,6 @@
-import { ECPair } from 'ecpair';
 import ops from '@boltz/bitcoin-ops';
 import { Transaction, crypto, script } from 'bitcoinjs-lib';
+import { ECPair } from './Utils';
 import Networks from '../../../lib/consts/Networks';
 import * as scripts from '../../../lib/swap/Scripts';
 import { OutputType } from '../../../lib/consts/Enums';

test-lib/unit/swap/Utils.ts

@@ -1,7 +1,11 @@
+import * as ecc from 'tiny-secp256k1';
+import { ECPairFactory } from 'ecpair';
 import Errors from '../../../lib/consts/Errors';
 import { OutputType } from '../../../lib/consts/Enums';
 import { p2wshOutput, p2shOutput, p2shP2wshOutput } from '../../../lib/swap/Scripts';
 
+export const ECPair = ECPairFactory(ecc);
+
 export const getScriptHashFunction = (type: OutputType): (scriptHex: Buffer) => Buffer => {
   switch (type) {
     case OutputType.Bech32: return p2wshOutput;