@ledgerhq/live-common 22.0.3 → 22.2.0-next.0

package/lib/families/solana/bridge/mock.js.map

@@ -1 +1 @@
-{"version":3,"file":"mock.js","sourceRoot":"","sources":["../../../../src/families/solana/bridge/mock.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mock.js","sourceRoot":"","sources":["../../../../src/families/solana/bridge/mock.ts"],"names":[],"mappings":"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"}

package/lib/families/solana/errors.d.ts

@@ -49,4 +49,13 @@ export declare const SolanaStakeNoWithdrawAuth: (message?: string | undefined, f
 export declare const SolanaStakeNoStakeAuth: (message?: string | undefined, fields?: {
     [key: string]: any;
 } | undefined) => void;
+export declare const SolanaUseAllAmountStakeWarning: (message?: string | undefined, fields?: {
+    [key: string]: any;
+} | undefined) => void;
+export declare const SolanaTxSimulationFailedPendingOp: (message?: string | undefined, fields?: {
+    [key: string]: any;
+} | undefined) => void;
+export declare const SolanaTxConfirmationTimeout: (message?: string | undefined, fields?: {
+    [key: string]: any;
+} | undefined) => void;
 //# sourceMappingURL=errors.d.ts.map

package/lib/families/solana/errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../src/families/solana/errors.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,sBAAsB;;sBAElC,CAAC;AAEF,eAAO,MAAM,iDAAiD;;sBACM,CAAC;AAErE,eAAO,MAAM,mBAAmB;;sBAE/B,CAAC;AAEF,eAAO,MAAM,mCAAmC;;sBAE/C,CAAC;AAEF,eAAO,MAAM,+BAA+B;;sBAE3C,CAAC;AAEF,eAAO,MAAM,uBAAuB;;sBAEnC,CAAC;AAEF,eAAO,MAAM,+BAA+B;;sBAE3C,CAAC;AAEF,eAAO,MAAM,uBAAuB;;sBAEnC,CAAC;AAEF,eAAO,MAAM,sBAAsB;;sBAElC,CAAC;AAEF,eAAO,MAAM,0BAA0B;;sBAEtC,CAAC;AAEF,eAAO,MAAM,0BAA0B;;sBAEtC,CAAC;AAEF,eAAO,MAAM,mCAAmC;;sBAE/C,CAAC;AAEF,eAAO,MAAM,kCAAkC;;sBAE9C,CAAC;AAEF,eAAO,MAAM,oCAAoC;;sBAEhD,CAAC;AAEF,eAAO,MAAM,yCAAyC;;sBAErD,CAAC;AAEF,eAAO,MAAM,yBAAyB;;sBAErC,CAAC;AAEF,eAAO,MAAM,sBAAsB;;sBAElC,CAAC"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../src/families/solana/errors.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,sBAAsB;;sBAElC,CAAC;AAEF,eAAO,MAAM,iDAAiD;;sBACM,CAAC;AAErE,eAAO,MAAM,mBAAmB;;sBAE/B,CAAC;AAEF,eAAO,MAAM,mCAAmC;;sBAE/C,CAAC;AAEF,eAAO,MAAM,+BAA+B;;sBAE3C,CAAC;AAEF,eAAO,MAAM,uBAAuB;;sBAEnC,CAAC;AAEF,eAAO,MAAM,+BAA+B;;sBAE3C,CAAC;AAEF,eAAO,MAAM,uBAAuB;;sBAEnC,CAAC;AAEF,eAAO,MAAM,sBAAsB;;sBAElC,CAAC;AAEF,eAAO,MAAM,0BAA0B;;sBAEtC,CAAC;AAEF,eAAO,MAAM,0BAA0B;;sBAEtC,CAAC;AAEF,eAAO,MAAM,mCAAmC;;sBAE/C,CAAC;AAEF,eAAO,MAAM,kCAAkC;;sBAE9C,CAAC;AAEF,eAAO,MAAM,oCAAoC;;sBAEhD,CAAC;AAEF,eAAO,MAAM,yCAAyC;;sBAErD,CAAC;AAEF,eAAO,MAAM,yBAAyB;;sBAErC,CAAC;AAEF,eAAO,MAAM,sBAAsB;;sBAElC,CAAC;AAEF,eAAO,MAAM,8BAA8B;;sBAE1C,CAAC;AAEF,eAAO,MAAM,iCAAiC;;sBAE7C,CAAC;AAEF,eAAO,MAAM,2BAA2B;;sBAEvC,CAAC"}

package/lib/families/solana/errors.js

@@ -1,6 +1,6 @@
 "use strict";
 exports.__esModule = true;
-exports.SolanaStakeNoStakeAuth = exports.SolanaStakeNoWithdrawAuth = exports.SolanaStakeAccountValidatorIsUnchangeable = exports.SolanaStakeAccountIsNotUndelegatable = exports.SolanaStakeAccountIsNotDelegatable = exports.SolanaStakeAccountNothingToWithdraw = exports.SolanaStakeAccountNotFound = exports.SolanaStakeAccountRequired = exports.SolanaInvalidValidator = exports.SolanaValidatorRequired = exports.SolanaTokenRecipientIsSenderATA = exports.SolanaAddressOffEd25519 = exports.SolanaTokenAccounNotInitialized = exports.SolanaTokenAccountHoldsAnotherToken = exports.SolanaMemoIsTooLong = exports.SolanaRecipientAssociatedTokenAccountWillBeFunded = exports.SolanaAccountNotFunded = void 0;
+exports.SolanaTxConfirmationTimeout = exports.SolanaTxSimulationFailedPendingOp = exports.SolanaUseAllAmountStakeWarning = exports.SolanaStakeNoStakeAuth = exports.SolanaStakeNoWithdrawAuth = exports.SolanaStakeAccountValidatorIsUnchangeable = exports.SolanaStakeAccountIsNotUndelegatable = exports.SolanaStakeAccountIsNotDelegatable = exports.SolanaStakeAccountNothingToWithdraw = exports.SolanaStakeAccountNotFound = exports.SolanaStakeAccountRequired = exports.SolanaInvalidValidator = exports.SolanaValidatorRequired = exports.SolanaTokenRecipientIsSenderATA = exports.SolanaAddressOffEd25519 = exports.SolanaTokenAccounNotInitialized = exports.SolanaTokenAccountHoldsAnotherToken = exports.SolanaMemoIsTooLong = exports.SolanaRecipientAssociatedTokenAccountWillBeFunded = exports.SolanaAccountNotFunded = void 0;
 var errors_1 = require("@ledgerhq/errors");
 exports.SolanaAccountNotFunded = (0, errors_1.createCustomErrorClass)("SolanaAccountNotFunded");
 exports.SolanaRecipientAssociatedTokenAccountWillBeFunded = (0, errors_1.createCustomErrorClass)("SolanaAssociatedTokenAccountWillBeFunded");
@@ -19,4 +19,7 @@ exports.SolanaStakeAccountIsNotUndelegatable = (0, errors_1.createCustomErrorCla
 exports.SolanaStakeAccountValidatorIsUnchangeable = (0, errors_1.createCustomErrorClass)("SolanaStakeAccountValidatorIsUnchangeable");
 exports.SolanaStakeNoWithdrawAuth = (0, errors_1.createCustomErrorClass)("SolanaStakeNoWithdrawAuth");
 exports.SolanaStakeNoStakeAuth = (0, errors_1.createCustomErrorClass)("SolanaStakeNoStakeAuth");
+exports.SolanaUseAllAmountStakeWarning = (0, errors_1.createCustomErrorClass)("SolanaUseAllAmountStakeWarning");
+exports.SolanaTxSimulationFailedPendingOp = (0, errors_1.createCustomErrorClass)("SolanaTxSimulationFailedWhilePendingOp");
+exports.SolanaTxConfirmationTimeout = (0, errors_1.createCustomErrorClass)("SolanaTxConfirmationTimeout");
 //# sourceMappingURL=errors.js.map

package/lib/families/solana/errors.js.map

@@ -1 +1 @@
-{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/families/solana/errors.ts"],"names":[],"mappings":";;;AAAA,2CAA0D;AAE7C,QAAA,sBAAsB,GAAG,IAAA,+BAAsB,EAC1D,wBAAwB,CACzB,CAAC;AAEW,QAAA,iDAAiD,GAC5D,IAAA,+BAAsB,EAAC,0CAA0C,CAAC,CAAC;AAExD,QAAA,mBAAmB,GAAG,IAAA,+BAAsB,EACvD,qBAAqB,CACtB,CAAC;AAEW,QAAA,mCAAmC,GAAG,IAAA,+BAAsB,EACvE,qCAAqC,CACtC,CAAC;AAEW,QAAA,+BAA+B,GAAG,IAAA,+BAAsB,EACnE,iCAAiC,CAClC,CAAC;AAEW,QAAA,uBAAuB,GAAG,IAAA,+BAAsB,EAC3D,wBAAwB,CACzB,CAAC;AAEW,QAAA,+BAA+B,GAAG,IAAA,+BAAsB,EACnE,iCAAiC,CAClC,CAAC;AAEW,QAAA,uBAAuB,GAAG,IAAA,+BAAsB,EAC3D,yBAAyB,CAC1B,CAAC;AAEW,QAAA,sBAAsB,GAAG,IAAA,+BAAsB,EAC1D,wBAAwB,CACzB,CAAC;AAEW,QAAA,0BAA0B,GAAG,IAAA,+BAAsB,EAC9D,4BAA4B,CAC7B,CAAC;AAEW,QAAA,0BAA0B,GAAG,IAAA,+BAAsB,EAC9D,4BAA4B,CAC7B,CAAC;AAEW,QAAA,mCAAmC,GAAG,IAAA,+BAAsB,EACvE,qCAAqC,CACtC,CAAC;AAEW,QAAA,kCAAkC,GAAG,IAAA,+BAAsB,EACtE,oCAAoC,CACrC,CAAC;AAEW,QAAA,oCAAoC,GAAG,IAAA,+BAAsB,EACxE,sCAAsC,CACvC,CAAC;AAEW,QAAA,yCAAyC,GAAG,IAAA,+BAAsB,EAC7E,2CAA2C,CAC5C,CAAC;AAEW,QAAA,yBAAyB,GAAG,IAAA,+BAAsB,EAC7D,2BAA2B,CAC5B,CAAC;AAEW,QAAA,sBAAsB,GAAG,IAAA,+BAAsB,EAC1D,wBAAwB,CACzB,CAAC"}
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/families/solana/errors.ts"],"names":[],"mappings":";;;AAAA,2CAA0D;AAE7C,QAAA,sBAAsB,GAAG,IAAA,+BAAsB,EAC1D,wBAAwB,CACzB,CAAC;AAEW,QAAA,iDAAiD,GAC5D,IAAA,+BAAsB,EAAC,0CAA0C,CAAC,CAAC;AAExD,QAAA,mBAAmB,GAAG,IAAA,+BAAsB,EACvD,qBAAqB,CACtB,CAAC;AAEW,QAAA,mCAAmC,GAAG,IAAA,+BAAsB,EACvE,qCAAqC,CACtC,CAAC;AAEW,QAAA,+BAA+B,GAAG,IAAA,+BAAsB,EACnE,iCAAiC,CAClC,CAAC;AAEW,QAAA,uBAAuB,GAAG,IAAA,+BAAsB,EAC3D,wBAAwB,CACzB,CAAC;AAEW,QAAA,+BAA+B,GAAG,IAAA,+BAAsB,EACnE,iCAAiC,CAClC,CAAC;AAEW,QAAA,uBAAuB,GAAG,IAAA,+BAAsB,EAC3D,yBAAyB,CAC1B,CAAC;AAEW,QAAA,sBAAsB,GAAG,IAAA,+BAAsB,EAC1D,wBAAwB,CACzB,CAAC;AAEW,QAAA,0BAA0B,GAAG,IAAA,+BAAsB,EAC9D,4BAA4B,CAC7B,CAAC;AAEW,QAAA,0BAA0B,GAAG,IAAA,+BAAsB,EAC9D,4BAA4B,CAC7B,CAAC;AAEW,QAAA,mCAAmC,GAAG,IAAA,+BAAsB,EACvE,qCAAqC,CACtC,CAAC;AAEW,QAAA,kCAAkC,GAAG,IAAA,+BAAsB,EACtE,oCAAoC,CACrC,CAAC;AAEW,QAAA,oCAAoC,GAAG,IAAA,+BAAsB,EACxE,sCAAsC,CACvC,CAAC;AAEW,QAAA,yCAAyC,GAAG,IAAA,+BAAsB,EAC7E,2CAA2C,CAC5C,CAAC;AAEW,QAAA,yBAAyB,GAAG,IAAA,+BAAsB,EAC7D,2BAA2B,CAC5B,CAAC;AAEW,QAAA,sBAAsB,GAAG,IAAA,+BAAsB,EAC1D,wBAAwB,CACzB,CAAC;AAEW,QAAA,8BAA8B,GAAG,IAAA,+BAAsB,EAClE,gCAAgC,CACjC,CAAC;AAEW,QAAA,iCAAiC,GAAG,IAAA,+BAAsB,EACrE,wCAAwC,CACzC,CAAC;AAEW,QAAA,2BAA2B,GAAG,IAAA,+BAAsB,EAC/D,6BAA6B,CAC9B,CAAC"}

package/lib/families/solana/js-broadcast.d.ts

@@ -1,6 +1,6 @@
 import type { Account, Operation, SignedOperation } from "../../types";
 import { ChainAPI } from "./api";
-export declare const broadcastWithAPI: ({ signedOperation, }: {
+export declare const broadcastWithAPI: ({ account, signedOperation, }: {
     account: Account;
     signedOperation: SignedOperation;
 }, api: ChainAPI) => Promise<Operation>;

package/lib/families/solana/js-broadcast.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"js-broadcast.d.ts","sourceRoot":"","sources":["../../../src/families/solana/js-broadcast.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEjC,eAAO,MAAM,gBAAgB;aAIhB,OAAO;qBACC,eAAe;QAE7B,QAAQ,KACZ,QAAQ,SAAS,CAOnB,CAAC"}
+{"version":3,"file":"js-broadcast.d.ts","sourceRoot":"","sources":["../../../src/families/solana/js-broadcast.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAMjC,eAAO,MAAM,gBAAgB;aAKhB,OAAO;qBACC,eAAe;QAE7B,QAAQ,KACZ,QAAQ,SAAS,CA2BnB,CAAC"}

package/lib/families/solana/js-broadcast.js

@@ -37,20 +37,39 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 exports.__esModule = true;
 exports.broadcastWithAPI = void 0;
+var logs_1 = require("@ledgerhq/logs");
 var operation_1 = require("../../operation");
+var errors_1 = require("./errors");
 var broadcastWithAPI = function (_a, api) {
-    var signedOperation = _a.signedOperation;
+    var account = _a.account, signedOperation = _a.signedOperation;
     return __awaiter(void 0, void 0, void 0, function () {
-        var signature, operation, txSignature, txHash;
+        var signature, operation, txSignature, e_1;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
                     signature = signedOperation.signature, operation = signedOperation.operation;
-                    return [4 /*yield*/, api.sendRawTransaction(Buffer.from(signature, "hex"))];
+                    _b.label = 1;
                 case 1:
+                    _b.trys.push([1, 3, , 4]);
+                    return [4 /*yield*/, api.sendRawTransaction(Buffer.from(signature, "hex"))];
+                case 2:
                     txSignature = _b.sent();
-                    txHash = txSignature;
-                    return [2 /*return*/, (0, operation_1.patchOperationWithHash)(operation, txHash)];
+                    return [2 /*return*/, (0, operation_1.patchOperationWithHash)(operation, txSignature)];
+                case 3:
+                    e_1 = _b.sent();
+                    // heuristics to make some errors more user friendly
+                    if (e_1 instanceof Error) {
+                        (0, logs_1.log)("broadcast-error", e_1.message);
+                        if (e_1.message.includes("simulation failed") &&
+                            account.pendingOperations.length > 0) {
+                            throw new errors_1.SolanaTxSimulationFailedPendingOp();
+                        }
+                        if (e_1.message.includes("was not confirmed in")) {
+                            throw new errors_1.SolanaTxConfirmationTimeout();
+                        }
+                    }
+                    throw e_1;
+                case 4: return [2 /*return*/];
             }
         });
     });

package/lib/families/solana/js-broadcast.js.map

@@ -1 +1 @@
-{"version":3,"file":"js-broadcast.js","sourceRoot":"","sources":["../../../src/families/solana/js-broadcast.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAyD;AAIlD,IAAM,gBAAgB,GAAG,UAC9B,EAKC,EACD,GAAa;QALX,eAAe,qBAAA;;;;;;oBAOT,SAAS,GAAgB,eAAe,UAA/B,EAAE,SAAS,GAAK,eAAe,UAApB,CAAqB;oBAC7B,qBAAM,GAAG,CAAC,kBAAkB,CAC9C,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAC9B,EAAA;;oBAFK,WAAW,GAAG,SAEnB;oBACK,MAAM,GAAG,WAAW,CAAC;oBAC3B,sBAAO,IAAA,kCAAsB,EAAC,SAAS,EAAE,MAAM,CAAC,EAAC;;;;CAClD,CAAC;AAfW,QAAA,gBAAgB,oBAe3B"}
+{"version":3,"file":"js-broadcast.js","sourceRoot":"","sources":["../../../src/families/solana/js-broadcast.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAqC;AACrC,6CAAyD;AAGzD,mCAGkB;AAEX,IAAM,gBAAgB,GAAG,UAC9B,EAMC,EACD,GAAa;QANX,OAAO,aAAA,EACP,eAAe,qBAAA;;;;;;oBAOT,SAAS,GAAgB,eAAe,UAA/B,EAAE,SAAS,GAAK,eAAe,UAApB,CAAqB;;;;oBAG3B,qBAAM,GAAG,CAAC,kBAAkB,CAC9C,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAC9B,EAAA;;oBAFK,WAAW,GAAG,SAEnB;oBACD,sBAAO,IAAA,kCAAsB,EAAC,SAAS,EAAE,WAAW,CAAC,EAAC;;;oBAEtD,oDAAoD;oBACpD,IAAI,GAAC,YAAY,KAAK,EAAE;wBACtB,IAAA,UAAG,EAAC,iBAAiB,EAAE,GAAC,CAAC,OAAO,CAAC,CAAC;wBAElC,IACE,GAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC;4BACvC,OAAO,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,EACpC;4BACA,MAAM,IAAI,0CAAiC,EAAE,CAAC;yBAC/C;wBAED,IAAI,GAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE;4BAC9C,MAAM,IAAI,oCAA2B,EAAE,CAAC;yBACzC;qBACF;oBAED,MAAM,GAAC,CAAC;;;;;CAEX,CAAC;AApCW,QAAA,gBAAgB,oBAoC3B"}

package/lib/families/solana/js-buildTransaction.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import type { Account } from "../../types";
 import type { Transaction } from "./types";
+import { Transaction as OnChainTransaction } from "@solana/web3.js";
 import { ChainAPI } from "./api";
-export declare const buildTransactionWithAPI: (account: Account, transaction: Transaction, api: ChainAPI) => Promise<readonly [Buffer, (signature: Buffer) => Buffer]>;
+export declare const buildTransactionWithAPI: (account: Account, transaction: Transaction, api: ChainAPI) => Promise<readonly [OnChainTransaction, (signature: Buffer) => OnChainTransaction]>;
 //# sourceMappingURL=js-buildTransaction.d.ts.map

package/lib/families/solana/js-buildTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"js-buildTransaction.d.ts","sourceRoot":"","sources":["../../../src/families/solana/js-buildTransaction.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EAAW,WAAW,EAAE,MAAM,SAAS,CAAC;AAkBpD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEjC,eAAO,MAAM,uBAAuB,YACzB,OAAO,eACH,WAAW,OACnB,QAAQ,2CAC0B,MAAM,KAAK,MAAM,EAwBzD,CAAC"}
+{"version":3,"file":"js-buildTransaction.d.ts","sourceRoot":"","sources":["../../../src/families/solana/js-buildTransaction.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EAAW,WAAW,EAAE,MAAM,SAAS,CAAC;AAYpD,OAAO,EAEL,WAAW,IAAI,kBAAkB,EAElC,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEjC,eAAO,MAAM,uBAAuB,YACzB,OAAO,eACH,WAAW,OACnB,QAAQ,uDAE6B,MAAM,KAAK,kBAAkB,EAsBxE,CAAC"}

package/lib/families/solana/js-buildTransaction.js

@@ -71,7 +71,7 @@ var buildTransactionWithAPI = function (account, transaction, api) { return __aw
         switch (_a.label) {
             case 0:
                 instructions = buildInstructions(transaction);
-                return [4 /*yield*/, api.getRecentBlockhash()];
+                return [4 /*yield*/, api.getLatestBlockhash()];
             case 1:
                 recentBlockhash = _a.sent();
                 feePayer = new web3_js_1.PublicKey(account.freshAddress);
@@ -81,13 +81,10 @@ var buildTransactionWithAPI = function (account, transaction, api) { return __aw
                 });
                 tx.add.apply(tx, __spreadArray([], __read(instructions), false));
                 return [2 /*return*/, [
-                        tx.compileMessage().serialize(),
+                        tx,
                         function (signature) {
-                            return (0, web3_1.addSignatureToTransaction)({
-                                tx: tx,
-                                address: account.freshAddress,
-                                signature: signature
-                            }).serialize();
+                            tx.addSignature(new web3_js_1.PublicKey(account.freshAddress), signature);
+                            return tx;
                         },
                     ]];
         }

package/lib/families/solana/js-buildTransaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"js-buildTransaction.js","sourceRoot":"","sources":["../../../src/families/solana/js-buildTransaction.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,yCAU0B;AAC1B,iCAA4C;AAC5C,2CAIyB;AAGlB,IAAM,uBAAuB,GAAG,UACrC,OAAgB,EAChB,WAAwB,EACxB,GAAa;;;;;gBAEP,YAAY,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;gBAE5B,qBAAM,GAAG,CAAC,kBAAkB,EAAE,EAAA;;gBAAhD,eAAe,GAAG,SAA8B;gBAEhD,QAAQ,GAAG,IAAI,mBAAS,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;gBAE/C,EAAE,GAAG,IAAI,qBAAkB,CAAC;oBAChC,QAAQ,UAAA;oBACR,eAAe,iBAAA;iBAChB,CAAC,CAAC;gBAEH,EAAE,CAAC,GAAG,OAAN,EAAE,2BAAQ,YAAY,WAAE;gBAExB,sBAAO;wBACL,EAAE,CAAC,cAAc,EAAE,CAAC,SAAS,EAAE;wBAC/B,UAAC,SAAiB;4BAChB,OAAO,IAAA,gCAAyB,EAAC;gCAC/B,EAAE,IAAA;gCACF,OAAO,EAAE,OAAO,CAAC,YAAY;gCAC7B,SAAS,WAAA;6BACV,CAAC,CAAC,SAAS,EAAE,CAAC;wBACjB,CAAC;qBACO,EAAC;;;KACZ,CAAC;AA5BW,QAAA,uBAAuB,2BA4BlC;AAEF,SAAS,iBAAiB,CAAC,EAAe;IAChC,IAAA,iBAAiB,GAAK,EAAE,CAAC,KAAK,kBAAb,CAAc;IACvC,IAAI,iBAAiB,KAAK,SAAS,EAAE;QACnC,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;KAC/C;IACD,IAAI,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;QACpD,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;KAClD;IACD,OAAO,2BAA2B,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;AAChE,CAAC;AAED,SAAS,2BAA2B,CAClC,OAAgB;IAEhB,QAAQ,OAAO,CAAC,IAAI,EAAE;QACpB,KAAK,UAAU;YACb,OAAO,IAAA,gCAAyB,EAAC,OAAO,CAAC,CAAC;QAC5C,KAAK,gBAAgB;YACnB,OAAO,IAAA,qCAA8B,EAAC,OAAO,CAAC,CAAC;QACjD,KAAK,iBAAiB;YACpB,OAAO,IAAA,mDAA4C,EAAC,OAAO,CAAC,CAAC;QAC/D,KAAK,qBAAqB;YACxB,OAAO,IAAA,0CAAmC,EAAC,OAAO,CAAC,CAAC;QACtD,KAAK,gBAAgB;YACnB,OAAO,IAAA,qCAA8B,EAAC,OAAO,CAAC,CAAC;QACjD,KAAK,kBAAkB;YACrB,OAAO,IAAA,uCAAgC,EAAC,OAAO,CAAC,CAAC;QACnD,KAAK,gBAAgB;YACnB,OAAO,IAAA,qCAA8B,EAAC,OAAO,CAAC,CAAC;QACjD,KAAK,aAAa;YAChB,OAAO,IAAA,kCAA2B,EAAC,OAAO,CAAC,CAAC;QAC9C;YACE,OAAO,IAAA,yBAAiB,EAAC,OAAO,CAAC,CAAC;KACrC;AACH,CAAC"}
+{"version":3,"file":"js-buildTransaction.js","sourceRoot":"","sources":["../../../src/families/solana/js-buildTransaction.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,yCAS0B;AAC1B,iCAA4C;AAC5C,2CAIyB;AAGlB,IAAM,uBAAuB,GAAG,UACrC,OAAgB,EAChB,WAAwB,EACxB,GAAa;;;;;gBAIP,YAAY,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;gBAE5B,qBAAM,GAAG,CAAC,kBAAkB,EAAE,EAAA;;gBAAhD,eAAe,GAAG,SAA8B;gBAEhD,QAAQ,GAAG,IAAI,mBAAS,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;gBAE/C,EAAE,GAAG,IAAI,qBAAkB,CAAC;oBAChC,QAAQ,UAAA;oBACR,eAAe,iBAAA;iBAChB,CAAC,CAAC;gBAEH,EAAE,CAAC,GAAG,OAAN,EAAE,2BAAQ,YAAY,WAAE;gBAExB,sBAAO;wBACL,EAAE;wBACF,UAAC,SAAiB;4BAChB,EAAE,CAAC,YAAY,CAAC,IAAI,mBAAS,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,SAAS,CAAC,CAAC;4BAChE,OAAO,EAAE,CAAC;wBACZ,CAAC;qBACF,EAAC;;;KACH,CAAC;AA3BW,QAAA,uBAAuB,2BA2BlC;AAEF,SAAS,iBAAiB,CAAC,EAAe;IAChC,IAAA,iBAAiB,GAAK,EAAE,CAAC,KAAK,kBAAb,CAAc;IACvC,IAAI,iBAAiB,KAAK,SAAS,EAAE;QACnC,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;KAC/C;IACD,IAAI,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;QACpD,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;KAClD;IACD,OAAO,2BAA2B,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;AAChE,CAAC;AAED,SAAS,2BAA2B,CAClC,OAAgB;IAEhB,QAAQ,OAAO,CAAC,IAAI,EAAE;QACpB,KAAK,UAAU;YACb,OAAO,IAAA,gCAAyB,EAAC,OAAO,CAAC,CAAC;QAC5C,KAAK,gBAAgB;YACnB,OAAO,IAAA,qCAA8B,EAAC,OAAO,CAAC,CAAC;QACjD,KAAK,iBAAiB;YACpB,OAAO,IAAA,mDAA4C,EAAC,OAAO,CAAC,CAAC;QAC/D,KAAK,qBAAqB;YACxB,OAAO,IAAA,0CAAmC,EAAC,OAAO,CAAC,CAAC;QACtD,KAAK,gBAAgB;YACnB,OAAO,IAAA,qCAA8B,EAAC,OAAO,CAAC,CAAC;QACjD,KAAK,kBAAkB;YACrB,OAAO,IAAA,uCAAgC,EAAC,OAAO,CAAC,CAAC;QACnD,KAAK,gBAAgB;YACnB,OAAO,IAAA,qCAA8B,EAAC,OAAO,CAAC,CAAC;QACjD,KAAK,aAAa;YAChB,OAAO,IAAA,kCAA2B,EAAC,OAAO,CAAC,CAAC;QAC9C;YACE,OAAO,IAAA,yBAAiB,EAAC,OAAO,CAAC,CAAC;KACrC;AACH,CAAC"}

package/lib/families/solana/js-estimateMaxSpendable.d.ts

@@ -2,6 +2,6 @@ import type { AccountBridge } from "../../types";
 import type { Transaction } from "./types";
 import BigNumber from "bignumber.js";
 import { ChainAPI } from "./api";
-declare const estimateMaxSpendableWithAPI: ({ account, transaction, }: Parameters<AccountBridge<Transaction>["estimateMaxSpendable"]>[0], api: ChainAPI) => Promise<BigNumber>;
+declare const estimateMaxSpendableWithAPI: ({ account, parentAccount, transaction, }: Parameters<AccountBridge<Transaction>["estimateMaxSpendable"]>[0], api: ChainAPI) => Promise<BigNumber>;
 export default estimateMaxSpendableWithAPI;
 //# sourceMappingURL=js-estimateMaxSpendable.d.ts.map

package/lib/families/solana/js-estimateMaxSpendable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"js-estimateMaxSpendable.d.ts","sourceRoot":"","sources":["../../../src/families/solana/js-estimateMaxSpendable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAGjC,QAAA,MAAM,2BAA2B,8BAI5B,WAAW,cAAc,WAAW,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,OAC/D,QAAQ,KACZ,QAAQ,SAAS,CA2BnB,CAAC;AAEF,eAAe,2BAA2B,CAAC"}
+{"version":3,"file":"js-estimateMaxSpendable.d.ts","sourceRoot":"","sources":["../../../src/families/solana/js-estimateMaxSpendable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAKjC,QAAA,MAAM,2BAA2B,6CAK5B,WAAW,cAAc,WAAW,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,OAC/D,QAAQ,KACZ,QAAQ,SAAS,CA0BnB,CAAC;AAEF,eAAe,2BAA2B,CAAC"}

package/lib/families/solana/js-estimateMaxSpendable.js

@@ -41,37 +41,39 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 exports.__esModule = true;
 var bignumber_js_1 = __importDefault(require("bignumber.js"));
 var web3_1 = require("./api/chain/web3");
+var account_1 = require("../../account");
+var tx_fees_1 = require("./tx-fees");
 var estimateMaxSpendableWithAPI = function (_a, api) {
-    var account = _a.account, transaction = _a.transaction;
+    var account = _a.account, parentAccount = _a.parentAccount, transaction = _a.transaction;
     return __awaiter(void 0, void 0, void 0, function () {
-        var txFee, _b, forTransfer, _c, stakeAccRentExempt;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
-                case 0: return [4 /*yield*/, api.getTxFeeCalculator()];
-                case 1:
-                    txFee = (_d.sent()).lamportsPerSignature;
+        var mainAccount, _b, txKind, txFee, _c, stakeAccRentExempt;
+        var _d;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
+                case 0:
+                    mainAccount = (0, account_1.getMainAccount)(account, parentAccount);
                     _b = account.type;
                     switch (_b) {
-                        case "Account": return [3 /*break*/, 2];
+                        case "Account": return [3 /*break*/, 1];
                         case "TokenAccount": return [3 /*break*/, 6];
                     }
                     return [3 /*break*/, 7];
+                case 1:
+                    txKind = (_d = transaction === null || transaction === void 0 ? void 0 : transaction.model.kind) !== null && _d !== void 0 ? _d : "transfer";
+                    return [4 /*yield*/, (0, tx_fees_1.estimateTxFee)(api, mainAccount, txKind)];
                 case 2:
-                    forTransfer = bignumber_js_1["default"].max(account.balance.minus(txFee), 0);
-                    if (!transaction) {
-                        return [2 /*return*/, forTransfer];
-                    }
-                    _c = transaction.model.kind;
+                    txFee = _e.sent();
+                    _c = txKind;
                     switch (_c) {
                         case "stake.createAccount": return [3 /*break*/, 3];
                     }
                     return [3 /*break*/, 5];
                 case 3: return [4 /*yield*/, (0, web3_1.getStakeAccountMinimumBalanceForRentExemption)(api)];
                 case 4:
-                    stakeAccRentExempt = _d.sent();
-                    return [2 /*return*/, bignumber_js_1["default"].max(account.balance.minus(txFee).minus(stakeAccRentExempt), 0)];
-                case 5: return [2 /*return*/, forTransfer];
-                case 6: return [2 /*return*/, account.balance];
+                    stakeAccRentExempt = _e.sent();
+                    return [2 /*return*/, bignumber_js_1["default"].max(account.spendableBalance.minus(txFee).minus(stakeAccRentExempt), 0)];
+                case 5: return [2 /*return*/, bignumber_js_1["default"].max(account.spendableBalance.minus(txFee), 0)];
+                case 6: return [2 /*return*/, account.spendableBalance];
                 case 7: throw new Error("not supported account type");
             }
         });

package/lib/families/solana/js-estimateMaxSpendable.js.map

@@ -1 +1 @@
-{"version":3,"file":"js-estimateMaxSpendable.js","sourceRoot":"","sources":["../../../src/families/solana/js-estimateMaxSpendable.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,8DAAqC;AAErC,yCAAiF;AAEjF,IAAM,2BAA2B,GAAG,UAClC,EAGoE,EACpE,GAAa;QAHX,OAAO,aAAA,EACP,WAAW,iBAAA;;;;;wBAIE,qBAAM,GAAG,CAAC,kBAAkB,EAAE,EAAA;;oBAAvC,KAAK,GAAG,CAAC,SAA8B,CAAC,CAAC,oBAAoB;oBAE3D,KAAA,OAAO,CAAC,IAAI,CAAA;;6BACb,SAAS,CAAC,CAAV,wBAAS;6BAkBT,cAAc,CAAC,CAAf,wBAAc;;;;oBAjBX,WAAW,GAAG,yBAAS,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;oBACnE,IAAI,CAAC,WAAW,EAAE;wBAChB,sBAAO,WAAW,EAAC;qBACpB;oBACO,KAAA,WAAW,CAAC,KAAK,CAAC,IAAI,CAAA;;6BACvB,qBAAqB,CAAC,CAAtB,wBAAqB;;;wBAEtB,qBAAM,IAAA,oDAA6C,EAAC,GAAG,CAAC,EAAA;;oBADpD,kBAAkB,GACtB,SAAwD;oBAC1D,sBAAO,yBAAS,CAAC,GAAG,CAClB,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,EACtD,CAAC,CACF,EAAC;wBAGF,sBAAO,WAAW,EAAC;wBAIvB,sBAAO,OAAO,CAAC,OAAO,EAAC;wBAG3B,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;;;;CAC/C,CAAC;AAEF,qBAAe,2BAA2B,CAAC"}
+{"version":3,"file":"js-estimateMaxSpendable.js","sourceRoot":"","sources":["../../../src/families/solana/js-estimateMaxSpendable.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,8DAAqC;AAErC,yCAAiF;AACjF,yCAA+C;AAC/C,qCAA0C;AAE1C,IAAM,2BAA2B,GAAG,UAClC,EAIoE,EACpE,GAAa;QAJX,OAAO,aAAA,EACP,aAAa,mBAAA,EACb,WAAW,iBAAA;;;;;;;oBAIP,WAAW,GAAG,IAAA,wBAAc,EAAC,OAAO,EAAE,aAAa,CAAC,CAAC;oBAEnD,KAAA,OAAO,CAAC,IAAI,CAAA;;6BACb,SAAS,CAAC,CAAV,wBAAS;6BAiBT,cAAc,CAAC,CAAf,wBAAc;;;;oBAhBX,MAAM,GAAG,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,KAAK,CAAC,IAAI,mCAAI,UAAU,CAAC;oBACvC,qBAAM,IAAA,uBAAa,EAAC,GAAG,EAAE,WAAW,EAAE,MAAM,CAAC,EAAA;;oBAArD,KAAK,GAAG,SAA6C;oBAEnD,KAAA,MAAM,CAAA;;6BACP,qBAAqB,CAAC,CAAtB,wBAAqB;;;wBAEtB,qBAAM,IAAA,oDAA6C,EAAC,GAAG,CAAC,EAAA;;oBADpD,kBAAkB,GACtB,SAAwD;oBAC1D,sBAAO,yBAAS,CAAC,GAAG,CAClB,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAC/D,CAAC,CACF,EAAC;wBAGF,sBAAO,yBAAS,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAC;wBAInE,sBAAO,OAAO,CAAC,gBAAgB,EAAC;wBAGpC,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;;;;CAC/C,CAAC;AAEF,qBAAe,2BAA2B,CAAC"}

package/lib/families/solana/js-preload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"js-preload.d.ts","sourceRoot":"","sources":["../../../src/families/solana/js-preload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAuB,MAAM,SAAS,CAAC;AAKjE,wBAAsB,cAAc,CAClC,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,MAAM,OAAO,CAAC,QAAQ,CAAC,GAC9B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAmB9B;AAaD,wBAAgB,OAAO,CACrB,IAAI,EAAE,iBAAiB,GAAG,SAAS,EACnC,QAAQ,EAAE,cAAc,GACvB,IAAI,CAgBN"}
+{"version":3,"file":"js-preload.d.ts","sourceRoot":"","sources":["../../../src/families/solana/js-preload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEjC,OAAO,EAAE,iBAAiB,EAAuB,MAAM,SAAS,CAAC;AASjE,wBAAsB,cAAc,CAClC,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,MAAM,OAAO,CAAC,QAAQ,CAAC,GAC9B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAsB9B;AAmBD,wBAAgB,OAAO,CACrB,IAAI,EAAE,iBAAiB,GAAG,SAAS,EACnC,QAAQ,EAAE,cAAc,GACvB,IAAI,CAgBN"}

package/lib/families/solana/js-preload.js

@@ -37,8 +37,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 exports.__esModule = true;
 exports.hydrate = exports.preloadWithAPI = void 0;
-var utils_1 = require("./utils");
+var fp_1 = require("lodash/fp");
 var js_preload_data_1 = require("./js-preload-data");
+var utils_1 = require("./utils");
 var validator_app_1 = require("./validator-app");
 function preloadWithAPI(currency, getAPI) {
     return __awaiter(this, void 0, void 0, function () {
@@ -63,7 +64,9 @@ function preloadWithAPI(currency, getAPI) {
                     data = {
                         version: "1",
                         validatorsWithMeta: [],
-                        validators: validators
+                        validators: cluster === "mainnet-beta"
+                            ? preprocessMainnetValidators(validators)
+                            : validators
                     };
                     (0, js_preload_data_1.setSolanaPreloadData)(data, currency);
                     return [2 /*return*/, data];
@@ -72,6 +75,9 @@ function preloadWithAPI(currency, getAPI) {
     });
 }
 exports.preloadWithAPI = preloadWithAPI;
+function preprocessMainnetValidators(validators) {
+    return (0, fp_1.flow)(function () { return validators; }, utils_1.profitableValidators, utils_1.ledgerFirstValidators)();
+}
 function loadDevnetValidators(api) {
     return __awaiter(this, void 0, void 0, function () {
         var voteAccs, validators;

package/lib/families/solana/js-preload.js.map

@@ -1 +1 @@
-{"version":3,"file":"js-preload.js","sourceRoot":"","sources":["../../../src/families/solana/js-preload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,iCAAiE;AACjE,qDAA2E;AAC3E,iDAAwE;AAExE,SAAsB,cAAc,CAClC,QAAwB,EACxB,MAA+B;;;;;wBAEnB,qBAAM,MAAM,EAAE,EAAA;;oBAApB,GAAG,GAAG,SAAc;oBAEpB,OAAO,GAAG,IAAA,2BAAmB,EAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;yBAG/C,CAAA,OAAO,KAAK,QAAQ,CAAA,EAApB,wBAAoB;oBAChB,qBAAM,oBAAoB,CAAC,GAAG,CAAC,EAAA;;oBAA/B,KAAA,SAA+B,CAAA;;wBAC/B,qBAAM,IAAA,6BAAa,EAAC,OAAO,CAAC,EAAA;;oBAA5B,KAAA,SAA4B,CAAA;;;oBAH5B,UAAU,KAGkB;oBAE5B,IAAI,GAAsB;wBAC9B,OAAO,EAAE,GAAG;wBACZ,kBAAkB,EAAE,EAAE;wBACtB,UAAU,YAAA;qBACX,CAAC;oBAEF,IAAA,sCAAc,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;oBAE/B,sBAAO,IAAI,EAAC;;;;CACb;AAtBD,wCAsBC;AAED,SAAe,oBAAoB,CAAC,GAAa;;;;;wBAC9B,qBAAM,GAAG,CAAC,eAAe,EAAE,EAAA;;oBAAtC,QAAQ,GAAG,SAA2B;oBACtC,UAAU,GAA6B,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,UAAC,GAAG,IAAK,OAAA,CAAC;wBAC1E,WAAW,EAAE,GAAG,CAAC,cAAc;wBAC/B,UAAU,EAAE,GAAG,CAAC,UAAU;wBAC1B,UAAU,EAAE,CAAC;wBACb,WAAW,EAAE,GAAG,CAAC,UAAU;qBAC5B,CAAC,EALyE,CAKzE,CAAC,CAAC;oBACJ,sBAAO,UAAU,EAAC;;;;CACnB;AAED,SAAgB,OAAO,CACrB,IAAmC,EACnC,QAAwB;IAExB,IAAI,IAAI,KAAK,SAAS,EAAE;QACtB,OAAO;KACR;IAED,QAAQ,IAAI,CAAC,OAAO,EAAE;QACpB,KAAK,GAAG;YACN,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC1B,OAAO;QACT,KAAK,GAAG;YACN,MAAM,IAAI,KAAK,CACb,8DAA8D,CAC/D,CAAC;QACJ;YACE,OAAO,IAAA,yBAAiB,EAAC,IAAI,CAAC,CAAC;KAClC;AACH,CAAC;AAnBD,0BAmBC;AAED,SAAS,SAAS,CAAC,IAAyB,EAAE,QAAwB;IACpE,IAAA,sCAAc,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;AACjC,CAAC"}
+{"version":3,"file":"js-preload.js","sourceRoot":"","sources":["../../../src/families/solana/js-preload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gCAAiC;AAEjC,qDAA2E;AAE3E,iCAKiB;AACjB,iDAAwE;AAExE,SAAsB,cAAc,CAClC,QAAwB,EACxB,MAA+B;;;;;wBAEnB,qBAAM,MAAM,EAAE,EAAA;;oBAApB,GAAG,GAAG,SAAc;oBAEpB,OAAO,GAAG,IAAA,2BAAmB,EAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;yBAG/C,CAAA,OAAO,KAAK,QAAQ,CAAA,EAApB,wBAAoB;oBAChB,qBAAM,oBAAoB,CAAC,GAAG,CAAC,EAAA;;oBAA/B,KAAA,SAA+B,CAAA;;wBAC/B,qBAAM,IAAA,6BAAa,EAAC,OAAO,CAAC,EAAA;;oBAA5B,KAAA,SAA4B,CAAA;;;oBAH5B,UAAU,KAGkB;oBAE5B,IAAI,GAAsB;wBAC9B,OAAO,EAAE,GAAG;wBACZ,kBAAkB,EAAE,EAAE;wBACtB,UAAU,EACR,OAAO,KAAK,cAAc;4BACxB,CAAC,CAAC,2BAA2B,CAAC,UAAU,CAAC;4BACzC,CAAC,CAAC,UAAU;qBACjB,CAAC;oBAEF,IAAA,sCAAc,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;oBAE/B,sBAAO,IAAI,EAAC;;;;CACb;AAzBD,wCAyBC;AAED,SAAS,2BAA2B,CAClC,UAAoC;IAEpC,OAAO,IAAA,SAAI,EAAC,cAAM,OAAA,UAAU,EAAV,CAAU,EAAE,4BAAoB,EAAE,6BAAqB,CAAC,EAAE,CAAC;AAC/E,CAAC;AAED,SAAe,oBAAoB,CAAC,GAAa;;;;;wBAC9B,qBAAM,GAAG,CAAC,eAAe,EAAE,EAAA;;oBAAtC,QAAQ,GAAG,SAA2B;oBACtC,UAAU,GAA6B,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,UAAC,GAAG,IAAK,OAAA,CAAC;wBAC1E,WAAW,EAAE,GAAG,CAAC,cAAc;wBAC/B,UAAU,EAAE,GAAG,CAAC,UAAU;wBAC1B,UAAU,EAAE,CAAC;wBACb,WAAW,EAAE,GAAG,CAAC,UAAU;qBAC5B,CAAC,EALyE,CAKzE,CAAC,CAAC;oBACJ,sBAAO,UAAU,EAAC;;;;CACnB;AAED,SAAgB,OAAO,CACrB,IAAmC,EACnC,QAAwB;IAExB,IAAI,IAAI,KAAK,SAAS,EAAE;QACtB,OAAO;KACR;IAED,QAAQ,IAAI,CAAC,OAAO,EAAE;QACpB,KAAK,GAAG;YACN,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC1B,OAAO;QACT,KAAK,GAAG;YACN,MAAM,IAAI,KAAK,CACb,8DAA8D,CAC/D,CAAC;QACJ;YACE,OAAO,IAAA,yBAAiB,EAAC,IAAI,CAAC,CAAC;KAClC;AACH,CAAC;AAnBD,0BAmBC;AAED,SAAS,SAAS,CAAC,IAAyB,EAAE,QAAwB;IACpE,IAAA,sCAAc,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;AACjC,CAAC"}

package/lib/families/solana/js-prepareTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"js-prepareTransaction.d.ts","sourceRoot":"","sources":["../../../src/families/solana/js-prepareTransaction.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAiCjC,OAAO,KAAK,EAWV,WAAW,EAIZ,MAAM,SAAS,CAAC;AAyCjB,QAAA,MAAM,kBAAkB,gBACT,OAAO,MAChB,WAAW,OACV,QAAQ,KACZ,QAAQ,WAAW,CAuBrB,CAAC;AA6mBF,OAAO,EAAE,kBAAkB,EAAE,CAAC"}
+{"version":3,"file":"js-prepareTransaction.d.ts","sourceRoot":"","sources":["../../../src/families/solana/js-prepareTransaction.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAkCjC,OAAO,KAAK,EAWV,WAAW,EAIZ,MAAM,SAAS,CAAC;AAyCjB,QAAA,MAAM,kBAAkB,gBACT,OAAO,MAChB,WAAW,OACV,QAAQ,KACZ,QAAQ,WAAW,CAuBrB,CAAC;AAqlBF,OAAO,EAAE,kBAAkB,EAAE,CAAC"}

package/lib/families/solana/js-prepareTransaction.js

@@ -58,6 +58,7 @@ var account_1 = require("../../account");
 var web3_1 = require("./api/chain/web3");
 var errors_2 = require("./errors");
 var logic_1 = require("./logic");
+var tx_fees_1 = require("./tx-fees");
 var utils_1 = require("./utils");
 function deriveCommandDescriptor(mainAccount, tx, api) {
     return __awaiter(this, void 0, void 0, function () {
@@ -152,9 +153,9 @@ var deriveTokenTransferCommandDescriptor = function (mainAccount, tx, model, api
                 recipientDescriptor = recipientDescriptorOrError instanceof Error
                     ? defaultRecipientDescriptor
                     : recipientDescriptorOrError;
-                return [4 /*yield*/, api.getTxFeeCalculator()];
+                return [4 /*yield*/, (0, tx_fees_1.estimateTxFee)(api, mainAccount, "token.transfer")];
             case 5:
-                txFee = (_c.sent()).lamportsPerSignature;
+                txFee = _c.sent();
                 if (!recipientDescriptor.shouldCreateAsAssociatedTokenAccount) return [3 /*break*/, 7];
                 return [4 /*yield*/, api.getAssocTokenAccMinNativeBalance()];
             case 6:
@@ -251,9 +252,9 @@ function deriveCreateAssociatedTokenAccountCommandDescriptor(mainAccount, model,
                     return [4 /*yield*/, api.findAssocTokenAccAddress(mainAccount.freshAddress, mint)];
                 case 1:
                     associatedTokenAccountAddress = _a.sent();
-                    return [4 /*yield*/, api.getTxFeeCalculator()];
+                    return [4 /*yield*/, (0, tx_fees_1.estimateTxFee)(api, mainAccount, "token.createATA")];
                 case 2:
-                    txFee = (_a.sent()).lamportsPerSignature;
+                    txFee = _a.sent();
                     return [4 /*yield*/, api.getAssocTokenAccMinNativeBalance()];
                 case 3:
                     assocAccRentExempt = _a.sent();
@@ -287,11 +288,11 @@ function deriveTransferCommandDescriptor(mainAccount, tx, model, api) {
                     if (typeof memo === "string" && memo.length > 0) {
                         validateMemoCommon(memo, errors);
                     }
-                    return [4 /*yield*/, api.getTxFeeCalculator()];
+                    return [4 /*yield*/, (0, tx_fees_1.estimateTxFee)(api, mainAccount, "transfer")];
                 case 2:
-                    fee = (_a.sent()).lamportsPerSignature;
+                    fee = _a.sent();
                     txAmount = tx.useAllAmount
-                        ? bignumber_js_1["default"].max(mainAccount.balance.minus(fee), 0)
+                        ? bignumber_js_1["default"].max(mainAccount.spendableBalance.minus(fee), 0)
                         : tx.amount;
                     if (tx.useAllAmount) {
                         if (txAmount.eq(0)) {
@@ -302,7 +303,7 @@ function deriveTransferCommandDescriptor(mainAccount, tx, model, api) {
                         if (txAmount.lte(0)) {
                             errors.amount = new errors_1.AmountRequired();
                         }
-                        else if (txAmount.plus(fee).gt(mainAccount.balance)) {
+                        else if (txAmount.plus(fee).gt(mainAccount.spendableBalance)) {
                             errors.amount = new errors_1.NotEnoughBalance();
                         }
                     }
@@ -325,34 +326,42 @@ function deriveTransferCommandDescriptor(mainAccount, tx, model, api) {
 }
 function deriveStakeCreateAccountCommandDescriptor(mainAccount, tx, model, api) {
     return __awaiter(this, void 0, void 0, function () {
-        var errors, txFee, stakeAccRentExemptAmount, fee, amount, delegate, _a, stakeAccAddress, stakeAccAddressSeed;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var errors, warnings, txFee, stakeAccRentExemptAmount, fee, amount, delegate, stakeAccAddressSeed, stakeAccAddress;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
                 case 0:
                     errors = {};
+                    warnings = {};
                     if (!tx.useAllAmount && tx.amount.lte(0)) {
                         errors.amount = new errors_1.AmountRequired();
                     }
-                    return [4 /*yield*/, api.getTxFeeCalculator()];
+                    return [4 /*yield*/, (0, tx_fees_1.estimateTxFee)(api, mainAccount, "stake.createAccount")];
                 case 1:
-                    txFee = (_b.sent()).lamportsPerSignature;
+                    txFee = _a.sent();
                     return [4 /*yield*/, (0, web3_1.getStakeAccountMinimumBalanceForRentExemption)(api)];
                 case 2:
-                    stakeAccRentExemptAmount = _b.sent();
+                    stakeAccRentExemptAmount = _a.sent();
                     fee = txFee + stakeAccRentExemptAmount;
                     amount = tx.useAllAmount
-                        ? bignumber_js_1["default"].max(mainAccount.balance.minus(fee), 0)
+                        ? bignumber_js_1["default"].max(mainAccount.spendableBalance.minus(fee), 0)
                         : tx.amount;
-                    if (!errors.amount && mainAccount.balance.lt(amount.plus(fee))) {
+                    if (!errors.amount && mainAccount.spendableBalance.lt(amount.plus(fee))) {
                         errors.amount = new errors_1.NotEnoughBalance();
                     }
+                    if (!errors.amount && tx.useAllAmount) {
+                        warnings.amount = new errors_2.SolanaUseAllAmountStakeWarning();
+                    }
                     delegate = model.uiState.delegate;
                     return [4 /*yield*/, validateValidatorCommon(delegate.voteAccAddress, errors, api)];
                 case 3:
-                    _b.sent();
-                    return [4 /*yield*/, nextStakeAccAddr(mainAccount)];
+                    _a.sent();
+                    stakeAccAddressSeed = "stake:".concat(Math.random().toString());
+                    return [4 /*yield*/, (0, web3_1.getStakeAccountAddressWithSeed)({
+                            fromAddress: mainAccount.freshAddress,
+                            seed: stakeAccAddressSeed
+                        })];
                 case 4:
-                    _a = _b.sent(), stakeAccAddress = _a.addr, stakeAccAddressSeed = _a.seed;
+                    stakeAccAddress = _a.sent();
                     return [2 /*return*/, {
                             command: {
                                 kind: "stake.createAccount",
@@ -364,7 +373,7 @@ function deriveStakeCreateAccountCommandDescriptor(mainAccount, tx, model, api)
                                 seed: stakeAccAddressSeed
                             },
                             fee: fee,
-                            warnings: {},
+                            warnings: warnings,
                             errors: errors
                         }];
             }
@@ -404,10 +413,10 @@ function deriveStakeDelegateCommandDescriptor(mainAccount, model, api) {
                                 return [2 /*return*/, (0, utils_1.assertUnreachable)(stake.activation.state)];
                         }
                     }
-                    return [4 /*yield*/, api.getTxFeeCalculator()];
+                    return [4 /*yield*/, (0, tx_fees_1.estimateTxFee)(api, mainAccount, "stake.delegate")];
                 case 2:
-                    txFee = (_b.sent()).lamportsPerSignature;
-                    if (mainAccount.balance.lt(txFee)) {
+                    txFee = _b.sent();
+                    if (mainAccount.spendableBalance.lt(txFee)) {
                         errors.fee = new errors_1.NotEnoughBalance();
                     }
                     return [2 /*return*/, {
@@ -450,10 +459,10 @@ function deriveStakeUndelegateCommandDescriptor(mainAccount, model, api) {
                             errors.stakeAccAddr = new errors_2.SolanaStakeNoStakeAuth();
                         }
                     }
-                    return [4 /*yield*/, api.getTxFeeCalculator()];
+                    return [4 /*yield*/, (0, tx_fees_1.estimateTxFee)(api, mainAccount, "stake.undelegate")];
                 case 1:
-                    txFee = (_a.sent()).lamportsPerSignature;
-                    if (mainAccount.balance.lt(txFee)) {
+                    txFee = _a.sent();
+                    if (mainAccount.spendableBalance.lt(txFee)) {
                         errors.fee = new errors_1.NotEnoughBalance();
                     }
                     return [2 /*return*/, {
@@ -488,10 +497,10 @@ function deriveStakeWithdrawCommandDescriptor(mainAccount, tx, model, api) {
                             errors.stakeAccAddr = new errors_2.SolanaStakeAccountNothingToWithdraw();
                         }
                     }
-                    return [4 /*yield*/, api.getTxFeeCalculator()];
+                    return [4 /*yield*/, (0, tx_fees_1.estimateTxFee)(api, mainAccount, "stake.withdraw")];
                 case 1:
-                    txFee = (_b.sent()).lamportsPerSignature;
-                    if (mainAccount.balance.lt(txFee)) {
+                    txFee = _b.sent();
+                    if (mainAccount.spendableBalance.lt(txFee)) {
                         errors.fee = new errors_1.NotEnoughBalance();
                     }
                     return [2 /*return*/, {
@@ -513,9 +522,9 @@ function deriveStakeWithdrawCommandDescriptor(mainAccount, tx, model, api) {
 function deriveStakeSplitCommandDescriptor(mainAccount, tx, model, api) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function () {
-        var errors, uiState, commandFees, _c, splitStakeAccAddr, splitStakeAccAddrSeed;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        var errors, uiState, commandFees, splitStakeAccAddrSeed, splitStakeAccAddr;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
                     errors = {};
                     uiState = model.uiState;
@@ -530,10 +539,14 @@ function deriveStakeSplitCommandDescriptor(mainAccount, tx, model, api) {
                     (_b = (_a = mainAccount.solanaResources) === null || _a === void 0 ? void 0 : _a.stakes) !== null && _b !== void 0 ? _b : [];
                     return [4 /*yield*/, (0, web3_1.getStakeAccountMinimumBalanceForRentExemption)(api)];
                 case 1:
-                    commandFees = _d.sent();
-                    return [4 /*yield*/, nextStakeAccAddr(mainAccount)];
+                    commandFees = _c.sent();
+                    splitStakeAccAddrSeed = "stake:".concat(Math.random().toString());
+                    return [4 /*yield*/, (0, web3_1.getStakeAccountAddressWithSeed)({
+                            fromAddress: mainAccount.freshAddress,
+                            seed: splitStakeAccAddrSeed
+                        })];
                 case 2:
-                    _c = _d.sent(), splitStakeAccAddr = _c.addr, splitStakeAccAddrSeed = _c.seed;
+                    splitStakeAccAddr = _c.sent();
                     return [2 /*return*/, {
                             command: {
                                 kind: "stake.split",
@@ -574,40 +587,6 @@ function isAccountFunded(address, api) {
         });
     });
 }
-function nextStakeAccAddr(account, base) {
-    var _a, _b;
-    if (base === void 0) { base = "stake"; }
-    return __awaiter(this, void 0, void 0, function () {
-        var usedStakeAccAddrs;
-        return __generator(this, function (_c) {
-            usedStakeAccAddrs = ((_b = (_a = account.solanaResources) === null || _a === void 0 ? void 0 : _a.stakes) !== null && _b !== void 0 ? _b : []).map(function (s) { return s.stakeAccAddr; });
-            return [2 /*return*/, nextStakeAccAddrRoutine(account.freshAddress, new Set(usedStakeAccAddrs), base, 0)];
-        });
-    });
-}
-function nextStakeAccAddrRoutine(fromAddress, usedAddresses, base, idx) {
-    return __awaiter(this, void 0, void 0, function () {
-        var seed, addr;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    seed = "".concat(base, ":").concat(idx);
-                    return [4 /*yield*/, (0, web3_1.getStakeAccountAddressWithSeed)({
-                            fromAddress: fromAddress,
-                            seed: seed
-                        })];
-                case 1:
-                    addr = _a.sent();
-                    return [2 /*return*/, usedAddresses.has(addr)
-                            ? nextStakeAccAddrRoutine(fromAddress, usedAddresses, base, idx + 1)
-                            : {
-                                seed: seed,
-                                addr: addr
-                            }];
-            }
-        });
-    });
-}
 function validateRecipientCommon(mainAccount, tx, errors, warnings, api) {
     return __awaiter(this, void 0, void 0, function () {
         var recipientWalletIsUnfunded;