@ledgerhq/live-common 33.5.0-next.0 → 33.5.0-next.1

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.
@@ -1 +1 @@
1
- {"version":3,"file":"tx-fees.d.ts","sourceRoot":"","sources":["../../../src/families/solana/tx-fees.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAGjC,OAAO,EAAe,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAKxD,wBAAsB,aAAa,CACjC,GAAG,EAAE,QAAQ,EACb,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC,mBAa/B"}
1
+ {"version":3,"file":"tx-fees.d.ts","sourceRoot":"","sources":["../../../src/families/solana/tx-fees.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAGjC,OAAO,EAAe,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAQxD,wBAAsB,aAAa,CACjC,GAAG,EAAE,QAAQ,EACb,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC,mBAmB/B"}
@@ -17,15 +17,22 @@ const js_buildTransaction_1 = require("./js-buildTransaction");
17
17
  const js_createTransaction_1 = __importDefault(require("./js-createTransaction"));
18
18
  const utils_1 = require("./utils");
19
19
  const logs_1 = require("@ledgerhq/logs");
20
+ const errors_1 = require("@ledgerhq/errors");
21
+ const MAX_RETRIES = 10; // TODO Candidate to put in coin config
20
22
  function estimateTxFee(api, address, kind) {
21
23
  return __awaiter(this, void 0, void 0, function* () {
22
24
  const tx = createDummyTx(address, kind);
23
25
  const [onChainTx] = yield (0, js_buildTransaction_1.buildTransactionWithAPI)(address, tx, api);
24
- const fee = yield api.getFeeForMessage(onChainTx.message);
26
+ let fee = yield api.getFeeForMessage(onChainTx.message);
27
+ let retries = 0;
28
+ while (typeof fee !== "number" && retries++ < MAX_RETRIES) {
29
+ // FIXME HACK: sometimes fee is not a number, retrying with a next blockhash
30
+ (0, logs_1.log)("debug", `api.getFeeForMessage returned invalid fee: <${fee}>`);
31
+ fee = yield retryWithNewBlockhash(api, onChainTx);
32
+ }
25
33
  if (typeof fee !== "number") {
26
- (0, logs_1.log)("error", `api.getFeeForMessage returned invalid fee: <${fee}>`);
27
- // TEMP HACK: sometimes fee is not a number, retrying with a next blockhash
28
- return retryWithNewBlockhash(api, onChainTx);
34
+ (0, logs_1.log)("error", `unexpected fee: <${fee}>, after retry with a new blockhash`);
35
+ throw new errors_1.NetworkError();
29
36
  }
30
37
  return fee;
31
38
  });
@@ -135,11 +142,7 @@ function retryWithNewBlockhash(api, onChainTx) {
135
142
  throw new Error("expected recentBlockhash");
136
143
  }
137
144
  onChainTx.message.recentBlockhash = yield waitNextBlockhash(api, onChainTx.message.recentBlockhash);
138
- const fee = yield api.getFeeForMessage(onChainTx.message);
139
- if (typeof fee !== "number") {
140
- throw new Error(`unexpected fee: <${fee}>, after retry with a new blockhash`);
141
- }
142
- return fee;
145
+ return api.getFeeForMessage(onChainTx.message);
143
146
  });
144
147
  }
