@vultisig/core-mpc 1.2.2 → 1.2.3

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @vultisig/core-mpc
 
+## 1.2.3
+
+### Patch Changes
+
+- Updated dependencies [[`03007d7`](https://github.com/vultisig/vultisig-sdk/commit/03007d7293b2f51f6269d39bf3725715182f933e)]:
+  - @vultisig/core-chain@1.5.1
+
 ## 1.2.2
 
 ### Patch Changes

package/dist/keysign/chainSpecific/resolvers/solana/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/mpc/keysign/chainSpecific/resolvers/solana/index.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAA;AAIzD,eAAO,MAAM,sBAAsB,EAAE,wBAAwB,CAC3D,gBAAgB,CAgDjB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/mpc/keysign/chainSpecific/resolvers/solana/index.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAA;AAEzD,eAAO,MAAM,sBAAsB,EAAE,wBAAwB,CAC3D,gBAAgB,CAsDjB,CAAA"}

package/dist/keysign/chainSpecific/resolvers/solana/index.js

@@ -1,24 +1,31 @@
 import { create } from '@bufbuild/protobuf';
+import { PublicKey } from '@solana/web3.js';
 import { getSolanaClient } from '@vultisig/core-chain/chains/solana/client';
+import { getDynamicPriorityFeePrice } from '@vultisig/core-chain/chains/solana/getDynamicPriorityFeePrice';
 import { solanaConfig } from '@vultisig/core-chain/chains/solana/solanaConfig';
 import { getSplAssociatedAccount } from '@vultisig/core-chain/chains/solana/spl/getSplAssociatedAccount';
 import { SolanaSpecificSchema } from '@vultisig/core-mpc/types/vultisig/keysign/v1/blockchain_specific_pb';
 import { shouldBePresent } from '@vultisig/lib-utils/assert/shouldBePresent';
 import { attempt, withFallback } from '@vultisig/lib-utils/attempt';
 import { getKeysignCoin } from '../../../utils/getKeysignCoin.js';
-import { refineSolanaChainSpecific } from './refine.js';
-import { getDynamicPriorityFeePrice } from '@vultisig/core-chain/chains/solana/getDynamicPriorityFeePrice';
-export const getSolanaChainSpecific = async ({ keysignPayload, walletCore }) => {
+export const getSolanaChainSpecific = async ({ keysignPayload }) => {
     const coin = getKeysignCoin(keysignPayload);
     const receiver = shouldBePresent(keysignPayload.toAddress);
     const client = getSolanaClient();
-    const priorityFeePrice = await withFallback(attempt(getDynamicPriorityFeePrice()), solanaConfig.priorityFeePrice);
     const recentBlockHash = (await client.getLatestBlockhash()).blockhash;
     const chainSpecific = create(SolanaSpecificSchema, {
         recentBlockHash,
-        priorityFee: priorityFeePrice.toString(),
         computeLimit: solanaConfig.priorityFeeLimit.toString(),
     });
+    // Scope the priority-fee query to slots that wrote to the contended
+    // accounts on this transaction. The global feed is dominated by vote
+    // txs and underestimates fees for hot accounts (e.g. a THORChain
+    // inbound vault during LP add).
+    //
+    // For native SOL the recipient lamports change, so it's writable.
+    // For SPL the SystemProgram never touches the recipient's main
+    // wallet — only the sender/recipient ATAs are writable.
+    const writableAccounts = [];
     if (coin.id) {
         const fromAccount = await getSplAssociatedAccount({
             account: coin.address,
@@ -26,19 +33,21 @@ export const getSolanaChainSpecific = async ({ keysignPayload, walletCore }) =>
         });
         chainSpecific.fromTokenAssociatedAddress = fromAccount.address;
         chainSpecific.programId = fromAccount.isToken2022;
+        writableAccounts.push(new PublicKey(fromAccount.address));
         const { data } = await attempt(getSplAssociatedAccount({
             account: receiver,
             token: coin.id,
         }));
         if (data) {
             chainSpecific.toTokenAssociatedAddress = data.address;
+            writableAccounts.push(new PublicKey(data.address));
         }
     }
-    return withFallback(attempt(refineSolanaChainSpecific({
-        keysignPayload,
-        chainSpecific,
-        priorityFeePrice,
-        walletCore,
-    })), chainSpecific);
+    else {
+        writableAccounts.push(new PublicKey(receiver));
+    }
+    const priorityFeePrice = await withFallback(attempt(getDynamicPriorityFeePrice(writableAccounts)), solanaConfig.priorityFeePrice);
+    chainSpecific.priorityFee = priorityFeePrice.toString();
+    return chainSpecific;
 };
 //# sourceMappingURL=index.js.map

package/dist/keysign/chainSpecific/resolvers/solana/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/core/mpc/keysign/chainSpecific/resolvers/solana/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAE3C,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAA;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,iDAAiD,CAAA;AAC9E,OAAO,EAAE,uBAAuB,EAAE,MAAM,gEAAgE,CAAA;AACxG,OAAO,EAAE,oBAAoB,EAAE,MAAM,qEAAqE,CAAA;AAC1G,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAA;AAC5E,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAEnE,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAE9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAA;AACpD,OAAO,EAAE,0BAA0B,EAAE,MAAM,+DAA+D,CAAA;AAE1G,MAAM,CAAC,MAAM,sBAAsB,GAE/B,KAAK,EAAE,EAAE,cAAc,EAAE,UAAU,EAAE,EAAE,EAAE;IAC3C,MAAM,IAAI,GAAG,cAAc,CAAoB,cAAc,CAAC,CAAA;IAC9D,MAAM,QAAQ,GAAG,eAAe,CAAC,cAAc,CAAC,SAAS,CAAC,CAAA;IAC1D,MAAM,MAAM,GAAG,eAAe,EAAE,CAAA;IAEhC,MAAM,gBAAgB,GAAG,MAAM,YAAY,CACzC,OAAO,CAAC,0BAA0B,EAAE,CAAC,EACrC,YAAY,CAAC,gBAAgB,CAC9B,CAAA;IAED,MAAM,eAAe,GAAG,CAAC,MAAM,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC,SAAS,CAAA;IAErE,MAAM,aAAa,GAAG,MAAM,CAAC,oBAAoB,EAAE;QACjD,eAAe;QACf,WAAW,EAAE,gBAAgB,CAAC,QAAQ,EAAE;QACxC,YAAY,EAAE,YAAY,CAAC,gBAAgB,CAAC,QAAQ,EAAE;KACvD,CAAC,CAAA;IAEF,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;QACZ,MAAM,WAAW,GAAG,MAAM,uBAAuB,CAAC;YAChD,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,KAAK,EAAE,IAAI,CAAC,EAAE;SACf,CAAC,CAAA;QACF,aAAa,CAAC,0BAA0B,GAAG,WAAW,CAAC,OAAO,CAAA;QAC9D,aAAa,CAAC,SAAS,GAAG,WAAW,CAAC,WAAW,CAAA;QACjD,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,OAAO,CAC5B,uBAAuB,CAAC;YACtB,OAAO,EAAE,QAAQ;YACjB,KAAK,EAAE,IAAI,CAAC,EAAE;SACf,CAAC,CACH,CAAA;QACD,IAAI,IAAI,EAAE,CAAC;YACT,aAAa,CAAC,wBAAwB,GAAG,IAAI,CAAC,OAAO,CAAA;QACvD,CAAC;IACH,CAAC;IAED,OAAO,YAAY,CACjB,OAAO,CACL,yBAAyB,CAAC;QACxB,cAAc;QACd,aAAa;QACb,gBAAgB;QAChB,UAAU;KACX,CAAC,CACH,EACD,aAAa,CACd,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/core/mpc/keysign/chainSpecific/resolvers/solana/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE3C,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAA;AAC3E,OAAO,EAAE,0BAA0B,EAAE,MAAM,+DAA+D,CAAA;AAC1G,OAAO,EAAE,YAAY,EAAE,MAAM,iDAAiD,CAAA;AAC9E,OAAO,EAAE,uBAAuB,EAAE,MAAM,gEAAgE,CAAA;AACxG,OAAO,EAAE,oBAAoB,EAAE,MAAM,qEAAqE,CAAA;AAC1G,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAA;AAC5E,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAEnE,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAG9D,MAAM,CAAC,MAAM,sBAAsB,GAE/B,KAAK,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE;IAC/B,MAAM,IAAI,GAAG,cAAc,CAAoB,cAAc,CAAC,CAAA;IAC9D,MAAM,QAAQ,GAAG,eAAe,CAAC,cAAc,CAAC,SAAS,CAAC,CAAA;IAC1D,MAAM,MAAM,GAAG,eAAe,EAAE,CAAA;IAEhC,MAAM,eAAe,GAAG,CAAC,MAAM,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC,SAAS,CAAA;IAErE,MAAM,aAAa,GAAG,MAAM,CAAC,oBAAoB,EAAE;QACjD,eAAe;QACf,YAAY,EAAE,YAAY,CAAC,gBAAgB,CAAC,QAAQ,EAAE;KACvD,CAAC,CAAA;IAEF,oEAAoE;IACpE,qEAAqE;IACrE,iEAAiE;IACjE,gCAAgC;IAChC,EAAE;IACF,kEAAkE;IAClE,+DAA+D;IAC/D,wDAAwD;IACxD,MAAM,gBAAgB,GAAgB,EAAE,CAAA;IAExC,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;QACZ,MAAM,WAAW,GAAG,MAAM,uBAAuB,CAAC;YAChD,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,KAAK,EAAE,IAAI,CAAC,EAAE;SACf,CAAC,CAAA;QACF,aAAa,CAAC,0BAA0B,GAAG,WAAW,CAAC,OAAO,CAAA;QAC9D,aAAa,CAAC,SAAS,GAAG,WAAW,CAAC,WAAW,CAAA;QACjD,gBAAgB,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAA;QAEzD,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,OAAO,CAC5B,uBAAuB,CAAC;YACtB,OAAO,EAAE,QAAQ;YACjB,KAAK,EAAE,IAAI,CAAC,EAAE;SACf,CAAC,CACH,CAAA;QACD,IAAI,IAAI,EAAE,CAAC;YACT,aAAa,CAAC,wBAAwB,GAAG,IAAI,CAAC,OAAO,CAAA;YACrD,gBAAgB,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;QACpD,CAAC;IACH,CAAC;SAAM,CAAC;QACN,gBAAgB,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAA;IAChD,CAAC;IAED,MAAM,gBAAgB,GAAG,MAAM,YAAY,CACzC,OAAO,CAAC,0BAA0B,CAAC,gBAAgB,CAAC,CAAC,EACrD,YAAY,CAAC,gBAAgB,CAC9B,CAAA;IAED,aAAa,CAAC,WAAW,GAAG,gBAAgB,CAAC,QAAQ,EAAE,CAAA;IAEvD,OAAO,aAAa,CAAA;AACtB,CAAC,CAAA"}

package/dist/keysign/fee/resolvers/solana.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solana.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/mpc/keysign/fee/resolvers/solana.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAE/C,eAAO,MAAM,kBAAkB,EAAE,iBAOhC,CAAA"}
+{"version":3,"file":"solana.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/mpc/keysign/fee/resolvers/solana.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAI/C,eAAO,MAAM,kBAAkB,EAAE,iBAmBhC,CAAA"}

package/dist/keysign/fee/resolvers/solana.js

@@ -1,6 +1,17 @@
+import { solanaConfig } from '@vultisig/core-chain/chains/solana/solanaConfig';
+import { isFeeCoin } from '@vultisig/core-chain/coin/utils/isFeeCoin';
 import { getBlockchainSpecificValue } from '../../chainSpecific/KeysignChainSpecific.js';
+import { getKeysignCoin } from '../../utils/getKeysignCoin.js';
+const MICRO_LAMPORTS_PER_LAMPORT = 1000000n;
 export const getSolanaFeeAmount = ({ keysignPayload }) => {
-    const { priorityFee } = getBlockchainSpecificValue(keysignPayload.blockchainSpecific, 'solanaSpecific');
-    return BigInt(priorityFee);
+    const { priorityFee, computeLimit, toTokenAssociatedAddress } = getBlockchainSpecificValue(keysignPayload.blockchainSpecific, 'solanaSpecific');
+    const priorityFeeAmount = (BigInt(priorityFee) *
+        BigInt(computeLimit ?? solanaConfig.priorityFeeLimit)) /
+        MICRO_LAMPORTS_PER_LAMPORT;
+    const coin = getKeysignCoin(keysignPayload);
+    const ataRent = !isFeeCoin(coin) && !toTokenAssociatedAddress
+        ? BigInt(solanaConfig.ataRentLamports)
+        : 0n;
+    return BigInt(solanaConfig.baseFee) + ataRent + priorityFeeAmount;
 };
 //# sourceMappingURL=solana.js.map

package/dist/keysign/fee/resolvers/solana.js.map

@@ -1 +1 @@
-{"version":3,"file":"solana.js","sourceRoot":"","sources":["../../../../../../../packages/core/mpc/keysign/fee/resolvers/solana.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,0CAA0C,CAAA;AAGrF,MAAM,CAAC,MAAM,kBAAkB,GAAsB,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE;IAC1E,MAAM,EAAE,WAAW,EAAE,GAAG,0BAA0B,CAChD,cAAc,CAAC,kBAAkB,EACjC,gBAAgB,CACjB,CAAA;IAED,OAAO,MAAM,CAAC,WAAW,CAAC,CAAA;AAC5B,CAAC,CAAA"}
+{"version":3,"file":"solana.js","sourceRoot":"","sources":["../../../../../../../packages/core/mpc/keysign/fee/resolvers/solana.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iDAAiD,CAAA;AAC9E,OAAO,EAAE,SAAS,EAAE,MAAM,2CAA2C,CAAA;AAErE,OAAO,EAAE,0BAA0B,EAAE,MAAM,0CAA0C,CAAA;AACrF,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAG3D,MAAM,0BAA0B,GAAG,QAAU,CAAA;AAE7C,MAAM,CAAC,MAAM,kBAAkB,GAAsB,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE;IAC1E,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,wBAAwB,EAAE,GAC3D,0BAA0B,CACxB,cAAc,CAAC,kBAAkB,EACjC,gBAAgB,CACjB,CAAA;IAEH,MAAM,iBAAiB,GACrB,CAAC,MAAM,CAAC,WAAW,CAAC;QAClB,MAAM,CAAC,YAAY,IAAI,YAAY,CAAC,gBAAgB,CAAC,CAAC;QACxD,0BAA0B,CAAA;IAE5B,MAAM,IAAI,GAAG,cAAc,CAAC,cAAc,CAAC,CAAA;IAC3C,MAAM,OAAO,GACX,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAwB;QAC3C,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,eAAe,CAAC;QACtC,CAAC,CAAC,EAAE,CAAA;IAER,OAAO,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,OAAO,GAAG,iBAAiB,CAAA;AACnE,CAAC,CAAA"}

package/dist/keysign/signingInputs/resolvers/solana/send.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"send.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/mpc/keysign/signingInputs/resolvers/solana/send.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,iEAAiE,CAAA;AAChG,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAMzD,KAAK,8BAA8B,GAAG;IACpC,cAAc,EAAE,cAAc,CAAA;IAC9B,UAAU,EAAE,UAAU,CAAA;CACvB,CAAA;AAED,eAAO,MAAM,yBAAyB,GAAI,iCAGvC,8BAA8B,KAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,YAsFnD,CAAA"}
+{"version":3,"file":"send.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/mpc/keysign/signingInputs/resolvers/solana/send.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,iEAAiE,CAAA;AAEhG,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAMzD,KAAK,8BAA8B,GAAG;IACpC,cAAc,EAAE,cAAc,CAAA;IAC9B,UAAU,EAAE,UAAU,CAAA;CACvB,CAAA;AAED,eAAO,MAAM,yBAAyB,GAAI,iCAGvC,8BAA8B,KAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,YA+FnD,CAAA"}

package/dist/keysign/signingInputs/resolvers/solana/send.js

@@ -1,11 +1,15 @@
 import { solanaConfig } from '@vultisig/core-chain/chains/solana/solanaConfig';
+import { maxBigInt } from '@vultisig/lib-utils/math/maxBigInt';
 import { TW } from '@trustwallet/wallet-core';
 import Long from 'long';
 import { getBlockchainSpecificValue } from '../../../chainSpecific/KeysignChainSpecific.js';
 import { getKeysignCoin } from '../../../utils/getKeysignCoin.js';
 export const getSolanaSendSigningInput = ({ keysignPayload, walletCore, }) => {
     const coin = getKeysignCoin(keysignPayload);
-    const { recentBlockHash, fromTokenAssociatedAddress, toTokenAssociatedAddress, programId, computeLimit, } = getBlockchainSpecificValue(keysignPayload.blockchainSpecific, 'solanaSpecific');
+    const { recentBlockHash, fromTokenAssociatedAddress, toTokenAssociatedAddress, programId, computeLimit, priorityFee, } = getBlockchainSpecificValue(keysignPayload.blockchainSpecific, 'solanaSpecific');
+    // Floor at the config minimum so co-signers all encode the same
+    // `setComputeUnitPrice` instruction when the wire value is missing.
+    const priorityFeePrice = maxBigInt(priorityFee ? BigInt(priorityFee) : 0n, BigInt(solanaConfig.priorityFeePrice));
     const amount = BigInt(keysignPayload.toAmount);
     const sender = coin.address;
     const recipient = keysignPayload.toAddress;
@@ -28,6 +32,7 @@ export const getSolanaSendSigningInput = ({ keysignPayload, walletCore, }) => {
             amount: Long.fromString(amount.toString()),
             decimals: coin.decimals,
             tokenProgramId,
+            memo: keysignPayload.memo,
         };
         if (!toTokenAssociatedAddress) {
             const receiverSolanaAddress = walletCore.SolanaAddress.createWithString(recipient);
@@ -55,7 +60,7 @@ export const getSolanaSendSigningInput = ({ keysignPayload, walletCore, }) => {
         recentBlockhash: recentBlockHash,
         sender,
         priorityFeePrice: TW.Solana.Proto.PriorityFeePrice.create({
-            price: Long.fromString(solanaConfig.priorityFeePrice.toString()),
+            price: Long.fromString(priorityFeePrice.toString()),
         }),
         priorityFeeLimit: TW.Solana.Proto.PriorityFeeLimit.create({
             limit: computeLimit

package/dist/keysign/signingInputs/resolvers/solana/send.js.map

@@ -1 +1 @@
-{"version":3,"file":"send.js","sourceRoot":"","sources":["../../../../../../../../packages/core/mpc/keysign/signingInputs/resolvers/solana/send.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iDAAiD,CAAA;AAE9E,OAAO,EAAE,EAAE,EAAc,MAAM,0BAA0B,CAAA;AACzD,OAAO,IAAI,MAAM,MAAM,CAAA;AAEvB,OAAO,EAAE,0BAA0B,EAAE,MAAM,6CAA6C,CAAA;AACxF,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAO9D,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,EACxC,cAAc,EACd,UAAU,GACqB,EAAgC,EAAE;IACjE,MAAM,IAAI,GAAG,cAAc,CAAC,cAAc,CAAC,CAAA;IAE3C,MAAM,EACJ,eAAe,EACf,0BAA0B,EAC1B,wBAAwB,EACxB,SAAS,EACT,YAAY,GACb,GAAG,0BAA0B,CAC5B,cAAc,CAAC,kBAAkB,EACjC,gBAAgB,CACjB,CAAA;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAA;IAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAA;IAC3B,MAAM,SAAS,GAAG,cAAc,CAAC,SAAS,CAAA;IAE1C,MAAM,iCAAiC,GACrC,GAA0C,EAAE;QAC1C,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;YACb,OAAO;gBACL,mBAAmB,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC;oBACnD,SAAS;oBACT,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;oBACzC,IAAI,EAAE,cAAc,CAAC,IAAI;iBAC1B,CAAC;aACH,CAAA;QACH,CAAC;QAED,MAAM,cAAc,GAAG,SAAS;YAC9B,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,gBAAgB;YACjD,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,YAAY,CAAA;QAE/C,MAAM,yBAAyB,GAAG;YAChC,gBAAgB,EAAE,IAAI,CAAC,EAAE;YACzB,kBAAkB,EAAE,0BAA0B;YAC9C,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YAC1C,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,cAAc;SACf,CAAA;QAED,IAAI,CAAC,wBAAwB,EAAE,CAAC;YAC9B,MAAM,qBAAqB,GACzB,UAAU,CAAC,aAAa,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAA;YAEtD,MAAM,qBAAqB,GAAG,SAAS;gBACrC,CAAC,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;gBACjD,CAAC,CAAC,qBAAqB,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAEtD,MAAM,oBAAoB,GACxB,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,MAAM,CAAC;gBAC5C,GAAG,yBAAyB;gBAC5B,oBAAoB,EAAE,SAAS;gBAC/B,qBAAqB;aACtB,CAAC,CAAA;YAEJ,OAAO;gBACL,iCAAiC,EAAE,oBAAoB;aACxD,CAAA;QACH,CAAC;QAED,OAAO;YACL,wBAAwB,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC;gBAC7D,GAAG,yBAAyB;gBAC5B,qBAAqB,EAAE,wBAAwB;aAChD,CAAC;SACH,CAAA;IACH,CAAC,CAAA;IAEH,MAAM,YAAY,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC;QACvD,KAAK,EAAE,IAAI;QACX,eAAe,EAAE,eAAe;QAChC,MAAM;QACN,gBAAgB,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,MAAM,CAAC;YACxD,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC;SACjE,CAAC;QACF,gBAAgB,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,MAAM,CAAC;YACxD,KAAK,EAAE,YAAY;gBACjB,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC;gBACtB,CAAC,CAAC,YAAY,CAAC,gBAAgB;SAClC,CAAC;QACF,GAAG,iCAAiC,EAAE;KACvC,CAAC,CAAA;IAEF,OAAO,YAAY,CAAA;AACrB,CAAC,CAAA"}
+{"version":3,"file":"send.js","sourceRoot":"","sources":["../../../../../../../../packages/core/mpc/keysign/signingInputs/resolvers/solana/send.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vultisig/core-mpc",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "MPC, keysign, and vault types shared across Vultisig clients",
   "license": "MIT",
   "repository": {
@@ -239,11 +239,6 @@
       "import": "./dist/keysign/chainSpecific/resolvers/solana/index.js",
       "default": "./dist/keysign/chainSpecific/resolvers/solana/index.js"
     },
-    "./keysign/chainSpecific/resolvers/solana/refine": {
-      "types": "./dist/keysign/chainSpecific/resolvers/solana/refine.d.ts",
-      "import": "./dist/keysign/chainSpecific/resolvers/solana/refine.js",
-      "default": "./dist/keysign/chainSpecific/resolvers/solana/refine.js"
-    },
     "./keysign/chainSpecific/resolvers/sui": {
       "types": "./dist/keysign/chainSpecific/resolvers/sui/index.d.ts",
       "import": "./dist/keysign/chainSpecific/resolvers/sui/index.js",
@@ -972,7 +967,7 @@
     "@noble/hashes": "^1.8.0",
     "@solana/web3.js": "^1.98.4",
     "@trustwallet/wallet-core": "^4.6.0",
-    "@vultisig/core-chain": "1.5.0",
+    "@vultisig/core-chain": "1.5.1",
     "@vultisig/core-config": "0.9.1",
     "@vultisig/lib-dkls": "0.9.0",
     "@vultisig/lib-mldsa": "0.9.0",

package/dist/keysign/chainSpecific/resolvers/solana/refine.d.ts

@@ -1,12 +0,0 @@
-import { SolanaSpecific } from '@vultisig/core-mpc/types/vultisig/keysign/v1/blockchain_specific_pb';
-import { KeysignPayload } from '@vultisig/core-mpc/types/vultisig/keysign/v1/keysign_message_pb';
-import { WalletCore } from '@trustwallet/wallet-core';
-type RefineSolanaChainSpecificInput = {
-    keysignPayload: KeysignPayload;
-    chainSpecific: SolanaSpecific;
-    priorityFeePrice: number;
-    walletCore: WalletCore;
-};
-export declare const refineSolanaChainSpecific: ({ keysignPayload, chainSpecific, priorityFeePrice, walletCore, }: RefineSolanaChainSpecificInput) => Promise<SolanaSpecific>;
-export {};
-//# sourceMappingURL=refine.d.ts.map

package/dist/keysign/chainSpecific/resolvers/solana/refine.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"refine.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/mpc/keysign/chainSpecific/resolvers/solana/refine.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,MAAM,qEAAqE,CAAA;AACpG,OAAO,EACL,cAAc,EAEf,MAAM,iEAAiE,CAAA;AAExE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AASrD,KAAK,8BAA8B,GAAG;IACpC,cAAc,EAAE,cAAc,CAAA;IAC9B,aAAa,EAAE,cAAc,CAAA;IAC7B,gBAAgB,EAAE,MAAM,CAAA;IACxB,UAAU,EAAE,UAAU,CAAA;CACvB,CAAA;AAED,eAAO,MAAM,yBAAyB,GAAU,kEAK7C,8BAA8B,KAAG,OAAO,CAAC,cAAc,CAqDzD,CAAA"}

package/dist/keysign/chainSpecific/resolvers/solana/refine.js

@@ -1,53 +0,0 @@
-import { create } from '@bufbuild/protobuf';
-import { Chain } from '@vultisig/core-chain/Chain';
-import { getSolanaClient } from '@vultisig/core-chain/chains/solana/client';
-import { solanaConfig } from '@vultisig/core-chain/chains/solana/solanaConfig';
-import { isFeeCoin } from '@vultisig/core-chain/coin/utils/isFeeCoin';
-import { KeysignPayloadSchema, } from '@vultisig/core-mpc/types/vultisig/keysign/v1/keysign_message_pb';
-import { Message } from '@solana/web3.js';
-import { getPreSigningOutput } from '../../../preSigningOutput/index.js';
-import { getEncodedSigningInputs } from '../../../signingInputs/index.js';
-import { getKeysignCoin } from '../../../utils/getKeysignCoin.js';
-const rentExemptionAccountSize = 165;
-const microLamportsPerLamport = 1000000n;
-export const refineSolanaChainSpecific = async ({ keysignPayload, chainSpecific, priorityFeePrice, walletCore, }) => {
-    const coin = getKeysignCoin(keysignPayload);
-    const client = getSolanaClient();
-    const [txInputData] = getEncodedSigningInputs({
-        keysignPayload: create(KeysignPayloadSchema, {
-            ...keysignPayload,
-            blockchainSpecific: {
-                case: 'solanaSpecific',
-                value: chainSpecific,
-            },
-        }),
-        walletCore,
-    });
-    const { data } = getPreSigningOutput({
-        walletCore,
-        txInputData,
-        chain: Chain.Solana,
-    });
-    const message = Message.from(data);
-    const getBaseFee = async () => {
-        const response = await client.getFeeForMessage(message, 'confirmed');
-        return BigInt(response.value ?? 0);
-    };
-    const getRentExemptionFee = async () => {
-        if (!isFeeCoin(coin) && !chainSpecific.toTokenAssociatedAddress) {
-            const rentExemption = await client.getMinimumBalanceForRentExemption(rentExemptionAccountSize);
-            return BigInt(rentExemption);
-        }
-        return 0n;
-    };
-    const baseFee = await getBaseFee();
-    const rentExemptionFee = await getRentExemptionFee();
-    const priorityFeeAmount = (BigInt(priorityFeePrice) * BigInt(solanaConfig.priorityFeeLimit)) /
-        microLamportsPerLamport;
-    const totalFee = baseFee + rentExemptionFee + priorityFeeAmount;
-    return {
-        ...chainSpecific,
-        priorityFee: totalFee.toString(),
-    };
-};
-//# sourceMappingURL=refine.js.map

package/dist/keysign/chainSpecific/resolvers/solana/refine.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"refine.js","sourceRoot":"","sources":["../../../../../../../../packages/core/mpc/keysign/chainSpecific/resolvers/solana/refine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAA;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,iDAAiD,CAAA;AAC9E,OAAO,EAAE,SAAS,EAAE,MAAM,2CAA2C,CAAA;AAErE,OAAO,EAEL,oBAAoB,GACrB,MAAM,iEAAiE,CAAA;AACxE,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAGzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAA;AAC/D,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAA;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAE9D,MAAM,wBAAwB,GAAG,GAAG,CAAA;AACpC,MAAM,uBAAuB,GAAG,QAAU,CAAA;AAS1C,MAAM,CAAC,MAAM,yBAAyB,GAAG,KAAK,EAAE,EAC9C,cAAc,EACd,aAAa,EACb,gBAAgB,EAChB,UAAU,GACqB,EAA2B,EAAE;IAC5D,MAAM,IAAI,GAAG,cAAc,CAAC,cAAc,CAAC,CAAA;IAC3C,MAAM,MAAM,GAAG,eAAe,EAAE,CAAA;IAEhC,MAAM,CAAC,WAAW,CAAC,GAAG,uBAAuB,CAAC;QAC5C,cAAc,EAAE,MAAM,CAAC,oBAAoB,EAAE;YAC3C,GAAG,cAAc;YACjB,kBAAkB,EAAE;gBAClB,IAAI,EAAE,gBAAgB;gBACtB,KAAK,EAAE,aAAa;aACrB;SACF,CAAC;QACF,UAAU;KACX,CAAC,CAAA;IAEF,MAAM,EAAE,IAAI,EAAE,GAAG,mBAAmB,CAAC;QACnC,UAAU;QACV,WAAW;QACX,KAAK,EAAE,KAAK,CAAC,MAAM;KACpB,CAAC,CAAA;IAEF,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAElC,MAAM,UAAU,GAAG,KAAK,IAAI,EAAE;QAC5B,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAA;QAEpE,OAAO,MAAM,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC,CAAC,CAAA;IACpC,CAAC,CAAA;IAED,MAAM,mBAAmB,GAAG,KAAK,IAAI,EAAE;QACrC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,wBAAwB,EAAE,CAAC;YAChE,MAAM,aAAa,GAAG,MAAM,MAAM,CAAC,iCAAiC,CAClE,wBAAwB,CACzB,CAAA;YACD,OAAO,MAAM,CAAC,aAAa,CAAC,CAAA;QAC9B,CAAC;QAED,OAAO,EAAE,CAAA;IACX,CAAC,CAAA;IAED,MAAM,OAAO,GAAG,MAAM,UAAU,EAAE,CAAA;IAClC,MAAM,gBAAgB,GAAG,MAAM,mBAAmB,EAAE,CAAA;IAEpD,MAAM,iBAAiB,GACrB,CAAC,MAAM,CAAC,gBAAgB,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;QAClE,uBAAuB,CAAA;IAEzB,MAAM,QAAQ,GAAG,OAAO,GAAG,gBAAgB,GAAG,iBAAiB,CAAA;IAE/D,OAAO;QACL,GAAG,aAAa;QAChB,WAAW,EAAE,QAAQ,CAAC,QAAQ,EAAE;KACjC,CAAA;AACH,CAAC,CAAA"}