@teleportdao/bitcoin 2.3.0-alpha.0 → 3.0.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.
Files changed (44) hide show
  1. package/dist/bitcoin-interface-utils.d.ts +0 -4
  2. package/dist/bitcoin-interface-utils.d.ts.map +1 -1
  3. package/dist/bitcoin-interface-utils.js +0 -4
  4. package/dist/bitcoin-interface-utils.js.map +1 -1
  5. package/dist/bitcoin-utils.d.ts +1 -5
  6. package/dist/bitcoin-utils.d.ts.map +1 -1
  7. package/dist/bitcoin-utils.js +2 -44
  8. package/dist/bitcoin-utils.js.map +1 -1
  9. package/dist/bitcoin-wallet-base.d.ts +8 -18
  10. package/dist/bitcoin-wallet-base.d.ts.map +1 -1
  11. package/dist/bitcoin-wallet-base.js +13 -33
  12. package/dist/bitcoin-wallet-base.js.map +1 -1
  13. package/dist/multisig-wallet-helper.d.ts +46 -0
  14. package/dist/multisig-wallet-helper.d.ts.map +1 -0
  15. package/dist/multisig-wallet-helper.js +203 -0
  16. package/dist/multisig-wallet-helper.js.map +1 -0
  17. package/dist/multisig-wallet.d.ts +20 -0
  18. package/dist/multisig-wallet.d.ts.map +1 -0
  19. package/dist/multisig-wallet.js +119 -0
  20. package/dist/multisig-wallet.js.map +1 -0
  21. package/dist/sign/sign-transaction.d.ts +1 -5
  22. package/dist/sign/sign-transaction.d.ts.map +1 -1
  23. package/dist/sign/sign-transaction.js +2 -5
  24. package/dist/sign/sign-transaction.js.map +1 -1
  25. package/dist/teleswap-wallet.d.ts +2 -2
  26. package/dist/teleswap-wallet.d.ts.map +1 -1
  27. package/dist/teleswap-wallet.js +6 -4
  28. package/dist/teleswap-wallet.js.map +1 -1
  29. package/dist/transaction-builder/coin-select.d.ts +87 -0
  30. package/dist/transaction-builder/coin-select.d.ts.map +1 -0
  31. package/dist/transaction-builder/coin-select.js +359 -0
  32. package/dist/transaction-builder/coin-select.js.map +1 -0
  33. package/dist/transaction-builder/transaction-builder.d.ts +6 -28
  34. package/dist/transaction-builder/transaction-builder.d.ts.map +1 -1
  35. package/dist/transaction-builder/transaction-builder.js +115 -195
  36. package/dist/transaction-builder/transaction-builder.js.map +1 -1
  37. package/package.json +4 -4
  38. package/src/bitcoin-interface-utils.ts +0 -12
  39. package/src/bitcoin-utils.ts +2 -51
  40. package/src/bitcoin-wallet-base.ts +22 -62
  41. package/src/sign/sign-transaction.ts +7 -5
  42. package/src/teleswap-wallet.ts +6 -1
  43. package/src/transaction-builder/transaction-builder.ts +131 -266
  44. package/src/multisig-coordinator-wallet.ts +0 -9