145
148
  function sleep(durationMS) {
@@ -1 +1 @@
1
- {"version":3,"file":"tx-fees.js","sourceRoot":"","sources":["../../../src/families/solana/tx-fees.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tx-fees.js","sourceRoot":"","sources":["../../../src/families/solana/tx-fees.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"tx-fees.d.ts","sourceRoot":"","sources":["../../../src/families/solana/tx-fees.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAGjC,OAAO,EAAe,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAKxD,wBAAsB,aAAa,CACjC,GAAG,EAAE,QAAQ,EACb,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC,mBAa/B"}
1
+ {"version":3,"file":"tx-fees.d.ts","sourceRoot":"","sources":["../../../src/families/solana/tx-fees.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAGjC,OAAO,EAAe,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAQxD,wBAAsB,aAAa,CACjC,GAAG,EAAE,QAAQ,EACb,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC,mBAmB/B"}
@@ -11,15 +11,22 @@ import { buildTransactionWithAPI } from "./js-buildTransaction";
11
11
  import createTransaction from "./js-createTransaction";
12
12
  import { assertUnreachable } from "./utils";
13
13
  import { log } from "@ledgerhq/logs";
14
+ import { NetworkError } from "@ledgerhq/errors";
15
+ const MAX_RETRIES = 10; // TODO Candidate to put in coin config
14
16
  export function estimateTxFee(api, address, kind) {
15
17
  return __awaiter(this, void 0, void 0, function* () {
16
18
  const tx = createDummyTx(address, kind);
17
19
  const [onChainTx] = yield buildTransactionWithAPI(address, tx, api);
18
- const fee = yield api.getFeeForMessage(onChainTx.message);
20
+ let fee = yield api.getFeeForMessage(onChainTx.message);
21
+ let retries = 0;
22
+ while (typeof fee !== "number" && retries++ < MAX_RETRIES) {
23
+ // FIXME HACK: sometimes fee is not a number, retrying with a next blockhash
24
+ log("debug", `api.getFeeForMessage returned invalid fee: <${fee}>`);
25
+ fee = yield retryWithNewBlockhash(api, onChainTx);
26
+ }
19
27
  if (typeof fee !== "number") {
20
- log("error", `api.getFeeForMessage returned invalid fee: <${fee}>`);
21
- // TEMP HACK: sometimes fee is not a number, retrying with a next blockhash
22
- return retryWithNewBlockhash(api, onChainTx);
28
+ log("error", `unexpected fee: <${fee}>, after retry with a new blockhash`);
29
+ throw new NetworkError();
23
30
  }
24
31
  return fee;
25
32
  });
@@ -128,11 +135,7 @@ function retryWithNewBlockhash(api, onChainTx) {
128
135
  throw new Error("expected recentBlockhash");
129
136
  }
130
137
  onChainTx.message.recentBlockhash = yield waitNextBlockhash(api, onChainTx.message.recentBlockhash);
131
- const fee = yield api.getFeeForMessage(onChainTx.message);
132
- if (typeof fee !== "number") {
133
- throw new Error(`unexpected fee: <${fee}>, after retry with a new blockhash`);
134
- }
135
- return fee;
138
+ return api.getFeeForMessage(onChainTx.message);
136
139
  });
137
140
  }
138
141
  function sleep(durationMS) {
@@ -1 +1 @@
1
- {"version":3,"file":"tx-fees.js","sourceRoot":"","sources":["../../../src/families/solana/tx-fees.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tx-fees.js","sourceRoot":"","sources":["../../../src/families/solana/tx-fees.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.0",
4
+ "version": "33.5.0-next.1",
5
5
  "repository": {
6
6
  "type": "git",
7
7
  "url": "https://github.com/LedgerHQ/ledger-live.git"
@@ -197,10 +197,9 @@
197
197
  "varuint-bitcoin": "1.1.2",
198
198
  "winston": "^3.4.0",
199
199
  "xstate": "^4.30.2",
200
- "@ledgerhq/wallet-api-exchange-module": "^0.2.0-next.0",
201
200
  "@ledgerhq/coin-algorand": "^0.3.9-next.0",
202
- "@ledgerhq/coin-evm": "^0.12.0-next.0",
203
201
  "@ledgerhq/coin-framework": "^0.11.0-next.0",
202
+ "@ledgerhq/coin-evm": "^0.12.0-next.0",
204
203
  "@ledgerhq/coin-polkadot": "^0.5.2-next.0",
205
204
  "@ledgerhq/crypto-icons-ui": "^1.0.1-next.0",
206
205
  "@ledgerhq/cryptoassets": "^11.4.0-next.0",
@@ -227,7 +226,8 @@
227
226
  "@ledgerhq/live-env": "^0.9.0-next.0",
228
227
  "@ledgerhq/live-network": "^1.1.11-next.0",
229
228
  "@ledgerhq/live-promise": "^0.0.3",
230
- "@ledgerhq/logs": "^6.12.0"
229
+ "@ledgerhq/logs": "^6.12.0",
230
+ "@ledgerhq/wallet-api-exchange-module": "^0.2.0-next.0"
231
231
  },
232
232
  "devDependencies": {
233
233
  "@svgr/core": "^5.5.0",