@teleportdao/bitcoin 2.0.5 → 2.0.8

package/src/type.ts

@@ -1,74 +1,64 @@
-export type Transaction = {
-  txId: string
-  version: number
-  locktime: number
-  blockNumber: number
-  blockHash: string
-  merkleProof?: {
-    intermediateNodes: string
-    transactionIndex: number
-  }
-  vout: {
-    address?: string
-    script: string
-    value: number
-  }[]
-  vin: {
-    txId: string
-    index: number
-    address?: string
-    script?: string
-    value?: number
-  }[]
-  address: string
-  addressScript: string
-}
-
-export type UtxoConnectionInfo = {
-  token?: string
-  provider: "BlockStream" | "MempoolSpace" | "NowNodes" | "Unisat" | "TeleportDao"
-}
-
-export type BTCTokenConnectionInfo = {
-  token?: string
-  provider: "Unisat" | "TeleportDao"
-}
-
-export type APIConnectionInfo = {
-  provider: "BlockStream" | "MempoolSpace"
-}
-
-export type RPCConnectionInfo = {
-  url: string
-  headers?: {
-    [key: string]: string
-  }
-  auth?: {
-    username: string
-    password: string
-  }
-}
-
-export type BitcoinWalletConnectionInfo = {
-  utxo?: UtxoConnectionInfo
-  // rpc used for getRawTransaction in transaction builder if set (optional)
-  rpc?: RPCConnectionInfo
-}
-export type BitcoinWalletInterfaceConnectionInfo = {
-  api?: APIConnectionInfo
-  // if utxo is not provided, it will use the same provider as the api
-  // rpc used for getRawTransaction in transaction builder if set (optional)
-  utxo?: UtxoConnectionInfo
-}
-
-export type BitcoinInterfaceConnectionInfo = BitcoinWalletInterfaceConnectionInfo & {
-  rpc?: RPCConnectionInfo
-}
-
-export type BitcoinNodeConnectionInfo = BitcoinWalletInterfaceConnectionInfo & {
-  rpc: RPCConnectionInfo
-}
-
-export type BitcoinTokenNodeConnectionInfo = BitcoinNodeConnectionInfo & {
-  // btcToken: BTCTokenConnectionInfo
-}
+export type Transaction = {
+  txId: string
+  version: number
+  locktime: number
+  blockNumber: number
+  blockHash: string
+  merkleProof?: {
+    intermediateNodes: string
+    transactionIndex: number
+  }
+  vout: {
+    address?: string
+    script: string
+    value: number
+  }[]
+  vin: {
+    txId: string
+    index: number
+    address?: string
+    script?: string
+    value?: number
+  }[]
+  address: string
+  addressScript: string
+}
+
+export type UtxoConnectionInfo = {
+  token?: string
+  provider: "BlockStream" | "MempoolSpace" | "NowNodes" | "Unisat" | "TeleportDao"
+}
+
+export type BTCTokenConnectionInfo = {
+  token?: string
+  provider: "Unisat" | "TeleportDao"
+}
+
+export type APIConnectionInfo = {
+  provider: "BlockStream" | "MempoolSpace"
+}
+
+export type RPCConnectionInfo = {
+  url: string
+  headers?: {
+    [key: string]: string
+  }
+  auth?: {
+    username: string
+    password: string
+  }
+}
+
+export type BitcoinConnectionInfo = {
+  utxo?: UtxoConnectionInfo
+  api?: APIConnectionInfo
+  rpc?: RPCConnectionInfo
+}
+
+export type BitcoinNodeConnectionInfo = BitcoinConnectionInfo & {
+  rpc: RPCConnectionInfo
+}
+
+export type BitcoinTokenNodeConnectionInfo = BitcoinNodeConnectionInfo & {
+  // btcToken: BTCTokenConnectionInfo
+}

package/src/utils/networks.ts