@@ -0,0 +1,203 @@
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
+ var __importDefault = (this && this.__importDefault) || function (mod) {
12
+ return (mod && mod.__esModule) ? mod : { "default": mod };
13
+ };
14
+ Object.defineProperty(exports, "__esModule", { value: true });
15
+ exports.MultisigWalletHelper = void 0;
16
+ const providers_1 = require("@teleportdao/providers");
17
+ const bignumber_js_1 = __importDefault(require("bignumber.js"));
18
+ class MultisigWalletHelper {
19
+ constructor(baseWallet, coordinatorUrl, coordinatorApiKey, txCounterMonitor = true, acceptableFeeDiffPercentage, txCheckConfig) {
20
+ this.baseWallet = baseWallet;
21
+ this.coordinatorUrl = coordinatorUrl;
22
+ this.coordinator = new providers_1.TeleportdaoMultisigCoordinator(coordinatorUrl, coordinatorApiKey);
23
+ this.acceptableFeeDiff = acceptableFeeDiffPercentage || 30;
24
+ this.txCheckConfig = txCheckConfig || {
25
+ sleepTime: 1500,
26
+ maxRetry: 30,
27
+ };
28
+ this.txCounterMonitor = txCounterMonitor;
29
+ this.txCounter = undefined;
30
+ }
31
+ get bitcoinAddress() {
32
+ return this.baseWallet.bitcoinAddress;
33
+ }
34
+ setAccountType(addressType, publicKeys, numberOfSigners) {
35
+ if (!this.baseWallet.publicKey ||
36
+ !publicKeys.includes(this.baseWallet.publicKey.toString("hex"))) {
37
+ throw new Error("public keys not match with the key");
38
+ }
39
+ return this.baseWallet.setAccountType(addressType, {
40
+ publicKeys,
41
+ numberOfSigners,
42
+ });
43
+ }
44
+ setAPIKey() {
45
+ return __awaiter(this, void 0, void 0, function* () {
46
+ if (!this.baseWallet.signerInfo ||
47
+ !this.baseWallet.signerInfo.publicKeys ||
48
+ !this.baseWallet.bitcoinAddress) {
49
+ throw new Error("wallet not initialized");
50
+ }
51
+ let response = yield this.coordinator.registerOrGetWallet(this.baseWallet.signerInfo.publicKey, this.baseWallet.signerInfo.publicKeys, this.baseWallet.bitcoinAddress, this.baseWallet.signerInfo.addressType, this.baseWallet.signerInfo.numberOfSigners);
52
+ this.coordinator = new providers_1.TeleportdaoMultisigCoordinator(this.coordinatorUrl, response.apiKey);
53
+ return response;
54
+ });
55
+ }
56
+ setTxCounter(txCounter) {
57
+ return __awaiter(this, void 0, void 0, function* () {
58
+ if (this.txCounterMonitor)
59
+ this.txCounter = txCounter;
60
+ });
61
+ }
62
+ resetTxCounter() {
63
+ return __awaiter(this, void 0, void 0, function* () {
64
+ const wallet = yield this.coordinator.getWallet();
65
+ this.setTxCounter(wallet.txCounter);
66
+ return wallet.txCounter;
67
+ });
68
+ }
69
+ step1SendBTCToMultipleAddressUnsigned(receivers, signerInfo, fee = "normal", staticExtendedUtxo, fullAmount = false) {
70
+ return __awaiter(this, void 0, void 0, function* () {
71
+ try {
72
+ let unsignedTx = yield this.baseWallet.sendBTCToMultipleAddressUnsignedTx(receivers, signerInfo, fee, staticExtendedUtxo, fullAmount);
73
+ console.log("this.txCounter step 1 start", this.txCounter);
74
+ let txRequest = yield this.coordinator.createOrConfirmNewTx({
75
+ inputs: unsignedTx.inputs.map((x) => ({
76
+ hash: x.hash,
77
+ index: x.index,
78
+ value: x.value,
79
+ })),
80
+ outputs: unsignedTx.outputs,
81
+ feeRate: unsignedTx.feeRate,
82
+ unsignedPsbt: unsignedTx.unsignedTransaction,
83
+ txCounter: this.txCounter,
84
+ });
85
+ if (txRequest.status !== "Rejected" && txRequest.status !== "Broadcasted") {
86
+ this.setTxCounter(txRequest.txCounter);
87
+ }
88
+ else {
89
+ yield this.resetTxCounter();
90
+ }
91
+ console.log("this.txCounter step 1 end", this.txCounter);
92
+ return {
93
+ txRequest,
94
+ unsignedTx,
95
+ };
96
+ }
97
+ catch (e) {
98
+ yield this.resetTxCounter();
99
+ throw e;
100
+ }
101
+ });
102
+ }
103
+ step2WaitForUnsignedTxApproval(input) {
104
+ return __awaiter(this, void 0, void 0, function* () {
105
+ const feeRateDiffPercentage = this.acceptableFeeDiff;
106
+ let newUnsignedTx = input.unsignedTx;
107
+ let newTxRequest = input.txRequest;
108
+ if (newTxRequest.status === "Pending") {
109
+ this.setTxCounter(newTxRequest.txCounter);
110
+ if (newTxRequest.unsignedPsbt !== newUnsignedTx.unsignedTransaction) {
111
+ const feeDiff = (0, bignumber_js_1.default)(newTxRequest.feeRate)
112
+ .minus(newUnsignedTx.feeRate)
113
+ .abs()
114
+ .dividedBy(newUnsignedTx.feeRate);
115
+ if (!feeDiff.isLessThan(feeRateDiffPercentage / 100)) {
116
+ const txRequest = yield this.coordinator.rejectTxRequest(newTxRequest.id);
117
+ this.setTxCounter((this.txCounter || txRequest.txCounter) + 1);
118
+ throw new Error("Reject because of Invalid FeeRate");
119
+ }
120
+ const { signerInfo } = newUnsignedTx.inputs[0];
121
+ console.log(newUnsignedTx.outputs, newTxRequest.outputs);
122
+ newUnsignedTx = yield this.baseWallet.sendBTCToMultipleAddressUnsignedTx(newUnsignedTx.outputs, signerInfo, +newTxRequest.feeRate, newTxRequest.inputs.map((x) => (Object.assign(Object.assign({}, x), { signerInfo }))));
123
+ let updatedTxRequest = yield this.coordinator.confirmOrRejectTxRequest(newTxRequest.id, newUnsignedTx.unsignedTransaction);
124
+ if (updatedTxRequest.status === "Rejected" ||
125
+ updatedTxRequest.unsignedPsbt !== newUnsignedTx.unsignedTransaction) {
126
+ console.log("not equal unsignedPsbt");
127
+ console.log(updatedTxRequest.unsignedPsbt);
128
+ console.log(newUnsignedTx.unsignedTransaction);
129
+ this.setTxCounter((this.txCounter || updatedTxRequest.txCounter) + 1);
130
+ throw new Error("Reject because of invalid outputs");
131
+ }
132
+ newTxRequest = updatedTxRequest;
133
+ }
134
+ const updatedTxRequest = yield this.coordinator.waitTxStatusChange(newTxRequest.id, "Pending", this.txCheckConfig.sleepTime, this.txCheckConfig.maxRetry);
135
+ if (!updatedTxRequest) {
136
+ yield this.coordinator.rejectTxRequest(newTxRequest.id);
137
+ if (this.txCounter)
138
+ this.setTxCounter(this.txCounter + 1);
139
+ throw new Error("Tx Timeout");
140
+ }
141
+ newTxRequest = updatedTxRequest;
142
+ if (newTxRequest.status === "Rejected") {
143
+ if (this.txCounter)
144
+ this.setTxCounter(this.txCounter + 1);
145
+ throw new Error("Tx Rejected");
146
+ }
147
+ }
148
+ if (newTxRequest.status === "Rejected") {
149
+ yield this.resetTxCounter();
150
+ throw new Error("Tx was Rejected");
151
+ }
152
+ console.log("this.txCounter step 2 end", this.txCounter);
153
+ return {
154
+ unsignedTx: newUnsignedTx,
155
+ txRequest: newTxRequest,
156
+ };
157
+ });
158
+ }
159
+ step3SignTxAndWaitForBroadcast(input) {
160
+ return __awaiter(this, void 0, void 0, function* () {
161
+ if (!this.baseWallet.privateKey)
162
+ throw new Error("account is not initialized");
163
+ const { unsignedTx, txRequest } = input;
164
+ let newTxRequest = txRequest;
165
+ if (newTxRequest.status === "Approved") {
166
+ const signed = yield this.baseWallet.signer.signPsbt(unsignedTx, this.baseWallet.privateKey);
167
+ newTxRequest = yield this.coordinator.submitSignedPsbt(newTxRequest.id, signed);
168
+ }
169
+ if (newTxRequest.status === "Approved") {
170
+ if (this.txCounter)
171
+ this.setTxCounter(newTxRequest.txCounter);
172
+ const finalTx = yield this.coordinator.waitTxStatusChange(newTxRequest.id, "Approved", this.txCheckConfig.sleepTime, this.txCheckConfig.maxRetry);
173
+ if (!finalTx || finalTx.status === "Failed") {
174
+ throw new Error("Tx not broadcasted for long time");
175
+ }
176
+ newTxRequest = finalTx;
177
+ }
178
+ if (this.txCounter)
179
+ this.setTxCounter(this.txCounter + 1);
180
+ console.log("this.txCounter step3", this.txCounter);
181
+ return newTxRequest;
182
+ });
183
+ }
184
+ sendBTCMultipleAddress(receivers, fee = "normal", staticExtendedUtxo, fullAmount = false) {
185
+ return __awaiter(this, void 0, void 0, function* () {
186
+ if (!this.baseWallet.signerInfo || !this.baseWallet.privateKey) {
187
+ throw new Error("account not initialized");
188
+ }
189
+ let unsignedResponse = yield this.step1SendBTCToMultipleAddressUnsigned(receivers, this.baseWallet.signerInfo, fee, staticExtendedUtxo, fullAmount);
190
+ unsignedResponse = yield this.step2WaitForUnsignedTxApproval(unsignedResponse);
191
+ const txRequest = yield this.step3SignTxAndWaitForBroadcast(unsignedResponse);
192
+ return txRequest;
193
+ });
194
+ }
195
+ sendBTC(receiverAddress, amountInSatoshi, fee = "normal", staticExtendedUtxo) {
196
+ return __awaiter(this, void 0, void 0, function* () {
197
+ const txRequest = yield this.sendBTCMultipleAddress([{ address: receiverAddress, value: amountInSatoshi === "all" ? 0 : amountInSatoshi }], fee, staticExtendedUtxo, amountInSatoshi === "all");
198
+ return txRequest;
199
+ });
200
+ }
201
+ }
202
+ exports.MultisigWalletHelper = MultisigWalletHelper;
203
+ //# sourceMappingURL=multisig-wallet-helper.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"multisig-wallet-helper.js","sourceRoot":"","sources":["../src/multisig-wallet-helper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,sDAAkF;AAClF,gEAAoC;AASpC,MAAa,oBAAoB;IAS/B,YACE,UAA6B,EAC7B,cAAsB,EACtB,iBAA0B,EAC1B,gBAAgB,GAAG,IAAI,EACvB,2BAAoC,EACpC,aAAuD;QAEvD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;QACpC,IAAI,CAAC,WAAW,GAAG,IAAI,0CAA8B,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAA;QACxF,IAAI,CAAC,iBAAiB,GAAG,2BAA2B,IAAI,EAAE,CAAA;QAC1D,IAAI,CAAC,aAAa,GAAG,aAAa,IAAI;YACpC,SAAS,EAAE,IAAI;YACf,QAAQ,EAAE,EAAE;SACb,CAAA;QACD,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;QACxC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;IAC5B,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,UAAU,CAAC,cAAc,CAAA;IACvC,CAAC;IAED,cAAc,CACZ,WAA4C,EAC5C,UAAoB,EACpB,eAAwB;QAExB,IACE,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS;YAC1B,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAC/D;YACA,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAA;SACtD;QAED,OAAO,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,WAAW,EAAE;YACjD,UAAU;YACV,eAAe;SAChB,CAAC,CAAA;IACJ,CAAC;IAEK,SAAS;;YACb,IACE,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU;gBAC3B,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU;gBACtC,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,EAC/B;gBACA,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;aAC1C;YACD,IAAI,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,mBAAmB,CACvD,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,EACpC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,EACrC,IAAI,CAAC,UAAU,CAAC,cAAc,EAC9B,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,WAAW,EACtC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,eAAe,CAC3C,CAAA;YACD,IAAI,CAAC,WAAW,GAAG,IAAI,0CAA8B,CAAC,IAAI,CAAC,cAAc,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAA;YAC3F,OAAO,QAAQ,CAAA;QACjB,CAAC;KAAA;IAEK,YAAY,CAAC,SAAiB;;YAClC,IAAI,IAAI,CAAC,gBAAgB;gBAAE,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QACvD,CAAC;KAAA;IAEK,cAAc;;YAClB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,CAAA;YACjD,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;YACnC,OAAO,MAAM,CAAC,SAAS,CAAA;QACzB,CAAC;KAAA;IAEK,qCAAqC,CACzC,SAA0B,EAC1B,UAAsB,EACtB,MAAmB,QAAQ,EAC3B,kBAAmC,EACnC,UAAU,GAAG,KAAK;;YAElB,IAAI;gBACF,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,kCAAkC,CACvE,SAAS,EACT,UAAU,EACV,GAAG,EACH,kBAAkB,EAClB,UAAU,CACX,CAAA;gBAED,OAAO,CAAC,GAAG,CAAC,6BAA6B,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;gBAE1D,IAAI,SAAS,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC;oBAC1D,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;wBACpC,IAAI,EAAE,CAAC,CAAC,IAAI;wBACZ,KAAK,EAAE,CAAC,CAAC,KAAK;wBACd,KAAK,EAAE,CAAC,CAAC,KAAK;qBACf,CAAC,CAAC;oBACH,OAAO,EAAE,UAAU,CAAC,OAAc;oBAClC,OAAO,EAAE,UAAU,CAAC,OAAO;oBAC3B,YAAY,EAAE,UAAU,CAAC,mBAAmB;oBAC5C,SAAS,EAAE,IAAI,CAAC,SAAS;iBAC1B,CAAC,CAAA;gBAEF,IAAI,SAAS,CAAC,MAAM,KAAK,UAAU,IAAI,SAAS,CAAC,MAAM,KAAK,aAAa,EAAE;oBACzE,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;iBACvC;qBAAM;oBACL,MAAM,IAAI,CAAC,cAAc,EAAE,CAAA;iBAC5B;gBAED,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;gBACxD,OAAO;oBACL,SAAS;oBACT,UAAU;iBACX,CAAA;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,IAAI,CAAC,cAAc,EAAE,CAAA;gBAC3B,MAAM,CAAC,CAAA;aACR;QACH,CAAC;KAAA;IAEK,8BAA8B,CAAC,KAGpC;;YACC,MAAM,qBAAqB,GAAG,IAAI,CAAC,iBAAiB,CAAA;YACpD,IAAI,aAAa,GAAG,KAAK,CAAC,UAAU,CAAA;YACpC,IAAI,YAAY,GAAG,KAAK,CAAC,SAAS,CAAA;YAGlC,IAAI,YAAY,CAAC,MAAM,KAAK,SAAS,EAAE;gBACrC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC,CAAA;gBAEzC,IAAI,YAAY,CAAC,YAAY,KAAK,aAAa,CAAC,mBAAmB,EAAE;oBACnE,MAAM,OAAO,GAAG,IAAA,sBAAS,EAAC,YAAY,CAAC,OAAO,CAAC;yBAC5C,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC;yBAC5B,GAAG,EAAE;yBACL,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;oBACnC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,qBAAqB,GAAG,GAAG,CAAC,EAAE;wBACpD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;wBACzE,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;wBAC9D,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAA;qBACrD;oBAED,MAAM,EAAE,UAAU,EAAE,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;oBAE9C,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,CAAA;oBAExD,aAAa,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,kCAAkC,CACtE,aAAa,CAAC,OAA0B,EACxC,UAAU,EACV,CAAC,YAAY,CAAC,OAAO,EACrB,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iCAC1B,CAAC,KACJ,UAAU,IACV,CAAC,CACJ,CAAA;oBAED,IAAI,gBAAgB,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,wBAAwB,CACpE,YAAY,CAAC,EAAE,EACf,aAAa,CAAC,mBAAmB,CAClC,CAAA;oBAED,IACE,gBAAgB,CAAC,MAAM,KAAK,UAAU;wBACtC,gBAAgB,CAAC,YAAY,KAAK,aAAa,CAAC,mBAAmB,EACnE;wBACA,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAA;wBACrC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAA;wBAC1C,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAA;wBAC9C,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,SAAS,IAAI,gBAAgB,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;wBACrE,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAA;qBACrD;oBACD,YAAY,GAAG,gBAAgB,CAAA;iBAChC;gBAED,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAChE,YAAY,CAAC,EAAE,EACf,SAAS,EACT,IAAI,CAAC,aAAa,CAAC,SAAS,EAC5B,IAAI,CAAC,aAAa,CAAC,QAAQ,CAC5B,CAAA;gBAED,IAAI,CAAC,gBAAgB,EAAE;oBACrB,MAAM,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;oBACvD,IAAI,IAAI,CAAC,SAAS;wBAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,CAAA;oBACzD,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAA;iBAC9B;gBACD,YAAY,GAAG,gBAAgB,CAAA;gBAE/B,IAAI,YAAY,CAAC,MAAM,KAAK,UAAU,EAAE;oBACtC,IAAI,IAAI,CAAC,SAAS;wBAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,CAAA;oBACzD,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAA;iBAC/B;aACF;YAED,IAAI,YAAY,CAAC,MAAM,KAAK,UAAU,EAAE;gBACtC,MAAM,IAAI,CAAC,cAAc,EAAE,CAAA;gBAC3B,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAA;aACnC;YACD,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;YAExD,OAAO;gBACL,UAAU,EAAE,aAAa;gBACzB,SAAS,EAAE,YAAY;aACxB,CAAA;QACH,CAAC;KAAA;IAGK,8BAA8B,CAAC,KAGpC;;YACC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU;gBAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;YAC9E,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,KAAK,CAAA;YACvC,IAAI,YAAY,GAAG,SAAS,CAAA;YAC5B,IAAI,YAAY,CAAC,MAAM,KAAK,UAAU,EAAE;gBACtC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,UAAW,CAAC,CAAA;gBAC7F,YAAY,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,YAAY,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;aAChF;YAGD,IAAI,YAAY,CAAC,MAAM,KAAK,UAAU,EAAE;gBACtC,IAAI,IAAI,CAAC,SAAS;oBAAE,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC,CAAA;gBAC7D,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,kBAAkB,CACvD,YAAY,CAAC,EAAE,EACf,UAAU,EACV,IAAI,CAAC,aAAa,CAAC,SAAS,EAC5B,IAAI,CAAC,aAAa,CAAC,QAAQ,CAC5B,CAAA;gBACD,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE;oBAC3C,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;iBACpD;gBACD,YAAY,GAAG,OAAO,CAAA;aACvB;YAED,IAAI,IAAI,CAAC,SAAS;gBAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,CAAA;YAEzD,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;YAEnD,OAAO,YAAY,CAAA;QACrB,CAAC;KAAA;IAEK,sBAAsB,CAC1B,SAA0B,EAC1B,MAAmB,QAAQ,EAC3B,kBAAmC,EACnC,UAAU,GAAG,KAAK;;YAElB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE;gBAC9D,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;aAC3C;YAED,IAAI,gBAAgB,GAAG,MAAM,IAAI,CAAC,qCAAqC,CACrE,SAAS,EACT,IAAI,CAAC,UAAU,CAAC,UAAU,EAC1B,GAAG,EACH,kBAAkB,EAClB,UAAU,CACX,CAAA;YACD,gBAAgB,GAAG,MAAM,IAAI,CAAC,8BAA8B,CAAC,gBAAgB,CAAC,CAAA;YAC9E,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,8BAA8B,CAAC,gBAAgB,CAAC,CAAA;YAC7E,OAAO,SAAS,CAAA;QAClB,CAAC;KAAA;IAEK,OAAO,CACX,eAAuB,EACvB,eAA+B,EAC/B,MAAmB,QAAQ,EAC3B,kBAAmC;;YAEnC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,sBAAsB,CACjD,CAAC,EAAE,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,eAAe,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,EACtF,GAAG,EACH,kBAAkB,EAClB,eAAe,KAAK,KAAK,CAC1B,CAAA;YACD,OAAO,SAAS,CAAA;QAClB,CAAC;KAAA;CACF;AA7RD,oDA6RC"}
@@ -0,0 +1,20 @@
1
+ import { TeleportdaoMultisigCoordinator, TxRequest } from "@teleportdao/providers";
2
+ import { BitcoinBaseWallet, FeeRateType } from "./bitcoin-wallet-base";
3
+ import { ExtendedUnsignedTransaction, ExtendedUtxo, SignerInfo, TargetAddress } from "./transaction-builder";
4
+ export declare class MultisigWalletHelper {
5
+ baseWallet: BitcoinBaseWallet;
6
+ coordinator: TeleportdaoMultisigCoordinator;
7
+ constructor(baseWallet: BitcoinBaseWallet, coordinatorApiKey: string, coordinatorUrl: string);
8
+ step1SendBTCToMultipleAddressUnsigned(receivers: TargetAddress[], signerInfo: SignerInfo, fee?: FeeRateType, staticExtendedUtxo?: ExtendedUtxo[], fullAmount?: boolean): Promise<{
9
+ txRequest: TxRequest;
10
+ unsignedTx: ExtendedUnsignedTransaction;
11
+ }>;
12
+ step2WaitForUnsignedTxApproval(unsignedTx: ExtendedUnsignedTransaction, txRequest: TxRequest, feeRateDiffPercentage?: number): Promise<{
13
+ unsignedTx: ExtendedUnsignedTransaction;
14
+ txRequest: TxRequest;
15
+ }>;
16
+ step3SignTxAndWaitForBroadcast(unsignedTx: ExtendedUnsignedTransaction, txRequest: TxRequest): Promise<TxRequest>;
17
+ sendBTCMultipleAddress(receivers: TargetAddress[], fee?: FeeRateType, staticExtendedUtxo?: ExtendedUtxo[], fullAmount?: boolean): Promise<TxRequest>;
18
+ sendBTC(receiverAddress: string, amountInSatoshi: number | "all", fee?: FeeRateType, staticExtendedUtxo?: ExtendedUtxo[]): Promise<TxRequest>;
19
+ }
20
+ //# sourceMappingURL=multisig-wallet.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"multisig-wallet.d.ts","sourceRoot":"","sources":["../src/multisig-wallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,8BAA8B,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAElF,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACtE,OAAO,EACL,2BAA2B,EAC3B,YAAY,EACZ,UAAU,EACV,aAAa,EACd,MAAM,uBAAuB,CAAA;AAE9B,qBAAa,oBAAoB;IAC/B,UAAU,EAAE,iBAAiB,CAAA;IAC7B,WAAW,EAAE,8BAA8B,CAAA;gBAC/B,UAAU,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;IAKtF,qCAAqC,CACzC,SAAS,EAAE,aAAa,EAAE,EAC1B,UAAU,EAAE,UAAU,EACtB,GAAG,GAAE,WAAsB,EAC3B,kBAAkB,CAAC,EAAE,YAAY,EAAE,EACnC,UAAU,UAAQ;;;;IA2Bd,8BAA8B,CAClC,UAAU,EAAE,2BAA2B,EACvC,SAAS,EAAE,SAAS,EACpB,qBAAqB,SAAK;;;;IA4DtB,8BAA8B,CAClC,UAAU,EAAE,2BAA2B,EACvC,SAAS,EAAE,SAAS;IAoBhB,sBAAsB,CAC1B,SAAS,EAAE,aAAa,EAAE,EAC1B,GAAG,GAAE,WAAsB,EAC3B,kBAAkB,CAAC,EAAE,YAAY,EAAE,EACnC,UAAU,UAAQ;IAwBd,OAAO,CACX,eAAe,EAAE,MAAM,EACvB,eAAe,EAAE,MAAM,GAAG,KAAK,EAC/B,GAAG,GAAE,WAAsB,EAC3B,kBAAkB,CAAC,EAAE,YAAY,EAAE;CAUtC"}
@@ -0,0 +1,119 @@
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
+ var __importDefault = (this && this.__importDefault) || function (mod) {
12
+ return (mod && mod.__esModule) ? mod : { "default": mod };
13
+ };
14
+ Object.defineProperty(exports, "__esModule", { value: true });
15
+ exports.MultisigWalletHelper = void 0;
16
+ const providers_1 = require("@teleportdao/providers");
17
+ const bignumber_js_1 = __importDefault(require("bignumber.js"));
18
+ class MultisigWalletHelper {
19
+ constructor(baseWallet, coordinatorApiKey, coordinatorUrl) {
20
+ this.baseWallet = baseWallet;
21
+ this.coordinator = new providers_1.TeleportdaoMultisigCoordinator(coordinatorUrl, coordinatorApiKey);
22
+ }
23
+ step1SendBTCToMultipleAddressUnsigned(receivers, signerInfo, fee = "normal", staticExtendedUtxo, fullAmount = false) {
24
+ return __awaiter(this, void 0, void 0, function* () {
25
+ let unsignedTx = yield this.baseWallet.sendBTCToMultipleAddressUnsignedTx(receivers, signerInfo, fee, staticExtendedUtxo, fullAmount);
26
+ let txRequest = yield this.coordinator.createOrConfirmNewTx({
27
+ inputs: unsignedTx.inputs.map((x) => ({
28
+ hash: x.hash,
29
+ index: x.index,
30
+ value: x.value,
31
+ })),
32
+ outputs: unsignedTx.outputs,
33
+ feeRate: unsignedTx.feeRate,
34
+ unsignedPsbt: unsignedTx.unsignedTransaction,
35
+ });
36
+ return {
37
+ txRequest,
38
+ unsignedTx,
39
+ };
40
+ });
41
+ }
42
+ step2WaitForUnsignedTxApproval(unsignedTx, txRequest, feeRateDiffPercentage = 10) {
43
+ return __awaiter(this, void 0, void 0, function* () {
44
+ let newUnsignedTx = unsignedTx;
45
+ let newTxRequest = txRequest;
46
+ if (newTxRequest.unsignedPsbt !== unsignedTx.unsignedTransaction) {
47
+ const feeDiff = (0, bignumber_js_1.default)(newTxRequest.feeRate)
48
+ .minus(unsignedTx.feeRate)
49
+ .abs()
50
+ .dividedBy(unsignedTx.feeRate);
51
+ if (!feeDiff.isLessThan(feeRateDiffPercentage / 100)) {
52
+ yield this.coordinator.rejectTxRequest(newTxRequest.id);
53
+ throw new Error("Reject because of Invalid FeeRate");
54
+ }
55
+ const { signerInfo } = unsignedTx.inputs[0];
56
+ newUnsignedTx = yield this.baseWallet.sendBTCToMultipleAddressUnsignedTx(unsignedTx.outputs, signerInfo, +newTxRequest.feeRate, newTxRequest.inputs.map((x) => (Object.assign(Object.assign({}, x), { signerInfo }))));
57
+ let updatedTxRequest = yield this.coordinator.confirmOrRejectTxRequest(newTxRequest.id, unsignedTx.unsignedTransaction);
58
+ if (updatedTxRequest.unsignedPsbt !== unsignedTx.unsignedTransaction ||
59
+ updatedTxRequest.status === "Rejected") {
60
+ throw new Error("Reject because of invalid outputs");
61
+ }
62
+ newTxRequest = updatedTxRequest;
63
+ }
64
+ if (newTxRequest.status === "Pending") {
65
+ const updatedTxRequest = yield this.coordinator.waitTxStatusChange(newTxRequest.id);
66
+ if (!updatedTxRequest) {
67
+ yield this.coordinator.rejectTxRequest(newTxRequest.id);
68
+ throw new Error("Tx Timeout");
69
+ }
70
+ newTxRequest = updatedTxRequest;
71
+ }
72
+ if (newTxRequest.status === "Rejected") {
73
+ throw new Error("Tx rejected");
74
+ }
75
+ return {
76
+ unsignedTx: newUnsignedTx,
77
+ txRequest: newTxRequest,
78
+ };
79
+ });
80
+ }
81
+ step3SignTxAndWaitForBroadcast(unsignedTx, txRequest) {
82
+ return __awaiter(this, void 0, void 0, function* () {
83
+ if (!this.baseWallet.privateKey)
84
+ throw new Error("account is not initialized");
85
+ let newTxRequest = txRequest;
86
+ if (newTxRequest.status === "Approved") {
87
+ const signed = yield this.baseWallet.signer.signPsbt(unsignedTx, this.baseWallet.privateKey);
88
+ newTxRequest = yield this.coordinator.submitSignedPsbt(newTxRequest.id, signed);
89
+ }
90
+ if (newTxRequest.status === "Approved") {
91
+ const finalTx = yield this.coordinator.waitTxStatusChange(newTxRequest.id, "Approved");
92
+ if (!finalTx || finalTx.status === "Failed") {
93
+ throw new Error("Tx not broadcasted for long time");
94
+ }
95
+ newTxRequest = finalTx;
96
+ }
97
+ return newTxRequest;
98
+ });
99
+ }
100
+ sendBTCMultipleAddress(receivers, fee = "normal", staticExtendedUtxo, fullAmount = false) {
101
+ return __awaiter(this, void 0, void 0, function* () {
102
+ if (!this.baseWallet.signerInfo || !this.baseWallet.privateKey) {
103
+ throw new Error("account not initialized");
104
+ }
105
+ let unsignedResponse = yield this.step1SendBTCToMultipleAddressUnsigned(receivers, this.baseWallet.signerInfo, fee, staticExtendedUtxo, fullAmount);
106
+ unsignedResponse = yield this.step2WaitForUnsignedTxApproval(unsignedResponse.unsignedTx, unsignedResponse.txRequest);
107
+ const txRequest = yield this.step3SignTxAndWaitForBroadcast(unsignedResponse.unsignedTx, unsignedResponse.txRequest);
108
+ return txRequest;
109
+ });
110
+ }
111
+ sendBTC(receiverAddress, amountInSatoshi, fee = "normal", staticExtendedUtxo) {
112
+ return __awaiter(this, void 0, void 0, function* () {
113
+ const txRequest = yield this.sendBTCMultipleAddress([{ address: receiverAddress, value: amountInSatoshi === "all" ? 0 : amountInSatoshi }], fee, staticExtendedUtxo, amountInSatoshi === "all");
114
+ return txRequest;
115
+ });
116
+ }
117
+ }
118
+ exports.MultisigWalletHelper = MultisigWalletHelper;
119
+ //# sourceMappingURL=multisig-wallet.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"multisig-wallet.js","sourceRoot":"","sources":["../src/multisig-wallet.ts"],"names":[],"mappings":"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"}
@@ -7,11 +7,7 @@ declare class BitcoinLikeSignTransaction {
7
7
  unsignedTransaction: string;
8
8
  inputsToSign?: number[];
9
9
  }, privateKey: Buffer, sighashTypes?: any[], usingTweakSignerIfNeeded?: boolean): Promise<string>;
