@teleportdao/bitcoin 1.4.8 → 1.4.9

package/dist/sign/sign-transaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sign-transaction.d.ts","sourceRoot":"","sources":["../../src/sign/sign-transaction.ts"],"names":[],"mappings":";AAAA,OAAO,EAAgB,OAAO,EAAU,MAAM,eAAe,CAAA;AAc7D,cAAM,0BAA0B;IAC9B,OAAO,EAAE,OAAO,CAAA;gBACJ,OAAO,EAAE,OAAO;IAoCtB,QAAQ,CACZ,YAAY,EAAE;QACZ,mBAAmB,EAAE,MAAM,CAAA;KAC5B,EACD,UAAU,EAAE,MAAM;IAsBpB,aAAa,CAAC,WAAW,GAAE,MAAM,EAAO;CAezC;AAED,eAAe,0BAA0B,CAAA"}
+{"version":3,"file":"sign-transaction.d.ts","sourceRoot":"","sources":["../../src/sign/sign-transaction.ts"],"names":[],"mappings":";AAAA,OAAO,EAAgB,OAAO,EAAE,MAAM,eAAe,CAAA;AA0CrD,cAAM,0BAA0B;IAC9B,OAAO,EAAE,OAAO,CAAA;gBACJ,OAAO,EAAE,OAAO;IAItB,QAAQ,CACZ,YAAY,EAAE;QACZ,mBAAmB,EAAE,MAAM,CAAA;KAC5B,EACD,UAAU,EAAE,MAAM;IA4BpB,aAAa,CAAC,WAAW,GAAE,MAAM,EAAO;CAczC;AAED,eAAe,0BAA0B,CAAA"}

