@continuumdao/ctm-mpc-defi 0.2.59 → 0.2.60

package/dist/protocols/evm/railgun/index.js

@@ -1,4 +1,4 @@
-import { getAddress, parseAbi, zeroAddress, encodeFunctionData, defineChain, createPublicClient, parseGwei, serializeTransaction, keccak256, hashMessage, stringToHex, http } from 'viem';
+import { getAddress, parseAbi, zeroAddress, keccak256, encodeFunctionData, defineChain, createPublicClient, parseGwei, serializeTransaction, hashMessage, stringToHex, http } from 'viem';
 import { fetchChainFeeParams, gasLimitFromEstimateAndChainConfig, gweiToDecimalString, proposalTxParamsToFeeSnapshot, alignEip1559FeesWithLatestBase, getClientIdFromKeyGenResult } from '@continuumdao/continuum-node-sdk';
 import { TXIDVersion, calculateGasPrice, ChainType, EVMGasType, RailgunWalletBalanceBucket } from '@railgun-community/shared-models';
 
@@ -659,6 +659,16 @@ async function shieldSignatureMessage() {
   const wallet = await import('@railgun-community/wallet');
   return wallet.getShieldPrivateKeySignatureMessage();
 }
+function shieldPrivateKeyFromSignature(signature) {
+  const hex = signature.startsWith("0x") ? signature : `0x${signature}`;
+  if (!/^0x[0-9a-fA-F]+$/.test(hex) || (hex.length - 2) % 2 !== 0) {
+    throw new Error("Shield-key signature must be hex.");
+  }
+  if ((hex.length - 2) / 2 !== 65) {
+    throw new Error("Shield-key signature must be the 65-byte personal_sign of RAILGUN_SHIELD.");
+  }
+  return keccak256(hex);
+}
 function personalSignBody(args, message) {
   const executor = getAddress(args.executorAddress);
   const digest = hashMessage(message);
@@ -739,6 +749,7 @@ async function buildEvmMultisignBodyRailgunShield(args) {
   if (!signature) {
     return personalSignBody(args, await shieldSignatureMessage());
   }
+  const shieldPrivateKey = shieldPrivateKeyFromSignature(signature);
   const network = await railgunNetworkByChainId(args.chainId);
   if (!network) throw new Error("Railgun is not deployed on this chain.");
   const tokenAddress = getAddress(args.tokenAddress);
@@ -790,7 +801,7 @@ async function buildEvmMultisignBodyRailgunShield(args) {
   const populated = await populate(
     TXIDVersion.V2_PoseidonMerkle,
     networkName,
-    signature,
+    shieldPrivateKey,
     [{ tokenAddress, amount, recipientAddress: args.railgunAddress.trim() }],
     [],
     railgunGasDetails(args.chainDetail, 1200000n)
@@ -1221,6 +1232,6 @@ var railgunProtocolModule = {
 };
 registerProtocolModule(railgunProtocolModule);
 
-export { RAILGUN_CTM_DISABLED_MESSAGE, RAILGUN_CTM_ENABLED, RAILGUN_POPULAR_ASSET_LIMIT, RAILGUN_PROTOCOL_ID, RAILGUN_WALLET_LOCKED_MESSAGE, assertRailgunCtmAllowed, buildEvmMultisignBodyRailgunShield, buildEvmMultisignBodyWethUnwrap, clearRailgunNetworkCache, clearRailgunPopularAssetCache, clearRailgunPrivateBalanceSnapshots, commitmentsFromShieldIndex, createRailgunBrowserWallet, discardRailgunWallet, getRailgunWalletSession, loadRailgunNetworks, loadRailgunPopularAssets, loadRailgunSupportedChainIds, openRailgunViewOnlyWallet, publishRailgunPrivateBalanceSnapshot, railgunAddressIsValid, railgunFetchPopularAssets, railgunFetchPrivateBalances, railgunFetchPrivateBalancesSummary, railgunNetworkByChainId, railgunPrivateTransfer, railgunProtocolModule, railgunShareableViewingKey, railgunUnshield, rankPopularShieldTokens, readRailgunPrivateBalanceSnapshot, requireRailgunWalletSession, scanRailgunPrivateBalances, selectRailgunNetworks, setRailgunAllowanceReaderForTests, setRailgunPopulateShieldForTests, setRailgunShieldLogReaderForTests, setRailgunWalletSession, shieldIndexEndpoint, unlockRailgunBrowserWallet, utxoScanTerminalStatus };
+export { RAILGUN_CTM_DISABLED_MESSAGE, RAILGUN_CTM_ENABLED, RAILGUN_POPULAR_ASSET_LIMIT, RAILGUN_PROTOCOL_ID, RAILGUN_WALLET_LOCKED_MESSAGE, assertRailgunCtmAllowed, buildEvmMultisignBodyRailgunShield, buildEvmMultisignBodyWethUnwrap, clearRailgunNetworkCache, clearRailgunPopularAssetCache, clearRailgunPrivateBalanceSnapshots, commitmentsFromShieldIndex, createRailgunBrowserWallet, discardRailgunWallet, getRailgunWalletSession, loadRailgunNetworks, loadRailgunPopularAssets, loadRailgunSupportedChainIds, openRailgunViewOnlyWallet, publishRailgunPrivateBalanceSnapshot, railgunAddressIsValid, railgunFetchPopularAssets, railgunFetchPrivateBalances, railgunFetchPrivateBalancesSummary, railgunNetworkByChainId, railgunPrivateTransfer, railgunProtocolModule, railgunShareableViewingKey, railgunUnshield, rankPopularShieldTokens, readRailgunPrivateBalanceSnapshot, requireRailgunWalletSession, scanRailgunPrivateBalances, selectRailgunNetworks, setRailgunAllowanceReaderForTests, setRailgunPopulateShieldForTests, setRailgunShieldLogReaderForTests, setRailgunWalletSession, shieldIndexEndpoint, shieldPrivateKeyFromSignature, unlockRailgunBrowserWallet, utxoScanTerminalStatus };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map