10
- finalizePsbts(psbtsBase64?: string[]): {
11
- hex: string;
12
- txId: string;
13
- vBytes: number;
14
- };
10
+ finalizePsbts(psbtsBase64?: string[]): string;
15
11
  }
16
12
  export default BitcoinLikeSignTransaction;
17
13
  //# sourceMappingURL=sign-transaction.d.ts.map
@@ -1 +1 @@
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;AA2CrD,cAAM,0BAA0B;IAC9B,OAAO,EAAE,OAAO,CAAA;gBAEJ,OAAO,EAAE,OAAO;IAItB,QAAQ,CACZ,YAAY,EAAE;QACZ,mBAAmB,EAAE,MAAM,CAAA;QAC3B,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;KACxB,EACD,UAAU,EAAE,MAAM,EAClB,YAAY,CAAC,EAAE,GAAG,EAAE,EACpB,wBAAwB,UAAO;IAkCjC,aAAa,CAAC,WAAW,GAAE,MAAM,EAAO;;;;;CAYzC;AAED,eAAe,0BAA0B,CAAA"}
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;AA2CrD,cAAM,0BAA0B;IAC9B,OAAO,EAAE,OAAO,CAAA;gBAEJ,OAAO,EAAE,OAAO;IAItB,QAAQ,CACZ,YAAY,EAAE;QACZ,mBAAmB,EAAE,MAAM,CAAA;QAC3B,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;KACxB,EACD,UAAU,EAAE,MAAM,EAClB,YAAY,CAAC,EAAE,GAAG,EAAE,EACpB,wBAAwB,UAAO;IAkCjC,aAAa,CAAC,WAAW,GAAE,MAAM,EAAO;CAczC;AAED,eAAe,0BAA0B,CAAA"}
@@ -73,13 +73,10 @@ class BitcoinLikeSignTransaction {
73
73
  }