@@ -1,33 +1,33 @@
-import * as bitcoinLib from "bitcoinjs-lib"
-
-const networks: {
-  [key: string]: bitcoinLib.Network
-} = {
-  bitcoin: bitcoinLib.networks.bitcoin,
-  bitcoin_testnet: bitcoinLib.networks.testnet,
-
-  litecoin: {
-    messagePrefix: "\x19Litecoin Signed Message:\n",
-    bech32: "ltc",
-    bip32: {
-      public: 0x0488b21e,
-      private: 0x0488ade4,
-    },
-    pubKeyHash: 0x30,
-    scriptHash: 0x32,
-    wif: 0xb0,
-  },
-  litecoin_testnet: {
-    messagePrefix: "\x18Litecoin Signed Message:\n",
-    bech32: "tltc",
-    bip32: {
-      public: 0x043587cf,
-      private: 0x04358394,
-    },
-    pubKeyHash: 0x6f,
-    scriptHash: 0x3a, // old 0xc4 -> 2  deprecated
-    wif: 0xef,
-  },
-}
-
-export default networks
+import * as bitcoinLib from "bitcoinjs-lib"
+
+const networks: {
+  [key: string]: bitcoinLib.Network
+} = {
+  bitcoin: bitcoinLib.networks.bitcoin,
+  bitcoin_testnet: bitcoinLib.networks.testnet,
+
+  litecoin: {
+    messagePrefix: "\x19Litecoin Signed Message:\n",
+    bech32: "ltc",
+    bip32: {
+      public: 0x0488b21e,
+      private: 0x0488ade4,
+    },
+    pubKeyHash: 0x30,
+    scriptHash: 0x32,
+    wif: 0xb0,
+  },
+  litecoin_testnet: {
+    messagePrefix: "\x18Litecoin Signed Message:\n",
+    bech32: "tltc",
+    bip32: {
+      public: 0x043587cf,
+      private: 0x04358394,
+    },
+    pubKeyHash: 0x6f,
+    scriptHash: 0x3a, // old 0xc4 -> 2  deprecated
+    wif: 0xef,
+  },
+}
+
+export default networks

package/src/utils/tools.ts

