@ledgerhq/coin-hedera 1.6.7-nightly.0 → 1.6.7-nightly.2
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/.turbo/turbo-build.log +1 -1
- package/.unimportedrc.json +1 -0
- package/CHANGELOG.md +17 -0
- package/lib/api/mirror.d.ts +1 -0
- package/lib/api/mirror.d.ts.map +1 -1
- package/lib/api/mirror.js +5 -2
- package/lib/api/mirror.js.map +1 -1
- package/lib/bridge/broadcast.d.ts.map +1 -1
- package/lib/bridge/broadcast.js +7 -1
- package/lib/bridge/broadcast.js.map +1 -1
- package/lib/bridge/utils.d.ts +3 -2
- package/lib/bridge/utils.d.ts.map +1 -1
- package/lib/bridge/utils.js +10 -1
- package/lib/bridge/utils.js.map +1 -1
- package/lib/logic.d.ts +5 -0
- package/lib/logic.d.ts.map +1 -0
- package/lib/logic.js +9 -0
- package/lib/logic.js.map +1 -0
- package/lib/logic.test.d.ts +2 -0
- package/lib/logic.test.d.ts.map +1 -0
- package/lib/logic.test.js +54 -0
- package/lib/logic.test.js.map +1 -0
- package/lib/types/bridge.d.ts +1 -3
- package/lib/types/bridge.d.ts.map +1 -1
- package/lib-es/api/mirror.d.ts +1 -0
- package/lib-es/api/mirror.d.ts.map +1 -1
- package/lib-es/api/mirror.js +5 -2
- package/lib-es/api/mirror.js.map +1 -1
- package/lib-es/bridge/broadcast.d.ts.map +1 -1
- package/lib-es/bridge/broadcast.js +8 -2
- package/lib-es/bridge/broadcast.js.map +1 -1
- package/lib-es/bridge/utils.d.ts +3 -2
- package/lib-es/bridge/utils.d.ts.map +1 -1
- package/lib-es/bridge/utils.js +8 -0
- package/lib-es/bridge/utils.js.map +1 -1
- package/lib-es/logic.d.ts +5 -0
- package/lib-es/logic.d.ts.map +1 -0
- package/lib-es/logic.js +6 -0
- package/lib-es/logic.js.map +1 -0
- package/lib-es/logic.test.d.ts +2 -0
- package/lib-es/logic.test.d.ts.map +1 -0
- package/lib-es/logic.test.js +52 -0
- package/lib-es/logic.test.js.map +1 -0
- package/lib-es/types/bridge.d.ts +1 -3
- package/lib-es/types/bridge.d.ts.map +1 -1
- package/package.json +6 -5
- package/src/api/mirror.ts +7 -2
- package/src/bridge/broadcast.ts +11 -4
- package/src/bridge/utils.ts +14 -2
- package/src/logic.test.ts +58 -0
- package/src/logic.ts +15 -0
- package/src/types/bridge.ts +1 -4
package/.turbo/turbo-build.log
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
|
|
2
|
-
> @ledgerhq/coin-hedera@1.6.
|
|
2
|
+
> @ledgerhq/coin-hedera@1.6.7-nightly.1 build /home/runner/work/ledger-live/ledger-live/libs/coin-modules/coin-hedera
|
|
3
3
|
> tsc --outDir lib --module commonjs --moduleResolution node10 && tsc -m ES6 --outDir lib-es
|
|
4
4
|
|
package/.unimportedrc.json
CHANGED
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,22 @@
|
|
|
1
1
|
# @ledgerhq/coin-hedera
|
|
2
2
|
|
|
3
|
+
## 1.6.7-nightly.2
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies [[`4ddfe60`](https://github.com/LedgerHQ/ledger-live/commit/4ddfe6060ab8e4e5c0bb89da91e08a02d8ca50e6)]:
|
|
8
|
+
- @ledgerhq/types-live@6.71.0-nightly.2
|
|
9
|
+
- @ledgerhq/coin-framework@5.0.3-nightly.0
|
|
10
|
+
- @ledgerhq/live-countervalues@0.5.7-nightly.0
|
|
11
|
+
|
|
12
|
+
## 1.6.7-nightly.1
|
|
13
|
+
|
|
14
|
+
### Patch Changes
|
|
15
|
+
|
|
16
|
+
- [#10264](https://github.com/LedgerHQ/ledger-live/pull/10264) [`52e34fc`](https://github.com/LedgerHQ/ledger-live/commit/52e34fc0ca98917e8ac2846524828f1f0aaf701d) Thanks [@md-blockydevs](https://github.com/md-blockydevs)! - fix "view in explorer" button in unconfirmed Hedera transaction details by adding "extra.transactionId" fallback
|
|
17
|
+
move getTransactionExplorer from LLD to coin module
|
|
18
|
+
support custom getTransactionExplorer in ledger-live-mobile
|
|
19
|
+
|
|
3
20
|
## 1.6.7-nightly.0
|
|
4
21
|
|
|
5
22
|
### Patch Changes
|
package/lib/api/mirror.d.ts
CHANGED
|
@@ -15,6 +15,7 @@ interface HederaMirrorTransaction {
|
|
|
15
15
|
charged_tx_fee: string;
|
|
16
16
|
transaction_hash: string;
|
|
17
17
|
consensus_timestamp: string;
|
|
18
|
+
transaction_id: string;
|
|
18
19
|
}
|
|
19
20
|
export declare function getAccountTransactions(address: string, since: string | null): Promise<HederaMirrorTransaction[]>;
|
|
20
21
|
export declare function getOperationsForAccount(ledgerAccountId: string, address: string, latestOperationTimestamp: string | null): Promise<Operation[]>;
|
package/lib/api/mirror.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mirror.d.ts","sourceRoot":"","sources":["../../src/api/mirror.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,OAAO,EAAE,SAAS,EAAiB,MAAM,sBAAsB,CAAC;AAChE,OAAO,SAAS,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"mirror.d.ts","sourceRoot":"","sources":["../../src/api/mirror.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,OAAO,EAAE,SAAS,EAAiB,MAAM,sBAAsB,CAAC;AAChE,OAAO,SAAS,MAAM,cAAc,CAAC;AAgBrC,UAAU,mBAAmB;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,SAAS,CAAC;CACpB;AAED,wBAAsB,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAqB/F;AAED,UAAU,oBAAoB;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,uBAAuB;IAC/B,SAAS,EAAE,oBAAoB,EAAE,CAAC;IAClC,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GAAG,IAAI,GACnB,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAuBpC;AAED,wBAAsB,uBAAuB,CAC3C,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,MAAM,EACf,wBAAwB,EAAE,MAAM,GAAG,IAAI,GACtC,OAAO,CAAC,SAAS,EAAE,CAAC,CA6EtB"}
|
package/lib/api/mirror.js
CHANGED
|
@@ -66,7 +66,7 @@ async function getOperationsForAccount(ledgerAccountId, address, latestOperation
|
|
|
66
66
|
const rawOperations = await getAccountTransactions(address, latestOperationTimestamp);
|
|
67
67
|
const operations = [];
|
|
68
68
|
for (const raw of rawOperations) {
|
|
69
|
-
const { consensus_timestamp } = raw;
|
|
69
|
+
const { consensus_timestamp, transaction_id } = raw;
|
|
70
70
|
const timestamp = new Date(parseInt(consensus_timestamp.split(".")[0], 10) * 1000);
|
|
71
71
|
const senders = [];
|
|
72
72
|
const recipients = [];
|
|
@@ -122,7 +122,10 @@ async function getOperationsForAccount(ledgerAccountId, address, latestOperation
|
|
|
122
122
|
// Set a value just so that it's considered confirmed according to isConfirmedOperation
|
|
123
123
|
blockHeight: 5,
|
|
124
124
|
blockHash: null,
|
|
125
|
-
extra: {
|
|
125
|
+
extra: {
|
|
126
|
+
consensusTimestamp: consensus_timestamp,
|
|
127
|
+
transactionId: transaction_id,
|
|
128
|
+
},
|
|
126
129
|
fee,
|
|
127
130
|
hash,
|
|
128
131
|
recipients,
|
package/lib/api/mirror.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mirror.js","sourceRoot":"","sources":["../../src/api/mirror.ts"],"names":[],"mappings":";;;;;;AAAA,wCAA2C;AAC3C,6EAAqD;AAErD,gEAAqC;AACrC,iDAA4C;AAC5C,kEAAuE;AACvE,uCAA8C;AAC9C,2CAAwD;
|
|
1
|
+
{"version":3,"file":"mirror.js","sourceRoot":"","sources":["../../src/api/mirror.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"broadcast.d.ts","sourceRoot":"","sources":["../../src/bridge/broadcast.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"broadcast.d.ts","sourceRoot":"","sources":["../../src/bridge/broadcast.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAa,MAAM,sBAAsB,CAAC;AAGhE,OAAO,EAAwB,WAAW,EAAE,MAAM,UAAU,CAAC;AAG7D,eAAO,MAAM,SAAS,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,WAAW,CAmB7D,CAAC"}
|
package/lib/bridge/broadcast.js
CHANGED
|
@@ -12,7 +12,13 @@ const broadcast = async ({ signedOperation }) => {
|
|
|
12
12
|
const response = await (0, network_1.broadcastTransaction)(hederaTransaction);
|
|
13
13
|
const base64Hash = Buffer.from(response.transactionHash).toString("base64");
|
|
14
14
|
const base64HashUrlSafe = (0, utils_1.base64ToUrlSafeBase64)(base64Hash);
|
|
15
|
-
|
|
15
|
+
const extra = {
|
|
16
|
+
transactionId: response.transactionId.toString(),
|
|
17
|
+
};
|
|
18
|
+
let patchedOperation = operation;
|
|
19
|
+
patchedOperation = (0, operation_1.patchOperationWithHash)(patchedOperation, base64HashUrlSafe);
|
|
20
|
+
patchedOperation = (0, utils_1.patchOperationWithExtra)(patchedOperation, extra);
|
|
21
|
+
return patchedOperation;
|
|
16
22
|
};
|
|
17
23
|
exports.broadcast = broadcast;
|
|
18
24
|
//# sourceMappingURL=broadcast.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"broadcast.js","sourceRoot":"","sources":["../../src/bridge/broadcast.ts"],"names":[],"mappings":";;;AAAA,wCAAqE;AAErE,kEAA4E;AAC5E,
|
|
1
|
+
{"version":3,"file":"broadcast.js","sourceRoot":"","sources":["../../src/bridge/broadcast.ts"],"names":[],"mappings":";;;AAAA,wCAAqE;AAErE,kEAA4E;AAC5E,mCAAyE;AAEzE,4CAAsD;AAE/C,MAAM,SAAS,GAA4C,KAAK,EAAE,EAAE,eAAe,EAAE,EAAE,EAAE;IAC9F,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,eAAe,CAAC;IAEjD,oFAAoF;IACpF,MAAM,iBAAiB,GAAG,iBAAoB,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;IAE3F,MAAM,QAAQ,GAAG,MAAM,IAAA,8BAAoB,EAAC,iBAAiB,CAAC,CAAC;IAE/D,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC5E,MAAM,iBAAiB,GAAG,IAAA,6BAAqB,EAAC,UAAU,CAAC,CAAC;IAC5D,MAAM,KAAK,GAAyB;QAClC,aAAa,EAAE,QAAQ,CAAC,aAAa,CAAC,QAAQ,EAAE;KACjD,CAAC;IAEF,IAAI,gBAAgB,GAAc,SAAS,CAAC;IAC5C,gBAAgB,GAAG,IAAA,kCAAsB,EAAC,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;IAC/E,gBAAgB,GAAG,IAAA,+BAAuB,EAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;IAEpE,OAAO,gBAAgB,CAAC;AAC1B,CAAC,CAAC;AAnBW,QAAA,SAAS,aAmBpB"}
|
package/lib/bridge/utils.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import BigNumber from "bignumber.js";
|
|
2
|
-
import type { Account } from "@ledgerhq/types-live";
|
|
3
|
-
import type { Transaction } from "../types";
|
|
2
|
+
import type { Account, Operation } from "@ledgerhq/types-live";
|
|
3
|
+
import type { HederaOperationExtra, Transaction } from "../types";
|
|
4
4
|
export declare const estimatedFeeSafetyRate = 2;
|
|
5
5
|
export declare function getEstimatedFees(account: Account): Promise<BigNumber>;
|
|
6
6
|
export declare function calculateAmount({ account, transaction, }: {
|
|
@@ -11,4 +11,5 @@ export declare function calculateAmount({ account, transaction, }: {
|
|
|
11
11
|
totalSpent: BigNumber;
|
|
12
12
|
}>;
|
|
13
13
|
export declare function base64ToUrlSafeBase64(data: string): string;
|
|
14
|
+
export declare function patchOperationWithExtra(operation: Operation, extra: HederaOperationExtra): Operation;
|
|
14
15
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/bridge/utils.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/bridge/utils.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAI/D,OAAO,KAAK,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAElE,eAAO,MAAM,sBAAsB,IAAI,CAAC;AAExC,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAsB3E;AAED,wBAAsB,eAAe,CAAC,EACpC,OAAO,EACP,WAAW,GACZ,EAAE;IACD,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,WAAW,CAAC;CAC1B,GAAG,OAAO,CAAC;IACV,MAAM,EAAE,SAAS,CAAC;IAClB,UAAU,EAAE,SAAS,CAAC;CACvB,CAAC,CASD;AAGD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAM1D;AAED,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,oBAAoB,GAC1B,SAAS,CAOX"}
|
package/lib/bridge/utils.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.base64ToUrlSafeBase64 = exports.calculateAmount = exports.getEstimatedFees = exports.estimatedFeeSafetyRate = void 0;
|
|
6
|
+
exports.patchOperationWithExtra = exports.base64ToUrlSafeBase64 = exports.calculateAmount = exports.getEstimatedFees = exports.estimatedFeeSafetyRate = void 0;
|
|
7
7
|
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
8
8
|
const index_1 = __importDefault(require("@ledgerhq/live-countervalues/api/index"));
|
|
9
9
|
const cryptoassets_1 = require("@ledgerhq/cryptoassets");
|
|
@@ -50,4 +50,13 @@ function base64ToUrlSafeBase64(data) {
|
|
|
50
50
|
return data.replace(/\//g, "_").replace(/\+/g, "-");
|
|
51
51
|
}
|
|
52
52
|
exports.base64ToUrlSafeBase64 = base64ToUrlSafeBase64;
|
|
53
|
+
function patchOperationWithExtra(operation, extra) {
|
|
54
|
+
return {
|
|
55
|
+
...operation,
|
|
56
|
+
extra,
|
|
57
|
+
subOperations: (operation.subOperations ?? []).map(op => ({ ...op, extra })),
|
|
58
|
+
nftOperations: (operation.nftOperations ?? []).map(op => ({ ...op, extra })),
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
exports.patchOperationWithExtra = patchOperationWithExtra;
|
|
53
62
|
//# sourceMappingURL=utils.js.map
|
package/lib/bridge/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/bridge/utils.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AAErC,mFAA4D;AAC5D,yDAAiE;AACjE,iEAA8D;AAGjD,QAAA,sBAAsB,GAAG,CAAC,CAAC;AAEjC,KAAK,UAAU,gBAAgB,CAAC,OAAgB;IACrD,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,eAAM,CAAC,WAAW,CAAC;YACpC;gBACE,IAAI,EAAE,OAAO,CAAC,QAAQ;gBACtB,EAAE,EAAE,IAAA,sCAAuB,EAAC,KAAK,CAAC;gBAClC,SAAS,EAAE,IAAI,IAAI,EAAE;aACtB;SACF,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;YACZ,OAAO,IAAI,sBAAS,CAAC,KAAK,CAAC;iBACxB,SAAS,CAAC,IAAI,sBAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;iBACjC,YAAY,CAAC,sBAAS,CAAC,UAAU,CAAC;iBAClC,YAAY,CAAC,8BAAsB,CAAC,CAAC;QAC1C,CAAC;QACD,oCAAoC;IACtC,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;IAEV,sDAAsD;IACtD,oEAAoE;IACpE,OAAO,IAAI,sBAAS,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,8BAAsB,CAAC,CAAC,CAAC,gCAAgC;AACvG,CAAC;AAtBD,4CAsBC;AAEM,KAAK,UAAU,eAAe,CAAC,EACpC,OAAO,EACP,WAAW,GAIZ;IAIC,MAAM,MAAM,GAAG,WAAW,CAAC,YAAY;QACrC,CAAC,CAAC,MAAM,IAAA,2CAAoB,EAAC,EAAE,OAAO,EAAE,CAAC;QACzC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC;IAEvB,OAAO;QACL,MAAM;QACN,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,gBAAgB,CAAC,OAAO,CAAC,CAAC;KACzD,CAAC;AACJ,CAAC;AAlBD,0CAkBC;AAED,yGAAyG;AACzG,SAAgB,qBAAqB,CAAC,IAAY;IAChD,8EAA8E;IAC9E,uDAAuD;IACvD,qDAAqD;IAErD,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AACtD,CAAC;AAND,sDAMC"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/bridge/utils.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AAErC,mFAA4D;AAC5D,yDAAiE;AACjE,iEAA8D;AAGjD,QAAA,sBAAsB,GAAG,CAAC,CAAC;AAEjC,KAAK,UAAU,gBAAgB,CAAC,OAAgB;IACrD,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,eAAM,CAAC,WAAW,CAAC;YACpC;gBACE,IAAI,EAAE,OAAO,CAAC,QAAQ;gBACtB,EAAE,EAAE,IAAA,sCAAuB,EAAC,KAAK,CAAC;gBAClC,SAAS,EAAE,IAAI,IAAI,EAAE;aACtB;SACF,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;YACZ,OAAO,IAAI,sBAAS,CAAC,KAAK,CAAC;iBACxB,SAAS,CAAC,IAAI,sBAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;iBACjC,YAAY,CAAC,sBAAS,CAAC,UAAU,CAAC;iBAClC,YAAY,CAAC,8BAAsB,CAAC,CAAC;QAC1C,CAAC;QACD,oCAAoC;IACtC,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;IAEV,sDAAsD;IACtD,oEAAoE;IACpE,OAAO,IAAI,sBAAS,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,8BAAsB,CAAC,CAAC,CAAC,gCAAgC;AACvG,CAAC;AAtBD,4CAsBC;AAEM,KAAK,UAAU,eAAe,CAAC,EACpC,OAAO,EACP,WAAW,GAIZ;IAIC,MAAM,MAAM,GAAG,WAAW,CAAC,YAAY;QACrC,CAAC,CAAC,MAAM,IAAA,2CAAoB,EAAC,EAAE,OAAO,EAAE,CAAC;QACzC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC;IAEvB,OAAO;QACL,MAAM;QACN,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,gBAAgB,CAAC,OAAO,CAAC,CAAC;KACzD,CAAC;AACJ,CAAC;AAlBD,0CAkBC;AAED,yGAAyG;AACzG,SAAgB,qBAAqB,CAAC,IAAY;IAChD,8EAA8E;IAC9E,uDAAuD;IACvD,qDAAqD;IAErD,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AACtD,CAAC;AAND,sDAMC;AAED,SAAgB,uBAAuB,CACrC,SAAoB,EACpB,KAA2B;IAE3B,OAAO;QACL,GAAG,SAAS;QACZ,KAAK;QACL,aAAa,EAAE,CAAC,SAAS,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QAC5E,aAAa,EAAE,CAAC,SAAS,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;KAC7E,CAAC;AACJ,CAAC;AAVD,0DAUC"}
|
package/lib/logic.d.ts
ADDED
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { ExplorerView } from "@ledgerhq/types-cryptoassets";
|
|
2
|
+
import { Operation } from "@ledgerhq/types-live";
|
|
3
|
+
declare const getTransactionExplorer: (explorerView: ExplorerView | null | undefined, operation: Operation) => string | undefined;
|
|
4
|
+
export { getTransactionExplorer };
|
|
5
|
+
//# sourceMappingURL=logic.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logic.d.ts","sourceRoot":"","sources":["../src/logic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAIjD,QAAA,MAAM,sBAAsB,iBACZ,YAAY,GAAG,IAAI,GAAG,SAAS,aAClC,SAAS,KACnB,MAAM,GAAG,SAIX,CAAC;AAEF,OAAO,EAAE,sBAAsB,EAAE,CAAC"}
|
package/lib/logic.js
ADDED
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getTransactionExplorer = void 0;
|
|
4
|
+
const getTransactionExplorer = (explorerView, operation) => {
|
|
5
|
+
const extra = operation.extra;
|
|
6
|
+
return explorerView?.tx?.replace("$hash", extra.consensusTimestamp ?? extra.transactionId ?? "0");
|
|
7
|
+
};
|
|
8
|
+
exports.getTransactionExplorer = getTransactionExplorer;
|
|
9
|
+
//# sourceMappingURL=logic.js.map
|
package/lib/logic.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logic.js","sourceRoot":"","sources":["../src/logic.ts"],"names":[],"mappings":";;;AAKA,MAAM,sBAAsB,GAAG,CAC7B,YAA6C,EAC7C,SAAoB,EACA,EAAE;IACtB,MAAM,KAAK,GAAG,SAAS,CAAC,KAA6B,CAAC;IAEtD,OAAO,YAAY,EAAE,EAAE,EAAE,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,kBAAkB,IAAI,KAAK,CAAC,aAAa,IAAI,GAAG,CAAC,CAAC;AACpG,CAAC,CAAC;AAEO,wDAAsB"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logic.test.d.ts","sourceRoot":"","sources":["../src/logic.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const bignumber_js_1 = require("bignumber.js");
|
|
4
|
+
const cryptoassets_1 = require("@ledgerhq/cryptoassets");
|
|
5
|
+
const logic_1 = require("./logic");
|
|
6
|
+
describe("getTransactionExplorer", () => {
|
|
7
|
+
test("Tx explorer URL is converted from hash to consensus timestamp", async () => {
|
|
8
|
+
const explorerView = (0, cryptoassets_1.getCryptoCurrencyById)("hedera").explorerViews[0];
|
|
9
|
+
expect(explorerView).toBeDefined();
|
|
10
|
+
expect(explorerView.tx).toBeDefined();
|
|
11
|
+
const mockOperation = {
|
|
12
|
+
extra: {
|
|
13
|
+
consensusTimestamp: "1.2.3.4",
|
|
14
|
+
},
|
|
15
|
+
id: "",
|
|
16
|
+
hash: "",
|
|
17
|
+
type: "IN",
|
|
18
|
+
value: new bignumber_js_1.BigNumber(0),
|
|
19
|
+
fee: new bignumber_js_1.BigNumber(0),
|
|
20
|
+
senders: [],
|
|
21
|
+
recipients: [],
|
|
22
|
+
blockHeight: undefined,
|
|
23
|
+
blockHash: undefined,
|
|
24
|
+
accountId: "",
|
|
25
|
+
date: new Date(),
|
|
26
|
+
};
|
|
27
|
+
const newUrl = (0, logic_1.getTransactionExplorer)(explorerView, mockOperation);
|
|
28
|
+
expect(newUrl).toBe("https://hashscan.io/mainnet/transaction/1.2.3.4");
|
|
29
|
+
});
|
|
30
|
+
test("Tx explorer URL is based on transaction id if consensus timestamp is not available", async () => {
|
|
31
|
+
const explorerView = (0, cryptoassets_1.getCryptoCurrencyById)("hedera").explorerViews[0];
|
|
32
|
+
expect(explorerView).toBeDefined();
|
|
33
|
+
expect(explorerView.tx).toBeDefined();
|
|
34
|
+
const mockOperation = {
|
|
35
|
+
extra: {
|
|
36
|
+
transactionId: "0.0.1234567-123-123",
|
|
37
|
+
},
|
|
38
|
+
id: "",
|
|
39
|
+
hash: "",
|
|
40
|
+
type: "IN",
|
|
41
|
+
value: new bignumber_js_1.BigNumber(0),
|
|
42
|
+
fee: new bignumber_js_1.BigNumber(0),
|
|
43
|
+
senders: [],
|
|
44
|
+
recipients: [],
|
|
45
|
+
blockHeight: undefined,
|
|
46
|
+
blockHash: undefined,
|
|
47
|
+
accountId: "",
|
|
48
|
+
date: new Date(),
|
|
49
|
+
};
|
|
50
|
+
const newUrl = (0, logic_1.getTransactionExplorer)(explorerView, mockOperation);
|
|
51
|
+
expect(newUrl).toBe("https://hashscan.io/mainnet/transaction/0.0.1234567-123-123");
|
|
52
|
+
});
|
|
53
|
+
});
|
|
54
|
+
//# sourceMappingURL=logic.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logic.test.js","sourceRoot":"","sources":["../src/logic.test.ts"],"names":[],"mappings":";;AAAA,+CAAyC;AAEzC,yDAA+D;AAC/D,mCAAiD;AAEjD,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;IACtC,IAAI,CAAC,+DAA+D,EAAE,KAAK,IAAI,EAAE;QAC/E,MAAM,YAAY,GAAG,IAAA,oCAAqB,EAAC,QAAQ,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QACtE,MAAM,CAAC,YAAY,CAAC,CAAC,WAAW,EAAE,CAAC;QACnC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;QAEtC,MAAM,aAAa,GAAc;YAC/B,KAAK,EAAE;gBACL,kBAAkB,EAAE,SAAS;aAC9B;YACD,EAAE,EAAE,EAAE;YACN,IAAI,EAAE,EAAE;YACR,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,IAAI,wBAAS,CAAC,CAAC,CAAC;YACvB,GAAG,EAAE,IAAI,wBAAS,CAAC,CAAC,CAAC;YACrB,OAAO,EAAE,EAAE;YACX,UAAU,EAAE,EAAE;YACd,WAAW,EAAE,SAAS;YACtB,SAAS,EAAE,SAAS;YACpB,SAAS,EAAE,EAAE;YACb,IAAI,EAAE,IAAI,IAAI,EAAE;SACjB,CAAC;QAEF,MAAM,MAAM,GAAG,IAAA,8BAAsB,EAAC,YAAY,EAAE,aAAa,CAAC,CAAC;QACnE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,oFAAoF,EAAE,KAAK,IAAI,EAAE;QACpG,MAAM,YAAY,GAAG,IAAA,oCAAqB,EAAC,QAAQ,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QACtE,MAAM,CAAC,YAAY,CAAC,CAAC,WAAW,EAAE,CAAC;QACnC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;QAEtC,MAAM,aAAa,GAAc;YAC/B,KAAK,EAAE;gBACL,aAAa,EAAE,qBAAqB;aACrC;YACD,EAAE,EAAE,EAAE;YACN,IAAI,EAAE,EAAE;YACR,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,IAAI,wBAAS,CAAC,CAAC,CAAC;YACvB,GAAG,EAAE,IAAI,wBAAS,CAAC,CAAC,CAAC;YACrB,OAAO,EAAE,EAAE;YACX,UAAU,EAAE,EAAE;YACd,WAAW,EAAE,SAAS;YACtB,SAAS,EAAE,SAAS;YACpB,SAAS,EAAE,EAAE;YACb,IAAI,EAAE,IAAI,IAAI,EAAE;SACjB,CAAC;QAEF,MAAM,MAAM,GAAG,IAAA,8BAAsB,EAAC,YAAY,EAAE,aAAa,CAAC,CAAC;QACnE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,6DAA6D,CAAC,CAAC;IACrF,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/lib/types/bridge.d.ts
CHANGED
|
@@ -17,8 +17,6 @@ export type TransactionStatus = TransactionStatusCommon;
|
|
|
17
17
|
export type TransactionStatusRaw = TransactionStatusCommonRaw;
|
|
18
18
|
export type HederaOperationExtra = {
|
|
19
19
|
consensusTimestamp?: string;
|
|
20
|
-
|
|
21
|
-
export type HederaOperationExtraRaw = {
|
|
22
|
-
consensusTimestamp?: string;
|
|
20
|
+
transactionId?: string;
|
|
23
21
|
};
|
|
24
22
|
//# sourceMappingURL=bridge.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bridge.d.ts","sourceRoot":"","sources":["../../src/types/bridge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,oBAAoB,EACpB,uBAAuB,EACvB,0BAA0B,EAC3B,MAAM,sBAAsB,CAAC;AAE9B,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,QAAQ,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,QAAQ,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,iBAAiB,GAAG;IAC5C,MAAM,EAAE,QAAQ,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,oBAAoB,GAAG;IAClD,MAAM,EAAE,QAAQ,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,uBAAuB,CAAC;AAExD,MAAM,MAAM,oBAAoB,GAAG,0BAA0B,CAAC;AAE9D,MAAM,MAAM,oBAAoB,GAAG;IACjC,kBAAkB,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"bridge.d.ts","sourceRoot":"","sources":["../../src/types/bridge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,oBAAoB,EACpB,uBAAuB,EACvB,0BAA0B,EAC3B,MAAM,sBAAsB,CAAC;AAE9B,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,QAAQ,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,QAAQ,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,iBAAiB,GAAG;IAC5C,MAAM,EAAE,QAAQ,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,oBAAoB,GAAG;IAClD,MAAM,EAAE,QAAQ,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,uBAAuB,CAAC;AAExD,MAAM,MAAM,oBAAoB,GAAG,0BAA0B,CAAC;AAE9D,MAAM,MAAM,oBAAoB,GAAG;IACjC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC"}
|
package/lib-es/api/mirror.d.ts
CHANGED
|
@@ -15,6 +15,7 @@ interface HederaMirrorTransaction {
|
|
|
15
15
|
charged_tx_fee: string;
|
|
16
16
|
transaction_hash: string;
|
|
17
17
|
consensus_timestamp: string;
|
|
18
|
+
transaction_id: string;
|
|
18
19
|
}
|
|
19
20
|
export declare function getAccountTransactions(address: string, since: string | null): Promise<HederaMirrorTransaction[]>;
|
|
20
21
|
export declare function getOperationsForAccount(ledgerAccountId: string, address: string, latestOperationTimestamp: string | null): Promise<Operation[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mirror.d.ts","sourceRoot":"","sources":["../../src/api/mirror.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,OAAO,EAAE,SAAS,EAAiB,MAAM,sBAAsB,CAAC;AAChE,OAAO,SAAS,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"mirror.d.ts","sourceRoot":"","sources":["../../src/api/mirror.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,OAAO,EAAE,SAAS,EAAiB,MAAM,sBAAsB,CAAC;AAChE,OAAO,SAAS,MAAM,cAAc,CAAC;AAgBrC,UAAU,mBAAmB;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,SAAS,CAAC;CACpB;AAED,wBAAsB,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAqB/F;AAED,UAAU,oBAAoB;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,uBAAuB;IAC/B,SAAS,EAAE,oBAAoB,EAAE,CAAC;IAClC,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GAAG,IAAI,GACnB,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAuBpC;AAED,wBAAsB,uBAAuB,CAC3C,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,MAAM,EACf,wBAAwB,EAAE,MAAM,GAAG,IAAI,GACtC,OAAO,CAAC,SAAS,EAAE,CAAC,CA6EtB"}
|
package/lib-es/api/mirror.js
CHANGED
|
@@ -58,7 +58,7 @@ export async function getOperationsForAccount(ledgerAccountId, address, latestOp
|
|
|
58
58
|
const rawOperations = await getAccountTransactions(address, latestOperationTimestamp);
|
|
59
59
|
const operations = [];
|
|
60
60
|
for (const raw of rawOperations) {
|
|
61
|
-
const { consensus_timestamp } = raw;
|
|
61
|
+
const { consensus_timestamp, transaction_id } = raw;
|
|
62
62
|
const timestamp = new Date(parseInt(consensus_timestamp.split(".")[0], 10) * 1000);
|
|
63
63
|
const senders = [];
|
|
64
64
|
const recipients = [];
|
|
@@ -114,7 +114,10 @@ export async function getOperationsForAccount(ledgerAccountId, address, latestOp
|
|
|
114
114
|
// Set a value just so that it's considered confirmed according to isConfirmedOperation
|
|
115
115
|
blockHeight: 5,
|
|
116
116
|
blockHash: null,
|
|
117
|
-
extra: {
|
|
117
|
+
extra: {
|
|
118
|
+
consensusTimestamp: consensus_timestamp,
|
|
119
|
+
transactionId: transaction_id,
|
|
120
|
+
},
|
|
118
121
|
fee,
|
|
119
122
|
hash,
|
|
120
123
|
recipients,
|
package/lib-es/api/mirror.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mirror.js","sourceRoot":"","sources":["../../src/api/mirror.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,OAAO,MAAM,gCAAgC,CAAC;AAErD,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"mirror.js","sourceRoot":"","sources":["../../src/api/mirror.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"broadcast.d.ts","sourceRoot":"","sources":["../../src/bridge/broadcast.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"broadcast.d.ts","sourceRoot":"","sources":["../../src/bridge/broadcast.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAa,MAAM,sBAAsB,CAAC;AAGhE,OAAO,EAAwB,WAAW,EAAE,MAAM,UAAU,CAAC;AAG7D,eAAO,MAAM,SAAS,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,WAAW,CAmB7D,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Transaction as HederaSDKTransaction } from "@hashgraph/sdk";
|
|
2
2
|
import { patchOperationWithHash } from "@ledgerhq/coin-framework/operation";
|
|
3
|
-
import { base64ToUrlSafeBase64 } from "./utils";
|
|
3
|
+
import { base64ToUrlSafeBase64, patchOperationWithExtra } from "./utils";
|
|
4
4
|
import { broadcastTransaction } from "../api/network";
|
|
5
5
|
export const broadcast = async ({ signedOperation }) => {
|
|
6
6
|
const { signature, operation } = signedOperation;
|
|
@@ -9,6 +9,12 @@ export const broadcast = async ({ signedOperation }) => {
|
|
|
9
9
|
const response = await broadcastTransaction(hederaTransaction);
|
|
10
10
|
const base64Hash = Buffer.from(response.transactionHash).toString("base64");
|
|
11
11
|
const base64HashUrlSafe = base64ToUrlSafeBase64(base64Hash);
|
|
12
|
-
|
|
12
|
+
const extra = {
|
|
13
|
+
transactionId: response.transactionId.toString(),
|
|
14
|
+
};
|
|
15
|
+
let patchedOperation = operation;
|
|
16
|
+
patchedOperation = patchOperationWithHash(patchedOperation, base64HashUrlSafe);
|
|
17
|
+
patchedOperation = patchOperationWithExtra(patchedOperation, extra);
|
|
18
|
+
return patchedOperation;
|
|
13
19
|
};
|
|
14
20
|
//# sourceMappingURL=broadcast.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"broadcast.js","sourceRoot":"","sources":["../../src/bridge/broadcast.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,IAAI,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAErE,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"broadcast.js","sourceRoot":"","sources":["../../src/bridge/broadcast.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,IAAI,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAErE,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAEzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAEtD,MAAM,CAAC,MAAM,SAAS,GAA4C,KAAK,EAAE,EAAE,eAAe,EAAE,EAAE,EAAE;IAC9F,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,eAAe,CAAC;IAEjD,oFAAoF;IACpF,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;IAE3F,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CAAC,iBAAiB,CAAC,CAAC;IAE/D,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC5E,MAAM,iBAAiB,GAAG,qBAAqB,CAAC,UAAU,CAAC,CAAC;IAC5D,MAAM,KAAK,GAAyB;QAClC,aAAa,EAAE,QAAQ,CAAC,aAAa,CAAC,QAAQ,EAAE;KACjD,CAAC;IAEF,IAAI,gBAAgB,GAAc,SAAS,CAAC;IAC5C,gBAAgB,GAAG,sBAAsB,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;IAC/E,gBAAgB,GAAG,uBAAuB,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;IAEpE,OAAO,gBAAgB,CAAC;AAC1B,CAAC,CAAC"}
|
package/lib-es/bridge/utils.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import BigNumber from "bignumber.js";
|
|
2
|
-
import type { Account } from "@ledgerhq/types-live";
|
|
3
|
-
import type { Transaction } from "../types";
|
|
2
|
+
import type { Account, Operation } from "@ledgerhq/types-live";
|
|
3
|
+
import type { HederaOperationExtra, Transaction } from "../types";
|
|
4
4
|
export declare const estimatedFeeSafetyRate = 2;
|
|
5
5
|
export declare function getEstimatedFees(account: Account): Promise<BigNumber>;
|
|
6
6
|
export declare function calculateAmount({ account, transaction, }: {
|
|
@@ -11,4 +11,5 @@ export declare function calculateAmount({ account, transaction, }: {
|
|
|
11
11
|
totalSpent: BigNumber;
|
|
12
12
|
}>;
|
|
13
13
|
export declare function base64ToUrlSafeBase64(data: string): string;
|
|
14
|
+
export declare function patchOperationWithExtra(operation: Operation, extra: HederaOperationExtra): Operation;
|
|
14
15
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/bridge/utils.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/bridge/utils.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAI/D,OAAO,KAAK,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAElE,eAAO,MAAM,sBAAsB,IAAI,CAAC;AAExC,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAsB3E;AAED,wBAAsB,eAAe,CAAC,EACpC,OAAO,EACP,WAAW,GACZ,EAAE;IACD,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,WAAW,CAAC;CAC1B,GAAG,OAAO,CAAC;IACV,MAAM,EAAE,SAAS,CAAC;IAClB,UAAU,EAAE,SAAS,CAAC;CACvB,CAAC,CASD;AAGD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAM1D;AAED,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,oBAAoB,GAC1B,SAAS,CAOX"}
|
package/lib-es/bridge/utils.js
CHANGED
|
@@ -41,4 +41,12 @@ export function base64ToUrlSafeBase64(data) {
|
|
|
41
41
|
// Buffer.from(data, "base64").toString("base64url");
|
|
42
42
|
return data.replace(/\//g, "_").replace(/\+/g, "-");
|
|
43
43
|
}
|
|
44
|
+
export function patchOperationWithExtra(operation, extra) {
|
|
45
|
+
return {
|
|
46
|
+
...operation,
|
|
47
|
+
extra,
|
|
48
|
+
subOperations: (operation.subOperations ?? []).map(op => ({ ...op, extra })),
|
|
49
|
+
nftOperations: (operation.nftOperations ?? []).map(op => ({ ...op, extra })),
|
|
50
|
+
};
|
|
51
|
+
}
|
|
44
52
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/bridge/utils.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,MAAM,MAAM,wCAAwC,CAAC;AAC5D,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAG9D,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC;AAExC,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,OAAgB;IACrD,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC;YACpC;gBACE,IAAI,EAAE,OAAO,CAAC,QAAQ;gBACtB,EAAE,EAAE,uBAAuB,CAAC,KAAK,CAAC;gBAClC,SAAS,EAAE,IAAI,IAAI,EAAE;aACtB;SACF,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;YACZ,OAAO,IAAI,SAAS,CAAC,KAAK,CAAC;iBACxB,SAAS,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;iBACjC,YAAY,CAAC,SAAS,CAAC,UAAU,CAAC;iBAClC,YAAY,CAAC,sBAAsB,CAAC,CAAC;QAC1C,CAAC;QACD,oCAAoC;IACtC,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;IAEV,sDAAsD;IACtD,oEAAoE;IACpE,OAAO,IAAI,SAAS,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,sBAAsB,CAAC,CAAC,CAAC,gCAAgC;AACvG,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,EACpC,OAAO,EACP,WAAW,GAIZ;IAIC,MAAM,MAAM,GAAG,WAAW,CAAC,YAAY;QACrC,CAAC,CAAC,MAAM,oBAAoB,CAAC,EAAE,OAAO,EAAE,CAAC;QACzC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC;IAEvB,OAAO;QACL,MAAM;QACN,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,gBAAgB,CAAC,OAAO,CAAC,CAAC;KACzD,CAAC;AACJ,CAAC;AAED,yGAAyG;AACzG,MAAM,UAAU,qBAAqB,CAAC,IAAY;IAChD,8EAA8E;IAC9E,uDAAuD;IACvD,qDAAqD;IAErD,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AACtD,CAAC"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/bridge/utils.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,MAAM,MAAM,wCAAwC,CAAC;AAC5D,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAG9D,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC;AAExC,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,OAAgB;IACrD,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC;YACpC;gBACE,IAAI,EAAE,OAAO,CAAC,QAAQ;gBACtB,EAAE,EAAE,uBAAuB,CAAC,KAAK,CAAC;gBAClC,SAAS,EAAE,IAAI,IAAI,EAAE;aACtB;SACF,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;YACZ,OAAO,IAAI,SAAS,CAAC,KAAK,CAAC;iBACxB,SAAS,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;iBACjC,YAAY,CAAC,SAAS,CAAC,UAAU,CAAC;iBAClC,YAAY,CAAC,sBAAsB,CAAC,CAAC;QAC1C,CAAC;QACD,oCAAoC;IACtC,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;IAEV,sDAAsD;IACtD,oEAAoE;IACpE,OAAO,IAAI,SAAS,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,sBAAsB,CAAC,CAAC,CAAC,gCAAgC;AACvG,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,EACpC,OAAO,EACP,WAAW,GAIZ;IAIC,MAAM,MAAM,GAAG,WAAW,CAAC,YAAY;QACrC,CAAC,CAAC,MAAM,oBAAoB,CAAC,EAAE,OAAO,EAAE,CAAC;QACzC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC;IAEvB,OAAO;QACL,MAAM;QACN,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,gBAAgB,CAAC,OAAO,CAAC,CAAC;KACzD,CAAC;AACJ,CAAC;AAED,yGAAyG;AACzG,MAAM,UAAU,qBAAqB,CAAC,IAAY;IAChD,8EAA8E;IAC9E,uDAAuD;IACvD,qDAAqD;IAErD,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AACtD,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,SAAoB,EACpB,KAA2B;IAE3B,OAAO;QACL,GAAG,SAAS;QACZ,KAAK;QACL,aAAa,EAAE,CAAC,SAAS,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QAC5E,aAAa,EAAE,CAAC,SAAS,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;KAC7E,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { ExplorerView } from "@ledgerhq/types-cryptoassets";
|
|
2
|
+
import { Operation } from "@ledgerhq/types-live";
|
|
3
|
+
declare const getTransactionExplorer: (explorerView: ExplorerView | null | undefined, operation: Operation) => string | undefined;
|
|
4
|
+
export { getTransactionExplorer };
|
|
5
|
+
//# sourceMappingURL=logic.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logic.d.ts","sourceRoot":"","sources":["../src/logic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAIjD,QAAA,MAAM,sBAAsB,iBACZ,YAAY,GAAG,IAAI,GAAG,SAAS,aAClC,SAAS,KACnB,MAAM,GAAG,SAIX,CAAC;AAEF,OAAO,EAAE,sBAAsB,EAAE,CAAC"}
|
package/lib-es/logic.js
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
const getTransactionExplorer = (explorerView, operation) => {
|
|
2
|
+
const extra = operation.extra;
|
|
3
|
+
return explorerView?.tx?.replace("$hash", extra.consensusTimestamp ?? extra.transactionId ?? "0");
|
|
4
|
+
};
|
|
5
|
+
export { getTransactionExplorer };
|
|
6
|
+
//# sourceMappingURL=logic.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logic.js","sourceRoot":"","sources":["../src/logic.ts"],"names":[],"mappings":"AAKA,MAAM,sBAAsB,GAAG,CAC7B,YAA6C,EAC7C,SAAoB,EACA,EAAE;IACtB,MAAM,KAAK,GAAG,SAAS,CAAC,KAA6B,CAAC;IAEtD,OAAO,YAAY,EAAE,EAAE,EAAE,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,kBAAkB,IAAI,KAAK,CAAC,aAAa,IAAI,GAAG,CAAC,CAAC;AACpG,CAAC,CAAC;AAEF,OAAO,EAAE,sBAAsB,EAAE,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logic.test.d.ts","sourceRoot":"","sources":["../src/logic.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
import { BigNumber } from "bignumber.js";
|
|
2
|
+
import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets";
|
|
3
|
+
import { getTransactionExplorer } from "./logic";
|
|
4
|
+
describe("getTransactionExplorer", () => {
|
|
5
|
+
test("Tx explorer URL is converted from hash to consensus timestamp", async () => {
|
|
6
|
+
const explorerView = getCryptoCurrencyById("hedera").explorerViews[0];
|
|
7
|
+
expect(explorerView).toBeDefined();
|
|
8
|
+
expect(explorerView.tx).toBeDefined();
|
|
9
|
+
const mockOperation = {
|
|
10
|
+
extra: {
|
|
11
|
+
consensusTimestamp: "1.2.3.4",
|
|
12
|
+
},
|
|
13
|
+
id: "",
|
|
14
|
+
hash: "",
|
|
15
|
+
type: "IN",
|
|
16
|
+
value: new BigNumber(0),
|
|
17
|
+
fee: new BigNumber(0),
|
|
18
|
+
senders: [],
|
|
19
|
+
recipients: [],
|
|
20
|
+
blockHeight: undefined,
|
|
21
|
+
blockHash: undefined,
|
|
22
|
+
accountId: "",
|
|
23
|
+
date: new Date(),
|
|
24
|
+
};
|
|
25
|
+
const newUrl = getTransactionExplorer(explorerView, mockOperation);
|
|
26
|
+
expect(newUrl).toBe("https://hashscan.io/mainnet/transaction/1.2.3.4");
|
|
27
|
+
});
|
|
28
|
+
test("Tx explorer URL is based on transaction id if consensus timestamp is not available", async () => {
|
|
29
|
+
const explorerView = getCryptoCurrencyById("hedera").explorerViews[0];
|
|
30
|
+
expect(explorerView).toBeDefined();
|
|
31
|
+
expect(explorerView.tx).toBeDefined();
|
|
32
|
+
const mockOperation = {
|
|
33
|
+
extra: {
|
|
34
|
+
transactionId: "0.0.1234567-123-123",
|
|
35
|
+
},
|
|
36
|
+
id: "",
|
|
37
|
+
hash: "",
|
|
38
|
+
type: "IN",
|
|
39
|
+
value: new BigNumber(0),
|
|
40
|
+
fee: new BigNumber(0),
|
|
41
|
+
senders: [],
|
|
42
|
+
recipients: [],
|
|
43
|
+
blockHeight: undefined,
|
|
44
|
+
blockHash: undefined,
|
|
45
|
+
accountId: "",
|
|
46
|
+
date: new Date(),
|
|
47
|
+
};
|
|
48
|
+
const newUrl = getTransactionExplorer(explorerView, mockOperation);
|
|
49
|
+
expect(newUrl).toBe("https://hashscan.io/mainnet/transaction/0.0.1234567-123-123");
|
|
50
|
+
});
|
|
51
|
+
});
|
|
52
|
+
//# sourceMappingURL=logic.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logic.test.js","sourceRoot":"","sources":["../src/logic.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAEjD,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;IACtC,IAAI,CAAC,+DAA+D,EAAE,KAAK,IAAI,EAAE;QAC/E,MAAM,YAAY,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QACtE,MAAM,CAAC,YAAY,CAAC,CAAC,WAAW,EAAE,CAAC;QACnC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;QAEtC,MAAM,aAAa,GAAc;YAC/B,KAAK,EAAE;gBACL,kBAAkB,EAAE,SAAS;aAC9B;YACD,EAAE,EAAE,EAAE;YACN,IAAI,EAAE,EAAE;YACR,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,IAAI,SAAS,CAAC,CAAC,CAAC;YACvB,GAAG,EAAE,IAAI,SAAS,CAAC,CAAC,CAAC;YACrB,OAAO,EAAE,EAAE;YACX,UAAU,EAAE,EAAE;YACd,WAAW,EAAE,SAAS;YACtB,SAAS,EAAE,SAAS;YACpB,SAAS,EAAE,EAAE;YACb,IAAI,EAAE,IAAI,IAAI,EAAE;SACjB,CAAC;QAEF,MAAM,MAAM,GAAG,sBAAsB,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;QACnE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,oFAAoF,EAAE,KAAK,IAAI,EAAE;QACpG,MAAM,YAAY,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QACtE,MAAM,CAAC,YAAY,CAAC,CAAC,WAAW,EAAE,CAAC;QACnC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;QAEtC,MAAM,aAAa,GAAc;YAC/B,KAAK,EAAE;gBACL,aAAa,EAAE,qBAAqB;aACrC;YACD,EAAE,EAAE,EAAE;YACN,IAAI,EAAE,EAAE;YACR,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,IAAI,SAAS,CAAC,CAAC,CAAC;YACvB,GAAG,EAAE,IAAI,SAAS,CAAC,CAAC,CAAC;YACrB,OAAO,EAAE,EAAE;YACX,UAAU,EAAE,EAAE;YACd,WAAW,EAAE,SAAS;YACtB,SAAS,EAAE,SAAS;YACpB,SAAS,EAAE,EAAE;YACb,IAAI,EAAE,IAAI,IAAI,EAAE;SACjB,CAAC;QAEF,MAAM,MAAM,GAAG,sBAAsB,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;QACnE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,6DAA6D,CAAC,CAAC;IACrF,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/lib-es/types/bridge.d.ts
CHANGED
|
@@ -17,8 +17,6 @@ export type TransactionStatus = TransactionStatusCommon;
|
|
|
17
17
|
export type TransactionStatusRaw = TransactionStatusCommonRaw;
|
|
18
18
|
export type HederaOperationExtra = {
|
|
19
19
|
consensusTimestamp?: string;
|
|
20
|
-
|
|
21
|
-
export type HederaOperationExtraRaw = {
|
|
22
|
-
consensusTimestamp?: string;
|
|
20
|
+
transactionId?: string;
|
|
23
21
|
};
|
|
24
22
|
//# sourceMappingURL=bridge.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bridge.d.ts","sourceRoot":"","sources":["../../src/types/bridge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,oBAAoB,EACpB,uBAAuB,EACvB,0BAA0B,EAC3B,MAAM,sBAAsB,CAAC;AAE9B,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,QAAQ,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,QAAQ,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,iBAAiB,GAAG;IAC5C,MAAM,EAAE,QAAQ,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,oBAAoB,GAAG;IAClD,MAAM,EAAE,QAAQ,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,uBAAuB,CAAC;AAExD,MAAM,MAAM,oBAAoB,GAAG,0BAA0B,CAAC;AAE9D,MAAM,MAAM,oBAAoB,GAAG;IACjC,kBAAkB,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"bridge.d.ts","sourceRoot":"","sources":["../../src/types/bridge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,oBAAoB,EACpB,uBAAuB,EACvB,0BAA0B,EAC3B,MAAM,sBAAsB,CAAC;AAE9B,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,QAAQ,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,QAAQ,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,iBAAiB,GAAG;IAC5C,MAAM,EAAE,QAAQ,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,oBAAoB,GAAG;IAClD,MAAM,EAAE,QAAQ,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,uBAAuB,CAAC;AAExD,MAAM,MAAM,oBAAoB,GAAG,0BAA0B,CAAC;AAE9D,MAAM,MAAM,oBAAoB,GAAG;IACjC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ledgerhq/coin-hedera",
|
|
3
|
-
"version": "1.6.7-nightly.
|
|
3
|
+
"version": "1.6.7-nightly.2",
|
|
4
4
|
"description": "Ledger Hedera Coin integration",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"Ledger",
|
|
@@ -81,14 +81,14 @@
|
|
|
81
81
|
"invariant": "^2.2.2",
|
|
82
82
|
"lodash": "^4.17.21",
|
|
83
83
|
"rxjs": "^7.8.1",
|
|
84
|
-
"@ledgerhq/coin-framework": "^5.0.
|
|
84
|
+
"@ledgerhq/coin-framework": "^5.0.3-nightly.0",
|
|
85
85
|
"@ledgerhq/cryptoassets": "^13.17.0",
|
|
86
86
|
"@ledgerhq/devices": "8.4.5-nightly.2",
|
|
87
87
|
"@ledgerhq/errors": "^6.21.0-nightly.0",
|
|
88
|
-
"@ledgerhq/live-countervalues": "^0.5.
|
|
88
|
+
"@ledgerhq/live-countervalues": "^0.5.7-nightly.0",
|
|
89
89
|
"@ledgerhq/live-env": "^2.9.0-nightly.0",
|
|
90
90
|
"@ledgerhq/live-network": "^2.0.8-nightly.1",
|
|
91
|
-
"@ledgerhq/types-live": "^6.71.0-nightly.
|
|
91
|
+
"@ledgerhq/types-live": "^6.71.0-nightly.2"
|
|
92
92
|
},
|
|
93
93
|
"devDependencies": {
|
|
94
94
|
"@types/invariant": "^2.2.2",
|
|
@@ -97,7 +97,8 @@
|
|
|
97
97
|
"jest": "^29.7.0",
|
|
98
98
|
"jest-sonar": "0.2.16",
|
|
99
99
|
"ts-jest": "^29.1.1",
|
|
100
|
-
"@ledgerhq/disable-network-setup": "^0.0.0"
|
|
100
|
+
"@ledgerhq/disable-network-setup": "^0.0.0",
|
|
101
|
+
"@ledgerhq/types-cryptoassets": "^7.23.0"
|
|
101
102
|
},
|
|
102
103
|
"scripts": {
|
|
103
104
|
"clean": "rimraf lib lib-es",
|
package/src/api/mirror.ts
CHANGED
|
@@ -6,6 +6,7 @@ import { getEnv } from "@ledgerhq/live-env";
|
|
|
6
6
|
import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
|
|
7
7
|
import { getAccountBalance } from "./network";
|
|
8
8
|
import { base64ToUrlSafeBase64 } from "../bridge/utils";
|
|
9
|
+
import { HederaOperationExtra } from "../types";
|
|
9
10
|
|
|
10
11
|
const getMirrorApiUrl = (): string => getEnv("API_HEDERA_MIRROR");
|
|
11
12
|
|
|
@@ -54,6 +55,7 @@ interface HederaMirrorTransaction {
|
|
|
54
55
|
charged_tx_fee: string;
|
|
55
56
|
transaction_hash: string;
|
|
56
57
|
consensus_timestamp: string;
|
|
58
|
+
transaction_id: string;
|
|
57
59
|
}
|
|
58
60
|
|
|
59
61
|
export async function getAccountTransactions(
|
|
@@ -93,7 +95,7 @@ export async function getOperationsForAccount(
|
|
|
93
95
|
const operations: Operation[] = [];
|
|
94
96
|
|
|
95
97
|
for (const raw of rawOperations) {
|
|
96
|
-
const { consensus_timestamp } = raw;
|
|
98
|
+
const { consensus_timestamp, transaction_id } = raw;
|
|
97
99
|
const timestamp = new Date(parseInt(consensus_timestamp.split(".")[0], 10) * 1000);
|
|
98
100
|
const senders: string[] = [];
|
|
99
101
|
const recipients: string[] = [];
|
|
@@ -150,7 +152,10 @@ export async function getOperationsForAccount(
|
|
|
150
152
|
// Set a value just so that it's considered confirmed according to isConfirmedOperation
|
|
151
153
|
blockHeight: 5,
|
|
152
154
|
blockHash: null,
|
|
153
|
-
extra: {
|
|
155
|
+
extra: {
|
|
156
|
+
consensusTimestamp: consensus_timestamp,
|
|
157
|
+
transactionId: transaction_id,
|
|
158
|
+
} satisfies HederaOperationExtra,
|
|
154
159
|
fee,
|
|
155
160
|
hash,
|
|
156
161
|
recipients,
|
package/src/bridge/broadcast.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { Transaction as HederaSDKTransaction } from "@hashgraph/sdk";
|
|
2
|
-
import { AccountBridge } from "@ledgerhq/types-live";
|
|
2
|
+
import { AccountBridge, Operation } from "@ledgerhq/types-live";
|
|
3
3
|
import { patchOperationWithHash } from "@ledgerhq/coin-framework/operation";
|
|
4
|
-
import { base64ToUrlSafeBase64 } from "./utils";
|
|
5
|
-
import { Transaction } from "../types";
|
|
4
|
+
import { base64ToUrlSafeBase64, patchOperationWithExtra } from "./utils";
|
|
5
|
+
import { HederaOperationExtra, Transaction } from "../types";
|
|
6
6
|
import { broadcastTransaction } from "../api/network";
|
|
7
7
|
|
|
8
8
|
export const broadcast: AccountBridge<Transaction>["broadcast"] = async ({ signedOperation }) => {
|
|
@@ -15,6 +15,13 @@ export const broadcast: AccountBridge<Transaction>["broadcast"] = async ({ signe
|
|
|
15
15
|
|
|
16
16
|
const base64Hash = Buffer.from(response.transactionHash).toString("base64");
|
|
17
17
|
const base64HashUrlSafe = base64ToUrlSafeBase64(base64Hash);
|
|
18
|
+
const extra: HederaOperationExtra = {
|
|
19
|
+
transactionId: response.transactionId.toString(),
|
|
20
|
+
};
|
|
18
21
|
|
|
19
|
-
|
|
22
|
+
let patchedOperation: Operation = operation;
|
|
23
|
+
patchedOperation = patchOperationWithHash(patchedOperation, base64HashUrlSafe);
|
|
24
|
+
patchedOperation = patchOperationWithExtra(patchedOperation, extra);
|
|
25
|
+
|
|
26
|
+
return patchedOperation;
|
|
20
27
|
};
|
package/src/bridge/utils.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import BigNumber from "bignumber.js";
|
|
2
|
-
import type { Account } from "@ledgerhq/types-live";
|
|
2
|
+
import type { Account, Operation } from "@ledgerhq/types-live";
|
|
3
3
|
import cvsApi from "@ledgerhq/live-countervalues/api/index";
|
|
4
4
|
import { getFiatCurrencyByTicker } from "@ledgerhq/cryptoassets";
|
|
5
5
|
import { estimateMaxSpendable } from "./estimateMaxSpendable";
|
|
6
|
-
import type { Transaction } from "../types";
|
|
6
|
+
import type { HederaOperationExtra, Transaction } from "../types";
|
|
7
7
|
|
|
8
8
|
export const estimatedFeeSafetyRate = 2;
|
|
9
9
|
|
|
@@ -59,3 +59,15 @@ export function base64ToUrlSafeBase64(data: string): string {
|
|
|
59
59
|
|
|
60
60
|
return data.replace(/\//g, "_").replace(/\+/g, "-");
|
|
61
61
|
}
|
|
62
|
+
|
|
63
|
+
export function patchOperationWithExtra(
|
|
64
|
+
operation: Operation,
|
|
65
|
+
extra: HederaOperationExtra,
|
|
66
|
+
): Operation {
|
|
67
|
+
return {
|
|
68
|
+
...operation,
|
|
69
|
+
extra,
|
|
70
|
+
subOperations: (operation.subOperations ?? []).map(op => ({ ...op, extra })),
|
|
71
|
+
nftOperations: (operation.nftOperations ?? []).map(op => ({ ...op, extra })),
|
|
72
|
+
};
|
|
73
|
+
}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
import { BigNumber } from "bignumber.js";
|
|
2
|
+
import { Operation } from "@ledgerhq/types-live";
|
|
3
|
+
import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets";
|
|
4
|
+
import { getTransactionExplorer } from "./logic";
|
|
5
|
+
|
|
6
|
+
describe("getTransactionExplorer", () => {
|
|
7
|
+
test("Tx explorer URL is converted from hash to consensus timestamp", async () => {
|
|
8
|
+
const explorerView = getCryptoCurrencyById("hedera").explorerViews[0];
|
|
9
|
+
expect(explorerView).toBeDefined();
|
|
10
|
+
expect(explorerView.tx).toBeDefined();
|
|
11
|
+
|
|
12
|
+
const mockOperation: Operation = {
|
|
13
|
+
extra: {
|
|
14
|
+
consensusTimestamp: "1.2.3.4",
|
|
15
|
+
},
|
|
16
|
+
id: "",
|
|
17
|
+
hash: "",
|
|
18
|
+
type: "IN",
|
|
19
|
+
value: new BigNumber(0),
|
|
20
|
+
fee: new BigNumber(0),
|
|
21
|
+
senders: [],
|
|
22
|
+
recipients: [],
|
|
23
|
+
blockHeight: undefined,
|
|
24
|
+
blockHash: undefined,
|
|
25
|
+
accountId: "",
|
|
26
|
+
date: new Date(),
|
|
27
|
+
};
|
|
28
|
+
|
|
29
|
+
const newUrl = getTransactionExplorer(explorerView, mockOperation);
|
|
30
|
+
expect(newUrl).toBe("https://hashscan.io/mainnet/transaction/1.2.3.4");
|
|
31
|
+
});
|
|
32
|
+
|
|
33
|
+
test("Tx explorer URL is based on transaction id if consensus timestamp is not available", async () => {
|
|
34
|
+
const explorerView = getCryptoCurrencyById("hedera").explorerViews[0];
|
|
35
|
+
expect(explorerView).toBeDefined();
|
|
36
|
+
expect(explorerView.tx).toBeDefined();
|
|
37
|
+
|
|
38
|
+
const mockOperation: Operation = {
|
|
39
|
+
extra: {
|
|
40
|
+
transactionId: "0.0.1234567-123-123",
|
|
41
|
+
},
|
|
42
|
+
id: "",
|
|
43
|
+
hash: "",
|
|
44
|
+
type: "IN",
|
|
45
|
+
value: new BigNumber(0),
|
|
46
|
+
fee: new BigNumber(0),
|
|
47
|
+
senders: [],
|
|
48
|
+
recipients: [],
|
|
49
|
+
blockHeight: undefined,
|
|
50
|
+
blockHash: undefined,
|
|
51
|
+
accountId: "",
|
|
52
|
+
date: new Date(),
|
|
53
|
+
};
|
|
54
|
+
|
|
55
|
+
const newUrl = getTransactionExplorer(explorerView, mockOperation);
|
|
56
|
+
expect(newUrl).toBe("https://hashscan.io/mainnet/transaction/0.0.1234567-123-123");
|
|
57
|
+
});
|
|
58
|
+
});
|
package/src/logic.ts
ADDED
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { ExplorerView } from "@ledgerhq/types-cryptoassets";
|
|
2
|
+
import { Operation } from "@ledgerhq/types-live";
|
|
3
|
+
|
|
4
|
+
import { HederaOperationExtra } from "./types";
|
|
5
|
+
|
|
6
|
+
const getTransactionExplorer = (
|
|
7
|
+
explorerView: ExplorerView | null | undefined,
|
|
8
|
+
operation: Operation,
|
|
9
|
+
): string | undefined => {
|
|
10
|
+
const extra = operation.extra as HederaOperationExtra;
|
|
11
|
+
|
|
12
|
+
return explorerView?.tx?.replace("$hash", extra.consensusTimestamp ?? extra.transactionId ?? "0");
|
|
13
|
+
};
|
|
14
|
+
|
|
15
|
+
export { getTransactionExplorer };
|
package/src/types/bridge.ts
CHANGED