74
74
  finalizePsbts(psbtsBase64 = []) {
75
75
  const finals = psbtsBase64.map((psbtBase64) => bitcoinjs_lib_1.Psbt.fromBase64(psbtBase64, { network: this.network }));
76
- let psbt = finals[0];
77
- for (let i = 1; i < finals.length; i += 1) {
78
- psbt.combine(finals[i]);
79
- }
76
+ const psbt = finals.length === 1 ? finals[0] : new bitcoinjs_lib_1.Psbt({ network: this.network }).combine(...finals);
80
77
  psbt.finalizeAllInputs();
81
78
  let finalizeTx = psbt.extractTransaction();
82
- return { hex: finalizeTx.toHex(), txId: finalizeTx.getId(), vBytes: finalizeTx.virtualSize() };
79
+ return finalizeTx.toHex();
83
80
  }
84
81
  }
85
82
  exports.default = BitcoinLikeSignTransaction;
@@ -1 +1 @@
1
- {"version":3,"file":"sign-transaction.js","sourceRoot":"","sources":["../../src/sign/sign-transaction.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sign-transaction.js","sourceRoot":"","sources":["../../src/sign/sign-transaction.ts"],"names":[],"mappings":"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"}
@@ -23,12 +23,12 @@ export declare class TeleswapWallet extends BitcoinBaseWallet {
23
23
  outputToken: string;
24
24
  outputAmount: string;
25
25
  bridgePercentageFee?: number;
26
- }, appId?: number, fee?: FeeRateType, thirdPartyId?: number, staticExtendedUtxo?: ExtendedUtxo[], changeAddress?: string, fullAmount?: boolean): Promise<any>;
26
+ }, appId?: number, speed?: boolean, fee?: FeeRateType, thirdPartyId?: number, staticExtendedUtxo?: ExtendedUtxo[], changeAddress?: string, fullAmount?: boolean): Promise<any>;
27
27
  wrapUnsigned(recipientAddress: string, amount: string, networkFee: string, lockerAddress: string, chainId: number, signer: SignerInfo, exchange?: {
28
28
  outputToken: string;
29
29
  outputAmount: string;
30
30
  bridgePercentageFee?: number;
31
- }, appId?: number, fee?: FeeRateType, thirdPartyId?: number, staticExtendedUtxo?: ExtendedUtxo[], changeAddress?: string, fullAmount?: boolean): Promise<{
31
+ }, appId?: number, speed?: boolean, fee?: FeeRateType, thirdPartyId?: number, staticExtendedUtxo?: ExtendedUtxo[], changeAddress?: string, fullAmount?: boolean): Promise<{
32
32
  unsignedTransaction: string;
33
33
  outputs: import("./transaction-builder/transaction-builder").Target[];
34
34
  inputs: {
@@ -1 +1 @@
1
- {"version":3,"file":"teleswap-wallet.d.ts","sourceRoot":"","sources":["../src/teleswap-wallet.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,YAAY,EACZ,UAAU,EAEX,MAAM,2CAA2C,CAAA;AAClD,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAGtE,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;AAED,qBAAa,cAAe,SAAQ,iBAAiB;IAE7C,IAAI,CACR,gBAAgB,EAAE,MAAM,EACxB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,MAAM,EACf,QAAQ,CAAC,EAAE;QACT,WAAW,EAAE,MAAM,CAAA;QACnB,YAAY,EAAE,MAAM,CAAA;QACpB,mBAAmB,CAAC,EAAE,MAAM,CAAA;KAC7B,EACD,KAAK,SAEiC,EACtC,GAAG,GAAE,WAAsB,EAC3B,YAAY,CAAC,EAAE,MAAM,EACrB,kBAAkB,CAAC,EAAE,YAAY,EAAE,EACnC,aAAa,CAAC,EAAE,MAAM,EACtB,UAAU,UAAQ;IA0Bd,YAAY,CAChB,gBAAgB,EAAE,MAAM,EACxB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,UAAU,EAClB,QAAQ,CAAC,EAAE;QACT,WAAW,EAAE,MAAM,CAAA;QACnB,YAAY,EAAE,MAAM,CAAA;QACpB,mBAAmB,CAAC,EAAE,MAAM,CAAA;KAC7B,EACD,KAAK,SAEiC,EACtC,GAAG,GAAE,WAAsB,EAC3B,YAAY,CAAC,EAAE,MAAM,EACrB,kBAAkB,CAAC,EAAE,YAAY,EAAE,EACnC,aAAa,CAAC,EAAE,MAAM,EACtB,UAAU,UAAQ;;;;;;;;;;;;;CAqCrB;AACD,eAAe,cAAc,CAAA"}
1
+ {"version":3,"file":"teleswap-wallet.d.ts","sourceRoot":"","sources":["../src/teleswap-wallet.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,YAAY,EACZ,UAAU,EAEX,MAAM,2CAA2C,CAAA;AAClD,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAGtE,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;AAED,qBAAa,cAAe,SAAQ,iBAAiB;IAE7C,IAAI,CACR,gBAAgB,EAAE,MAAM,EACxB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,MAAM,EACf,QAAQ,CAAC,EAAE;QACT,WAAW,EAAE,MAAM,CAAA;QACnB,YAAY,EAAE,MAAM,CAAA;QACpB,mBAAmB,CAAC,EAAE,MAAM,CAAA;KAC7B,EACD,KAAK,SAEiC,EACtC,KAAK,UAAQ,EACb,GAAG,GAAE,WAAsB,EAC3B,YAAY,CAAC,EAAE,MAAM,EACrB,kBAAkB,CAAC,EAAE,YAAY,EAAE,EACnC,aAAa,CAAC,EAAE,MAAM,EACtB,UAAU,UAAQ;IA2Bd,YAAY,CAChB,gBAAgB,EAAE,MAAM,EACxB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,UAAU,EAClB,QAAQ,CAAC,EAAE;QACT,WAAW,EAAE,MAAM,CAAA;QACnB,YAAY,EAAE,MAAM,CAAA;QACpB,mBAAmB,CAAC,EAAE,MAAM,CAAA;KAC7B,EACD,KAAK,SAEiC,EACtC,KAAK,UAAQ,EACb,GAAG,GAAE,WAAsB,EAC3B,YAAY,CAAC,EAAE,MAAM,EACrB,kBAAkB,CAAC,EAAE,YAAY,EAAE,EACnC,aAAa,CAAC,EAAE,MAAM,EACtB,UAAU,UAAQ;;;;;;;;;;;;;CAuCrB;AACD,eAAe,cAAc,CAAA"}
@@ -16,26 +16,26 @@ const teleswap_helper_1 = require("./helper/teleswap-helper");
16
16
  class TeleswapWallet extends bitcoin_wallet_base_1.BitcoinBaseWallet {
17
17
  wrap(recipientAddress, amount, networkFee, lockerAddress, chainId, exchange, appId = exchange
18
18
  ? configs_1.teleswap.requestAppId.WrapAndSwap.default
19
- : configs_1.teleswap.requestAppId.Wrap.default, fee = "normal", thirdPartyId, staticExtendedUtxo, changeAddress, fullAmount = false) {
19
+ : configs_1.teleswap.requestAppId.Wrap.default, speed = false, fee = "normal", thirdPartyId, staticExtendedUtxo, changeAddress, fullAmount = false) {
20
20
  return __awaiter(this, void 0, void 0, function* () {
21
21
  if (!this.signerInfo || !this.privateKey) {
22
22
  throw new Error("account not initialized");
23
23
  }
24
- let unsignedTransaction = yield this.wrapUnsigned(recipientAddress, amount, networkFee, lockerAddress, chainId, this.signerInfo, exchange, appId, fee, thirdPartyId, staticExtendedUtxo, changeAddress, fullAmount);
24
+ let unsignedTransaction = yield this.wrapUnsigned(recipientAddress, amount, networkFee, lockerAddress, chainId, this.signerInfo, exchange, appId, speed, fee, thirdPartyId, staticExtendedUtxo, changeAddress, fullAmount);
25
25
  let signedPsbt = yield this.signer.signPsbt(unsignedTransaction, this.privateKey);
26
26
  return this.sendSignedPsbt(signedPsbt);
27
27
  });
28
28
  }
29
29
  wrapUnsigned(recipientAddress, amount, networkFee, lockerAddress, chainId, signer, exchange, appId = exchange
30
30
  ? configs_1.teleswap.requestAppId.WrapAndSwap.default
31
- : configs_1.teleswap.requestAppId.Wrap.default, fee = "normal", thirdPartyId, staticExtendedUtxo, changeAddress, fullAmount = false) {
31
+ : configs_1.teleswap.requestAppId.Wrap.default, speed = false, fee = "normal", thirdPartyId, staticExtendedUtxo, changeAddress, fullAmount = false) {
32
32
  return __awaiter(this, void 0, void 0, function* () {
33
33
  const dataHex = (0, teleswap_helper_1.generateWrapOpReturn)({
34
34
  chainId,
35
35
  appId,
36
36
  recipientAddress,
37
37
  networkFee,
38
- speed: false,
38
+ speed,
39
39
  isExchange: !!exchange,
40
40
  outputAmount: exchange === null || exchange === void 0 ? void 0 : exchange.outputAmount,
41
41
  outputToken: exchange === null || exchange === void 0 ? void 0 : exchange.outputToken,
@@ -53,12 +53,14 @@ class TeleswapWallet extends bitcoin_wallet_base_1.BitcoinBaseWallet {
53
53
  },
54
54
  this.transactionBuilder.getOpReturnTarget(dataHex),
55
55
  ];
56
+ const sequenceNumber = speed === true ? this.transactionBuilder.NO_RBF_SEQUENCE : undefined;
56
57
  const unsignedTx = this.transactionBuilder.processUnsignedTransaction({
57
58
  extendedUtxo,
58
59
  feeRate,
59
60
  targets,
60
61
  changeAddress: fullAmount ? lockerAddress : changeAddress || signer.address,
61
62
  fullAmount,
63
+ sequenceNumber,
62
64
  });
63
65
  return unsignedTx;
64
66
  });
@@ -1 +1 @@
1
- {"version":3,"file":"teleswap-wallet.js","sourceRoot":"","sources":["../src/teleswap-wallet.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAA0D;AAM1D,+DAAsE;AACtE,8DAA+D;AAsB/D,MAAa,cAAe,SAAQ,uCAAiB;IAE7C,IAAI,CACR,gBAAwB,EACxB,MAAc,EACd,UAAkB,EAClB,aAAqB,EACrB,OAAe,EACf,QAIC,EACD,KAAK,GAAG,QAAQ;QACd,CAAC,CAAC,kBAAQ,CAAC,YAAY,CAAC,WAAW,CAAC,OAAO;QAC3C,CAAC,CAAC,kBAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,EACtC,MAAmB,QAAQ,EAC3B,YAAqB,EACrB,kBAAmC,EACnC,aAAsB,EACtB,UAAU,GAAG,KAAK;;YAElB,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;gBACxC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;aAC3C;YACD,IAAI,mBAAmB,GAAG,MAAM,IAAI,CAAC,YAAY,CAC/C,gBAAgB,EAChB,MAAM,EACN,UAAU,EACV,aAAa,EACb,OAAO,EACP,IAAI,CAAC,UAAU,EACf,QAAQ,EACR,KAAK,EACL,GAAG,EACH,YAAY,EACZ,kBAAkB,EAClB,aAAa,EACb,UAAU,CACX,CAAA;YACD,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,EAAE,IAAI,CAAC,UAAU,CAAC,CAAA;YACjF,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAA;QACxC,CAAC;KAAA;IAIK,YAAY,CAChB,gBAAwB,EACxB,MAAc,EACd,UAAkB,EAClB,aAAqB,EACrB,OAAe,EACf,MAAkB,EAClB,QAIC,EACD,KAAK,GAAG,QAAQ;QACd,CAAC,CAAC,kBAAQ,CAAC,YAAY,CAAC,WAAW,CAAC,OAAO;QAC3C,CAAC,CAAC,kBAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,EACtC,MAAmB,QAAQ,EAC3B,YAAqB,EACrB,kBAAmC,EACnC,aAAsB,EACtB,UAAU,GAAG,KAAK;;YAElB,MAAM,OAAO,GAAG,IAAA,sCAAoB,EAAC;gBACnC,OAAO;gBACP,KAAK;gBACL,gBAAgB;gBAChB,UAAU;gBACV,KAAK,EAAE,KAAK;gBACZ,UAAU,EAAE,CAAC,CAAC,QAAQ;gBACtB,YAAY,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,YAAY;gBACpC,WAAW,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,WAAW;gBAClC,mBAAmB,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,mBAAmB;gBAClD,YAAY;aACb,CAAC,CAAA;YACF,IAAI,YAAY,GAAG,kBAAkB,IAAI,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAA;YAC7E,IAAI,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;YAExC,MAAM,OAAO,GAAG,UAAU;gBACxB,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;gBACtD,CAAC,CAAC;oBACE;wBACE,OAAO,EAAE,aAAa;wBACtB,KAAK,EAAE,CAAC,MAAM;qBACf;oBACD,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,OAAO,CAAC;iBACnD,CAAA;YAEL,MAAM,UAAU,GAAG,IAAI,CAAC,kBAAkB,CAAC,0BAA0B,CAAC;gBACpE,YAAY;gBACZ,OAAO;gBACP,OAAO;gBACP,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa,IAAI,MAAM,CAAC,OAAO;gBAC3E,UAAU;aACX,CAAC,CAAA;YAEF,OAAO,UAAU,CAAA;QACnB,CAAC;KAAA;CACF;AAtGD,wCAsGC;AACD,kBAAe,cAAc,CAAA"}
1
+ {"version":3,"file":"teleswap-wallet.js","sourceRoot":"","sources":["../src/teleswap-wallet.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,87 @@
1
+ /// <reference types="node" />
2
+ import * as bitcoin from "bitcoinjs-lib";
3
+ import { ExtendedUtxo, Target } from "./transaction-builder";
4
+ export declare const componentBytes: {
5
+ bytePerInput: {
6
+ p2pkh: number;
7
+ p2wpkh: number;
8
+ "p2sh-p2wpkh": number;
9
+ p2tr: number;
10
+ default: number;
11
+ };
12
+ baseTxBytes: number;
13
+ bytePerOutput: {
14
+ p2pkh: number;
15
+ p2wpkh: number;
16
+ p2sh: number;
17
+ p2tr: number;
18
+ p2wsh: number;
19
+ default: number;
20
+ max: number;
21
+ };
22
+ scriptExtraBytes: {
23
+ lessThan255: number;
24
+ moreThan255: number;
25
+ };
26
+ };
27
+ export declare const DUST = 600;
28
+ export declare function getInputSize(addressType: string, details?: {
29
+ script?: string;
30
+ n?: number;
31
+ m?: number;
32
+ }): number;
33
+ export declare function getOutputSize(output: {
34
+ addressType?: string;
35
+ address?: string;
36
+ script?: Buffer;
37
+ }, network?: bitcoin.Network): number;
38
+ export declare function calculateTxSize(inputTypes: {
39
+ addressType: string;
40
+ n?: number;
41
+ m?: number;
42
+ script?: string;
43
+ }[], outputs: {
44
+ script?: Buffer;
45
+ address?: string;
46
+ value: number;
47
+ }[], changeAddressType?: string, network?: bitcoin.Network): number;
48
+ export declare function coinSelectBnB(inputs: ExtendedUtxo[], outputs: Target[], feeRate: number, changeAddressType?: string, network?: bitcoin.Network): {
49
+ success: boolean;
50
+ inputs: ExtendedUtxo[];
51
+ outputs: Target[];
52
+ fee: number;
53
+ totalInputValue: number;
54
+ totalOutputValue: number;
55
+ needed: number;
56
+ change?: {
57
+ value: number;
58
+ };
59
+ };
60
+ export declare function coinSelectAccumulative(inputs: ExtendedUtxo[], outputs: Target[], feeRate: number, changeAddressType?: string, network?: bitcoin.Network, minInputAggregate?: {
61
+ minInputCount: number;
62
+ maxInputValue: number;
63
+ }): {
64
+ success: boolean;
65
+ inputs: ExtendedUtxo[];
66
+ outputs: Target[];
67
+ fee: number;
68
+ totalInputValue: number;
69
+ totalOutputValue: number;
70
+ needed: number;
71
+ change?: {
72
+ value: number;
73
+ };
74
+ };
75
+ export declare function coinSelectAll(inputs: ExtendedUtxo[], targets: Target[], feeRate: number, changeAddressType?: string, network?: bitcoin.Network): {
76
+ success: boolean;
77
+ inputs: ExtendedUtxo[];
78
+ outputs: Target[];
79
+ fee: number;
80
+ totalInputValue: number;
81
+ totalOutputValue: number;
82
+ needed: number;
83
+ change?: {
84
+ value: number;
85
+ };
86
+ };
87
+ //# sourceMappingURL=coin-select.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"coin-select.d.ts","sourceRoot":"","sources":["../../src/transaction-builder/coin-select.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,OAAO,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAG5D,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;CAuB1B,CAAA;AA0BD,eAAO,MAAM,IAAI,MAAM,CAAA;AAEvB,wBAAgB,YAAY,CAC1B,WAAW,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE;IAER,MAAM,CAAC,EAAE,MAAM,CAAA;IAEf,CAAC,CAAC,EAAE,MAAM,CAAA;IACV,CAAC,CAAC,EAAE,MAAM,CAAA;CACX,UAkBF;AAED,wBAAgB,aAAa,CAC3B,MAAM,EAAE;IACN,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,EAED,OAAO,GAAE,OAAO,CAAC,OAAkC,UA6BpD;AAED,wBAAgB,eAAe,CAC7B,UAAU,EAAE;IACV,WAAW,EAAE,MAAM,CAAA;IACnB,CAAC,CAAC,EAAE,MAAM,CAAA;IACV,CAAC,CAAC,EAAE,MAAM,CAAA;IACV,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,EAAE,EACH,OAAO,EAAE;IACP,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;CACd,EAAE,EACH,iBAAiB,SAAY,EAC7B,OAAO,GAAE,OAAO,CAAC,OAAkC,UAqBpD;AAWD,wBAAgB,aAAa,CAC3B,MAAM,EAAE,YAAY,EAAE,EACtB,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,iBAAiB,SAAQ,EACzB,OAAO,GAAE,OAAO,CAAC,OAAkC,GAClD;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE,YAAY,EAAE,CAAA;IACtB,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,GAAG,EAAE,MAAM,CAAA;IACX,eAAe,EAAE,MAAM,CAAA;IACvB,gBAAgB,EAAE,MAAM,CAAA;IACxB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;CAC3B,CA6GA;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,YAAY,EAAE,EACtB,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,iBAAiB,SAAQ,EACzB,OAAO,GAAE,OAAO,CAAC,OAAkC,EACnD,iBAAiB,GAAE;IACjB,aAAa,EAAE,MAAM,CAAA;IACrB,aAAa,EAAE,MAAM,CAAA;CAItB,GACA;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE,YAAY,EAAE,CAAA;IACtB,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,GAAG,EAAE,MAAM,CAAA;IACX,eAAe,EAAE,MAAM,CAAA;IACvB,gBAAgB,EAAE,MAAM,CAAA;IACxB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;CAC3B,CAwEA;AAED,wBAAgB,aAAa,CAC3B,MAAM,EAAE,YAAY,EAAE,EACtB,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,iBAAiB,SAAQ,EACzB,OAAO,GAAE,OAAO,CAAC,OAAkC,GAClD;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE,YAAY,EAAE,CAAA;IACtB,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,GAAG,EAAE,MAAM,CAAA;IACX,eAAe,EAAE,MAAM,CAAA;IACvB,gBAAgB,EAAE,MAAM,CAAA;IACxB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;CAC3B,CAyDA"}