@@ -1,92 +1,92 @@
-import axios from "axios"
-
-function sleep(ms: number) {
-  // eslint-disable-next-line no-promise-executor-return
-  return new Promise((resolve) => setTimeout(resolve, ms))
-}
-
-async function runWithRetries<T>(
-  action: () => Promise<T>,
-  config: {
-    maxTries?: number
-    retrySleep?: number
-  } = {
-    maxTries: 2,
-    retrySleep: 1000,
-  },
-): Promise<T> {
-  const maxTries = config.maxTries ?? 2
-  const retrySleep = config.retrySleep ?? 1000
-  const trace = new Error().stack?.split("\n").slice(5).join("\n")
-
-  let lastError: any
-  for (let count = 0; count < maxTries; count += 1) {
-    try {
-      return await action()
-    } catch (error: any) {
-      error.message += `\n${trace}`
-      console.log(`Attempt ${count + 1} failed: ${error.message}`)
-      lastError = error
-      if (count < maxTries - 1) {
-        await sleep(retrySleep)
-      }
-    }
-  }
-
-  throw lastError || new Error(`Function failed after ${maxTries} retries: ${lastError?.message}`)
-}
-
-function getRandomInteger(min: number, max: number) {
-  return Math.floor(Math.random() * (max - min)) + min
-}
-
-function getAxiosInstance({
-  baseUrl,
-  timeout = 10000,
-  headers = {},
-  auth,
-}: {
-  baseUrl: string
-  timeout?: number
-  headers?: { [key: string]: string }
-  auth?: {
-    username: string
-    password: string
-  }
-}) {
-  let host = baseUrl
-  let instance
-
-  instance = axios.create({
-    baseURL: host,
-    timeout,
-    auth,
-    headers: {
-      ...headers,
-    },
-  })
-
-  // Add a response interceptor
-  instance.interceptors.response.use(
-    (response) => response,
-    (error) => {
-      // todo : fix this part
-      if (error.response) {
-        const serviceError = new Error(
-          JSON.stringify({ data: error.response.data, message: error.message }),
-        )
-        return Promise.reject(serviceError)
-      }
-
-      if (error.request) {
-        const serviceError = new Error(error.message)
-        return Promise.reject(serviceError)
-      }
-      return Promise.reject(error)
-    },
-  )
-
-  return instance
-}
-
-export { sleep, runWithRetries, getRandomInteger, getAxiosInstance }
+import axios from "axios"
+
+function sleep(ms: number) {
+  // eslint-disable-next-line no-promise-executor-return
+  return new Promise((resolve) => setTimeout(resolve, ms))
+}
+
+async function runWithRetries<T>(
+  action: () => Promise<T>,
+  config: {
+    maxTries?: number
+    retrySleep?: number
+  } = {
+    maxTries: 2,
+    retrySleep: 1000,
+  },
+): Promise<T> {
+  const maxTries = config.maxTries ?? 2
+  const retrySleep = config.retrySleep ?? 1000
+  const trace = new Error().stack?.split("\n").slice(5).join("\n")
+
+  let lastError: any
+  for (let count = 0; count < maxTries; count += 1) {
+    try {
+      return await action()
+    } catch (error: any) {
+      error.message += `\n${trace}`
+      console.log(`Attempt ${count + 1} failed: ${error.message}`)
+      lastError = error
+      if (count < maxTries - 1) {
+        await sleep(retrySleep)
+      }
+    }
+  }
+
+  throw lastError || new Error(`Function failed after ${maxTries} retries: ${lastError?.message}`)
+}
+
+function getRandomInteger(min: number, max: number) {
+  return Math.floor(Math.random() * (max - min)) + min
+}
+
+function getAxiosInstance({
+  baseUrl,
+  timeout = 10000,
+  headers = {},
+  auth,
+}: {
+  baseUrl: string
+  timeout?: number
+  headers?: { [key: string]: string }
+  auth?: {
+    username: string
+    password: string
+  }
+}) {
+  let host = baseUrl
+  let instance
+
+  instance = axios.create({
+    baseURL: host,
+    timeout,
+    auth,
+    headers: {
+      ...headers,
+    },
+  })
+
+  // Add a response interceptor
+  instance.interceptors.response.use(
+    (response) => response,
+    (error) => {
+      // todo : fix this part
+      if (error.response) {
+        const serviceError = new Error(
+          JSON.stringify({ data: error.response.data, message: error.message }),
+        )
+        return Promise.reject(serviceError)
+      }
+
+      if (error.request) {
+        const serviceError = new Error(error.message)
+        return Promise.reject(serviceError)
+      }
+      return Promise.reject(error)
+    },
+  )
+
+  return instance
+}
+
+export { sleep, runWithRetries, getRandomInteger, getAxiosInstance }

package/tsconfig.json

@@ -1,9 +1,9 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "rootDir": "src" /* Specify the root folder within your source files. */,
-    "outDir": "dist" /* Specify an output folder for all emitted files. */
-  },
-  "include": ["src"],
-  "exclude": ["node_modules", "dist"]
-}
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "src" /* Specify the root folder within your source files. */,
+    "outDir": "dist" /* Specify an output folder for all emitted files. */
+  },
+  "include": ["src"],
+  "exclude": ["node_modules", "dist"]
+}

package/webpack.config.js

@@ -1,16 +1,16 @@
-const path = require("path")
-// const webpack = require("webpack")
-
-module.exports = {
-  mode: "production",
-  entry: "./dist/index.js",
-  output: {
-    filename: "bundle.js",
-    path: path.resolve(__dirname, "dist"),
-    libraryTarget: "umd", // Module type
-    globalObject: "this", // Fix for universal module definition
-  },
-  performance: {
-    hints: false,
-  },
-}
+const path = require("path")
+// const webpack = require("webpack")
+
+module.exports = {
+  mode: "production",
+  entry: "./dist/index.js",
+  output: {
+    filename: "bundle.js",
+    path: path.resolve(__dirname, "dist"),
+    libraryTarget: "umd", // Module type
+    globalObject: "this", // Fix for universal module definition
+  },
+  performance: {
+    hints: false,
+  },
+}

