@atomicfinance/bitcoin-dlc-provider 2.5.0 → 3.0.1

package/lib/BitcoinDlcProvider.ts

@@ -1,11 +1,12 @@
-import { chainHashFromNetwork } from '@atomicfinance/bitcoin-networks';
 import Provider from '@atomicfinance/provider';
 import {
   AdaptorPair,
+  Address,
   AddSignaturesToRefundTxRequest,
   AddSignaturesToRefundTxResponse,
   AddSignatureToFundTransactionRequest,
   AddSignatureToFundTransactionResponse,
+  bitcoin,
   CalculateEcSignatureRequest,
   CreateCetAdaptorSignatureRequest,
   CreateCetAdaptorSignatureResponse,
@@ -44,9 +45,7 @@ import {
   VerifyRefundTxSignatureResponse,
   VerifySignatureRequest,
 } from '@atomicfinance/types';
-import { BitcoinNetwork } from '@liquality/bitcoin-networks';
-import { Address, bitcoin } from '@liquality/types';
-import { sleep } from '@liquality/utils';
+import { sleep } from '@atomicfinance/utils';
 import {
   DualClosingTxFinalizer,
   DualFundingTxFinalizer,
@@ -92,6 +91,7 @@ import { StreamReader } from '@node-lightning/bufio';
 import { hash160, sha256, xor } from '@node-lightning/crypto';
 import assert from 'assert';
 import BigNumber from 'bignumber.js';
+import { BitcoinNetwork, chainHashFromNetwork } from 'bitcoin-networks';
 import {
   address,
   ECPairInterface,
@@ -647,9 +647,9 @@ export default class BitcoinDlcProvider
       network,
     );
 
-    const {
-      derivationPath,
-    } = await this.client.financewallet.quickFindAddress([fundingAddress]);
+    const { derivationPath } = await this.client.wallet.findAddress([
+      fundingAddress,
+    ]);
 
     const fundPrivateKeyPair = await this.getMethod('keyPair')(derivationPath);
     const fundPrivateKey = Buffer.from(fundPrivateKeyPair.__D).toString('hex');
@@ -1025,11 +1025,14 @@ export default class BitcoinDlcProvider
       polynomialPayoutCurvePiece,
     );
 
+    const payouts = polynomialPayoutCurvePiece.points.map((point) =>
+      Number(point.outcomePayout),
+    );
+    const minPayout = Math.min(...payouts);
+    const maxPayout = Math.max(...payouts);
+
     const clampBN = (val: BigNumber) =>
-      BigNumber.max(
-        0,
-        BigNumber.min(val, dlcOffer.contractInfo.totalCollateral.toString()),
-      );
+      BigNumber.max(minPayout, BigNumber.min(val, maxPayout));
 
     const payout = clampBN(polynomialCurve.getPayout(outcome));
 
@@ -1737,11 +1740,11 @@ Payout Group not found',
       network,
     );
 
-    let walletAddress: Address = await this.client.financewallet.quickFindAddress(
-      [offerFundingAddress],
-    );
+    let walletAddress: Address = await this.client.wallet.findAddress([
+      offerFundingAddress,
+    ]);
     if (walletAddress) return true;
-    walletAddress = await this.client.financewallet.quickFindAddress([
+    walletAddress = await this.client.wallet.findAddress([
       acceptFundingAddress,
     ]);
     if (walletAddress) return false;
@@ -2950,9 +2953,9 @@ Payout Group not found',
     let derivationPath: string;
 
     if (findDerivationPath) {
-      const inputAddress: Address = await this.client.financewallet.quickFindAddress(
-        [_address],
-      );
+      const inputAddress: Address = await this.client.wallet.findAddress([
+        _address,
+      ]);
       if (inputAddress) {
         derivationPath = inputAddress.derivationPath;
       }
@@ -2992,6 +2995,7 @@ Payout Group not found',
         );
       }
     }
+
     const tx = Tx.decode(StreamReader.fromHex(txRaw));
 
     fundingInput.prevTx = tx;

package/package.json

@@ -1,34 +1,32 @@
 {
   "name": "@atomicfinance/bitcoin-dlc-provider",
   "umdName": "BitcoinDlcProvider",
-  "version": "2.5.0",
-  "description": "CAL Finance Bitcoin Dlc Provider",
+  "version": "3.0.1",
+  "description": "Bitcoin Abstraction Layer Dlc Provider",
   "author": "Atomic Finance <info@atomic.finance>",
   "homepage": "",
   "license": "ISC",
   "main": "dist/index.js",
   "scripts": {
-    "build": "../../node_modules/.bin/swc lib --out-dir=dist --config-file=../../.swcrc",
+    "build": "../../node_modules/.bin/tsc --project tsconfig.json",
     "prepublishOnly": "yarn run build",
     "test": "yarn run build",
     "lint": "../../node_modules/.bin/eslint --ignore-path ../../.eslintignore  -c ../../.eslintrc.js .",
     "lint:fix": "../../node_modules/.bin/eslint --fix --ignore-path ../../.eslintignore  -c ../../.eslintrc.js ."
   },
   "dependencies": {
-    "@atomicfinance/bitcoin-networks": "^2.5.0",
-    "@atomicfinance/provider": "^2.5.0",
-    "@atomicfinance/types": "^2.5.0",
-    "@liquality/bitcoin-utils": "1.1.5",
-    "@liquality/provider": "1.1.5",
-    "@liquality/types": "1.1.5",
-    "@liquality/utils": "1.1.5",
-    "@node-dlc/core": "0.18.3",
-    "@node-dlc/messaging": "0.18.3",
+    "@atomicfinance/bitcoin-utils": "3.0.1",
+    "@atomicfinance/provider": "^3.0.1",
+    "@atomicfinance/types": "^3.0.1",
+    "@atomicfinance/utils": "^3.0.1",
+    "@node-dlc/core": "0.19.1",
+    "@node-dlc/messaging": "0.19.1",
     "@node-lightning/bitcoin": "0.26.1",
     "@node-lightning/bufio": "0.26.1",
     "@node-lightning/crypto": "0.26.1",
     "bignumber.js": "^9.0.1",
     "bip-schnorr": "0.6.2",
+    "bitcoin-networks": "^1.0.0",
     "bitcoinjs-lib": "5.2.0",
     "lodash": "^4.17.20",
     "randombytes": "2.1.0",
@@ -40,6 +38,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "gitHead": "021537d74a46eb5bd578a7c4b122555e6b0a310f"
+  }
 }