@teleportdao/bitcoin 1.0.2 → 1.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (16) hide show
  1. package/dist/bitcoin-base.d.ts +1 -0
  2. package/dist/bitcoin-base.d.ts.map +1 -1
  3. package/dist/bitcoin-base.js +5 -1
  4. package/dist/bitcoin-base.js.map +1 -1
  5. package/dist/bitcoin-utils.d.ts +3 -3
  6. package/dist/bitcoin-utils.d.ts.map +1 -1
  7. package/dist/bitcoin-utils.js +12 -30
  8. package/dist/bitcoin-utils.js.map +1 -1
  9. package/dist/teleport-dao-payments.d.ts +6 -3
  10. package/dist/teleport-dao-payments.d.ts.map +1 -1
  11. package/dist/teleport-dao-payments.js +16 -12
  12. package/dist/teleport-dao-payments.js.map +1 -1
  13. package/package.json +5 -5
  14. package/src/bitcoin-base.js +5 -2
  15. package/src/bitcoin-utils.js +12 -15
  16. package/src/teleport-dao-payments.js +16 -9
package/dist/bitcoin-base.d.ts CHANGED
@@ -35,6 +35,7 @@ declare class BitcoinBase {
35
35
  }): void;
36
36
  setAccount(accountType?: string): string | undefined;
37
37
  addressObj: import("bitcoinjs-lib").Payment | undefined;