package/.tmp/block-parser.ts

@@ -1,58 +0,0 @@
-import blockchainConfig from "@teleportdao/teleswap-nodes/src/config/blockchain.config"
-import { BitcoinInterface } from "../src"
-import { parseRawTransaction } from "../src/bitcoin-utils"
-
-async function start() {
-  const btcInterface = new BitcoinInterface(
-    blockchainConfig.sourceNetwork.connection,
-    blockchainConfig.sourceNetwork.name,
-  )
-
-  // const txs = await btcInterface.getMultipleBlocksTransactions(
-  //   ["3QMbvA6PhMSJAhr4Usr7JxVC6LuxQJqNKa"],
-  //   862571,
-  //   862572,
-  //   [
-  //     {
-  //       txId: "7fc88095bf4a8722295b51615965b46b5f429ebe18c38d7d7746a8c00b58b724",
-  //       index: 2,
-  //       value: 546,
-  //       script: "a914f89ef33376877ad6d01bf5e23bc263f9553bb2d587",
-  //       address: "3QMbvA6PhMSJAhr4Usr7JxVC6LuxQJqNKa",
-  //     },
-  //     {
-  //       txId: "49daf17deab7e8ecfd9eacb4d0476a5dbca7a333cc9aee94e208d718870743e7",
-  //       index: 2,
-  //       value: 546,
-  //       script: "a914f89ef33376877ad6d01bf5e23bc263f9553bb2d587",
-  //       address: "3QMbvA6PhMSJAhr4Usr7JxVC6LuxQJqNKa",
-  //     },
-  //     {
-  //       txId: "3ac54d4ff0c8e971658b3a20a9f75d912795da2fd83b94465a2cafad3b25f3ef",
-  //       index: 2,
-  //       value: 546,
-  //       script: "a914f89ef33376877ad6d01bf5e23bc263f9553bb2d587",
-  //       address: "3QMbvA6PhMSJAhr4Usr7JxVC6LuxQJqNKa",
-  //     },
-  //     {
-  //       txId: "49f4fc74c20ea50e2ce6d2c9b3bcfdcbba600a1f691d20bfb4f39b77170bd2e6",
-  //       index: 3,
-  //       value: 35637,
-  //       script: "a914f89ef33376877ad6d01bf5e23bc263f9553bb2d587",
-  //       address: "3QMbvA6PhMSJAhr4Usr7JxVC6LuxQJqNKa",
-  //     },
-  //   ],
-  // )
-  const a = await btcInterface.getRequestProof({
-    txId: "4a24b07a9faa9929153d544fd1cbb0f83f5b7eb43977a88b8c1c2b704fa112af",
-  })
-  console.log(JSON.stringify(a, null, 2))
-
-  // console.log(
-  //   txs.filter(
-  //     (t, i) => !txs.find((tt, ii) => t.txId === tt.txId && t.address === tt.address && ii < i),
-  //   ),
-  // )
-}
-
-start()

package/.tmp/check.ts

