@ledgerhq/live-common 33.5.0-next.4 → 33.5.0-next.6
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/lib/exchange/swap/maybeTezosAccountUnrevealedAccount.d.ts.map +1 -1
- package/lib/exchange/swap/maybeTezosAccountUnrevealedAccount.js +5 -4
- package/lib/exchange/swap/maybeTezosAccountUnrevealedAccount.js.map +1 -1
- package/lib/families/stacks/bridge/account.d.ts.map +1 -1
- package/lib/families/stacks/bridge/account.js +10 -11
- package/lib/families/stacks/bridge/account.js.map +1 -1
- package/lib/families/stacks/bridge/utils/misc.d.ts.map +1 -1
- package/lib/families/stacks/bridge/utils/misc.js +4 -5
- package/lib/families/stacks/bridge/utils/misc.js.map +1 -1
- package/lib/families/stacks/bridge.integration.test.js +3 -1
- package/lib/families/stacks/bridge.integration.test.js.map +1 -1
- package/lib-es/exchange/swap/maybeTezosAccountUnrevealedAccount.d.ts.map +1 -1
- package/lib-es/exchange/swap/maybeTezosAccountUnrevealedAccount.js +5 -4
- package/lib-es/exchange/swap/maybeTezosAccountUnrevealedAccount.js.map +1 -1
- package/lib-es/families/stacks/bridge/account.d.ts.map +1 -1
- package/lib-es/families/stacks/bridge/account.js +11 -12
- package/lib-es/families/stacks/bridge/account.js.map +1 -1
- package/lib-es/families/stacks/bridge/utils/misc.d.ts.map +1 -1
- package/lib-es/families/stacks/bridge/utils/misc.js +4 -5
- package/lib-es/families/stacks/bridge/utils/misc.js.map +1 -1
- package/lib-es/families/stacks/bridge.integration.test.js +3 -1
- package/lib-es/families/stacks/bridge.integration.test.js.map +1 -1
- package/package.json +6 -7
- package/src/exchange/swap/maybeTezosAccountUnrevealedAccount.ts +1 -0
- package/src/families/stacks/bridge/account.ts +11 -12
- package/src/families/stacks/bridge/utils/misc.ts +4 -5
- package/src/families/stacks/bridge.integration.test.ts +3 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"maybeTezosAccountUnrevealedAccount.d.ts","sourceRoot":"","sources":["../../../src/exchange/swap/maybeTezosAccountUnrevealedAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAE9C,eAAO,MAAM,kCAAkC,oBAC5B,mBAAmB,KACnC,KAAK,GAAG,
|
|
1
|
+
{"version":3,"file":"maybeTezosAccountUnrevealedAccount.d.ts","sourceRoot":"","sources":["../../../src/exchange/swap/maybeTezosAccountUnrevealedAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAE9C,eAAO,MAAM,kCAAkC,oBAC5B,mBAAmB,KACnC,KAAK,GAAG,SAWV,CAAC"}
|
|
@@ -2,10 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.maybeTezosAccountUnrevealedAccount = void 0;
|
|
4
4
|
const maybeTezosAccountUnrevealedAccount = (swapTransaction) => {
|
|
5
|
-
var _a, _b, _c, _d;
|
|
6
|
-
if (((_a = swapTransaction
|
|
7
|
-
((_b = swapTransaction === null || swapTransaction === void 0 ? void 0 : swapTransaction.transaction) === null || _b === void 0 ? void 0 : _b.
|
|
8
|
-
((_c = swapTransaction === null || swapTransaction === void 0 ? void 0 : swapTransaction.transaction) === null || _c === void 0 ? void 0 : _c.
|
|
5
|
+
var _a, _b, _c, _d, _e;
|
|
6
|
+
if (((_a = swapTransaction.swap) === null || _a === void 0 ? void 0 : _a.rates.status) == "success" &&
|
|
7
|
+
((_b = swapTransaction === null || swapTransaction === void 0 ? void 0 : swapTransaction.transaction) === null || _b === void 0 ? void 0 : _b.family) == "tezos" &&
|
|
8
|
+
((_c = swapTransaction === null || swapTransaction === void 0 ? void 0 : swapTransaction.transaction) === null || _c === void 0 ? void 0 : _c.estimatedFees) &&
|
|
9
|
+
((_d = swapTransaction === null || swapTransaction === void 0 ? void 0 : swapTransaction.transaction) === null || _d === void 0 ? void 0 : _d.fees) !== ((_e = swapTransaction === null || swapTransaction === void 0 ? void 0 : swapTransaction.transaction) === null || _e === void 0 ? void 0 : _e.estimatedFees)) {
|
|
9
10
|
const tezosError = new Error("Cannot swap with an unrevealed Tezos account");
|
|
10
11
|
tezosError.name = "TezosUnrevealedAccount";
|
|
11
12
|
return tezosError;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"maybeTezosAccountUnrevealedAccount.js","sourceRoot":"","sources":["../../../src/exchange/swap/maybeTezosAccountUnrevealedAccount.ts"],"names":[],"mappings":";;;AAEO,MAAM,kCAAkC,GAAG,CAChD,eAAoC,EACjB,EAAE;;IACrB,IACE,CAAA,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,WAAW,0CAAE,MAAM,KAAI,OAAO;SAC/C,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,WAAW,0CAAE,aAAa,CAAA;QAC3C,CAAA,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,WAAW,0CAAE,IAAI,OAAK,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,WAAW,0CAAE,aAAa,CAAA,EAClF;QACA,MAAM,UAAU,GAAG,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;QAC7E,UAAU,CAAC,IAAI,GAAG,wBAAwB,CAAC;QAC3C,OAAO,UAAU,CAAC;KACnB;AACH,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"maybeTezosAccountUnrevealedAccount.js","sourceRoot":"","sources":["../../../src/exchange/swap/maybeTezosAccountUnrevealedAccount.ts"],"names":[],"mappings":";;;AAEO,MAAM,kCAAkC,GAAG,CAChD,eAAoC,EACjB,EAAE;;IACrB,IACE,CAAA,MAAA,eAAe,CAAC,IAAI,0CAAE,KAAK,CAAC,MAAM,KAAI,SAAS;QAC/C,CAAA,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,WAAW,0CAAE,MAAM,KAAI,OAAO;SAC/C,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,WAAW,0CAAE,aAAa,CAAA;QAC3C,CAAA,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,WAAW,0CAAE,IAAI,OAAK,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,WAAW,0CAAE,aAAa,CAAA,EAClF;QACA,MAAM,UAAU,GAAG,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;QAC7E,UAAU,CAAC,IAAI,GAAG,wBAAwB,CAAC;QAC3C,OAAO,UAAU,CAAC;KACnB;AACH,CAAC,CAAC;AAbW,QAAA,kCAAkC,sCAa7C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../../../../src/families/stacks/bridge/account.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../../../../src/families/stacks/bridge/account.ts"],"names":[],"mappings":"AA4BA,OAAO,EAEL,aAAa,EAKd,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAmB,WAAW,EAAqB,MAAM,UAAU,CAAC;AAmQ3E,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,WAAW,CAUpD,CAAC"}
|
|
@@ -17,7 +17,6 @@ const ledger_stacks_1 = __importDefault(require("@zondax/ledger-stacks"));
|
|
|
17
17
|
const c32check_1 = require("c32check");
|
|
18
18
|
const network_1 = require("@stacks/network");
|
|
19
19
|
const bignumber_js_1 = require("bignumber.js");
|
|
20
|
-
const bn_js_1 = __importDefault(require("bn.js"));
|
|
21
20
|
const rxjs_1 = require("rxjs");
|
|
22
21
|
const invariant_1 = __importDefault(require("invariant"));
|
|
23
22
|
const errors_1 = require("@ledgerhq/errors");
|
|
@@ -107,11 +106,11 @@ const estimateMaxSpendable = ({ account, parentAccount, transaction, }) => __awa
|
|
|
107
106
|
memo,
|
|
108
107
|
network,
|
|
109
108
|
publicKey: xpub,
|
|
110
|
-
amount:
|
|
109
|
+
amount: amount.toFixed(),
|
|
111
110
|
};
|
|
112
111
|
const tx = yield (0, transactions_1.makeUnsignedSTXTokenTransfer)(options);
|
|
113
|
-
const
|
|
114
|
-
const diff = spendableBalance.minus(new bignumber_js_1.BigNumber(fee
|
|
112
|
+
const [feeEst] = yield (0, transactions_1.estimateTransaction)(tx.payload);
|
|
113
|
+
const diff = spendableBalance.minus(new bignumber_js_1.BigNumber(feeEst.fee));
|
|
115
114
|
return diff.gte(0) ? diff : new bignumber_js_1.BigNumber(0);
|
|
116
115
|
});
|
|
117
116
|
const prepareTransaction = (a, t) => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -129,15 +128,15 @@ const prepareTransaction = (a, t) => __awaiter(void 0, void 0, void 0, function*
|
|
|
129
128
|
memo,
|
|
130
129
|
network,
|
|
131
130
|
publicKey: xpub,
|
|
132
|
-
amount:
|
|
131
|
+
amount: amount.toFixed(),
|
|
133
132
|
};
|
|
134
133
|
const tx = yield (0, transactions_1.makeUnsignedSTXTokenTransfer)(options);
|
|
135
134
|
const addressVersion = network.version === transactions_1.TransactionVersion.Mainnet
|
|
136
135
|
? transactions_1.AddressVersion.MainnetSingleSig
|
|
137
136
|
: transactions_1.AddressVersion.TestnetSingleSig;
|
|
138
137
|
const senderAddress = (0, c32check_1.c32address)(addressVersion, tx.auth.spendingCondition.signer);
|
|
139
|
-
const fee = yield (0, transactions_1.
|
|
140
|
-
patch.fee = new bignumber_js_1.BigNumber(fee.
|
|
138
|
+
const [fee] = yield (0, transactions_1.estimateTransaction)(tx.payload);
|
|
139
|
+
patch.fee = new bignumber_js_1.BigNumber(fee.fee);
|
|
141
140
|
patch.nonce = yield (0, misc_1.findNextNonce)(senderAddress, pendingOperations);
|
|
142
141
|
if (useAllAmount)
|
|
143
142
|
patch.amount = spendableBalance.minus(patch.fee);
|
|
@@ -164,14 +163,14 @@ const signOperation = ({ account, deviceId, transaction, }) => (0, deviceAccess_
|
|
|
164
163
|
}
|
|
165
164
|
const blockstack = new ledger_stacks_1.default(transport);
|
|
166
165
|
const options = {
|
|
167
|
-
amount:
|
|
166
|
+
amount: amount.toFixed(),
|
|
168
167
|
recipient,
|
|
169
168
|
anchorMode,
|
|
170
169
|
network: api_types_1.StacksNetwork[network],
|
|
171
170
|
memo,
|
|
172
171
|
publicKey: xpub,
|
|
173
|
-
fee:
|
|
174
|
-
nonce:
|
|
172
|
+
fee: fee.toFixed(),
|
|
173
|
+
nonce: nonce.toFixed(),
|
|
175
174
|
};
|
|
176
175
|
const tx = yield (0, transactions_1.makeUnsignedSTXTokenTransfer)(options);
|
|
177
176
|
const serializedTx = tx.serialize();
|
|
@@ -179,7 +178,7 @@ const signOperation = ({ account, deviceId, transaction, }) => (0, deviceAccess_
|
|
|
179
178
|
type: "device-signature-requested",
|
|
180
179
|
});
|
|
181
180
|
// Sign by device
|
|
182
|
-
const result = yield blockstack.sign((0, utils_2.getPath)(derivationPath), serializedTx);
|
|
181
|
+
const result = yield blockstack.sign((0, utils_2.getPath)(derivationPath), Buffer.from(serializedTx));
|
|
183
182
|
(0, utils_2.throwIfError)(result);
|
|
184
183
|
o.next({
|
|
185
184
|
type: "device-signature-granted",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account.js","sourceRoot":"","sources":["../../../../src/families/stacks/bridge/account.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0EAAkD;AAClD,uCAAsC;AACtC,6CAAgD;AAChD,+CAAyC;AACzC
|
|
1
|
+
{"version":3,"file":"account.js","sourceRoot":"","sources":["../../../../src/families/stacks/bridge/account.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../../../../../src/families/stacks/bridge/utils/misc.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../../../../../src/families/stacks/bridge/utils/misc.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAOnE,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AASjF,OAAO,EAAiB,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAGjE,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,eAAO,MAAM,gBAAgB,cAChB,eAAe,aACf,MAAM,WACR,OAAO,MAAM,EAAE,GAAG,CAAC,KAC3B,QAAQ,MAAM,CA4BhB,CAAC;AAEF,eAAO,MAAM,OAAO,mDAAiD,CAAC;AAEtE,eAAO,MAAM,UAAU,MAAO,OAAO,KAAG,OAG6B,CAAC;AAEtE,eAAO,MAAM,UAAU,gCACI,gBAAgB,UACpC,mBAAmB,KAAG,eAAe,EAgEzC,CAAC;AAEJ,eAAO,MAAM,eAAe,EAAE,eAqC7B,CAAC;AAcF,eAAO,MAAM,aAAa,kBACT,MAAM,cACT,SAAS,EAAE,KACtB,QAAQ,SAAS,CAgCnB,CAAC"}
|
|
@@ -14,7 +14,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.findNextNonce = exports.getAccountShape = exports.mapTxToOps = exports.getAddress = exports.getUnit = exports.getTxToBroadcast = void 0;
|
|
16
16
|
const bignumber_js_1 = require("bignumber.js");
|
|
17
|
-
const bn_js_1 = __importDefault(require("bn.js"));
|
|
18
17
|
const flatMap_1 = __importDefault(require("lodash/flatMap"));
|
|
19
18
|
const transactions_1 = require("@stacks/transactions");
|
|
20
19
|
const account_1 = require("../../../../account");
|
|
@@ -27,20 +26,20 @@ const getTxToBroadcast = (operation, signature, rawData) => __awaiter(void 0, vo
|
|
|
27
26
|
const { value, recipients, fee, extra: { memo }, } = operation;
|
|
28
27
|
const { anchorMode, network, xpub } = rawData;
|
|
29
28
|
const options = {
|
|
30
|
-
amount:
|
|
29
|
+
amount: (0, bignumber_js_1.BigNumber)(value).minus(fee).toFixed(),
|
|
31
30
|
recipient: recipients[0],
|
|
32
31
|
anchorMode,
|
|
33
32
|
memo,
|
|
34
33
|
network: api_types_1.StacksNetwork[network],
|
|
35
34
|
publicKey: xpub,
|
|
36
|
-
fee:
|
|
37
|
-
nonce:
|
|
35
|
+
fee: (0, bignumber_js_1.BigNumber)(fee).toFixed(),
|
|
36
|
+
nonce: (_a = operation.transactionSequenceNumber) !== null && _a !== void 0 ? _a : 0,
|
|
38
37
|
};
|
|
39
38
|
const tx = yield (0, transactions_1.makeUnsignedSTXTokenTransfer)(options);
|
|
40
39
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
41
40
|
// @ts-ignore need to ignore the TS error here
|
|
42
41
|
tx.auth.spendingCondition.signature = (0, transactions_1.createMessageSignature)(signature);
|
|
43
|
-
return tx.serialize();
|
|
42
|
+
return Buffer.from(tx.serialize());
|
|
44
43
|
});
|
|
45
44
|
exports.getTxToBroadcast = getTxToBroadcast;
|
|
46
45
|
const getUnit = () => (0, currencies_1.getCryptoCurrencyById)("stacks").units[0];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"misc.js","sourceRoot":"","sources":["../../../../../src/families/stacks/bridge/utils/misc.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+CAAyC;AACzC,
|
|
1
|
+
{"version":3,"file":"misc.js","sourceRoot":"","sources":["../../../../../src/families/stacks/bridge/utils/misc.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,9 +7,11 @@ require("../../__tests__/test-helpers/setup");
|
|
|
7
7
|
const transaction_1 = require("./transaction");
|
|
8
8
|
const bridge_1 = require("../../__tests__/test-helpers/bridge");
|
|
9
9
|
const SEED_IDENTIFIER = "SP3KS7VMY2ZNE6SB88PHR4SKRK2EEPHS8N8MCCBR9";
|
|
10
|
+
const DUMMY_PUBKEY = "022d82baea2d041ac281bebafab11571f45db4f163a9e3f8640b1c804a4ac6f662";
|
|
10
11
|
const ACCOUNT_1 = "SP2DV2RVZP1A69Q6VAG5PHEQ6ZHQHZPCV84TMYNGN";
|
|
11
12
|
const stacks = {
|
|
12
13
|
FIXME_ignoreAccountFields: [],
|
|
14
|
+
IgnorePrepareTransactionFields: ["fee"],
|
|
13
15
|
scanAccounts: [
|
|
14
16
|
{
|
|
15
17
|
name: "stacks seed 1",
|
|
@@ -26,7 +28,7 @@ const stacks = {
|
|
|
26
28
|
accounts: [
|
|
27
29
|
{
|
|
28
30
|
raw: {
|
|
29
|
-
id: `js:2:stacks:${
|
|
31
|
+
id: `js:2:stacks:${DUMMY_PUBKEY}:`,
|
|
30
32
|
seedIdentifier: SEED_IDENTIFIER,
|
|
31
33
|
name: "Stacks 1",
|
|
32
34
|
derivationMode: "",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bridge.integration.test.js","sourceRoot":"","sources":["../../../src/families/stacks/bridge.integration.test.ts"],"names":[],"mappings":";;AACA,uDAAkD;AAElD,+CAAyC;AACzC,6CAI0B;AAE1B,8CAA4C;AAE5C,+CAAmD;AACnD,gEAAiE;AAEjE,MAAM,eAAe,GAAG,2CAA2C,CAAC;AACpE,MAAM,SAAS,GAAG,2CAA2C,CAAC;AAE9D,MAAM,MAAM,GAAgC;IAC1C,yBAAyB,EAAE,EAAE;IAC7B,YAAY,EAAE;QACZ;YACE,IAAI,EAAE,eAAe;YACrB,KAAK,EAAE;;;;;;;OAON;SACF;KACF;IACD,QAAQ,EAAE;QACR;YACE,GAAG,EAAE;gBACH,EAAE,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"bridge.integration.test.js","sourceRoot":"","sources":["../../../src/families/stacks/bridge.integration.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"maybeTezosAccountUnrevealedAccount.d.ts","sourceRoot":"","sources":["../../../src/exchange/swap/maybeTezosAccountUnrevealedAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAE9C,eAAO,MAAM,kCAAkC,oBAC5B,mBAAmB,KACnC,KAAK,GAAG,
|
|
1
|
+
{"version":3,"file":"maybeTezosAccountUnrevealedAccount.d.ts","sourceRoot":"","sources":["../../../src/exchange/swap/maybeTezosAccountUnrevealedAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAE9C,eAAO,MAAM,kCAAkC,oBAC5B,mBAAmB,KACnC,KAAK,GAAG,SAWV,CAAC"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
export const maybeTezosAccountUnrevealedAccount = (swapTransaction) => {
|
|
2
|
-
var _a, _b, _c, _d;
|
|
3
|
-
if (((_a = swapTransaction
|
|
4
|
-
((_b = swapTransaction === null || swapTransaction === void 0 ? void 0 : swapTransaction.transaction) === null || _b === void 0 ? void 0 : _b.
|
|
5
|
-
((_c = swapTransaction === null || swapTransaction === void 0 ? void 0 : swapTransaction.transaction) === null || _c === void 0 ? void 0 : _c.
|
|
2
|
+
var _a, _b, _c, _d, _e;
|
|
3
|
+
if (((_a = swapTransaction.swap) === null || _a === void 0 ? void 0 : _a.rates.status) == "success" &&
|
|
4
|
+
((_b = swapTransaction === null || swapTransaction === void 0 ? void 0 : swapTransaction.transaction) === null || _b === void 0 ? void 0 : _b.family) == "tezos" &&
|
|
5
|
+
((_c = swapTransaction === null || swapTransaction === void 0 ? void 0 : swapTransaction.transaction) === null || _c === void 0 ? void 0 : _c.estimatedFees) &&
|
|
6
|
+
((_d = swapTransaction === null || swapTransaction === void 0 ? void 0 : swapTransaction.transaction) === null || _d === void 0 ? void 0 : _d.fees) !== ((_e = swapTransaction === null || swapTransaction === void 0 ? void 0 : swapTransaction.transaction) === null || _e === void 0 ? void 0 : _e.estimatedFees)) {
|
|
6
7
|
const tezosError = new Error("Cannot swap with an unrevealed Tezos account");
|
|
7
8
|
tezosError.name = "TezosUnrevealedAccount";
|
|
8
9
|
return tezosError;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"maybeTezosAccountUnrevealedAccount.js","sourceRoot":"","sources":["../../../src/exchange/swap/maybeTezosAccountUnrevealedAccount.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,kCAAkC,GAAG,CAChD,eAAoC,EACjB,EAAE;;IACrB,IACE,CAAA,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,WAAW,0CAAE,MAAM,KAAI,OAAO;SAC/C,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,WAAW,0CAAE,aAAa,CAAA;QAC3C,CAAA,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,WAAW,0CAAE,IAAI,OAAK,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,WAAW,0CAAE,aAAa,CAAA,EAClF;QACA,MAAM,UAAU,GAAG,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;QAC7E,UAAU,CAAC,IAAI,GAAG,wBAAwB,CAAC;QAC3C,OAAO,UAAU,CAAC;KACnB;AACH,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"maybeTezosAccountUnrevealedAccount.js","sourceRoot":"","sources":["../../../src/exchange/swap/maybeTezosAccountUnrevealedAccount.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,kCAAkC,GAAG,CAChD,eAAoC,EACjB,EAAE;;IACrB,IACE,CAAA,MAAA,eAAe,CAAC,IAAI,0CAAE,KAAK,CAAC,MAAM,KAAI,SAAS;QAC/C,CAAA,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,WAAW,0CAAE,MAAM,KAAI,OAAO;SAC/C,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,WAAW,0CAAE,aAAa,CAAA;QAC3C,CAAA,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,WAAW,0CAAE,IAAI,OAAK,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,WAAW,0CAAE,aAAa,CAAA,EAClF;QACA,MAAM,UAAU,GAAG,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;QAC7E,UAAU,CAAC,IAAI,GAAG,wBAAwB,CAAC;QAC3C,OAAO,UAAU,CAAC;KACnB;AACH,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../../../../src/families/stacks/bridge/account.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../../../../src/families/stacks/bridge/account.ts"],"names":[],"mappings":"AA4BA,OAAO,EAEL,aAAa,EAKd,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAmB,WAAW,EAAqB,MAAM,UAAU,CAAC;AAmQ3E,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,WAAW,CAUpD,CAAC"}
|
|
@@ -11,13 +11,12 @@ import BlockstackApp from "@zondax/ledger-stacks";
|
|
|
11
11
|
import { c32address } from "c32check";
|
|
12
12
|
import { StacksMainnet } from "@stacks/network";
|
|
13
13
|
import { BigNumber } from "bignumber.js";
|
|
14
|
-
import BN from "bn.js";
|
|
15
14
|
import { Observable } from "rxjs";
|
|
16
15
|
import invariant from "invariant";
|
|
17
16
|
import { AmountRequired, FeeNotLoaded, InvalidAddress, InvalidNonce, InvalidAddressBecauseDestinationIsAlsoSource, NotEnoughBalance, RecipientRequired, } from "@ledgerhq/errors";
|
|
18
17
|
import { getAbandonSeedAddress } from "@ledgerhq/cryptoassets";
|
|
19
18
|
import { StacksMemoTooLong } from "../errors";
|
|
20
|
-
import { AddressVersion, TransactionVersion, AnchorMode,
|
|
19
|
+
import { AddressVersion, TransactionVersion, AnchorMode, estimateTransaction, makeUnsignedSTXTokenTransfer, } from "@stacks/transactions";
|
|
21
20
|
import { makeAccountBridgeReceive, makeSync } from "../../../bridge/jsHelpers";
|
|
22
21
|
import { defaultUpdateTransaction } from "@ledgerhq/coin-framework/bridge/jsHelpers";
|
|
23
22
|
import { StacksNetwork } from "./utils/api.types";
|
|
@@ -101,11 +100,11 @@ const estimateMaxSpendable = ({ account, parentAccount, transaction, }) => __awa
|
|
|
101
100
|
memo,
|
|
102
101
|
network,
|
|
103
102
|
publicKey: xpub,
|
|
104
|
-
amount:
|
|
103
|
+
amount: amount.toFixed(),
|
|
105
104
|
};
|
|
106
105
|
const tx = yield makeUnsignedSTXTokenTransfer(options);
|
|
107
|
-
const
|
|
108
|
-
const diff = spendableBalance.minus(new BigNumber(fee
|
|
106
|
+
const [feeEst] = yield estimateTransaction(tx.payload);
|
|
107
|
+
const diff = spendableBalance.minus(new BigNumber(feeEst.fee));
|
|
109
108
|
return diff.gte(0) ? diff : new BigNumber(0);
|
|
110
109
|
});
|
|
111
110
|
const prepareTransaction = (a, t) => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -123,15 +122,15 @@ const prepareTransaction = (a, t) => __awaiter(void 0, void 0, void 0, function*
|
|
|
123
122
|
memo,
|
|
124
123
|
network,
|
|
125
124
|
publicKey: xpub,
|
|
126
|
-
amount:
|
|
125
|
+
amount: amount.toFixed(),
|
|
127
126
|
};
|
|
128
127
|
const tx = yield makeUnsignedSTXTokenTransfer(options);
|
|
129
128
|
const addressVersion = network.version === TransactionVersion.Mainnet
|
|
130
129
|
? AddressVersion.MainnetSingleSig
|
|
131
130
|
: AddressVersion.TestnetSingleSig;
|
|
132
131
|
const senderAddress = c32address(addressVersion, tx.auth.spendingCondition.signer);
|
|
133
|
-
const fee = yield
|
|
134
|
-
patch.fee = new BigNumber(fee.
|
|
132
|
+
const [fee] = yield estimateTransaction(tx.payload);
|
|
133
|
+
patch.fee = new BigNumber(fee.fee);
|
|
135
134
|
patch.nonce = yield findNextNonce(senderAddress, pendingOperations);
|
|
136
135
|
if (useAllAmount)
|
|
137
136
|
patch.amount = spendableBalance.minus(patch.fee);
|
|
@@ -158,14 +157,14 @@ const signOperation = ({ account, deviceId, transaction, }) => withDevice(device
|
|
|
158
157
|
}
|
|
159
158
|
const blockstack = new BlockstackApp(transport);
|
|
160
159
|
const options = {
|
|
161
|
-
amount:
|
|
160
|
+
amount: amount.toFixed(),
|
|
162
161
|
recipient,
|
|
163
162
|
anchorMode,
|
|
164
163
|
network: StacksNetwork[network],
|
|
165
164
|
memo,
|
|
166
165
|
publicKey: xpub,
|
|
167
|
-
fee:
|
|
168
|
-
nonce:
|
|
166
|
+
fee: fee.toFixed(),
|
|
167
|
+
nonce: nonce.toFixed(),
|
|
169
168
|
};
|
|
170
169
|
const tx = yield makeUnsignedSTXTokenTransfer(options);
|
|
171
170
|
const serializedTx = tx.serialize();
|
|
@@ -173,7 +172,7 @@ const signOperation = ({ account, deviceId, transaction, }) => withDevice(device
|
|
|
173
172
|
type: "device-signature-requested",
|
|
174
173
|
});
|
|
175
174
|
// Sign by device
|
|
176
|
-
const result = yield blockstack.sign(getPath(derivationPath), serializedTx);
|
|
175
|
+
const result = yield blockstack.sign(getPath(derivationPath), Buffer.from(serializedTx));
|
|
177
176
|
throwIfError(result);
|
|
178
177
|
o.next({
|
|
179
178
|
type: "device-signature-granted",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account.js","sourceRoot":"","sources":["../../../../src/families/stacks/bridge/account.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,aAAa,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"account.js","sourceRoot":"","sources":["../../../../src/families/stacks/bridge/account.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../../../../../src/families/stacks/bridge/utils/misc.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../../../../../src/families/stacks/bridge/utils/misc.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAOnE,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AASjF,OAAO,EAAiB,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAGjE,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,eAAO,MAAM,gBAAgB,cAChB,eAAe,aACf,MAAM,WACR,OAAO,MAAM,EAAE,GAAG,CAAC,KAC3B,QAAQ,MAAM,CA4BhB,CAAC;AAEF,eAAO,MAAM,OAAO,mDAAiD,CAAC;AAEtE,eAAO,MAAM,UAAU,MAAO,OAAO,KAAG,OAG6B,CAAC;AAEtE,eAAO,MAAM,UAAU,gCACI,gBAAgB,UACpC,mBAAmB,KAAG,eAAe,EAgEzC,CAAC;AAEJ,eAAO,MAAM,eAAe,EAAE,eAqC7B,CAAC;AAcF,eAAO,MAAM,aAAa,kBACT,MAAM,cACT,SAAS,EAAE,KACtB,QAAQ,SAAS,CAgCnB,CAAC"}
|
|
@@ -8,7 +8,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
import { BigNumber } from "bignumber.js";
|
|
11
|
-
import BN from "bn.js";
|
|
12
11
|
import flatMap from "lodash/flatMap";
|
|
13
12
|
import { makeUnsignedSTXTokenTransfer, createMessageSignature, } from "@stacks/transactions";
|
|
14
13
|
import { decodeAccountId, encodeAccountId } from "../../../../account";
|
|
@@ -21,20 +20,20 @@ export const getTxToBroadcast = (operation, signature, rawData) => __awaiter(voi
|
|
|
21
20
|
const { value, recipients, fee, extra: { memo }, } = operation;
|
|
22
21
|
const { anchorMode, network, xpub } = rawData;
|
|
23
22
|
const options = {
|
|
24
|
-
amount:
|
|
23
|
+
amount: BigNumber(value).minus(fee).toFixed(),
|
|
25
24
|
recipient: recipients[0],
|
|
26
25
|
anchorMode,
|
|
27
26
|
memo,
|
|
28
27
|
network: StacksNetwork[network],
|
|
29
28
|
publicKey: xpub,
|
|
30
|
-
fee:
|
|
31
|
-
nonce:
|
|
29
|
+
fee: BigNumber(fee).toFixed(),
|
|
30
|
+
nonce: (_a = operation.transactionSequenceNumber) !== null && _a !== void 0 ? _a : 0,
|
|
32
31
|
};
|
|
33
32
|
const tx = yield makeUnsignedSTXTokenTransfer(options);
|
|
34
33
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
35
34
|
// @ts-ignore need to ignore the TS error here
|
|
36
35
|
tx.auth.spendingCondition.signature = createMessageSignature(signature);
|
|
37
|
-
return tx.serialize();
|
|
36
|
+
return Buffer.from(tx.serialize());
|
|
38
37
|
});
|
|
39
38
|
export const getUnit = () => getCryptoCurrencyById("stacks").units[0];
|
|
40
39
|
export const getAddress = (a) => a.freshAddresses.length > 0
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"misc.js","sourceRoot":"","sources":["../../../../../src/families/stacks/bridge/utils/misc.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,
|
|
1
|
+
{"version":3,"file":"misc.js","sourceRoot":"","sources":["../../../../../src/families/stacks/bridge/utils/misc.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,11 @@ import "../../__tests__/test-helpers/setup";
|
|
|
5
5
|
import { fromTransactionRaw } from "./transaction";
|
|
6
6
|
import { testBridge } from "../../__tests__/test-helpers/bridge";
|
|
7
7
|
const SEED_IDENTIFIER = "SP3KS7VMY2ZNE6SB88PHR4SKRK2EEPHS8N8MCCBR9";
|
|
8
|
+
const DUMMY_PUBKEY = "022d82baea2d041ac281bebafab11571f45db4f163a9e3f8640b1c804a4ac6f662";
|
|
8
9
|
const ACCOUNT_1 = "SP2DV2RVZP1A69Q6VAG5PHEQ6ZHQHZPCV84TMYNGN";
|
|
9
10
|
const stacks = {
|
|
10
11
|
FIXME_ignoreAccountFields: [],
|
|
12
|
+
IgnorePrepareTransactionFields: ["fee"],
|
|
11
13
|
scanAccounts: [
|
|
12
14
|
{
|
|
13
15
|
name: "stacks seed 1",
|
|
@@ -24,7 +26,7 @@ const stacks = {
|
|
|
24
26
|
accounts: [
|
|
25
27
|
{
|
|
26
28
|
raw: {
|
|
27
|
-
id: `js:2:stacks:${
|
|
29
|
+
id: `js:2:stacks:${DUMMY_PUBKEY}:`,
|
|
28
30
|
seedIdentifier: SEED_IDENTIFIER,
|
|
29
31
|
name: "Stacks 1",
|
|
30
32
|
derivationMode: "",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bridge.integration.test.js","sourceRoot":"","sources":["../../../src/families/stacks/bridge.integration.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EACL,cAAc,EACd,4CAA4C,EAC5C,gBAAgB,GACjB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,oCAAoC,CAAC;AAE5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAEjE,MAAM,eAAe,GAAG,2CAA2C,CAAC;AACpE,MAAM,SAAS,GAAG,2CAA2C,CAAC;AAE9D,MAAM,MAAM,GAAgC;IAC1C,yBAAyB,EAAE,EAAE;IAC7B,YAAY,EAAE;QACZ;YACE,IAAI,EAAE,eAAe;YACrB,KAAK,EAAE;;;;;;;OAON;SACF;KACF;IACD,QAAQ,EAAE;QACR;YACE,GAAG,EAAE;gBACH,EAAE,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"bridge.integration.test.js","sourceRoot":"","sources":["../../../src/families/stacks/bridge.integration.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ledgerhq/live-common",
|
|
3
3
|
"description": "Common ground for the Ledger Live apps",
|
|
4
|
-
"version": "33.5.0-next.
|
|
4
|
+
"version": "33.5.0-next.6",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
7
7
|
"url": "https://github.com/LedgerHQ/ledger-live.git"
|
|
@@ -121,8 +121,8 @@
|
|
|
121
121
|
"@ledgerhq/wallet-api-server": "^1.5.0",
|
|
122
122
|
"@solana/spl-token": "^0.3.7",
|
|
123
123
|
"@solana/web3.js": "1.77.3",
|
|
124
|
-
"@stacks/network": "
|
|
125
|
-
"@stacks/transactions": "
|
|
124
|
+
"@stacks/network": "6.10.0",
|
|
125
|
+
"@stacks/transactions": "6.11.0",
|
|
126
126
|
"@stricahq/bip32ed25519": "^1.0.3",
|
|
127
127
|
"@stricahq/typhonjs": "^1.2.6",
|
|
128
128
|
"@taquito/ledger-signer": "^13.0.1",
|
|
@@ -154,7 +154,6 @@
|
|
|
154
154
|
"blake-hash": "^2.0.0",
|
|
155
155
|
"blake2b": "^2.1.4",
|
|
156
156
|
"blakejs": "^1.2.1",
|
|
157
|
-
"bn.js": "^5.2.1",
|
|
158
157
|
"bs58": "^4.0.1",
|
|
159
158
|
"bs58check": "^2.1.2",
|
|
160
159
|
"c32check": "1.1.3",
|
|
@@ -197,11 +196,10 @@
|
|
|
197
196
|
"varuint-bitcoin": "1.1.2",
|
|
198
197
|
"winston": "^3.4.0",
|
|
199
198
|
"xstate": "^4.30.2",
|
|
200
|
-
"@ledgerhq/wallet-api-exchange-module": "^0.2.0-next.0",
|
|
201
199
|
"@ledgerhq/coin-algorand": "^0.3.9-next.0",
|
|
202
200
|
"@ledgerhq/coin-evm": "^0.12.0-next.0",
|
|
203
|
-
"@ledgerhq/coin-framework": "^0.11.0-next.0",
|
|
204
201
|
"@ledgerhq/coin-polkadot": "^0.5.2-next.0",
|
|
202
|
+
"@ledgerhq/coin-framework": "^0.11.0-next.0",
|
|
205
203
|
"@ledgerhq/crypto-icons-ui": "^1.0.1-next.0",
|
|
206
204
|
"@ledgerhq/cryptoassets": "^11.4.0-next.0",
|
|
207
205
|
"@ledgerhq/devices": "^8.2.0",
|
|
@@ -227,7 +225,8 @@
|
|
|
227
225
|
"@ledgerhq/live-env": "^0.9.0-next.0",
|
|
228
226
|
"@ledgerhq/live-network": "^1.1.11-next.0",
|
|
229
227
|
"@ledgerhq/live-promise": "^0.0.3",
|
|
230
|
-
"@ledgerhq/logs": "^6.12.0"
|
|
228
|
+
"@ledgerhq/logs": "^6.12.0",
|
|
229
|
+
"@ledgerhq/wallet-api-exchange-module": "^0.2.0-next.0"
|
|
231
230
|
},
|
|
232
231
|
"devDependencies": {
|
|
233
232
|
"@svgr/core": "^5.5.0",
|
|
@@ -4,6 +4,7 @@ export const maybeTezosAccountUnrevealedAccount = (
|
|
|
4
4
|
swapTransaction: SwapTransactionType,
|
|
5
5
|
): Error | undefined => {
|
|
6
6
|
if (
|
|
7
|
+
swapTransaction.swap?.rates.status == "success" &&
|
|
7
8
|
swapTransaction?.transaction?.family == "tezos" &&
|
|
8
9
|
swapTransaction?.transaction?.estimatedFees &&
|
|
9
10
|
swapTransaction?.transaction?.fees !== swapTransaction?.transaction?.estimatedFees
|
|
@@ -2,7 +2,6 @@ import BlockstackApp from "@zondax/ledger-stacks";
|
|
|
2
2
|
import { c32address } from "c32check";
|
|
3
3
|
import { StacksMainnet } from "@stacks/network";
|
|
4
4
|
import { BigNumber } from "bignumber.js";
|
|
5
|
-
import BN from "bn.js";
|
|
6
5
|
import { Observable } from "rxjs";
|
|
7
6
|
import invariant from "invariant";
|
|
8
7
|
import {
|
|
@@ -21,7 +20,7 @@ import {
|
|
|
21
20
|
TransactionVersion,
|
|
22
21
|
AnchorMode,
|
|
23
22
|
UnsignedTokenTransferOptions,
|
|
24
|
-
|
|
23
|
+
estimateTransaction,
|
|
25
24
|
makeUnsignedSTXTokenTransfer,
|
|
26
25
|
} from "@stacks/transactions";
|
|
27
26
|
|
|
@@ -143,14 +142,14 @@ const estimateMaxSpendable = async ({
|
|
|
143
142
|
memo,
|
|
144
143
|
network,
|
|
145
144
|
publicKey: xpub,
|
|
146
|
-
amount:
|
|
145
|
+
amount: amount.toFixed(),
|
|
147
146
|
};
|
|
148
147
|
|
|
149
148
|
const tx = await makeUnsignedSTXTokenTransfer(options);
|
|
150
149
|
|
|
151
|
-
const
|
|
150
|
+
const [feeEst] = await estimateTransaction(tx.payload);
|
|
152
151
|
|
|
153
|
-
const diff = spendableBalance.minus(new BigNumber(fee
|
|
152
|
+
const diff = spendableBalance.minus(new BigNumber(feeEst.fee));
|
|
154
153
|
return diff.gte(0) ? diff : new BigNumber(0);
|
|
155
154
|
};
|
|
156
155
|
|
|
@@ -172,7 +171,7 @@ const prepareTransaction = async (a: Account, t: Transaction): Promise<Transacti
|
|
|
172
171
|
memo,
|
|
173
172
|
network,
|
|
174
173
|
publicKey: xpub,
|
|
175
|
-
amount:
|
|
174
|
+
amount: amount.toFixed(),
|
|
176
175
|
};
|
|
177
176
|
|
|
178
177
|
const tx = await makeUnsignedSTXTokenTransfer(options);
|
|
@@ -183,9 +182,9 @@ const prepareTransaction = async (a: Account, t: Transaction): Promise<Transacti
|
|
|
183
182
|
: AddressVersion.TestnetSingleSig;
|
|
184
183
|
const senderAddress = c32address(addressVersion, tx.auth.spendingCondition!.signer);
|
|
185
184
|
|
|
186
|
-
const fee = await
|
|
185
|
+
const [fee] = await estimateTransaction(tx.payload);
|
|
187
186
|
|
|
188
|
-
patch.fee = new BigNumber(fee.
|
|
187
|
+
patch.fee = new BigNumber(fee.fee);
|
|
189
188
|
patch.nonce = await findNextNonce(senderAddress, pendingOperations);
|
|
190
189
|
|
|
191
190
|
if (useAllAmount) patch.amount = spendableBalance.minus(patch.fee);
|
|
@@ -226,14 +225,14 @@ const signOperation: SignOperationFnSignature<Transaction> = ({
|
|
|
226
225
|
const blockstack = new BlockstackApp(transport);
|
|
227
226
|
|
|
228
227
|
const options: UnsignedTokenTransferOptions = {
|
|
229
|
-
amount:
|
|
228
|
+
amount: amount.toFixed(),
|
|
230
229
|
recipient,
|
|
231
230
|
anchorMode,
|
|
232
231
|
network: StacksNetwork[network],
|
|
233
232
|
memo,
|
|
234
233
|
publicKey: xpub,
|
|
235
|
-
fee:
|
|
236
|
-
nonce:
|
|
234
|
+
fee: fee.toFixed(),
|
|
235
|
+
nonce: nonce.toFixed(),
|
|
237
236
|
};
|
|
238
237
|
|
|
239
238
|
const tx = await makeUnsignedSTXTokenTransfer(options);
|
|
@@ -245,7 +244,7 @@ const signOperation: SignOperationFnSignature<Transaction> = ({
|
|
|
245
244
|
});
|
|
246
245
|
|
|
247
246
|
// Sign by device
|
|
248
|
-
const result = await blockstack.sign(getPath(derivationPath), serializedTx);
|
|
247
|
+
const result = await blockstack.sign(getPath(derivationPath), Buffer.from(serializedTx));
|
|
249
248
|
throwIfError(result);
|
|
250
249
|
|
|
251
250
|
o.next({
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { BigNumber } from "bignumber.js";
|
|
2
|
-
import BN from "bn.js";
|
|
3
2
|
import flatMap from "lodash/flatMap";
|
|
4
3
|
import { Account, Address, Operation } from "@ledgerhq/types-live";
|
|
5
4
|
import {
|
|
@@ -37,14 +36,14 @@ export const getTxToBroadcast = async (
|
|
|
37
36
|
const { anchorMode, network, xpub } = rawData;
|
|
38
37
|
|
|
39
38
|
const options: UnsignedTokenTransferOptions = {
|
|
40
|
-
amount:
|
|
39
|
+
amount: BigNumber(value).minus(fee).toFixed(),
|
|
41
40
|
recipient: recipients[0],
|
|
42
41
|
anchorMode,
|
|
43
42
|
memo,
|
|
44
43
|
network: StacksNetwork[network],
|
|
45
44
|
publicKey: xpub,
|
|
46
|
-
fee:
|
|
47
|
-
nonce:
|
|
45
|
+
fee: BigNumber(fee).toFixed(),
|
|
46
|
+
nonce: operation.transactionSequenceNumber ?? 0,
|
|
48
47
|
};
|
|
49
48
|
|
|
50
49
|
const tx = await makeUnsignedSTXTokenTransfer(options);
|
|
@@ -53,7 +52,7 @@ export const getTxToBroadcast = async (
|
|
|
53
52
|
// @ts-ignore need to ignore the TS error here
|
|
54
53
|
tx.auth.spendingCondition.signature = createMessageSignature(signature);
|
|
55
54
|
|
|
56
|
-
return tx.serialize();
|
|
55
|
+
return Buffer.from(tx.serialize());
|
|
57
56
|
};
|
|
58
57
|
|
|
59
58
|
export const getUnit = () => getCryptoCurrencyById("stacks").units[0];
|
|
@@ -14,10 +14,12 @@ import { fromTransactionRaw } from "./transaction";
|
|
|
14
14
|
import { testBridge } from "../../__tests__/test-helpers/bridge";
|
|
15
15
|
|
|
16
16
|
const SEED_IDENTIFIER = "SP3KS7VMY2ZNE6SB88PHR4SKRK2EEPHS8N8MCCBR9";
|
|
17
|
+
const DUMMY_PUBKEY = "022d82baea2d041ac281bebafab11571f45db4f163a9e3f8640b1c804a4ac6f662";
|
|
17
18
|
const ACCOUNT_1 = "SP2DV2RVZP1A69Q6VAG5PHEQ6ZHQHZPCV84TMYNGN";
|
|
18
19
|
|
|
19
20
|
const stacks: CurrenciesData<Transaction> = {
|
|
20
21
|
FIXME_ignoreAccountFields: [],
|
|
22
|
+
IgnorePrepareTransactionFields: ["fee"],
|
|
21
23
|
scanAccounts: [
|
|
22
24
|
{
|
|
23
25
|
name: "stacks seed 1",
|
|
@@ -34,7 +36,7 @@ const stacks: CurrenciesData<Transaction> = {
|
|
|
34
36
|
accounts: [
|
|
35
37
|
{
|
|
36
38
|
raw: {
|
|
37
|
-
id: `js:2:stacks:${
|
|
39
|
+
id: `js:2:stacks:${DUMMY_PUBKEY}:`,
|
|
38
40
|
seedIdentifier: SEED_IDENTIFIER,
|
|
39
41
|
name: "Stacks 1",
|
|
40
42
|
derivationMode: "",
|