@teleportdao/bitcoin 1.4.3 → 1.4.4

package/package.json

@@ -1,18 +1,20 @@
 {
   "name": "@teleportdao/bitcoin",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "description": "teleswap bitcoin package",
   "main": "dist/index.js",
+  "browser": "dist/bundle.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 2",
-    "build": "tsc",
-    "build:watch": "tsc --watch"
+    "build:tsc": "tsc",
+    "build:watch": "tsc --watch",
+    "build": "npm run build:tsc && browserify dist/index.js --standalone tdo/bitcoin  > dist/bundle.js"
   },
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@teleportdao/configs": "^1.4.3",
+    "@teleportdao/configs": "^1.4.4",
     "@teleportdao/providers": "^1.2.4",
     "axios": "^0.27.2",
     "bignumber.js": "^9.1.1",
@@ -31,5 +33,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "500f1fc29c154585ab7729ba19c8616001678bb4"
+  "gitHead": "5ef6d5dcf2c5d5ea2c4d75309df730a52f722129"
 }

package/src/bitcoin-base.js

@@ -1,219 +1,220 @@
-const bip39 = require("bip39")
-const bip32 = require("bip32")
-const hdWalletNetworksPath = require("@teleportdao/configs").hdWalletPath
-const { getPubKeyFromPrivateKeyHex } = require("./bitcoin-utils")
-const networks = require("./utils/networks")
-
-const TransactionBuilder = require("./transaction-builder/bitcoin-transaction-builder")
-const BitcoinSign = require("./sign/sign-transaction")
-
-class BitcoinBase {
-  constructor(
-    networkName,
-    connectionInfo = {
-      api: {
-        enabled: true,
-        provider: "BlockStream",
-      },
-    },
-  ) {
-    this.network = networks[networkName]
-    this.hdWalletPath = hdWalletNetworksPath[networkName.replace("_testnet", "")]
-
-    this.transactionBuilder = new TransactionBuilder(connectionInfo, networkName, this.network)
-    this.btcInterface = this.transactionBuilder.btcInterface
-
-    this.signer = new BitcoinSign(this.network)
-
-    this.currentAccount = null
-    this.currentAccountType = null
-
-    this.privateKey = null
-    this.publicKey = null
-    // todo multisig
-    this.publicKeys = []
-  }
-
-  static createTransactionInputsAndOutputs({
-    targets,
-    extendedUtxo,
-    changeAddress,
-    feeRate,
-    fullAmount = false,
-  }) {
-    return TransactionBuilder.helperHandleInputsAndOutputs({
-      targets,
-      extendedUtxo,
-      changeAddress,
-      feeRate,
-      fullAmount,
-    })
-  }
-
-  static checkBalanceIsSufficient({
-    targets,
-    extendedUtxo,
-    changeAddress,
-    feeRate,
-    fullAmount = false,
-  }) {
-    try {
-      TransactionBuilder.helperHandleInputsAndOutputs({
-        targets,
-        extendedUtxo,
-        changeAddress,
-        feeRate,
-        fullAmount,
-      })
-      return true
-    } catch (err) {
-      return false
-    }
-  }
-
-  setMultiSigAccount(accountType = "p2sh") {
-    /* eslint-disable no-unreachable */
-    // todo : not completed
-    switch (accountType) {
-      // case 'p2sh':
-      //   this.currentAccount = ''
-      //   break
-      // case 'p2wsh':
-      //   this.currentAccount = ''
-      //   break
-      // case 'p2sh-p2wsh':
-      //   this.currentAccount = ''
-      //   break
-      default:
-        throw new Error("accountType is incorrect")
-    }
-    this.currentAccountType = accountType
-  }
-
-  setAccountPrivateKey(privateKeyHex) {
-    this.privateKey = Buffer.from(privateKeyHex, "hex")
-    let publicKey = getPubKeyFromPrivateKeyHex(privateKeyHex, this.network)
-    this.publicKey = publicKey
-  }
-
-  setAccountPublicKey(publicKeyHex) {
-    this.publicKey = Buffer.from(publicKeyHex, "hex")
-  }
-
-  /**
-   *
-   * @param {*} input
-   * @param {*} input.mnemonic
-   * @param {*} input.mnemonicPassword
-   * @param {*} input.index
-   * @param {*} input.walletNumber
-   * @param {*} input.addressType
-   * @returns
-   */
-  setAccountPrivateKeyByMnemonic({
-    mnemonic,
-    mnemonicPassword = "",
-    index = 0,
-    walletNumber = 0,
-    addressType = "p2sh-p2wpkh",
-  }) {
-    if (!bip39.validateMnemonic(mnemonic)) throw new Error("invalid mnemonic")
-    const seed = bip39.mnemonicToSeedSync(mnemonic, mnemonicPassword)
-    const node = bip32.fromSeed(seed)
-
-    if (!this.hdWalletPath[addressType]) throw new Error("incorrect path or addressType")
-
-    const path = `${this.hdWalletPath[addressType]}/${walletNumber}`
-    const account = node.derivePath(path)
-    const userKeyPair = account.derive(index)
-    this.setAccountPrivateKey(userKeyPair.privateKey.toString("hex"))
-    return this.setAccount(addressType)
-  }
-
-  setAccount(accountType = "p2pkh") {
-    let addressObj = this.transactionBuilder.createAddressObject({
-      addressType: accountType,
-      publicKey: this.publicKey,
-    })
-    this.currentAccount = addressObj.address
-    this.currentAccountType = accountType
-    this.addressObj = addressObj
-    this.bitcoinAddress = addressObj.address
-    return addressObj.address
-  }
-
-  /**
-   *
-   * @param {Object} signerInfo
-   * @param {*} signerInfo.address
-   * @param {*} signerInfo.addressType
-   * @param {*} signerInfo.publicKey
-   * @param {*} signerInfo.derivationPath
-   * @param {*} signerInfo.masterFingerprint
-   * @returns
-   */
-  async getExtendedUtxo({ address, addressType, publicKey, derivationPath, masterFingerprint }) {
-    return this.transactionBuilder.getExtendedUtxo({
-      address,
-      addressType,
-      publicKey,
-      derivationPath,
-      masterFingerprint,
-    })
-  }
-
-  /**
-   *
-   * @param {*} input
-   * @param {*} input.receiverAddress
-   * @param {*} input.amount
-   * @param {*} input.fullAmount
-   * @param {*} input.speed
-   * @returns
-   */
-  async send({ receiverAddress, amount, fullAmount = false, speed = "normal" }) {
-    let extendedUtxo = await this.getExtendedUtxo({
-      address: this.currentAccount,
-      addressType: this.currentAccountType,
-      publicKey: this.publicKey.toString("hex"),
-    })
-    if (amount - +amount.toFixed() !== 0)
-      throw new Error("incorrect amount. amount should be in satoshi")
-    let feeRate = await this.transactionBuilder._getFeeRate(speed)
-    let unsignedTx = await this.transactionBuilder.processUnsignedTransaction({
-      extendedUtxo,
-      targets: [
-        {
-          address: receiverAddress,
-          value: amount,
-        },
-      ],
-      changeAddress: this.currentAccount,
-      feeRate,
-      fullAmount,
-    })
-    let signedPsbt = await this.signer.signPsbt(unsignedTx, this.privateKey)
-    let signedTx = this.signer.finalizePsbts([signedPsbt])
-    let txId = await this.transactionBuilder.sendTx(signedTx)
-    return txId
-  }
-
-  async sendSignedPsbt(signedPsbt) {
-    let signedTx = this.signer.finalizePsbts([signedPsbt])
-    let txId = await this.transactionBuilder.sendTx(signedTx)
-    return txId
-  }
-
-  async sendSignedTx(signedTx) {
-    let txId = await this.transactionBuilder.sendTx(signedTx)
-    return txId
-  }
-
-  async sendMultiSignedPsbt(signedPsbts = []) {
-    let signedTx = this.signer.finalizePsbts(signedPsbts)
-    let txId = await this.transactionBuilder.sendTx(signedTx)
-    return txId
-  }
-}
-
-module.exports = BitcoinBase
+import TransactionBuilder from "./transaction-builder/bitcoin-transaction-builder"
+import BitcoinSign from "./sign/sign-transaction"
+
+const bip39 = require("bip39")
+const bip32 = require("bip32")
+const hdWalletNetworksPath = require("@teleportdao/configs").hdWalletPath
+const { getPubKeyFromPrivateKeyHex } = require("./bitcoin-utils")
+const networks = require("./utils/networks")
+
+// eslint-disable-next-line import/prefer-default-export
+export class BitcoinBase {
+  constructor(
+    networkName,
+    connectionInfo = {
+      api: {
+        enabled: true,
+        provider: "BlockStream",
+      },
+    },
+  ) {
+    this.network = networks[networkName]
+    this.hdWalletPath = hdWalletNetworksPath[networkName.replace("_testnet", "")]
+
+    this.transactionBuilder = new TransactionBuilder(connectionInfo, networkName, this.network)
+    this.btcInterface = this.transactionBuilder.btcInterface
+
+    this.signer = new BitcoinSign(this.network)
+
+    this.currentAccount = null
+    this.currentAccountType = null
+
+    this.privateKey = null
+    this.publicKey = null
+    // todo multisig
+    this.publicKeys = []
+  }
+
+  static createTransactionInputsAndOutputs({
+    targets,
+    extendedUtxo,
+    changeAddress,
+    feeRate,
+    fullAmount = false,
+  }) {
+    return TransactionBuilder.helperHandleInputsAndOutputs({
+      targets,
+      extendedUtxo,
+      changeAddress,
+      feeRate,
+      fullAmount,
+    })
+  }
+
+  static checkBalanceIsSufficient({
+    targets,
+    extendedUtxo,
+    changeAddress,
+    feeRate,
+    fullAmount = false,
+  }) {
+    try {
+      TransactionBuilder.helperHandleInputsAndOutputs({
+        targets,
+        extendedUtxo,
+        changeAddress,
+        feeRate,
+        fullAmount,
+      })
+      return true
+    } catch (err) {
+      return false
+    }
+  }
+
+  setMultiSigAccount(accountType = "p2sh") {
+    /* eslint-disable no-unreachable */
+    // todo : not completed
+    switch (accountType) {
+      // case 'p2sh':
+      //   this.currentAccount = ''
+      //   break
+      // case 'p2wsh':
+      //   this.currentAccount = ''
+      //   break
+      // case 'p2sh-p2wsh':
+      //   this.currentAccount = ''
+      //   break
+      default:
+        throw new Error("accountType is incorrect")
+    }
+    this.currentAccountType = accountType
+  }
+
+  setAccountPrivateKey(privateKeyHex) {
+    this.privateKey = Buffer.from(privateKeyHex, "hex")
+    let publicKey = getPubKeyFromPrivateKeyHex(privateKeyHex, this.network)
+    this.publicKey = publicKey
+  }
+
+  setAccountPublicKey(publicKeyHex) {
+    this.publicKey = Buffer.from(publicKeyHex, "hex")
+  }
+
+  /**
+   *
+   * @param {*} input
+   * @param {*} input.mnemonic
+   * @param {*} input.mnemonicPassword
+   * @param {*} input.index
+   * @param {*} input.walletNumber
+   * @param {*} input.addressType
+   * @returns
+   */
+  setAccountPrivateKeyByMnemonic({
+    mnemonic,
+    mnemonicPassword = "",
+    index = 0,
+    walletNumber = 0,
+    addressType = "p2sh-p2wpkh",
+  }) {
+    if (!bip39.validateMnemonic(mnemonic)) throw new Error("invalid mnemonic")
+    const seed = bip39.mnemonicToSeedSync(mnemonic, mnemonicPassword)
+    const node = bip32.fromSeed(seed)
+
+    if (!this.hdWalletPath[addressType]) throw new Error("incorrect path or addressType")
+
+    const path = `${this.hdWalletPath[addressType]}/${walletNumber}`
+    const account = node.derivePath(path)
+    const userKeyPair = account.derive(index)
+    this.setAccountPrivateKey(userKeyPair.privateKey.toString("hex"))
+    return this.setAccount(addressType)
+  }
+
+  setAccount(accountType = "p2pkh") {
+    let addressObj = this.transactionBuilder.createAddressObject({
+      addressType: accountType,
+      publicKey: this.publicKey,
+    })
+    this.currentAccount = addressObj.address
+    this.currentAccountType = accountType
+    this.addressObj = addressObj
+    this.bitcoinAddress = addressObj.address
+    return addressObj.address
+  }
+
+  /**
+   *
+   * @param {Object} signerInfo
+   * @param {*} signerInfo.address
+   * @param {*} signerInfo.addressType
+   * @param {*} signerInfo.publicKey
+   * @param {*} signerInfo.derivationPath
+   * @param {*} signerInfo.masterFingerprint
+   * @returns
+   */
+  async getExtendedUtxo({ address, addressType, publicKey, derivationPath, masterFingerprint }) {
+    return this.transactionBuilder.getExtendedUtxo({
+      address,
+      addressType,
+      publicKey,
+      derivationPath,
+      masterFingerprint,
+    })
+  }
+
+  /**
+   *
+   * @param {*} input
+   * @param {*} input.receiverAddress
+   * @param {*} input.amount
+   * @param {*} input.fullAmount
+   * @param {*} input.speed
+   * @returns
+   */
+  async send({ receiverAddress, amount, fullAmount = false, speed = "normal" }) {
+    let extendedUtxo = await this.getExtendedUtxo({
+      address: this.currentAccount,
+      addressType: this.currentAccountType,
+      publicKey: this.publicKey.toString("hex"),
+    })
+    if (amount - +amount.toFixed() !== 0)
+      throw new Error("incorrect amount. amount should be in satoshi")
+    let feeRate = await this.transactionBuilder._getFeeRate(speed)
+    let unsignedTx = await this.transactionBuilder.processUnsignedTransaction({
+      extendedUtxo,
+      targets: [
+        {
+          address: receiverAddress,
+          value: amount,
+        },
+      ],
+      changeAddress: this.currentAccount,
+      feeRate,
+      fullAmount,
+    })
+    let signedPsbt = await this.signer.signPsbt(unsignedTx, this.privateKey)
+    let signedTx = this.signer.finalizePsbts([signedPsbt])
+    let txId = await this.transactionBuilder.sendTx(signedTx)
+    return txId
+  }
+
+  async sendSignedPsbt(signedPsbt) {
+    let signedTx = this.signer.finalizePsbts([signedPsbt])
+    let txId = await this.transactionBuilder.sendTx(signedTx)
+    return txId
+  }
+
+  async sendSignedTx(signedTx) {
+    let txId = await this.transactionBuilder.sendTx(signedTx)
+    return txId
+  }
+
+  async sendMultiSignedPsbt(signedPsbts = []) {
+    let signedTx = this.signer.finalizePsbts(signedPsbts)
+    let txId = await this.transactionBuilder.sendTx(signedTx)
+    return txId
+  }
+}
+
+// export default BitcoinBase