@teleportdao/bitcoin 2.0.8 → 2.0.10
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.
|
@@ -30,7 +30,7 @@ class BitcoinInterfaceWallet extends bitcoin_interface_utils_1.BitcoinInterfaceU
|
|
|
30
30
|
}
|
|
31
31
|
getFeeRate(speed) {
|
|
32
32
|
return __awaiter(this, void 0, void 0, function* () {
|
|
33
|
-
return this.apiProvider.
|
|
33
|
+
return this.apiProvider.getRecommendedFeeRate(speed);
|
|
34
34
|
});
|
|
35
35
|
}
|
|
36
36
|
getUtxo(address) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bitcoin-interface-wallet.js","sourceRoot":"","sources":["../src/bitcoin-interface-wallet.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sDAAmE;AACnE,uEAAiE;AAIjE,MAAa,sBAAuB,SAAQ,+CAAqB;IAI/D,YAAY,WAAmB,EAAE,cAAsC;;QACrE,KAAK,CAAC,WAAW,CAAC,CAAA;QAClB,IAAI,CAAA,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,GAAG,0CAAE,QAAQ,MAAK,aAAa,EAAE;YACnD,IAAI,CAAC,WAAW,GAAG,IAAI,mBAAe,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;SACjE;aAAM;YACL,IAAI,CAAC,WAAW,GAAG,IAAI,mBAAe,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;SAClE;QAED,IAAI,CAAC,YAAY,GAAG,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,IAAI;YACtC,CAAC,CAAC,mBAAe,CAAC,eAAe,CAAC,cAAc,CAAC,IAAI,EAAE,WAAW,CAAE;YACpE,CAAC,CAAC,IAAI,CAAC,WAAW,CAAA;QAGpB,IAAI,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,GAAG;YAAE,IAAI,CAAC,WAAW,GAAG,mBAAe,CAAC,cAAc,CAAC,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,GAAG,CAAC,CAAA;IACjG,CAAC;IAEK,UAAU,CAAC,KAAkC;;YACjD,OAAO,IAAI,CAAC,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"bitcoin-interface-wallet.js","sourceRoot":"","sources":["../src/bitcoin-interface-wallet.ts"],"names":[],"mappings":"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"}
|
package/dist/teleswap-wallet.js
CHANGED
|
@@ -57,7 +57,7 @@ class TeleswapWallet extends bitcoin_wallet_base_1.BitcoinBaseWallet {
|
|
|
57
57
|
extendedUtxo,
|
|
58
58
|
feeRate,
|
|
59
59
|
targets,
|
|
60
|
-
changeAddress: changeAddress || signer.address,
|
|
60
|
+
changeAddress: fullAmount ? lockerAddress : changeAddress || signer.address,
|
|
61
61
|
fullAmount,
|
|
62
62
|
});
|
|
63
63
|
return unsignedTx;
|
|
@@ -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,aAAa,IAAI,MAAM,CAAC,OAAO;
|
|
1
|
+
{"version":3,"file":"teleswap-wallet.js","sourceRoot":"","sources":["../src/teleswap-wallet.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teleportdao/bitcoin",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.10",
|
|
4
4
|
"description": "teleswap bitcoin package",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -14,8 +14,8 @@
|
|
|
14
14
|
"license": "ISC",
|
|
15
15
|
"dependencies": {
|
|
16
16
|
"@bitcoinerlab/secp256k1": "^1.0.5",
|
|
17
|
-
"@teleportdao/configs": "^2.0.
|
|
18
|
-
"@teleportdao/providers": "^2.0.
|
|
17
|
+
"@teleportdao/configs": "^2.0.10",
|
|
18
|
+
"@teleportdao/providers": "^2.0.10",
|
|
19
19
|
"axios": "^0.27.2",
|
|
20
20
|
"bignumber.js": "^9.1.1",
|
|
21
21
|
"bip32": "^4.0.0",
|
|
@@ -31,5 +31,5 @@
|
|
|
31
31
|
"publishConfig": {
|
|
32
32
|
"access": "public"
|
|
33
33
|
},
|
|
34
|
-
"gitHead": "
|
|
34
|
+
"gitHead": "7eaf41d6a45e31a3f10ce8121a75b67ebd5067f2"
|
|
35
35
|
}
|
|
@@ -24,7 +24,7 @@ export class BitcoinInterfaceWallet extends BitcoinInterfaceUtils {
|
|
|
24
24
|
}
|
|
25
25
|
|
|
26
26
|
async getFeeRate(speed?: "normal" | "slow" | "fast") {
|
|
27
|
-
return this.apiProvider.
|
|
27
|
+
return this.apiProvider.getRecommendedFeeRate(speed)
|
|
28
28
|
}
|
|
29
29
|
|
|
30
30
|
async getUtxo(address: string) {
|
package/src/teleswap-wallet.ts
CHANGED
|
@@ -123,7 +123,7 @@ export class TeleswapWallet extends BitcoinBaseWallet {
|
|
|
123
123
|
extendedUtxo,
|
|
124
124
|
feeRate,
|
|
125
125
|
targets,
|
|
126
|
-
changeAddress: changeAddress || signer.address,
|
|
126
|
+
changeAddress: fullAmount ? lockerAddress : changeAddress || signer.address,
|
|
127
127
|
fullAmount,
|
|
128
128
|
})
|
|
129
129
|
|