@ledgerhq/live-common 34.54.0-nightly.20251204135727 → 34.54.0-nightly.20251205023918
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/bridge/generic-alpaca/broadcast.d.ts.map +1 -1
- package/lib/bridge/generic-alpaca/broadcast.js +3 -3
- package/lib/bridge/generic-alpaca/broadcast.js.map +1 -1
- package/lib/bridge/generic-alpaca/currencyBridge.d.ts.map +1 -1
- package/lib/bridge/generic-alpaca/currencyBridge.js +1 -3
- package/lib/bridge/generic-alpaca/currencyBridge.js.map +1 -1
- package/lib/bridge/generic-alpaca/estimateMaxSpendable.d.ts.map +1 -1
- package/lib/bridge/generic-alpaca/estimateMaxSpendable.js +2 -1
- package/lib/bridge/generic-alpaca/estimateMaxSpendable.js.map +1 -1
- package/lib/bridge/generic-alpaca/getAccountShape.d.ts.map +1 -1
- package/lib/bridge/generic-alpaca/getAccountShape.js +16 -7
- package/lib/bridge/generic-alpaca/getAccountShape.js.map +1 -1
- package/lib/bridge/generic-alpaca/getTransactionStatus.d.ts.map +1 -1
- package/lib/bridge/generic-alpaca/getTransactionStatus.js +16 -1
- package/lib/bridge/generic-alpaca/getTransactionStatus.js.map +1 -1
- package/lib/bridge/generic-alpaca/prepareTransaction.d.ts.map +1 -1
- package/lib/bridge/generic-alpaca/prepareTransaction.js +38 -4
- package/lib/bridge/generic-alpaca/prepareTransaction.js.map +1 -1
- package/lib/bridge/generic-alpaca/signOperation.d.ts.map +1 -1
- package/lib/bridge/generic-alpaca/signOperation.js +18 -2
- package/lib/bridge/generic-alpaca/signOperation.js.map +1 -1
- package/lib/bridge/generic-alpaca/signer/Eth.d.ts +2 -0
- package/lib/bridge/generic-alpaca/signer/Eth.d.ts.map +1 -1
- package/lib/bridge/generic-alpaca/signer/Eth.js +8 -1
- package/lib/bridge/generic-alpaca/signer/Eth.js.map +1 -1
- package/lib/bridge/generic-alpaca/signer/index.d.ts.map +1 -1
- package/lib/bridge/generic-alpaca/signer/index.js +7 -0
- package/lib/bridge/generic-alpaca/signer/index.js.map +1 -1
- package/lib/bridge/generic-alpaca/types.d.ts +4 -0
- package/lib/bridge/generic-alpaca/types.d.ts.map +1 -1
- package/lib/bridge/generic-alpaca/utils.d.ts.map +1 -1
- package/lib/bridge/generic-alpaca/utils.js +11 -3
- package/lib/bridge/generic-alpaca/utils.js.map +1 -1
- package/lib/bridge/impl.d.ts.map +1 -1
- package/lib/bridge/impl.js +14 -3
- package/lib/bridge/impl.js.map +1 -1
- package/lib/families/canton/config.d.ts.map +1 -1
- package/lib/families/canton/config.js +4 -4
- package/lib/families/canton/config.js.map +1 -1
- package/lib/families/celo/setup.d.ts.map +1 -1
- package/lib/families/celo/setup.js +11 -0
- package/lib/families/celo/setup.js.map +1 -1
- package/lib/families/evm/bridge/mock.d.ts +1 -0
- package/lib/families/evm/bridge/mock.d.ts.map +1 -1
- package/lib/families/evm/bridge/mock.js +12 -0
- package/lib/families/evm/bridge/mock.js.map +1 -1
- package/lib/families/evm/setup.d.ts +1 -4
- package/lib/families/evm/setup.d.ts.map +1 -1
- package/lib/families/evm/setup.js +1 -8
- package/lib/families/evm/setup.js.map +1 -1
- package/lib/families/evm/walletApiAdapter.d.ts +7 -0
- package/lib/families/evm/walletApiAdapter.d.ts.map +1 -1
- package/lib/families/evm/walletApiAdapter.js +36 -2
- package/lib/families/evm/walletApiAdapter.js.map +1 -1
- package/lib/families/stacks/constants.d.ts +1 -1
- package/lib/families/stacks/constants.d.ts.map +1 -1
- package/lib/families/stacks/constants.js +1 -1
- package/lib/families/stacks/constants.js.map +1 -1
- package/lib/generated/bridge/js.d.ts +0 -1
- package/lib/generated/bridge/js.d.ts.map +1 -1
- package/lib/generated/bridge/js.js +30 -32
- package/lib/generated/bridge/js.js.map +1 -1
- package/lib/generated/bridge/mock.d.ts +1 -0
- package/lib/generated/bridge/mock.d.ts.map +1 -1
- package/lib/operation.d.ts.map +1 -1
- package/lib/operation.js +7 -2
- package/lib/operation.js.map +1 -1
- package/lib/wallet-api/constants.d.ts +1 -1
- package/lib-es/bridge/generic-alpaca/broadcast.d.ts.map +1 -1
- package/lib-es/bridge/generic-alpaca/broadcast.js +3 -3
- package/lib-es/bridge/generic-alpaca/broadcast.js.map +1 -1
- package/lib-es/bridge/generic-alpaca/currencyBridge.d.ts.map +1 -1
- package/lib-es/bridge/generic-alpaca/currencyBridge.js +1 -3
- package/lib-es/bridge/generic-alpaca/currencyBridge.js.map +1 -1
- package/lib-es/bridge/generic-alpaca/estimateMaxSpendable.d.ts.map +1 -1
- package/lib-es/bridge/generic-alpaca/estimateMaxSpendable.js +2 -1
- package/lib-es/bridge/generic-alpaca/estimateMaxSpendable.js.map +1 -1
- package/lib-es/bridge/generic-alpaca/getAccountShape.d.ts.map +1 -1
- package/lib-es/bridge/generic-alpaca/getAccountShape.js +16 -7
- package/lib-es/bridge/generic-alpaca/getAccountShape.js.map +1 -1
- package/lib-es/bridge/generic-alpaca/getTransactionStatus.d.ts.map +1 -1
- package/lib-es/bridge/generic-alpaca/getTransactionStatus.js +16 -1
- package/lib-es/bridge/generic-alpaca/getTransactionStatus.js.map +1 -1
- package/lib-es/bridge/generic-alpaca/prepareTransaction.d.ts.map +1 -1
- package/lib-es/bridge/generic-alpaca/prepareTransaction.js +38 -4
- package/lib-es/bridge/generic-alpaca/prepareTransaction.js.map +1 -1
- package/lib-es/bridge/generic-alpaca/signOperation.d.ts.map +1 -1
- package/lib-es/bridge/generic-alpaca/signOperation.js +18 -2
- package/lib-es/bridge/generic-alpaca/signOperation.js.map +1 -1
- package/lib-es/bridge/generic-alpaca/signer/Eth.d.ts +2 -0
- package/lib-es/bridge/generic-alpaca/signer/Eth.d.ts.map +1 -1
- package/lib-es/bridge/generic-alpaca/signer/Eth.js +4 -0
- package/lib-es/bridge/generic-alpaca/signer/Eth.js.map +1 -1
- package/lib-es/bridge/generic-alpaca/signer/index.d.ts.map +1 -1
- package/lib-es/bridge/generic-alpaca/signer/index.js +7 -0
- package/lib-es/bridge/generic-alpaca/signer/index.js.map +1 -1
- package/lib-es/bridge/generic-alpaca/types.d.ts +4 -0
- package/lib-es/bridge/generic-alpaca/types.d.ts.map +1 -1
- package/lib-es/bridge/generic-alpaca/utils.d.ts.map +1 -1
- package/lib-es/bridge/generic-alpaca/utils.js +11 -3
- package/lib-es/bridge/generic-alpaca/utils.js.map +1 -1
- package/lib-es/bridge/impl.d.ts.map +1 -1
- package/lib-es/bridge/impl.js +14 -3
- package/lib-es/bridge/impl.js.map +1 -1
- package/lib-es/families/canton/config.d.ts.map +1 -1
- package/lib-es/families/canton/config.js +4 -4
- package/lib-es/families/canton/config.js.map +1 -1
- package/lib-es/families/celo/setup.d.ts.map +1 -1
- package/lib-es/families/celo/setup.js +11 -0
- package/lib-es/families/celo/setup.js.map +1 -1
- package/lib-es/families/evm/bridge/mock.d.ts +1 -0
- package/lib-es/families/evm/bridge/mock.d.ts.map +1 -1
- package/lib-es/families/evm/bridge/mock.js +12 -0
- package/lib-es/families/evm/bridge/mock.js.map +1 -1
- package/lib-es/families/evm/setup.d.ts +1 -4
- package/lib-es/families/evm/setup.d.ts.map +1 -1
- package/lib-es/families/evm/setup.js +2 -8
- package/lib-es/families/evm/setup.js.map +1 -1
- package/lib-es/families/evm/walletApiAdapter.d.ts +7 -0
- package/lib-es/families/evm/walletApiAdapter.d.ts.map +1 -1
- package/lib-es/families/evm/walletApiAdapter.js +30 -1
- package/lib-es/families/evm/walletApiAdapter.js.map +1 -1
- package/lib-es/families/stacks/constants.d.ts +1 -1
- package/lib-es/families/stacks/constants.d.ts.map +1 -1
- package/lib-es/families/stacks/constants.js +1 -1
- package/lib-es/families/stacks/constants.js.map +1 -1
- package/lib-es/generated/bridge/js.d.ts +0 -1
- package/lib-es/generated/bridge/js.d.ts.map +1 -1
- package/lib-es/generated/bridge/js.js +0 -2
- package/lib-es/generated/bridge/js.js.map +1 -1
- package/lib-es/generated/bridge/mock.d.ts +1 -0
- package/lib-es/generated/bridge/mock.d.ts.map +1 -1
- package/lib-es/operation.d.ts.map +1 -1
- package/lib-es/operation.js +7 -2
- package/lib-es/operation.js.map +1 -1
- package/lib-es/wallet-api/constants.d.ts +1 -1
- package/package.json +56 -56
- package/src/bridge/generic-alpaca/broadcast.ts +6 -3
- package/src/bridge/generic-alpaca/currencyBridge.ts +1 -3
- package/src/bridge/generic-alpaca/estimateMaxSpendable.ts +2 -1
- package/src/bridge/generic-alpaca/getAccountShape.ts +24 -12
- package/src/bridge/generic-alpaca/getTransactionStatus.ts +16 -1
- package/src/bridge/generic-alpaca/prepareTransaction.ts +44 -10
- package/src/bridge/generic-alpaca/signOperation.ts +18 -2
- package/src/bridge/generic-alpaca/signer/Eth.ts +5 -1
- package/src/bridge/generic-alpaca/signer/index.ts +7 -0
- package/src/bridge/generic-alpaca/tests/getAccountShape.test.ts +2 -2
- package/src/bridge/generic-alpaca/tests/prepareTransaction.test.ts +32 -0
- package/src/bridge/generic-alpaca/types.ts +4 -0
- package/src/bridge/generic-alpaca/utils.test.ts +1 -0
- package/src/bridge/generic-alpaca/utils.ts +14 -3
- package/src/bridge/impl.ts +16 -3
- package/src/families/canton/config.ts +5 -4
- package/src/families/celo/setup.ts +12 -0
- package/src/families/evm/bridge/mock.ts +14 -0
- package/src/families/evm/setup.ts +3 -22
- package/src/families/evm/walletApiAdapter.ts +33 -1
- package/src/families/stacks/__snapshots__/bridge.integration.test.ts.snap +1537 -18
- package/src/families/stacks/__tests__/sync.integration.test.ts +2 -2
- package/src/families/stacks/constants.ts +1 -1
- package/src/families/stellar/__snapshots__/bridge.integration.test.ts.snap +9 -9
- package/src/generated/bridge/js.ts +0 -2
- package/src/operation.ts +10 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"broadcast.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/broadcast.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAIxE,eAAO,MAAM,gBAAgB,EAAE,CAAC,OAAO,KAAA,EAAE,IAAI,KAAA,KAAK,aAAa,CAAC,iBAAiB,CAAC,CAAC,WAAW,
|
|
1
|
+
{"version":3,"file":"broadcast.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/broadcast.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAIxE,eAAO,MAAM,gBAAgB,EAAE,CAAC,OAAO,KAAA,EAAE,IAAI,KAAA,KAAK,aAAa,CAAC,iBAAiB,CAAC,CAAC,WAAW,CAS3F,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { patchOperationWithHash } from "
|
|
1
|
+
import { patchOperationWithHash } from "@ledgerhq/coin-framework/operation";
|
|
2
2
|
import { getAlpacaApi } from "./alpaca";
|
|
3
|
-
export const genericBroadcast = (network, kind) => async ({ signedOperation: { signature, operation }, account }) => {
|
|
4
|
-
const hash = await getAlpacaApi(account.currency.id, kind).broadcast(signature);
|
|
3
|
+
export const genericBroadcast = (network, kind) => async ({ signedOperation: { signature, operation }, account, broadcastConfig }) => {
|
|
4
|
+
const hash = await getAlpacaApi(account.currency.id, kind).broadcast(signature, broadcastConfig);
|
|
5
5
|
return patchOperationWithHash(operation, hash);
|
|
6
6
|
};
|
|
7
7
|
//# sourceMappingURL=broadcast.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"broadcast.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/broadcast.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"broadcast.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/broadcast.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC,MAAM,CAAC,MAAM,gBAAgB,GAC3B,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CAClB,KAAK,EAAE,EAAE,eAAe,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,EAAE,EAAE;IAChF,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,SAAS,CAClE,SAAS,EACT,eAAe,CAChB,CAAC;IAEF,OAAO,sBAAsB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;AACjD,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"currencyBridge.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/currencyBridge.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAGnD,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,YAAY,CAAC,EAAE,YAAY,GAC1B,cAAc,
|
|
1
|
+
{"version":3,"file":"currencyBridge.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/currencyBridge.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAGnD,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,YAAY,CAAC,EAAE,YAAY,GAC1B,cAAc,CAWhB"}
|
|
@@ -6,9 +6,7 @@ export function getAlpacaCurrencyBridge(network, kind, customSigner) {
|
|
|
6
6
|
const signer = customSigner ?? getSigner(network);
|
|
7
7
|
return {
|
|
8
8
|
preload: () => Promise.resolve({}),
|
|
9
|
-
hydrate: () =>
|
|
10
|
-
return;
|
|
11
|
-
},
|
|
9
|
+
hydrate: () => undefined,
|
|
12
10
|
scanAccounts: makeScanAccounts({
|
|
13
11
|
getAccountShape: genericGetAccountShape(network, kind),
|
|
14
12
|
getAddressFn: signer.getAddress.bind(signer),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"currencyBridge.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/currencyBridge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAE7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,MAAM,UAAU,uBAAuB,CACrC,OAAe,EACf,IAAY,EACZ,YAA2B;IAE3B,MAAM,MAAM,GAAG,YAAY,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC;IAClD,OAAO;QACL,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,OAAO,EAAE,GAAG,EAAE
|
|
1
|
+
{"version":3,"file":"currencyBridge.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/currencyBridge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAE7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,MAAM,UAAU,uBAAuB,CACrC,OAAe,EACf,IAAY,EACZ,YAA2B;IAE3B,MAAM,MAAM,GAAG,YAAY,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC;IAClD,OAAO;QACL,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS;QACxB,YAAY,EAAE,gBAAgB,CAAC;YAC7B,eAAe,EAAE,sBAAsB,CAAC,OAAO,EAAE,IAAI,CAAC;YACtD,YAAY,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC;YAC5C,QAAQ;SACT,CAAC;KACH,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"estimateMaxSpendable.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/estimateMaxSpendable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAOrD,wBAAgB,2BAA2B,CACzC,OAAO,KAAA,EACP,IAAI,KAAA,GACH,aAAa,CAAC,GAAG,CAAC,CAAC,sBAAsB,CAAC,
|
|
1
|
+
{"version":3,"file":"estimateMaxSpendable.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/estimateMaxSpendable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAOrD,wBAAgB,2BAA2B,CACzC,OAAO,KAAA,EACP,IAAI,KAAA,GACH,aAAa,CAAC,GAAG,CAAC,CAAC,sBAAsB,CAAC,CAiC5C"}
|
|
@@ -20,8 +20,9 @@ export function genericEstimateMaxSpendable(network, kind) {
|
|
|
20
20
|
if (transaction?.fees === null || transaction?.fees === undefined) {
|
|
21
21
|
fees = (await alpacaApi.estimateFees(transactionToIntent(mainAccount, draftTransaction, alpacaApi.computeIntentType))).value;
|
|
22
22
|
}
|
|
23
|
+
// TODO Remove the call to `validateIntent` https://ledgerhq.atlassian.net/browse/LIVE-22229
|
|
23
24
|
const { amount } = await alpacaApi.validateIntent(transactionToIntent(account, { ...draftTransaction }, alpacaApi.computeIntentType), { value: transaction?.fees ? BigInt(transaction.fees.toString()) : 0n });
|
|
24
|
-
if (["stellar", "tezos"].includes(network)) {
|
|
25
|
+
if (["stellar", "tezos", "evm"].includes(network)) {
|
|
25
26
|
return amount > 0 ? new BigNumber(amount.toString()) : new BigNumber(0);
|
|
26
27
|
}
|
|
27
28
|
const bnFee = BigNumber(fees.toString());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"estimateMaxSpendable.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/estimateMaxSpendable.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,MAAM,UAAU,2BAA2B,CACzC,OAAO,EACP,IAAI;IAEJ,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,EAAE,EAAE;QACvD,IAAI,OAAO,CAAC,IAAI,KAAK,cAAc,EAAE;YACnC,OAAO,OAAO,CAAC,gBAAgB,CAAC;SACjC;QACD,MAAM,WAAW,GAAG,cAAc,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAC3D,MAAM,SAAS,GAAG,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC9D,MAAM,gBAAgB,GAAG;YACvB,GAAG,iBAAiB,CAAC,OAAO,CAAC;YAC7B,GAAG,WAAW;YACd,MAAM,EAAE,WAAW,CAAC,gBAAgB;YACpC,YAAY,EAAE,IAAI;SACnB,CAAC;QAEF,IAAI,IAAI,GAAG,WAAW,EAAE,IAAI,CAAC;QAC7B,IAAI,WAAW,EAAE,IAAI,KAAK,IAAI,IAAI,WAAW,EAAE,IAAI,KAAK,SAAS,EAAE;YACjE,IAAI,GAAG,CACL,MAAM,SAAS,CAAC,YAAY,CAC1B,mBAAmB,CAAC,WAAW,EAAE,gBAAgB,EAAE,SAAS,CAAC,iBAAiB,CAAC,CAChF,CACF,CAAC,KAAK,CAAC;SACT;QACD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,SAAS,CAAC,cAAc,CAC/C,mBAAmB,CAAC,OAAO,EAAE,EAAE,GAAG,gBAAgB,EAAE,EAAE,SAAS,CAAC,iBAAiB,CAAC,EAClF,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CACxE,CAAC;QACF,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"estimateMaxSpendable.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/estimateMaxSpendable.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,MAAM,UAAU,2BAA2B,CACzC,OAAO,EACP,IAAI;IAEJ,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,EAAE,EAAE;QACvD,IAAI,OAAO,CAAC,IAAI,KAAK,cAAc,EAAE;YACnC,OAAO,OAAO,CAAC,gBAAgB,CAAC;SACjC;QACD,MAAM,WAAW,GAAG,cAAc,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAC3D,MAAM,SAAS,GAAG,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC9D,MAAM,gBAAgB,GAAG;YACvB,GAAG,iBAAiB,CAAC,OAAO,CAAC;YAC7B,GAAG,WAAW;YACd,MAAM,EAAE,WAAW,CAAC,gBAAgB;YACpC,YAAY,EAAE,IAAI;SACnB,CAAC;QAEF,IAAI,IAAI,GAAG,WAAW,EAAE,IAAI,CAAC;QAC7B,IAAI,WAAW,EAAE,IAAI,KAAK,IAAI,IAAI,WAAW,EAAE,IAAI,KAAK,SAAS,EAAE;YACjE,IAAI,GAAG,CACL,MAAM,SAAS,CAAC,YAAY,CAC1B,mBAAmB,CAAC,WAAW,EAAE,gBAAgB,EAAE,SAAS,CAAC,iBAAiB,CAAC,CAChF,CACF,CAAC,KAAK,CAAC;SACT;QACD,4FAA4F;QAC5F,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,SAAS,CAAC,cAAc,CAC/C,mBAAmB,CAAC,OAAO,EAAE,EAAE,GAAG,gBAAgB,EAAE,EAAE,SAAS,CAAC,iBAAiB,CAAC,EAClF,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CACxE,CAAC;QACF,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YACjD,OAAO,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;SACzE;QACD,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACzC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IACjE,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAccountShape.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/getAccountShape.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAY,MAAM,2CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"getAccountShape.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/getAccountShape.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAY,MAAM,2CAA2C,CAAC;AAsBtF,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,eAAe,CA0GrF"}
|
|
@@ -10,6 +10,9 @@ function isNftCoreOp(operation) {
|
|
|
10
10
|
return (typeof operation.details?.ledgerOpType === "string" &&
|
|
11
11
|
["NFT_IN", "NFT_OUT"].includes(operation.details?.ledgerOpType));
|
|
12
12
|
}
|
|
13
|
+
function isInternalLiveOp(operation) {
|
|
14
|
+
return !!operation.extra?.internal;
|
|
15
|
+
}
|
|
13
16
|
export function genericGetAccountShape(network, kind) {
|
|
14
17
|
return async (info, syncConfig) => {
|
|
15
18
|
const { address, initialAccount, currency, derivationMode } = info;
|
|
@@ -42,7 +45,7 @@ export function genericGetAccountShape(network, kind) {
|
|
|
42
45
|
const syncFromScratch = !initialAccount?.blockHeight || initialAccount?.syncHash !== syncHash;
|
|
43
46
|
// Calculate minHeight for pagination
|
|
44
47
|
const minHeight = syncFromScratch ? 0 : (oldOps[0]?.blockHeight ?? 0) + 1;
|
|
45
|
-
const paginationParams = { minHeight, order: "
|
|
48
|
+
const paginationParams = { minHeight, order: "desc" };
|
|
46
49
|
if (lastPagingToken && !syncFromScratch) {
|
|
47
50
|
paginationParams.lastPagingToken = lastPagingToken;
|
|
48
51
|
}
|
|
@@ -53,6 +56,7 @@ export function genericGetAccountShape(network, kind) {
|
|
|
53
56
|
const newAssetOperations = newOps.filter(operation => operation?.extra?.assetReference &&
|
|
54
57
|
operation?.extra?.assetOwner &&
|
|
55
58
|
!["OPT_IN", "OPT_OUT"].includes(operation.type));
|
|
59
|
+
const newInternalOperations = newOps.filter(isInternalLiveOp);
|
|
56
60
|
const newSubAccounts = await buildSubAccounts({
|
|
57
61
|
accountId,
|
|
58
62
|
allTokenAssetsBalances,
|
|
@@ -63,20 +67,25 @@ export function genericGetAccountShape(network, kind) {
|
|
|
63
67
|
const subAccounts = syncFromScratch
|
|
64
68
|
? newSubAccounts
|
|
65
69
|
: mergeSubAccounts(initialAccount?.subAccounts ?? [], newSubAccounts);
|
|
66
|
-
const newOpsWithSubs = newOps
|
|
70
|
+
const newOpsWithSubs = newOps
|
|
71
|
+
.filter(operation => !isInternalLiveOp(operation))
|
|
72
|
+
.map(op => {
|
|
67
73
|
const subOperations = inferSubOperations(op.hash, newSubAccounts);
|
|
74
|
+
const internalOperations = newInternalOperations.filter(it => it.hash === op.hash);
|
|
68
75
|
return cleanedOperation({
|
|
69
76
|
...op,
|
|
70
77
|
subOperations,
|
|
78
|
+
internalOperations,
|
|
71
79
|
});
|
|
72
80
|
});
|
|
73
|
-
|
|
74
|
-
|
|
81
|
+
// Try to refresh known pending operations (if not already updated)
|
|
82
|
+
// Useful for integrations without explorers
|
|
83
|
+
const operationsToRefresh = initialAccount?.pendingOperations.filter(pendingOp => !newOpsWithSubs.some(newOp => pendingOp.hash === newOp.hash));
|
|
84
|
+
const confirmedOperations = alpacaApi.refreshOperations && operationsToRefresh?.length
|
|
85
|
+
? await alpacaApi.refreshOperations(operationsToRefresh)
|
|
75
86
|
: [];
|
|
76
87
|
const newOperations = [...confirmedOperations, ...newOpsWithSubs];
|
|
77
|
-
const operations = syncFromScratch
|
|
78
|
-
? newOperations
|
|
79
|
-
: mergeOps(oldOps, newOperations);
|
|
88
|
+
const operations = mergeOps(syncFromScratch ? [] : oldOps, newOperations);
|
|
80
89
|
const res = {
|
|
81
90
|
id: accountId,
|
|
82
91
|
xpub: address,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAccountShape.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/getAccountShape.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"getAccountShape.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/getAccountShape.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTransactionStatus.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/getTransactionStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAQrD,wBAAgB,2BAA2B,CACzC,OAAO,KAAA,EACP,IAAI,KAAA,GACH,aAAa,CAAC,GAAG,CAAC,CAAC,sBAAsB,CAAC,
|
|
1
|
+
{"version":3,"file":"getTransactionStatus.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/getTransactionStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAQrD,wBAAgB,2BAA2B,CACzC,OAAO,KAAA,EACP,IAAI,KAAA,GACH,aAAa,CAAC,GAAG,CAAC,CAAC,sBAAsB,CAAC,CA6D5C"}
|
|
@@ -20,6 +20,7 @@ export function genericGetTransactionStatus(network, kind) {
|
|
|
20
20
|
feesStrategy: transaction.feesStrategy,
|
|
21
21
|
data: transaction.data,
|
|
22
22
|
type: transaction.type,
|
|
23
|
+
sponsored: transaction.sponsored,
|
|
23
24
|
};
|
|
24
25
|
if (alpacaApi.getChainSpecificRules) {
|
|
25
26
|
const chainSpecificValidation = alpacaApi.getChainSpecificRules();
|
|
@@ -29,7 +30,21 @@ export function genericGetTransactionStatus(network, kind) {
|
|
|
29
30
|
}
|
|
30
31
|
}
|
|
31
32
|
}
|
|
32
|
-
const
|
|
33
|
+
const fees = BigInt(transaction.fees?.toString() || "0");
|
|
34
|
+
const feesParameters = {
|
|
35
|
+
...(transaction.gasLimit ? { gasLimit: BigInt(transaction.gasLimit.toFixed()) } : {}),
|
|
36
|
+
...(transaction.gasPrice ? { gasPrice: BigInt(transaction.gasPrice.toFixed()) } : {}),
|
|
37
|
+
...(transaction.maxFeePerGas
|
|
38
|
+
? { maxFeePerGas: BigInt(transaction.maxFeePerGas.toFixed()) }
|
|
39
|
+
: {}),
|
|
40
|
+
...(transaction.maxPriorityFeePerGas
|
|
41
|
+
? { maxPriorityFeePerGas: BigInt(transaction.maxPriorityFeePerGas.toFixed()) }
|
|
42
|
+
: {}),
|
|
43
|
+
...(transaction.additionalFees
|
|
44
|
+
? { additionalFees: BigInt(transaction.additionalFees.toFixed()) }
|
|
45
|
+
: {}),
|
|
46
|
+
};
|
|
47
|
+
const { errors, warnings, estimatedFees, amount, totalSpent, totalFees } = await alpacaApi.validateIntent(transactionToIntent(account, draftTransaction, alpacaApi.computeIntentType), { value: fees, parameters: feesParameters });
|
|
33
48
|
return {
|
|
34
49
|
errors,
|
|
35
50
|
warnings,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTransactionStatus.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/getTransactionStatus.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oCAAoC,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAG9C,2BAA2B;AAC3B,MAAM,UAAU,2BAA2B,CACzC,OAAO,EACP,IAAI;IAEJ,OAAO,KAAK,EAAE,OAAO,EAAE,WAA+B,EAAE,EAAE;QACxD,MAAM,SAAS,GAAG,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC1D,MAAM,gBAAgB,GAAG;YACvB,IAAI,EAAE,WAAW,EAAE,IAAI,IAAI,MAAM;YACjC,SAAS,EAAE,WAAW,CAAC,SAAS;YAChC,MAAM,EAAE,WAAW,CAAC,MAAM,IAAI,IAAI,SAAS,CAAC,CAAC,CAAC;YAC9C,YAAY,EAAE,CAAC,CAAC,WAAW,CAAC,YAAY;YACxC,cAAc,EAAE,WAAW,CAAC,cAAc,IAAI,EAAE;YAChD,UAAU,EAAE,WAAW,CAAC,UAAU,IAAI,EAAE;YACxC,YAAY,EAAE,WAAW,CAAC,YAAY,IAAI,EAAE;YAC5C,QAAQ,EAAE,WAAW,CAAC,QAAQ,IAAI,EAAE;YACpC,SAAS,EAAE,WAAW,CAAC,SAAS,IAAI,EAAE;YACtC,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,YAAY,EAAE,WAAW,CAAC,YAAY;YACtC,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,IAAI,EAAE,WAAW,CAAC,IAAI;
|
|
1
|
+
{"version":3,"file":"getTransactionStatus.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/getTransactionStatus.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareTransaction.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/prepareTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAI9D,OAAO,EAAE,SAAS,EAAiB,MAAM,oCAAoC,CAAC;AAE9E,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"prepareTransaction.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/prepareTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAI9D,OAAO,EAAE,SAAS,EAAiB,MAAM,oCAAoC,CAAC;AAE9E,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAsC7C,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,MAAM,EACf,IAAI,KAAA,GACH,aAAa,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC,oBAAoB,CAAC,CA0FlE;AAED,wBAAsB,aAAa,CACjC,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,MAAM,EACb,iBAAiB,EAAE,CAAC,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,KAAK,SAAS,GACpE,OAAO,CAAC;IACT,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC,CAcD"}
|
|
@@ -20,6 +20,11 @@ function propagateField(estimation, field, dest) {
|
|
|
20
20
|
dest[field] = Number(value.toString());
|
|
21
21
|
return;
|
|
22
22
|
case "storageLimit":
|
|
23
|
+
case "gasLimit":
|
|
24
|
+
case "gasPrice":
|
|
25
|
+
case "maxFeePerGas":
|
|
26
|
+
case "maxPriorityFeePerGas":
|
|
27
|
+
case "additionalFees":
|
|
23
28
|
dest[field] = new BigNumber(value.toString());
|
|
24
29
|
return;
|
|
25
30
|
default:
|
|
@@ -33,11 +38,31 @@ export function genericPrepareTransaction(network, kind) {
|
|
|
33
38
|
? await getAssetInfos(transaction, account.freshAddress, getAssetFromToken)
|
|
34
39
|
: assetInfosFallback(transaction);
|
|
35
40
|
const customParametersFees = transaction.customFees?.parameters?.fees;
|
|
41
|
+
/**
|
|
42
|
+
* Ticking `useAllAmount` constantly resets the amount to 0. This is problematic
|
|
43
|
+
* because some Blockchain need the actual transaction amount to compute the fees
|
|
44
|
+
* (Example with EVM and ERC20 transactions)
|
|
45
|
+
* In case of `useAllAmount` and token transaction, we read the token account spendable
|
|
46
|
+
* balance instead.
|
|
47
|
+
*/
|
|
48
|
+
let amount = transaction.amount;
|
|
49
|
+
if (transaction.useAllAmount && transaction.subAccountId) {
|
|
50
|
+
const subAccount = account.subAccounts?.find(acc => acc.id === transaction.subAccountId);
|
|
51
|
+
amount = subAccount?.spendableBalance ?? amount;
|
|
52
|
+
}
|
|
53
|
+
// Pass any parameters that help estimating fees
|
|
54
|
+
const intent = transactionToIntent(account, {
|
|
55
|
+
...transaction,
|
|
56
|
+
amount,
|
|
57
|
+
}, computeIntentType);
|
|
36
58
|
const estimation = customParametersFees
|
|
37
59
|
? { value: BigInt(customParametersFees.toFixed()) }
|
|
38
|
-
: await estimateFees(
|
|
39
|
-
|
|
40
|
-
|
|
60
|
+
: await estimateFees(intent, {
|
|
61
|
+
gasPrice: transaction.gasPrice,
|
|
62
|
+
maxFeePerGas: transaction.maxFeePerGas,
|
|
63
|
+
maxPriorityFeePerGas: transaction.maxPriorityFeePerGas,
|
|
64
|
+
gasOptions: transaction.gasOptions,
|
|
65
|
+
});
|
|
41
66
|
const fees = new BigNumber(estimation.value.toString());
|
|
42
67
|
if (!bnEq(transaction.fees, fees)) {
|
|
43
68
|
const next = {
|
|
@@ -52,12 +77,21 @@ export function genericPrepareTransaction(network, kind) {
|
|
|
52
77
|
},
|
|
53
78
|
};
|
|
54
79
|
// Propagate needed fields
|
|
55
|
-
const fieldsToPropagate = [
|
|
80
|
+
const fieldsToPropagate = [
|
|
81
|
+
"type",
|
|
82
|
+
"storageLimit",
|
|
83
|
+
"gasLimit",
|
|
84
|
+
"gasPrice",
|
|
85
|
+
"maxFeePerGas",
|
|
86
|
+
"maxPriorityFeePerGas",
|
|
87
|
+
"additionalFees",
|
|
88
|
+
];
|
|
56
89
|
for (const field of fieldsToPropagate) {
|
|
57
90
|
propagateField(estimation, field, next);
|
|
58
91
|
}
|
|
59
92
|
// align with stellar/xrp: when send max (or staking intents), reflect validated amount in UI
|
|
60
93
|
if (transaction.useAllAmount || ["stake", "unstake"].includes(transaction.mode ?? "")) {
|
|
94
|
+
// TODO Remove the call to `validateIntent` https://ledgerhq.atlassian.net/browse/LIVE-22228
|
|
61
95
|
const { amount } = await validateIntent(transactionToIntent(account, {
|
|
62
96
|
...transaction,
|
|
63
97
|
}, computeIntentType));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/prepareTransaction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AAI9E,SAAS,IAAI,CAAC,CAA+B,EAAE,CAA+B;IAC5E,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACtD,CAAC;AAED,SAAS,kBAAkB,CAAC,WAA+B;IAIzD,OAAO;QACL,cAAc,EAAE,WAAW,CAAC,cAAc,IAAI,EAAE;QAChD,UAAU,EAAE,WAAW,CAAC,UAAU,IAAI,EAAE;KACzC,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,UAAyB,EAAE,KAAa,EAAE,IAAwB;IACxF,MAAM,KAAK,GAAG,UAAU,EAAE,UAAU,EAAE,CAAC,KAAK,CAAC,CAAC;IAE9C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO;IAEhG,QAAQ,KAAK,EAAE;QACb,KAAK,MAAM;YACT,IAAI,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;YACvC,OAAO;QACT,KAAK,cAAc;
|
|
1
|
+
{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/prepareTransaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signOperation.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/signOperation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,KAAK,EAAyC,aAAa,EAAE,MAAM,sBAAsB,CAAC;AASjG,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAyD7C;;GAEG;AACH,eAAO,MAAM,oBAAoB,+CAEf,cAAc,GAAG,CAAC,KAAG,cAAc,kBAAkB,CAAC,CAAC,eAAe,
|
|
1
|
+
{"version":3,"file":"signOperation.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/signOperation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,KAAK,EAAyC,aAAa,EAAE,MAAM,sBAAsB,CAAC;AASjG,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAyD7C;;GAEG;AACH,eAAO,MAAM,oBAAoB,+CAEf,cAAc,GAAG,CAAC,KAAG,cAAc,kBAAkB,CAAC,CAAC,eAAe,CAmHlF,CAAC"}
|
|
@@ -52,6 +52,19 @@ export const genericSignOperation = (network, kind) => (signerContext) => ({ acc
|
|
|
52
52
|
if (!transaction.fees)
|
|
53
53
|
throw new FeeNotLoaded();
|
|
54
54
|
const fees = BigInt(transaction.fees?.toString() || "0");
|
|
55
|
+
const feesParameters = {
|
|
56
|
+
...(transaction.gasLimit ? { gasLimit: BigInt(transaction.gasLimit.toFixed()) } : {}),
|
|
57
|
+
...(transaction.gasPrice ? { gasPrice: BigInt(transaction.gasPrice.toFixed()) } : {}),
|
|
58
|
+
...(transaction.maxFeePerGas
|
|
59
|
+
? { maxFeePerGas: BigInt(transaction.maxFeePerGas.toFixed()) }
|
|
60
|
+
: {}),
|
|
61
|
+
...(transaction.maxPriorityFeePerGas
|
|
62
|
+
? { maxPriorityFeePerGas: BigInt(transaction.maxPriorityFeePerGas.toFixed()) }
|
|
63
|
+
: {}),
|
|
64
|
+
...(transaction.additionalFees
|
|
65
|
+
? { additionalFees: BigInt(transaction.additionalFees.toFixed()) }
|
|
66
|
+
: {}),
|
|
67
|
+
};
|
|
55
68
|
if (transaction.useAllAmount) {
|
|
56
69
|
const draftTransaction = {
|
|
57
70
|
mode: transaction.mode,
|
|
@@ -64,8 +77,10 @@ export const genericSignOperation = (network, kind) => (signerContext) => ({ acc
|
|
|
64
77
|
family: transaction.family,
|
|
65
78
|
feesStrategy: transaction.feesStrategy,
|
|
66
79
|
data: transaction.data,
|
|
80
|
+
type: transaction.type,
|
|
67
81
|
};
|
|
68
|
-
|
|
82
|
+
// TODO Remove the call to `validateIntent` https://ledgerhq.atlassian.net/browse/LIVE-22227
|
|
83
|
+
const { amount } = await alpacaApi.validateIntent(transactionToIntent(account, draftTransaction, alpacaApi.computeIntentType), { value: fees, parameters: feesParameters });
|
|
69
84
|
transaction.amount = new BigNumber(amount.toString());
|
|
70
85
|
}
|
|
71
86
|
const signedInfo = await signerContext(deviceId, async (signer) => {
|
|
@@ -75,7 +90,7 @@ export const genericSignOperation = (network, kind) => (signerContext) => ({ acc
|
|
|
75
90
|
transactionIntent.senderPublicKey = publicKey;
|
|
76
91
|
// Enrich with memo and asset information
|
|
77
92
|
transactionIntent = enrichTransactionIntent(transactionIntent, transaction, publicKey);
|
|
78
|
-
if (typeof transactionIntent.sequence !== "bigint") {
|
|
93
|
+
if (typeof transactionIntent.sequence !== "bigint" || transactionIntent.sequence < 0n) {
|
|
79
94
|
// TODO: should compute it and pass it down to craftTransaction (duplicate call right now)
|
|
80
95
|
const sequenceNumber = await alpacaApi.getSequence(transactionIntent.sender);
|
|
81
96
|
transactionIntent.sequence = sequenceNumber;
|
|
@@ -83,6 +98,7 @@ export const genericSignOperation = (network, kind) => (signerContext) => ({ acc
|
|
|
83
98
|
/* Craft unsigned blob via Alpaca */
|
|
84
99
|
const { transaction: unsigned } = await alpacaApi.craftTransaction(transactionIntent, {
|
|
85
100
|
value: fees,
|
|
101
|
+
parameters: feesParameters,
|
|
86
102
|
});
|
|
87
103
|
/* Notify UI that the device is now showing the tx */
|
|
88
104
|
o.next({ type: "device-signature-requested" });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signOperation.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/signOperation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAGlC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAIhD,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,SAAS,MAAM,cAAc,CAAC;AAGrC;;;GAGG;AACH,SAAS,iBAAiB,CACxB,iBAAyC,EACzC,WAA+B;IAE/B,oDAAoD;IACpD,IAAI,WAAW,CAAC,GAAG,EAAE;QACnB,MAAM,aAAa,GAAG,iBAA+D,CAAC;QACtF,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAEvC,aAAa,CAAC,IAAI,GAAG;YACnB,IAAI,EAAE,KAAK;YACX,KAAK,EAAE,IAAI,GAAG,EAAE;SACjB,CAAC;QACF,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;QAEvD,OAAO,aAAa,CAAC;KACtB;IAED,4BAA4B;IAC5B,IAAI,WAAW,CAAC,QAAQ,IAAI,WAAW,CAAC,SAAS,EAAE;QACjD,MAAM,UAAU,GAAG,iBAAmD,CAAC;QACvE,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAChD,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAElD,UAAU,CAAC,IAAI,GAAG;YAChB,IAAI,EAAE,UAA+E;YACrF,KAAK,EAAE,WAAW;SACnB,CAAC;QAEF,OAAO,UAAU,CAAC;KACnB;IAED,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAED;;GAEG;AACH,SAAS,uBAAuB,CAC9B,iBAAyC,EACzC,WAA+B,EAC/B,SAAiB;IAEjB,wBAAwB;IACxB,iBAAiB,CAAC,eAAe,GAAG,SAAS,CAAC;IAE9C,yBAAyB;IACzB,iBAAiB,GAAG,iBAAiB,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;IAEtE,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AACD;;GAEG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAC/B,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CAClB,CAAC,aAAiC,EAAsD,EAAE,CAC1F,CAAC,EACC,OAAO,EACP,WAAW,EACX,QAAQ,GAKT,EAAkC,EAAE,CACnC,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE;IACjB,KAAK,UAAU,IAAI;QACjB,MAAM,SAAS,GAAG,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC1D,IAAI,CAAC,WAAW,CAAC,IAAI;YAAE,MAAM,IAAI,YAAY,EAAE,CAAC;QAChD,MAAM,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,GAAG,CAAC,CAAC;QACzD,IAAI,WAAW,CAAC,YAAY,EAAE;YAC5B,MAAM,gBAAgB,GAAG;gBACvB,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,SAAS,EAAE,WAAW,CAAC,SAAS;gBAChC,MAAM,EAAE,WAAW,CAAC,MAAM,IAAI,CAAC;gBAC/B,YAAY,EAAE,CAAC,CAAC,WAAW,CAAC,YAAY;gBACxC,cAAc,EAAE,WAAW,EAAE,cAAc,IAAI,EAAE;gBACjD,UAAU,EAAE,WAAW,EAAE,UAAU,IAAI,EAAE;gBACzC,YAAY,EAAE,WAAW,CAAC,YAAY,IAAI,EAAE;gBAC5C,MAAM,EAAE,WAAW,CAAC,MAAM;gBAC1B,YAAY,EAAE,WAAW,CAAC,YAAY;gBACtC,IAAI,EAAE,WAAW,CAAC,IAAI;aACvB,CAAC;YACF,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,SAAS,CAAC,cAAc,CAC/C,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,EAAE,SAAS,CAAC,iBAAiB,CAAC,EAC3E,EAAE,KAAK,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"signOperation.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/signOperation.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,4 +6,6 @@ export type Signer = {
|
|
|
6
6
|
signTransaction: (path: string, tx: string, domain?: DomainServiceResolution) => Promise<string>;
|
|
7
7
|
};
|
|
8
8
|
export declare const createSigner: CreateSigner<Signer>;
|
|
9
|
+
export declare const context: import("@ledgerhq/coin-framework/lib/signer").SignerContext<Signer>;
|
|
10
|
+
export declare const getAddress: import("@ledgerhq/coin-framework/lib/bridge/getAddressWrapper").GetAddressFn;
|
|
9
11
|
//# sourceMappingURL=Eth.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Eth.d.ts","sourceRoot":"","sources":["../../../../src/bridge/generic-alpaca/signer/Eth.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAA2B,MAAM,iCAAiC,CAAC;AACtF,OAAO,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"Eth.d.ts","sourceRoot":"","sources":["../../../../src/bridge/generic-alpaca/signer/Eth.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAA2B,MAAM,iCAAiC,CAAC;AACtF,OAAO,EAAE,YAAY,EAAqB,MAAM,aAAa,CAAC;AAO9D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAGpE,MAAM,MAAM,MAAM,GAAG;IACnB,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IAClD,eAAe,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,uBAAuB,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CAClG,CAAC;AAqBF,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,MAAM,CAoC7C,CAAC;AAEF,eAAO,MAAM,OAAO,qEAAkC,CAAC;AACvD,eAAO,MAAM,UAAU,8EAAoB,CAAC"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { filter, firstValueFrom } from "rxjs";
|
|
2
|
+
import { executeWithSigner } from "../../setup";
|
|
2
3
|
import { DmkSignerEth, LegacySignerEth } from "@ledgerhq/live-signer-evm";
|
|
3
4
|
import { getEnv } from "@ledgerhq/live-env";
|
|
4
5
|
import { Signature } from "ethers";
|
|
6
|
+
import resolver from "@ledgerhq/coin-evm/hw-getAddress";
|
|
5
7
|
const isDmkTransport = (transport) => {
|
|
6
8
|
return ("dmk" in transport &&
|
|
7
9
|
transport.dmk !== undefined &&
|
|
@@ -45,4 +47,6 @@ export const createSigner = (transport) => {
|
|
|
45
47
|
},
|
|
46
48
|
};
|
|
47
49
|
};
|
|
50
|
+
export const context = executeWithSigner(createSigner);
|
|
51
|
+
export const getAddress = resolver(context);
|
|
48
52
|
//# sourceMappingURL=Eth.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Eth.js","sourceRoot":"","sources":["../../../../src/bridge/generic-alpaca/signer/Eth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"Eth.js","sourceRoot":"","sources":["../../../../src/bridge/generic-alpaca/signer/Eth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAE9C,OAAO,EAAgB,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAE9D,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE1E,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,OAAO,QAAQ,MAAM,kCAAkC,CAAC;AAOxD,MAAM,cAAc,GAAG,CACrB,SAAoB,EACsD,EAAE;IAC5E,OAAO,CACL,KAAK,IAAI,SAAS;QAClB,SAAS,CAAC,GAAG,KAAK,SAAS;QAC3B,WAAW,IAAI,SAAS;QACxB,SAAS,CAAC,SAAS,KAAK,SAAS,CAClC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAA4B,CAAC,SAAoB,EAAE,EAAE;IACzE,IAAI,cAAc,CAAC,SAAS,CAAC,EAAE;QAC7B,OAAO,IAAI,YAAY,CAAC,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;KAC7D;IAED,OAAO,IAAI,eAAe,CAAC,SAAS,CAAC,CAAC;AACxC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAyB,CAAC,SAAoB,EAAE,EAAE;IACzE,MAAM,MAAM,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;IAE3C,OAAO;QACL,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC;QAC1C,eAAe,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE;YAC1C,gEAAgE;YAChE,MAAM,gBAAgB,GAAqB;gBACzC,eAAe,EAAE,IAAI;gBACrB,KAAK,EAAE,IAAI;gBACX,GAAG,EAAE,KAAK;gBACV,SAAS,EAAE,IAAI;gBACf,OAAO,EAAE,MAAM,IAAI,CAAC,MAAM,CAAC;aAC5B,CAAC;YACF,MAAM,UAAU,GAAe;gBAC7B,mBAAmB,EAAE,MAAM,CAAC,sBAAsB,CAAC;gBACnD,kBAAkB,EAAE,MAAM,CAAC,sBAAsB,CAAC,GAAG,cAAc;aACpE,CAAC;YAEF,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;YAEjC,MAAM,UAAU,GAAG,MAAM,CAAC,oBAAoB,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,IAAI,CAAC,CAAC;YAC9F,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAC3B,MAAM,CAAC,CAAC,KAAK,EAA+D,EAAE;gBAC5E,OAAO,KAAK,CAAC,IAAI,KAAK,mBAAmB,CAAC;YAC5C,CAAC,CAAC,CACH,CAAC;YACF,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,cAAc,CAAC,KAAK,CAAC,CAAC;YAE9C,OAAO,SAAS,CAAC,IAAI,CAAC;gBACpB,CAAC,EAAE,IAAI,GAAG,KAAK,CAAC,CAAC;gBACjB,CAAC,EAAE,IAAI,GAAG,KAAK,CAAC,CAAC;gBACjB,CAAC,EAAE,OAAO,KAAK,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;aACjE,CAAC,CAAC,UAAU,CAAC;QAChB,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,OAAO,GAAG,iBAAiB,CAAC,YAAY,CAAC,CAAC;AACvD,MAAM,CAAC,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/bridge/generic-alpaca/signer/index.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/bridge/generic-alpaca/signer/index.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAoEvC,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAgCvD"}
|
|
@@ -8,6 +8,7 @@ import Xrp from "@ledgerhq/hw-app-xrp";
|
|
|
8
8
|
import { DerivationType, LedgerSigner as TaquitoLedgerSigner } from "@taquito/ledger-signer";
|
|
9
9
|
import tezosGetAddress from "@ledgerhq/coin-tezos/signer/getAddress";
|
|
10
10
|
import Tezos from "@ledgerhq/hw-app-tezos";
|
|
11
|
+
import { context as evmContext, getAddress as evmGetAddress } from "./Eth";
|
|
11
12
|
const createSignerXrp = (transport) => {
|
|
12
13
|
return new Xrp(transport);
|
|
13
14
|
};
|
|
@@ -85,6 +86,12 @@ export function getSigner(network) {
|
|
|
85
86
|
context: signerContextTezos,
|
|
86
87
|
};
|
|
87
88
|
}
|
|
89
|
+
case "evm": {
|
|
90
|
+
return {
|
|
91
|
+
getAddress: evmGetAddress,
|
|
92
|
+
context: evmContext,
|
|
93
|
+
};
|
|
94
|
+
}
|
|
88
95
|
}
|
|
89
96
|
throw new Error(`signer for ${network} not implemented`);
|
|
90
97
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/bridge/generic-alpaca/signer/index.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,sCAAsC,CAAC;AACjE,OAAO,iBAAiB,MAAM,0CAA0C,CAAC;AACzE,OAAO,OAAO,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAClG,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAgB,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,GAAG,MAAM,sBAAsB,CAAC;AAGvC,OAAO,EAAE,cAAc,EAAE,YAAY,IAAI,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7F,OAAO,eAAe,MAAM,wCAAwC,CAAC;AACrE,OAAO,KAAK,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/bridge/generic-alpaca/signer/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,7 +53,9 @@ export type GenericTransaction = TransactionCommon & {
|
|
|
53
53
|
gasPrice?: BigNumber | null;
|
|
54
54
|
maxFeePerGas?: BigNumber | null;
|
|
55
55
|
maxPriorityFeePerGas?: BigNumber | null;
|
|
56
|
+
additionalFees?: BigNumber | null;
|
|
56
57
|
gasOptions?: GasOptions;
|
|
58
|
+
sponsored?: boolean;
|
|
57
59
|
};
|
|
58
60
|
export type GenericTransactionRaw = TransactionCommonRaw & {
|
|
59
61
|
family: string;
|
|
@@ -80,7 +82,9 @@ export type GenericTransactionRaw = TransactionCommonRaw & {
|
|
|
80
82
|
gasPrice?: string | null;
|
|
81
83
|
maxFeePerGas?: string | null;
|
|
82
84
|
maxPriorityFeePerGas?: string | null;
|
|
85
|
+
additionalFees?: string | null;
|
|
83
86
|
gasOptions?: GasOptionsRaw;
|
|
87
|
+
sponsored?: boolean;
|
|
84
88
|
};
|
|
85
89
|
export interface OperationCommon extends Operation {
|
|
86
90
|
extra: Record<string, any>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/types.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,EACV,SAAS,EACT,YAAY,EACZ,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAEzD,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,SAAS,CAAC;CACjB,CAAC;AAEF,KAAK,cAAc,GAAG;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,KAAK,QAAQ,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM,CAAC;AAE3C,MAAM,MAAM,OAAO,GAAG;IACpB,YAAY,EAAE,SAAS,GAAG,IAAI,CAAC;IAC/B,oBAAoB,EAAE,SAAS,GAAG,IAAI,CAAC;IACvC,QAAQ,EAAE,SAAS,GAAG,IAAI,CAAC;IAC3B,WAAW,EAAE,SAAS,GAAG,IAAI,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;KACtB,GAAG,IAAI,QAAQ,GAAG,OAAO;CAC3B,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;KACzB,GAAG,IAAI,QAAQ,GAAG,UAAU;CAC9B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,iBAAiB,GAAG;IACnD,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,SAAS,GAAG,IAAI,CAAC;IACxB,YAAY,CAAC,EAAE,SAAS,GAAG,IAAI,CAAC;IAChC,UAAU,CAAC,EAAE;QACX,UAAU,EAAE;YAAE,IAAI,CAAC,EAAE,SAAS,GAAG,IAAI,CAAA;SAAE,CAAC;KACzC,CAAC;IACF,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAChC,KAAK,CAAC,EAAE,SAAS,GAAG,IAAI,GAAG,SAAS,CAAC;IACrC,aAAa,CAAC,EAAE,IAAI,GAAG,IAAI,GAAG,SAAS,CAAC;IACxC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EACD,MAAM,GACN,aAAa,GACb,aAAa,GACb,cAAc,GACd,UAAU,GACV,OAAO,GACP,YAAY,GACZ,SAAS,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,CAAC,EAAE,SAAS,GAAG,IAAI,CAAC;IAC5B,QAAQ,CAAC,EAAE,SAAS,GAAG,IAAI,CAAC;IAC5B,YAAY,CAAC,EAAE,SAAS,GAAG,IAAI,CAAC;IAChC,oBAAoB,CAAC,EAAE,SAAS,GAAG,IAAI,CAAC;IACxC,UAAU,CAAC,EAAE,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAiB,MAAM,sBAAsB,CAAC;AAGzE,OAAO,EACL,OAAO,EACP,SAAS,IAAI,aAAa,EAC1B,iBAAiB,EAClB,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAKL,kBAAkB,EAElB,eAAe,EAChB,MAAM,SAAS,CAAC;AAEjB,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAKvF;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAOzE;AAMD,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,eAAe,GAAG,eAAe,CAkB5E;AAED,wBAAgB,iCAAiC,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,aAAa,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAiB,MAAM,sBAAsB,CAAC;AAGzE,OAAO,EACL,OAAO,EACP,SAAS,IAAI,aAAa,EAC1B,iBAAiB,EAClB,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAKL,kBAAkB,EAElB,eAAe,EAChB,MAAM,SAAS,CAAC;AAEjB,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAKvF;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAOzE;AAMD,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,eAAe,GAAG,eAAe,CAkB5E;AAED,wBAAgB,iCAAiC,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,aAAa,GAAG,SAAS,CAwFjG;AAqBD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,kBAAkB,EAC/B,iBAAiB,CAAC,EAAE,CAAC,WAAW,EAAE,kBAAkB,KAAK,MAAM,GAC9D,iBAAiB,GAAG;IAAE,IAAI,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,GAAG;IACnE,IAAI,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;CAC1C,CAiDA;AA8GD,eAAO,MAAM,wBAAwB,YAC1B,OAAO,eACH,kBAAkB,mBACd,MAAM,KACtB,SA8EF,CAAC"}
|
|
@@ -62,6 +62,9 @@ export function adaptCoreOperationToLiveOperation(accountId, op) {
|
|
|
62
62
|
if (op.details?.memo) {
|
|
63
63
|
extra.memo = op.details.memo;
|
|
64
64
|
}
|
|
65
|
+
if (op.details?.internal === true) {
|
|
66
|
+
extra.internal = op.details?.internal;
|
|
67
|
+
}
|
|
65
68
|
const bnFees = new BigNumber(op.tx.fees.toString());
|
|
66
69
|
const hasFailed = op.tx.failed;
|
|
67
70
|
let value;
|
|
@@ -154,6 +157,7 @@ export function transactionToIntent(account, transaction, computeIntentType) {
|
|
|
154
157
|
sequence: transaction.nonce !== null && transaction.nonce !== undefined
|
|
155
158
|
? BigInt(transaction.nonce.toString())
|
|
156
159
|
: undefined,
|
|
160
|
+
sponsored: transaction.sponsored,
|
|
157
161
|
};
|
|
158
162
|
if (transaction.assetReference && transaction.assetOwner) {
|
|
159
163
|
const { subAccountId } = transaction;
|
|
@@ -199,8 +203,11 @@ function toGenericTransactionRaw(transaction) {
|
|
|
199
203
|
recipient: transaction.recipient,
|
|
200
204
|
family: transaction.family,
|
|
201
205
|
};
|
|
202
|
-
|
|
203
|
-
|
|
206
|
+
const booleanFieldsToPropagate = ["useAllAmount", "sponsored"];
|
|
207
|
+
for (const field of booleanFieldsToPropagate) {
|
|
208
|
+
if (field in transaction) {
|
|
209
|
+
raw[field] = transaction[field];
|
|
210
|
+
}
|
|
204
211
|
}
|
|
205
212
|
const stringFieldsToPropagate = [
|
|
206
213
|
"memoType",
|
|
@@ -227,6 +234,7 @@ function toGenericTransactionRaw(transaction) {
|
|
|
227
234
|
"gasPrice",
|
|
228
235
|
"maxFeePerGas",
|
|
229
236
|
"maxPriorityFeePerGas",
|
|
237
|
+
"additionalFees",
|
|
230
238
|
];
|
|
231
239
|
for (const field of bigNumberFieldsToPropagate) {
|
|
232
240
|
if (field in transaction) {
|
|
@@ -322,7 +330,7 @@ export const buildOptimisticOperation = (account, transaction, sequenceNumber) =
|
|
|
322
330
|
hash: "",
|
|
323
331
|
type,
|
|
324
332
|
value: transaction.useAllAmount ? tokenAccount.balance : transaction.amount,
|
|
325
|
-
fee: new BigNumber(
|
|
333
|
+
fee: new BigNumber(fees.toString()),
|
|
326
334
|
blockHash: null,
|
|
327
335
|
blockHeight: null,
|
|
328
336
|
senders: [account.freshAddress],
|