@ledgerhq/live-cli 24.15.1-nightly.2 → 24.15.1-nightly.4

package/lib/cli.js

@@ -187,7 +187,7 @@ function getAltStatusMessage(code) {
     return "Internal error, please report";
   }
 }
-var AccountNameRequiredError, AccountNotSupported, AccountAwaitingSendPendingOperations, AmountRequired, BluetoothRequired, BtcUnmatchedApp, CantOpenDevice, CashAddrNotSupported, ClaimRewardsFeesWarning, CurrencyNotSupported, DeviceAppVerifyNotSupported, DeviceGenuineSocketEarlyClose, DeviceNotGenuineError, DeviceOnDashboardExpected, DeviceOnDashboardUnexpected, DeviceInOSUExpected, DeviceHalted, DeviceNameInvalid, DeviceSocketFail, DeviceSocketNoBulkStatus, DeviceNeedsRestart, UnresponsiveDeviceError, DisconnectedDevice, DisconnectedDeviceDuringOperation, DeviceExtractOnboardingStateError, DeviceOnboardingStatePollingError, EnpointConfigError, EthAppPleaseEnableContractData, FeeEstimationFailed, FirmwareNotRecognized, HardResetFail, InvalidXRPTag, InvalidAddress, InvalidNonce, InvalidAddressBecauseDestinationIsAlsoSource, LatestMCUInstalledError, UnknownMCU, LedgerAPIError, LedgerAPIErrorWithMessage, LedgerAPINotAvailable, ManagerAppAlreadyInstalledError, ManagerAppRelyOnBTCError, ManagerAppDepInstallRequired, ManagerAppDepUninstallRequired, ManagerDeviceLockedError, ManagerFirmwareNotEnoughSpaceError, ManagerNotEnoughSpaceError, ManagerUninstallBTCDep, NetworkDown, NetworkError, NoAddressesFound, NotEnoughBalance, NotEnoughBalanceSwap, NotEnoughBalanceToDelegate, NotEnoughBalanceInParentAccount, NotEnoughSpendableBalance, NotEnoughBalanceBecauseDestinationNotCreated, NoAccessToCamera, NotEnoughGas, NotEnoughGasSwap, TronEmptyAccount, MaybeKeepTronAccountAlive, NotSupportedLegacyAddress, GasLessThanEstimate, PriorityFeeTooLow, PriorityFeeTooHigh, PriorityFeeHigherThanMaxFee, MaxFeeTooLow, PasswordsDontMatchError, PasswordIncorrectError, RecommendSubAccountsToEmpty, RecommendUndelegation, TimeoutTagged, UnexpectedBootloader, MCUNotGenuineToDashboard, RecipientRequired, UnavailableTezosOriginatedAccountReceive, UnavailableTezosOriginatedAccountSend, UpdateFetchFileFail, UpdateIncorrectHash, UpdateIncorrectSig, UpdateYourApp, UserRefusedDeviceNameChange, UserRefusedAddress, UserRefusedFirmwareUpdate, UserRefusedAllowManager, UserRefusedOnDevice, PinNotSet, ExpertModeRequired, TransportOpenUserCancelled, TransportInterfaceNotAvailable, TransportRaceCondition, TransportWebUSBGestureRequired, TransactionHasBeenValidatedError, TransportExchangeTimeoutError, DeviceShouldStayInApp, WebsocketConnectionError, WebsocketConnectionFailed, WrongDeviceForAccount, WrongDeviceForAccountPayout, WrongDeviceForAccountRefund, WrongAppForCurrency, ETHAddressNonEIP, CantScanQRCode, FeeNotLoaded, FeeNotLoadedSwap, FeeRequired, FeeTooHigh, PendingOperation, SyncError, PairingFailed, PeerRemovedPairing, GenuineCheckFailed, LedgerAPI4xx, LedgerAPI5xx, FirmwareOrAppUpdateRequired, ReplacementTransactionUnderpriced, OpReturnDataSizeLimit, DustLimit, LanguageNotFound, NoDBPathGiven, DBWrongPassword, DBNotReset, SequenceNumberError, DisabledTransactionBroadcastError, HwTransportErrorType, TransportError, StatusCodes, TransportStatusError, LockedDeviceError;
+var AccountNameRequiredError, AccountNotSupported, AccountAwaitingSendPendingOperations, AmountRequired, BluetoothRequired, BtcUnmatchedApp, CantOpenDevice, CashAddrNotSupported, ClaimRewardsFeesWarning, CurrencyNotSupported, DeviceAppVerifyNotSupported, DeviceGenuineSocketEarlyClose, DeviceNotGenuineError, DeviceOnDashboardExpected, DeviceOnDashboardUnexpected, DeviceInOSUExpected, DeviceHalted, DeviceNameInvalid, DeviceSocketFail, DeviceSocketNoBulkStatus, DeviceNeedsRestart, UnresponsiveDeviceError, DisconnectedDevice, DisconnectedDeviceDuringOperation, DeviceExtractOnboardingStateError, DeviceOnboardingStatePollingError, EnpointConfigError, EthAppPleaseEnableContractData, FeeEstimationFailed, FirmwareNotRecognized, HardResetFail, InvalidXRPTag, InvalidAddress, InvalidNonce, InvalidAddressBecauseDestinationIsAlsoSource, LatestMCUInstalledError, UnknownMCU, LedgerAPIError, LedgerAPIErrorWithMessage, LedgerAPINotAvailable, ManagerAppAlreadyInstalledError, ManagerAppRelyOnBTCError, ManagerAppDepInstallRequired, ManagerAppDepUninstallRequired, ManagerDeviceLockedError, ManagerFirmwareNotEnoughSpaceError, ManagerNotEnoughSpaceError, ManagerUninstallBTCDep, NetworkDown, NetworkError, NoAddressesFound, NotEnoughBalance, NotEnoughBalanceFees, NotEnoughBalanceSwap, NotEnoughBalanceToDelegate, NotEnoughBalanceInParentAccount, NotEnoughSpendableBalance, NotEnoughBalanceBecauseDestinationNotCreated, NoAccessToCamera, NotEnoughGas, NotEnoughGasSwap, TronEmptyAccount, MaybeKeepTronAccountAlive, NotSupportedLegacyAddress, GasLessThanEstimate, PriorityFeeTooLow, PriorityFeeTooHigh, PriorityFeeHigherThanMaxFee, MaxFeeTooLow, PasswordsDontMatchError, PasswordIncorrectError, RecommendSubAccountsToEmpty, RecommendUndelegation, TimeoutTagged, UnexpectedBootloader, MCUNotGenuineToDashboard, RecipientRequired, UnavailableTezosOriginatedAccountReceive, UnavailableTezosOriginatedAccountSend, UpdateFetchFileFail, UpdateIncorrectHash, UpdateIncorrectSig, UpdateYourApp, UserRefusedDeviceNameChange, UserRefusedAddress, UserRefusedFirmwareUpdate, UserRefusedAllowManager, UserRefusedOnDevice, PinNotSet, ExpertModeRequired, TransportOpenUserCancelled, TransportInterfaceNotAvailable, TransportRaceCondition, TransportWebUSBGestureRequired, TransactionHasBeenValidatedError, TransportExchangeTimeoutError, DeviceShouldStayInApp, WebsocketConnectionError, WebsocketConnectionFailed, WrongDeviceForAccount, WrongDeviceForAccountPayout, WrongDeviceForAccountRefund, WrongAppForCurrency, ETHAddressNonEIP, CantScanQRCode, FeeNotLoaded, FeeNotLoadedSwap, FeeRequired, FeeTooHigh, PendingOperation, SyncError, PairingFailed, PeerRemovedPairing, GenuineCheckFailed, LedgerAPI4xx, LedgerAPI5xx, FirmwareOrAppUpdateRequired, ReplacementTransactionUnderpriced, OpReturnDataSizeLimit, DustLimit, LanguageNotFound, NoDBPathGiven, DBWrongPassword, DBNotReset, SequenceNumberError, DisabledTransactionBroadcastError, HwTransportErrorType, TransportError, StatusCodes, TransportStatusError, LockedDeviceError;
 var init_lib_es = __esm({
   "../../libs/ledgerjs/packages/errors/lib-es/index.js"() {
     "use strict";
@@ -244,6 +244,7 @@ var init_lib_es = __esm({
     NetworkError = createCustomErrorClass("NetworkError");
     NoAddressesFound = createCustomErrorClass("NoAddressesFound");
     NotEnoughBalance = createCustomErrorClass("NotEnoughBalance");
+    NotEnoughBalanceFees = createCustomErrorClass("NotEnoughBalanceFees");
     NotEnoughBalanceSwap = createCustomErrorClass("NotEnoughBalanceSwap");
     NotEnoughBalanceToDelegate = createCustomErrorClass("NotEnoughBalanceToDelegate");
     NotEnoughBalanceInParentAccount = createCustomErrorClass("NotEnoughBalanceInParentAccount");
@@ -63794,14 +63795,14 @@ var require_crypto = __commonJS({
   "../../node_modules/.pnpm/bip32@2.0.6/node_modules/bip32/src/crypto.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    var createHash3 = require_create_hash();
+    var createHash4 = require_create_hash();
     var createHmac3 = require_create_hmac();
     function hash1605(buffer2) {
-      const sha256Hash = createHash3("sha256").update(buffer2).digest();
+      const sha256Hash = createHash4("sha256").update(buffer2).digest();
       try {
-        return createHash3("rmd160").update(sha256Hash).digest();
+        return createHash4("rmd160").update(sha256Hash).digest();
       } catch (err) {
-        return createHash3("ripemd160").update(sha256Hash).digest();
+        return createHash4("ripemd160").update(sha256Hash).digest();
       }
     }
     exports2.hash160 = hash1605;
@@ -64001,11 +64002,11 @@ var require_base = __commonJS({
 var require_bs58check = __commonJS({
   "../../node_modules/.pnpm/bs58check@2.1.2/node_modules/bs58check/index.js"(exports2, module2) {
     "use strict";
-    var createHash3 = require_create_hash();
+    var createHash4 = require_create_hash();
     var bs58checkBase2 = require_base();
     function sha256x2(buffer2) {
-      var tmp = createHash3("sha256").update(buffer2).digest();
-      return createHash3("sha256").update(tmp).digest();
+      var tmp = createHash4("sha256").update(buffer2).digest();
+      return createHash4("sha256").update(tmp).digest();
     }
     module2.exports = bs58checkBase2(sha256x2);
   }
@@ -72706,21 +72707,21 @@ var require_crypto2 = __commonJS({
   "../../node_modules/.pnpm/bitcoinjs-lib@5.2.0/node_modules/bitcoinjs-lib/src/crypto.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    var createHash3 = require_create_hash();
+    var createHash4 = require_create_hash();
     function ripemd1608(buffer2) {
       try {
-        return createHash3("rmd160").update(buffer2).digest();
+        return createHash4("rmd160").update(buffer2).digest();
       } catch (err) {
-        return createHash3("ripemd160").update(buffer2).digest();
+        return createHash4("ripemd160").update(buffer2).digest();
       }
     }
     exports2.ripemd160 = ripemd1608;
     function sha13(buffer2) {
-      return createHash3("sha1").update(buffer2).digest();
+      return createHash4("sha1").update(buffer2).digest();
     }
     exports2.sha1 = sha13;
     function sha25616(buffer2) {
-      return createHash3("sha256").update(buffer2).digest();
+      return createHash4("sha256").update(buffer2).digest();
     }
     exports2.sha256 = sha25616;
     function hash1605(buffer2) {
@@ -104261,8 +104262,8 @@ var require_lib6 = __commonJS({
           const buffer2 = await crypto36.web.subtle.digest("SHA-256", concatBytes9(...messages));
           return new Uint8Array(buffer2);
         } else if (crypto36.node) {
-          const { createHash: createHash3 } = crypto36.node;
-          const hash12 = createHash3("sha256");
+          const { createHash: createHash4 } = crypto36.node;
+          const hash12 = createHash4("sha256");
           messages.forEach((m63) => hash12.update(m63));
           return Uint8Array.from(hash12.digest());
         } else {
@@ -232335,7 +232336,7 @@ var require_blake2b4 = __commonJS({
       return n59.toString(16);
     }
     var Proto = Blake2b;
-    module2.exports = function createHash3(outlen, key2, salt2, personal, noAssert) {
+    module2.exports = function createHash4(outlen, key2, salt2, personal, noAssert) {
       if (noAssert !== true) {
         assert10(outlen >= BYTES_MIN, "outlen must be at least " + BYTES_MIN + ", was given " + outlen);
         assert10(outlen <= BYTES_MAX, "outlen must be at most " + BYTES_MAX + ", was given " + outlen);
@@ -322749,10 +322750,10 @@ var require_server4 = __commonJS({
                 }
             }, _callee, this);
           }));
-          function getAccount10(_x) {
+          function getAccount11(_x) {
             return _getAccount2.apply(this, arguments);
           }
-          return getAccount10;
+          return getAccount11;
         }()
       }, {
         key: "getHealth",
@@ -328322,7 +328323,7 @@ var require_blake2b7 = __commonJS({
       return n59.toString(16);
     }
     var Proto = Blake2b;
-    module2.exports = function createHash3(outlen, key2, salt2, personal, noAssert) {
+    module2.exports = function createHash4(outlen, key2, salt2, personal, noAssert) {
       if (noAssert !== true) {
         assert10(outlen >= BYTES_MIN, "outlen must be at least " + BYTES_MIN + ", was given " + outlen);
         assert10(outlen <= BYTES_MAX, "outlen must be at most " + BYTES_MAX + ", was given " + outlen);
@@ -352355,11 +352356,11 @@ var require_TonClient4 = __commonJS({
        */
       async getLastBlock() {
         let res = await __classPrivateFieldGet9(this, _TonClient4_axios, "f").get(__classPrivateFieldGet9(this, _TonClient4_endpoint, "f") + "/block/latest", { adapter: __classPrivateFieldGet9(this, _TonClient4_adapter, "f"), timeout: __classPrivateFieldGet9(this, _TonClient4_timeout, "f") });
-        let lastBlock5 = lastBlockCodec.safeParse(res.data);
-        if (!lastBlock5.success) {
-          throw Error("Mailformed response: " + lastBlock5.error.format()._errors.join(", "));
+        let lastBlock6 = lastBlockCodec.safeParse(res.data);
+        if (!lastBlock6.success) {
+          throw Error("Mailformed response: " + lastBlock6.error.format()._errors.join(", "));
         }
-        return lastBlock5.data;
+        return lastBlock6.data;
       }
       /**
        * Get block info
@@ -394370,7 +394371,7 @@ var require_xrp_codec = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.isValidClassicAddress = exports2.decodeAccountPublic = exports2.encodeAccountPublic = exports2.encodeNodePublic = exports2.decodeNodePublic = exports2.decodeAddress = exports2.decodeAccountID = exports2.encodeAddress = exports2.encodeAccountID = exports2.decodeSeed = exports2.encodeSeed = exports2.codec = void 0;
     var baseCodec = require_src6();
-    var createHash3 = require_create_hash();
+    var createHash4 = require_create_hash();
     var utils_12 = require_utils40();
     var Codec3 = class {
       constructor(options21) {
@@ -394460,7 +394461,7 @@ var require_xrp_codec = __commonJS({
     var ED25519_SEED = [1, 225, 75];
     var codecOptions = {
       sha256(bytes8) {
-        return createHash3("sha256").update(Buffer.from(bytes8)).digest();
+        return createHash4("sha256").update(Buffer.from(bytes8)).digest();
       },
       alphabet: "rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz"
     };
@@ -398896,14 +398897,14 @@ var require_hashes = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.transactionID = exports2.sha512Half = exports2.Sha512Half = void 0;
     var hash_prefixes_1 = require_hash_prefixes();
-    var createHash3 = require_create_hash();
+    var createHash4 = require_create_hash();
     var hash_256_1 = require_hash_256();
     var binary_serializer_1 = require_binary_serializer();
     var buffer_1 = require_buffer();
     var Sha512Half = class _Sha512Half extends binary_serializer_1.BytesList {
       constructor() {
         super(...arguments);
-        this.hash = createHash3("sha512");
+        this.hash = createHash4("sha512");
       }
       /**
        * Construct a new Sha512Hash and write bytes this.hash
@@ -430042,7 +430043,7 @@ var require_lib49 = __commonJS({
       return payload;
     };
     Method.prototype._confirmTransaction = function(defer10, result2, payload) {
-      var method2 = this, promiseResolved = false, canUnsubscribe = true, timeoutCount = 0, confirmationCount = 0, intervalId = null, blockHeaderTimeoutId = null, lastBlock5 = null, receiptJSON = "", gasProvided = !!payload.params[0] && typeof payload.params[0] === "object" && payload.params[0].gas ? payload.params[0].gas : null, isContractDeployment = !!payload.params[0] && typeof payload.params[0] === "object" && payload.params[0].data && payload.params[0].from && !payload.params[0].to, hasBytecode = isContractDeployment && payload.params[0].data.length > 2;
+      var method2 = this, promiseResolved = false, canUnsubscribe = true, timeoutCount = 0, confirmationCount = 0, intervalId = null, blockHeaderTimeoutId = null, lastBlock6 = null, receiptJSON = "", gasProvided = !!payload.params[0] && typeof payload.params[0] === "object" && payload.params[0].gas ? payload.params[0].gas : null, isContractDeployment = !!payload.params[0] && typeof payload.params[0] === "object" && payload.params[0].data && payload.params[0].from && !payload.params[0].to, hasBytecode = isContractDeployment && payload.params[0].data.length > 2;
       var _ethereumCalls = [
         new Method({
           name: "getBlockByNumber",
@@ -430120,15 +430121,15 @@ var require_lib49 = __commonJS({
                 var latestBlock = await _ethereumCall.getBlockByNumber("latest");
                 var latestBlockHash = latestBlock ? latestBlock.hash : null;
                 if (isPolling) {
-                  if (lastBlock5) {
-                    block2 = await _ethereumCall.getBlockByNumber(lastBlock5.number + 1);
+                  if (lastBlock6) {
+                    block2 = await _ethereumCall.getBlockByNumber(lastBlock6.number + 1);
                     if (block2) {
-                      lastBlock5 = block2;
+                      lastBlock6 = block2;
                       defer10.eventEmitter.emit("confirmation", confirmationCount, receipt, latestBlockHash);
                     }
                   } else {
                     block2 = await _ethereumCall.getBlockByNumber(receipt.blockNumber);
-                    lastBlock5 = block2;
+                    lastBlock6 = block2;
                     defer10.eventEmitter.emit("confirmation", confirmationCount, receipt, latestBlockHash);
                   }
                 } else {
@@ -438550,7 +438551,7 @@ var require_hash8 = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.rlphash = exports2.ripemd160FromArray = exports2.ripemd160FromString = exports2.ripemd160 = exports2.sha256FromArray = exports2.sha256FromString = exports2.sha256 = exports2.keccakFromArray = exports2.keccakFromHexString = exports2.keccakFromString = exports2.keccak256 = exports2.keccak = void 0;
     var keccak_1 = require_keccak11();
-    var createHash3 = require_create_hash();
+    var createHash4 = require_create_hash();
     var externals_1 = require_externals();
     var bytes_1 = require_bytes9();
     var helpers_1 = require_helpers8();
@@ -438597,7 +438598,7 @@ var require_hash8 = __commonJS({
     exports2.keccakFromArray = keccakFromArray;
     var _sha2562 = function(a86) {
       a86 = (0, bytes_1.toBuffer)(a86);
-      return createHash3("sha256").update(a86).digest();
+      return createHash4("sha256").update(a86).digest();
     };
     var sha25616 = function(a86) {
       (0, helpers_1.assertIsBuffer)(a86);
@@ -438616,7 +438617,7 @@ var require_hash8 = __commonJS({
     exports2.sha256FromArray = sha256FromArray;
     var _ripemd1602 = function(a86, padded) {
       a86 = (0, bytes_1.toBuffer)(a86);
-      const hash12 = createHash3("rmd160").update(a86).digest();
+      const hash12 = createHash4("rmd160").update(a86).digest();
       if (padded === true) {
         return (0, bytes_1.setLengthLeft)(hash12, 32);
       } else {
@@ -523375,7 +523376,7 @@ var require_package8 = __commonJS({
     module2.exports = {
       name: "@ledgerhq/live-common",
       description: "Common ground for the Ledger Live apps",
-      version: "34.29.0-nightly.2",
+      version: "34.29.0-nightly.4",
       repository: {
         type: "git",
         url: "https://github.com/LedgerHQ/ledger-live.git"
@@ -530176,7 +530177,7 @@ var require_package9 = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@ledgerhq/live-cli",
-      version: "24.15.1-nightly.2",
+      version: "24.15.1-nightly.4",
       description: "ledger-live CLI version",
       repository: {
         type: "git",
@@ -540507,6 +540508,18 @@ var spl_default = [["solana/spl/27g8mtk7vttcchkpasjsddkwwyfoqt6ggeukidvjidd4", "
 // ../../libs/ledgerjs/packages/cryptoassets/lib-es/data/spl.js
 var spl_default2 = spl_default;
 
+// ../../libs/ledgerjs/packages/cryptoassets/lib-es/data/apt_coin.json
+var apt_coin_default = [["aptos/coin/amnis_aptos_coin_0x111ae3e5bc816a5e63c2da97d0aa3886519e0cd5e4b046659fa35796bd11542a::amapt_token::amnisapt", "amAPT", "Amnis Aptos Coin", "0x111ae3e5bc816a5e63c2da97d0aa3886519e0cd5e4b046659fa35796bd11542a::amapt_token::AmnisApt", 8, false], ["aptos/coin/animeswap_coin_0x16fe2df00ea7dde4a63409201f7f4e536bde7bb7335526a35d05111e68aa322c::animecoin::ani", "ANI", "AnimeSwap Coin", "0x16fe2df00ea7dde4a63409201f7f4e536bde7bb7335526a35d05111e68aa322c::AnimeCoin::ANI", 8, false], ["aptos/coin/apartment_0x7b7bab2131de3e4f318b4abaa952f7c817b2c3df16c951caca809ac9ca9b650e::apartment::apartment", "APARTMENT", "Apartment", "0x7b7bab2131de3e4f318b4abaa952f7c817b2c3df16c951caca809ac9ca9b650e::APARTMENT::APARTMENT", 8, false], ["aptos/coin/apetos_0xada35ada7e43e2ee1c39633ffccec38b76ce702b4efc2e60b50f63fbe4f710d8::apetos_token::apetoscoin", "APE", "APETOS", "0xada35ada7e43e2ee1c39633ffccec38b76ce702b4efc2e60b50f63fbe4f710d8::apetos_token::ApetosCoin", 8, false], ["aptos/coin/aptos_fomo_0xf891d2e004973430cc2bbbee69f3d0f4adb9c7ae03137b4579f7bb9979283ee6::aptos_fomo::aptos_fomo", "FOMO", "APTOS FOMO", "0xf891d2e004973430cc2bbbee69f3d0f4adb9c7ae03137b4579f7bb9979283ee6::APTOS_FOMO::APTOS_FOMO", 6, false], ["aptos/coin/aptos_launch_token_0xd0b4efb4be7c3508d9a26a9b5405cf9f860d0b9e5fe2f498b90e68b8d2cedd3e::aptos_launch_token::aptoslaunchtoken", "ALT", "Aptos Launch Token", "0xd0b4efb4be7c3508d9a26a9b5405cf9f860d0b9e5fe2f498b90e68b8d2cedd3e::aptos_launch_token::AptosLaunchToken", 8, false], ["aptos/coin/blocto_token_0xfbab9fb68bd2103925317b6a540baa20087b1e7a7a4eb90badee04abb6b5a16f::blt::blt", "BLT", "Blocto Token", "0xfbab9fb68bd2103925317b6a540baa20087b1e7a7a4eb90badee04abb6b5a16f::blt::Blt", 8, false], ["aptos/coin/bluemove_0x27fafcc4e39daac97556af8a803dbb52bcb03f0821898dc845ac54225b9793eb::move_coin::movecoin", "MOVE", "BlueMove", "0x27fafcc4e39daac97556af8a803dbb52bcb03f0821898dc845ac54225b9793eb::move_coin::MoveCoin", 8, false], ["aptos/coin/bubbles_0xd6a49762f6e4f7401ee79be6f5d4111e70db1408966ba1aa204e6e10c9d437ca::bubbles::bubblescoin", "BUBBLES", "BUBBLES", "0xd6a49762f6e4f7401ee79be6f5d4111e70db1408966ba1aa204e6e10c9d437ca::bubbles::BubblesCoin", 8, false], ["aptos/coin/doodoo_0x73eb84966be67e4697fc5ae75173ca6c35089e802650f75422ab49a8729704ec::coin::doodoo", "doodoo", "DooDoo", "0x73eb84966be67e4697fc5ae75173ca6c35089e802650f75422ab49a8729704ec::coin::DooDoo", 8, false], ["aptos/coin/dstapt_0xd11107bdf0d6d7040c6c0bfbdecb6545191fdf13e8d8d259952f53e1713f61b5::staked_coin::stakedaptos", "dstAPT", "dstAPT", "0xd11107bdf0d6d7040c6c0bfbdecb6545191fdf13e8d8d259952f53e1713f61b5::staked_coin::StakedAptos", 8, false], ["aptos/coin/gari_wormhole_0x4def3d3dee27308886f0a3611dd161ce34f977a9a5de4e80b237225923492a2a::coin::t", "whGARI", "Gari (Wormhole)", "0x4def3d3dee27308886f0a3611dd161ce34f977a9a5de4e80b237225923492a2a::coin::T", 8, false], ["aptos/coin/gui_inu_0xe4ccb6d39136469f376242c31b34d10515c8eaaa38092f804db8e08a8f53c5b2::assets_v1::echocoin002", "GUI", "Gui Inu", "0xe4ccb6d39136469f376242c31b34d10515c8eaaa38092f804db8e08a8f53c5b2::assets_v1::EchoCoin002", 6, false], ["aptos/coin/heart_0x7de3fea83cd5ca0e1def27c3f3803af619882db51f34abf30dd04ad12ee6af31::tapos::heart", "HEART", "HEART", "0x7de3fea83cd5ca0e1def27c3f3803af619882db51f34abf30dd04ad12ee6af31::tapos::Heart", 8, false], ["aptos/coin/liquidswap_0x53a30a6e5936c0a4c5140daed34de39d17ca7fcae08f947c02e979cef98a3719::coin::lsd", "LSD", "Liquidswap", "0x53a30a6e5936c0a4c5140daed34de39d17ca7fcae08f947c02e979cef98a3719::coin::LSD", 8, false], ["aptos/coin/mojito_0x881ac202b1f1e6ad4efcff7a1d0579411533f2502417a19211cfc49751ddb5f4::coin::mojo", "MOJO", "Mojito", "0x881ac202b1f1e6ad4efcff7a1d0579411533f2502417a19211cfc49751ddb5f4::coin::MOJO", 8, false], ["aptos/coin/moo_moo_0xc5fbbcc4637aeebb4e732767abee8a21f2b0776f73b73e16ce13e7d31d6700da::moomoo::moomoo", "MOOMOO", "MOO MOO", "0xc5fbbcc4637aeebb4e732767abee8a21f2b0776f73b73e16ce13e7d31d6700da::MOOMOO::MOOMOO", 6, false], ["aptos/coin/move_dollar_0x6f986d146e4a90b828d8c12c14b6f4e003fdff11a8eecceceb63744363eaac01::mod_coin::mod", "MOD", "Move Dollar", "0x6f986d146e4a90b828d8c12c14b6f4e003fdff11a8eecceceb63744363eaac01::mod_coin::MOD", 8, false], ["aptos/coin/pancakeswap_token_0x159df6b7689437016108a019fd5bef736bac692b6d4a1f10c941f6fbb9a74ca6::oft::cakeoft", "Cake", "PancakeSwap Token", "0x159df6b7689437016108a019fd5bef736bac692b6d4a1f10c941f6fbb9a74ca6::oft::CakeOFT", 8, false], ["aptos/coin/returd_0xdf3d5eb83df80dfde8ceb1edaa24d8dbc46da6a89ae134a858338e1b86a29e38::coin::returd", "RETuRD", "Returd", "0xdf3d5eb83df80dfde8ceb1edaa24d8dbc46da6a89ae134a858338e1b86a29e38::coin::Returd", 8, false], ["aptos/coin/shrimp_0x55987edfab9a57f69bac759674f139ae473b5e09a9283848c1f87faf6fc1e789::shrimp::shrimpcoin", "SHRIMP", "SHRIMP", "0x55987edfab9a57f69bac759674f139ae473b5e09a9283848c1f87faf6fc1e789::shrimp::ShrimpCoin", 2, false], ["aptos/coin/solana_wormhole_0xdd89c0e695df0692205912fb69fc290418bed0dbe6e4573d744a6d5e6bab6c13::coin::t", "whSOL", "Solana (Wormhole)", "0xdd89c0e695df0692205912fb69fc290418bed0dbe6e4573d744a6d5e6bab6c13::coin::T", 8, false], ["aptos/coin/staked_aptos_coin_0x111ae3e5bc816a5e63c2da97d0aa3886519e0cd5e4b046659fa35796bd11542a::stapt_token::stakedapt", "stAPT", "Staked Aptos Coin", "0x111ae3e5bc816a5e63c2da97d0aa3886519e0cd5e4b046659fa35796bd11542a::stapt_token::StakedApt", 8, false], ["aptos/coin/staked_thala_apt_0xfaf4e633ae9eb31366c9ca24214231760926576c7b625313b3688b5e900731f6::staking::stakedthalaapt", "sthAPT", "Staked Thala APT", "0xfaf4e633ae9eb31366c9ca24214231760926576c7b625313b3688b5e900731f6::staking::StakedThalaAPT", 8, false], ["aptos/coin/tether_usd_celer_0x8d87a65ba30e09357fa2edea2c80dbac296e5dec2b18287113500b902942929d::celer_coin_manager::usdtcoin", "ceUSDT", "Tether USD (Celer)", "0x8d87a65ba30e09357fa2edea2c80dbac296e5dec2b18287113500b902942929d::celer_coin_manager::UsdtCoin", 6, false], ["aptos/coin/tether_usd_layerzero_0xf22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa::asset::usdt", "lzUSDT", "Tether USD (LayerZero)", "0xf22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa::asset::USDT", 6, false], ["aptos/coin/tether_usd_wormhole_0xa2eda21a58856fda86451436513b867c97eecb4ba099da5775520e0f7492e852::coin::t", "whUSDT", "Tether USD (Wormhole)", "0xa2eda21a58856fda86451436513b867c97eecb4ba099da5775520e0f7492e852::coin::T", 6, false], ["aptos/coin/thala_apt_0xfaf4e633ae9eb31366c9ca24214231760926576c7b625313b3688b5e900731f6::staking::thalaapt", "thAPT", "Thala APT", "0xfaf4e633ae9eb31366c9ca24214231760926576c7b625313b3688b5e900731f6::staking::ThalaAPT", 8, false], ["aptos/coin/thala_token_0x7fd500c11216f0fe3095d0c4b8aa4d64a4e2e04f83758462f2b127255643615::thl_coin::thl", "THL", "Thala Token", "0x7fd500c11216f0fe3095d0c4b8aa4d64a4e2e04f83758462f2b127255643615::thl_coin::THL", 8, false], ["aptos/coin/the_loonies_0x268d4a7a2ad93274edf6116f9f20ad8455223a7ab5fc73154f687e7dbc3e3ec6::loon::loon", "LOON", "The Loonies", "0x268d4a7a2ad93274edf6116f9f20ad8455223a7ab5fc73154f687e7dbc3e3ec6::LOON::LOON", 6, false], ["aptos/coin/token_in_0xc32ba5d293577cbb1df390f35b2bc6369a593b736d0865fedec1a2b08565de8e::in_coin::incoin", "TIN", 'Token "IN"', "0xc32ba5d293577cbb1df390f35b2bc6369a593b736d0865fedec1a2b08565de8e::in_coin::InCoin", 8, false], ["aptos/coin/tomarket_0x9d0595765a31f8d56e1d2aafc4d6c76f283c67a074ef8812d8c31bd8252ac2c3::asset::toma", "TOMA", "Tomarket", "0x9d0595765a31f8d56e1d2aafc4d6c76f283c67a074ef8812d8c31bd8252ac2c3::asset::TOMA", 6, false], ["aptos/coin/tortuga_staked_apt_0x84d7aeef42d38a5ffc3ccef853e1b82e4958659d16a7de736a29c55fbbeb0114::staked_aptos_coin::stakedaptoscoin", "tAPT", "Tortuga Staked APT", "0x84d7aeef42d38a5ffc3ccef853e1b82e4958659d16a7de736a29c55fbbeb0114::staked_aptos_coin::StakedAptosCoin", 8, false], ["aptos/coin/uptos_0x4fbed3f8a3fd8a11081c8b6392152a8b0cb14d70d0414586f0c9b858fcd2d6a7::uptos::uptos", "UPTOS", "UPTOS", "0x4fbed3f8a3fd8a11081c8b6392152a8b0cb14d70d0414586f0c9b858fcd2d6a7::UPTOS::UPTOS", 8, false], ["aptos/coin/usd_coin_layerzero_0xf22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa::asset::usdc", "lzUSDC", "USD Coin (LayerZero)", "0xf22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa::asset::USDC", 6, false], ["aptos/coin/usd_coin_wormhole_0x5e156f1207d0ebfa19a9eeff00d62a282278fb8719f4fab3a586a0a2c0fffbea::coin::t", "whUSDC", "USD Coin (Wormhole)", "0x5e156f1207d0ebfa19a9eeff00d62a282278fb8719f4fab3a586a0a2c0fffbea::coin::T", 6, false], ["aptos/coin/wrapped_bnb_celer_0x8d87a65ba30e09357fa2edea2c80dbac296e5dec2b18287113500b902942929d::celer_coin_manager::bnbcoin", "ceWBNB", "Wrapped BNB (Celer)", "0x8d87a65ba30e09357fa2edea2c80dbac296e5dec2b18287113500b902942929d::celer_coin_manager::BnbCoin", 8, false], ["aptos/coin/wrapped_ether_layerzero_0xf22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa::asset::weth", "lzWETH", "Wrapped Ether (LayerZero)", "0xf22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa::asset::WETH", 6, false], ["aptos/coin/wrapped_ether_wormhole_0xcc8a89c8dce9693d354449f1f73e60e14e347417854f029db5bc8e7454008abb::coin::t", "whWETH", "Wrapped Ether (Wormhole)", "0xcc8a89c8dce9693d354449f1f73e60e14e347417854f029db5bc8e7454008abb::coin::T", 8, false]];
+
+// ../../libs/ledgerjs/packages/cryptoassets/lib-es/data/apt_coin.js
+var apt_coin_default2 = apt_coin_default;
+
+// ../../libs/ledgerjs/packages/cryptoassets/lib-es/data/apt_fungible_asset.json
+var apt_fungible_asset_default = [["aptos/fungible_asset/amaterasu_0xd0ab8c2f76cd640455db56ca758a9766a966c88f77920347aac1719edab1df5e", "AMA", "Amaterasu", "0xd0ab8c2f76cd640455db56ca758a9766a966c88f77920347aac1719edab1df5e", 8, false], ["aptos/fungible_asset/cellana_0x2ebb2ccac5e027a87fa0e2e5f656a3a4238d6a48d93ec9b610d570fc0aa0df12", "CELL", "CELLANA", "0x2ebb2ccac5e027a87fa0e2e5f656a3a4238d6a48d93ec9b610d570fc0aa0df12", 8, false], ["aptos/fungible_asset/mkl_0x878370592f9129e14b76558689a4b570ad22678111df775befbfcbc9fb3d90ab", "MKL", "MKL", "0x878370592f9129e14b76558689a4b570ad22678111df775befbfcbc9fb3d90ab", 6, false], ["aptos/fungible_asset/tether_usd_0x357b0b74bc833e95a115ad22604854d6b0fca151cecd94111770e5d6ffc9dc2b", "USDT", "Tether USD", "0x357b0b74bc833e95a115ad22604854d6b0fca151cecd94111770e5d6ffc9dc2b", 6, false], ["aptos/fungible_asset/truapt_coin_0xaef6a8c3182e076db72d64324617114cacf9a52f28325edc10b483f7f05da0e7", "TruAPT", "TruAPT coin", "0xaef6a8c3182e076db72d64324617114cacf9a52f28325edc10b483f7f05da0e7", 8, false], ["aptos/fungible_asset/usdc_0xbae207659db88bea0cbead6da0ed00aac12edcdda169e591cd41c94180b46f3b", "USDC", "USDC", "0xbae207659db88bea0cbead6da0ed00aac12edcdda169e591cd41c94180b46f3b", 6, false]];
+
+// ../../libs/ledgerjs/packages/cryptoassets/lib-es/data/apt_fungible_asset.js
+var apt_fungible_asset_default2 = apt_fungible_asset_default;
+
 // ../../libs/ledgerjs/packages/cryptoassets/lib-es/tokens.js
 var emptyArray = [];
 var tokensArray = [];
@@ -540533,6 +540546,8 @@ addTokens(ton_jetton_default2.map(convertJettonToken));
 addTokens(filecoin_erc20_default2.map(convertERC20));
 addTokens(spl_default2.map(convertSplTokens));
 addTokens(tokens3.map(convertERC20));
+addTokens(apt_coin_default2.map(convertAptCoinTokens));
+addTokens(apt_fungible_asset_default2.map(convertAptFaTokens));
 var defaultTokenListOptions = {
   withDelisted: false
 };
@@ -540748,6 +540763,32 @@ function convertSplTokens([id5, network, name3, symbol4, address4, decimals2]) {
     ]
   };
 }
+function convertAptosTokens(tokenType, [id5, ticker, name3, address4, decimals2, delisted]) {
+  return {
+    type: "TokenCurrency",
+    id: id5,
+    contractAddress: address4,
+    parentCurrency: getCryptoCurrencyById("aptos"),
+    name: name3,
+    tokenType,
+    ticker,
+    disableCountervalue: false,
+    delisted,
+    units: [
+      {
+        name: name3,
+        code: ticker,
+        magnitude: decimals2
+      }
+    ]
+  };
+}
+function convertAptCoinTokens(token) {
+  return convertAptosTokens("coin", token);
+}
+function convertAptFaTokens(token) {
+  return convertAptosTokens("fungible_asset", token);
+}
 function convertCardanoNativeTokens([parentCurrencyId, policyId, assetName, name3, ticker, decimals2, delisted]) {
   const assetId = policyId + assetName;
   const parentCurrency = getCryptoCurrencyById(parentCurrencyId);
@@ -552930,49 +552971,51 @@ function flattenOperationWithInternalsAndNfts(op) {
   }
   return ops;
 }
+var OPERATION_TYPE_IN_FAMILY = ["IN", "REWARD", "REWARD_PAYOUT", "WITHDRAW"];
+var OPERATION_TYPE_OUT_FAMILY = [
+  "OUT",
+  "REVEAL",
+  "CREATE",
+  "FEES",
+  "DELEGATE",
+  "REDELEGATE",
+  "UNDELEGATE",
+  "OPT_IN",
+  "OPT_OUT",
+  "SLASH",
+  "LOCK",
+  "BURN"
+];
+var OPERATION_TYPE_STAKE_FAMILY = [
+  "FREEZE",
+  "UNFREEZE",
+  "UNDELEGATE_RESOURCE",
+  "WITHDRAW_EXPIRE_UNFREEZE",
+  "LEGACY_UNFREEZE",
+  "VOTE",
+  "BOND",
+  "UNBOND",
+  "WITHDRAW_UNBONDED",
+  "SET_CONTROLLER",
+  "NOMINATE",
+  "CHILL",
+  "REVOKE",
+  "APPROVE",
+  "ACTIVATE",
+  "UNLOCK",
+  "STAKE",
+  "UNSTAKE",
+  "WITHDRAW_UNSTAKED"
+];
 function getOperationAmountNumber(op) {
-  switch (op.type) {
-    case "IN":
-    case "REWARD":
-    case "REWARD_PAYOUT":
-    case "WITHDRAW":
-      return op.value;
-    case "OUT":
-    case "REVEAL":
-    case "CREATE":
-    case "FEES":
-    case "DELEGATE":
-    case "REDELEGATE":
-    case "UNDELEGATE":
-    case "OPT_IN":
-    case "OPT_OUT":
-    case "SLASH":
-    case "LOCK":
-    case "BURN":
-      return op.value.negated();
-    case "FREEZE":
-    case "UNFREEZE":
-    case "UNDELEGATE_RESOURCE":
-    case "WITHDRAW_EXPIRE_UNFREEZE":
-    case "LEGACY_UNFREEZE":
-    case "VOTE":
-    case "BOND":
-    case "UNBOND":
-    case "WITHDRAW_UNBONDED":
-    case "SET_CONTROLLER":
-    case "NOMINATE":
-    case "CHILL":
-    case "REVOKE":
-    case "APPROVE":
-    case "ACTIVATE":
-    case "UNLOCK":
-    case "STAKE":
-    case "UNSTAKE":
-    case "WITHDRAW_UNSTAKED":
-      return op.fee.negated();
-    default:
-      return new import_bignumber33.BigNumber(0);
+  if (OPERATION_TYPE_IN_FAMILY.includes(op.type)) {
+    return op.value;
+  } else if (OPERATION_TYPE_OUT_FAMILY.includes(op.type)) {
+    return op.value.negated();
+  } else if (OPERATION_TYPE_STAKE_FAMILY.includes(op.type)) {
+    return op.fee.negated();
   }
+  return new import_bignumber33.BigNumber(0);
 }
 function getOperationAmountNumberWithInternals(op) {
   return flattenOperationWithInternalsAndNfts(op).reduce((amount, op2) => amount.plus(getOperationAmountNumber(op2)), new import_bignumber33.BigNumber(0));
@@ -617947,8 +617990,8 @@ var resolver5 = (signerContext3) => {
 var signer_default = resolver5;
 
 // ../../libs/coin-modules/coin-aptos/lib-es/bridge/getTransactionStatus.js
-var import_bignumber90 = require("bignumber.js");
 init_lib_es();
+var import_bignumber91 = require("bignumber.js");
 
 // ../../node_modules/.pnpm/@aptos-labs+ts-sdk@1.33.1/node_modules/@aptos-labs/ts-sdk/dist/esm/chunk-6Q2O5G3J.mjs
 var s36 = class extends Error {
@@ -630015,28 +630058,292 @@ var T24 = ((t75) => (t75[t75.Ed25519 = 0] = "Ed25519", t75[t75.MultiEd25519 = 1]
 var E25 = ((i101) => (i101[i101.Ed25519 = 0] = "Ed25519", i101[i101.Secp256k1Ecdsa = 2] = "Secp256k1Ecdsa", i101))(E25 || {});
 var U16 = ((e54) => (e54[e54.DeriveAuid = 251] = "DeriveAuid", e54[e54.DeriveObjectAddressFromObject = 252] = "DeriveObjectAddressFromObject", e54[e54.DeriveObjectAddressFromGuid = 253] = "DeriveObjectAddressFromGuid", e54[e54.DeriveObjectAddressFromSeed = 254] = "DeriveObjectAddressFromSeed", e54[e54.DeriveResourceAccountAddress = 255] = "DeriveResourceAccountAddress", e54))(U16 || {});
 
+// ../../libs/coin-modules/coin-aptos/lib-es/bridge/logic.js
+var import_bignumber90 = __toESM(require("bignumber.js"));
+
+// ../../libs/coin-modules/coin-aptos/lib-es/constants.js
+var TX_STATUS;
+(function(TX_STATUS2) {
+  TX_STATUS2["PENDING"] = "pending";
+  TX_STATUS2["FAIL"] = "fail";
+  TX_STATUS2["SUCCESS"] = "success";
+})(TX_STATUS || (TX_STATUS = {}));
+var COIN_TRANSFER_TYPES = [
+  "0x1::aptos_account::transfer",
+  "0x1::aptos_account::transfer_coins",
+  "0x1::coin::transfer"
+];
+var FA_TRANSFER_TYPES = ["0x1::primary_fungible_store::transfer"];
+var BATCH_TRANSFER_TYPES = [
+  "0x1::aptos_account::batch_transfer",
+  "0x1::aptos_account::batch_transfer_coins"
+];
+var DELEGATION_POOL_TYPES = [
+  "0x1::delegation_pool::add_stake",
+  "0x1::delegation_pool::withdraw"
+];
+var APTOS_ASSET_ID = "0x1::aptos_coin::AptosCoin";
+var APTOS_COIN_CHANGE = `0x1::coin::CoinStore<${APTOS_ASSET_ID}>`;
+var APTOS_FUNGIBLE_STORE = "0x1::fungible_asset::FungibleStore";
+var APTOS_OBJECT_CORE = "0x1::object::ObjectCore";
+var DIRECTION;
+(function(DIRECTION2) {
+  DIRECTION2["IN"] = "IN";
+  DIRECTION2["OUT"] = "OUT";
+  DIRECTION2["UNKNOWN"] = "UNKNOWN";
+})(DIRECTION || (DIRECTION = {}));
+var SUPPORTED_TOKEN_TYPES = ["coin", "fungible_asset"];
+
+// ../../libs/coin-modules/coin-aptos/lib-es/bridge/logic.js
+var DEFAULT_GAS = new import_bignumber90.default(200);
+var DEFAULT_GAS_PRICE = new import_bignumber90.default(100);
+var ESTIMATE_GAS_MUL = new import_bignumber90.default(1);
+var CLEAN_HEX_REGEXP = /^0x0*|^0+/;
+function isTestnet(currencyId) {
+  return getCryptoCurrencyById(currencyId).isTestnetFor ? true : false;
+}
+var getMaxSendBalance = (gas, gasPrice, account3, transaction) => {
+  const tokenAccount = findSubAccountById(account3, transaction?.subAccountId ?? "");
+  const fromTokenAccount = tokenAccount && isTokenAccount(tokenAccount);
+  const totalGas = gas.multipliedBy(gasPrice);
+  return fromTokenAccount ? tokenAccount.spendableBalance : account3.spendableBalance.gt(totalGas) ? account3.spendableBalance.minus(totalGas) : new import_bignumber90.default(0);
+};
+function normalizeTransactionOptions(options21) {
+  const check3 = (v56) => (v56 ?? "").toString().trim() ? v56 : void 0;
+  return {
+    maxGasAmount: check3(options21.maxGasAmount),
+    gasUnitPrice: check3(options21.gasUnitPrice)
+  };
+}
+var getBlankOperation = (tx, id5) => ({
+  id: "",
+  hash: tx.hash,
+  type: "",
+  value: new import_bignumber90.default(0),
+  fee: new import_bignumber90.default(0),
+  blockHash: tx.block?.hash,
+  blockHeight: tx.block?.height,
+  senders: [],
+  recipients: [],
+  accountId: id5,
+  date: new Date(parseInt(tx.timestamp) / 1e3),
+  extra: { version: tx.version },
+  transactionSequenceNumber: parseInt(tx.sequence_number),
+  hasFailed: false
+});
+var convertFunctionPayloadResponseToInputEntryFunctionData = (payload) => ({
+  function: payload.function,
+  typeArguments: payload.type_arguments,
+  functionArguments: payload.arguments
+});
+var txsToOps = (info6, id5, txs) => {
+  const { address: address4 } = info6;
+  const ops = [];
+  const opsTokens = [];
+  txs.forEach((tx) => {
+    if (tx !== null) {
+      const op = getBlankOperation(tx, id5);
+      op.fee = new import_bignumber90.default(tx.gas_used).multipliedBy(new import_bignumber90.default(tx.gas_unit_price));
+      const payload = convertFunctionPayloadResponseToInputEntryFunctionData(tx.payload);
+      const function_address = getFunctionAddress(payload);
+      if (!function_address) {
+        return;
+      }
+      const { coin_id, amount_in, amount_out } = getCoinAndAmounts(tx, address4);
+      op.value = calculateAmount(tx.sender, address4, amount_in, amount_out);
+      op.type = compareAddress(tx.sender, address4) ? DIRECTION.OUT : DIRECTION.IN;
+      op.senders.push(tx.sender);
+      op.hasFailed = !tx.success;
+      op.id = encodeOperationId(op.accountId, tx.hash, op.type);
+      processRecipients(payload, address4, op, function_address);
+      if (op.value.isZero()) {
+        op.type = DIRECTION.UNKNOWN;
+      }
+      if (op.type !== DIRECTION.UNKNOWN && coin_id !== null) {
+        if (coin_id === APTOS_ASSET_ID) {
+          ops.push(op);
+        } else {
+          const token = findTokenByAddressInCurrency(coin_id.toLowerCase(), "aptos");
+          if (token !== void 0) {
+            op.accountId = encodeTokenAccountId(id5, token);
+            opsTokens.push(op);
+            if (op.type === DIRECTION.OUT) {
+              ops.push({
+                ...op,
+                accountId: decodeTokenAccountId(op.accountId).accountId,
+                value: op.fee,
+                type: "FEES"
+              });
+            }
+          }
+        }
+      }
+    }
+  });
+  return [ops, opsTokens];
+};
+function compareAddress(addressA, addressB) {
+  return addressA.replace(CLEAN_HEX_REGEXP, "").toLowerCase() === addressB.replace(CLEAN_HEX_REGEXP, "").toLowerCase();
+}
+function getFunctionAddress(payload) {
+  if (payload.function) {
+    const parts = payload.function.split("::");
+    return parts.length === 3 && parts[0].length ? parts[0] : void 0;
+  }
+  return void 0;
+}
+function processRecipients(payload, address4, op, function_address) {
+  if ((COIN_TRANSFER_TYPES.includes(payload.function) || DELEGATION_POOL_TYPES.includes(payload.function)) && payload.functionArguments && payload.functionArguments.length > 0 && typeof payload.functionArguments[0] === "string") {
+    op.recipients.push(payload.functionArguments[0].toString());
+  } else if (FA_TRANSFER_TYPES.includes(payload.function) && payload.functionArguments && payload.functionArguments.length > 1 && typeof payload.functionArguments[0] === "object" && typeof payload.functionArguments[1] === "string") {
+    op.recipients.push(payload.functionArguments[1].toString());
+  } else if (BATCH_TRANSFER_TYPES.includes(payload.function) && payload.functionArguments && payload.functionArguments.length > 0 && Array.isArray(payload.functionArguments[0])) {
+    if (!compareAddress(op.senders[0], address4)) {
+      for (const recipient of payload.functionArguments[0]) {
+        if (recipient && compareAddress(recipient.toString(), address4)) {
+          op.recipients.push(recipient.toString());
+        }
+      }
+    }
+  } else {
+    op.recipients.push(function_address);
+  }
+}
+function getEventCoinAddress(change2, event, event_name) {
+  const change_data = change2.data;
+  const mr = change_data;
+  if (!(event_name in mr.data)) {
+    return null;
+  }
+  const change_event_data = mr.data[event_name];
+  if (change_event_data.guid.id.addr !== event.guid.account_address || change_event_data.guid.id.creation_num !== event.guid.creation_number) {
+    return null;
+  }
+  const address4 = extractAddress(mr.type);
+  return address4;
+}
+function getEventFAAddress(change2, event, _event_name) {
+  const change_data = change2.data;
+  if (change_data.type !== APTOS_FUNGIBLE_STORE) {
+    return null;
+  }
+  const mr = change_data;
+  if (change2.address !== event.data.store) {
+    return null;
+  }
+  return mr.data.metadata.inner;
+}
+function getResourceAddress(tx, event, event_name, getAddressProcessor) {
+  for (const change2 of tx.changes) {
+    if (isWriteSetChangeWriteResource(change2)) {
+      const address4 = getAddressProcessor(change2, event, event_name);
+      if (address4 !== null) {
+        return address4;
+      }
+    }
+  }
+  return null;
+}
+function isWriteSetChangeWriteResource(change2) {
+  return change2.data !== void 0;
+}
+function checkFAOwner(tx, event, user_address) {
+  for (const change2 of tx.changes) {
+    if (isWriteSetChangeWriteResource(change2)) {
+      const storeData = change2.data;
+      if (change2.address == event.data.store && storeData.type == APTOS_OBJECT_CORE && storeData.data.owner == user_address) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+function getCoinAndAmounts(tx, address4) {
+  let coin_id = null;
+  let amount_in = (0, import_bignumber90.default)(0);
+  let amount_out = (0, import_bignumber90.default)(0);
+  tx.events.forEach((event) => {
+    switch (event.type) {
+      case "0x1::coin::WithdrawEvent":
+        if (compareAddress(event.guid.account_address, address4)) {
+          coin_id = getResourceAddress(tx, event, "withdraw_events", getEventCoinAddress);
+          amount_out = amount_out.plus(event.data.amount);
+        }
+        break;
+      case "0x1::coin::DepositEvent":
+        if (compareAddress(event.guid.account_address, address4)) {
+          coin_id = getResourceAddress(tx, event, "deposit_events", getEventCoinAddress);
+          amount_in = amount_in.plus(event.data.amount);
+        }
+        break;
+      case "0x1::fungible_asset::Withdraw":
+        if (checkFAOwner(tx, event, address4)) {
+          coin_id = getResourceAddress(tx, event, "withdraw_events", getEventFAAddress);
+          amount_out = amount_out.plus(event.data.amount);
+        }
+        break;
+      case "0x1::fungible_asset::Deposit":
+        if (checkFAOwner(tx, event, address4)) {
+          coin_id = getResourceAddress(tx, event, "deposit_events", getEventFAAddress);
+          amount_in = amount_in.plus(event.data.amount);
+        }
+        break;
+      case "0x1::transaction_fee::FeeStatement":
+        if (tx.sender === address4) {
+          if (coin_id === null)
+            coin_id = APTOS_ASSET_ID;
+          if (coin_id === APTOS_ASSET_ID) {
+            const fees2 = (0, import_bignumber90.default)(tx.gas_unit_price).times((0, import_bignumber90.default)(tx.gas_used));
+            amount_out = amount_out.plus(fees2);
+          }
+        }
+        break;
+    }
+  });
+  return { coin_id, amount_in, amount_out };
+}
+function calculateAmount(sender, address4, amount_in, amount_out) {
+  const is_sender = compareAddress(sender, address4);
+  return is_sender ? amount_out.minus(amount_in) : amount_in.minus(amount_out);
+}
+function extractAddress(str) {
+  const match = str.match(/<([^<>]+)>{1}$/);
+  return match ? match[1] : null;
+}
+function getTokenAccount(account3, transaction) {
+  const tokenAccount = findSubAccountById(account3, transaction.subAccountId ?? "");
+  const fromTokenAccount = tokenAccount && isTokenAccount(tokenAccount);
+  return fromTokenAccount ? tokenAccount : void 0;
+}
+
 // ../../libs/coin-modules/coin-aptos/lib-es/bridge/getTransactionStatus.js
 var getTransactionStatus3 = async (a86, t75) => {
   const errors = {};
   const warnings3 = {};
+  if (!t75.recipient) {
+    errors.recipient = new RecipientRequired();
+  }
+  if (!l30.isValid({ input: t75.recipient }).valid && !errors.recipient) {
+    errors.recipient = new InvalidAddress("", { currencyName: a86.currency.name });
+  }
+  if (t75.recipient === a86.freshAddress && !errors.recipient) {
+    errors.recipient = new InvalidAddressBecauseDestinationIsAlsoSource();
+  }
   if (!t75.fees) {
     errors.fees = new FeeNotLoaded();
   }
-  const estimatedFees = t75.fees || (0, import_bignumber90.BigNumber)(0);
-  if (t75.amount.eq(0)) {
+  const estimatedFees = t75.fees || (0, import_bignumber91.BigNumber)(0);
+  if (t75.amount.lte(0)) {
     errors.amount = new AmountRequired();
   }
-  const amount = t75.amount;
-  const totalSpent = (0, import_bignumber90.BigNumber)(t75.amount).plus(estimatedFees);
-  if (totalSpent.gt(a86.balance) && !errors.amount) {
-    errors.amount = new NotEnoughBalance();
+  const tokenAccount = getTokenAccount(a86, t75);
+  const amount = t75.useAllAmount ? tokenAccount ? tokenAccount.spendableBalance : a86.spendableBalance.minus(estimatedFees).isLessThan(0) ? (0, import_bignumber91.BigNumber)(0) : a86.spendableBalance.minus(estimatedFees) : t75.amount;
+  const totalSpent = tokenAccount ? amount : amount.plus(estimatedFees);
+  if (tokenAccount && t75.errors?.maxGasAmount == "GasInsufficientBalance" && !errors.amount) {
+    errors.amount = new NotEnoughBalanceFees();
   }
-  if (!t75.recipient) {
-    errors.recipient = new RecipientRequired();
-  } else if (l30.isValid({ input: t75.recipient }).valid === false && !errors.recipient) {
-    errors.recipient = new InvalidAddress("", { currencyName: a86.currency.name });
-  } else if (t75.recipient === a86.freshAddress && !errors.recipient) {
-    errors.recipient = new InvalidAddressBecauseDestinationIsAlsoSource();
+  if (tokenAccount ? tokenAccount.spendableBalance.isLessThan(totalSpent) || a86.spendableBalance.isLessThan(estimatedFees) : a86.spendableBalance.isLessThan(totalSpent) && !errors.amount) {
+    errors.amount = new NotEnoughBalance();
   }
   return Promise.resolve({
     errors,
@@ -642669,182 +642976,6 @@ setVerbosity(globalThis.__DEV__ !== false ? "log" : "silent");
 var import_bignumber92 = __toESM(require("bignumber.js"));
 var import_isUndefined = __toESM(require("lodash/isUndefined"));
 
-// ../../libs/coin-modules/coin-aptos/lib-es/constants.js
-var TX_STATUS;
-(function(TX_STATUS2) {
-  TX_STATUS2["PENDING"] = "pending";
-  TX_STATUS2["FAIL"] = "fail";
-  TX_STATUS2["SUCCESS"] = "success";
-})(TX_STATUS || (TX_STATUS = {}));
-var WRITE_RESOURCE = "write_resource";
-var TRANSFER_TYPES = [
-  "0x1::aptos_account::transfer",
-  "0x1::aptos_account::transfer_coins",
-  "0x1::coin::transfer"
-];
-var BATCH_TRANSFER_TYPES = [
-  "0x1::aptos_account::batch_transfer",
-  "0x1::aptos_account::batch_transfer_coins"
-];
-var DELEGATION_POOL_TYPES = [
-  "0x1::delegation_pool::add_stake",
-  "0x1::delegation_pool::withdraw"
-];
-var APTOS_ASSET_ID = "0x1::aptos_coin::AptosCoin";
-var APTOS_COIN_CHANGE = `0x1::coin::CoinStore<${APTOS_ASSET_ID}>`;
-var DIRECTION;
-(function(DIRECTION2) {
-  DIRECTION2["IN"] = "IN";
-  DIRECTION2["OUT"] = "OUT";
-  DIRECTION2["UNKNOWN"] = "UNKNOWN";
-})(DIRECTION || (DIRECTION = {}));
-
-// ../../libs/coin-modules/coin-aptos/lib-es/bridge/logic.js
-var import_bignumber91 = __toESM(require("bignumber.js"));
-var DEFAULT_GAS = new import_bignumber91.default(200);
-var DEFAULT_GAS_PRICE = new import_bignumber91.default(100);
-var ESTIMATE_GAS_MUL = new import_bignumber91.default(1);
-var CLEAN_HEX_REGEXP = /^0x0*|^0+/;
-function isTestnet(currencyId) {
-  return getCryptoCurrencyById(currencyId).isTestnetFor ? true : false;
-}
-var getMaxSendBalance = (amount, gas, gasPrice) => {
-  const totalGas = gas.multipliedBy(gasPrice);
-  return amount.gt(totalGas) ? amount.minus(totalGas) : new import_bignumber91.default(0);
-};
-function normalizeTransactionOptions(options21) {
-  const check3 = (v56) => (v56 ?? "").toString().trim() ? v56 : void 0;
-  return {
-    maxGasAmount: check3(options21.maxGasAmount),
-    gasUnitPrice: check3(options21.gasUnitPrice)
-  };
-}
-var getBlankOperation = (tx, id5) => ({
-  id: "",
-  hash: tx.hash,
-  type: "",
-  value: new import_bignumber91.default(0),
-  fee: new import_bignumber91.default(0),
-  blockHash: tx.block?.hash,
-  blockHeight: tx.block?.height,
-  senders: [],
-  recipients: [],
-  accountId: id5,
-  date: new Date(parseInt(tx.timestamp) / 1e3),
-  extra: { version: tx.version },
-  transactionSequenceNumber: parseInt(tx.sequence_number),
-  hasFailed: false
-});
-var convertFunctionPayloadResponseToInputEntryFunctionData = (payload) => ({
-  function: payload.function,
-  typeArguments: payload.type_arguments,
-  functionArguments: payload.arguments
-});
-var txsToOps = (info6, id5, txs) => {
-  const { address: address4 } = info6;
-  const ops = [];
-  txs.forEach((tx) => {
-    if (tx !== null) {
-      const op = getBlankOperation(tx, id5);
-      op.fee = new import_bignumber91.default(tx.gas_used).multipliedBy(new import_bignumber91.default(tx.gas_unit_price));
-      const payload = convertFunctionPayloadResponseToInputEntryFunctionData(tx.payload);
-      const function_address = getFunctionAddress(payload);
-      if (!function_address) {
-        return;
-      }
-      const { amount_in, amount_out } = getAptosAmounts(tx, address4);
-      op.value = calculateAmount(tx.sender, address4, op.fee, amount_in, amount_out);
-      op.type = compareAddress(tx.sender, address4) ? DIRECTION.OUT : DIRECTION.IN;
-      op.senders.push(tx.sender);
-      processRecipients(payload, address4, op, function_address);
-      if (op.value.isZero()) {
-        op.type = DIRECTION.UNKNOWN;
-      }
-      op.hasFailed = !tx.success;
-      op.id = encodeOperationId(id5, tx.hash, op.type);
-      if (op.type !== DIRECTION.UNKNOWN)
-        ops.push(op);
-    }
-  });
-  return ops;
-};
-function compareAddress(addressA, addressB) {
-  return addressA.replace(CLEAN_HEX_REGEXP, "").toLowerCase() === addressB.replace(CLEAN_HEX_REGEXP, "").toLowerCase();
-}
-function getFunctionAddress(payload) {
-  if (payload.function) {
-    const parts = payload.function.split("::");
-    return parts.length === 3 && parts[0].length ? parts[0] : void 0;
-  }
-  return void 0;
-}
-function processRecipients(payload, address4, op, function_address) {
-  if ((TRANSFER_TYPES.includes(payload.function) || DELEGATION_POOL_TYPES.includes(payload.function)) && payload.functionArguments && payload.functionArguments.length > 0 && typeof payload.functionArguments[0] === "string") {
-    op.recipients.push(payload.functionArguments[0].toString());
-  } else if (BATCH_TRANSFER_TYPES.includes(payload.function) && payload.functionArguments && payload.functionArguments.length > 0 && Array.isArray(payload.functionArguments[0])) {
-    if (!compareAddress(op.senders[0], address4)) {
-      for (const recipient of payload.functionArguments[0]) {
-        if (recipient && compareAddress(recipient.toString(), address4)) {
-          op.recipients.push(recipient.toString());
-        }
-      }
-    }
-  } else {
-    op.recipients.push(function_address);
-  }
-}
-function checkWriteSets(tx, event, event_name) {
-  return tx.changes.some((change2) => {
-    return isChangeOfAptos(change2, event, event_name);
-  });
-}
-function isChangeOfAptos(writeSetChange, event, event_name) {
-  if (writeSetChange.type !== WRITE_RESOURCE) {
-    return false;
-  }
-  if (!("data" in writeSetChange)) {
-    return false;
-  }
-  const change_data = writeSetChange.data;
-  if (!("type" in change_data)) {
-    return false;
-  }
-  const mr = change_data;
-  if (mr.type !== APTOS_COIN_CHANGE) {
-    return false;
-  }
-  const change_event_data = mr.data[event_name];
-  return change_event_data.guid.id.addr === event.guid.account_address && change_event_data.guid.id.creation_num === event.guid.creation_number;
-}
-function getAptosAmounts(tx, address4) {
-  let amount_in = new import_bignumber91.default(0);
-  let amount_out = new import_bignumber91.default(0);
-  tx.events.forEach((event) => {
-    if (compareAddress(event.guid.account_address, address4)) {
-      switch (event.type) {
-        case "0x1::coin::WithdrawEvent":
-          if (checkWriteSets(tx, event, "withdraw_events")) {
-            amount_out = amount_out.plus(event.data.amount);
-          }
-          break;
-        case "0x1::coin::DepositEvent":
-          if (checkWriteSets(tx, event, "deposit_events")) {
-            amount_in = amount_in.plus(event.data.amount);
-          }
-          break;
-      }
-    }
-  });
-  return { amount_in, amount_out };
-}
-function calculateAmount(sender, address4, fee, amount_in, amount_out) {
-  const is_sender = compareAddress(sender, address4);
-  if (is_sender) {
-    amount_out = amount_out.plus(fee);
-  }
-  return is_sender ? amount_out.minus(amount_in) : amount_in.minus(amount_out);
-}
-
 // ../../libs/coin-modules/coin-aptos/lib-es/api/graphql/queries.js
 var GetDelegatedStakingActivities = gql`
   query getDelegatedStakingActivities($delegatorAddress: String) {
@@ -642863,8 +642994,8 @@ var GetDelegatedStakingActivities = gql`
 `;
 var GetAccountTransactionsData = gql`
   query GetAccountTransactionsData($address: String, $limit: Int) {
-    address_version_from_move_resources(
-      where: { address: { _eq: $address } }
+    account_transactions(
+      where: { account_address: { _eq: $address } }
       order_by: { transaction_version: desc }
       limit: $limit
     ) {
@@ -642875,8 +643006,8 @@ var GetAccountTransactionsData = gql`
 `;
 var GetAccountTransactionsDataGt = gql`
   query GetAccountTransactionsDataGt($address: String, $limit: Int, $gt: bigint) {
-    address_version_from_move_resources(
-      where: { address: { _eq: $address }, transaction_version: { _gt: $gt } }
+    account_transactions(
+      where: { account_address: { _eq: $address }, transaction_version: { _gt: $gt } }
       order_by: { transaction_version: desc }
       limit: $limit
     ) {
@@ -642887,8 +643018,8 @@ var GetAccountTransactionsDataGt = gql`
 `;
 var GetAccountTransactionsDataLt = gql`
   query GetAccountTransactionsDataLt($address: String, $limit: Int, $lt: bigint) {
-    address_version_from_move_resources(
-      where: { address: { _eq: $address }, transaction_version: { _lt: $lt } }
+    account_transactions(
+      where: { account_address: { _eq: $address }, transaction_version: { _lt: $lt } }
       order_by: { transaction_version: desc }
       limit: $limit
     ) {
@@ -642928,7 +643059,7 @@ var AptosAPI = class {
   }
   async getAccountInfo(address4, startAt) {
     const [balance, transactions3, blockHeight] = await Promise.all([
-      this.getBalance(address4),
+      this.getCoinBalance(address4, APTOS_ASSET_ID),
       this.fetchTransactions(address4, startAt),
       this.getHeight()
     ]);
@@ -642985,12 +643116,21 @@ var AptosAPI = class {
     });
     return pendingTx.data.hash;
   }
-  async getBalance(address4) {
+  async getBalance(address4, token) {
+    let balance = new import_bignumber92.default(0);
+    if (token.tokenType === "coin") {
+      balance = await this.getCoinBalance(address4, token.contractAddress);
+    } else {
+      balance = await this.getFABalance(address4, token.contractAddress);
+    }
+    return balance;
+  }
+  async getCoinBalance(address4, contract_address) {
     try {
       const [balanceStr] = await this.aptosClient.view({
         payload: {
           function: "0x1::coin::balance",
-          typeArguments: [APTOS_ASSET_ID],
+          typeArguments: [contract_address],
           functionArguments: [address4]
         }
       });
@@ -643000,6 +643140,21 @@ var AptosAPI = class {
       return new import_bignumber92.default(0);
     }
   }
+  async getFABalance(address4, contract_address) {
+    try {
+      const [balanceStr] = await this.aptosClient.view({
+        payload: {
+          function: "0x1::primary_fungible_store::balance",
+          typeArguments: ["0x1::object::ObjectCore"],
+          functionArguments: [address4, contract_address]
+        }
+      });
+      const balance = parseInt(balanceStr, 10);
+      return new import_bignumber92.default(balance);
+    } catch (_17) {
+      return new import_bignumber92.default(0);
+    }
+  }
   async fetchTransactions(address4, gt2) {
     if (!address4) {
       return [];
@@ -643017,7 +643172,7 @@ var AptosAPI = class {
       },
       fetchPolicy: "network-only"
     });
-    return Promise.all(queryResponse.data.address_version_from_move_resources.map(({ transaction_version }) => {
+    return Promise.all(queryResponse.data.account_transactions.map(({ transaction_version }) => {
       return this.richItemByVersion(transaction_version);
     }));
   }
@@ -643057,16 +643212,41 @@ var import_bignumber93 = __toESM(require("bignumber.js"));
 
 // ../../libs/coin-modules/coin-aptos/lib-es/bridge/buildTransaction.js
 var buildTransaction = async (account3, transaction, aptosClient2) => {
-  const txPayload = getPayload(transaction.recipient, transaction.amount);
+  const subAccount = findSubAccountById(account3, transaction.subAccountId ?? "");
+  const txPayload = getPayload(subAccount, transaction);
   const txOptions = normalizeTransactionOptions(transaction.options);
   const tx = await aptosClient2.generateTransaction(account3.freshAddress, txPayload, txOptions);
   return tx;
 };
-var getPayload = (sendTo2, amount) => {
+var getPayload = (tokenAccount, transaction) => {
+  if (tokenAccount && isTokenAccount(tokenAccount)) {
+    const { tokenType } = tokenAccount.token;
+    if (!SUPPORTED_TOKEN_TYPES.includes(tokenType)) {
+      throw new Error(`Token type ${tokenType} not supported`);
+    }
+    if (tokenType === "fungible_asset") {
+      return {
+        function: `0x1::primary_fungible_store::transfer`,
+        typeArguments: ["0x1::fungible_asset::Metadata"],
+        functionArguments: [
+          tokenAccount.token.contractAddress,
+          transaction.recipient,
+          transaction.amount.toString()
+        ]
+      };
+    }
+    if (tokenType === "coin") {
+      return {
+        function: `0x1::aptos_account::transfer_coins`,
+        typeArguments: [tokenAccount.token.contractAddress],
+        functionArguments: [transaction.recipient, transaction.amount.toString()]
+      };
+    }
+  }
   return {
     function: "0x1::aptos_account::transfer_coins",
     typeArguments: [APTOS_ASSET_ID],
-    functionArguments: [sendTo2, amount.toString()]
+    functionArguments: [transaction.recipient, transaction.amount.toString()]
   };
 };
 var buildTransaction_default = buildTransaction;
@@ -643096,9 +643276,10 @@ var getFee = async (account3, transaction, aptosClient2) => {
       gasLimit = new import_bignumber93.default(completedTx.gas_used).multipliedBy(ESTIMATE_GAS_MUL);
       gasPrice = new import_bignumber93.default(completedTx.gas_unit_price);
       const expectedGas = gasPrice.multipliedBy(gasLimit);
-      const isUnderMaxSpendable = transaction.amount.plus(expectedGas).isLessThan(account3.spendableBalance);
-      if (isUnderMaxSpendable && !completedTx.success) {
-        if (!completedTx.vm_status.includes("INSUFFICIENT_BALANCE")) {
+      if (!completedTx.success) {
+        if (completedTx.vm_status.includes("MAX_GAS_UNITS_BELOW_MIN_TRANSACTION_GAS_UNITS")) {
+          res.errors.maxGasAmount = "GasInsufficientBalance";
+        } else if (!completedTx.vm_status.includes("INSUFFICIENT_BALANCE") && !completedTx.vm_status.includes("0x203ed")) {
           throw Error(`Simulation failed with following error: ${completedTx.vm_status}`);
         }
       }
@@ -643112,7 +643293,10 @@ var getFee = async (account3, transaction, aptosClient2) => {
   }
   return res;
 };
-var CACHE = makeLRUCache(getFee, (account3, transaction) => `${account3.id}-${transaction.amount.toString()}}`, seconds(30));
+var CACHE = makeLRUCache(getFee, (account3, transaction) => {
+  const tokenAccount = getTokenAccount(account3, transaction);
+  return `${tokenAccount ? tokenAccount.id : account3.id}-${transaction.amount.toString()}}`;
+}, seconds(30));
 var getEstimatedGas = async (account3, transaction, aptosClient2) => {
   return await CACHE(account3, transaction, aptosClient2);
 };
@@ -643128,7 +643312,7 @@ var estimateMaxSpendable3 = async ({ account: account3, parentAccount, transacti
     maxGasAmount = (0, import_bignumber94.BigNumber)(estimate.maxGasAmount);
     gasUnitPrice = (0, import_bignumber94.BigNumber)(estimate.gasUnitPrice);
   }
-  return getMaxSendBalance(mainAccount.spendableBalance, maxGasAmount, gasUnitPrice);
+  return getMaxSendBalance(maxGasAmount, gasUnitPrice, mainAccount, transaction);
 };
 var estimateMaxSpendable_default = estimateMaxSpendable3;
 
@@ -643146,11 +643330,11 @@ var prepareTransaction3 = async (account3, transaction) => {
   }
   const aptosClient2 = new AptosAPI(account3.currency.id);
   if (transaction.useAllAmount) {
-    transaction.amount = getMaxSendBalance(account3.spendableBalance, new import_bignumber95.default(DEFAULT_GAS), new import_bignumber95.default(DEFAULT_GAS_PRICE));
+    transaction.amount = getMaxSendBalance(new import_bignumber95.default(DEFAULT_GAS), new import_bignumber95.default(DEFAULT_GAS_PRICE), account3, transaction);
   }
   const { fees: fees2, estimate, errors } = await getEstimatedGas(account3, transaction, aptosClient2);
   if (transaction.useAllAmount) {
-    transaction.amount = getMaxSendBalance(account3.spendableBalance, (0, import_bignumber95.default)(estimate.maxGasAmount), (0, import_bignumber95.default)(estimate.gasUnitPrice));
+    transaction.amount = getMaxSendBalance((0, import_bignumber95.default)(estimate.maxGasAmount), (0, import_bignumber95.default)(estimate.gasUnitPrice), account3, transaction);
   }
   transaction.fees = fees2;
   transaction.options = estimate;
@@ -643175,6 +643359,86 @@ var createTransaction3 = () => ({
 var createTransaction_default2 = createTransaction3;
 
 // ../../libs/coin-modules/coin-aptos/lib-es/bridge/synchronisation.js
+var updatableSubAccountProperties2 = [
+  { name: "balance", isOps: false },
+  { name: "spendableBalance", isOps: false },
+  { name: "balanceHistoryCache", isOps: false },
+  { name: "operations", isOps: true },
+  { name: "pendingOperations", isOps: true }
+];
+var mergeSubAccounts2 = (initialAccount, newSubAccounts) => {
+  const oldSubAccounts = initialAccount?.subAccounts;
+  if (!oldSubAccounts) {
+    return newSubAccounts;
+  }
+  const oldSubAccountsById = {};
+  for (const oldSubAccount of oldSubAccounts) {
+    oldSubAccountsById[oldSubAccount.id] = oldSubAccount;
+  }
+  const newSubAccountsToAdd = [];
+  for (const newSubAccount of newSubAccounts) {
+    const duplicatedAccount = oldSubAccountsById[newSubAccount.id];
+    if (!duplicatedAccount) {
+      newSubAccountsToAdd.push(newSubAccount);
+      continue;
+    }
+    const updates7 = {};
+    for (const { name: name3, isOps } of updatableSubAccountProperties2) {
+      if (!isOps) {
+        if (newSubAccount[name3] !== duplicatedAccount[name3]) {
+          updates7[name3] = newSubAccount[name3];
+        }
+      } else {
+        updates7[name3] = mergeOps(duplicatedAccount[name3], newSubAccount[name3]) || [];
+      }
+    }
+    updates7.operationsCount = updates7.operations?.length || duplicatedAccount?.operations?.length || 0;
+    oldSubAccountsById[newSubAccount.id] = {
+      ...duplicatedAccount,
+      ...updates7
+    };
+  }
+  const updatedSubAccounts = Object.values(oldSubAccountsById);
+  return [...updatedSubAccounts, ...newSubAccountsToAdd];
+};
+var getSubAccountShape2 = async (currency24, address4, parentId, token, operations) => {
+  const aptosClient2 = new AptosAPI(currency24.id);
+  const tokenAccountId = encodeTokenAccountId(parentId, token);
+  const balance = await aptosClient2.getBalance(address4, token);
+  const firstOperation = operations.sort((a86, b23) => b23.date.getTime() - a86.date.getTime()).at(operations.length - 1);
+  return {
+    type: "TokenAccount",
+    id: tokenAccountId,
+    parentId,
+    token,
+    balance,
+    spendableBalance: balance,
+    creationDate: firstOperation?.date || /* @__PURE__ */ new Date(0),
+    operations,
+    operationsCount: operations.length,
+    pendingOperations: [],
+    balanceHistoryCache: emptyHistoryCache,
+    swapHistory: []
+  };
+};
+var getSubAccounts2 = async (infos, address4, accountId2, lastTokenOperations) => {
+  const { currency: currency24 } = infos;
+  const operationsByToken = lastTokenOperations.reduce((acc, operation) => {
+    const { token } = decodeTokenAccountId(operation.accountId);
+    if (!token)
+      return acc;
+    if (!acc.has(token)) {
+      acc.set(token, []);
+    }
+    acc.get(token)?.push(operation);
+    return acc;
+  }, /* @__PURE__ */ new Map());
+  const subAccountsPromises = [];
+  for (const [token, ops] of operationsByToken.entries()) {
+    subAccountsPromises.push(getSubAccountShape2(currency24, address4, accountId2, token, ops));
+  }
+  return Promise.all(subAccountsPromises);
+};
 var getAccountShape3 = async (info6) => {
   const { address: address4, initialAccount, currency: currency24, derivationMode, rest } = info6;
   const publicKey3 = rest?.publicKey || initialAccount && decodeAccountId(initialAccount.id).xpubOrAddress;
@@ -643187,11 +643451,17 @@ var getAccountShape3 = async (info6) => {
   });
   const xpub = initialAccount?.xpub || publicKey3 || "";
   const oldOperations = initialAccount?.operations || [];
-  const startAt = oldOperations[0]?.extra?.version;
   const aptosClient2 = new AptosAPI(currency24.id);
-  const { balance, transactions: transactions3, blockHeight } = await aptosClient2.getAccountInfo(address4, startAt);
-  const newOperations = txsToOps(info6, accountId2, transactions3);
+  const { balance, transactions: transactions3, blockHeight } = await aptosClient2.getAccountInfo(address4);
+  const [newOperations, tokenOperations] = txsToOps(info6, accountId2, transactions3);
   const operations = mergeOps(oldOperations, newOperations);
+  const newSubAccounts = await getSubAccounts2(info6, address4, accountId2, tokenOperations);
+  const shouldSyncFromScratch = initialAccount === void 0;
+  const subAccounts = shouldSyncFromScratch ? newSubAccounts : mergeSubAccounts2(initialAccount, newSubAccounts);
+  operations.forEach((op) => {
+    const subOperations = inferSubOperations(op.hash, subAccounts);
+    op.subOperations = subOperations.length === 1 ? subOperations : subOperations.filter((op2) => !!op2.blockHash);
+  });
   const shape = {
     type: "Account",
     id: accountId2,
@@ -643201,7 +643471,8 @@ var getAccountShape3 = async (info6) => {
     operations,
     operationsCount: operations.length,
     blockHeight,
-    lastSyncDate: /* @__PURE__ */ new Date()
+    lastSyncDate: /* @__PURE__ */ new Date(),
+    subAccounts
   };
   return shape;
 };
@@ -643253,11 +643524,12 @@ var buildSignOperation3 = (signerContext3) => ({ account: account3, transaction,
       senders.push(account3.freshAddress);
       recipients.push(transaction.recipient);
     }
+    const subAccount = !!transaction.subAccountId && findSubAccountById(account3, transaction.subAccountId);
     const operation = {
       id: encodeOperationId(accountId2, hash12, type5),
       hash: hash12,
       type: type5,
-      value: transaction.useAllAmount ? account3.balance.minus(fee) : transaction.amount.plus(fee),
+      value: subAccount ? fee : transaction.amount.plus(fee),
       fee,
       extra,
       blockHash: null,
@@ -643266,7 +643538,19 @@ var buildSignOperation3 = (signerContext3) => ({ account: account3, transaction,
       recipients,
       accountId: accountId2,
       date: /* @__PURE__ */ new Date(),
-      transactionSequenceNumber: Number(rawTx.sequence_number)
+      transactionSequenceNumber: Number(rawTx.sequence_number),
+      subOperations: subAccount ? [
+        {
+          id: encodeOperationId(subAccount.id, "", "OUT"),
+          type: "OUT",
+          accountId: transaction.subAccountId,
+          senders: [account3.freshAddress],
+          recipients: [transaction.recipient],
+          value: transaction.amount,
+          fee,
+          date: /* @__PURE__ */ new Date()
+        }
+      ] : []
     };
     o56.next({
       type: "signed",
@@ -765705,13 +765989,13 @@ function buildAssociatedTokenAccountInstruction(payer, associatedToken, owner, m
   });
 }
 
-// ../../libs/coin-modules/coin-solana/lib-es/api/chain/index.js
+// ../../libs/coin-modules/coin-solana/lib-es/network/chain/index.js
 init_lib_es();
 
 // ../../libs/coin-modules/coin-solana/lib-es/helpers/token.js
 var import_bignumber214 = __toESM(require("bignumber.js"));
 
-// ../../libs/coin-modules/coin-solana/lib-es/api/chain/program/constants.js
+// ../../libs/coin-modules/coin-solana/lib-es/network/chain/program/constants.js
 var PARSED_PROGRAMS = {
   SPL_ASSOCIATED_TOKEN_ACCOUNT: "spl-associated-token-account",
   BPF_LOADER: "bpf-loader",
@@ -765759,7 +766043,7 @@ function calculateToken2022TransferFees({ transferAmount, transferFeeConfigState
   };
 }
 
-// ../../libs/coin-modules/coin-solana/lib-es/api/chain/index.js
+// ../../libs/coin-modules/coin-solana/lib-es/network/chain/index.js
 var LATEST_BLOCKHASH_MOCK = "EEbZs6DmDyDjucyYbo3LwVJU7pQYuVopYcYTSEZXskW3";
 var remapErrors = (e54) => {
   throw new NetworkError(e54 instanceof Error ? e54.message : "Unknown Solana error");
@@ -765907,7 +766191,7 @@ function getChainAPI(config4, logger49) {
   };
 }
 
-// ../../libs/coin-modules/coin-solana/lib-es/api/cached.js
+// ../../libs/coin-modules/coin-solana/lib-es/network/cached.js
 var import_object_hash = __toESM(require_object_hash());
 var cacheKeyAddress = (address4) => address4;
 var cacheKeyEmpty = () => "";
@@ -766079,7 +766363,7 @@ function isSignaturesForAddressResponse(value6) {
   return isUnknownObject(value6) && typeof value6.id === "string" && Array.isArray(value6.result) && value6.result.every(isConfirmedSignatureInfo);
 }
 
-// ../../libs/coin-modules/coin-solana/lib-es/api/queued.js
+// ../../libs/coin-modules/coin-solana/lib-es/network/queued.js
 function queued(api8, delayBetweenRuns = 100) {
   const q10 = asyncQueue({
     delayBetweenRuns
@@ -766099,7 +766383,7 @@ function queued(api8, delayBetweenRuns = 100) {
   return proxy2;
 }
 
-// ../../libs/coin-modules/coin-solana/lib-es/api/traced.js
+// ../../libs/coin-modules/coin-solana/lib-es/network/traced.js
 init_lib_es2();
 function traced(api8) {
   const state = {
@@ -766172,7 +766456,7 @@ function formatMsg({ reqId, msg, duration }) {
 // ../../libs/coin-modules/coin-solana/lib-es/prepareTransaction.js
 init_lib_es();
 
-// ../../libs/coin-modules/coin-solana/lib-es/api/chain/web3.js
+// ../../libs/coin-modules/coin-solana/lib-es/network/chain/web3.js
 var import_bignumber217 = __toESM(require("bignumber.js"));
 var import_chunk3 = __toESM(require("lodash/chunk"));
 var import_uniq = __toESM(require("lodash/uniq"));
@@ -766689,16 +766973,16 @@ function refine(struct21, name3, refiner) {
   });
 }
 
-// ../../libs/coin-modules/coin-solana/lib-es/api/chain/validators/index.js
+// ../../libs/coin-modules/coin-solana/lib-es/network/chain/validators/index.js
 var ParsedInfo = type2({
   type: string3(),
   info: any2()
 });
 
-// ../../libs/coin-modules/coin-solana/lib-es/api/chain/validators/pubkey.js
+// ../../libs/coin-modules/coin-solana/lib-es/network/chain/validators/pubkey.js
 var PublicKeyFromString2 = coerce5(instance2(PublicKey4), string3(), (value6) => new PublicKey4(value6));
 
-// ../../libs/coin-modules/coin-solana/lib-es/api/chain/validators/bignum.js
+// ../../libs/coin-modules/coin-solana/lib-es/network/chain/validators/bignum.js
 var import_bignumber216 = require("bignumber.js");
 var BigNumFromString = coerce5(instance2(import_bignumber216.BigNumber), string3(), (value6) => {
   if (typeof value6 === "string")
@@ -766711,7 +766995,7 @@ var BigNumFromNumber = coerce5(instance2(import_bignumber216.BigNumber), number6
   throw new Error("invalid big num");
 });
 
-// ../../libs/coin-modules/coin-solana/lib-es/api/chain/account/stake.js
+// ../../libs/coin-modules/coin-solana/lib-es/network/chain/account/stake.js
 var StakeAccountType = enums(["uninitialized", "initialized", "delegated", "rewardsPool"]);
 var StakeMeta = type2({
   rentExemptReserve: BigNumFromString,
@@ -766750,7 +767034,7 @@ var StakeAccount = type2({
   info: StakeAccountInfo
 });
 
-// ../../libs/coin-modules/coin-solana/lib-es/api/chain/account/tokenExtensions.js
+// ../../libs/coin-modules/coin-solana/lib-es/network/chain/account/tokenExtensions.js
 var DefaultAccountState = enums(["initialized", "frozen"]);
 var TokenAccountExtensionType = enums([
   "transferFeeAmount",
@@ -767020,7 +767304,7 @@ var MintExtensions = array2(union2([
 ]));
 var ExtensionType2 = union2([TokenAccountExtensionType, MintExtensionType]);
 
-// ../../libs/coin-modules/coin-solana/lib-es/api/chain/account/token.js
+// ../../libs/coin-modules/coin-solana/lib-es/network/chain/account/token.js
 var TokenAccountType = enums(["mint", "account", "multisig"]);
 var AccountState2 = enums(["initialized", "uninitialized", "frozen"]);
 var TokenAmount = type2({
@@ -767060,7 +767344,7 @@ var TokenAccount = type2({
   info: any2()
 });
 
-// ../../libs/coin-modules/coin-solana/lib-es/api/chain/account/vote.js
+// ../../libs/coin-modules/coin-solana/lib-es/network/chain/account/vote.js
 var VoteAccountType = enums(["vote"]);
 var AuthorizedVoter = type2({
   authorizedVoter: PublicKeyFromString2,
@@ -767099,7 +767383,7 @@ var VoteAccount = type2({
   info: VoteAccountInfo
 });
 
-// ../../libs/coin-modules/coin-solana/lib-es/api/chain/account/parser.js
+// ../../libs/coin-modules/coin-solana/lib-es/network/chain/account/parser.js
 function parseMintAccountInfo(info6) {
   return create3(info6, MintAccountInfo);
 }
@@ -767165,7 +767449,7 @@ function onThrowReturnError(fn3) {
   }
 }
 
-// ../../libs/coin-modules/coin-solana/lib-es/api/chain/web3.js
+// ../../libs/coin-modules/coin-solana/lib-es/network/chain/web3.js
 var MEMO_PROGRAM_ID = "MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr";
 function toTokenAccountWithInfo(onChainAcc) {
   const parsedInfo = onChainAcc.account.data.parsed.info;
@@ -768397,7 +768681,7 @@ function getCurrentSolanaPreloadData(currency24) {
   return data6;
 }
 
-// ../../libs/coin-modules/coin-solana/lib-es/validator-app/index.js
+// ../../libs/coin-modules/coin-solana/lib-es/network/validator-app/index.js
 var import_fp2 = require("lodash/fp");
 var MAX_VALIDATORS_NB = 1e3;
 var URLS = {
@@ -768549,7 +768833,7 @@ var import_groupBy4 = __toESM(require("lodash/groupBy"));
 var import_head = __toESM(require("lodash/head"));
 var import_compact4 = __toESM(require("lodash/compact"));
 
-// ../../libs/coin-modules/coin-solana/lib-es/api/chain/instruction/token/types.js
+// ../../libs/coin-modules/coin-solana/lib-es/network/chain/instruction/token/types.js
 var TokenAmountUi = type2({
   amount: string3(),
   decimals: number6(),
@@ -768859,7 +769143,7 @@ var IX_TITLES = {
   transferCheckedWithFee: "Transfer With Fee (Checked)"
 };
 
-// ../../libs/coin-modules/coin-solana/lib-es/api/chain/instruction/token/index.js
+// ../../libs/coin-modules/coin-solana/lib-es/network/chain/instruction/token/index.js
 function parseSplTokenInstruction(ix) {
   const parsed2 = create3(ix.parsed, ParsedInfo);
   const { type: rawType, info: info6 } = parsed2;
@@ -768873,7 +769157,7 @@ function parseSplTokenInstruction(ix) {
   };
 }
 
-// ../../libs/coin-modules/coin-solana/lib-es/api/chain/instruction/associated-token-account/types.js
+// ../../libs/coin-modules/coin-solana/lib-es/network/chain/instruction/associated-token-account/types.js
 var AssociateInfo = type2({
   account: PublicKeyFromString2,
   mint: PublicKeyFromString2,
@@ -768887,7 +769171,7 @@ var IX_TITLES2 = {
   associate: "Associate"
 };
 
-// ../../libs/coin-modules/coin-solana/lib-es/api/chain/instruction/associated-token-account/index.js
+// ../../libs/coin-modules/coin-solana/lib-es/network/chain/instruction/associated-token-account/index.js
 function parseAssociatedTokenAccountInstruction(ix) {
   const parsed2 = create3(ix.parsed, ParsedInfo);
   const type5 = "associate";
@@ -768900,7 +769184,7 @@ function parseAssociatedTokenAccountInstruction(ix) {
   };
 }
 
-// ../../libs/coin-modules/coin-solana/lib-es/api/chain/instruction/memo/index.js
+// ../../libs/coin-modules/coin-solana/lib-es/network/chain/instruction/memo/index.js
 function parseSplMemoInstruction(ix) {
   return {
     title: "Save",
@@ -768911,7 +769195,7 @@ function parseSplMemoInstruction(ix) {
   };
 }
 
-// ../../libs/coin-modules/coin-solana/lib-es/api/chain/instruction/stake/types.js
+// ../../libs/coin-modules/coin-solana/lib-es/network/chain/instruction/stake/types.js
 var InitializeInfo = type2({
   stakeAccount: PublicKeyFromString2,
   authorized: type2({
@@ -768986,7 +769270,7 @@ var IX_TITLES3 = {
   merge: "Merge"
 };
 
-// ../../libs/coin-modules/coin-solana/lib-es/api/chain/instruction/stake/index.js
+// ../../libs/coin-modules/coin-solana/lib-es/network/chain/instruction/stake/index.js
 function parseStakeInstruction(ix) {
   const parsed2 = create3(ix.parsed, ParsedInfo);
   const { type: rawType, info: info6 } = parsed2;
@@ -769000,7 +769284,7 @@ function parseStakeInstruction(ix) {
   };
 }
 
-// ../../libs/coin-modules/coin-solana/lib-es/api/chain/instruction/system/types.js
+// ../../libs/coin-modules/coin-solana/lib-es/network/chain/instruction/system/types.js
 var CreateAccountInfo = type2({
   source: PublicKeyFromString2,
   newAccount: PublicKeyFromString2,
@@ -769113,7 +769397,7 @@ var IX_TITLES4 = {
   transferWithSeed: "Transfer With Seed"
 };
 
-// ../../libs/coin-modules/coin-solana/lib-es/api/chain/instruction/system/index.js
+// ../../libs/coin-modules/coin-solana/lib-es/network/chain/instruction/system/index.js
 function parseSystemInstruction(ix) {
   const parsed2 = create3(ix.parsed, ParsedInfo);
   const { type: rawType, info: info6 } = parsed2;
@@ -769127,7 +769411,7 @@ function parseSystemInstruction(ix) {
   };
 }
 
-// ../../libs/coin-modules/coin-solana/lib-es/api/chain/program/parser.js
+// ../../libs/coin-modules/coin-solana/lib-es/network/chain/program/parser.js
 var parse11 = (ix) => {
   if ("parsed" in ix) {
     switch (ix.program) {
@@ -769210,10 +769494,10 @@ function unknown4() {
 var coinConfig9 = config_default();
 var config_default5 = coinConfig9;
 
-// ../../libs/coin-modules/coin-solana/lib-es/api/chain/stake-activation/rpc.js
+// ../../libs/coin-modules/coin-solana/lib-es/network/chain/stake-activation/rpc.js
 var import_bignumber222 = require("bignumber.js");
 
-// ../../libs/coin-modules/coin-solana/lib-es/api/chain/stake-activation/delegation.js
+// ../../libs/coin-modules/coin-solana/lib-es/network/chain/stake-activation/delegation.js
 var import_bignumber221 = __toESM(require("bignumber.js"));
 function getStakeHistoryEntry(epoch, stakeHistory) {
   for (const entry of stakeHistory) {
@@ -769323,7 +769607,7 @@ function getStakeActivatingAndDeactivating(delegation, targetEpoch, stakeHistory
   }
 }
 
-// ../../libs/coin-modules/coin-solana/lib-es/api/chain/stake-activation/rpc.js
+// ../../libs/coin-modules/coin-solana/lib-es/network/chain/stake-activation/rpc.js
 var import_compact3 = __toESM(require("lodash/compact"));
 function getStakeActivationState({ activating, deactivating, effective }) {
   if (deactivating.gt(0)) {
@@ -770309,7 +770593,7 @@ function assignFromTokenAccountRaw(tokenAccountRaw, tokenAccount) {
   }
 }
 
-// ../../libs/coin-modules/coin-solana/lib-es/api/nft/index.js
+// ../../libs/coin-modules/coin-solana/lib-es/network/nft/index.js
 var getNftMetadata2 = async (input, params) => {
   const { data: data6 } = await network_default({
     method: "POST",
@@ -773305,8 +773589,8 @@ var utils3 = {
       const buffer2 = await crypto31.web.subtle.digest("SHA-256", concatBytes8(...messages));
       return new Uint8Array(buffer2);
     } else if (crypto31.node) {
-      const { createHash: createHash3 } = crypto31.node;
-      const hash12 = createHash3("sha256");
+      const { createHash: createHash4 } = crypto31.node;
+      const hash12 = createHash4("sha256");
       messages.forEach((m63) => hash12.update(m63));
       return Uint8Array.from(hash12.digest());
     } else {
@@ -797246,7 +797530,7 @@ var getAccountShape16 = async (info6, { blacklistedTokenIds }) => {
   const newOps = (0, import_flatMap18.default)(newTxs.transactions, mapTxToOps5(accountId2, address4, newTxs.address_book));
   const newJettonOps = (0, import_flatMap18.default)(newJettonTxs, mapJettonTxToOps(accountId2, address4, newTxs.address_book));
   const operations = shouldSyncFromScratch ? newOps : mergeOps(oldOps, newOps);
-  const subAccounts = await getSubAccounts2(info6, accountId2, newJettonOps, blacklistedTokenIds, shouldSyncFromScratch);
+  const subAccounts = await getSubAccounts3(info6, accountId2, newJettonOps, blacklistedTokenIds, shouldSyncFromScratch);
   const toReturn = {
     id: accountId2,
     balance: new import_bignumber260.default(balance),
@@ -797260,7 +797544,7 @@ var getAccountShape16 = async (info6, { blacklistedTokenIds }) => {
   };
   return toReturn;
 };
-var getSubAccountShape2 = async (info6, parentId, token, ops, shouldSyncFromScratch) => {
+var getSubAccountShape3 = async (info6, parentId, token, ops, shouldSyncFromScratch) => {
   const walletsInfo = await fetchJettonWallets({
     address: info6.address,
     jettonMaster: token.contractAddress
@@ -797290,7 +797574,7 @@ var getSubAccountShape2 = async (info6, parentId, token, ops, shouldSyncFromScra
     // Address of the jetton wallet contract that holds the token balance and handles transfers
   };
 };
-async function getSubAccounts2(info6, accountId2, newOps, blacklistedTokenIds = [], shouldSyncFromScratch) {
+async function getSubAccounts3(info6, accountId2, newOps, blacklistedTokenIds = [], shouldSyncFromScratch) {
   const opsPerToken = newOps.reduce((acc, op) => {
     const { accountId: tokenAccountId } = decodeOperationId(op.id);
     const { token } = decodeTokenAccountId(tokenAccountId);
@@ -797303,7 +797587,7 @@ async function getSubAccounts2(info6, accountId2, newOps, blacklistedTokenIds =
   }, /* @__PURE__ */ new Map());
   const subAccountsPromises = [];
   for (const [token, ops] of opsPerToken.entries()) {
-    subAccountsPromises.push(getSubAccountShape2(info6, accountId2, token, ops, shouldSyncFromScratch));
+    subAccountsPromises.push(getSubAccountShape3(info6, accountId2, token, ops, shouldSyncFromScratch));
   }
   return Promise.all(subAccountsPromises);
 }
@@ -797997,54 +798281,149 @@ var claimRewardTronTransaction = async (account3) => {
   return result2;
 };
 
-// ../../libs/coin-modules/coin-tron/lib-es/bridge/broadcast.js
-var broadcast22 = async ({ signedOperation: { signature: signature3, operation, rawData } }) => {
-  const transaction = {
-    raw_data: rawData,
-    txID: operation.hash,
-    signature: [signature3]
-  };
-  await broadcastTron(transaction);
-  return operation;
-};
-var broadcast_default3 = broadcast22;
-
-// ../../libs/coin-modules/coin-tron/lib-es/bridge/createTransaction.js
-var import_bignumber263 = __toESM(require("bignumber.js"));
-var createTransaction21 = () => ({
-  family: "tron",
-  amount: new import_bignumber263.default(0),
-  useAllAmount: false,
-  mode: "send",
-  duration: 3,
-  recipient: "",
-  networkInfo: null,
-  resource: null,
-  votes: []
-});
-var createTransaction_default6 = createTransaction21;
-
-// ../../libs/coin-modules/coin-tron/lib-es/bridge/estimateMaxSpendable.js
-var import_bignumber268 = __toESM(require("bignumber.js"));
-
-// ../../libs/coin-modules/coin-tron/lib-es/bridge/getEstimateFees.js
-var import_bignumber267 = __toESM(require("bignumber.js"));
-
-// ../../libs/coin-modules/coin-tron/lib-es/logic/constants.js
-var import_bignumber264 = require("bignumber.js");
-var ONE_TRX = new import_bignumber264.BigNumber(1e6);
-var STANDARD_FEES_NATIVE = new import_bignumber264.BigNumber(2e3);
-var ACTIVATION_FEES = ONE_TRX.multipliedBy(1.1);
-var ACTIVATION_FEES_TRC_20 = ONE_TRX.multipliedBy(27.6009);
-var STANDARD_FEES_TRC_20 = ONE_TRX.multipliedBy(13.7409);
-
-// ../../libs/coin-modules/coin-tron/lib-es/bridge/utils.js
-var import_bignumber266 = require("bignumber.js");
-
 // ../../libs/coin-modules/coin-tron/lib-es/logic/utils.js
-var import_bignumber265 = __toESM(require("bignumber.js"));
+var import_bignumber263 = __toESM(require("bignumber.js"));
+var import_crypto44 = require("crypto");
 var import_get2 = __toESM(require("lodash/get"));
 var import_tronweb2 = __toESM(require_TronWeb_node());
+async function decodeTransaction(rawTx) {
+  const { Transaction: Transaction7 } = globalThis.TronWebProto;
+  const transaction = Transaction7.raw.deserializeBinary(Buffer.from(rawTx, "hex"));
+  return {
+    txID: (0, import_crypto44.createHash)("sha256").update(Buffer.from(rawTx, "hex")).digest("hex"),
+    raw_data: convertTxFromRaw(transaction),
+    raw_data_hex: rawTx
+  };
+}
+function convertTxFromRaw(tx) {
+  let transactionRawData = {
+    ref_block_bytes: convertBufferToHex(tx.getRefBlockBytes()),
+    ref_block_hash: convertBufferToHex(tx.getRefBlockHash()),
+    expiration: tx.getExpiration(),
+    contract: tx.getContractList().map(convertContractFromRaw),
+    timestamp: tx.getTimestamp()
+  };
+  if (tx.getRefBlockNum()) {
+    transactionRawData = {
+      ...transactionRawData,
+      ref_block_num: tx.getRefBlockNum()
+    };
+  }
+  if (tx.getFeeLimit()) {
+    transactionRawData = {
+      ...transactionRawData,
+      fee_limit: tx.getFeeLimit()
+    };
+  }
+  if (tx.getData()) {
+    transactionRawData = {
+      ...transactionRawData,
+      data: tx.getData()
+    };
+  }
+  if (tx.getScripts()) {
+    transactionRawData = {
+      ...transactionRawData,
+      scripts: tx.getScripts()
+    };
+  }
+  return transactionRawData;
+}
+function convertContractFromRaw(contract) {
+  const contractType = convertNumberToContractType(contract.getType());
+  const value6 = contractType.convertFunction?.(contract);
+  if (!value6) {
+    throw new Error(`Missing deserializer for this contract: "${contract.getParameter().getTypeUrl()}"`);
+  }
+  return {
+    type: contractType.name,
+    parameter: {
+      value: value6,
+      type_url: contract.getParameter().getTypeUrl()
+    }
+  };
+}
+function convertTransferContractFromRaw(contract) {
+  const { TransferContract } = globalThis.TronWebProto;
+  const transferContract = TransferContract.deserializeBinary(contract.getParameter().getValue());
+  return {
+    amount: transferContract.getAmount(),
+    owner_address: convertBufferToHex(transferContract.getOwnerAddress()),
+    to_address: convertBufferToHex(transferContract.getToAddress())
+  };
+}
+function convertTransferAssetContractFromRaw(contract) {
+  const { TransferAssetContract } = globalThis.TronWebProto;
+  const transferContract = TransferAssetContract.deserializeBinary(contract.getParameter().getValue());
+  return {
+    amount: transferContract.getAmount(),
+    asset_name: convertBufferToString(transferContract.getAssetName()),
+    owner_address: convertBufferToHex(transferContract.getOwnerAddress()),
+    to_address: convertBufferToHex(transferContract.getToAddress())
+  };
+}
+function convertTriggerSmartContractFromRaw(contract) {
+  const { TriggerSmartContract } = globalThis.TronWebProto;
+  const transferContract = TriggerSmartContract.deserializeBinary(contract.getParameter().getValue());
+  return {
+    data: convertBufferToHex(transferContract.getData()),
+    owner_address: convertBufferToHex(transferContract.getOwnerAddress()),
+    contract_address: convertBufferToHex(transferContract.getContractAddress())
+  };
+}
+var CONTRACT_TYPE = {
+  0: { name: "AccountCreateContract" },
+  1: { name: "TransferContract", convertFunction: convertTransferContractFromRaw },
+  // Transfer TRX
+  2: { name: "TransferAssetContract", convertFunction: convertTransferAssetContractFromRaw },
+  // Transfer TRC-10
+  3: { name: "VoteAssetContract" },
+  4: { name: "VoteWitnessContract" },
+  5: { name: "WitnessCreateContract" },
+  6: { name: "AssetIssueContract" },
+  8: { name: "WitnessUpdateContract" },
+  9: { name: "ParticipateAssetIssueContract" },
+  10: { name: "AccountUpdateContract" },
+  11: { name: "FreezeBalanceContract" },
+  12: { name: "UnfreezeBalanceContract" },
+  13: { name: "WithdrawBalanceContract" },
+  14: { name: "UnfreezeAssetContract" },
+  15: { name: "UpdateAssetContract" },
+  16: { name: "ProposalCreateContract" },
+  17: { name: "ProposalApproveContract" },
+  18: { name: "ProposalDeleteContract" },
+  19: { name: "SetAccountIdContract" },
+  20: { name: "CustomContract" },
+  30: { name: "CreateSmartContract" },
+  31: { name: "TriggerSmartContract", convertFunction: convertTriggerSmartContractFromRaw },
+  // Transfer TRC-20
+  32: { name: "GetContract" },
+  33: { name: "UpdateSettingContract" },
+  41: { name: "ExchangeCreateContract" },
+  42: { name: "ExchangeInjectContract" },
+  43: { name: "ExchangeWithdrawContract" },
+  44: { name: "ExchangeTransactionContract" },
+  45: { name: "UpdateEnergyLimitContract" },
+  46: { name: "AccountPermissionUpdateContract" },
+  48: { name: "ClearABIContract" },
+  49: { name: "UpdateBrokerageContract" },
+  51: { name: "ShieldedTransferContract" },
+  52: { name: "MarketSellAssetContract" },
+  53: { name: "MarketCancelOrderContract" },
+  54: { name: "FreezeBalanceV2Contract" },
+  55: { name: "UnfreezeBalanceV2Contract" },
+  56: { name: "WithdrawExpireUnfreezeContract" },
+  57: { name: "DelegateResourceContract" },
+  58: { name: "UnDelegateResourceContract" },
+  59: { name: "CancelAllUnfreezeV2Contract" }
+};
+var convertNumberToContractType = (value6) => CONTRACT_TYPE[value6];
+function convertBufferToHex(address4) {
+  return import_tronweb2.default.utils.bytes.byteArray2hexStr(address4).toLowerCase();
+}
+function convertBufferToString(address4) {
+  return import_tronweb2.default.utils.bytes.bytesToString(address4);
+}
 function getTronResources(acc) {
   const delegatedFrozenBandwidth = (0, import_get2.default)(acc, "delegated_frozenV2_balance_for_bandwidth", void 0);
   const delegatedFrozenEnergy = (0, import_get2.default)(acc, "account_resource.delegated_frozenV2_balance_for_energy", void 0);
@@ -798053,16 +798432,16 @@ function getTronResources(acc) {
   const legacyFrozenEnergy = (0, import_get2.default)(acc, "account_resource.frozen_balance_for_energy", void 0);
   const legacyFrozen = {
     bandwidth: legacyFrozenBandwidth ? {
-      amount: new import_bignumber265.default(legacyFrozenBandwidth.frozen_balance),
+      amount: new import_bignumber263.default(legacyFrozenBandwidth.frozen_balance),
       expiredAt: new Date(legacyFrozenBandwidth.expire_time)
     } : void 0,
     energy: legacyFrozenEnergy ? {
-      amount: new import_bignumber265.default(legacyFrozenEnergy.frozen_balance),
+      amount: new import_bignumber263.default(legacyFrozenEnergy.frozen_balance),
       expiredAt: new Date(legacyFrozenEnergy.expire_time)
     } : void 0
   };
   const { frozenEnergy, frozenBandwidth } = frozenBalances.reduce((accum, cur) => {
-    const amount = new import_bignumber265.default(cur?.amount ?? 0);
+    const amount = new import_bignumber263.default(cur?.amount ?? 0);
     if (cur.type === "ENERGY") {
       accum.frozenEnergy = accum.frozenEnergy.plus(amount);
     } else if (cur.type === void 0) {
@@ -798070,19 +798449,19 @@ function getTronResources(acc) {
     }
     return accum;
   }, {
-    frozenEnergy: new import_bignumber265.default(0),
-    frozenBandwidth: new import_bignumber265.default(0)
+    frozenEnergy: new import_bignumber263.default(0),
+    frozenBandwidth: new import_bignumber263.default(0)
   });
   const unFrozenBalances = (0, import_get2.default)(acc, "unfrozenV2", []);
   const unFrozen = unFrozenBalances ? unFrozenBalances.reduce((accum, cur) => {
     if (cur && cur.type === "ENERGY") {
       accum.energy.push({
-        amount: new import_bignumber265.default(cur.unfreeze_amount),
+        amount: new import_bignumber263.default(cur.unfreeze_amount),
         expireTime: new Date(cur.unfreeze_expire_time)
       });
     } else if (cur) {
       accum.bandwidth.push({
-        amount: new import_bignumber265.default(cur.unfreeze_amount),
+        amount: new import_bignumber263.default(cur.unfreeze_amount),
         expireTime: new Date(cur.unfreeze_expire_time)
       });
     }
@@ -798098,13 +798477,13 @@ function getTronResources(acc) {
   };
   const delegatedFrozen = {
     bandwidth: delegatedFrozenBandwidth ? {
-      amount: new import_bignumber265.default(delegatedFrozenBandwidth)
+      amount: new import_bignumber263.default(delegatedFrozenBandwidth)
     } : void 0,
     energy: delegatedFrozenEnergy ? {
-      amount: new import_bignumber265.default(delegatedFrozenEnergy)
+      amount: new import_bignumber263.default(delegatedFrozenEnergy)
     } : void 0
   };
-  const tronPower = new import_bignumber265.default((0, import_get2.default)(frozen, "bandwidth.amount", 0)).plus((0, import_get2.default)(frozen, "energy.amount", 0)).plus((0, import_get2.default)(delegatedFrozen, "bandwidth.amount", 0)).plus((0, import_get2.default)(delegatedFrozen, "energy.amount", 0)).plus((0, import_get2.default)(legacyFrozen, "energy.amount", 0)).plus((0, import_get2.default)(legacyFrozen, "bandwidth.amount", 0)).dividedBy(1e6).integerValue(import_bignumber265.default.ROUND_FLOOR).toNumber();
+  const tronPower = new import_bignumber263.default((0, import_get2.default)(frozen, "bandwidth.amount", 0)).plus((0, import_get2.default)(frozen, "energy.amount", 0)).plus((0, import_get2.default)(delegatedFrozen, "bandwidth.amount", 0)).plus((0, import_get2.default)(delegatedFrozen, "energy.amount", 0)).plus((0, import_get2.default)(legacyFrozen, "energy.amount", 0)).plus((0, import_get2.default)(legacyFrozen, "bandwidth.amount", 0)).dividedBy(1e6).integerValue(import_bignumber263.default.ROUND_FLOOR).toNumber();
   const votes2 = (0, import_get2.default)(acc, "votes", []).map((v56) => ({
     address: v56.vote_address,
     voteCount: v56.vote_count
@@ -798121,7 +798500,72 @@ function getTronResources(acc) {
   };
 }
 
+// ../../libs/coin-modules/coin-tron/lib-es/logic/broadcast.js
+async function broadcast22(transaction) {
+  if (typeof transaction === "string") {
+    const { rawTx, signature: signature3 } = extractTxAndSignature(transaction);
+    const { txID, raw_data } = await decodeTransaction(rawTx);
+    const signedTxPayload = {
+      txID,
+      raw_data,
+      raw_data_hex: rawTx,
+      signature: [signature3]
+    };
+    return broadcastTron(signedTxPayload);
+  } else {
+    return broadcastTron(transaction);
+  }
+}
+function extractTxAndSignature(transaction) {
+  const txLength = parseInt(transaction.slice(0, 4), 16);
+  const rawTx = transaction.slice(4, txLength + 4);
+  const signature3 = transaction.slice(4 + txLength);
+  return { rawTx, signature: signature3 };
+}
+
+// ../../libs/coin-modules/coin-tron/lib-es/bridge/broadcast.js
+var broadcast23 = async ({ signedOperation: { signature: signature3, operation, rawData } }) => {
+  const transaction = {
+    raw_data: rawData,
+    txID: operation.hash,
+    signature: [signature3]
+  };
+  await broadcast22(transaction);
+  return operation;
+};
+var broadcast_default3 = broadcast23;
+
+// ../../libs/coin-modules/coin-tron/lib-es/bridge/createTransaction.js
+var import_bignumber264 = __toESM(require("bignumber.js"));
+var createTransaction21 = () => ({
+  family: "tron",
+  amount: new import_bignumber264.default(0),
+  useAllAmount: false,
+  mode: "send",
+  duration: 3,
+  recipient: "",
+  networkInfo: null,
+  resource: null,
+  votes: []
+});
+var createTransaction_default6 = createTransaction21;
+
+// ../../libs/coin-modules/coin-tron/lib-es/bridge/estimateMaxSpendable.js
+var import_bignumber270 = __toESM(require("bignumber.js"));
+
+// ../../libs/coin-modules/coin-tron/lib-es/bridge/getEstimateFees.js
+var import_bignumber269 = __toESM(require("bignumber.js"));
+
+// ../../libs/coin-modules/coin-tron/lib-es/logic/constants.js
+var import_bignumber265 = require("bignumber.js");
+var ONE_TRX = new import_bignumber265.BigNumber(1e6);
+var STANDARD_FEES_NATIVE = new import_bignumber265.BigNumber(2e3);
+var ACTIVATION_FEES = ONE_TRX.multipliedBy(1.1);
+var ACTIVATION_FEES_TRC_20 = ONE_TRX.multipliedBy(27.6009);
+var STANDARD_FEES_TRC_20 = ONE_TRX.multipliedBy(13.7409);
+
 // ../../libs/coin-modules/coin-tron/lib-es/bridge/utils.js
+var import_bignumber266 = require("bignumber.js");
 var parentTx = [
   "TransferContract",
   "VoteWitnessContract",
@@ -798308,6 +798752,43 @@ function isAccountEmpty3({ tronResources }) {
   return tronResources.bandwidth.freeLimit.eq(0);
 }
 
+// ../../libs/coin-modules/coin-tron/lib-es/logic/craftTransaction.js
+var import_bignumber267 = __toESM(require("bignumber.js"));
+
+// ../../libs/coin-modules/coin-tron/lib-es/logic/estimateFees.js
+async function estimateFees4(transactionIntent) {
+  if (transactionIntent.asset && transactionIntent.asset.standard === "trc20") {
+    return BigInt(ACTIVATION_FEES_TRC_20.toString());
+  } else {
+    return BigInt(STANDARD_FEES_NATIVE.toString());
+  }
+}
+
+// ../../libs/coin-modules/coin-tron/lib-es/logic/getBalance.js
+var import_bignumber268 = __toESM(require("bignumber.js"));
+
+// ../../libs/coin-modules/coin-tron/lib-es/logic/getAccount.js
+async function getAccount8(address4) {
+  return await fetchTronAccount(address4);
+}
+
+// ../../libs/coin-modules/coin-tron/lib-es/logic/getBalance.js
+function computeBalanceBridge(account3) {
+  const tronResources = getTronResources(account3);
+  const spendableBalance = account3.balance ? new import_bignumber268.default(account3.balance) : new import_bignumber268.default(0);
+  const balance = spendableBalance.plus(tronResources.frozen.bandwidth ? tronResources.frozen.bandwidth.amount : new import_bignumber268.default(0)).plus(tronResources.frozen.energy ? tronResources.frozen.energy.amount : new import_bignumber268.default(0)).plus(tronResources.delegatedFrozen.bandwidth ? tronResources.delegatedFrozen.bandwidth.amount : new import_bignumber268.default(0)).plus(tronResources.delegatedFrozen.energy ? tronResources.delegatedFrozen.energy.amount : new import_bignumber268.default(0)).plus(tronResources.unFrozen.energy ? tronResources.unFrozen.energy.reduce((accum, cur) => {
+    return accum.plus(cur.amount);
+  }, new import_bignumber268.default(0)) : new import_bignumber268.default(0)).plus(tronResources.unFrozen.bandwidth ? tronResources.unFrozen.bandwidth.reduce((accum, cur) => {
+    return accum.plus(cur.amount);
+  }, new import_bignumber268.default(0)) : new import_bignumber268.default(0)).plus(tronResources.legacyFrozen.bandwidth ? tronResources.legacyFrozen.bandwidth.amount : new import_bignumber268.default(0)).plus(tronResources.legacyFrozen.energy ? tronResources.legacyFrozen.energy.amount : new import_bignumber268.default(0));
+  return balance;
+}
+
+// ../../libs/coin-modules/coin-tron/lib-es/logic/lastBlock.js
+async function lastBlock4() {
+  return await getLastBlock4();
+}
+
 // ../../libs/coin-modules/coin-tron/lib-es/bridge/getEstimateFees.js
 var getFeesFromBandwidth = (account3, transaction) => {
   const { freeUsed, freeLimit, gainedUsed, gainedLimit } = extractBandwidthInfo(transaction.networkInfo);
@@ -798316,30 +798797,38 @@ var getFeesFromBandwidth = (account3, transaction) => {
   if (available.lt(estimatedBandwidthCost)) {
     return STANDARD_FEES_NATIVE;
   }
-  return new import_bignumber267.default(0);
+  return new import_bignumber269.default(0);
 };
 var getFeesFromAccountActivation = async (account3, transaction, tokenAccount) => {
-  const recipientAccounts = await fetchTronAccount(transaction.recipient);
+  const recipientAccounts = await getAccount8(transaction.recipient);
   const recipientAccount2 = recipientAccounts[0];
   const { gainedUsed, gainedLimit } = extractBandwidthInfo(transaction.networkInfo);
   const available = gainedLimit.minus(gainedUsed);
   const estimatedBandwidthCost = getEstimatedBlockSize(account3, transaction);
   const hasTRC20 = Boolean(tokenAccount && recipientAccount2?.trc20?.some((trc20) => tokenAccount.token.contractAddress in trc20));
   if (!recipientAccount2 && !hasTRC20 && available.lt(estimatedBandwidthCost)) {
-    if (tokenAccount && tokenAccount.token.tokenType === "trc20") {
-      return ACTIVATION_FEES_TRC_20;
-    }
     if (!tokenAccount) {
       return ACTIVATION_FEES;
     }
+    const transactionIntent = {
+      type: transaction.mode,
+      sender: account3.freshAddress,
+      recipient: transaction.recipient,
+      amount: BigInt(transaction.amount.toString()),
+      asset: tokenAccount?.token.tokenType === "trc20" ? { standard: "trc20", contractAddress: tokenAccount.token.contractAddress } : { standard: "trc10", tokenId: tokenAccount?.token.id }
+    };
+    if (tokenAccount && tokenAccount.token.tokenType === "trc20") {
+      const estimatedFees = await estimateFees4(transactionIntent);
+      return new import_bignumber269.default(estimatedFees.toString());
+    }
   }
   if (tokenAccount && tokenAccount.token.tokenType === "trc20") {
     return STANDARD_FEES_TRC_20;
   }
-  return new import_bignumber267.default(0);
+  return new import_bignumber269.default(0);
 };
 var getEstimatedFees11 = async (account3, transaction, tokenAccount) => {
-  const feesFromAccountActivation = transaction.mode === "send" ? await getFeesFromAccountActivation(account3, transaction, tokenAccount) : new import_bignumber267.default(0);
+  const feesFromAccountActivation = transaction.mode === "send" ? await getFeesFromAccountActivation(account3, transaction, tokenAccount) : new import_bignumber269.default(0);
   if (feesFromAccountActivation.gt(0)) {
     return feesFromAccountActivation;
   }
@@ -798356,15 +798845,15 @@ var estimateMaxSpendable19 = async ({ account: account3, parentAccount, transact
     subAccountId: account3.type === "Account" ? null : account3.id,
     ...transaction,
     recipient: transaction?.recipient || "0x0000000000000000000000000000000000000000",
-    amount: new import_bignumber268.default(0)
+    amount: new import_bignumber270.default(0)
   }, account3.type === "TokenAccount" ? account3 : void 0);
-  return account3.type === "Account" ? import_bignumber268.default.max(0, account3.spendableBalance.minus(fees2)) : account3.balance;
+  return account3.type === "Account" ? import_bignumber270.default.max(0, account3.spendableBalance.minus(fees2)) : account3.balance;
 };
 var estimateMaxSpendable_default4 = estimateMaxSpendable19;
 
 // ../../libs/coin-modules/coin-tron/lib-es/bridge/getTransactionStatus.js
 init_lib_es();
-var import_bignumber269 = __toESM(require("bignumber.js"));
+var import_bignumber271 = __toESM(require("bignumber.js"));
 var import_sumBy2 = __toESM(require("lodash/sumBy"));
 var getTransactionStatus19 = async (acc, transaction) => {
   const errors = {};
@@ -798390,9 +798879,9 @@ var getTransactionStatus19 = async (acc, transaction) => {
   }
   if (mode === "unfreeze") {
     const { bandwidth, energy } = acc.tronResources.frozen;
-    if (resource === "BANDWIDTH" && transaction.amount.gt(bandwidth?.amount || new import_bignumber269.default(0))) {
+    if (resource === "BANDWIDTH" && transaction.amount.gt(bandwidth?.amount || new import_bignumber271.default(0))) {
       errors.resource = new TronNoFrozenForBandwidth();
-    } else if (resource === "ENERGY" && transaction.amount.gt(energy?.amount || new import_bignumber269.default(0))) {
+    } else if (resource === "ENERGY" && transaction.amount.gt(energy?.amount || new import_bignumber271.default(0))) {
       errors.resource = new TronNoFrozenForEnergy();
     }
   }
@@ -798473,10 +798962,10 @@ var getTransactionStatus19 = async (acc, transaction) => {
       });
     }
   }
-  const estimatedFees = Object.entries(errors).length > 0 ? new import_bignumber269.default(0) : await getEstimateFees_default(acc, transaction, tokenAccount);
-  const balance = account3.type === "Account" ? import_bignumber269.default.max(0, account3.spendableBalance.minus(estimatedFees)) : account3.balance;
+  const estimatedFees = Object.entries(errors).length > 0 ? new import_bignumber271.default(0) : await getEstimateFees_default(acc, transaction, tokenAccount);
+  const balance = account3.type === "Account" ? import_bignumber271.default.max(0, account3.spendableBalance.minus(estimatedFees)) : account3.balance;
   const amount = useAllAmount ? balance : transaction.amount;
-  const amountSpent = ["send", "freeze", "undelegateResource"].includes(mode) ? amount : new import_bignumber269.default(0);
+  const amountSpent = ["send", "freeze", "undelegateResource"].includes(mode) ? amount : new import_bignumber271.default(0);
   if (mode === "freeze" && amount.lt(ONE_TRX)) {
     errors.amount = new TronInvalidFreezeAmount();
   }
@@ -798490,7 +798979,7 @@ var getTransactionStatus19 = async (acc, transaction) => {
     } else if (amount.gt(balance)) {
       errors.amount = new NotEnoughBalance();
     }
-    const energy = acc.tronResources && acc.tronResources.energy || new import_bignumber269.default(0);
+    const energy = acc.tronResources && acc.tronResources.energy || new import_bignumber271.default(0);
     if (account3.type === "TokenAccount" && account3.token.tokenType === "trc20" && energy.lt(47619)) {
       const contractUserEnergyConsumption = await getContractUserEnergyRatioConsumption(account3.token.contractAddress);
       if (contractUserEnergyConsumption > 0) {
@@ -798553,7 +799042,7 @@ var prepareTransaction20 = async (account3, transaction) => {
 };
 
 // ../../libs/coin-modules/coin-tron/lib-es/bridge/serialization.js
-var import_bignumber270 = require("bignumber.js");
+var import_bignumber272 = require("bignumber.js");
 
 // ../../libs/coin-modules/coin-tron/lib-es/types/bridge.js
 function isTrongridExtraTxInfo(op) {
@@ -798655,48 +799144,48 @@ var fromTronResourcesRaw = ({ frozen, unFrozen, delegatedFrozen, legacyFrozen, v
   return {
     frozen: {
       bandwidth: frozenBandwidth ? {
-        amount: new import_bignumber270.BigNumber(frozenBandwidth.amount)
+        amount: new import_bignumber272.BigNumber(frozenBandwidth.amount)
       } : void 0,
       energy: frozenEnergy ? {
-        amount: new import_bignumber270.BigNumber(frozenEnergy.amount)
+        amount: new import_bignumber272.BigNumber(frozenEnergy.amount)
       } : void 0
     },
     delegatedFrozen: {
       bandwidth: delegatedFrozenBandwidth ? {
-        amount: new import_bignumber270.BigNumber(delegatedFrozenBandwidth.amount)
+        amount: new import_bignumber272.BigNumber(delegatedFrozenBandwidth.amount)
       } : void 0,
       energy: delegatedFrozenEnergy ? {
-        amount: new import_bignumber270.BigNumber(delegatedFrozenEnergy.amount)
+        amount: new import_bignumber272.BigNumber(delegatedFrozenEnergy.amount)
       } : void 0
     },
     unFrozen: {
       bandwidth: unFrozenBandwidth ? unFrozenBandwidth.map((entry) => {
-        return { amount: new import_bignumber270.BigNumber(entry.amount), expireTime: new Date(entry.expireTime) };
+        return { amount: new import_bignumber272.BigNumber(entry.amount), expireTime: new Date(entry.expireTime) };
       }) : void 0,
       energy: unFrozenEnergy ? unFrozenEnergy.map((entry) => {
-        return { amount: new import_bignumber270.BigNumber(entry.amount), expireTime: new Date(entry.expireTime) };
+        return { amount: new import_bignumber272.BigNumber(entry.amount), expireTime: new Date(entry.expireTime) };
       }) : void 0
     },
     legacyFrozen: {
       bandwidth: legacyFrozenBandwidth ? {
-        amount: new import_bignumber270.BigNumber(legacyFrozenBandwidth.amount),
+        amount: new import_bignumber272.BigNumber(legacyFrozenBandwidth.amount),
         expiredAt: new Date(legacyFrozenBandwidth.expiredAt)
       } : void 0,
       energy: legacyFrozenEnergy ? {
-        amount: new import_bignumber270.BigNumber(legacyFrozenEnergy.amount),
+        amount: new import_bignumber272.BigNumber(legacyFrozenEnergy.amount),
         expiredAt: new Date(legacyFrozenEnergy.expiredAt)
       } : void 0
     },
     votes: votes2,
     tronPower,
-    energy: new import_bignumber270.BigNumber(energy),
+    energy: new import_bignumber272.BigNumber(energy),
     bandwidth: {
-      freeUsed: new import_bignumber270.BigNumber(bandwidth.freeUsed),
-      freeLimit: new import_bignumber270.BigNumber(bandwidth.freeLimit),
-      gainedUsed: new import_bignumber270.BigNumber(bandwidth.gainedUsed),
-      gainedLimit: new import_bignumber270.BigNumber(bandwidth.gainedLimit)
+      freeUsed: new import_bignumber272.BigNumber(bandwidth.freeUsed),
+      freeLimit: new import_bignumber272.BigNumber(bandwidth.freeLimit),
+      gainedUsed: new import_bignumber272.BigNumber(bandwidth.gainedUsed),
+      gainedLimit: new import_bignumber272.BigNumber(bandwidth.gainedLimit)
     },
-    unwithdrawnReward: new import_bignumber270.BigNumber(unwithdrawnReward),
+    unwithdrawnReward: new import_bignumber272.BigNumber(unwithdrawnReward),
     lastWithdrawnRewardDate: lastWithdrawnRewardDate ? new Date(lastWithdrawnRewardDate) : void 0,
     lastVotedDate: lastVotedDate ? new Date(lastVotedDate) : void 0,
     cacheTransactionInfoById
@@ -798719,16 +799208,16 @@ function fromOperationExtraRaw6(extraRaw) {
     return extra;
   }
   if (extraRaw.frozenAmount) {
-    extra.frozenAmount = new import_bignumber270.BigNumber(extraRaw.frozenAmount);
+    extra.frozenAmount = new import_bignumber272.BigNumber(extraRaw.frozenAmount);
   }
   if (extraRaw.unfreezeAmount) {
-    extra.unfreezeAmount = new import_bignumber270.BigNumber(extraRaw.unfreezeAmount);
+    extra.unfreezeAmount = new import_bignumber272.BigNumber(extraRaw.unfreezeAmount);
   }
   if (extraRaw.votes) {
     extra.votes = extraRaw.votes;
   }
   if (extraRaw.unDelegatedAmount) {
-    extra.unDelegatedAmount = new import_bignumber270.BigNumber(extraRaw.unDelegatedAmount);
+    extra.unDelegatedAmount = new import_bignumber272.BigNumber(extraRaw.unDelegatedAmount);
   }
   if (extraRaw.receiverAddress) {
     extra.receiverAddress = extraRaw.receiverAddress;
@@ -798759,21 +799248,21 @@ function toOperationExtraRaw6(extra) {
 }
 
 // ../../libs/coin-modules/coin-tron/lib-es/bridge/signOperation.js
-var import_bignumber272 = __toESM(require("bignumber.js"));
+var import_bignumber274 = __toESM(require("bignumber.js"));
 var import_rxjs139 = require("rxjs");
 
 // ../../libs/coin-modules/coin-tron/lib-es/bridge/buildOptimisticOperation.js
-var import_bignumber271 = __toESM(require("bignumber.js"));
+var import_bignumber273 = __toESM(require("bignumber.js"));
 var import_get3 = __toESM(require("lodash/get"));
 var getValue6 = (account3, subAccount, transaction, fee) => {
   switch (transaction.mode) {
     case "send":
-      return subAccount ? fee : new import_bignumber271.default(transaction.amount || 0).plus(fee);
+      return subAccount ? fee : new import_bignumber273.default(transaction.amount || 0).plus(fee);
     case "claimReward": {
-      return account3.tronResources ? account3.tronResources.unwithdrawnReward : new import_bignumber271.default(0);
+      return account3.tronResources ? account3.tronResources.unwithdrawnReward : new import_bignumber273.default(0);
     }
     default:
-      return new import_bignumber271.default(0);
+      return new import_bignumber273.default(0);
   }
 };
 var getExtra3 = (account3, transaction, resource) => {
@@ -798797,7 +799286,7 @@ var getExtra3 = (account3, transaction, resource) => {
       };
     case "legacyUnfreeze":
       return {
-        unfreezeAmount: (0, import_get3.default)(account3.tronResources, `frozen.${resource.toLocaleLowerCase()}.amount`, new import_bignumber271.default(0))
+        unfreezeAmount: (0, import_get3.default)(account3.tronResources, `frozen.${resource.toLocaleLowerCase()}.amount`, new import_bignumber273.default(0))
       };
     default:
       return void 0;
@@ -798827,8 +799316,8 @@ var buildOptimisticOperation17 = (account3, subAccount, transaction, fee, hash12
         id: encodeOperationId(subAccount.id, hash12, "OUT"),
         hash: hash12,
         type: "OUT",
-        value: transaction.useAllAmount && subAccount ? subAccount.balance : new import_bignumber271.default(transaction.amount || 0),
-        fee: new import_bignumber271.default(0),
+        value: transaction.useAllAmount && subAccount ? subAccount.balance : new import_bignumber273.default(transaction.amount || 0),
+        fee: new import_bignumber273.default(0),
         blockHash: null,
         blockHeight: null,
         senders: [account3.freshAddress],
@@ -798847,7 +799336,7 @@ var buildSignOperation20 = (signerContext3) => ({ account: account3, transaction
   async function main2() {
     const subAccount = transaction.subAccountId && account3.subAccounts ? account3.subAccounts.find((sa) => sa.id === transaction.subAccountId) : void 0;
     const fee = await getEstimateFees_default(account3, transaction, subAccount);
-    const balance = subAccount ? subAccount.balance : import_bignumber272.default.max(0, account3.spendableBalance.minus(fee));
+    const balance = subAccount ? subAccount.balance : import_bignumber274.default.max(0, account3.spendableBalance.minus(fee));
     if (transaction.useAllAmount) {
       transaction = { ...transaction };
       transaction.amount = balance;
@@ -798908,22 +799397,6 @@ var import_bignumber275 = __toESM(require("bignumber.js"));
 var import_compact6 = __toESM(require("lodash/compact"));
 var import_get4 = __toESM(require("lodash/get"));
 
-// ../../libs/coin-modules/coin-tron/lib-es/logic/craftTransaction.js
-var import_bignumber273 = __toESM(require("bignumber.js"));
-
-// ../../libs/coin-modules/coin-tron/lib-es/logic/getBalance.js
-var import_bignumber274 = __toESM(require("bignumber.js"));
-function computeBalanceBridge(account3) {
-  const tronResources = getTronResources(account3);
-  const spendableBalance = account3.balance ? new import_bignumber274.default(account3.balance) : new import_bignumber274.default(0);
-  const balance = spendableBalance.plus(tronResources.frozen.bandwidth ? tronResources.frozen.bandwidth.amount : new import_bignumber274.default(0)).plus(tronResources.frozen.energy ? tronResources.frozen.energy.amount : new import_bignumber274.default(0)).plus(tronResources.delegatedFrozen.bandwidth ? tronResources.delegatedFrozen.bandwidth.amount : new import_bignumber274.default(0)).plus(tronResources.delegatedFrozen.energy ? tronResources.delegatedFrozen.energy.amount : new import_bignumber274.default(0)).plus(tronResources.unFrozen.energy ? tronResources.unFrozen.energy.reduce((accum, cur) => {
-    return accum.plus(cur.amount);
-  }, new import_bignumber274.default(0)) : new import_bignumber274.default(0)).plus(tronResources.unFrozen.bandwidth ? tronResources.unFrozen.bandwidth.reduce((accum, cur) => {
-    return accum.plus(cur.amount);
-  }, new import_bignumber274.default(0)) : new import_bignumber274.default(0)).plus(tronResources.legacyFrozen.bandwidth ? tronResources.legacyFrozen.bandwidth.amount : new import_bignumber274.default(0)).plus(tronResources.legacyFrozen.energy ? tronResources.legacyFrozen.energy.amount : new import_bignumber274.default(0));
-  return balance;
-}
-
 // ../../libs/coin-modules/coin-tron/lib-es/logic/pagination.js
 function getOperationsPageSize(accountId2, syncConfig) {
   const { paginationConfig } = syncConfig;
@@ -798943,8 +799416,8 @@ function getOperationsPageSize(accountId2, syncConfig) {
 // ../../libs/coin-modules/coin-tron/lib-es/bridge/synchronization.js
 var PREFER_PENDING_OPERATIONS_UNTIL_BLOCK_VALIDATION = 35;
 var getAccountShape17 = async ({ initialAccount, currency: currency24, address: address4, derivationMode }, syncConfig) => {
-  const { height: blockHeight } = await getLastBlock4();
-  const tronAcc = await fetchTronAccount(address4);
+  const { height: blockHeight } = await lastBlock4();
+  const tronAcc = await getAccount8(address4);
   const accountId2 = encodeAccountId({
     type: "js",
     version: "2",
@@ -799025,7 +799498,7 @@ var getAccountShape17 = async ({ initialAccount, currency: currency24, address:
     return sub;
   }));
   const filteredInitialSubAccounts = (initialAccount?.subAccounts || []).filter((subAccount) => !blacklistedTokenIds.includes(subAccount.token.id));
-  const mergedSubAccounts = mergeSubAccounts2(subAccounts, filteredInitialSubAccounts);
+  const mergedSubAccounts = mergeSubAccounts3(subAccounts, filteredInitialSubAccounts);
   const subOutOperationsWithFee = subAccounts.flatMap((s67) => s67.operations).filter((o56) => o56.type === "OUT" && o56.fee.isGreaterThan(0)).map((o56) => ({
     ...o56,
     accountId: accountId2,
@@ -799062,7 +799535,7 @@ var postSync5 = (initial, parent) => {
   parent.subAccounts && parent.subAccounts.forEach(evictRecentOpsIfPending);
   return parent;
 };
-var mergeSubAccounts2 = (subAccounts1, subAccounts2) => {
+var mergeSubAccounts3 = (subAccounts1, subAccounts2) => {
   const existingIds = new Set(subAccounts1.map((subAccount) => subAccount.id));
   const filteredSubAccounts2 = subAccounts2.map((subAccount) => {
     if (existingIds.has(subAccount.id)) {
@@ -800100,7 +800573,7 @@ var RLPError = class _RLPError extends Error {
 };
 
 // ../../node_modules/.pnpm/thor-devkit@2.0.9/node_modules/thor-devkit/esm/secp256k1.js
-var import_crypto44 = require("crypto");
+var import_crypto45 = require("crypto");
 var import_elliptic4 = __toESM(require_elliptic());
 var import_buffer22 = require("buffer");
 var curve = new import_elliptic4.ec("secp256k1");
@@ -800115,7 +800588,7 @@ function isValidMessageHash(hash12) {
 var secp256k16;
 (function(secp256k19) {
   function generatePrivateKey2(rng4) {
-    rng4 = rng4 !== null && rng4 !== void 0 ? rng4 : () => (0, import_crypto44.randomBytes)(32);
+    rng4 = rng4 !== null && rng4 !== void 0 ? rng4 : () => (0, import_crypto45.randomBytes)(32);
     for (; ; ) {
       const privKey = rng4();
       if (isValidPrivateKey(privKey)) {
@@ -800713,7 +801186,7 @@ var import_bignumber278 = __toESM(require("bignumber.js"));
 // ../../libs/coin-modules/coin-vechain/lib-es/network/sdk.js
 var import_bignumber277 = __toESM(require("bignumber.js"));
 var BASE_URL3 = getEnv("API_VECHAIN_THOREST");
-var getAccount8 = async (address4) => {
+var getAccount9 = async (address4) => {
   const { data: data6 } = await network_default({
     method: "GET",
     url: `${BASE_URL3}/accounts/${address4}`
@@ -800865,7 +801338,7 @@ var padAddress = (address4) => {
 
 // ../../libs/coin-modules/coin-vechain/lib-es/common-logic/transaction-utils.js
 var import_bignumber279 = __toESM(require("bignumber.js"));
-var import_crypto45 = __toESM(require("crypto"));
+var import_crypto46 = __toESM(require("crypto"));
 
 // ../../libs/coin-modules/coin-vechain/lib-es/contracts/abis/params.js
 var set2 = {
@@ -800931,7 +801404,7 @@ var params_default = {
 // ../../libs/coin-modules/coin-vechain/lib-es/common-logic/transaction-utils.js
 var GAS_COEFFICIENT = 15e3;
 var generateNonce = () => {
-  const randBuffer = import_crypto45.default.randomBytes(Math.ceil(4));
+  const randBuffer = import_crypto46.default.randomBytes(Math.ceil(4));
   if (!randBuffer)
     throw Error("Failed to generate random hex");
   return `${HEX_PREFIX}${randBuffer.toString("hex").substring(0, 8)}`;
@@ -801166,7 +801639,7 @@ var getAccountShape18 = async (info6) => {
     xpubOrAddress: address4,
     derivationMode
   });
-  const { balance, energy } = await getAccount8(address4);
+  const { balance, energy } = await getAccount9(address4);
   const blockHeight = await getLastBlockHeight();
   const newOperations = await getOperations4(accountId2, address4, startAt);
   const vthoAccountId = encodeTokenAccountId(accountId2, findTokenById("vechain/vip180/vtho"));
@@ -801275,7 +801748,7 @@ var buildSignOperation21 = (signerContext3) => ({ account: account3, transaction
 });
 
 // ../../libs/coin-modules/coin-vechain/lib-es/bridge/broadcast.js
-var broadcast23 = async ({ signedOperation: { signature: signature3, operation, rawData } }) => {
+var broadcast24 = async ({ signedOperation: { signature: signature3, operation, rawData } }) => {
   const transaction = new Transaction5(rawData.body);
   transaction.signature = Buffer.from(signature3, "hex");
   const hash12 = await submit2(transaction);
@@ -801332,7 +801805,7 @@ function buildAccountBridge20(signerContext3) {
     sync: sync17,
     receive: receive16,
     signOperation: signOperation3,
-    broadcast: broadcast23,
+    broadcast: broadcast24,
     getSerializedAddressParameters
   };
 }
@@ -801768,7 +802241,7 @@ async function rpcCall(method2, params = {}) {
 }
 
 // ../../libs/coin-modules/coin-xrp/lib-es/logic/broadcast.js
-async function broadcast24(signature3) {
+async function broadcast25(signature3) {
   const submittedPayment = await submit3(signature3);
   if (submittedPayment.engine_result !== "tesSUCCESS" && submittedPayment.engine_result !== "terQUEUED") {
     throw new Error(submittedPayment.engine_result_message);
@@ -801880,7 +802353,7 @@ var remapError = (error2) => {
   }
   return error2;
 };
-async function estimateFees4(networkInfo) {
+async function estimateFees5(networkInfo) {
   if (!networkInfo) {
     try {
       const info6 = await getServerInfos();
@@ -802024,8 +802497,8 @@ var convertToCoreOperation = (address4) => (operation) => {
 };
 
 // ../../libs/coin-modules/coin-xrp/lib-es/bridge/broadcast.js
-var broadcast25 = async ({ signedOperation: { signature: signature3, operation } }) => {
-  const hash12 = await broadcast24(signature3);
+var broadcast26 = async ({ signedOperation: { signature: signature3, operation } }) => {
+  const hash12 = await broadcast25(signature3);
   return patchOperationWithHash(operation, hash12);
 };
 
@@ -802103,7 +802576,7 @@ var getTransactionStatus21 = async (account3, transaction) => {
 
 // ../../libs/coin-modules/coin-xrp/lib-es/bridge/prepareTransaction.js
 var prepareTransaction22 = async (_account, transaction) => {
-  const { networkInfo } = await estimateFees4(transaction.networkInfo);
+  const { networkInfo } = await estimateFees5(transaction.networkInfo);
   const fee = transaction.fee || networkInfo.serverFee;
   if (transaction.networkInfo !== networkInfo || transaction.fee !== fee) {
     return { ...transaction, networkInfo, fee };
@@ -802290,7 +802763,7 @@ function createBridges22(signerContext3, coinConfig16) {
     sync: sync21,
     receive: receive16,
     signOperation: signOperation3,
-    broadcast: broadcast25,
+    broadcast: broadcast26,
     getSerializedAddressParameters
   };
   return {
@@ -808390,7 +808863,7 @@ async function withApi2(execute2) {
   return result2;
 }
 var getBalanceCached = makeLRUCache(({ api: api8, owner }) => api8.getBalance({ owner }), (params) => params.owner, minutes(1));
-var getAccount9 = async (addr) => withApi2(async (api8) => {
+var getAccount10 = async (addr) => withApi2(async (api8) => {
   const balance = await getBalanceCached({ api: api8, owner: addr });
   return {
     blockHeight: BLOCK_HEIGHT * 2,
@@ -808524,7 +808997,7 @@ var loadOperation = async (params) => {
 
 // ../../libs/coin-modules/coin-sui/lib-es/network/index.js
 var network_default3 = {
-  getAccount: getAccount9,
+  getAccount: getAccount10,
   getOperations: getOperations5,
   paymentInfo: paymentInfo3,
   createTransaction: createTransaction24,
@@ -808540,13 +809013,13 @@ async function craftTransaction5(address4, extractExtrinsicArg3) {
 }
 
 // ../../libs/coin-modules/coin-sui/lib-es/logic/estimateFees.js
-async function estimateFees5(sender, transaction) {
+async function estimateFees6(sender, transaction) {
   const { gasBudget } = await network_default3.paymentInfo(sender, transaction);
   return BigInt(gasBudget);
 }
 
 // ../../libs/coin-modules/coin-sui/lib-es/logic/broadcast.js
-async function broadcast26(unsigned2, serializedSignature) {
+async function broadcast27(unsigned2, serializedSignature) {
   const result2 = await network_default3.executeTransactionBlock({
     transactionBlock: unsigned2,
     signature: serializedSignature,
@@ -808558,9 +809031,9 @@ async function broadcast26(unsigned2, serializedSignature) {
 }
 
 // ../../libs/coin-modules/coin-sui/lib-es/bridge/broadcast.js
-var broadcast27 = async ({ signedOperation }) => {
+var broadcast28 = async ({ signedOperation }) => {
   const { operation, rawData: { unsigned: unsigned2, serializedSignature } } = signedOperation;
-  const hash12 = await broadcast26(unsigned2, serializedSignature);
+  const hash12 = await broadcast27(unsigned2, serializedSignature);
   return patchOperationWithHash(operation, hash12);
 };
 
@@ -808633,7 +809106,7 @@ async function getEstimatedFees12({ account: account3, transaction }) {
     })
     // Remove fees if present since we are fetching fees
   };
-  const fees2 = await estimateFees5(account3.freshAddress, t75);
+  const fees2 = await estimateFees6(account3.freshAddress, t75);
   return new import_bignumber295.BigNumber(fees2.toString());
 }
 
@@ -811155,7 +811628,7 @@ var getAccountShape20 = async (info6) => {
     xpubOrAddress: address4,
     derivationMode
   });
-  const { blockHeight, balance } = await getAccount9(address4);
+  const { blockHeight, balance } = await getAccount10(address4);
   let operations = [];
   try {
     const startAtIn = latestHash(oldOperations, "IN");
@@ -811209,7 +811682,7 @@ function buildAccountBridge21(signerContext3) {
     sync: sync18,
     receive: receive16,
     signOperation: signOperation3,
-    broadcast: broadcast27,
+    broadcast: broadcast28,
     assignFromAccountRaw: assignFromAccountRaw12,
     assignToAccountRaw: assignToAccountRaw12,
     fromOperationExtraRaw: fromOperationExtraRaw7,
@@ -812412,7 +812885,7 @@ var parseSigningResponse = (response, chainId, isModern) => {
 };
 
 // ../../libs/ledger-live-common/lib-es/families/celo/broadcast.js
-var broadcast28 = async ({ signedOperation: { operation, signature: signature3 } }) => {
+var broadcast29 = async ({ signedOperation: { operation, signature: signature3 } }) => {
   const kit4 = celoKit();
   const { transactionHash } = await kit4.web3.eth.sendSignedTransaction(signature3);
   return patchOperationWithHash(operation, transactionHash);
@@ -812527,7 +813000,7 @@ var accountBridge = {
   sync: sync19,
   receive: receive2,
   signOperation,
-  broadcast: broadcast28,
+  broadcast: broadcast29,
   assignFromAccountRaw: assignFromAccountRaw13,
   assignToAccountRaw: assignToAccountRaw13,
   fromOperationExtraRaw: fromOperationExtraRaw8,
@@ -815076,7 +815549,7 @@ var sync20 = (initialAccount) => new import_rxjs148.Observable((o56) => {
     syncTimeouts[accountId2] = null;
   };
 });
-var broadcast29 = ({ signedOperation }) => Promise.resolve(signedOperation.operation);
+var broadcast30 = ({ signedOperation }) => Promise.resolve(signedOperation.operation);
 var signOperation2 = ({ account: account3, transaction }) => new import_rxjs148.Observable((o56) => {
   let cancelled = false;
   async function main2() {
@@ -815247,7 +815720,7 @@ var accountBridge2 = {
   assignFromAccountRaw,
   initAccount,
   signOperation: signOperation2,
-  broadcast: broadcast29,
+  broadcast: broadcast30,
   getSerializedAddressParameters
 };
 var currencyBridge2 = {
@@ -815401,7 +815874,7 @@ var accountBridge3 = {
   sync: sync20,
   receive: receive4,
   signOperation: signOperation2,
-  broadcast: broadcast29,
+  broadcast: broadcast30,
   getSerializedAddressParameters
 };
 var currencyBridge3 = {
@@ -815523,7 +815996,7 @@ var accountBridge4 = {
   sync: sync20,
   receive: receive5,
   signOperation: signOperation2,
-  broadcast: broadcast29,
+  broadcast: broadcast30,
   getSerializedAddressParameters
 };
 var currencyBridge4 = {
@@ -815644,7 +816117,7 @@ var accountBridge5 = {
   sync: sync20,
   receive: receive6,
   signOperation: signOperation2,
-  broadcast: broadcast29,
+  broadcast: broadcast30,
   estimateMaxSpendable: estimateMaxSpendable27,
   getSerializedAddressParameters
 };
@@ -815730,7 +816203,7 @@ var accountBridge6 = {
   sync: sync20,
   receive: receive7,
   signOperation: signOperation2,
-  broadcast: broadcast29,
+  broadcast: broadcast30,
   assignFromAccountRaw: assignFromAccountRaw4,
   assignToAccountRaw: assignToAccountRaw4,
   getSerializedAddressParameters
@@ -815849,7 +816322,7 @@ var accountBridge7 = {
   sync: sync20,
   receive: receive8,
   signOperation: signOperation2,
-  broadcast: broadcast29,
+  broadcast: broadcast30,
   getSerializedAddressParameters
 };
 var currencyBridge7 = {
@@ -815916,7 +816389,7 @@ var accountBridge8 = {
   sync: sync20,
   receive: receive9,
   signOperation: signOperation2,
-  broadcast: broadcast29,
+  broadcast: broadcast30,
   getSerializedAddressParameters
 };
 var currencyBridge8 = {
@@ -815992,7 +816465,7 @@ var accountBridge9 = {
   assignToAccountRaw: assignToAccountRaw6,
   assignFromAccountRaw: assignFromAccountRaw6,
   signOperation: signOperation2,
-  broadcast: broadcast29,
+  broadcast: broadcast30,
   getSerializedAddressParameters
 };
 var currencyBridge9 = {
@@ -816076,7 +816549,7 @@ var accountBridge10 = {
   assignToAccountRaw: assignToAccountRaw8,
   assignFromAccountRaw: assignFromAccountRaw8,
   signOperation: signOperation2,
-  broadcast: broadcast29,
+  broadcast: broadcast30,
   getSerializedAddressParameters
 };
 var preload11 = () => {
@@ -817224,7 +817697,7 @@ var accountBridge11 = {
   sync: sync20,
   receive: receive12,
   signOperation: signOperation2,
-  broadcast: broadcast29,
+  broadcast: broadcast30,
   estimateMaxSpendable: estimateMaxSpendable33,
   getSerializedAddressParameters
 };
@@ -817359,7 +817832,7 @@ var accountBridge12 = {
   sync: sync20,
   receive: receive13,
   signOperation: signOperation2,
-  broadcast: broadcast29,
+  broadcast: broadcast30,
   getSerializedAddressParameters
 };
 var currencyBridge12 = {
@@ -817445,7 +817918,7 @@ var accountBridge13 = {
   sync: sync20,
   receive: receive14,
   signOperation: signOperation2,
-  broadcast: broadcast29,
+  broadcast: broadcast30,
   getSerializedAddressParameters
 };
 var currencyBridge13 = {
@@ -817552,7 +818025,7 @@ var accountBridge14 = {
   sync: sync20,
   receive: receive15,
   signOperation: signOperation2,
-  broadcast: broadcast29,
+  broadcast: broadcast30,
   getSerializedAddressParameters
 };
 var currencyBridge14 = {
@@ -820244,6 +820717,12 @@ var appConfig = {
     default: {
       minVersion: "2.4.5"
     }
+  },
+  config_nanoapp_aptos: {
+    type: "object",
+    default: {
+      minVersion: "0.8.12"
+    }
   }
 };
 
@@ -822475,7 +822954,7 @@ var acceptTransaction3 = deviceActionFlow({
       button: SpeculosButton2.RIGHT
     },
     {
-      title: "Transaction",
+      title: "Transaction Type",
       button: SpeculosButton2.RIGHT
     },
     {
@@ -822483,21 +822962,53 @@ var acceptTransaction3 = deviceActionFlow({
       button: SpeculosButton2.RIGHT
     },
     {
-      title: "Coin Type",
+      title: "Amount",
+      button: SpeculosButton2.RIGHT
+    },
+    {
+      title: "To (1/2)",
+      button: SpeculosButton2.RIGHT
+    },
+    {
+      title: "To (2/2)",
+      button: SpeculosButton2.RIGHT
+    },
+    {
+      title: "Gas Fee",
+      button: SpeculosButton2.RIGHT
+    },
+    {
+      title: "Approve",
+      button: SpeculosButton2.BOTH
+    }
+  ]
+});
+var acceptTokenTransaction = deviceActionFlow({
+  steps: [
+    {
+      title: "Review",
       button: SpeculosButton2.RIGHT
     },
     {
-      title: "Receiver (1/2)",
+      title: "Transaction Type",
       button: SpeculosButton2.RIGHT
     },
     {
-      title: "Receiver (2/2)",
+      title: "Function",
       button: SpeculosButton2.RIGHT
     },
     {
       title: "Amount",
       button: SpeculosButton2.RIGHT
     },
+    {
+      title: "To (1/2)",
+      button: SpeculosButton2.RIGHT
+    },
+    {
+      title: "To (2/2)",
+      button: SpeculosButton2.RIGHT
+    },
     {
       title: "Gas Fee",
       button: SpeculosButton2.RIGHT
@@ -822520,7 +823031,7 @@ var aptosSpecs = {
     appName: "Aptos"
   },
   genericDeviceAction: acceptTransaction3,
-  testTimeout: 6 * 60 * 1e3,
+  testTimeout: 2 * 60 * 1e3,
   minViableAmount: MIN_SAFE,
   transactionCheck: ({ maxSpendable }) => {
     (0, import_invariant73.default)(maxSpendable.gt(MIN_SAFE), "balance is too low");
@@ -822574,9 +823085,48 @@ var aptosSpecs = {
       test: ({ account: account3 }) => {
         botTest("account spendable balance is zero", () => (0, import_expect3.default)(account3.spendableBalance.toString()).toBe("0"));
       }
+    },
+    {
+      name: "Send ~50% of token amount",
+      feature: "tokens",
+      maxRun: 1,
+      deviceAction: acceptTokenTransaction,
+      transaction: ({ account: account3, bridge: bridge26, siblings, maxSpendable }) => {
+        (0, import_invariant73.default)(maxSpendable.gt(MIN_SAFE), "Balance is too low");
+        const senderTokenAcc = findTokenSubAccountWithBalance(account3);
+        (0, import_invariant73.default)(senderTokenAcc, "Sender token account with available balance not found");
+        const sibling = pickSiblings(siblings, maxAccount2);
+        const recipientTokenAcc = findTokenSubAccountWithBalance(sibling);
+        (0, import_invariant73.default)(recipientTokenAcc, "Receiver token account with available balance not found");
+        const amount = senderTokenAcc.spendableBalance.div(2).integerValue();
+        const recipient = sibling.freshAddress;
+        const transaction = bridge26.createTransaction(account3);
+        const subAccountId = senderTokenAcc.id;
+        return {
+          transaction,
+          updates: [{ subAccountId }, { recipient }, { amount }]
+        };
+      },
+      test: (input) => {
+        expectTokenAccountCorrectBalanceChange(input);
+      }
     }
   ]
 };
+function findTokenSubAccountWithBalance(account3) {
+  return account3.subAccounts?.find((acc) => acc.type === "TokenAccount" && acc.balance.gt(0));
+}
+function expectTokenAccountCorrectBalanceChange({ account: account3, accountBeforeTransaction, status, transaction }) {
+  const tokenAccId = transaction.subAccountId;
+  if (!tokenAccId)
+    throw new Error("Wrong subAccountId");
+  const tokenAccAfterTx = account3.subAccounts?.find((acc) => acc.id === tokenAccId);
+  const tokenAccBeforeTx = accountBeforeTransaction.subAccounts?.find((acc) => acc.id === tokenAccId);
+  if (!tokenAccAfterTx || !tokenAccBeforeTx) {
+    throw new Error("Token sub accounts not found!");
+  }
+  botTest("Token balance decreased with operation", () => (0, import_expect3.default)(tokenAccAfterTx.balance.toString()).toBe(tokenAccBeforeTx.balance.minus(status.amount).toString()));
+}
 var bot_specs_default = {
   aptosSpecs
 };
@@ -827055,7 +827605,7 @@ var solana = {
       deviceAction: acceptTransferTokensWithATACreationTransaction,
       transaction: ({ account: account3, bridge: bridge26, siblings, maxSpendable }) => {
         (0, import_invariant87.default)(maxSpendable.gt(0), "balance is 0");
-        const senderTokenAcc = findTokenSubAccountWithBalance(account3);
+        const senderTokenAcc = findTokenSubAccountWithBalance2(account3);
         (0, import_invariant87.default)(senderTokenAcc, "Sender token account with available balance not found");
         const token = senderTokenAcc.token;
         const siblingWithoutToken = siblings.find((acc) => !findTokenSubAccount(acc, token.id));
@@ -827075,7 +827625,7 @@ var solana = {
         };
       },
       test: (input) => {
-        expectTokenAccountCorrectBalanceChange(input);
+        expectTokenAccountCorrectBalanceChange2(input);
       }
     },
     {
@@ -827085,7 +827635,7 @@ var solana = {
       deviceAction: acceptTransferTokensTransaction,
       transaction: ({ account: account3, bridge: bridge26, siblings, maxSpendable }) => {
         (0, import_invariant87.default)(maxSpendable.gt(0), "balance is 0");
-        const senderTokenAcc = findTokenSubAccountWithBalance(account3);
+        const senderTokenAcc = findTokenSubAccountWithBalance2(account3);
         (0, import_invariant87.default)(senderTokenAcc, "Sender token account with available balance not found");
         const token = senderTokenAcc.token;
         const siblingTokenAccount = siblings.find((acc) => findTokenSubAccount(acc, token.id));
@@ -827100,7 +827650,7 @@ var solana = {
         };
       },
       test: (input) => {
-        expectTokenAccountCorrectBalanceChange(input);
+        expectTokenAccountCorrectBalanceChange2(input);
       }
     },
     {
@@ -827237,7 +827787,7 @@ function expectCorrectBalanceChange2(input) {
   const { account: account3, operation, accountBeforeTransaction } = input;
   botTest("account balance decreased with operation value", () => (0, import_expect15.default)(account3.balance.toNumber()).toBe(accountBeforeTransaction.balance.minus(operation.value).toNumber()));
 }
-function expectTokenAccountCorrectBalanceChange({ account: account3, accountBeforeTransaction, status, transaction }) {
+function expectTokenAccountCorrectBalanceChange2({ account: account3, accountBeforeTransaction, status, transaction }) {
   const tokenAccId = transaction.subAccountId;
   if (!tokenAccId)
     throw new Error("Wrong transaction!");
@@ -827271,7 +827821,7 @@ function expectSourceBalanceChangeWithTxFee({ transaction, account: account3, ac
 function findTokenSubAccount(account3, tokenId) {
   return account3.subAccounts?.find((acc) => acc.type === "TokenAccount" && acc.token.id === tokenId);
 }
-function findTokenSubAccountWithBalance(account3) {
+function findTokenSubAccountWithBalance2(account3) {
   return account3.subAccounts?.find((acc) => acc.type === "TokenAccount" && acc.balance.gt(0));
 }
 function findTokenAccountWithExtensionAndBalance(account3, extension) {
@@ -836022,7 +836572,7 @@ async function generateCustomLockScreenImageFormat(hexImage, compressImage, padI
 }
 
 // src/commands/device/customLockScreenFetchAndRestore.ts
-var import_crypto47 = __toESM(require("crypto"));
+var import_crypto48 = __toESM(require("crypto"));
 var exec3 = async (opts) => {
   const { fileInput, device: deviceId = "", deviceModelId } = opts;
   if (!isCustomLockScreenSupported(deviceModelId)) {
@@ -836038,7 +836588,7 @@ var exec3 = async (opts) => {
     getScreenSpecs(clsSupportedDeviceModelId)
   );
   await new Promise(async () => {
-    const hash12 = import_crypto47.default.createHash("sha256").update(hexImage).digest("hex");
+    const hash12 = import_crypto48.default.createHash("sha256").update(hexImage).digest("hex");
     console.log("Computing hash for input file");
     console.log(hash12);
     console.log("Extracting hash from device");
@@ -842090,12 +842640,12 @@ var SoftwareDevice = class {
     if (stream10[stream10.length - 1].commands.length === 0) {
       throw new Error("Cannot sign an empty block");
     }
-    const lastBlock5 = stream10[stream10.length - 1];
-    lastBlock5.issuer = this.keyPair.publicKey;
+    const lastBlock6 = stream10[stream10.length - 1];
+    lastBlock6.issuer = this.keyPair.publicKey;
     const resolved = await CommandStreamResolver.resolve(stream10.slice(0, stream10.length - 1));
     let sharedKey = null;
-    for (let commandIndex = 0; commandIndex < lastBlock5.commands.length; commandIndex++) {
-      const command4 = lastBlock5.commands[commandIndex];
+    for (let commandIndex = 0; commandIndex < lastBlock6.commands.length; commandIndex++) {
+      const command4 = lastBlock6.commands[commandIndex];
       switch (command4.getType()) {
         case CommandType.Seed: {
           sharedKey = this.generateSharedKey();
@@ -842146,9 +842696,9 @@ var SoftwareDevice = class {
         }
       }
     }
-    const signature3 = signCommandBlock(lastBlock5, (await this.getPublicKey()).publicKey, this.keyPair.privateKey).signature;
-    lastBlock5.signature = signature3;
-    return lastBlock5;
+    const signature3 = signCommandBlock(lastBlock6, (await this.getPublicKey()).publicKey, this.keyPair.privateKey).signature;
+    lastBlock6.signature = signature3;
+    return lastBlock6;
   }
   async readKey(tree, path4) {
     const event = await tree.getPublishKeyEvent(this.keyPair.publicKey, path4);