package/dist/sign/sign-transaction.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,8 +31,36 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const bitcoinjs_lib_1 = require("bitcoinjs-lib");
+const secp256k1_1 = __importDefault(require("@bitcoinerlab/secp256k1"));
+const bitcoinEcPair = __importStar(require("bitcoinjs-ecpair"));
+const ECPair = bitcoinEcPair.ECPair;
+function tapTweakHash(pubKey, h) {
+    return bitcoinjs_lib_1.crypto.taggedHash("TapTweak", Buffer.concat(h ? [pubKey, h] : [pubKey]));
+}
+function tweakSigner(privateKey, opts = {}, network) {
+    let newPrv = privateKey;
+    let keyPair = ECPair.fromPrivateKey(privateKey, {
+        network: network,
+        compressed: true,
+    });
+    if (!keyPair.privateKey)
+        throw new Error("private key not exist");
+    if (keyPair.publicKey.toString("hex").startsWith("03")) {
+        newPrv = secp256k1_1.default.privateNegate(keyPair.privateKey);
+    }
+    const tweakedPrivateKey = secp256k1_1.default.privateAdd(newPrv, tapTweakHash(Buffer.from(keyPair.publicKey.toString("hex").slice(2), "hex"), opts === null || opts === void 0 ? void 0 : opts.tweakHash));
+    if (!tweakedPrivateKey) {
+        throw new Error("Invalid tweaked private key!");
+    }
+    return ECPair.fromPrivateKey(Buffer.from(tweakedPrivateKey), {
+        network: network,
+    });
+}
 class BitcoinLikeSignTransaction {
     constructor(network) {
         this.network = network;
@@ -17,7 +68,7 @@ class BitcoinLikeSignTransaction {
     signPsbt(unsignedPsbt, privateKey) {
         return __awaiter(this, void 0, void 0, function* () {
             const { network } = this;
-            const keyPair = bitcoinjs_lib_1.ECPair.fromPrivateKey(privateKey, {
+            const keyPair = ECPair.fromPrivateKey(privateKey, {
                 network,
                 compressed: true,
             });
@@ -26,7 +77,14 @@ class BitcoinLikeSignTransaction {
             });
             let numberOfInputs = psbt.inputCount;
             for (let i = 0; i < numberOfInputs; i += 1) {
-                yield psbt.signInputAsync(i, keyPair);
+                let type = psbt.getInputType(i);
+                if (type === "nonstandard") {
+                    let a = tweakSigner(privateKey, undefined, this.network);
+                    yield psbt.signInputAsync(i, a);
+                }
+                else {
+                    yield psbt.signInputAsync(i, keyPair);
+                }
             }
             const partialSigendPsbt = psbt.toBase64();
             return partialSigendPsbt;

package/dist/sign/sign-transaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"sign-transaction.js","sourceRoot":"","sources":["../../src/sign/sign-transaction.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,iDAA6D;AAc7D,MAAM,0BAA0B;IAE9B,YAAY,OAAgB;QAC1B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAkCK,QAAQ,CACZ,YAEC,EACD,UAAkB;;YAElB,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;YACxB,MAAM,OAAO,GAAG,sBAAM,CAAC,cAAc,CAAC,UAAU,EAAE;gBAChD,OAAO;gBACP,UAAU,EAAE,IAAI;aACjB,CAAC,CAAA;YACF,MAAM,IAAI,GAAG,oBAAI,CAAC,UAAU,CAAC,YAAY,CAAC,mBAAmB,EAAE;gBAC7D,OAAO;aACR,CAAC,CAAA;YAEF,IAAI,cAAc,GAAG,IAAI,CAAC,UAAU,CAAA;YAEpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,EAAE,CAAC,IAAI,CAAC,EAAE;gBAC1C,MAAM,IAAI,CAAC,cAAc,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;aACtC;YAGD,MAAM,iBAAiB,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAA;YACzC,OAAO,iBAAiB,CAAA;QAC1B,CAAC;KAAA;IAED,aAAa,CAAC,cAAwB,EAAE;QACtC,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAC5C,oBAAI,CAAC,UAAU,CAAC,UAAU,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CACvD,CAAA;QACD,MAAM,IAAI,GACR,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,oBAAI,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,CAAA;QAC1F,IAAI,CAAC,iBAAiB,EAAE,CAAA;QAMxB,IAAI,UAAU,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAA;QAC1C,OAAO,UAAU,CAAC,KAAK,EAAE,CAAA;IAC3B,CAAC;CACF;AAED,kBAAe,0BAA0B,CAAA"}
+{"version":3,"file":"sign-transaction.js","sourceRoot":"","sources":["../../src/sign/sign-transaction.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teleportdao/bitcoin",
-  "version": "1.4.8",
+  "version": "1.4.9",
   "description": "teleswap bitcoin package",
   "main": "dist/index.js",
   "browser": "dist/bundle.js",
@@ -14,24 +14,28 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@bitcoinerlab/secp256k1": "^1.0.5",
     "@teleportdao/configs": "^1.4.6",
-    "@teleportdao/providers": "^1.4.8",
+    "@teleportdao/providers": "^1.4.9",
     "axios": "^0.27.2",
     "bignumber.js": "^9.1.1",
-    "bip32": "^2.0.6",
-    "bip39": "^3.0.4",
-    "bitcoinjs-lib": "^5.2.0",
-    "buffer": "^6.0.3",
+    "bip32": "^4.0.0",
+    "bip39": "^3.1.0",
+    "bitcoinjs-ecpair": "npm:bitcoinjs-lib@^5.2.0",
+    "bitcoinjs-lib": "^6.1.5",
     "coinselect": "^3.1.13",
-    "ecpair": "^2.1.0",
+    "ecpair": "^2.0.1",
     "merkle-lib": "^2.0.10",
     "merkle-patricia-tree": "^2.3.2",
-    "stream": "^0.0.2",
-    "tiny-secp256k1": "^2.2.1",
+    "npm": "^10.2.3",
+    "uninstall": "^0.0.0",
     "varuint-bitcoin": "^1.1.2"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "de0ae6fdd49608b800612b57316c0a6f3e7c829a"
+  "gitHead": "cb98230f4b9dddad7318f3830bc1890e20a3cda4",
+  "devDependencies": {
+    "@babel/preset-react": "^7.23.3"
+  }
 }

package/src/bitcoin-base.ts

@@ -6,13 +6,17 @@ import type { ExtendedUtxo, SignerInfo, Target } from "./transaction-builder/tra
 import BitcoinSign from "./sign/sign-transaction"
 
 import * as bip39 from "bip39"
-import * as bip32 from "bip32"
 import { hdWalletPath } from "@teleportdao/configs"
 import { getPubKeyFromPrivateKeyHex } from "./bitcoin-utils"
 import networks from "./utils/networks"
 import { Network, Payment } from "bitcoinjs-lib"
 import { BitcoinInterface } from "./bitcoin-interface"
 
+import BIP32Factory from "bip32"
+import ecc from "@bitcoinerlab/secp256k1"
+
+const bip32 = BIP32Factory(ecc)
+
 class BitcoinBase {
   network: Network
   hdWalletPath: {
@@ -244,5 +248,4 @@ class BitcoinBase {
     return txId
   }
 }
-
 export { BitcoinBase }

package/src/bitcoin-interface.ts

@@ -266,9 +266,11 @@ export class BitcoinInterface extends BitcoinInterfaceUtils {
     }
     let blockTxs = []
     for (let blockNumber = +startBlockNumber + 1; blockNumber <= endBlockNumber; blockNumber += 1) {
-      const response = this.getBlockTransactions(addresses, blockNumber, inputTxIds)
+      console.log(blockNumber)
+
+      const response = await this.getBlockTransactions(addresses, blockNumber, inputTxIds)
       blockTxs.push(response)
-      await sleep(200)
+      // await sleep(200)
     }
     blockTxs = await Promise.all(blockTxs)
     return blockTxs.flat(1)

package/src/bitcoin-utils.ts

@@ -1,15 +1,13 @@
-import * as bip39 from "bip39"
-import * as bip32 from "bip32"
 import networks from "./utils/networks"
 
-// import BIP32Factory from "bip32"
-// import ECPairFactory from "ecpair"
-// import * as ecc from "tiny-secp256k1"
+import * as bip39 from "bip39"
+import BIP32Factory from "bip32"
+import * as ecc from "@bitcoinerlab/secp256k1"
 import * as bitcoin from "bitcoinjs-lib"
+import * as bitcoinEcPair from "bitcoinjs-ecpair"
 
-// bitcoin.initEccLib(ecc)
-// const bip32 = BIP32Factory(ecc)
-const ECPair = bitcoin.ECPair
+const bip32 = BIP32Factory(ecc)
+const ECPair = bitcoinEcPair.ECPair
 
 let varUnit = require("varuint-bitcoin")
 const fastRoot = require("merkle-lib/fastRoot")
@@ -46,6 +44,44 @@ export function generateMnemonic() {
   return mnemonic
 }
 
+export function reverseBytes(hexInput: string) {
+  return Buffer.from(hexInput, "hex").reverse().toString("hex")
+}
+
+export function getPublicKeyHexByXpubAndIndex(
+  xpub: string,
+  index = 0,
+  isChange = false,
+  network = networks.bitcoin,
+) {
+  const node = bip32.fromBase58(xpub, network)
+  return node
+    .derive(isChange ? 1 : 0)
+    .derive(index)
+    .publicKey.toString("hex")
+}
+
+export function getPubKeyFromPrivateKeyWIF(
+  privateKeyWIF: string,
+  network = bitcoin.networks.bitcoin,
+) {
+  let key = ECPair.fromWIF(privateKeyWIF, network)
+  return key.publicKey
+}
+
+export function getPubKeyFromPrivateKeyHex(
+  privateKeyHex: string,
+  network = bitcoin.networks.bitcoin,
+) {
+  let key = ECPair.fromPrivateKey(Buffer.from(privateKeyHex, "hex"), { network })
+  return key.publicKey
+}
+
+export function getPrivateKeyHexFromWIF(privateKeyWIF: string, network = bitcoin.networks.bitcoin) {
+  let key = ECPair.fromWIF(privateKeyWIF, network)
+  return key.privateKey!.toString("hex")
+}
+
 export function parseRawTransaction(rawTransaction: string) {
   const size = {
     version: 4,
@@ -102,44 +138,6 @@ export function parseRawTransaction(rawTransaction: string) {
   return { version, flag, vin, vout, witness, locktime }
 }
 
-export function reverseBytes(hexInput: string) {
-  return Buffer.from(hexInput, "hex").reverse().toString("hex")
-}
-
-export function getPublicKeyHexByXpubAndIndex(
-  xpub: string,
-  index = 0,
-  isChange = false,
-  network = networks.bitcoin,
-) {
-  const node = bip32.fromBase58(xpub, network)
-  return node
-    .derive(isChange ? 1 : 0)
-    .derive(index)
-    .publicKey.toString("hex")
-}
-
-export function getPubKeyFromPrivateKeyWIF(
-  privateKeyWIF: string,
-  network = bitcoin.networks.bitcoin,
-) {
-  let key = bitcoin.ECPair.fromWIF(privateKeyWIF, network)
-  return key.publicKey
-}
-
-export function getPubKeyFromPrivateKeyHex(
-  privateKeyHex: string,
-  network = bitcoin.networks.bitcoin,
-) {
-  let key = bitcoin.ECPair.fromPrivateKey(Buffer.from(privateKeyHex, "hex"), { network })
-  return key.publicKey
-}
-
-export function getPrivateKeyHexFromWIF(privateKeyWIF: string, network = bitcoin.networks.bitcoin) {
-  let key = bitcoin.ECPair.fromWIF(privateKeyWIF, network)
-  return key.privateKey!.toString("hex")
-}
-
 export function calculateMerkleProof(
   blockTransactions: string[],
   txId: string,
@@ -202,6 +200,7 @@ export function parseBlockHeader(headerHex: string) {
   }
 }
 
+// used in block parser functions ( newt 2 functions )
 export function convertBitcoinScriptToAddress(script: Buffer, network = bitcoin.networks.bitcoin) {
   try {
     return bitcoin.address.fromOutputScript(script, network)
@@ -414,11 +413,11 @@ function toXOnlyPublicKey(pubKey: Buffer) {
 
 export function getAddressType(address: string, network = bitcoin.networks.bitcoin) {
   if (address.startsWith(`${network.bech32}1p`)) {
-    // todo : check length - it could be p2wsh
+    // todo validate p2tr address
     return "p2tr"
   }
   if (address.startsWith(network.bech32)) {
-    // todo : check length - it could be p2wsh
+    bitcoin.address.fromBech32(address)
     return "p2wpkh"
   }
   let base58Data = bitcoin.address.fromBase58Check(address)
@@ -462,12 +461,12 @@ export function createAddressObjectByScript(
         network,
       })
       break
-    // case "p2tr":
-    //   addressObject = bitcoin.payments.p2tr({
-    //     output: script,
-    //     network,
-    //   })
-    //   break
+    case "p2tr":
+      addressObject = bitcoin.payments.p2tr({
+        output: script,
+        network,
+      })
+      break
     default:
       throw new Error("address type is incorrect")
   }
@@ -504,13 +503,13 @@ export function createAddressObjectByHash(
         network,
       })
       break
-    // case "p2tr":
-    //   // here hash is the public key of tweaked private key
-    //   addressObject = bitcoin.payments.p2tr({
-    //     pubkey: hash,
-    //     network,
-    //   })
-    // break
+    case "p2tr":
+      // here hash is the public key of tweaked private key (internal public key)
+      addressObject = bitcoin.payments.p2tr({
+        pubkey: hash,
+        network,
+      })
+      break
     default:
       throw new Error("address type is incorrect")
   }
@@ -544,12 +543,12 @@ export function createAddressObjectByPublicKey(
       })
       break
     case "p2tr":
-    // // this public key is public key of main private key
-    // addressObject = bitcoin.payments.p2tr({
-    //   internalPubkey: toXOnlyPublicKey(publicKey),
-    //   network,
-    // })
-    // break
+      // this public key is public key of main private key
+      addressObject = bitcoin.payments.p2tr({
+        internalPubkey: toXOnlyPublicKey(publicKey),
+        network,
+      })
+      break
     default:
       throw new Error("address type is incorrect")
   }
@@ -578,12 +577,12 @@ export function createAddressObjectByAddress(address: string, network = bitcoin.
         network,
       })
       break
-    // case "p2tr":
-    //   addressObject = bitcoin.payments.p2tr({
-    //     address,
-    //     network,
-    //   })
-    //   break
+    case "p2tr":
+      addressObject = bitcoin.payments.p2tr({
+        address,
+        network,
+      })
+      break
     default:
       throw new Error("address type is incorrect")
   }

package/src/sign/sign-transaction.ts

@@ -1,16 +1,44 @@
-import { Psbt, crypto, Network, ECPair } from "bitcoinjs-lib"
-// import ECPairFactory from "ecpair"
-// import * as ecc from "tiny-secp256k1"
-import { ExtendedUnsignedTransaction } from "../transaction-builder/transaction-builder"
-// import * as bitcoin from "bitcoinjs-lib"
+import { Psbt, crypto, Network } from "bitcoinjs-lib"
+// import BIP32Factory from "bip32"
+import ecc from "@bitcoinerlab/secp256k1"
+import * as bitcoinEcPair from "bitcoinjs-ecpair"
+const ECPair = bitcoinEcPair.ECPair
 
-// bitcoin.initEccLib(ecc)
-// // const bip32 = BIP32Factory(ecc)
-// const ECPair = ECPairFactory(ecc)
+function tapTweakHash(pubKey: Buffer, h?: Buffer) {
+  return crypto.taggedHash("TapTweak", Buffer.concat(h ? [pubKey, h] : [pubKey]))
+}
+
+function tweakSigner(
+  privateKey: Buffer,
+  opts = {} as {
+    [key: string]: Buffer
+  },
+  network: Network,
+) {
+  let newPrv = privateKey
+  let keyPair = ECPair.fromPrivateKey(privateKey, {
+    network: network,
+    compressed: true,
+  })
+
+  if (!keyPair.privateKey) throw new Error("private key not exist")
+
+  if (keyPair.publicKey.toString("hex").startsWith("03")) {
+    newPrv = ecc.privateNegate(keyPair.privateKey) as Buffer
+  }
+
+  const tweakedPrivateKey = ecc.privateAdd(
+    newPrv,
+    tapTweakHash(Buffer.from(keyPair.publicKey.toString("hex").slice(2), "hex"), opts?.tweakHash),
+  )
+  if (!tweakedPrivateKey) {
+    throw new Error("Invalid tweaked private key!")
+  }
 
-// function tapTweakHash(pubKey: Buffer, h?: Buffer) {
-//   return crypto.taggedHash('TapTweak', Buffer.concat(h ? [pubKey, h] : [pubKey]))
-// }
+  return ECPair.fromPrivateKey(Buffer.from(tweakedPrivateKey), {
+    network: network,
+  })
+}
 
 class BitcoinLikeSignTransaction {
   network: Network
@@ -18,38 +46,6 @@ class BitcoinLikeSignTransaction {
     this.network = network
   }
 
-  // tweakSigner(
-  //   privateKey: Buffer,
-  //   opts = {} as {
-  //     [key: string]: Buffer
-  //   },
-  // ) {
-  //   let newPrv = privateKey
-  //   let keyPair = ECPair.fromPrivateKey(privateKey, {
-  //     network: this.network,
-  //     compressed: true,
-  //   })
-
-  //   if (!keyPair.privateKey) throw new Error("private key not exist")
-
-  //   if (keyPair.publicKey.toString("hex").startsWith("03")) {
-  //     newPrv = ecc.privateNegate(keyPair.privateKey) as Buffer
-  //   }
-
-  //   const tweakedPrivateKey = ecc.privateAdd(
-  //     newPrv,
-  //     tapTweakHash(Buffer.from(keyPair.publicKey.toString("hex").slice(2), "hex"), opts?.tweakHash),
-  //   )
-  //   if (!tweakedPrivateKey) {
-  //     throw new Error("Invalid tweaked private key!")
-  //   }
-
-  //   return ECPair.fromPrivateKey(Buffer.from(tweakedPrivateKey), {
-  //     network: this.network,
-  //   })
-  // }
-
-  // todo : change to psbt
   async signPsbt(
     unsignedPsbt: {
       unsignedTransaction: string
@@ -68,7 +64,13 @@ class BitcoinLikeSignTransaction {
     let numberOfInputs = psbt.inputCount
 
     for (let i = 0; i < numberOfInputs; i += 1) {
-      await psbt.signInputAsync(i, keyPair)
+      let type = psbt.getInputType(i)
+      if (type === "nonstandard") {
+        let a = tweakSigner(privateKey, undefined, this.network)
+        await psbt.signInputAsync(i, a)
+      } else {
+        await psbt.signInputAsync(i, keyPair)
+      }
     }
 
     // psbt.signAllInputs(keyPair)
@@ -82,13 +84,12 @@ class BitcoinLikeSignTransaction {
     )
     const psbt =
       finals.length === 1 ? finals[0] : new Psbt({ network: this.network }).combine(...finals)
+
     psbt.finalizeAllInputs()
 
-    // psbt.finalizeAllInputs()
-    // const tx = psbt.extractTransaction()
-    // const rawTx = tx.toBuffer()
-    // const hex = rawTx.toString("hex")
     let finalizeTx = psbt.extractTransaction()
+    // const rawTx = finalizeTx.toBuffer()
+    // const hex = rawTx.toString("hex")
     return finalizeTx.toHex()
   }
 }