@ledgerhq/live-common 34.0.0-nightly.12 → 34.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.
- package/lib/families/stacks/bridge/account.d.ts.map +1 -1
- package/lib/families/stacks/bridge/account.js +9 -6
- 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 +9 -4
- package/lib/families/stacks/bridge/utils/misc.js.map +1 -1
- package/lib/families/stacks/bridge.integration.test.js +4 -3
- package/lib/families/stacks/bridge.integration.test.js.map +1 -1
- package/lib-es/families/stacks/bridge/account.d.ts.map +1 -1
- package/lib-es/families/stacks/bridge/account.js +10 -7
- 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 +10 -5
- package/lib-es/families/stacks/bridge/utils/misc.js.map +1 -1
- package/lib-es/families/stacks/bridge.integration.test.js +4 -3
- package/lib-es/families/stacks/bridge.integration.test.js.map +1 -1
- package/package.json +36 -36
- package/src/families/stacks/bridge/account.ts +10 -7
- package/src/families/stacks/bridge/utils/misc.ts +11 -5
- package/src/families/stacks/bridge.integration.test.ts +4 -3
|
@@ -1 +1 @@
|
|
|
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;
|
|
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;AAsQ3E,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,WAAW,CAUpD,CAAC"}
|
|
@@ -94,8 +94,10 @@ const getTransactionStatus = (a, t) => __awaiter(void 0, void 0, void 0, functio
|
|
|
94
94
|
});
|
|
95
95
|
const estimateMaxSpendable = ({ account, parentAccount, transaction, }) => __awaiter(void 0, void 0, void 0, function* () {
|
|
96
96
|
const a = (0, account_1.getMainAccount)(account, parentAccount);
|
|
97
|
-
const {
|
|
98
|
-
const
|
|
97
|
+
const { spendableBalance } = a;
|
|
98
|
+
const mainAccount = (0, account_1.getMainAccount)(account, parentAccount);
|
|
99
|
+
const { xpub } = mainAccount;
|
|
100
|
+
(0, invariant_1.default)(xpub, "xpub is required");
|
|
99
101
|
const dummyTx = Object.assign(Object.assign(Object.assign({}, createTransaction()), transaction), { recipient: (0, cryptoassets_1.getAbandonSeedAddress)(a.currency.id), useAllAmount: true });
|
|
100
102
|
// Compute fees
|
|
101
103
|
const { recipient, anchorMode, memo, amount } = dummyTx;
|
|
@@ -114,9 +116,10 @@ const estimateMaxSpendable = ({ account, parentAccount, transaction, }) => __awa
|
|
|
114
116
|
return diff.gte(0) ? diff : new bignumber_js_1.BigNumber(0);
|
|
115
117
|
});
|
|
116
118
|
const prepareTransaction = (a, t) => __awaiter(void 0, void 0, void 0, function* () {
|
|
117
|
-
const {
|
|
119
|
+
const { spendableBalance, pendingOperations } = a;
|
|
118
120
|
const { recipient, useAllAmount } = t;
|
|
119
|
-
const {
|
|
121
|
+
const { xpub } = a;
|
|
122
|
+
(0, invariant_1.default)(xpub, "xpub is required");
|
|
120
123
|
const patch = {};
|
|
121
124
|
if (xpub && recipient && (0, addresses_1.validateAddress)(recipient).isValid) {
|
|
122
125
|
const { anchorMode, memo, amount } = t;
|
|
@@ -146,9 +149,9 @@ const prepareTransaction = (a, t) => __awaiter(void 0, void 0, void 0, function*
|
|
|
146
149
|
const signOperation = ({ account, deviceId, transaction, }) => (0, deviceAccess_1.withDevice)(deviceId)(transport => new rxjs_1.Observable(o => {
|
|
147
150
|
function main() {
|
|
148
151
|
return __awaiter(this, void 0, void 0, function* () {
|
|
149
|
-
const { id: accountId } = account;
|
|
150
152
|
const { address, derivationPath } = (0, utils_1.getAddress)(account);
|
|
151
|
-
const {
|
|
153
|
+
const { xpub, id: accountId } = account;
|
|
154
|
+
(0, invariant_1.default)(xpub, "xpub is required");
|
|
152
155
|
const { recipient, fee, anchorMode, network, memo, amount, nonce } = transaction;
|
|
153
156
|
if (!xpub) {
|
|
154
157
|
throw new errors_1.InvalidAddress("", {
|
|
@@ -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,+BAAkC;AAClC,0DAAkC;AAClC,6CAQ0B;AAC1B,yDAA+D;AAC/D,sCAA8C;AAC9C,uDAO8B;AAE9B,yDAA+E;AAC/E,yEAAqF;AAUrF,iDAAkD;AAElD,uCAAgF;AAChF,qCAA0C;AAC1C,6DAA+D;AAC/D,2DAAsD;AACtD,oCAAiD;AACjD,
|
|
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;AAEzC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,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;AAQnE,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;AAG9C,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,eAyC7B,CAAC;AAcF,eAAO,MAAM,aAAa,kBACT,MAAM,cACT,SAAS,EAAE,KACtB,QAAQ,SAAS,CAgCnB,CAAC"}
|
|
@@ -21,6 +21,7 @@ const api_1 = require("../../bridge/utils/api");
|
|
|
21
21
|
const api_types_1 = require("./api.types");
|
|
22
22
|
const currencies_1 = require("../../../../currencies");
|
|
23
23
|
const operation_1 = require("../../../../operation");
|
|
24
|
+
const invariant_1 = __importDefault(require("invariant"));
|
|
24
25
|
const getTxToBroadcast = (operation, signature, rawData) => __awaiter(void 0, void 0, void 0, function* () {
|
|
25
26
|
var _a;
|
|
26
27
|
const { value, recipients, fee, extra: { memo }, } = operation;
|
|
@@ -100,15 +101,19 @@ const mapTxToOps = (accountID, { address }) => (tx) => {
|
|
|
100
101
|
};
|
|
101
102
|
exports.mapTxToOps = mapTxToOps;
|
|
102
103
|
const getAccountShape = (info) => __awaiter(void 0, void 0, void 0, function* () {
|
|
103
|
-
const { initialAccount,
|
|
104
|
-
|
|
104
|
+
const { initialAccount, currency, rest = {}, derivationMode } = info;
|
|
105
|
+
// for bridge tests specifically the `rest` object is empty and therefore the publicKey is undefined
|
|
106
|
+
// reconciliatePublicKey tries to get pubKey from rest object and then from accountId
|
|
107
|
+
const pubKey = reconciliatePublicKey(rest.publicKey, initialAccount);
|
|
108
|
+
(0, invariant_1.default)(pubKey, "publicKey is required");
|
|
105
109
|
const accountId = (0, account_1.encodeAccountId)({
|
|
106
110
|
type: "js",
|
|
107
111
|
version: "2",
|
|
108
112
|
currencyId: currency.id,
|
|
109
|
-
xpubOrAddress:
|
|
113
|
+
xpubOrAddress: pubKey,
|
|
110
114
|
derivationMode,
|
|
111
115
|
});
|
|
116
|
+
const address = (0, transactions_1.getAddressFromPublicKey)(pubKey);
|
|
112
117
|
const blockHeight = yield (0, api_1.fetchBlockHeight)();
|
|
113
118
|
const balanceResp = yield (0, api_1.fetchBalances)(address);
|
|
114
119
|
const rawTxs = yield (0, api_1.fetchFullTxs)(address);
|
|
@@ -122,7 +127,7 @@ const getAccountShape = (info) => __awaiter(void 0, void 0, void 0, function* ()
|
|
|
122
127
|
}
|
|
123
128
|
const result = {
|
|
124
129
|
id: accountId,
|
|
125
|
-
xpub:
|
|
130
|
+
xpub: pubKey,
|
|
126
131
|
freshAddress: address,
|
|
127
132
|
balance,
|
|
128
133
|
spendableBalance,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"misc.js","sourceRoot":"","sources":["../../../../../src/families/stacks/bridge/utils/misc.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+CAAyC;AACzC,6DAAqC;AAErC,
|
|
1
|
+
{"version":3,"file":"misc.js","sourceRoot":"","sources":["../../../../../src/families/stacks/bridge/utils/misc.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ 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
|
|
10
|
+
const SEED_IDENTIFIER_PUBKEY = "022a460decc9dba8c452927fecb33d7ae25a8d79dc5442b84feaf8f3aa0e2b575d";
|
|
11
11
|
const ACCOUNT_1 = "SP2DV2RVZP1A69Q6VAG5PHEQ6ZHQHZPCV84TMYNGN";
|
|
12
12
|
const stacks = {
|
|
13
13
|
FIXME_ignoreAccountFields: [],
|
|
@@ -28,16 +28,17 @@ const stacks = {
|
|
|
28
28
|
accounts: [
|
|
29
29
|
{
|
|
30
30
|
raw: {
|
|
31
|
-
id: `js:2:stacks:${
|
|
31
|
+
id: `js:2:stacks:${SEED_IDENTIFIER_PUBKEY}:`,
|
|
32
32
|
seedIdentifier: SEED_IDENTIFIER,
|
|
33
33
|
name: "Stacks 1",
|
|
34
34
|
derivationMode: "",
|
|
35
35
|
index: 0,
|
|
36
36
|
freshAddress: SEED_IDENTIFIER,
|
|
37
|
-
freshAddressPath: "
|
|
37
|
+
freshAddressPath: "",
|
|
38
38
|
freshAddresses: [],
|
|
39
39
|
blockHeight: 0,
|
|
40
40
|
operations: [],
|
|
41
|
+
xpub: SEED_IDENTIFIER_PUBKEY,
|
|
41
42
|
pendingOperations: [],
|
|
42
43
|
currencyId: "stacks",
|
|
43
44
|
unitMagnitude: 6,
|
|
@@ -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,
|
|
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":"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;
|
|
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;AAsQ3E,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,WAAW,CAUpD,CAAC"}
|
|
@@ -25,7 +25,7 @@ import { broadcastTx } from "./utils/api";
|
|
|
25
25
|
import { getAddress } from "../../filecoin/bridge/utils/utils";
|
|
26
26
|
import { withDevice } from "../../../hw/deviceAccess";
|
|
27
27
|
import { getPath, throwIfError } from "../utils";
|
|
28
|
-
import {
|
|
28
|
+
import { getMainAccount } from "../../../account";
|
|
29
29
|
import { encodeOperationId, patchOperationWithHash } from "../../../operation";
|
|
30
30
|
import { validateAddress } from "./utils/addresses";
|
|
31
31
|
const receive = makeAccountBridgeReceive();
|
|
@@ -88,8 +88,10 @@ const getTransactionStatus = (a, t) => __awaiter(void 0, void 0, void 0, functio
|
|
|
88
88
|
});
|
|
89
89
|
const estimateMaxSpendable = ({ account, parentAccount, transaction, }) => __awaiter(void 0, void 0, void 0, function* () {
|
|
90
90
|
const a = getMainAccount(account, parentAccount);
|
|
91
|
-
const {
|
|
92
|
-
const
|
|
91
|
+
const { spendableBalance } = a;
|
|
92
|
+
const mainAccount = getMainAccount(account, parentAccount);
|
|
93
|
+
const { xpub } = mainAccount;
|
|
94
|
+
invariant(xpub, "xpub is required");
|
|
93
95
|
const dummyTx = Object.assign(Object.assign(Object.assign({}, createTransaction()), transaction), { recipient: getAbandonSeedAddress(a.currency.id), useAllAmount: true });
|
|
94
96
|
// Compute fees
|
|
95
97
|
const { recipient, anchorMode, memo, amount } = dummyTx;
|
|
@@ -108,9 +110,10 @@ const estimateMaxSpendable = ({ account, parentAccount, transaction, }) => __awa
|
|
|
108
110
|
return diff.gte(0) ? diff : new BigNumber(0);
|
|
109
111
|
});
|
|
110
112
|
const prepareTransaction = (a, t) => __awaiter(void 0, void 0, void 0, function* () {
|
|
111
|
-
const {
|
|
113
|
+
const { spendableBalance, pendingOperations } = a;
|
|
112
114
|
const { recipient, useAllAmount } = t;
|
|
113
|
-
const {
|
|
115
|
+
const { xpub } = a;
|
|
116
|
+
invariant(xpub, "xpub is required");
|
|
114
117
|
const patch = {};
|
|
115
118
|
if (xpub && recipient && validateAddress(recipient).isValid) {
|
|
116
119
|
const { anchorMode, memo, amount } = t;
|
|
@@ -140,9 +143,9 @@ const prepareTransaction = (a, t) => __awaiter(void 0, void 0, void 0, function*
|
|
|
140
143
|
const signOperation = ({ account, deviceId, transaction, }) => withDevice(deviceId)(transport => new Observable(o => {
|
|
141
144
|
function main() {
|
|
142
145
|
return __awaiter(this, void 0, void 0, function* () {
|
|
143
|
-
const { id: accountId } = account;
|
|
144
146
|
const { address, derivationPath } = getAddress(account);
|
|
145
|
-
const {
|
|
147
|
+
const { xpub, id: accountId } = account;
|
|
148
|
+
invariant(xpub, "xpub is required");
|
|
146
149
|
const { recipient, fee, anchorMode, network, memo, amount, nonce } = transaction;
|
|
147
150
|
if (!xpub) {
|
|
148
151
|
throw new InvalidAddress("", {
|
|
@@ -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,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,SAAS,MAAM,WAAW,CAAC;AAClC,OAAO,EACL,cAAc,EACd,YAAY,EACZ,cAAc,EACd,YAAY,EACZ,4CAA4C,EAC5C,gBAAgB,EAChB,iBAAiB,GAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EACL,cAAc,EACd,kBAAkB,EAClB,UAAU,EAEV,mBAAmB,EACnB,4BAA4B,GAC7B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,wBAAwB,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAC/E,OAAO,EAAE,wBAAwB,EAAE,MAAM,2CAA2C,CAAC;AAUrF,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACjD,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;AAEzC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,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;AAQnE,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;AAG9C,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,eAyC7B,CAAC;AAcF,eAAO,MAAM,aAAa,kBACT,MAAM,cACT,SAAS,EAAE,KACtB,QAAQ,SAAS,CAgCnB,CAAC"}
|
|
@@ -9,12 +9,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
};
|
|
10
10
|
import { BigNumber } from "bignumber.js";
|
|
11
11
|
import flatMap from "lodash/flatMap";
|
|
12
|
-
import { makeUnsignedSTXTokenTransfer, createMessageSignature, } from "@stacks/transactions";
|
|
12
|
+
import { makeUnsignedSTXTokenTransfer, createMessageSignature, getAddressFromPublicKey, } from "@stacks/transactions";
|
|
13
13
|
import { decodeAccountId, encodeAccountId } from "../../../../account";
|
|
14
14
|
import { fetchBalances, fetchBlockHeight, fetchFullMempoolTxs, fetchFullTxs, fetchNonce, } from "../../bridge/utils/api";
|
|
15
15
|
import { StacksNetwork } from "./api.types";
|
|
16
16
|
import { getCryptoCurrencyById } from "../../../../currencies";
|
|
17
17
|
import { encodeOperationId } from "../../../../operation";
|
|
18
|
+
import invariant from "invariant";
|
|
18
19
|
export const getTxToBroadcast = (operation, signature, rawData) => __awaiter(void 0, void 0, void 0, function* () {
|
|
19
20
|
var _a;
|
|
20
21
|
const { value, recipients, fee, extra: { memo }, } = operation;
|
|
@@ -90,15 +91,19 @@ export const mapTxToOps = (accountID, { address }) => (tx) => {
|
|
|
90
91
|
return ops;
|
|
91
92
|
};
|
|
92
93
|
export const getAccountShape = (info) => __awaiter(void 0, void 0, void 0, function* () {
|
|
93
|
-
const { initialAccount,
|
|
94
|
-
|
|
94
|
+
const { initialAccount, currency, rest = {}, derivationMode } = info;
|
|
95
|
+
// for bridge tests specifically the `rest` object is empty and therefore the publicKey is undefined
|
|
96
|
+
// reconciliatePublicKey tries to get pubKey from rest object and then from accountId
|
|
97
|
+
const pubKey = reconciliatePublicKey(rest.publicKey, initialAccount);
|
|
98
|
+
invariant(pubKey, "publicKey is required");
|
|
95
99
|
const accountId = encodeAccountId({
|
|
96
100
|
type: "js",
|
|
97
101
|
version: "2",
|
|
98
102
|
currencyId: currency.id,
|
|
99
|
-
xpubOrAddress:
|
|
103
|
+
xpubOrAddress: pubKey,
|
|
100
104
|
derivationMode,
|
|
101
105
|
});
|
|
106
|
+
const address = getAddressFromPublicKey(pubKey);
|
|
102
107
|
const blockHeight = yield fetchBlockHeight();
|
|
103
108
|
const balanceResp = yield fetchBalances(address);
|
|
104
109
|
const rawTxs = yield fetchFullTxs(address);
|
|
@@ -112,7 +117,7 @@ export const getAccountShape = (info) => __awaiter(void 0, void 0, void 0, funct
|
|
|
112
117
|
}
|
|
113
118
|
const result = {
|
|
114
119
|
id: accountId,
|
|
115
|
-
xpub:
|
|
120
|
+
xpub: pubKey,
|
|
116
121
|
freshAddress: address,
|
|
117
122
|
balance,
|
|
118
123
|
spendableBalance,
|
|
@@ -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,OAAO,MAAM,gBAAgB,CAAC;AAErC,OAAO,EACL,4BAA4B,EAE5B,sBAAsB,
|
|
1
|
+
{"version":3,"file":"misc.js","sourceRoot":"","sources":["../../../../../src/families/stacks/bridge/utils/misc.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ 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
|
|
8
|
+
const SEED_IDENTIFIER_PUBKEY = "022a460decc9dba8c452927fecb33d7ae25a8d79dc5442b84feaf8f3aa0e2b575d";
|
|
9
9
|
const ACCOUNT_1 = "SP2DV2RVZP1A69Q6VAG5PHEQ6ZHQHZPCV84TMYNGN";
|
|
10
10
|
const stacks = {
|
|
11
11
|
FIXME_ignoreAccountFields: [],
|
|
@@ -26,16 +26,17 @@ const stacks = {
|
|
|
26
26
|
accounts: [
|
|
27
27
|
{
|
|
28
28
|
raw: {
|
|
29
|
-
id: `js:2:stacks:${
|
|
29
|
+
id: `js:2:stacks:${SEED_IDENTIFIER_PUBKEY}:`,
|
|
30
30
|
seedIdentifier: SEED_IDENTIFIER,
|
|
31
31
|
name: "Stacks 1",
|
|
32
32
|
derivationMode: "",
|
|
33
33
|
index: 0,
|
|
34
34
|
freshAddress: SEED_IDENTIFIER,
|
|
35
|
-
freshAddressPath: "
|
|
35
|
+
freshAddressPath: "",
|
|
36
36
|
freshAddresses: [],
|
|
37
37
|
blockHeight: 0,
|
|
38
38
|
operations: [],
|
|
39
|
+
xpub: SEED_IDENTIFIER_PUBKEY,
|
|
39
40
|
pendingOperations: [],
|
|
40
41
|
currencyId: "stacks",
|
|
41
42
|
unitMagnitude: 6,
|
|
@@ -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,
|
|
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": "34.0.0
|
|
4
|
+
"version": "34.0.0",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
7
7
|
"url": "https://github.com/LedgerHQ/ledger-live.git"
|
|
@@ -196,42 +196,42 @@
|
|
|
196
196
|
"varuint-bitcoin": "1.1.2",
|
|
197
197
|
"winston": "^3.4.0",
|
|
198
198
|
"xstate": "^4.30.2",
|
|
199
|
-
"@ledgerhq/hw-transport-node-speculos-http": "^6.28.4
|
|
200
|
-
"@ledgerhq/live-config": "^2.0.0
|
|
201
|
-
"@ledgerhq/live-countervalues": "^0.1.1
|
|
202
|
-
"@ledgerhq/live-countervalues-react": "^0.1.1
|
|
203
|
-
"@ledgerhq/
|
|
199
|
+
"@ledgerhq/hw-transport-node-speculos-http": "^6.28.4",
|
|
200
|
+
"@ledgerhq/live-config": "^2.0.0",
|
|
201
|
+
"@ledgerhq/live-countervalues": "^0.1.1",
|
|
202
|
+
"@ledgerhq/live-countervalues-react": "^0.1.1",
|
|
203
|
+
"@ledgerhq/coin-algorand": "^0.3.10",
|
|
204
|
+
"@ledgerhq/coin-evm": "^1.0.0",
|
|
205
|
+
"@ledgerhq/coin-framework": "^0.11.1",
|
|
206
|
+
"@ledgerhq/coin-near": "^0.3.9",
|
|
207
|
+
"@ledgerhq/coin-polkadot": "^0.5.3",
|
|
208
|
+
"@ledgerhq/crypto-icons-ui": "^1.1.0",
|
|
209
|
+
"@ledgerhq/cryptoassets": "^12.0.0",
|
|
210
|
+
"@ledgerhq/devices": "^8.2.1",
|
|
211
|
+
"@ledgerhq/errors": "^6.16.2",
|
|
212
|
+
"@ledgerhq/hw-app-algorand": "^6.28.4",
|
|
213
|
+
"@ledgerhq/hw-app-btc": "^10.2.2",
|
|
214
|
+
"@ledgerhq/hw-app-cosmos": "^6.29.4",
|
|
215
|
+
"@ledgerhq/hw-app-eth": "^6.35.5",
|
|
216
|
+
"@ledgerhq/hw-app-exchange": "^0.4.5",
|
|
217
|
+
"@ledgerhq/hw-app-near": "^6.28.4",
|
|
218
|
+
"@ledgerhq/hw-app-polkadot": "^6.28.4",
|
|
219
|
+
"@ledgerhq/hw-app-solana": "^7.1.4",
|
|
220
|
+
"@ledgerhq/hw-app-str": "^6.28.4",
|
|
221
|
+
"@ledgerhq/hw-app-tezos": "^6.28.4",
|
|
222
|
+
"@ledgerhq/hw-app-trx": "^6.28.4",
|
|
223
|
+
"@ledgerhq/hw-app-vet": "^0.1.4",
|
|
224
|
+
"@ledgerhq/hw-app-xrp": "^6.28.4",
|
|
225
|
+
"@ledgerhq/hw-transport": "^6.30.4",
|
|
226
|
+
"@ledgerhq/hw-transport-mocker": "^6.28.4",
|
|
227
|
+
"@ledgerhq/hw-transport-node-speculos": "^6.28.4",
|
|
228
|
+
"@ledgerhq/live-env": "^1.0.0",
|
|
204
229
|
"@ledgerhq/live-hooks": "0.1.0",
|
|
205
|
-
"@ledgerhq/live-network": "^1.1.12
|
|
206
|
-
"@ledgerhq/live-nft": "^0.2.0
|
|
230
|
+
"@ledgerhq/live-network": "^1.1.12",
|
|
231
|
+
"@ledgerhq/live-nft": "^0.2.0",
|
|
207
232
|
"@ledgerhq/live-promise": "^0.0.3",
|
|
208
233
|
"@ledgerhq/logs": "^6.12.0",
|
|
209
|
-
"@ledgerhq/wallet-api-exchange-module": "^0.3.0
|
|
210
|
-
"@ledgerhq/coin-algorand": "^0.3.10-nightly.6",
|
|
211
|
-
"@ledgerhq/coin-evm": "^1.0.0-nightly.7",
|
|
212
|
-
"@ledgerhq/coin-framework": "^0.11.1-nightly.6",
|
|
213
|
-
"@ledgerhq/coin-near": "^0.3.9-nightly.3",
|
|
214
|
-
"@ledgerhq/coin-polkadot": "^0.5.3-nightly.6",
|
|
215
|
-
"@ledgerhq/crypto-icons-ui": "^1.1.0-nightly.3",
|
|
216
|
-
"@ledgerhq/cryptoassets": "^12.0.0-nightly.1",
|
|
217
|
-
"@ledgerhq/devices": "^8.2.1-nightly.0",
|
|
218
|
-
"@ledgerhq/errors": "^6.16.2-nightly.0",
|
|
219
|
-
"@ledgerhq/hw-app-algorand": "^6.28.4-nightly.0",
|
|
220
|
-
"@ledgerhq/hw-app-btc": "^10.2.2-nightly.1",
|
|
221
|
-
"@ledgerhq/hw-app-cosmos": "^6.29.4-nightly.0",
|
|
222
|
-
"@ledgerhq/hw-app-eth": "^6.35.5-nightly.5",
|
|
223
|
-
"@ledgerhq/hw-app-exchange": "^0.4.5-nightly.2",
|
|
224
|
-
"@ledgerhq/hw-app-near": "^6.28.4-nightly.0",
|
|
225
|
-
"@ledgerhq/hw-app-polkadot": "^6.28.4-nightly.0",
|
|
226
|
-
"@ledgerhq/hw-app-solana": "^7.1.4-nightly.0",
|
|
227
|
-
"@ledgerhq/hw-app-str": "^6.28.4-nightly.0",
|
|
228
|
-
"@ledgerhq/hw-app-tezos": "^6.28.4-nightly.0",
|
|
229
|
-
"@ledgerhq/hw-app-trx": "^6.28.4-nightly.0",
|
|
230
|
-
"@ledgerhq/hw-app-vet": "^0.1.4-nightly.2",
|
|
231
|
-
"@ledgerhq/hw-app-xrp": "^6.28.4-nightly.0",
|
|
232
|
-
"@ledgerhq/hw-transport": "^6.30.4-nightly.0",
|
|
233
|
-
"@ledgerhq/hw-transport-mocker": "^6.28.4-nightly.0",
|
|
234
|
-
"@ledgerhq/hw-transport-node-speculos": "^6.28.4-nightly.0"
|
|
234
|
+
"@ledgerhq/wallet-api-exchange-module": "^0.3.0"
|
|
235
235
|
},
|
|
236
236
|
"devDependencies": {
|
|
237
237
|
"@svgr/core": "^5.5.0",
|
|
@@ -274,9 +274,9 @@
|
|
|
274
274
|
"ts-node": "^10.4.0",
|
|
275
275
|
"uuid": "^8.3.2",
|
|
276
276
|
"ws": "7",
|
|
277
|
-
"@ledgerhq/types-cryptoassets": "^7.10.0
|
|
277
|
+
"@ledgerhq/types-cryptoassets": "^7.10.0",
|
|
278
278
|
"@ledgerhq/types-devices": "^6.23.0",
|
|
279
|
-
"@ledgerhq/types-live": "^6.45.0
|
|
279
|
+
"@ledgerhq/types-live": "^6.45.0"
|
|
280
280
|
},
|
|
281
281
|
"scripts": {
|
|
282
282
|
"build": "zx ./scripts/build-ts.mjs",
|
|
@@ -42,7 +42,7 @@ import { broadcastTx } from "./utils/api";
|
|
|
42
42
|
import { getAddress } from "../../filecoin/bridge/utils/utils";
|
|
43
43
|
import { withDevice } from "../../../hw/deviceAccess";
|
|
44
44
|
import { getPath, throwIfError } from "../utils";
|
|
45
|
-
import {
|
|
45
|
+
import { getMainAccount } from "../../../account";
|
|
46
46
|
import { encodeOperationId, patchOperationWithHash } from "../../../operation";
|
|
47
47
|
import { validateAddress } from "./utils/addresses";
|
|
48
48
|
|
|
@@ -123,8 +123,10 @@ const estimateMaxSpendable = async ({
|
|
|
123
123
|
transaction?: Transaction | null | undefined;
|
|
124
124
|
}): Promise<BigNumber> => {
|
|
125
125
|
const a = getMainAccount(account, parentAccount);
|
|
126
|
-
const {
|
|
127
|
-
const
|
|
126
|
+
const { spendableBalance } = a;
|
|
127
|
+
const mainAccount = getMainAccount(account, parentAccount);
|
|
128
|
+
const { xpub } = mainAccount;
|
|
129
|
+
invariant(xpub, "xpub is required");
|
|
128
130
|
|
|
129
131
|
const dummyTx = {
|
|
130
132
|
...createTransaction(),
|
|
@@ -154,9 +156,10 @@ const estimateMaxSpendable = async ({
|
|
|
154
156
|
};
|
|
155
157
|
|
|
156
158
|
const prepareTransaction = async (a: Account, t: Transaction): Promise<Transaction> => {
|
|
157
|
-
const {
|
|
159
|
+
const { spendableBalance, pendingOperations } = a;
|
|
158
160
|
const { recipient, useAllAmount } = t;
|
|
159
|
-
const {
|
|
161
|
+
const { xpub } = a;
|
|
162
|
+
invariant(xpub, "xpub is required");
|
|
160
163
|
|
|
161
164
|
const patch: Partial<Transaction> = {};
|
|
162
165
|
if (xpub && recipient && validateAddress(recipient).isValid) {
|
|
@@ -202,9 +205,9 @@ const signOperation: SignOperationFnSignature<Transaction> = ({
|
|
|
202
205
|
transport =>
|
|
203
206
|
new Observable(o => {
|
|
204
207
|
async function main() {
|
|
205
|
-
const { id: accountId } = account;
|
|
206
208
|
const { address, derivationPath } = getAddress(account);
|
|
207
|
-
const {
|
|
209
|
+
const { xpub, id: accountId } = account;
|
|
210
|
+
invariant(xpub, "xpub is required");
|
|
208
211
|
|
|
209
212
|
const { recipient, fee, anchorMode, network, memo, amount, nonce } = transaction;
|
|
210
213
|
|
|
@@ -5,6 +5,7 @@ import {
|
|
|
5
5
|
makeUnsignedSTXTokenTransfer,
|
|
6
6
|
UnsignedTokenTransferOptions,
|
|
7
7
|
createMessageSignature,
|
|
8
|
+
getAddressFromPublicKey,
|
|
8
9
|
} from "@stacks/transactions";
|
|
9
10
|
|
|
10
11
|
import { GetAccountShape, AccountShapeInfo } from "../../../../bridge/jsHelpers";
|
|
@@ -20,6 +21,7 @@ import { StacksNetwork, TransactionResponse } from "./api.types";
|
|
|
20
21
|
import { getCryptoCurrencyById } from "../../../../currencies";
|
|
21
22
|
import { encodeOperationId } from "../../../../operation";
|
|
22
23
|
import { StacksOperation } from "../../types";
|
|
24
|
+
import invariant from "invariant";
|
|
23
25
|
|
|
24
26
|
export const getTxToBroadcast = async (
|
|
25
27
|
operation: StacksOperation,
|
|
@@ -131,18 +133,22 @@ export const mapTxToOps =
|
|
|
131
133
|
};
|
|
132
134
|
|
|
133
135
|
export const getAccountShape: GetAccountShape = async info => {
|
|
134
|
-
const { initialAccount,
|
|
135
|
-
|
|
136
|
-
|
|
136
|
+
const { initialAccount, currency, rest = {}, derivationMode } = info;
|
|
137
|
+
// for bridge tests specifically the `rest` object is empty and therefore the publicKey is undefined
|
|
138
|
+
// reconciliatePublicKey tries to get pubKey from rest object and then from accountId
|
|
139
|
+
const pubKey = reconciliatePublicKey(rest.publicKey, initialAccount);
|
|
140
|
+
invariant(pubKey, "publicKey is required");
|
|
137
141
|
|
|
138
142
|
const accountId = encodeAccountId({
|
|
139
143
|
type: "js",
|
|
140
144
|
version: "2",
|
|
141
145
|
currencyId: currency.id,
|
|
142
|
-
xpubOrAddress:
|
|
146
|
+
xpubOrAddress: pubKey,
|
|
143
147
|
derivationMode,
|
|
144
148
|
});
|
|
145
149
|
|
|
150
|
+
const address = getAddressFromPublicKey(pubKey);
|
|
151
|
+
|
|
146
152
|
const blockHeight = await fetchBlockHeight();
|
|
147
153
|
const balanceResp = await fetchBalances(address);
|
|
148
154
|
const rawTxs = await fetchFullTxs(address);
|
|
@@ -158,7 +164,7 @@ export const getAccountShape: GetAccountShape = async info => {
|
|
|
158
164
|
|
|
159
165
|
const result: Partial<Account> = {
|
|
160
166
|
id: accountId,
|
|
161
|
-
xpub:
|
|
167
|
+
xpub: pubKey,
|
|
162
168
|
freshAddress: address,
|
|
163
169
|
balance,
|
|
164
170
|
spendableBalance,
|
|
@@ -14,7 +14,7 @@ import { fromTransactionRaw } from "./transaction";
|
|
|
14
14
|
import { testBridge } from "../../__tests__/test-helpers/bridge";
|
|
15
15
|
|
|
16
16
|
const SEED_IDENTIFIER = "SP3KS7VMY2ZNE6SB88PHR4SKRK2EEPHS8N8MCCBR9";
|
|
17
|
-
const
|
|
17
|
+
const SEED_IDENTIFIER_PUBKEY = "022a460decc9dba8c452927fecb33d7ae25a8d79dc5442b84feaf8f3aa0e2b575d";
|
|
18
18
|
const ACCOUNT_1 = "SP2DV2RVZP1A69Q6VAG5PHEQ6ZHQHZPCV84TMYNGN";
|
|
19
19
|
|
|
20
20
|
const stacks: CurrenciesData<Transaction> = {
|
|
@@ -36,16 +36,17 @@ const stacks: CurrenciesData<Transaction> = {
|
|
|
36
36
|
accounts: [
|
|
37
37
|
{
|
|
38
38
|
raw: {
|
|
39
|
-
id: `js:2:stacks:${
|
|
39
|
+
id: `js:2:stacks:${SEED_IDENTIFIER_PUBKEY}:`,
|
|
40
40
|
seedIdentifier: SEED_IDENTIFIER,
|
|
41
41
|
name: "Stacks 1",
|
|
42
42
|
derivationMode: "",
|
|
43
43
|
index: 0,
|
|
44
44
|
freshAddress: SEED_IDENTIFIER,
|
|
45
|
-
freshAddressPath: "
|
|
45
|
+
freshAddressPath: "",
|
|
46
46
|
freshAddresses: [],
|
|
47
47
|
blockHeight: 0,
|
|
48
48
|
operations: [],
|
|
49
|
+
xpub: SEED_IDENTIFIER_PUBKEY,
|
|
49
50
|
pendingOperations: [],
|
|
50
51
|
currencyId: "stacks",
|
|
51
52
|
unitMagnitude: 6,
|