@teleportdao/bitcoin 1.4.8 → 1.5.0
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.
- package/.tmp/check.ts +16 -0
- package/dist/bitcoin-base.d.ts +7 -0
- package/dist/bitcoin-base.d.ts.map +1 -1
- package/dist/bitcoin-base.js +21 -1
- package/dist/bitcoin-base.js.map +1 -1
- package/dist/bitcoin-interface-utils.d.ts +2 -2
- package/dist/bitcoin-interface.d.ts +2 -2
- package/dist/bitcoin-interface.d.ts.map +1 -1
- package/dist/bitcoin-interface.js +6 -9
- package/dist/bitcoin-interface.js.map +1 -1
- package/dist/bitcoin-utils-2.d.ts +2 -0
- package/dist/bitcoin-utils-2.d.ts.map +1 -0
- package/dist/bitcoin-utils-2.js +13 -0
- package/dist/bitcoin-utils-2.js.map +1 -0
- package/dist/bitcoin-utils.d.ts +6 -6
- package/dist/bitcoin-utils.d.ts.map +1 -1
- package/dist/bitcoin-utils.js +58 -31
- package/dist/bitcoin-utils.js.map +1 -1
- package/dist/bundle.js +9 -5
- package/dist/helper/teleport-request-helper.d.ts.map +1 -1
- package/dist/helper/teleport-request-helper.js +2 -2
- package/dist/helper/teleport-request-helper.js.map +1 -1
- package/dist/sign/sign-transaction.d.ts.map +1 -1
- package/dist/sign/sign-transaction.js +60 -2
- package/dist/sign/sign-transaction.js.map +1 -1
- package/dist/teleport-dao-payments.d.ts +5 -3
- package/dist/teleport-dao-payments.d.ts.map +1 -1
- package/dist/teleport-dao-payments.js +6 -5
- package/dist/teleport-dao-payments.js.map +1 -1
- package/package.json +15 -11
- package/src/bitcoin-base.ts +29 -2
- package/src/bitcoin-interface.ts +18 -9
- package/src/bitcoin-utils.ts +72 -73
- package/src/helper/teleport-request-helper.js +5 -3
- package/src/sign/sign-transaction.ts +49 -48
- package/src/teleport-dao-payments.ts +8 -2
- package/src/mempool-space.ts +0 -255
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"teleport-request-helper.d.ts","sourceRoot":"","sources":["../../src/helper/teleport-request-helper.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"teleport-request-helper.d.ts","sourceRoot":"","sources":["../../src/helper/teleport-request-helper.js"],"names":[],"mappings":"AAyJA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuBC"}
|
|
@@ -64,7 +64,6 @@ function parseLendAndBorrowRequest(data) {
|
|
|
64
64
|
};
|
|
65
65
|
}
|
|
66
66
|
function parseRawRequest(opReturnData) {
|
|
67
|
-
var _a;
|
|
68
67
|
let data = opReturnData.slice(2, 4) === "4c" ? opReturnData.slice(6) : opReturnData.slice(4);
|
|
69
68
|
let _chainId = Number(`0x${data.slice(0, 2)}`);
|
|
70
69
|
let appIdHex = data.slice(2, 6);
|
|
@@ -76,7 +75,8 @@ function parseRawRequest(opReturnData) {
|
|
|
76
75
|
};
|
|
77
76
|
}
|
|
78
77
|
let appId = Number(`0x${appIdHex}`);
|
|
79
|
-
let requestType = (
|
|
78
|
+
let requestType = Object.keys(teleportRequestsType).find((key) => appId >= teleportRequestsType[key].appIdRange[0] &&
|
|
79
|
+
appId <= teleportRequestsType[key].appIdRange[1]);
|
|
80
80
|
switch (requestType) {
|
|
81
81
|
case "transfer":
|
|
82
82
|
case "exchange":
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"teleport-request-helper.js","sourceRoot":"","sources":["../../src/helper/teleport-request-helper.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"teleport-request-helper.js","sourceRoot":"","sources":["../../src/helper/teleport-request-helper.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sign-transaction.d.ts","sourceRoot":"","sources":["../../src/sign/sign-transaction.ts"],"names":[],"mappings":";AAAA,OAAO,EAAgB,OAAO,
|
|
1
|
+
{"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"}
|
|
@@ -1,4 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
26
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
27
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -8,8 +31,36 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
31
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
32
|
});
|
|
10
33
|
};
|
|
34
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
35
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
|
+
};
|
|
11
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
38
|
const bitcoinjs_lib_1 = require("bitcoinjs-lib");
|
|
39
|
+
const secp256k1_1 = __importDefault(require("@bitcoinerlab/secp256k1"));
|
|
40
|
+
const bitcoinEcPair = __importStar(require("bitcoinjs-ecpair"));
|
|
41
|
+
const ECPair = bitcoinEcPair.ECPair;
|
|
42
|
+
function tapTweakHash(pubKey, h) {
|
|
43
|
+
return bitcoinjs_lib_1.crypto.taggedHash("TapTweak", Buffer.concat(h ? [pubKey, h] : [pubKey]));
|
|
44
|
+
}
|
|
45
|
+
function tweakSigner(privateKey, opts = {}, network) {
|
|
46
|
+
let newPrv = privateKey;
|
|
47
|
+
let keyPair = ECPair.fromPrivateKey(privateKey, {
|
|
48
|
+
network: network,
|
|
49
|
+
compressed: true,
|
|
50
|
+
});
|
|
51
|
+
if (!keyPair.privateKey)
|
|
52
|
+
throw new Error("private key not exist");
|
|
53
|
+
if (keyPair.publicKey.toString("hex").startsWith("03")) {
|
|
54
|
+
newPrv = secp256k1_1.default.privateNegate(keyPair.privateKey);
|
|
55
|
+
}
|
|
56
|
+
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));
|
|
57
|
+
if (!tweakedPrivateKey) {
|
|
58
|
+
throw new Error("Invalid tweaked private key!");
|
|
59
|
+
}
|
|
60
|
+
return ECPair.fromPrivateKey(Buffer.from(tweakedPrivateKey), {
|
|
61
|
+
network: network,
|
|
62
|
+
});
|
|
63
|
+
}
|
|
13
64
|
class BitcoinLikeSignTransaction {
|
|
14
65
|
constructor(network) {
|
|
15
66
|
this.network = network;
|
|
@@ -17,7 +68,7 @@ class BitcoinLikeSignTransaction {
|
|
|
17
68
|
signPsbt(unsignedPsbt, privateKey) {
|
|
18
69
|
return __awaiter(this, void 0, void 0, function* () {
|
|
19
70
|
const { network } = this;
|
|
20
|
-
const keyPair =
|
|
71
|
+
const keyPair = ECPair.fromPrivateKey(privateKey, {
|
|
21
72
|
network,
|
|
22
73
|
compressed: true,
|
|
23
74
|
});
|
|
@@ -26,7 +77,14 @@ class BitcoinLikeSignTransaction {
|
|
|
26
77
|
});
|
|
27
78
|
let numberOfInputs = psbt.inputCount;
|
|
28
79
|
for (let i = 0; i < numberOfInputs; i += 1) {
|
|
29
|
-
|
|
80
|
+
let type = psbt.getInputType(i);
|
|
81
|
+
if (type === "nonstandard") {
|
|
82
|
+
let a = tweakSigner(privateKey, undefined, this.network);
|
|
83
|
+
yield psbt.signInputAsync(i, a);
|
|
84
|
+
}
|
|
85
|
+
else {
|
|
86
|
+
yield psbt.signInputAsync(i, keyPair);
|
|
87
|
+
}
|
|
30
88
|
}
|
|
31
89
|
const partialSigendPsbt = psbt.toBase64();
|
|
32
90
|
return partialSigendPsbt;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sign-transaction.js","sourceRoot":"","sources":["../../src/sign/sign-transaction.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sign-transaction.js","sourceRoot":"","sources":["../../src/sign/sign-transaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,12 +16,13 @@ export type TransferRequest = {
|
|
|
16
16
|
deadline?: number;
|
|
17
17
|
isFixedToken?: boolean;
|
|
18
18
|
feeSpeed?: "normal" | "fast" | "slow";
|
|
19
|
+
staticFeeRate?: number;
|
|
19
20
|
};
|
|
20
21
|
export declare class TeleportDaoPayment extends BitcoinBase {
|
|
21
22
|
payBurnRequest(receivers: Target[], feeSpeed?: "normal" | "fast" | "slow"): Promise<string>;
|
|
22
|
-
transferBitcoinToEth({ lockerAddress, amount, fullAmount, chainId, appId, recipientAddress, percentageFee, speed, isExchange, exchangeTokenAddress, outputAmount, deadline, isFixedToken, feeSpeed, }: TransferRequest): Promise<string>;
|
|
23
|
+
transferBitcoinToEth({ lockerAddress, amount, fullAmount, chainId, appId, recipientAddress, percentageFee, speed, isExchange, exchangeTokenAddress, outputAmount, deadline, isFixedToken, feeSpeed, staticFeeRate, }: TransferRequest): Promise<string>;
|
|
23
24
|
getBitcoinToEthTargetOutputs({ lockerAddress, amount, fullAmount, chainId, appId, recipientAddress, percentageFee, speed, isExchange, exchangeTokenAddress, outputAmount, deadline, isFixedToken, }: TransferRequest): Promise<Target[]>;
|
|
24
|
-
getBitcoinToEthUnsignedPsbt({ changeAddress, extendedUtxo, lockerAddress, amount, fullAmount, chainId, appId, recipientAddress, percentageFee, speed, isExchange, exchangeTokenAddress, outputAmount, deadline, isFixedToken, feeSpeed, }: TransferRequest & {
|
|
25
|
+
getBitcoinToEthUnsignedPsbt({ changeAddress, extendedUtxo, lockerAddress, amount, fullAmount, chainId, appId, recipientAddress, percentageFee, speed, isExchange, exchangeTokenAddress, outputAmount, deadline, isFixedToken, feeSpeed, staticFeeRate, }: TransferRequest & {
|
|
25
26
|
extendedUtxo: ExtendedUtxo[];
|
|
26
27
|
}): Promise<{
|
|
27
28
|
unsignedTransaction: string;
|
|
@@ -35,13 +36,14 @@ export declare class TeleportDaoPayment extends BitcoinBase {
|
|
|
35
36
|
fee: number;
|
|
36
37
|
change: import("./transaction-builder/transaction-builder").ChangeTarget | undefined;
|
|
37
38
|
}>;
|
|
38
|
-
bitcoinToEthLend({ lockerAddress, amount, chainId, appId, recipientAddress, percentageFee, mode, isBorrow, tokenAddress, borrowAmount, }: {
|
|
39
|
+
bitcoinToEthLend({ lockerAddress, amount, chainId, appId, recipientAddress, percentageFee, mode, isBorrow, tokenAddress, borrowAmount, staticFeeRate, }: {
|
|
39
40
|
lockerAddress: string;
|
|
40
41
|
amount: number;
|
|
41
42
|
chainId: number;
|
|
42
43
|
appId: number;
|
|
43
44
|
recipientAddress: string;
|
|
44
45
|
percentageFee: number;
|
|
46
|
+
staticFeeRate: number;
|
|
45
47
|
mode?: 0 | 1 | boolean;
|
|
46
48
|
isBorrow?: boolean;
|
|
47
49
|
tokenAddress?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"teleport-dao-payments.d.ts","sourceRoot":"","sources":["../src/teleport-dao-payments.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAA;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAE5C,MAAM,MAAM,eAAe,GAAG;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,aAAa,EAAE,MAAM,CAAA;IACrB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,OAAO,CAAA;IAEpB,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;IACb,gBAAgB,EAAE,MAAM,CAAA;IACxB,aAAa,EAAE,MAAM,CAAA;IACrB,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;IACxB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,QAAQ,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"teleport-dao-payments.d.ts","sourceRoot":"","sources":["../src/teleport-dao-payments.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAA;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAE5C,MAAM,MAAM,eAAe,GAAG;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,aAAa,EAAE,MAAM,CAAA;IACrB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,OAAO,CAAA;IAEpB,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;IACb,gBAAgB,EAAE,MAAM,CAAA;IACxB,aAAa,EAAE,MAAM,CAAA;IACrB,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;IACxB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,QAAQ,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAA;IACrC,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB,CAAA;AACD,qBAAa,kBAAmB,SAAQ,WAAW;IAE3C,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,QAAQ,GAAG,MAAM,GAAG,MAAiB;IAyBnF,oBAAoB,CAAC,EACzB,aAAa,EACb,MAAM,EACN,UAAkB,EAElB,OAAO,EACP,KAAK,EACL,gBAAgB,EAChB,aAAa,EACb,KAAS,EACT,UAAkB,EAClB,oBAAmE,EACnE,YAAgB,EAChB,QAAQ,EACR,YAAoB,EACpB,QAAmB,EACnB,aAAa,GACd,EAAE,eAAe;IAmCZ,4BAA4B,CAAC,EACjC,aAAa,EACb,MAAM,EACN,UAAkB,EAElB,OAAO,EACP,KAAK,EACL,gBAAgB,EAChB,aAAa,EACb,KAAS,EACT,UAAkB,EAClB,oBAAmE,EACnE,YAAgB,EAChB,QAAY,EACZ,YAAoB,GACrB,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAyBhC,2BAA2B,CAAC,EAChC,aAAa,EACb,YAAY,EACZ,aAAa,EACb,MAAM,EACN,UAAkB,EAElB,OAAO,EACP,KAAK,EACL,gBAAgB,EAChB,aAAa,EACb,KAAS,EACT,UAAkB,EAClB,oBAAmE,EACnE,YAAgB,EAChB,QAAY,EACZ,YAAoB,EACpB,QAAmB,EACnB,aAAa,GACd,EAAE,eAAe,GAAG;QACnB,YAAY,EAAE,YAAY,EAAE,CAAA;KAC7B;;;;;;;;;;;;IA4BK,gBAAgB,CAAC,EACrB,aAAa,EACb,MAAM,EAEN,OAAO,EACP,KAAK,EACL,gBAAgB,EAChB,aAAa,EACb,IAAQ,EACR,QAAgB,EAChB,YAA2D,EAC3D,YAAgB,EAChB,aAAa,GACd,EAAE;QACD,aAAa,EAAE,MAAM,CAAA;QACrB,MAAM,EAAE,MAAM,CAAA;QACd,OAAO,EAAE,MAAM,CAAA;QACf,KAAK,EAAE,MAAM,CAAA;QACb,gBAAgB,EAAE,MAAM,CAAA;QACxB,aAAa,EAAE,MAAM,CAAA;QACrB,aAAa,EAAE,MAAM,CAAA;QACrB,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,OAAO,CAAA;QACtB,QAAQ,CAAC,EAAE,OAAO,CAAA;QAClB,YAAY,CAAC,EAAE,MAAM,CAAA;QACrB,YAAY,CAAC,EAAE,MAAM,CAAA;KACtB;IAyCD,MAAM,CAAC,uBAAuB,CAAC,EAC7B,OAAO,EACP,KAAK,EACL,gBAAgB,EAChB,aAAa,EACb,KAAS,EACT,UAAkB,EAClB,oBAAmE,EACnE,YAAgB,EAChB,QAAQ,EACR,YAAoB,GACrB,EAAE;QACD,OAAO,EAAE,MAAM,CAAA;QACf,KAAK,EAAE,MAAM,CAAA;QACb,gBAAgB,EAAE,MAAM,CAAA;QACxB,aAAa,EAAE,MAAM,CAAA;QACrB,QAAQ,EAAE,MAAM,CAAA;QAChB,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;QACxB,UAAU,CAAC,EAAE,OAAO,CAAA;QACpB,oBAAoB,CAAC,EAAE,MAAM,CAAA;QAC7B,YAAY,CAAC,EAAE,MAAM,CAAA;QACrB,YAAY,CAAC,EAAE,OAAO,CAAA;KACvB;IA4BD,MAAM,CAAC,sBAAsB,CAAC,EAC5B,OAAO,EACP,KAAK,EACL,gBAAgB,EAChB,aAAa,EACb,IAAI,EAEJ,QAAgB,EAChB,YAA2D,EAC3D,YAAgB,GACjB,EAAE;QACD,OAAO,EAAE,MAAM,CAAA;QACf,KAAK,EAAE,MAAM,CAAA;QACb,gBAAgB,EAAE,MAAM,CAAA;QACxB,aAAa,EAAE,MAAM,CAAA;QACrB,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,OAAO,CAAA;QACtB,QAAQ,CAAC,EAAE,OAAO,CAAA;QAClB,YAAY,CAAC,EAAE,MAAM,CAAA;QACrB,YAAY,CAAC,EAAE,MAAM,CAAA;KACtB;CAoBF;AACD,eAAe,kBAAkB,CAAA"}
|
|
@@ -36,7 +36,7 @@ class TeleportDaoPayment extends bitcoin_base_1.BitcoinBase {
|
|
|
36
36
|
return txId;
|
|
37
37
|
});
|
|
38
38
|
}
|
|
39
|
-
transferBitcoinToEth({ lockerAddress, amount, fullAmount = false, chainId, appId, recipientAddress, percentageFee, speed = 0, isExchange = false, exchangeTokenAddress = "0x0000000000000000000000000000000000000000", outputAmount = 0, deadline, isFixedToken = false, feeSpeed = "normal", }) {
|
|
39
|
+
transferBitcoinToEth({ lockerAddress, amount, fullAmount = false, chainId, appId, recipientAddress, percentageFee, speed = 0, isExchange = false, exchangeTokenAddress = "0x0000000000000000000000000000000000000000", outputAmount = 0, deadline, isFixedToken = false, feeSpeed = "normal", staticFeeRate, }) {
|
|
40
40
|
return __awaiter(this, void 0, void 0, function* () {
|
|
41
41
|
if (!this.currentAccount || !this.currentAccountType || !this.publicKey || !this.privateKey) {
|
|
42
42
|
throw new Error("account not initialized");
|
|
@@ -63,6 +63,7 @@ class TeleportDaoPayment extends bitcoin_base_1.BitcoinBase {
|
|
|
63
63
|
deadline,
|
|
64
64
|
isFixedToken,
|
|
65
65
|
feeSpeed,
|
|
66
|
+
staticFeeRate,
|
|
66
67
|
});
|
|
67
68
|
let signedPsbt = yield this.signer.signPsbt(unsignedTx, this.privateKey);
|
|
68
69
|
let txId = yield this.sendSignedPsbt(signedPsbt);
|
|
@@ -95,9 +96,9 @@ class TeleportDaoPayment extends bitcoin_base_1.BitcoinBase {
|
|
|
95
96
|
];
|
|
96
97
|
});
|
|
97
98
|
}
|
|
98
|
-
getBitcoinToEthUnsignedPsbt({ changeAddress, extendedUtxo, lockerAddress, amount, fullAmount = false, chainId, appId, recipientAddress, percentageFee, speed = 0, isExchange = false, exchangeTokenAddress = "0x0000000000000000000000000000000000000000", outputAmount = 0, deadline = 0, isFixedToken = false, feeSpeed = "normal", }) {
|
|
99
|
+
getBitcoinToEthUnsignedPsbt({ changeAddress, extendedUtxo, lockerAddress, amount, fullAmount = false, chainId, appId, recipientAddress, percentageFee, speed = 0, isExchange = false, exchangeTokenAddress = "0x0000000000000000000000000000000000000000", outputAmount = 0, deadline = 0, isFixedToken = false, feeSpeed = "normal", staticFeeRate, }) {
|
|
99
100
|
return __awaiter(this, void 0, void 0, function* () {
|
|
100
|
-
let feeRate = yield this.transactionBuilder._getFeeRate(feeSpeed);
|
|
101
|
+
let feeRate = staticFeeRate || (yield this.transactionBuilder._getFeeRate(feeSpeed));
|
|
101
102
|
let targets = yield this.getBitcoinToEthTargetOutputs({
|
|
102
103
|
lockerAddress,
|
|
103
104
|
amount,
|
|
@@ -123,7 +124,7 @@ class TeleportDaoPayment extends bitcoin_base_1.BitcoinBase {
|
|
|
123
124
|
return unsignedTx;
|
|
124
125
|
});
|
|
125
126
|
}
|
|
126
|
-
bitcoinToEthLend({ lockerAddress, amount, chainId, appId, recipientAddress, percentageFee, mode = 0, isBorrow = false, tokenAddress = "0x0000000000000000000000000000000000000000", borrowAmount = 0, }) {
|
|
127
|
+
bitcoinToEthLend({ lockerAddress, amount, chainId, appId, recipientAddress, percentageFee, mode = 0, isBorrow = false, tokenAddress = "0x0000000000000000000000000000000000000000", borrowAmount = 0, staticFeeRate, }) {
|
|
127
128
|
return __awaiter(this, void 0, void 0, function* () {
|
|
128
129
|
if (!this.currentAccount || !this.currentAccountType || !this.publicKey || !this.privateKey) {
|
|
129
130
|
throw new Error("account not initialized");
|
|
@@ -154,7 +155,7 @@ class TeleportDaoPayment extends bitcoin_base_1.BitcoinBase {
|
|
|
154
155
|
opTarget,
|
|
155
156
|
],
|
|
156
157
|
changeAddress: this.currentAccount,
|
|
157
|
-
feeRate:
|
|
158
|
+
feeRate: staticFeeRate,
|
|
158
159
|
fullAmount: false,
|
|
159
160
|
});
|
|
160
161
|
let signedPsbt = yield this.signer.signPsbt(unsignedTx, this.privateKey);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"teleport-dao-payments.js","sourceRoot":"","sources":["../src/teleport-dao-payments.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,iDAA4C;
|
|
1
|
+
{"version":3,"file":"teleport-dao-payments.js","sourceRoot":"","sources":["../src/teleport-dao-payments.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teleportdao/bitcoin",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.5.0",
|
|
4
4
|
"description": "teleswap bitcoin package",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"browser": "dist/bundle.js",
|
|
@@ -14,24 +14,28 @@
|
|
|
14
14
|
"author": "",
|
|
15
15
|
"license": "ISC",
|
|
16
16
|
"dependencies": {
|
|
17
|
-
"@
|
|
18
|
-
"@teleportdao/
|
|
17
|
+
"@bitcoinerlab/secp256k1": "^1.0.5",
|
|
18
|
+
"@teleportdao/configs": "^1.5.0",
|
|
19
|
+
"@teleportdao/providers": "^1.5.0",
|
|
19
20
|
"axios": "^0.27.2",
|
|
20
21
|
"bignumber.js": "^9.1.1",
|
|
21
|
-
"bip32": "^
|
|
22
|
-
"bip39": "^3.0
|
|
23
|
-
"bitcoinjs-
|
|
24
|
-
"
|
|
22
|
+
"bip32": "^4.0.0",
|
|
23
|
+
"bip39": "^3.1.0",
|
|
24
|
+
"bitcoinjs-ecpair": "npm:bitcoinjs-lib@^5.2.0",
|
|
25
|
+
"bitcoinjs-lib": "^6.1.5",
|
|
25
26
|
"coinselect": "^3.1.13",
|
|
26
|
-
"ecpair": "^2.1
|
|
27
|
+
"ecpair": "^2.0.1",
|
|
27
28
|
"merkle-lib": "^2.0.10",
|
|
28
29
|
"merkle-patricia-tree": "^2.3.2",
|
|
29
|
-
"
|
|
30
|
-
"
|
|
30
|
+
"npm": "^10.2.3",
|
|
31
|
+
"uninstall": "^0.0.0",
|
|
31
32
|
"varuint-bitcoin": "^1.1.2"
|
|
32
33
|
},
|
|
33
34
|
"publishConfig": {
|
|
34
35
|
"access": "public"
|
|
35
36
|
},
|
|
36
|
-
"gitHead": "
|
|
37
|
+
"gitHead": "09d752308413f871b806cf95c825a443caa70c7a",
|
|
38
|
+
"devDependencies": {
|
|
39
|
+
"@babel/preset-react": "^7.23.3"
|
|
40
|
+
}
|
|
37
41
|
}
|
package/src/bitcoin-base.ts
CHANGED
|
@@ -6,13 +6,17 @@ import type { ExtendedUtxo, SignerInfo, Target } from "./transaction-builder/tra
|
|
|
6
6
|
import BitcoinSign from "./sign/sign-transaction"
|
|
7
7
|
|
|
8
8
|
import * as bip39 from "bip39"
|
|
9
|
-
import * as bip32 from "bip32"
|
|
10
9
|
import { hdWalletPath } from "@teleportdao/configs"
|
|
11
10
|
import { getPubKeyFromPrivateKeyHex } from "./bitcoin-utils"
|
|
12
11
|
import networks from "./utils/networks"
|
|
13
12
|
import { Network, Payment } from "bitcoinjs-lib"
|
|
14
13
|
import { BitcoinInterface } from "./bitcoin-interface"
|
|
15
14
|
|
|
15
|
+
import BIP32Factory from "bip32"
|
|
16
|
+
import ecc from "@bitcoinerlab/secp256k1"
|
|
17
|
+
|
|
18
|
+
const bip32 = BIP32Factory(ecc)
|
|
19
|
+
|
|
16
20
|
class BitcoinBase {
|
|
17
21
|
network: Network
|
|
18
22
|
hdWalletPath: {
|
|
@@ -22,6 +26,7 @@ class BitcoinBase {
|
|
|
22
26
|
p2sh: string
|
|
23
27
|
p2wsh: string
|
|
24
28
|
"p2sh-p2wsh": string
|
|
29
|
+
p2tr: string
|
|
25
30
|
}
|
|
26
31
|
transactionBuilder: TransactionBuilder
|
|
27
32
|
btcInterface: BitcoinInterface
|
|
@@ -59,6 +64,16 @@ class BitcoinBase {
|
|
|
59
64
|
this.publicKeys = []
|
|
60
65
|
}
|
|
61
66
|
|
|
67
|
+
get signerInfo() {
|
|
68
|
+
return this.privateKey
|
|
69
|
+
? {
|
|
70
|
+
address: this.bitcoinAddress!,
|
|
71
|
+
publicKey: this.publicKey!.toString("hex"),
|
|
72
|
+
addressType: this.currentAccountType!,
|
|
73
|
+
}
|
|
74
|
+
: undefined
|
|
75
|
+
}
|
|
76
|
+
|
|
62
77
|
static createTransactionInputsAndOutputs({
|
|
63
78
|
targets,
|
|
64
79
|
extendedUtxo,
|
|
@@ -243,6 +258,18 @@ class BitcoinBase {
|
|
|
243
258
|
let txId = await this.transactionBuilder.sendTx(signedTx)
|
|
244
259
|
return txId
|
|
245
260
|
}
|
|
246
|
-
}
|
|
247
261
|
|
|
262
|
+
async increaseTransactionFee(
|
|
263
|
+
txId: string,
|
|
264
|
+
signerInfo: SignerInfo,
|
|
265
|
+
extraExtendedUtxo: ExtendedUtxo[],
|
|
266
|
+
) {
|
|
267
|
+
let transaction = await this.btcInterface.getTransaction(txId)
|
|
268
|
+
console.log(transaction)
|
|
269
|
+
if (transaction?.blockNumber > 0) {
|
|
270
|
+
return
|
|
271
|
+
}
|
|
272
|
+
// this.transactionBuilder.processUnsignedTransaction()
|
|
273
|
+
}
|
|
274
|
+
}
|
|
248
275
|
export { BitcoinBase }
|
package/src/bitcoin-interface.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { bitcoin as bitcoinProvider } from "@teleportdao/providers"
|
|
2
|
-
import { runWithRetries
|
|
2
|
+
import { runWithRetries } from "./utils/tools"
|
|
3
3
|
import {
|
|
4
4
|
parseRawTransaction,
|
|
5
5
|
calculateMerkleProof,
|
|
@@ -11,7 +11,6 @@ import { getBurnTransactionInfo } from "./helper/burn-request-helper"
|
|
|
11
11
|
import { BitcoinInterfaceUtils } from "./bitcoin-interface-utils"
|
|
12
12
|
import type { BitcoinConnectionInfo } from "./transaction-builder/bitcoin-transaction-builder"
|
|
13
13
|
import type { SignerInfo } from "./transaction-builder/transaction-builder"
|
|
14
|
-
import ms from "./mempool-space"
|
|
15
14
|
|
|
16
15
|
export class BitcoinInterface extends BitcoinInterfaceUtils {
|
|
17
16
|
rpcProvider?: bitcoinProvider.RPC
|
|
@@ -19,7 +18,10 @@ export class BitcoinInterface extends BitcoinInterfaceUtils {
|
|
|
19
18
|
// todo : add provider type
|
|
20
19
|
minTeleporterFeeAmount: number
|
|
21
20
|
provider: any
|
|
22
|
-
apiProvider!:
|
|
21
|
+
apiProvider!:
|
|
22
|
+
| bitcoinProvider.ApiProviders.BlockStream
|
|
23
|
+
| bitcoinProvider.ApiProviders.NowNodes
|
|
24
|
+
| bitcoinProvider.ApiProviders.MempoolSpace
|
|
23
25
|
constructor(
|
|
24
26
|
connectionInfo: BitcoinConnectionInfo,
|
|
25
27
|
networkName: string,
|
|
@@ -28,8 +30,13 @@ export class BitcoinInterface extends BitcoinInterfaceUtils {
|
|
|
28
30
|
super(networkName)
|
|
29
31
|
if (connectionInfo.rpc?.enabled) {
|
|
30
32
|
this.rpcProvider = bitcoinProvider.getRpcProvider(connectionInfo.rpc)
|
|
31
|
-
} else if (
|
|
32
|
-
|
|
33
|
+
} else if (
|
|
34
|
+
connectionInfo.api.provider !== "BlockStream" &&
|
|
35
|
+
connectionInfo.api.provider !== "MempoolSpace"
|
|
36
|
+
) {
|
|
37
|
+
throw new Error(
|
|
38
|
+
"if rpc is disabled, we just support BlockStream Or MempoolSpace as api provider",
|
|
39
|
+
)
|
|
33
40
|
}
|
|
34
41
|
|
|
35
42
|
if (connectionInfo.api.enabled) {
|
|
@@ -65,7 +72,7 @@ export class BitcoinInterface extends BitcoinInterfaceUtils {
|
|
|
65
72
|
|
|
66
73
|
// speed : low normal fast
|
|
67
74
|
async getFeeRate(speed?: "normal" | "slow" | "fast") {
|
|
68
|
-
return new
|
|
75
|
+
return new bitcoinProvider.ApiProviders.MempoolSpace(this.testnet).getRecommendedFeeRate(speed)
|
|
69
76
|
}
|
|
70
77
|
|
|
71
78
|
// ----------- specific
|
|
@@ -266,9 +273,11 @@ export class BitcoinInterface extends BitcoinInterfaceUtils {
|
|
|
266
273
|
}
|
|
267
274
|
let blockTxs = []
|
|
268
275
|
for (let blockNumber = +startBlockNumber + 1; blockNumber <= endBlockNumber; blockNumber += 1) {
|
|
269
|
-
|
|
276
|
+
console.log(blockNumber)
|
|
277
|
+
|
|
278
|
+
const response = await this.getBlockTransactions(addresses, blockNumber, inputTxIds)
|
|
270
279
|
blockTxs.push(response)
|
|
271
|
-
await sleep(200)
|
|
280
|
+
// await sleep(200)
|
|
272
281
|
}
|
|
273
282
|
blockTxs = await Promise.all(blockTxs)
|
|
274
283
|
return blockTxs.flat(1)
|
|
@@ -278,7 +287,7 @@ export class BitcoinInterface extends BitcoinInterfaceUtils {
|
|
|
278
287
|
async getTransactionHistory(
|
|
279
288
|
addresses: string[],
|
|
280
289
|
startBlockNumber: number,
|
|
281
|
-
endBlockNumber
|
|
290
|
+
endBlockNumber?: number,
|
|
282
291
|
) {
|
|
283
292
|
if (this.rpcProvider) {
|
|
284
293
|
let endBlock = endBlockNumber || (await this.getLatestBlockNumber())
|