@@ -1,101 +0,0 @@
-import { BitcoinBase, TeleportDaoPayment, TransferRequest } from "@teleportdao/bitcoin"
-import { parseRawTransaction } from "../dist/bitcoin-utils"
-;(async () => {
-  const testnet = true
-  let address = "tb1psfytxls4urhycq63xjrfmseq73wwuql2syn3n8398rqkyf5m3z8shy5sl7"
-  let btc = new TeleportDaoPayment("bitcoin_testnet")
-  let deadline = Math.ceil(new Date().getTime() / 1000 + 3600)
-  let transferRequest: TransferRequest = {
-    changeAddress: address,
-    lockerAddress: testnet
-      ? "2MzQA2boKkWPkooDkN9dKfqzFndSvjHw5kg"
-      : "3CAQAw7m95axbY761Xq8d9DADhjNaX9b8o",
-    amount: +(0.0001 * 1e8).toFixed(),
-    recipientAddress: "0x7C124a845BC48D957748661452dc996FF487B252",
-    percentageFee: 4, // 2 bytes in satoshi
-
-    chainId: 3,
-    appId: 0,
-    speed: 0, // 1 byte
-
-    // exchange
-    isExchange: false,
-    exchangeTokenAddress: undefined,
-    outputAmount: undefined,
-    isFixedToken: false,
-    deadline,
-    feeSpeed: "normal",
-  }
-
-  let extendedUtxo = await btc.transactionBuilder.getExtendedUtxo({
-    address: address,
-    addressType: "p2tr",
-    publicKey: "021f6adece8789d520aaea90a2ca9faff45bdd2dca02fd819815673953dc674d54",
-    includeHex: false,
-  })
-  console.log(extendedUtxo.reduce((a, b) => a + b.value, 0) / 1e8)
-  extendedUtxo = extendedUtxo.filter((u) => u.value > 145 * 68)
-  console.log(extendedUtxo.reduce((a, b) => a + b.value, 0) / 1e8)
-  console.log(extendedUtxo.length)
-
-  // const extendedUtxo = [
-  //   {
-  //     hash: "1a69625b1fe4392e4130f30fa1e6794dd8b81f54bc9d7ccf7a3479d8ccf419a6",
-  //     value: 99787,
-  //     index: 1,
-  //     signerInfo: {
-  //       address: "tb1psfytxls4urhycq63xjrfmseq73wwuql2syn3n8398rqkyf5m3z8shy5sl7",
-  //       publicKey: "021f6adece8789d520aaea90a2ca9faff45bdd2dca02fd819815673953dc674d54",
-  //       addressType: "p2tr",
-  //     },
-  //   },
-  //   {
-  //     hash: "93f0b41f26480068a219a8620313f6fa146f076e4ef03ab781638965a2a1c7c4",
-  //     value: 8000,
-  //     index: 1,
-  //     signerInfo: {
-  //       address: "tb1psfytxls4urhycq63xjrfmseq73wwuql2syn3n8398rqkyf5m3z8shy5sl7",
-  //       publicKey: "021f6adece8789d520aaea90a2ca9faff45bdd2dca02fd819815673953dc674d54",
-  //       addressType: "p2tr",
-  //     },
-  //   },
-  //   {
-  //     hash: "6c666a7036fdff9f4c1cce2f9233eac3c4b56601cdc5ea82554b8af90e962ced",
-  //     value: 8000,
-  //     index: 1,
-  //     signerInfo: {
-  //       address: "tb1psfytxls4urhycq63xjrfmseq73wwuql2syn3n8398rqkyf5m3z8shy5sl7",
-  //       publicKey: "021f6adece8789d520aaea90a2ca9faff45bdd2dca02fd819815673953dc674d54",
-  //       addressType: "p2tr",
-  //     },
-  //   },
-  //   {
-  //     hash: "2437ddbde4bb469c5c1f8dcb09959962a9e844ba9b56420bb5391fb29f50400c",
-  //     value: 8000,
-  //     index: 0,
-  //     signerInfo: {
-  //       address: "tb1psfytxls4urhycq63xjrfmseq73wwuql2syn3n8398rqkyf5m3z8shy5sl7",
-  //       publicKey: "021f6adece8789d520aaea90a2ca9faff45bdd2dca02fd819815673953dc674d54",
-  //       addressType: "p2tr",
-  //     },
-  //   },
-  // ]
-
-  // normal transfer
-  // let tx = await btc.transactionBuilder.processUnsignedTransaction({
-  //   extendedUtxo,
-  //   targets: [{
-  //     address: addressObj.address!,
-  //     value: 0.0001 * 1e8
-  //   }],
-  //   feeRate:1,
-  //   changeAddress: addressObj.address!
-  // })
-
-  let tx = await btc.getBitcoinToEthUnsignedPsbt({
-    ...transferRequest,
-    extendedUtxo,
-  })
-
-  console.log("tx", tx)
-})()