38
+ bitcoinAddress: string | undefined;
38
39
  getExtendedUtxo({ address, addressType, publicKey, derivationPath }: {
39
40
  address: string;
40
41
  addressType: string;
package/dist/bitcoin-base.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"bitcoin-base.d.ts","sourceRoot":"","sources":["../src/bitcoin-base.js"],"names":[],"mappings":";AASA;IAyGE;;;;;;gBAmBC;IA3HD;;;;;OAwBC;IAfC,aAAoC;IACpC,kBAA6E;IAE7E,uCAA2F;IAC3F,4CAAwD;IAExD,oBAA2C;IAE3C,0CAA0B;IAC1B,kCAA8B;IAE9B,0BAAsB;IACtB,yBAAqB;IAErB,kBAAoB;IAGtB,+CAiBC;IAED,+CAEC;IAED,6CAEC;IAED;;;;;;aAkBC;IAED,qDASC;IAFC,wDAA4B;IAe9B;QAR8B,OAAO;QACP,WAAW;QACV,SAAS;QAET,cAAc;QACd,YAAY;qBAU1C;IAuBD;;;;;qBAuBC;IAED,8CAIC;IAED,uDAIC;CACF"}
1
+ {"version":3,"file":"bitcoin-base.d.ts","sourceRoot":"","sources":["../src/bitcoin-base.js"],"names":[],"mappings":";AASA;IA4GE;;;;;;gBAmBC;IA9HD;;;;;OAwBC;IAfC,aAAoC;IACpC,kBAA6E;IAE7E,uCAA2F;IAC3F,4CAAwD;IAExD,oBAA2C;IAE3C,0CAA0B;IAC1B,kCAA8B;IAE9B,0BAAsB;IACtB,yBAAqB;IAErB,kBAAoB;IAGtB,+CAiBC;IAED,+CAIC;IAED,6CAEC;IAED;;;;;;aAkBC;IAED,qDAUC;IAHC,wDAA4B;IAC5B,mCAAwC;IAe1C;QAR8B,OAAO;QACP,WAAW;QACV,SAAS;QAET,cAAc;QACd,YAAY;qBAU1C;IAuBD;;;;;qBAuBC;IAED,8CAIC;IAED,uDAIC;CACF"}
package/dist/bitcoin-base.js CHANGED
@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
11
11
  const bip39 = require("bip39");
12
12
  const bip32 = require("bip32");
13
13
  const hdWalletNetworksPath = require("@teleportdao/configs").hdWalletPath;
14
+ const { getPubKeyFromPrivateKeyHex } = require("./bitcoin-utils");
14
15
  const networks = require("./utils/networks");
15
16
  const TransactionBuilder = require("./transaction-builder/bitcoin-transaction-builder");
16
17
  const BitcoinSign = require("./sign/sign-transaction");
@@ -41,6 +42,8 @@ class BitcoinBase {
41
42
  }
42
43
  setAccountPrivateKey(privateKeyHex) {
43
44
  this.privateKey = Buffer.from(privateKeyHex, "hex");
45
+ let publicKey = getPubKeyFromPrivateKeyHex(privateKeyHex, this.network);
46
+ this.publicKey = publicKey;
44
47
  }
45
48
  setAccountPublicKey(publicKeyHex) {
46
49
  this.publicKey = Buffer.from(publicKeyHex, "hex");
@@ -56,7 +59,7 @@ class BitcoinBase {
56
59
  const account = node.derivePath(path);
57
60
  const userKeyPair = account.derive(index);
58
61
  this.setAccountPrivateKey(userKeyPair.privateKey.toString("hex"));
59
- this.setAccountPublicKey(userKeyPair.publicKey.toString("hex"));
62
+ this.setAccount(addressType);
60
63
  }
61
64
  setAccount(accountType = "p2pkh") {
62
65
  let addressObj = this.transactionBuilder.createAddressObject({
@@ -66,6 +69,7 @@ class BitcoinBase {
66
69
  this.currentAccount = addressObj.address;
67
70
  this.currentAccountType = accountType;
68
71
  this.addressObj = addressObj;
72
+ this.bitcoinAddress = addressObj.address;
69
73
  return addressObj.address;
70
74
  }
71
75
  getExtendedUtxo({ address, addressType, publicKey, derivationPath }) {
package/dist/bitcoin-base.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"bitcoin-base.js","sourceRoot":"","sources":["../src/bitcoin-base.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"bitcoin-base.js","sourceRoot":"","sources":["../src/bitcoin-base.js"],"names":[],"mappings":"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"}
package/dist/bitcoin-utils.d.ts CHANGED
@@ -27,9 +27,9 @@ export function createAddressObjectByScript({ addressType, script }: {
27
27
  script: any;
28
28
  }, network: any): bitcoin.payments.Payment;
29
29
  export function getAddressType(address: any, network: any): "p2wpkh" | "p2sh" | "p2pkh";
30
- export function deriveAddressFromPubKey(pubKey: any, network: any): Promise<any>;
31
- export function deriveAddressFromBufferPubKey(pubKey: any, network: any): Promise<any>;
32
- export function getPubKeyFromPrivateKey(privateKey: any, network: any): Promise<Buffer>;
30
+ export function getPubKeyFromPrivateKeyWIF(privateKeyWIF: any, network: any): Buffer;
31
+ export function getPubKeyFromPrivateKeyHex(privateKeyHex: any, network: any): Buffer;
32
+ export function getPrivateKeyHexFromWIF(privateKeyWIF: any, network: any): string;
33
33
  export function reverseBytes(hexInput: any): string;
34
34
  export function parseBlockHeader(headerHex: any): {};
35
35
  export function generateMnemonic(): string;
package/dist/bitcoin-utils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"bitcoin-utils.d.ts","sourceRoot":"","sources":["../src/bitcoin-utils.js"],"names":[],"mappings":"AAaA;;;;;;;EAsDC;AA0JD;;;EA2BC;AA/JD;;;2CAyBC;AA6BD;;;2CA4BC;AAED;;;EA0BC;AAnFD;;;2CAyBC;AApED,wFAcC;AAoHD,iFAMC;AAED,uFAGC;AAED,wFAGC;AAtJD,oDAEC;AAmLD,qDAgBC;AAlQD,2CAGC;AAyQD;;;;;;;;;;;;;;;;;;;;EA8BC;AAED;;;;;;;;;EA4GC"}
1
+ {"version":3,"file":"bitcoin-utils.d.ts","sourceRoot":"","sources":["../src/bitcoin-utils.js"],"names":[],"mappings":"AAaA;;;;;;;EAsDC;AAuJD;;;EA2BC;AA5JD;;;2CAyBC;AA6BD;;;2CA4BC;AAED;;;EA0BC;AAnFD;;;2CAyBC;AApED,wFAcC;AAoHD,qFAGC;AAED,qFAGC;AAED,kFAGC;AAnJD,oDAEC;AAgLD,qDAgBC;AA/PD,2CAGC;AAsQD;;;;;;;;;;;;;;;;;;;;EA8BC;AAED;;;;;;;;;EA4GC"}
package/dist/bitcoin-utils.js CHANGED
@@ -1,13 +1,4 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  const bip39 = require("bip39");
12
3
  let varUnit = require("varuint-bitcoin");
13
4
  const fastRoot = require("merkle-lib/fastRoot");
@@ -190,26 +181,17 @@ function createAddressObjectByAddress(address, network) {
190
181
  }
191
182
  return { addressObject, addressType };
192
183
  }
193
- function deriveAddressFromPubKey(pubKey, network) {
194
- return __awaiter(this, void 0, void 0, function* () {
195
- let { address } = this.bitcoinJS.payments.p2pkh({
196
- network,
197
- pubkey: Buffer.from(pubKey, "hex"),
198
- });
199
- return address;
200
- });
184
+ function getPubKeyFromPrivateKeyWIF(privateKeyWIF, network) {
185
+ let key = bitcoin.ECPair.fromWIF(privateKeyWIF, network);
186
+ return key.publicKey;
201
187
  }
202
- function deriveAddressFromBufferPubKey(pubKey, network) {
203
- return __awaiter(this, void 0, void 0, function* () {
204
- let { address } = this.bitcoinJS.payments.p2pkh({ network, pubkey: pubKey });
205
- return address;
206
- });
188
+ function getPubKeyFromPrivateKeyHex(privateKeyHex, network) {
189
+ let key = bitcoin.ECPair.fromPrivateKey(Buffer.from(privateKeyHex, "hex"), network);
190
+ return key.publicKey;
207
191
  }
208
- function getPubKeyFromPrivateKey(privateKey, network) {
209
- return __awaiter(this, void 0, void 0, function* () {
210
- let key = bitcoin.ECPair.fromWIF(privateKey, network);
211
- return key.publicKey;
212
- });
192
+ function getPrivateKeyHexFromWIF(privateKeyWIF, network) {
193
+ let key = bitcoin.ECPair.fromWIF(privateKeyWIF, network);
194
+ return key.privateKey.toString("hex");
213
195
  }
214
196
  function calculateMerkleProof(blockTransactions, txId, blockMerkleRoot = undefined) {
215
197
  let transactionIndex = blockTransactions.findIndex((tx) => tx === txId);
@@ -375,9 +357,9 @@ module.exports = {
375
357
  createAddressObjectByAddress,
376
358
  createAddressObjectByScript,
377
359
  getAddressType,
378
- deriveAddressFromPubKey,
379
- deriveAddressFromBufferPubKey,
380
- getPubKeyFromPrivateKey,
360
+ getPubKeyFromPrivateKeyWIF,
361
+ getPubKeyFromPrivateKeyHex,
362
+ getPrivateKeyHexFromWIF,
381
363
  reverseBytes,
382
364
  parseBlockHeader,
383
365
  generateMnemonic,
package/dist/bitcoin-utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"bitcoin-utils.js","sourceRoot":"","sources":["../src/bitcoin-utils.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"bitcoin-utils.js","sourceRoot":"","sources":["../src/bitcoin-utils.js"],"names":[],"mappings":"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"}
package/dist/teleport-dao-payments.d.ts CHANGED
@@ -23,9 +23,10 @@ declare class TeleportDaoPayment extends BitcoinBase {
23
23
  borrowAmount?: number | undefined;
24
24
  }): any;
25
25
  payBurnRequest(receivers: any, feeSpeed?: string): Promise<any>;
26
- transferBitcoinToEth({ lockerAddress, amount, chainId, appId, recipientAddress, percentageFee, speed, isExchange, exchangeTokenAddress, outputAmount, deadline, isFixedToken, feeSpeed, }: {
26
+ transferBitcoinToEth({ lockerAddress, amount, fullAmount, chainId, appId, recipientAddress, percentageFee, speed, isExchange, exchangeTokenAddress, outputAmount, deadline, isFixedToken, feeSpeed, }: {
27
27
  lockerAddress: any;
28
28
  amount: any;
29
+ fullAmount?: boolean | undefined;
29
30
  chainId: any;
30
31
  appId: any;
31
32
  recipientAddress: any;
@@ -38,9 +39,10 @@ declare class TeleportDaoPayment extends BitcoinBase {
38
39
  isFixedToken?: boolean | undefined;
39
40
  feeSpeed?: string | undefined;
40
41
  }): Promise<any>;
41
- getBitcoinToEthTargetOutputs({ lockerAddress, amount, chainId, appId, recipientAddress, percentageFee, speed, isExchange, exchangeTokenAddress, outputAmount, deadline, isFixedToken, }: {
42
+ getBitcoinToEthTargetOutputs({ lockerAddress, amount, fullAmount, chainId, appId, recipientAddress, percentageFee, speed, isExchange, exchangeTokenAddress, outputAmount, deadline, isFixedToken, }: {
42
43
  lockerAddress: any;
43
44
  amount: any;
45
+ fullAmount?: boolean | undefined;
44
46
  chainId: any;
45
47
  appId: any;
46
48
  recipientAddress: any;
@@ -58,11 +60,12 @@ declare class TeleportDaoPayment extends BitcoinBase {
58
60
  address: any;
59
61
  value: any;
60
62
  })[]>;
61
- getBitcoinToEthUnsignedPsbt({ changeAddress, extendedUtxo, lockerAddress, amount, chainId, appId, recipientAddress, percentageFee, speed, isExchange, exchangeTokenAddress, outputAmount, deadline, isFixedToken, feeSpeed, }: {
63
+ getBitcoinToEthUnsignedPsbt({ changeAddress, extendedUtxo, lockerAddress, amount, fullAmount, chainId, appId, recipientAddress, percentageFee, speed, isExchange, exchangeTokenAddress, outputAmount, deadline, isFixedToken, feeSpeed, }: {
62
64
  changeAddress: any;
63
65
  extendedUtxo: any;
64
66
  lockerAddress: any;
65
67
  amount: any;
68
+ fullAmount?: boolean | undefined;
66
69
  chainId: any;
67
70
  appId: any;
68
71
  recipientAddress: any;
package/dist/teleport-dao-payments.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"teleport-dao-payments.d.ts","sourceRoot":"","sources":["../src/teleport-dao-payments.js"],"names":[],"mappings":";AAEA;IA2ME;;;;;;;;;;;eAoCC;IAED;;;;;;;;;YA6BC;IA5QD,gEAsBC;IAGD;;;;;;;;;;;;;;qBA0CC;IAGD;;;;;;;;;;;;;;;;;;;UAmCC;IAED;;;;;;;;;;;;;;;;sBAyCC;IAGD;;;;;;;;;;;qBAgDC;CAsEF"}
1
+ {"version":3,"file":"teleport-dao-payments.d.ts","sourceRoot":"","sources":["../src/teleport-dao-payments.js"],"names":[],"mappings":";AAEA;IAkNE;;;;;;;;;;;eAoCC;IAED;;;;;;;;;YA6BC;IAnRD,gEAsBC;IAGD;;;;;;;;;;;;;;;qBA4CC;IAGD;;;;;;;;;;;;;;;;;;;;UAsCC;IAED;;;;;;;;;;;;;;;;;sBA2CC;IAGD;;;;;;;;;;;qBAgDC;CAsEF"}
package/dist/teleport-dao-payments.js CHANGED
@@ -33,7 +33,7 @@ class TeleportDaoPayment extends BitcoinBase {
33
33
  return txId;
34
34
  });
35
35
  }
36
- transferBitcoinToEth({ lockerAddress, amount, chainId, appId, recipientAddress, percentageFee, speed = 0, isExchange = false, exchangeTokenAddress = "0x0000000000000000000000000000000000000000", outputAmount = 0, deadline, isFixedToken = false, feeSpeed = "normal", }) {
36
+ transferBitcoinToEth({ lockerAddress, amount, fullAmount = false, chainId, appId, recipientAddress, percentageFee, speed = 0, isExchange = false, exchangeTokenAddress = "0x0000000000000000000000000000000000000000", outputAmount = 0, deadline, isFixedToken = false, feeSpeed = "normal", }) {
37
37
  return __awaiter(this, void 0, void 0, function* () {
38
38
  let extendedUtxo = yield this.getExtendedUtxo({
39
39
  address: this.currentAccount,
@@ -45,6 +45,7 @@ class TeleportDaoPayment extends BitcoinBase {
45
45
  extendedUtxo,
46
46
  lockerAddress,
47
47
  amount,
48
+ fullAmount,
48
49
  chainId,
49
50
  appId,
50
51
  recipientAddress,
@@ -62,7 +63,7 @@ class TeleportDaoPayment extends BitcoinBase {
62
63
  return txId;
63
64
  });
64
65
  }
65
- getBitcoinToEthTargetOutputs({ lockerAddress, amount, chainId, appId, recipientAddress, percentageFee, speed = 0, isExchange = false, exchangeTokenAddress = "0x0000000000000000000000000000000000000000", outputAmount = 0, deadline, isFixedToken = false, }) {
66
+ getBitcoinToEthTargetOutputs({ lockerAddress, amount, fullAmount = false, chainId, appId, recipientAddress, percentageFee, speed = 0, isExchange = false, exchangeTokenAddress = "0x0000000000000000000000000000000000000000", outputAmount = 0, deadline, isFixedToken = false, }) {
66
67
  return __awaiter(this, void 0, void 0, function* () {
67
68
  let dataHex = TeleportDaoPayment.getTransferOpReturnData({
68
69
  chainId,
@@ -77,21 +78,24 @@ class TeleportDaoPayment extends BitcoinBase {
77
78
  isFixedToken,
78
79
  });
79
80
  let opTarget = this.transactionBuilder.getOpReturnTarget(dataHex);
80
- return [
81
- {
82
- address: lockerAddress,
83
- value: amount,
84
- },
85
- opTarget,
86
- ];
81
+ return fullAmount
82
+ ? [opTarget]
83
+ : [
84
+ {
85
+ address: lockerAddress,
86
+ value: amount,
87
+ },
88
+ opTarget,
89
+ ];
87
90
  });
88
91
  }
89
- getBitcoinToEthUnsignedPsbt({ changeAddress, extendedUtxo, lockerAddress, amount, chainId, appId, recipientAddress, percentageFee, speed = 0, isExchange = false, exchangeTokenAddress = "0x0000000000000000000000000000000000000000", outputAmount = 0, deadline, isFixedToken = false, feeSpeed = "normal", }) {
92
+ getBitcoinToEthUnsignedPsbt({ changeAddress, extendedUtxo, lockerAddress, amount, fullAmount = false, chainId, appId, recipientAddress, percentageFee, speed = 0, isExchange = false, exchangeTokenAddress = "0x0000000000000000000000000000000000000000", outputAmount = 0, deadline, isFixedToken = false, feeSpeed = "normal", }) {
90
93
  return __awaiter(this, void 0, void 0, function* () {
91
94
  let feeRate = yield this.transactionBuilder._getFeeRate(feeSpeed);
92
95
  let targets = yield this.getBitcoinToEthTargetOutputs({
93
96
  lockerAddress,
94
97
  amount,
98
+ fullAmount,
95
99
  chainId,
96
100
  appId,
97
101
  recipientAddress,
@@ -106,9 +110,9 @@ class TeleportDaoPayment extends BitcoinBase {
106
110
  let unsignedTx = yield this.transactionBuilder.processUnsignedTransaction({
107
111
  extendedUtxo,
108
112
  targets,
109
- changeAddress,
113
+ changeAddress: fullAmount ? lockerAddress : changeAddress,
110
114
  feeRate,
111
- fullAmount: false,
115
+ fullAmount,
112
116
  });
113
117
  return unsignedTx;
114
118
  });
package/dist/teleport-dao-payments.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"teleport-dao-payments.js","sourceRoot":"","sources":["../src/teleport-dao-payments.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"teleport-dao-payments.js","sourceRoot":"","sources":["../src/teleport-dao-payments.js"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,19 +1,19 @@
1
1
  {
2
2
  "name": "@teleportdao/bitcoin",
3
- "version": "1.0.2",
3
+ "version": "1.0.3",
4
4
  "description": "provider for different networks",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
7
7
  "scripts": {
8
- "test": "echo \"Error: no test specified\" && exit 1",
8
+ "test": "echo \"Error: no test specified\" && exit 3",
9
9
  "build": "tsc",
10
10
  "build:watch": "tsc --watch"
11
11
  },
12
12
  "author": "",
13
13
  "license": "ISC",
14
14
  "dependencies": {
15
- "@teleportdao/configs": "^1.0.2",
16
- "@teleportdao/providers": "^1.0.1",
15
+ "@teleportdao/configs": "^1.0.3",
16
+ "@teleportdao/providers": "^1.0.3",
17
17
  "axios": "^0.27.2",
18
18
  "bip32": "^2.0.6",
19
19
  "bip39": "^3.0.4",
@@ -30,5 +30,5 @@
30
30
  "publishConfig": {
31
31
  "access": "public"
32
32
  },
33
- "gitHead": "621ca0f12a0c6472d04f6b3e6d28c08a3a035e33"
33
+ "gitHead": "05f1a899a35428f859b26eee4f916a436b8de9d6"
34
34
  }
package/src/bitcoin-base.js CHANGED
@@ -1,7 +1,7 @@
1
1
  const bip39 = require("bip39")
2
2
  const bip32 = require("bip32")
3
3
  const hdWalletNetworksPath = require("@teleportdao/configs").hdWalletPath
4
-
4
+ const { getPubKeyFromPrivateKeyHex } = require("./bitcoin-utils")
5
5
  const networks = require("./utils/networks")
6
6
 
7
7
  const TransactionBuilder = require("./transaction-builder/bitcoin-transaction-builder")
@@ -55,6 +55,8 @@ class BitcoinBase {
55
55
 
56
56
  setAccountPrivateKey(privateKeyHex) {
57
57
  this.privateKey = Buffer.from(privateKeyHex, "hex")
58
+ let publicKey = getPubKeyFromPrivateKeyHex(privateKeyHex, this.network)
59
+ this.publicKey = publicKey
58
60
  }
59
61
 
60
62
  setAccountPublicKey(publicKeyHex) {
@@ -78,7 +80,7 @@ class BitcoinBase {
78
80
  const account = node.derivePath(path)
79
81
  const userKeyPair = account.derive(index)
80
82
  this.setAccountPrivateKey(userKeyPair.privateKey.toString("hex"))
81
- this.setAccountPublicKey(userKeyPair.publicKey.toString("hex"))
83
+ this.setAccount(addressType)
82
84
  }
83
85
 
84
86
  setAccount(accountType = "p2pkh") {
@@ -89,6 +91,7 @@ class BitcoinBase {
89
91
  this.currentAccount = addressObj.address
90
92
  this.currentAccountType = accountType
91
93
  this.addressObj = addressObj
94
+ this.bitcoinAddress = addressObj.address
92
95
  return addressObj.address
93
96
  }
94
97
 
package/src/bitcoin-utils.js CHANGED
@@ -201,22 +201,19 @@ function createAddressObjectByAddress(address, network) {
201
201
 
202
202
  // not used
203
203
 
204
- async function deriveAddressFromPubKey(pubKey, network) {
205
- let { address } = this.bitcoinJS.payments.p2pkh({
206
- network,
207
- pubkey: Buffer.from(pubKey, "hex"),
208
- })
209
- return address
204
+ function getPubKeyFromPrivateKeyWIF(privateKeyWIF, network) {
205
+ let key = bitcoin.ECPair.fromWIF(privateKeyWIF, network)
206
+ return key.publicKey
210
207
  }
211
208
 
212
- async function deriveAddressFromBufferPubKey(pubKey, network) {
213
- let { address } = this.bitcoinJS.payments.p2pkh({ network, pubkey: pubKey })
214
- return address
209
+ function getPubKeyFromPrivateKeyHex(privateKeyHex, network) {
210
+ let key = bitcoin.ECPair.fromPrivateKey(Buffer.from(privateKeyHex, "hex"), network)
211
+ return key.publicKey
215
212
  }
216
213
 
217
- async function getPubKeyFromPrivateKey(privateKey, network) {
218
- let key = bitcoin.ECPair.fromWIF(privateKey, network)
219
- return key.publicKey
214
+ function getPrivateKeyHexFromWIF(privateKeyWIF, network) {
215
+ let key = bitcoin.ECPair.fromWIF(privateKeyWIF, network)
216
+ return key.privateKey.toString("hex")
220
217
  }
221
218
 
222
219
  function calculateMerkleProof(blockTransactions, txId, blockMerkleRoot = undefined) {
@@ -426,9 +423,9 @@ module.exports = {
426
423
 
427
424
  // ------------------------
428
425
  getAddressType,
429
- deriveAddressFromPubKey,
430
- deriveAddressFromBufferPubKey,
431
- getPubKeyFromPrivateKey,
426
+ getPubKeyFromPrivateKeyWIF,
427
+ getPubKeyFromPrivateKeyHex,
428
+ getPrivateKeyHexFromWIF,
432
429
  reverseBytes,
433
430
 
434
431
  parseBlockHeader,
package/src/teleport-dao-payments.js CHANGED
@@ -30,6 +30,7 @@ class TeleportDaoPayment extends BitcoinBase {
30
30
  async transferBitcoinToEth({
31
31
  lockerAddress,
32
32
  amount,
33
+ fullAmount = false,
33
34
  //-----------
34
35
  chainId,
35
36
  appId,
@@ -53,6 +54,7 @@ class TeleportDaoPayment extends BitcoinBase {
53
54
  extendedUtxo,
54
55
  lockerAddress,
55
56
  amount,
57
+ fullAmount,
56
58
  //-----------
57
59
  chainId,
58
60
  appId,
@@ -75,6 +77,7 @@ class TeleportDaoPayment extends BitcoinBase {
75
77
  async getBitcoinToEthTargetOutputs({
76
78
  lockerAddress,
77
79
  amount,
80
+ fullAmount = false,
78
81
  //-----------
79
82
  chainId,
80
83
  appId,
@@ -100,13 +103,15 @@ class TeleportDaoPayment extends BitcoinBase {
100
103
  isFixedToken,
101
104
  })
102
105
  let opTarget = this.transactionBuilder.getOpReturnTarget(dataHex)
103
- return [
104
- {
105
- address: lockerAddress,
106
- value: amount,
107
- },
108
- opTarget,
109
- ]
106
+ return fullAmount
107
+ ? [opTarget]
108
+ : [
109
+ {
110
+ address: lockerAddress,
111
+ value: amount,
112
+ },
113
+ opTarget,
114
+ ]
110
115
  }
111
116
 
112
117
  async getBitcoinToEthUnsignedPsbt({
@@ -114,6 +119,7 @@ class TeleportDaoPayment extends BitcoinBase {
114
119
  extendedUtxo,
115
120
  lockerAddress,
116
121
  amount,
122
+ fullAmount = false,
117
123
  //-----------
118
124
  chainId,
119
125
  appId,
@@ -131,6 +137,7 @@ class TeleportDaoPayment extends BitcoinBase {
131
137
  let targets = await this.getBitcoinToEthTargetOutputs({
132
138
  lockerAddress,
133
139
  amount,
140
+ fullAmount,
134
141
  chainId,
135
142
  appId,
136
143
  recipientAddress,
@@ -145,9 +152,9 @@ class TeleportDaoPayment extends BitcoinBase {
145
152
  let unsignedTx = await this.transactionBuilder.processUnsignedTransaction({
146
153
  extendedUtxo,
147
154
  targets,
148
- changeAddress,
155
+ changeAddress: fullAmount ? lockerAddress : changeAddress,
149
156
  feeRate,
150
- fullAmount: false,
157
+ fullAmount,
151
158
  })
152
159
  return unsignedTx
153
160
  }