@ledgerhq/live-common 34.51.0-nightly.8 → 34.51.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/bridge/generic-alpaca/estimateMaxSpendable.js +1 -1
- package/lib/bridge/generic-alpaca/estimateMaxSpendable.js.map +1 -1
- package/lib/bridge/generic-alpaca/prepareTransaction.d.ts.map +1 -1
- package/lib/bridge/generic-alpaca/prepareTransaction.js +45 -37
- 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 +20 -0
- package/lib/bridge/generic-alpaca/signOperation.js.map +1 -1
- package/lib/bridge/generic-alpaca/tests/prepareTransaction.test.js +88 -186
- package/lib/bridge/generic-alpaca/tests/prepareTransaction.test.js.map +1 -1
- package/lib/bridge/generic-alpaca/utils.js +1 -1
- package/lib/bridge/generic-alpaca/utils.js.map +1 -1
- package/lib/bridge/generic-alpaca/utils.test.js +2 -2
- package/lib/bridge/generic-alpaca/utils.test.js.map +1 -1
- package/lib/dada-client/state-manager/api.d.ts.map +1 -1
- package/lib/dada-client/state-manager/api.js +5 -10
- package/lib/dada-client/state-manager/api.js.map +1 -1
- package/lib/dada-client/state-manager/types.d.ts +0 -1
- package/lib/dada-client/state-manager/types.d.ts.map +1 -1
- package/lib/device/use-cases/getAppsCatalogForDevice.d.ts +1 -1
- package/lib/device/use-cases/getAppsCatalogForDevice.d.ts.map +1 -1
- package/lib/e2e/data/deviceLabelsData.d.ts.map +1 -1
- package/lib/e2e/data/deviceLabelsData.js +4 -2
- package/lib/e2e/data/deviceLabelsData.js.map +1 -1
- package/lib/e2e/enum/Device.d.ts +4 -5
- package/lib/e2e/enum/Device.d.ts.map +1 -1
- package/lib/e2e/enum/Device.js +4 -6
- package/lib/e2e/enum/Device.js.map +1 -1
- package/lib/e2e/families/bitcoin.d.ts.map +1 -1
- package/lib/e2e/families/bitcoin.js +3 -4
- package/lib/e2e/families/bitcoin.js.map +1 -1
- package/lib/e2e/families/cardano.js +2 -2
- package/lib/e2e/families/cardano.js.map +1 -1
- package/lib/e2e/families/evm.d.ts.map +1 -1
- package/lib/e2e/families/evm.js +2 -3
- package/lib/e2e/families/evm.js.map +1 -1
- package/lib/e2e/families/solana.d.ts.map +1 -1
- package/lib/e2e/families/solana.js +5 -2
- package/lib/e2e/families/solana.js.map +1 -1
- package/lib/e2e/families/tezos.d.ts.map +1 -1
- package/lib/e2e/families/tezos.js +1 -2
- package/lib/e2e/families/tezos.js.map +1 -1
- package/lib/e2e/index.d.ts +2 -7
- package/lib/e2e/index.d.ts.map +1 -1
- package/lib/e2e/speculos.d.ts +1 -1
- package/lib/e2e/speculos.d.ts.map +1 -1
- package/lib/e2e/speculos.js +60 -53
- package/lib/e2e/speculos.js.map +1 -1
- package/lib/env.react.d.ts +1 -1
- package/lib/env.react.d.ts.map +1 -1
- package/lib/exchange/swap/hooks/usePickDefaultAccount.js +1 -1
- package/lib/exchange/swap/hooks/usePickDefaultAccount.js.map +1 -1
- package/lib/exchange/swap/hooks/useSwapTransaction.d.ts +2 -3
- package/lib/exchange/swap/hooks/useSwapTransaction.d.ts.map +1 -1
- package/lib/exchange/swap/hooks/useSwapTransaction.js +9 -14
- package/lib/exchange/swap/hooks/useSwapTransaction.js.map +1 -1
- package/lib/exchange/swap/transactionStrategies.d.ts +1 -2
- package/lib/exchange/swap/transactionStrategies.d.ts.map +1 -1
- package/lib/exchange/swap/transactionStrategies.js +1 -3
- package/lib/exchange/swap/transactionStrategies.js.map +1 -1
- package/lib/exchange/swap/types.d.ts +0 -1
- package/lib/exchange/swap/types.d.ts.map +1 -1
- package/lib/families/evm/walletApiAdapter.d.ts.map +1 -1
- package/lib/families/evm/walletApiAdapter.js +0 -5
- package/lib/families/evm/walletApiAdapter.js.map +1 -1
- package/lib/featureFlags/defaultFeatures.d.ts +3 -0
- package/lib/featureFlags/defaultFeatures.d.ts.map +1 -1
- package/lib/featureFlags/defaultFeatures.js +1 -10
- package/lib/featureFlags/defaultFeatures.js.map +1 -1
- package/lib/featureFlags/useFeature.d.ts +1 -1
- package/lib/featureFlags/useFeature.d.ts.map +1 -1
- package/lib/load/speculos.d.ts.map +1 -1
- package/lib/load/speculos.js +0 -1
- package/lib/load/speculos.js.map +1 -1
- package/lib/modularDrawer/hooks/__tests__/useDetailedAccountsCore.test.d.ts.map +1 -0
- package/lib/modularDrawer/hooks/__tests__/useDetailedAccountsCore.test.js.map +1 -0
- package/lib/modularDrawer/hooks/useCurrenciesUnderFeatureFlag.d.ts.map +1 -1
- package/lib/modularDrawer/hooks/useCurrenciesUnderFeatureFlag.js +3 -0
- package/lib/modularDrawer/hooks/useCurrenciesUnderFeatureFlag.js.map +1 -1
- package/lib/wallet-api/Exchange/server.d.ts +0 -1
- package/lib/wallet-api/Exchange/server.d.ts.map +1 -1
- package/lib/wallet-api/Exchange/server.js +2 -5
- package/lib/wallet-api/Exchange/server.js.map +1 -1
- package/lib/wallet-api/react.d.ts.map +1 -1
- package/lib/wallet-api/react.js +1 -5
- package/lib/wallet-api/react.js.map +1 -1
- package/lib-es/bridge/generic-alpaca/estimateMaxSpendable.js +1 -1
- package/lib-es/bridge/generic-alpaca/estimateMaxSpendable.js.map +1 -1
- package/lib-es/bridge/generic-alpaca/prepareTransaction.d.ts.map +1 -1
- package/lib-es/bridge/generic-alpaca/prepareTransaction.js +45 -37
- 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 +17 -0
- package/lib-es/bridge/generic-alpaca/signOperation.js.map +1 -1
- package/lib-es/bridge/generic-alpaca/tests/prepareTransaction.test.js +88 -163
- package/lib-es/bridge/generic-alpaca/tests/prepareTransaction.test.js.map +1 -1
- package/lib-es/bridge/generic-alpaca/utils.js +1 -1
- package/lib-es/bridge/generic-alpaca/utils.js.map +1 -1
- package/lib-es/bridge/generic-alpaca/utils.test.js +2 -2
- package/lib-es/bridge/generic-alpaca/utils.test.js.map +1 -1
- package/lib-es/dada-client/state-manager/api.d.ts.map +1 -1
- package/lib-es/dada-client/state-manager/api.js +5 -10
- package/lib-es/dada-client/state-manager/api.js.map +1 -1
- package/lib-es/dada-client/state-manager/types.d.ts +0 -1
- package/lib-es/dada-client/state-manager/types.d.ts.map +1 -1
- package/lib-es/device/use-cases/getAppsCatalogForDevice.d.ts +1 -1
- package/lib-es/device/use-cases/getAppsCatalogForDevice.d.ts.map +1 -1
- package/lib-es/e2e/data/deviceLabelsData.d.ts.map +1 -1
- package/lib-es/e2e/data/deviceLabelsData.js +4 -2
- package/lib-es/e2e/data/deviceLabelsData.js.map +1 -1
- package/lib-es/e2e/enum/Device.d.ts +4 -5
- package/lib-es/e2e/enum/Device.d.ts.map +1 -1
- package/lib-es/e2e/enum/Device.js +4 -6
- package/lib-es/e2e/enum/Device.js.map +1 -1
- package/lib-es/e2e/families/bitcoin.d.ts.map +1 -1
- package/lib-es/e2e/families/bitcoin.js +3 -4
- package/lib-es/e2e/families/bitcoin.js.map +1 -1
- package/lib-es/e2e/families/cardano.js +2 -2
- package/lib-es/e2e/families/cardano.js.map +1 -1
- package/lib-es/e2e/families/evm.d.ts.map +1 -1
- package/lib-es/e2e/families/evm.js +2 -3
- package/lib-es/e2e/families/evm.js.map +1 -1
- package/lib-es/e2e/families/solana.d.ts.map +1 -1
- package/lib-es/e2e/families/solana.js +6 -3
- package/lib-es/e2e/families/solana.js.map +1 -1
- package/lib-es/e2e/families/tezos.d.ts.map +1 -1
- package/lib-es/e2e/families/tezos.js +1 -2
- package/lib-es/e2e/families/tezos.js.map +1 -1
- package/lib-es/e2e/index.d.ts +2 -7
- package/lib-es/e2e/index.d.ts.map +1 -1
- package/lib-es/e2e/speculos.d.ts +1 -1
- package/lib-es/e2e/speculos.d.ts.map +1 -1
- package/lib-es/e2e/speculos.js +25 -19
- package/lib-es/e2e/speculos.js.map +1 -1
- package/lib-es/env.react.d.ts +1 -1
- package/lib-es/env.react.d.ts.map +1 -1
- package/lib-es/exchange/swap/hooks/usePickDefaultAccount.js +2 -2
- package/lib-es/exchange/swap/hooks/usePickDefaultAccount.js.map +1 -1
- package/lib-es/exchange/swap/hooks/useSwapTransaction.d.ts +2 -3
- package/lib-es/exchange/swap/hooks/useSwapTransaction.d.ts.map +1 -1
- package/lib-es/exchange/swap/hooks/useSwapTransaction.js +9 -14
- package/lib-es/exchange/swap/hooks/useSwapTransaction.js.map +1 -1
- package/lib-es/exchange/swap/transactionStrategies.d.ts +1 -2
- package/lib-es/exchange/swap/transactionStrategies.d.ts.map +1 -1
- package/lib-es/exchange/swap/transactionStrategies.js +1 -3
- package/lib-es/exchange/swap/transactionStrategies.js.map +1 -1
- package/lib-es/exchange/swap/types.d.ts +0 -1
- package/lib-es/exchange/swap/types.d.ts.map +1 -1
- package/lib-es/families/evm/walletApiAdapter.d.ts.map +1 -1
- package/lib-es/families/evm/walletApiAdapter.js +0 -5
- package/lib-es/families/evm/walletApiAdapter.js.map +1 -1
- package/lib-es/featureFlags/defaultFeatures.d.ts +3 -0
- package/lib-es/featureFlags/defaultFeatures.d.ts.map +1 -1
- package/lib-es/featureFlags/defaultFeatures.js +1 -10
- package/lib-es/featureFlags/defaultFeatures.js.map +1 -1
- package/lib-es/featureFlags/useFeature.d.ts +1 -1
- package/lib-es/featureFlags/useFeature.d.ts.map +1 -1
- package/lib-es/load/speculos.d.ts.map +1 -1
- package/lib-es/load/speculos.js +0 -1
- package/lib-es/load/speculos.js.map +1 -1
- package/lib-es/modularDrawer/hooks/__tests__/useDetailedAccountsCore.test.d.ts.map +1 -0
- package/lib-es/modularDrawer/hooks/__tests__/useDetailedAccountsCore.test.js.map +1 -0
- package/lib-es/modularDrawer/hooks/useCurrenciesUnderFeatureFlag.d.ts.map +1 -1
- package/lib-es/modularDrawer/hooks/useCurrenciesUnderFeatureFlag.js +3 -0
- package/lib-es/modularDrawer/hooks/useCurrenciesUnderFeatureFlag.js.map +1 -1
- package/lib-es/wallet-api/Exchange/server.d.ts +0 -1
- package/lib-es/wallet-api/Exchange/server.d.ts.map +1 -1
- package/lib-es/wallet-api/Exchange/server.js +2 -5
- package/lib-es/wallet-api/Exchange/server.js.map +1 -1
- package/lib-es/wallet-api/react.d.ts.map +1 -1
- package/lib-es/wallet-api/react.js +1 -5
- package/lib-es/wallet-api/react.js.map +1 -1
- package/package.json +78 -78
- package/src/bridge/generic-alpaca/estimateMaxSpendable.ts +1 -1
- package/src/bridge/generic-alpaca/prepareTransaction.ts +69 -46
- package/src/bridge/generic-alpaca/signOperation.ts +20 -0
- package/src/bridge/generic-alpaca/tests/prepareTransaction.test.ts +109 -191
- package/src/bridge/generic-alpaca/utils.test.ts +15 -12
- package/src/bridge/generic-alpaca/utils.ts +1 -1
- package/src/dada-client/state-manager/api.ts +5 -10
- package/src/dada-client/state-manager/types.ts +0 -1
- package/src/e2e/data/deviceLabelsData.ts +4 -2
- package/src/e2e/enum/Device.ts +4 -7
- package/src/e2e/families/bitcoin.ts +9 -4
- package/src/e2e/families/cardano.ts +2 -2
- package/src/e2e/families/evm.ts +8 -3
- package/src/e2e/families/solana.ts +7 -2
- package/src/e2e/families/tezos.ts +7 -2
- package/src/e2e/speculos.ts +27 -22
- package/src/exchange/swap/hooks/usePickDefaultAccount.ts +2 -2
- package/src/exchange/swap/hooks/useSwapTransaction.ts +7 -20
- package/src/exchange/swap/transactionStrategies.ts +0 -4
- package/src/exchange/swap/types.ts +0 -1
- package/src/families/evm/walletApiAdapter.ts +0 -6
- package/src/featureFlags/defaultFeatures.ts +1 -10
- package/src/load/speculos.ts +0 -1
- package/src/modularDrawer/hooks/useCurrenciesUnderFeatureFlag.ts +3 -0
- package/src/wallet-api/Exchange/server.ts +3 -12
- package/src/wallet-api/react.ts +1 -7
- package/lib/e2e/speculosAppVersion.d.ts +0 -7
- package/lib/e2e/speculosAppVersion.d.ts.map +0 -1
- package/lib/e2e/speculosAppVersion.js +0 -104
- package/lib/e2e/speculosAppVersion.js.map +0 -1
- package/lib/modularDrawer/hooks/__test__/useAssetAccountCounts.test.d.ts +0 -2
- package/lib/modularDrawer/hooks/__test__/useAssetAccountCounts.test.d.ts.map +0 -1
- package/lib/modularDrawer/hooks/__test__/useAssetAccountCounts.test.js +0 -38
- package/lib/modularDrawer/hooks/__test__/useAssetAccountCounts.test.js.map +0 -1
- package/lib/modularDrawer/hooks/__test__/useCurrenciesUnderFeatureFlag.test.d.ts +0 -2
- package/lib/modularDrawer/hooks/__test__/useCurrenciesUnderFeatureFlag.test.d.ts.map +0 -1
- package/lib/modularDrawer/hooks/__test__/useCurrenciesUnderFeatureFlag.test.js +0 -50
- package/lib/modularDrawer/hooks/__test__/useCurrenciesUnderFeatureFlag.test.js.map +0 -1
- package/lib/modularDrawer/hooks/__test__/useDetailedAccountsCore.test.d.ts.map +0 -1
- package/lib/modularDrawer/hooks/__test__/useDetailedAccountsCore.test.js.map +0 -1
- package/lib/modularDrawer/modules/__test__/createAssetConfiguration.test.d.ts +0 -19
- package/lib/modularDrawer/modules/__test__/createAssetConfiguration.test.d.ts.map +0 -1
- package/lib/modularDrawer/modules/__test__/createAssetConfiguration.test.js +0 -209
- package/lib/modularDrawer/modules/__test__/createAssetConfiguration.test.js.map +0 -1
- package/lib/modularDrawer/modules/__test__/createNetworkConfiguration.test.d.ts +0 -5
- package/lib/modularDrawer/modules/__test__/createNetworkConfiguration.test.d.ts.map +0 -1
- package/lib/modularDrawer/modules/__test__/createNetworkConfiguration.test.js +0 -248
- package/lib/modularDrawer/modules/__test__/createNetworkConfiguration.test.js.map +0 -1
- package/lib-es/e2e/speculosAppVersion.d.ts +0 -7
- package/lib-es/e2e/speculosAppVersion.d.ts.map +0 -1
- package/lib-es/e2e/speculosAppVersion.js +0 -74
- package/lib-es/e2e/speculosAppVersion.js.map +0 -1
- package/lib-es/modularDrawer/hooks/__test__/useAssetAccountCounts.test.d.ts +0 -2
- package/lib-es/modularDrawer/hooks/__test__/useAssetAccountCounts.test.d.ts.map +0 -1
- package/lib-es/modularDrawer/hooks/__test__/useAssetAccountCounts.test.js +0 -36
- package/lib-es/modularDrawer/hooks/__test__/useAssetAccountCounts.test.js.map +0 -1
- package/lib-es/modularDrawer/hooks/__test__/useCurrenciesUnderFeatureFlag.test.d.ts +0 -2
- package/lib-es/modularDrawer/hooks/__test__/useCurrenciesUnderFeatureFlag.test.d.ts.map +0 -1
- package/lib-es/modularDrawer/hooks/__test__/useCurrenciesUnderFeatureFlag.test.js +0 -45
- package/lib-es/modularDrawer/hooks/__test__/useCurrenciesUnderFeatureFlag.test.js.map +0 -1
- package/lib-es/modularDrawer/hooks/__test__/useDetailedAccountsCore.test.d.ts.map +0 -1
- package/lib-es/modularDrawer/hooks/__test__/useDetailedAccountsCore.test.js.map +0 -1
- package/lib-es/modularDrawer/modules/__test__/createAssetConfiguration.test.d.ts +0 -19
- package/lib-es/modularDrawer/modules/__test__/createAssetConfiguration.test.d.ts.map +0 -1
- package/lib-es/modularDrawer/modules/__test__/createAssetConfiguration.test.js +0 -202
- package/lib-es/modularDrawer/modules/__test__/createAssetConfiguration.test.js.map +0 -1
- package/lib-es/modularDrawer/modules/__test__/createNetworkConfiguration.test.d.ts +0 -5
- package/lib-es/modularDrawer/modules/__test__/createNetworkConfiguration.test.d.ts.map +0 -1
- package/lib-es/modularDrawer/modules/__test__/createNetworkConfiguration.test.js +0 -246
- package/lib-es/modularDrawer/modules/__test__/createNetworkConfiguration.test.js.map +0 -1
- package/src/e2e/speculosAppVersion.ts +0 -86
- package/src/modularDrawer/hooks/__test__/useAssetAccountCounts.test.ts +0 -40
- package/src/modularDrawer/hooks/__test__/useCurrenciesUnderFeatureFlag.test.ts +0 -59
- package/src/modularDrawer/modules/__test__/createAssetConfiguration.test.tsx +0 -250
- package/src/modularDrawer/modules/__test__/createNetworkConfiguration.test.ts +0 -349
- /package/lib/modularDrawer/hooks/{__test__ → __tests__}/useDetailedAccountsCore.test.d.ts +0 -0
- /package/lib/modularDrawer/hooks/{__test__ → __tests__}/useDetailedAccountsCore.test.js +0 -0
- /package/lib-es/modularDrawer/hooks/{__test__ → __tests__}/useDetailedAccountsCore.test.d.ts +0 -0
- /package/lib-es/modularDrawer/hooks/{__test__ → __tests__}/useDetailedAccountsCore.test.js +0 -0
- /package/src/modularDrawer/hooks/{__test__ → __tests__}/useDetailedAccountsCore.test.ts +0 -0
|
@@ -27,7 +27,7 @@ function genericEstimateMaxSpendable(network, kind) {
|
|
|
27
27
|
fees = (await alpacaApi.estimateFees((0, utils_1.transactionToIntent)(mainAccount, draftTransaction, alpacaApi.computeIntentType))).value;
|
|
28
28
|
}
|
|
29
29
|
const { amount } = await alpacaApi.validateIntent((0, utils_1.transactionToIntent)(account, { ...draftTransaction }, alpacaApi.computeIntentType), { value: transaction?.fees ? BigInt(transaction.fees.toString()) : 0n });
|
|
30
|
-
if (
|
|
30
|
+
if (["stellar", "tezos"].includes(network)) {
|
|
31
31
|
return amount > 0 ? new bignumber_js_1.default(amount.toString()) : new bignumber_js_1.default(0);
|
|
32
32
|
}
|
|
33
33
|
const bnFee = (0, bignumber_js_1.default)(fees.toString());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"estimateMaxSpendable.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/estimateMaxSpendable.ts"],"names":[],"mappings":";;;;;;AACA,2CAA+C;AAC/C,qCAAwC;AACxC,2DAAwD;AACxD,mCAA8C;AAC9C,gEAAqC;AAErC,SAAgB,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,IAAA,wBAAc,EAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAC3D,MAAM,SAAS,GAAG,IAAA,qBAAY,EAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC9D,MAAM,gBAAgB,GAAG;YACvB,GAAG,IAAA,qCAAiB,EAAC,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,IAAA,2BAAmB,EAAC,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,IAAA,2BAAmB,EAAC,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,OAAO,
|
|
1
|
+
{"version":3,"file":"estimateMaxSpendable.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/estimateMaxSpendable.ts"],"names":[],"mappings":";;;;;;AACA,2CAA+C;AAC/C,qCAAwC;AACxC,2DAAwD;AACxD,mCAA8C;AAC9C,gEAAqC;AAErC,SAAgB,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,IAAA,wBAAc,EAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAC3D,MAAM,SAAS,GAAG,IAAA,qBAAY,EAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC9D,MAAM,gBAAgB,GAAG;YACvB,GAAG,IAAA,qCAAiB,EAAC,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,IAAA,2BAAmB,EAAC,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,IAAA,2BAAmB,EAAC,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;YAC1C,OAAO,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,sBAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,sBAAS,CAAC,CAAC,CAAC,CAAC;SACzE;QACD,MAAM,KAAK,GAAG,IAAA,sBAAS,EAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACzC,OAAO,sBAAS,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IACjE,CAAC,CAAC;AACJ,CAAC;AAnCD,kEAmCC"}
|
|
@@ -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,EAAE,MAAM,oCAAoC,CAAC;AAE/D,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,EAAE,MAAM,oCAAoC,CAAC;AAE/D,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAgB7C,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,MAAM,EACf,IAAI,KAAA,GACH,aAAa,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC,oBAAoB,CAAC,CAmFlE;AAED,wBAAgB,aAAa,CAC3B,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,MAAM,EACb,iBAAiB,EAAE,CAAC,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,KAAK,SAAS,GACpE;IACD,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;CACpB,CAcA"}
|
|
@@ -8,6 +8,9 @@ const alpaca_1 = require("./alpaca");
|
|
|
8
8
|
const utils_1 = require("./utils");
|
|
9
9
|
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
10
10
|
const index_1 = require("@ledgerhq/coin-framework/account/index");
|
|
11
|
+
function bnEq(a, b) {
|
|
12
|
+
return !a && !b ? true : !a || !b ? false : a.eq(b);
|
|
13
|
+
}
|
|
11
14
|
function assetInfosFallback(transaction) {
|
|
12
15
|
return {
|
|
13
16
|
assetReference: transaction.assetReference ?? "",
|
|
@@ -16,50 +19,55 @@ function assetInfosFallback(transaction) {
|
|
|
16
19
|
}
|
|
17
20
|
function genericPrepareTransaction(network, kind) {
|
|
18
21
|
return async (account, transaction) => {
|
|
19
|
-
const { getAssetFromToken, computeIntentType, estimateFees } = (0, alpaca_1.getAlpacaApi)(account.currency.id, kind);
|
|
22
|
+
const { getAssetFromToken, computeIntentType, estimateFees, validateIntent } = (0, alpaca_1.getAlpacaApi)(account.currency.id, kind);
|
|
20
23
|
const { assetReference, assetOwner } = getAssetFromToken
|
|
21
24
|
? getAssetInfos(transaction, account.freshAddress, getAssetFromToken)
|
|
22
25
|
: assetInfosFallback(transaction);
|
|
23
|
-
const
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
// Anticipate use cases where token amounts impact fee calculuses
|
|
30
|
-
if (useAllAmount && next.subAccountId) {
|
|
31
|
-
const subAccount = account.subAccounts?.find(sub => sub.id === next.subAccountId);
|
|
32
|
-
next.amount = subAccount?.spendableBalance ?? new bignumber_js_1.default(0);
|
|
33
|
-
}
|
|
34
|
-
const intent = (0, utils_1.transactionToIntent)(account, next, computeIntentType);
|
|
35
|
-
const estimation = await estimateFees(intent);
|
|
36
|
-
const customFeesValue = next.customFees?.parameters?.fees; // e.g. Stellar
|
|
37
|
-
next.fees = customFeesValue ?? new bignumber_js_1.default(estimation.value.toString());
|
|
38
|
-
const fieldsToPropagate = ["storageLimit"];
|
|
39
|
-
for (const field of fieldsToPropagate) {
|
|
40
|
-
const parameter = estimation.parameters?.[field];
|
|
41
|
-
if (typeof parameter === "bigint" ||
|
|
42
|
-
typeof parameter === "number" ||
|
|
43
|
-
typeof parameter === "string") {
|
|
44
|
-
next[field] = new bignumber_js_1.default(parameter.toString());
|
|
45
|
-
}
|
|
26
|
+
const customParametersFees = transaction.customFees?.parameters?.fees;
|
|
27
|
+
let fees = customParametersFees || null;
|
|
28
|
+
if (fees === null) {
|
|
29
|
+
fees = (await estimateFees((0, utils_1.transactionToIntent)(account, {
|
|
30
|
+
...transaction,
|
|
31
|
+
}, computeIntentType))).value;
|
|
46
32
|
}
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
33
|
+
if (!bnEq(transaction.fees, new bignumber_js_1.default(fees.toString()))) {
|
|
34
|
+
const next = {
|
|
35
|
+
...transaction,
|
|
36
|
+
fees: new bignumber_js_1.default(fees.toString()),
|
|
37
|
+
assetReference,
|
|
38
|
+
assetOwner,
|
|
39
|
+
customFees: {
|
|
40
|
+
parameters: {
|
|
41
|
+
fees: customParametersFees ? new bignumber_js_1.default(customParametersFees.toString()) : undefined,
|
|
42
|
+
},
|
|
43
|
+
},
|
|
44
|
+
};
|
|
45
|
+
// propagate storageLimit fee parameter when present (ex: tezos)
|
|
46
|
+
const feeEstimation = await estimateFees((0, utils_1.transactionToIntent)(account, {
|
|
47
|
+
...transaction,
|
|
48
|
+
}, computeIntentType));
|
|
49
|
+
const params = feeEstimation?.parameters;
|
|
50
|
+
if (params) {
|
|
51
|
+
const storageLimit = params["storageLimit"];
|
|
52
|
+
if (storageLimit !== undefined &&
|
|
53
|
+
(typeof storageLimit === "bigint" ||
|
|
54
|
+
typeof storageLimit === "number" ||
|
|
55
|
+
typeof storageLimit === "string")) {
|
|
56
|
+
next.storageLimit = new bignumber_js_1.default(storageLimit.toString());
|
|
57
|
+
}
|
|
55
58
|
}
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
59
|
+
// align with stellar/xrp: when send max (or staking intents), reflect validated amount in UI
|
|
60
|
+
if (transaction.useAllAmount ||
|
|
61
|
+
transaction["mode"] === "stake" ||
|
|
62
|
+
transaction["mode"] === "unstake") {
|
|
63
|
+
const { amount } = await validateIntent((0, utils_1.transactionToIntent)(account, {
|
|
64
|
+
...transaction,
|
|
65
|
+
}, computeIntentType));
|
|
66
|
+
next.amount = new bignumber_js_1.default(amount.toString());
|
|
60
67
|
}
|
|
68
|
+
return next;
|
|
61
69
|
}
|
|
62
|
-
return
|
|
70
|
+
return transaction;
|
|
63
71
|
};
|
|
64
72
|
}
|
|
65
73
|
exports.genericPrepareTransaction = genericPrepareTransaction;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/prepareTransaction.ts"],"names":[],"mappings":";;;;;;AACA,qCAAwC;AACxC,mCAA8C;AAC9C,gEAAqC;AAErC,kEAA8E;AAI9E,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,SAAgB,yBAAyB,CACvC,OAAe,EACf,IAAI;IAEJ,OAAO,KAAK,EAAE,OAAO,EAAE,WAA+B,EAAE,EAAE;QACxD,MAAM,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,YAAY,EAAE,GAAG,IAAA,qBAAY,
|
|
1
|
+
{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/prepareTransaction.ts"],"names":[],"mappings":";;;;;;AACA,qCAAwC;AACxC,mCAA8C;AAC9C,gEAAqC;AAErC,kEAA8E;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,SAAgB,yBAAyB,CACvC,OAAe,EACf,IAAI;IAEJ,OAAO,KAAK,EAAE,OAAO,EAAE,WAA+B,EAAE,EAAE;QACxD,MAAM,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,YAAY,EAAE,cAAc,EAAE,GAAG,IAAA,qBAAY,EACzF,OAAO,CAAC,QAAQ,CAAC,EAAE,EACnB,IAAI,CACL,CAAC;QACF,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,GAAG,iBAAiB;YACtD,CAAC,CAAC,aAAa,CAAC,WAAW,EAAE,OAAO,CAAC,YAAY,EAAE,iBAAiB,CAAC;YACrE,CAAC,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;QACpC,MAAM,oBAAoB,GAAG,WAAW,CAAC,UAAU,EAAE,UAAU,EAAE,IAAI,CAAC;QACtE,IAAI,IAAI,GAA8B,oBAAoB,IAAI,IAAI,CAAC;QACnE,IAAI,IAAI,KAAK,IAAI,EAAE;YACjB,IAAI,GAAG,CACL,MAAM,YAAY,CAChB,IAAA,2BAAmB,EACjB,OAAO,EACP;gBACE,GAAG,WAAW;aACf,EACD,iBAAiB,CAClB,CACF,CACF,CAAC,KAAK,CAAC;SACT;QAED,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,sBAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE;YAC3D,MAAM,IAAI,GAAuB;gBAC/B,GAAG,WAAW;gBACd,IAAI,EAAE,IAAI,sBAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACpC,cAAc;gBACd,UAAU;gBACV,UAAU,EAAE;oBACV,UAAU,EAAE;wBACV,IAAI,EAAE,oBAAoB,CAAC,CAAC,CAAC,IAAI,sBAAS,CAAC,oBAAoB,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS;qBACxF;iBACF;aACF,CAAC;YAEF,gEAAgE;YAChE,MAAM,aAAa,GAAG,MAAM,YAAY,CACtC,IAAA,2BAAmB,EACjB,OAAO,EACP;gBACE,GAAG,WAAW;aACf,EACD,iBAAiB,CAClB,CACF,CAAC;YACF,MAAM,MAAM,GAAG,aAAa,EAAE,UAAU,CAAC;YACzC,IAAI,MAAM,EAAE;gBACV,MAAM,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;gBAC5C,IACE,YAAY,KAAK,SAAS;oBAC1B,CAAC,OAAO,YAAY,KAAK,QAAQ;wBAC/B,OAAO,YAAY,KAAK,QAAQ;wBAChC,OAAO,YAAY,KAAK,QAAQ,CAAC,EACnC;oBACA,IAAI,CAAC,YAAY,GAAG,IAAI,sBAAS,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC;iBAC5D;aACF;YAED,6FAA6F;YAC7F,IACE,WAAW,CAAC,YAAY;gBACxB,WAAW,CAAC,MAAM,CAAC,KAAK,OAAO;gBAC/B,WAAW,CAAC,MAAM,CAAC,KAAK,SAAS,EACjC;gBACA,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,cAAc,CACrC,IAAA,2BAAmB,EACjB,OAAO,EACP;oBACE,GAAG,WAAW;iBACf,EACD,iBAAiB,CAClB,CACF,CAAC;gBACF,IAAI,CAAC,MAAM,GAAG,IAAI,sBAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;aAChD;YACD,OAAO,IAAI,CAAC;SACb;QAED,OAAO,WAAW,CAAC;IACrB,CAAC,CAAC;AACJ,CAAC;AAtFD,8DAsFC;AAED,SAAgB,aAAa,CAC3B,EAAsB,EACtB,KAAa,EACb,iBAAqE;IAKrE,IAAI,EAAE,CAAC,YAAY,EAAE;QACnB,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,4BAAoB,EAAC,EAAE,CAAC,YAAY,CAAC,CAAC;QAExD,IAAI,CAAC,KAAK;YAAE,OAAO,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAE1C,MAAM,KAAK,GAAG,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAE9C,OAAO;YACL,UAAU,EAAE,CAAC,YAAY,IAAI,KAAK,IAAI,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE;YAC7D,cAAc,EAAE,CAAC,gBAAgB,IAAI,KAAK,IAAI,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE;SAC1E,CAAC;KACH;IACD,OAAO,kBAAkB,CAAC,EAAE,CAAC,CAAC;AAChC,CAAC;AArBD,sCAqBC"}
|
|
@@ -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;
|
|
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,CA6FlF,CAAC"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.genericSignOperation = void 0;
|
|
4
7
|
const rxjs_1 = require("rxjs");
|
|
@@ -6,6 +9,7 @@ const alpaca_1 = require("./alpaca");
|
|
|
6
9
|
const utils_1 = require("./utils");
|
|
7
10
|
const errors_1 = require("@ledgerhq/errors");
|
|
8
11
|
const logs_1 = require("@ledgerhq/logs");
|
|
12
|
+
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
9
13
|
/**
|
|
10
14
|
* Applies memo information to transaction intent
|
|
11
15
|
* Handles both destination tags (XRP-like) and Stellar-style memos
|
|
@@ -54,6 +58,22 @@ const genericSignOperation = (network, kind) => (signerContext) => ({ account, t
|
|
|
54
58
|
if (!transaction.fees)
|
|
55
59
|
throw new errors_1.FeeNotLoaded();
|
|
56
60
|
const fees = BigInt(transaction.fees?.toString() || "0");
|
|
61
|
+
if (transaction.useAllAmount) {
|
|
62
|
+
const draftTransaction = {
|
|
63
|
+
mode: transaction.mode,
|
|
64
|
+
recipient: transaction.recipient,
|
|
65
|
+
amount: transaction.amount ?? 0,
|
|
66
|
+
useAllAmount: !!transaction.useAllAmount,
|
|
67
|
+
assetReference: transaction?.assetReference || "",
|
|
68
|
+
assetOwner: transaction?.assetOwner || "",
|
|
69
|
+
subAccountId: transaction.subAccountId || "",
|
|
70
|
+
family: transaction.family,
|
|
71
|
+
feesStrategy: transaction.feesStrategy,
|
|
72
|
+
data: transaction.data,
|
|
73
|
+
};
|
|
74
|
+
const { amount } = await alpacaApi.validateIntent((0, utils_1.transactionToIntent)(account, draftTransaction, alpacaApi.computeIntentType), { value: fees });
|
|
75
|
+
transaction.amount = new bignumber_js_1.default(amount.toString());
|
|
76
|
+
}
|
|
57
77
|
const signedInfo = await signerContext(deviceId, async (signer) => {
|
|
58
78
|
const derivationPath = account.freshAddressPath;
|
|
59
79
|
const { publicKey } = (await signer.getAddress(derivationPath));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signOperation.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/signOperation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"signOperation.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/signOperation.ts"],"names":[],"mappings":";;;;;;AAAA,+BAAkC;AAGlC,qCAAwC;AACxC,mCAAwE;AACxE,6CAAgD;AAIhD,yCAAqC;AACrC,gEAAqC;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;AACI,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,iBAAU,CAAC,CAAC,CAAC,EAAE;IACjB,KAAK,UAAU,IAAI;QACjB,MAAM,SAAS,GAAG,IAAA,qBAAY,EAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC1D,IAAI,CAAC,WAAW,CAAC,IAAI;YAAE,MAAM,IAAI,qBAAY,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,IAAA,2BAAmB,EAAC,OAAO,EAAE,gBAAgB,EAAE,SAAS,CAAC,iBAAiB,CAAC,EAC3E,EAAE,KAAK,EAAE,IAAI,EAAE,CAChB,CAAC;YACF,WAAW,CAAC,MAAM,GAAG,IAAI,sBAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;SACvD;QACD,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,KAAK,EAAC,MAAM,EAAC,EAAE;YAC9D,MAAM,cAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC;YAChD,MAAM,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,MAAM,CAAC,UAAU,CAAC,cAAc,CAAC,CAAW,CAAC;YAE1E,IAAI,iBAAiB,GAAG,IAAA,2BAAmB,EACzC,OAAO,EACP,EAAE,GAAG,WAAW,EAAE,EAClB,SAAS,CAAC,iBAAiB,CAC5B,CAAC;YACF,iBAAiB,CAAC,eAAe,GAAG,SAAS,CAAC;YAE9C,yCAAyC;YACzC,iBAAiB,GAAG,uBAAuB,CAAC,iBAAiB,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;YAEvF,0FAA0F;YAC1F,MAAM,cAAc,GAAG,MAAM,SAAS,CAAC,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;YAC7E,iBAAiB,CAAC,QAAQ,GAAG,cAAc,CAAC;YAE5C,oCAAoC;YACpC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,MAAM,SAAS,CAAC,gBAAgB,CAAC,iBAAiB,EAAE;gBACpF,KAAK,EAAE,IAAI;aACZ,CAAC,CAAC;YAEH,qDAAqD;YACrD,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,4BAA4B,EAAE,CAAC,CAAC;YAC/C,2BAA2B;YAC3B,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;YACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,iBAAiB,CAAC,QAAQ,EAAE,CAAC;QAC/E,CAAC,CAAC,CAAC;QAEH,gDAAgD;QAChD,IAAI,CAAC,UAAU;YAAE,OAAO;QACxB,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,0BAA0B,EAAE,CAAC,CAAC;QAE7C,+CAA+C;QAC/C,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,OAAO,CACtC,UAAU,CAAC,QAAQ,EACnB,UAAU,CAAC,MAAM,EACjB,UAAU,CAAC,SAAS,CACrB,CAAC;QACF,MAAM,SAAS,GAAG,IAAA,gCAAwB,EAAC,OAAO,EAAE,WAAW,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;QACtF,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE;YACjB,IAAA,UAAG,EAAC,gBAAgB,EAAE,0BAA0B,EAAE,SAAS,CAAC,CAAC;SAC9D;QACD,qEAAqE;QACrE,wGAAwG;QACxG,CAAC,CAAC,IAAI,CAAC;YACL,IAAI,EAAE,QAAQ;YACd,eAAe,EAAE;gBACf,SAAS;gBACT,SAAS,EAAE,QAAQ;aACpB;SACF,CAAC,CAAC;IACL,CAAC;IAED,IAAI,EAAE,CAAC,IAAI,CACT,GAAG,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,EAClB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAChB,CAAC;AACJ,CAAC,CAAC,CAAC;AA/FM,QAAA,oBAAoB,wBA+F1B"}
|
|
@@ -1,233 +1,135 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
4
|
};
|
|
28
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
6
|
const prepareTransaction_1 = require("../prepareTransaction");
|
|
30
7
|
const alpaca_1 = require("../alpaca");
|
|
8
|
+
const utils_1 = require("../utils");
|
|
31
9
|
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
32
|
-
const accountModule = __importStar(require("@ledgerhq/coin-framework/account/index"));
|
|
33
10
|
jest.mock("../alpaca", () => ({
|
|
34
11
|
getAlpacaApi: jest.fn(),
|
|
35
12
|
}));
|
|
13
|
+
jest.mock("../utils", () => ({
|
|
14
|
+
transactionToIntent: jest.fn(),
|
|
15
|
+
}));
|
|
36
16
|
describe("genericPrepareTransaction", () => {
|
|
37
17
|
const network = "testnet";
|
|
38
18
|
const kind = "local";
|
|
19
|
+
const account = {
|
|
20
|
+
id: "test-account",
|
|
21
|
+
address: "0xabc",
|
|
22
|
+
currency: { id: "ethereum" },
|
|
23
|
+
};
|
|
24
|
+
const baseTransaction = {
|
|
25
|
+
amount: new bignumber_js_1.default(100_000),
|
|
26
|
+
fees: new bignumber_js_1.default(500),
|
|
27
|
+
recipient: "0xrecipient",
|
|
28
|
+
family: "family",
|
|
29
|
+
};
|
|
30
|
+
const txIntent = { mock: "intent" };
|
|
39
31
|
beforeEach(() => {
|
|
40
32
|
jest.clearAllMocks();
|
|
33
|
+
utils_1.transactionToIntent.mockReturnValue(txIntent);
|
|
41
34
|
});
|
|
42
|
-
it("
|
|
35
|
+
it("updates fees if they differ", async () => {
|
|
36
|
+
const newFee = new bignumber_js_1.default(700);
|
|
43
37
|
alpaca_1.getAlpacaApi.mockReturnValue({
|
|
44
|
-
estimateFees: jest.fn().mockResolvedValue({ value:
|
|
45
|
-
getAssetFromToken: jest.fn().mockImplementation((token, owner) => {
|
|
46
|
-
return {
|
|
47
|
-
assetOwner: owner,
|
|
48
|
-
assetReference: token.contractAddress,
|
|
49
|
-
};
|
|
50
|
-
}),
|
|
51
|
-
});
|
|
52
|
-
jest.spyOn(accountModule, "decodeTokenAccountId").mockImplementation(accountId => {
|
|
53
|
-
const token = accountId === "ethereum_usdc_sub_account"
|
|
54
|
-
? { contractAddress: "usdc_contract" }
|
|
55
|
-
: undefined;
|
|
56
|
-
return { accountId, token };
|
|
38
|
+
estimateFees: jest.fn().mockResolvedValue({ value: newFee }),
|
|
57
39
|
});
|
|
58
40
|
const prepareTransaction = (0, prepareTransaction_1.genericPrepareTransaction)(network, kind);
|
|
59
|
-
const
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
recipient: "0xrecipient",
|
|
63
|
-
family: "family",
|
|
64
|
-
subAccountId: "ethereum_usdc_sub_account",
|
|
65
|
-
});
|
|
66
|
-
expect(resultUsdcToken).toEqual({
|
|
67
|
-
amount: new bignumber_js_1.default(100_000),
|
|
68
|
-
fees: new bignumber_js_1.default(500),
|
|
69
|
-
recipient: "0xrecipient",
|
|
70
|
-
family: "family",
|
|
71
|
-
assetReference: "usdc_contract",
|
|
72
|
-
assetOwner: "0xabc",
|
|
73
|
-
subAccountId: "ethereum_usdc_sub_account",
|
|
74
|
-
});
|
|
75
|
-
const resultUnknownToken = await prepareTransaction({ currency: { id: "ethereum", units: [{}] } }, {
|
|
76
|
-
amount: new bignumber_js_1.default(100_000),
|
|
77
|
-
fees: new bignumber_js_1.default(500),
|
|
78
|
-
recipient: "0xrecipient",
|
|
79
|
-
family: "family",
|
|
80
|
-
subAccountId: "ethereum_unknown_sub_account",
|
|
81
|
-
});
|
|
82
|
-
expect(resultUnknownToken).toEqual({
|
|
83
|
-
amount: new bignumber_js_1.default(100_000),
|
|
84
|
-
fees: new bignumber_js_1.default(500),
|
|
85
|
-
recipient: "0xrecipient",
|
|
86
|
-
family: "family",
|
|
87
|
-
assetReference: "",
|
|
88
|
-
assetOwner: "",
|
|
89
|
-
subAccountId: "ethereum_unknown_sub_account",
|
|
90
|
-
});
|
|
41
|
+
const result = await prepareTransaction(account, { ...baseTransaction });
|
|
42
|
+
expect(result.fees.toString()).toBe(newFee.toString());
|
|
43
|
+
expect(utils_1.transactionToIntent).toHaveBeenCalledWith(account, expect.objectContaining(baseTransaction), undefined);
|
|
91
44
|
});
|
|
92
|
-
it
|
|
93
|
-
|
|
94
|
-
["all native amount on staking scenarios", { mode: "stake" }, new bignumber_js_1.default(42)],
|
|
95
|
-
["all native amount on unstaking scenarios", { mode: "unstake" }, new bignumber_js_1.default(42)],
|
|
96
|
-
[
|
|
97
|
-
"all token amount",
|
|
98
|
-
{ subAccountId: "ethereum_usdc_sub_account", useAllAmount: true },
|
|
99
|
-
new bignumber_js_1.default(5),
|
|
100
|
-
],
|
|
101
|
-
[
|
|
102
|
-
"all token amount on staking scenarios",
|
|
103
|
-
{ subAccountId: "ethereum_usdc_sub_account", mode: "stake" },
|
|
104
|
-
new bignumber_js_1.default(5),
|
|
105
|
-
],
|
|
106
|
-
[
|
|
107
|
-
"all token amount on unstaking scenarios",
|
|
108
|
-
{ subAccountId: "ethereum_usdc_sub_account", mode: "unstake" },
|
|
109
|
-
new bignumber_js_1.default(5),
|
|
110
|
-
],
|
|
111
|
-
])("uses %s, updating the amount", async (_s, partialTransaction, expectedAmount) => {
|
|
45
|
+
it("returns original transaction if fees are the same", async () => {
|
|
46
|
+
const sameFee = baseTransaction.fees;
|
|
112
47
|
alpaca_1.getAlpacaApi.mockReturnValue({
|
|
113
|
-
estimateFees: jest.fn().mockResolvedValue({ value:
|
|
114
|
-
getAssetFromToken: jest.fn().mockImplementation((token, owner) => {
|
|
115
|
-
return {
|
|
116
|
-
assetOwner: owner,
|
|
117
|
-
assetReference: token.contractAddress,
|
|
118
|
-
};
|
|
119
|
-
}),
|
|
120
|
-
});
|
|
121
|
-
jest.spyOn(accountModule, "decodeTokenAccountId").mockImplementation(accountId => {
|
|
122
|
-
const token = accountId === "ethereum_usdc_sub_account"
|
|
123
|
-
? { contractAddress: "usdc_contract" }
|
|
124
|
-
: undefined;
|
|
125
|
-
return { accountId, token };
|
|
48
|
+
estimateFees: jest.fn().mockResolvedValue({ value: sameFee }),
|
|
126
49
|
});
|
|
127
50
|
const prepareTransaction = (0, prepareTransaction_1.genericPrepareTransaction)(network, kind);
|
|
128
|
-
const result = await prepareTransaction(
|
|
129
|
-
|
|
130
|
-
spendableBalance: new bignumber_js_1.default(50),
|
|
131
|
-
subAccounts: [{ id: "ethereum_usdc_sub_account", spendableBalance: new bignumber_js_1.default(5) }],
|
|
132
|
-
}, {
|
|
133
|
-
amount: new bignumber_js_1.default(0),
|
|
134
|
-
recipient: "0xrecipient",
|
|
135
|
-
family: "family",
|
|
136
|
-
...partialTransaction,
|
|
137
|
-
});
|
|
138
|
-
expect(result).toMatchObject({
|
|
139
|
-
amount: expectedAmount,
|
|
140
|
-
fees: new bignumber_js_1.default(8),
|
|
141
|
-
recipient: "0xrecipient",
|
|
142
|
-
family: "family",
|
|
143
|
-
});
|
|
51
|
+
const result = await prepareTransaction(account, baseTransaction);
|
|
52
|
+
expect(result).toBe(baseTransaction);
|
|
144
53
|
});
|
|
145
|
-
it("
|
|
54
|
+
it("sets fee if original fees are undefined", async () => {
|
|
55
|
+
const newFee = new bignumber_js_1.default(1234);
|
|
146
56
|
alpaca_1.getAlpacaApi.mockReturnValue({
|
|
147
|
-
estimateFees: jest.fn().mockResolvedValue({ value:
|
|
57
|
+
estimateFees: jest.fn().mockResolvedValue({ value: newFee }),
|
|
148
58
|
});
|
|
59
|
+
const txWithoutFees = { ...baseTransaction, fees: undefined };
|
|
149
60
|
const prepareTransaction = (0, prepareTransaction_1.genericPrepareTransaction)(network, kind);
|
|
150
|
-
const result = await prepareTransaction(
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
recipient: "0xrecipient",
|
|
154
|
-
family: "family",
|
|
155
|
-
});
|
|
156
|
-
expect(result).toEqual({
|
|
157
|
-
amount: new bignumber_js_1.default(100_000),
|
|
158
|
-
fees: new bignumber_js_1.default(700),
|
|
159
|
-
recipient: "0xrecipient",
|
|
160
|
-
family: "family",
|
|
161
|
-
assetReference: "",
|
|
162
|
-
assetOwner: "",
|
|
163
|
-
});
|
|
61
|
+
const result = await prepareTransaction(account, txWithoutFees);
|
|
62
|
+
expect(result.fees.toString()).toBe(newFee.toString());
|
|
63
|
+
expect(result).not.toBe(txWithoutFees);
|
|
164
64
|
});
|
|
165
|
-
it("
|
|
65
|
+
it("returns original if fees are BigNumber-equal but different instance", async () => {
|
|
66
|
+
const sameValue = new bignumber_js_1.default(baseTransaction.fees.toString()); // different instance
|
|
166
67
|
alpaca_1.getAlpacaApi.mockReturnValue({
|
|
167
|
-
estimateFees: jest.fn().mockResolvedValue({ value:
|
|
68
|
+
estimateFees: jest.fn().mockResolvedValue({ value: sameValue }),
|
|
168
69
|
});
|
|
169
70
|
const prepareTransaction = (0, prepareTransaction_1.genericPrepareTransaction)(network, kind);
|
|
170
|
-
const result = await prepareTransaction(
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
71
|
+
const result = await prepareTransaction(account, baseTransaction);
|
|
72
|
+
expect(result).toBe(baseTransaction); // still same reference
|
|
73
|
+
});
|
|
74
|
+
it("propagates storageLimit from second estimation", async () => {
|
|
75
|
+
const estimatedFee = new bignumber_js_1.default(491);
|
|
76
|
+
const estimateFeesFirstCall = jest.fn().mockResolvedValue({
|
|
77
|
+
value: estimatedFee,
|
|
78
|
+
parameters: { storageLimit: 300 },
|
|
176
79
|
});
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
customFees: { parameters: { fees: new bignumber_js_1.default(600) } },
|
|
181
|
-
recipient: "0xrecipient",
|
|
182
|
-
family: "family",
|
|
183
|
-
assetReference: "",
|
|
184
|
-
assetOwner: "",
|
|
80
|
+
const estimateFeesSecondCall = jest.fn().mockResolvedValue({
|
|
81
|
+
value: estimatedFee,
|
|
82
|
+
parameters: { storageLimit: 0 },
|
|
185
83
|
});
|
|
186
|
-
});
|
|
187
|
-
it("propagates estimated 'storageLimit'", async () => {
|
|
188
84
|
alpaca_1.getAlpacaApi.mockReturnValue({
|
|
189
85
|
estimateFees: jest
|
|
190
86
|
.fn()
|
|
191
|
-
.
|
|
87
|
+
.mockImplementationOnce(() => estimateFeesFirstCall())
|
|
88
|
+
.mockImplementationOnce(() => estimateFeesSecondCall()),
|
|
192
89
|
});
|
|
90
|
+
const txWithoutCustomFees = { ...baseTransaction, customFees: undefined };
|
|
193
91
|
const prepareTransaction = (0, prepareTransaction_1.genericPrepareTransaction)(network, kind);
|
|
194
|
-
const result = await prepareTransaction(
|
|
195
|
-
|
|
196
|
-
fees:
|
|
197
|
-
|
|
198
|
-
|
|
92
|
+
const result = await prepareTransaction(account, txWithoutCustomFees);
|
|
93
|
+
expect(result).toEqual(expect.objectContaining({
|
|
94
|
+
fees: estimatedFee,
|
|
95
|
+
storageLimit: new bignumber_js_1.default(0),
|
|
96
|
+
customFees: {
|
|
97
|
+
parameters: {
|
|
98
|
+
fees: undefined,
|
|
99
|
+
},
|
|
100
|
+
},
|
|
101
|
+
}));
|
|
102
|
+
expect(alpaca_1.getAlpacaApi().estimateFees).toHaveBeenCalledTimes(2);
|
|
103
|
+
});
|
|
104
|
+
it("propagates storageLimit showing new account scenario", async () => {
|
|
105
|
+
const estimatedFee = new bignumber_js_1.default(491);
|
|
106
|
+
const estimateFeesFirstCall = jest.fn().mockResolvedValue({
|
|
107
|
+
value: estimatedFee,
|
|
108
|
+
parameters: { storageLimit: 300 },
|
|
199
109
|
});
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
storageLimit: new bignumber_js_1.default(277),
|
|
204
|
-
recipient: "0xrecipient",
|
|
205
|
-
family: "family",
|
|
206
|
-
assetReference: "",
|
|
207
|
-
assetOwner: "",
|
|
110
|
+
const estimateFeesSecondCall = jest.fn().mockResolvedValue({
|
|
111
|
+
value: estimatedFee,
|
|
112
|
+
parameters: { storageLimit: 277 },
|
|
208
113
|
});
|
|
209
|
-
});
|
|
210
|
-
it("keeps the amount used during the estimation when using all native amount", async () => {
|
|
211
114
|
alpaca_1.getAlpacaApi.mockReturnValue({
|
|
212
|
-
estimateFees: jest
|
|
115
|
+
estimateFees: jest
|
|
116
|
+
.fn()
|
|
117
|
+
.mockImplementationOnce(() => estimateFeesFirstCall())
|
|
118
|
+
.mockImplementationOnce(() => estimateFeesSecondCall()),
|
|
213
119
|
});
|
|
120
|
+
const txWithoutCustomFees = { ...baseTransaction, customFees: undefined };
|
|
214
121
|
const prepareTransaction = (0, prepareTransaction_1.genericPrepareTransaction)(network, kind);
|
|
215
|
-
const result = await prepareTransaction(
|
|
216
|
-
|
|
217
|
-
fees:
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
family: "family",
|
|
227
|
-
assetReference: "",
|
|
228
|
-
assetOwner: "",
|
|
229
|
-
useAllAmount: true,
|
|
230
|
-
});
|
|
122
|
+
const result = await prepareTransaction(account, txWithoutCustomFees);
|
|
123
|
+
expect(result).toEqual(expect.objectContaining({
|
|
124
|
+
fees: estimatedFee,
|
|
125
|
+
storageLimit: new bignumber_js_1.default(277),
|
|
126
|
+
customFees: {
|
|
127
|
+
parameters: {
|
|
128
|
+
fees: undefined,
|
|
129
|
+
},
|
|
130
|
+
},
|
|
131
|
+
}));
|
|
132
|
+
expect(alpaca_1.getAlpacaApi().estimateFees).toHaveBeenCalledTimes(2);
|
|
231
133
|
});
|
|
232
134
|
});
|
|
233
135
|
//# sourceMappingURL=prepareTransaction.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareTransaction.test.js","sourceRoot":"","sources":["../../../../src/bridge/generic-alpaca/tests/prepareTransaction.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"prepareTransaction.test.js","sourceRoot":"","sources":["../../../../src/bridge/generic-alpaca/tests/prepareTransaction.test.ts"],"names":[],"mappings":";;;;;AAAA,8DAAkE;AAClE,sCAAyC;AACzC,oCAA+C;AAC/C,gEAAqC;AAErC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC;IAC5B,YAAY,EAAE,IAAI,CAAC,EAAE,EAAE;CACxB,CAAC,CAAC,CAAC;AAEJ,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;IAC3B,mBAAmB,EAAE,IAAI,CAAC,EAAE,EAAE;CAC/B,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACzC,MAAM,OAAO,GAAG,SAAS,CAAC;IAC1B,MAAM,IAAI,GAAG,OAAO,CAAC;IAErB,MAAM,OAAO,GAAG;QACd,EAAE,EAAE,cAAc;QAClB,OAAO,EAAE,OAAO;QAChB,QAAQ,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE;KACtB,CAAC;IAET,MAAM,eAAe,GAAG;QACtB,MAAM,EAAE,IAAI,sBAAS,CAAC,OAAO,CAAC;QAC9B,IAAI,EAAE,IAAI,sBAAS,CAAC,GAAG,CAAC;QACxB,SAAS,EAAE,aAAa;QACxB,MAAM,EAAE,QAAQ;KACjB,CAAC;IAEF,MAAM,QAAQ,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAEpC,UAAU,CAAC,GAAG,EAAE;QACd,IAAI,CAAC,aAAa,EAAE,CAAC;QACpB,2BAAiC,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;QAC3C,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC,GAAG,CAAC,CAAC;QAEjC,qBAA0B,CAAC,eAAe,CAAC;YAC1C,YAAY,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;SAC7D,CAAC,CAAC;QAEH,MAAM,kBAAkB,GAAG,IAAA,8CAAyB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,OAAO,EAAE,EAAE,GAAG,eAAe,EAAE,CAAC,CAAC;QAEzE,MAAM,CAAE,MAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QAChE,MAAM,CAAC,2BAAmB,CAAC,CAAC,oBAAoB,CAC9C,OAAO,EACP,MAAM,CAAC,gBAAgB,CAAC,eAAe,CAAC,EACxC,SAAS,CACV,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;QACjE,MAAM,OAAO,GAAG,eAAe,CAAC,IAAI,CAAC;QAEpC,qBAA0B,CAAC,eAAe,CAAC;YAC1C,YAAY,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;SAC9D,CAAC,CAAC;QAEH,MAAM,kBAAkB,GAAG,IAAA,8CAAyB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QAElE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;QACvD,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC,IAAI,CAAC,CAAC;QAClC,qBAA0B,CAAC,eAAe,CAAC;YAC1C,YAAY,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;SAC7D,CAAC,CAAC;QAEH,MAAM,aAAa,GAAG,EAAE,GAAG,eAAe,EAAE,IAAI,EAAE,SAAgB,EAAE,CAAC;QACrE,MAAM,kBAAkB,GAAG,IAAA,8CAAyB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAEhE,MAAM,CAAE,MAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QAChE,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qEAAqE,EAAE,KAAK,IAAI,EAAE;QACnF,MAAM,SAAS,GAAG,IAAI,sBAAS,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,qBAAqB;QACtF,qBAA0B,CAAC,eAAe,CAAC;YAC1C,YAAY,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;SAChE,CAAC,CAAC;QAEH,MAAM,kBAAkB,GAAG,IAAA,8CAAyB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QAElE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,uBAAuB;IAC/D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;QAC9D,MAAM,YAAY,GAAG,IAAI,sBAAS,CAAC,GAAG,CAAC,CAAC;QAExC,MAAM,qBAAqB,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC;YACxD,KAAK,EAAE,YAAY;YACnB,UAAU,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE;SAClC,CAAC,CAAC;QAEH,MAAM,sBAAsB,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC;YACzD,KAAK,EAAE,YAAY;YACnB,UAAU,EAAE,EAAE,YAAY,EAAE,CAAC,EAAE;SAChC,CAAC,CAAC;QAEF,qBAA0B,CAAC,eAAe,CAAC;YAC1C,YAAY,EAAE,IAAI;iBACf,EAAE,EAAE;iBACJ,sBAAsB,CAAC,GAAG,EAAE,CAAC,qBAAqB,EAAE,CAAC;iBACrD,sBAAsB,CAAC,GAAG,EAAE,CAAC,sBAAsB,EAAE,CAAC;SAC1D,CAAC,CAAC;QAEH,MAAM,mBAAmB,GAAG,EAAE,GAAG,eAAe,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;QAC1E,MAAM,kBAAkB,GAAG,IAAA,8CAAyB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;QAEtE,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CACpB,MAAM,CAAC,gBAAgB,CAAC;YACtB,IAAI,EAAE,YAAY;YAClB,YAAY,EAAE,IAAI,sBAAS,CAAC,CAAC,CAAC;YAC9B,UAAU,EAAE;gBACV,UAAU,EAAE;oBACV,IAAI,EAAE,SAAS;iBAChB;aACF;SACF,CAAC,CACH,CAAC;QAEF,MAAM,CAAE,qBAA0B,EAAE,CAAC,YAAY,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAC9E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;QACpE,MAAM,YAAY,GAAG,IAAI,sBAAS,CAAC,GAAG,CAAC,CAAC;QAExC,MAAM,qBAAqB,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC;YACxD,KAAK,EAAE,YAAY;YACnB,UAAU,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE;SAClC,CAAC,CAAC;QAEH,MAAM,sBAAsB,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC;YACzD,KAAK,EAAE,YAAY;YACnB,UAAU,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE;SAClC,CAAC,CAAC;QAEF,qBAA0B,CAAC,eAAe,CAAC;YAC1C,YAAY,EAAE,IAAI;iBACf,EAAE,EAAE;iBACJ,sBAAsB,CAAC,GAAG,EAAE,CAAC,qBAAqB,EAAE,CAAC;iBACrD,sBAAsB,CAAC,GAAG,EAAE,CAAC,sBAAsB,EAAE,CAAC;SAC1D,CAAC,CAAC;QAEH,MAAM,mBAAmB,GAAG,EAAE,GAAG,eAAe,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;QAC1E,MAAM,kBAAkB,GAAG,IAAA,8CAAyB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;QAEtE,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CACpB,MAAM,CAAC,gBAAgB,CAAC;YACtB,IAAI,EAAE,YAAY;YAClB,YAAY,EAAE,IAAI,sBAAS,CAAC,GAAG,CAAC;YAChC,UAAU,EAAE;gBACV,UAAU,EAAE;oBACV,IAAI,EAAE,SAAS;iBAChB;aACF;SACF,CAAC,CACH,CAAC;QAEF,MAAM,CAAE,qBAA0B,EAAE,CAAC,YAAY,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAC9E,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -45,7 +45,7 @@ function adaptCoreOperationToLiveOperation(accountId, op) {
|
|
|
45
45
|
hash: op.tx.hash,
|
|
46
46
|
accountId,
|
|
47
47
|
type: opType,
|
|
48
|
-
value: op.asset.type === "native" && ["OUT", "FEES"].includes(opType)
|
|
48
|
+
value: op.asset.type === "native" && ["OUT", "FEES", "DELEGATE", "UNDELEGATE"].includes(opType)
|
|
49
49
|
? new bignumber_js_1.default(op.value.toString()).plus(bnFees)
|
|
50
50
|
: new bignumber_js_1.default(op.value.toString()),
|
|
51
51
|
fee: bnFees,
|