dop-wallet-v6 1.1.5 → 1.1.6

package/dist/services/transactions/tx-cross-contract-calls.js

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseRelayAdaptReturnValue = exports.getRelayAdaptTransactionError = exports.populateProvedCrossContractCalls = exports.createNFTTokenDataFromDopNFTAmount = exports.createRelayAdaptUnshieldNFTAmountRecipients = exports.createRelayAdaptUnshieldERC20AmountRecipients = void 0;
-const dop_sharedmodel_v5_1 = require("dop-sharedmodel-v5");
+exports.parseRelayAdaptReturnValue = exports.getRelayAdaptTransactionError = exports.generateCrossContractCallsProof = exports.gasEstimateForUnprovenCrossContractCalls = exports.populateProvedCrossContractCalls = exports.createNFTTokenDataFromDopNFTAmount = exports.createRelayAdaptUnshieldNFTAmountRecipients = exports.createRelayAdaptUnshieldERC20AmountRecipients = void 0;
+const dop_sharedmodel_1 = require("dop-sharedmodel");
 const providers_1 = require("../dop/core/providers");
+const tx_generator_1 = require("./tx-generator");
 const proof_cache_1 = require("./proof-cache");
 const logger_1 = require("../../utils/logger");
-const dop_engine_v5_1 = require("dop-engine-v5");
+const dop_engine_1 = require("dop-engine");
 const blocked_address_1 = require("../../utils/blocked-address");
-// import { gasEstimateResponseDummyProofIterativeRelayerFee } from './tx-gas-relayer-fee-estimator';
+const tx_gas_relayer_fee_estimator_1 = require("./tx-gas-relayer-fee-estimator");
 const error_1 = require("../../utils/error");
 const createValidCrossContractCalls = (crossContractCalls) => {
     if (!crossContractCalls.length) {
@@ -21,7 +22,7 @@ const createValidCrossContractCalls = (crossContractCalls) => {
             const transaction = {
                 to: transactionRequest.to,
                 value: transactionRequest.value,
-                data: (0, dop_engine_v5_1.hexlify)(transactionRequest.data, true),
+                data: (0, dop_engine_1.hexlify)(transactionRequest.data, true),
             };
             (0, blocked_address_1.assertNotBlockedAddress)(transaction.to);
             return transaction;
@@ -64,9 +65,9 @@ const createNFTTokenDataFromDopNFTAmount = (nftAmount) => {
     //   ? bigIntStringToHex(nftAmount.tokenSubID)
     //   : nftAmount.tokenSubID;
     return {
-        tokenAddress: (0, dop_engine_v5_1.formatToByteLength)(nftAmount.nftAddress, dop_engine_v5_1.ByteLength.Address, true),
+        tokenAddress: (0, dop_engine_1.formatToByteLength)(nftAmount.nftAddress, dop_engine_1.ByteLength.Address, true),
         tokenType: nftAmount.nftTokenType,
-        tokenSubID: (0, dop_engine_v5_1.formatToByteLength)(nftAmount.tokenSubID, dop_engine_v5_1.ByteLength.UINT_256, true),
+        tokenSubID: (0, dop_engine_1.formatToByteLength)(nftAmount.tokenSubID, dop_engine_1.ByteLength.UINT_256, true),
     };
 };
 exports.createNFTTokenDataFromDopNFTAmount = createNFTTokenDataFromDopNFTAmount;
@@ -78,7 +79,7 @@ const createRelayAdaptShieldNFTRecipients = (relayAdaptShieldNFTRecipients) => {
 };
 const populateProvedCrossContractCalls = async (networkName, dopWalletID, relayAdaptUnshieldERC20Amounts, relayAdaptUnshieldNFTAmounts, relayAdaptShieldERC20Recipients, relayAdaptShieldNFTRecipients, crossContractCalls, relayerFeeERC20AmountRecipient, sendWithPublicWallet, overallBatchMinGasPrice, gasDetails) => {
     try {
-        const { transaction, nullifiers } = await (0, proof_cache_1.populateProvedTransaction)(networkName, dop_sharedmodel_v5_1.ProofType.CrossContractCalls, dopWalletID, false, // showSenderAddressToRecipient
+        const { transaction, nullifiers } = await (0, proof_cache_1.populateProvedTransaction)(networkName, dop_sharedmodel_1.ProofType.CrossContractCalls, dopWalletID, false, // showSenderAddressToRecipient
         undefined, // memoText
         [], // erc20AmountRecipients
         [], // nftAmountRecipients
@@ -94,271 +95,118 @@ const populateProvedCrossContractCalls = async (networkName, dopWalletID, relayA
     }
 };
 exports.populateProvedCrossContractCalls = populateProvedCrossContractCalls;
-/*
-export const gasEstimateForUnprovenCrossContractCalls = async (
-  networkName: NetworkName,
-  dopWalletID: string,
-  encryptionKey: string,
-  relayAdaptUnshieldERC20Amounts: DopERC20Amount[],
-  relayAdaptUnshieldNFTAmounts: DopNFTAmount[],
-  relayAdaptShieldERC20Recipients: DopERC20Recipient[],
-  relayAdaptShieldNFTRecipients: DopNFTAmountRecipient[],
-  crossContractCalls: ContractTransaction[],
-  originalGasDetails: TransactionGasDetails,
-  feeTokenDetails: Optional<FeeTokenDetails>,
-  sendWithPublicWallet: boolean,
-  minGasLimit: Optional<bigint>,
-  valueCheck: bigint
-): Promise<DopTransactionGasEstimateResponse> => {
-  try {
-    setCachedProvedTransaction(undefined);
-
-    const overallBatchMinGasPrice = 0n;
-
-    const validCrossContractCalls =
-      createValidCrossContractCalls(crossContractCalls);
-
-    const relayAdaptContract = getRelayAdaptContractForNetwork(networkName);
-
-    const relayAdaptUnshieldERC20AmountRecipients: DopERC20AmountRecipient[] =
-      createRelayAdaptUnshieldERC20AmountRecipients(
-        networkName,
-        relayAdaptUnshieldERC20Amounts,
-      );
-    const relayAdaptUnshieldNFTAmountRecipients: DopNFTAmountRecipient[] =
-      createRelayAdaptUnshieldNFTAmountRecipients(
-        networkName,
-        relayAdaptUnshieldNFTAmounts,
-      );
-
-    const shieldRandom = randomHex(16);
-    const relayShieldRequests =
-      await RelayAdaptHelper.generateRelayShieldRequests(
-        shieldRandom,
-        relayAdaptShieldERC20Recipients,
-        createRelayAdaptShieldNFTRecipients(relayAdaptShieldNFTRecipients),
-      );
-
-    const minimumGasLimit =
-      minGasLimit ?? MINIMUM_RELAY_ADAPT_CROSS_CONTRACT_CALLS_GAS_LIMIT;
-
-    const response = await gasEstimateResponseDummyProofIterativeRelayerFee(
-      (relayerFeeERC20Amount: Optional<DopERC20Amount>) =>
-        generateDummyProofTransactions(
-          ProofType.CrossContractCalls,
-          networkName,
-          dopWalletID,
-          encryptionKey,
-          false, // showSenderAddressToRecipient
-          undefined, // memoText
-          relayAdaptUnshieldERC20AmountRecipients,
-          relayAdaptUnshieldNFTAmountRecipients,
-          relayerFeeERC20Amount,
-          sendWithPublicWallet,
-          overallBatchMinGasPrice,
-          valueCheck
-        ),
-      async (txs: TransactionStruct[]) => {
-        const relayAdaptParamsRandom = randomHex(31);
-
-        // TODO: We should add the relay adapt contract gas limit here.
-        const transaction = await relayAdaptContract.populateCrossContractCalls(
-          txs,
-          validCrossContractCalls,
-          relayShieldRequests,
-          relayAdaptParamsRandom,
-          true, // isGasEstimate
-          !sendWithPublicWallet, // isRelayerTransaction
-          minimumGasLimit,
-        );
-        // Remove gasLimit, we'll set to the minimum below.
-        // TODO: Remove after callbacks upgrade.
-        delete transaction.gasLimit;
-        return transaction;
-      },
-      networkName,
-      dopWalletID,
-      relayAdaptUnshieldERC20AmountRecipients,
-      originalGasDetails,
-      feeTokenDetails,
-      sendWithPublicWallet,
-      true, // isCrossContractCall
-    );
-
-    // TODO: Remove this after callbacks upgrade.
-    // If gas estimate is under the cross-contract-minimum, replace it with the minimum.
-    if (response.gasEstimate) {
-      if (response.gasEstimate < minimumGasLimit) {
-        response.gasEstimate = minimumGasLimit;
-      }
+const gasEstimateForUnprovenCrossContractCalls = async (networkName, dopWalletID, encryptionKey, relayAdaptUnshieldERC20Amounts, relayAdaptUnshieldNFTAmounts, relayAdaptShieldERC20Recipients, relayAdaptShieldNFTRecipients, crossContractCalls, originalGasDetails, feeTokenDetails, sendWithPublicWallet, minGasLimit) => {
+    try {
+        (0, proof_cache_1.setCachedProvedTransaction)(undefined);
+        const overallBatchMinGasPrice = 0n;
+        const validCrossContractCalls = createValidCrossContractCalls(crossContractCalls);
+        const relayAdaptContract = (0, providers_1.getRelayAdaptContractForNetwork)(networkName);
+        const relayAdaptUnshieldERC20AmountRecipients = (0, exports.createRelayAdaptUnshieldERC20AmountRecipients)(networkName, relayAdaptUnshieldERC20Amounts);
+        const relayAdaptUnshieldNFTAmountRecipients = (0, exports.createRelayAdaptUnshieldNFTAmountRecipients)(networkName, relayAdaptUnshieldNFTAmounts);
+        const shieldRandom = (0, dop_engine_1.randomHex)(16);
+        const relayShieldRequests = await dop_engine_1.RelayAdaptHelper.generateRelayShieldRequests(shieldRandom, relayAdaptShieldERC20Recipients, createRelayAdaptShieldNFTRecipients(relayAdaptShieldNFTRecipients));
+        const minimumGasLimit = minGasLimit ?? dop_engine_1.MINIMUM_RELAY_ADAPT_CROSS_CONTRACT_CALLS_GAS_LIMIT;
+        const response = await (0, tx_gas_relayer_fee_estimator_1.gasEstimateResponseDummyProofIterativeRelayerFee)((relayerFeeERC20Amount) => (0, tx_generator_1.generateDummyProofTransactions)(dop_sharedmodel_1.ProofType.CrossContractCalls, networkName, dopWalletID, encryptionKey, false, // showSenderAddressToRecipient
+        undefined, // memoText
+        relayAdaptUnshieldERC20AmountRecipients, relayAdaptUnshieldNFTAmountRecipients, relayerFeeERC20Amount, sendWithPublicWallet, overallBatchMinGasPrice), async (txs) => {
+            const relayAdaptParamsRandom = (0, dop_engine_1.randomHex)(31);
+            // TODO: We should add the relay adapt contract gas limit here.
+            const transaction = await relayAdaptContract.populateCrossContractCalls(txs, validCrossContractCalls, relayShieldRequests, relayAdaptParamsRandom, true, // isGasEstimate
+            !sendWithPublicWallet, // isRelayerTransaction
+            minimumGasLimit);
+            // Remove gasLimit, we'll set to the minimum below.
+            // TODO: Remove after callbacks upgrade.
+            delete transaction.gasLimit;
+            return transaction;
+        }, networkName, dopWalletID, relayAdaptUnshieldERC20AmountRecipients, originalGasDetails, feeTokenDetails, sendWithPublicWallet, true);
+        // TODO: Remove this after callbacks upgrade.
+        // If gas estimate is under the cross-contract-minimum, replace it with the minimum.
+        if (response.gasEstimate) {
+            if (response.gasEstimate < minimumGasLimit) {
+                response.gasEstimate = minimumGasLimit;
+            }
+        }
+        return response;
+    }
+    catch (err) {
+        throw (0, error_1.reportAndSanitizeError)(exports.gasEstimateForUnprovenCrossContractCalls.name, err);
     }
-
-    return response;
-  } catch (err) {
-    throw reportAndSanitizeError(
-      gasEstimateForUnprovenCrossContractCalls.name,
-      err,
-    );
-  }
 };
-*/
-/*
-export const generateCrossContractCallsProof = async (
-  networkName: NetworkName,
-  dopWalletID: string,
-  encryptionKey: string,
-  relayAdaptUnshieldERC20Amounts: DopERC20Amount[],
-  relayAdaptUnshieldNFTAmounts: DopNFTAmount[],
-  relayAdaptShieldERC20Recipients: DopERC20Recipient[],
-  relayAdaptShieldNFTRecipients: DopNFTAmountRecipient[],
-  crossContractCalls: ContractTransaction[],
-  relayerFeeERC20AmountRecipient: Optional<DopERC20AmountRecipient>,
-  sendWithPublicWallet: boolean,
-  overallBatchMinGasPrice: Optional<bigint>,
-  minGasLimit: Optional<bigint>,
-  progressCallback: ProverProgressCallback,
-  valueCheck: bigint
-): Promise<void> => {
-  try {
-    setCachedProvedTransaction(undefined);
-
-    const validCrossContractCalls =
-      createValidCrossContractCalls(crossContractCalls);
-
-    const relayAdaptContract = getRelayAdaptContractForNetwork(networkName);
-
-    const relayAdaptUnshieldERC20AmountRecipients: DopERC20AmountRecipient[] =
-      createRelayAdaptUnshieldERC20AmountRecipients(
-        networkName,
-        relayAdaptUnshieldERC20Amounts,
-      );
-    const relayAdaptUnshieldNFTAmountRecipients: DopNFTAmountRecipient[] =
-      createRelayAdaptUnshieldNFTAmountRecipients(
-        networkName,
-        relayAdaptUnshieldNFTAmounts,
-      );
-
-    // Generate dummy txs for relay adapt params.
-    const dummyUnshieldTxs = await generateDummyProofTransactions(
-      ProofType.CrossContractCalls,
-      networkName,
-      dopWalletID,
-      encryptionKey,
-      false, // showSenderAddressToRecipient
-      undefined, // memoText
-      relayAdaptUnshieldERC20AmountRecipients,
-      relayAdaptUnshieldNFTAmountRecipients,
-      relayerFeeERC20AmountRecipient,
-      sendWithPublicWallet,
-      overallBatchMinGasPrice,
-      valueCheck
-    );
-
-    // Generate relay adapt params from dummy transactions.
-    const shieldRandom = randomHex(16);
-
-    const relayShieldRequests =
-      await RelayAdaptHelper.generateRelayShieldRequests(
-        shieldRandom,
-        relayAdaptShieldERC20Recipients,
-        createRelayAdaptShieldNFTRecipients(relayAdaptShieldNFTRecipients),
-      );
-
-    const minimumGasLimit =
-      minGasLimit ?? MINIMUM_RELAY_ADAPT_CROSS_CONTRACT_CALLS_GAS_LIMIT;
-
-    const isRelayerTransaction = !sendWithPublicWallet;
-    const relayAdaptParamsRandom = randomHex(31);
-    const relayAdaptParams =
-      await relayAdaptContract.getRelayAdaptParamsCrossContractCalls(
-        dummyUnshieldTxs,
-        validCrossContractCalls,
-        relayShieldRequests,
-        relayAdaptParamsRandom,
-        isRelayerTransaction,
-        minimumGasLimit,
-      );
-    const relayAdaptID: AdaptID = {
-      contract: relayAdaptContract.address,
-      parameters: relayAdaptParams,
-    };
-
-
-    // console.log("====== 4",
-    //   ProofType.CrossContractCalls,
-    //   networkName,
-    //   dopWalletID,
-    //   encryptionKey,
-    //   false, // showSenderAddressToRecipient
-    //   undefined, // memoText
-    //   relayAdaptUnshieldERC20AmountRecipients,
-    //   relayAdaptUnshieldNFTAmountRecipients,
-    //   relayerFeeERC20AmountRecipient,
-    //   sendWithPublicWallet,
-    //   relayAdaptID,
-    //   false, // useDummyProof
-    //   overallBatchMinGasPrice,
-    //   progressCallback);
-
-    // Create real transactions with relay adapt params.
-    const transactions = await generateProofTransactions(
-      ProofType.CrossContractCalls,
-      networkName,
-      dopWalletID,
-      encryptionKey,
-      false, // showSenderAddressToRecipient
-      undefined, // memoText
-      relayAdaptUnshieldERC20AmountRecipients,
-      relayAdaptUnshieldNFTAmountRecipients,
-      relayerFeeERC20AmountRecipient,
-      sendWithPublicWallet,
-      relayAdaptID,
-      false, // useDummyProof
-      overallBatchMinGasPrice,
-      progressCallback,
-      valueCheck
-    );
-
-    const nullifiers = nullifiersForTransactions(transactions);
-
-    const transaction = await relayAdaptContract.populateCrossContractCalls(
-      transactions,
-      validCrossContractCalls,
-      relayShieldRequests,
-      relayAdaptParamsRandom,
-      false, // isGasEstimate
-      isRelayerTransaction,
-      minimumGasLimit,
-    );
-    delete transaction.from;
-
-    setCachedProvedTransaction({
-      proofType: ProofType.CrossContractCalls,
-      dopWalletID,
-      showSenderAddressToRecipient: false,
-      memoText: undefined,
-      erc20AmountRecipients: [],
-      nftAmountRecipients: [],
-      relayAdaptUnshieldERC20Amounts,
-      relayAdaptUnshieldNFTAmounts,
-      relayAdaptShieldERC20Recipients,
-      relayAdaptShieldNFTRecipients,
-      crossContractCalls: validCrossContractCalls,
-      relayerFeeERC20AmountRecipient,
-      sendWithPublicWallet,
-      transaction,
-      overallBatchMinGasPrice,
-      nullifiers,
-    });
-  } catch (err) {
-    throw reportAndSanitizeError(generateCrossContractCallsProof.name, err);
-  }
+exports.gasEstimateForUnprovenCrossContractCalls = gasEstimateForUnprovenCrossContractCalls;
+const generateCrossContractCallsProof = async (networkName, dopWalletID, encryptionKey, relayAdaptUnshieldERC20Amounts, relayAdaptUnshieldNFTAmounts, relayAdaptShieldERC20Recipients, relayAdaptShieldNFTRecipients, crossContractCalls, relayerFeeERC20AmountRecipient, sendWithPublicWallet, overallBatchMinGasPrice, minGasLimit, progressCallback) => {
+    try {
+        (0, proof_cache_1.setCachedProvedTransaction)(undefined);
+        const validCrossContractCalls = createValidCrossContractCalls(crossContractCalls);
+        const relayAdaptContract = (0, providers_1.getRelayAdaptContractForNetwork)(networkName);
+        const relayAdaptUnshieldERC20AmountRecipients = (0, exports.createRelayAdaptUnshieldERC20AmountRecipients)(networkName, relayAdaptUnshieldERC20Amounts);
+        const relayAdaptUnshieldNFTAmountRecipients = (0, exports.createRelayAdaptUnshieldNFTAmountRecipients)(networkName, relayAdaptUnshieldNFTAmounts);
+        // Generate dummy txs for relay adapt params.
+        const dummyUnshieldTxs = await (0, tx_generator_1.generateDummyProofTransactions)(dop_sharedmodel_1.ProofType.CrossContractCalls, networkName, dopWalletID, encryptionKey, false, // showSenderAddressToRecipient
+        undefined, // memoText
+        relayAdaptUnshieldERC20AmountRecipients, relayAdaptUnshieldNFTAmountRecipients, relayerFeeERC20AmountRecipient, sendWithPublicWallet, overallBatchMinGasPrice);
+        // Generate relay adapt params from dummy transactions.
+        const shieldRandom = (0, dop_engine_1.randomHex)(16);
+        const relayShieldRequests = await dop_engine_1.RelayAdaptHelper.generateRelayShieldRequests(shieldRandom, relayAdaptShieldERC20Recipients, createRelayAdaptShieldNFTRecipients(relayAdaptShieldNFTRecipients));
+        const minimumGasLimit = minGasLimit ?? dop_engine_1.MINIMUM_RELAY_ADAPT_CROSS_CONTRACT_CALLS_GAS_LIMIT;
+        const isRelayerTransaction = !sendWithPublicWallet;
+        const relayAdaptParamsRandom = (0, dop_engine_1.randomHex)(31);
+        const relayAdaptParams = await relayAdaptContract.getRelayAdaptParamsCrossContractCalls(dummyUnshieldTxs, validCrossContractCalls, relayShieldRequests, relayAdaptParamsRandom, isRelayerTransaction, minimumGasLimit);
+        const relayAdaptID = {
+            contract: relayAdaptContract.address,
+            parameters: relayAdaptParams,
+        };
+        // console.log("====== 4",
+        //   ProofType.CrossContractCalls,
+        //   networkName,
+        //   dopWalletID,
+        //   encryptionKey,
+        //   false, // showSenderAddressToRecipient
+        //   undefined, // memoText
+        //   relayAdaptUnshieldERC20AmountRecipients,
+        //   relayAdaptUnshieldNFTAmountRecipients,
+        //   relayerFeeERC20AmountRecipient,
+        //   sendWithPublicWallet,
+        //   relayAdaptID,
+        //   false, // useDummyProof
+        //   overallBatchMinGasPrice,
+        //   progressCallback);
+        // Create real transactions with relay adapt params.
+        const transactions = await (0, tx_generator_1.generateProofTransactions)(dop_sharedmodel_1.ProofType.CrossContractCalls, networkName, dopWalletID, encryptionKey, false, // showSenderAddressToRecipient
+        undefined, // memoText
+        relayAdaptUnshieldERC20AmountRecipients, relayAdaptUnshieldNFTAmountRecipients, relayerFeeERC20AmountRecipient, sendWithPublicWallet, relayAdaptID, false, // useDummyProof
+        overallBatchMinGasPrice, progressCallback);
+        const nullifiers = (0, tx_generator_1.nullifiersForTransactions)(transactions);
+        const transaction = await relayAdaptContract.populateCrossContractCalls(transactions, validCrossContractCalls, relayShieldRequests, relayAdaptParamsRandom, false, // isGasEstimate
+        isRelayerTransaction, minimumGasLimit);
+        delete transaction.from;
+        (0, proof_cache_1.setCachedProvedTransaction)({
+            proofType: dop_sharedmodel_1.ProofType.CrossContractCalls,
+            dopWalletID,
+            showSenderAddressToRecipient: false,
+            memoText: undefined,
+            erc20AmountRecipients: [],
+            nftAmountRecipients: [],
+            relayAdaptUnshieldERC20Amounts,
+            relayAdaptUnshieldNFTAmounts,
+            relayAdaptShieldERC20Recipients,
+            relayAdaptShieldNFTRecipients,
+            crossContractCalls: validCrossContractCalls,
+            relayerFeeERC20AmountRecipient,
+            sendWithPublicWallet,
+            transaction,
+            overallBatchMinGasPrice,
+            nullifiers,
+        });
+    }
+    catch (err) {
+        throw (0, error_1.reportAndSanitizeError)(exports.generateCrossContractCallsProof.name, err);
+    }
 };
-*/
+exports.generateCrossContractCallsProof = generateCrossContractCallsProof;
 const getRelayAdaptTransactionError = (receiptLogs) => {
     try {
-        const relayAdaptError = dop_engine_v5_1.RelayAdaptContract.getRelayAdaptCallError(receiptLogs);
-        if ((0, dop_sharedmodel_v5_1.isDefined)(relayAdaptError)) {
+        const relayAdaptError = dop_engine_1.RelayAdaptContract.getRelayAdaptCallError(receiptLogs);
+        if ((0, dop_sharedmodel_1.isDefined)(relayAdaptError)) {
             (0, logger_1.sendErrorMessage)(relayAdaptError);
             return relayAdaptError;
         }
@@ -371,7 +219,7 @@ const getRelayAdaptTransactionError = (receiptLogs) => {
 exports.getRelayAdaptTransactionError = getRelayAdaptTransactionError;
 const parseRelayAdaptReturnValue = (data) => {
     try {
-        const relayAdaptErrorParsed = dop_engine_v5_1.RelayAdaptContract.parseRelayAdaptReturnValue(data);
+        const relayAdaptErrorParsed = dop_engine_1.RelayAdaptContract.parseRelayAdaptReturnValue(data);
         if (relayAdaptErrorParsed) {
             (0, logger_1.sendErrorMessage)(relayAdaptErrorParsed.error);
             return relayAdaptErrorParsed.error;

package/dist/services/transactions/tx-cross-contract-calls.js.map

@@ -1 +1 @@
-{"version":3,"file":"tx-cross-contract-calls.js","sourceRoot":"","sources":["../../../src/services/transactions/tx-cross-contract-calls.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  DopPopulateTransactionResponse,\n  DopTransactionGasEstimateResponse,\n  DopERC20Amount,\n  NetworkName,\n  ProofType,\n  TransactionReceiptLog,\n  FeeTokenDetails,\n  DopERC20AmountRecipient,\n  DopNFTAmountRecipient,\n  DopNFTAmount,\n  TransactionGasDetails,\n  isDefined,\n  DopERC20Recipient,\n} from 'dop-sharedmodel-v5';\nimport { getRelayAdaptContractForNetwork } from '../dop/core/providers';\nimport {\n  generateDummyProofTransactions,\n  generateProofTransactions,\n  nullifiersForTransactions,\n} from './tx-generator';\nimport {\n  populateProvedTransaction,\n  setCachedProvedTransaction,\n} from './proof-cache';\nimport { sendErrorMessage } from '../../utils/logger';\nimport {\n  RelayAdaptHelper,\n  AdaptID,\n  TransactionStruct,\n  hexlify,\n  randomHex,\n  RelayAdaptContract,\n  ProverProgressCallback,\n  NFTTokenData,\n  formatToByteLength,\n  ByteLength,\n  MINIMUM_RELAY_ADAPT_CROSS_CONTRACT_CALLS_GAS_LIMIT,\n  RelayAdaptShieldNFTRecipient,\n} from 'dop-engine-v5';\nimport { assertNotBlockedAddress } from '../../utils/blocked-address';\n// import { gasEstimateResponseDummyProofIterativeRelayerFee } from './tx-gas-relayer-fee-estimator';\nimport { reportAndSanitizeError } from '../../utils/error';\nimport { ContractTransaction, Log } from 'ethers';\n\nconst createValidCrossContractCalls = (\n  crossContractCalls: ContractTransaction[],\n): ContractTransaction[] => {\n  if (!crossContractCalls.length) {\n    throw new Error('No cross contract calls in transaction.');\n  }\n  try {\n    return crossContractCalls.map(transactionRequest => {\n      if (!transactionRequest.to || !transactionRequest.data) {\n        throw new Error(`Cross-contract calls require 'to' and 'data' fields.`);\n      }\n      const transaction: ContractTransaction = {\n        to: transactionRequest.to,\n        value: transactionRequest.value,\n        data: hexlify(transactionRequest.data, true),\n      };\n      assertNotBlockedAddress(transaction.to);\n      return transaction;\n    });\n  } catch (err) {\n    if (!(err instanceof Error)) {\n      throw err;\n    }\n    throw reportAndSanitizeError(createValidCrossContractCalls.name, err);\n  }\n};\n\nexport const createRelayAdaptUnshieldERC20AmountRecipients = (\n  networkName: NetworkName,\n  unshieldERC20Amounts: DopERC20Amount[],\n): DopERC20AmountRecipient[] => {\n  const relayAdaptContract = getRelayAdaptContractForNetwork(networkName);\n  const unshieldERC20AmountRecipients: DopERC20AmountRecipient[] =\n    unshieldERC20Amounts.map(unshieldERC20Amount => ({\n      ...unshieldERC20Amount,\n      recipientAddress: relayAdaptContract.address,\n    }));\n  return unshieldERC20AmountRecipients;\n};\n\nexport const createRelayAdaptUnshieldNFTAmountRecipients = (\n  networkName: NetworkName,\n  unshieldNFTAmounts: DopNFTAmount[],\n): DopNFTAmountRecipient[] => {\n  const relayAdaptContract = getRelayAdaptContractForNetwork(networkName);\n  const unshieldNFTAmountRecipients: DopNFTAmountRecipient[] =\n    unshieldNFTAmounts.map(unshieldNFTAmount => ({\n      ...unshieldNFTAmount,\n      recipientAddress: relayAdaptContract.address,\n    }));\n  return unshieldNFTAmountRecipients;\n};\n\nconst isDecimalStr = (str: string): boolean => {\n  const decimalPattern = /^[-+]?(\\d+(\\.\\d*)?|\\.\\d+)$/;\n  return decimalPattern.test(str);\n}\n\nconst bigIntStringToHex = (bigintString: string): string => {\n  return `0x${BigInt(bigintString).toString(16)}`;\n};\n\nexport const createNFTTokenDataFromDopNFTAmount = (\n  nftAmount: DopNFTAmount,\n): NFTTokenData => {\n\n  // const tokenSubIDHex = isDecimalStr(nftAmount.tokenSubID)\n  //   ? bigIntStringToHex(nftAmount.tokenSubID)\n  //   : nftAmount.tokenSubID;\n\n  return {\n    tokenAddress: formatToByteLength(\n      nftAmount.nftAddress,\n      ByteLength.Address,\n      true,\n    ),\n    tokenType: nftAmount.nftTokenType as 1 | 2,\n    tokenSubID: formatToByteLength(\n      nftAmount.tokenSubID,\n      ByteLength.UINT_256,\n      true,\n    ),\n  };\n};\n\nconst createRelayAdaptShieldNFTRecipients = (\n  relayAdaptShieldNFTRecipients: DopNFTAmountRecipient[],\n): RelayAdaptShieldNFTRecipient[] => {\n  return relayAdaptShieldNFTRecipients.map(\n    (nftRecipient: DopNFTAmountRecipient) => ({\n      nftTokenData: createNFTTokenDataFromDopNFTAmount(nftRecipient),\n      recipientAddress: nftRecipient.recipientAddress,\n    }),\n  );\n};\n\nexport const populateProvedCrossContractCalls = async (\n  networkName: NetworkName,\n  dopWalletID: string,\n  relayAdaptUnshieldERC20Amounts: DopERC20Amount[],\n  relayAdaptUnshieldNFTAmounts: DopNFTAmount[],\n  relayAdaptShieldERC20Recipients: DopERC20Recipient[],\n  relayAdaptShieldNFTRecipients: DopNFTAmountRecipient[],\n  crossContractCalls: ContractTransaction[],\n  relayerFeeERC20AmountRecipient: Optional<DopERC20AmountRecipient>,\n  sendWithPublicWallet: boolean,\n  overallBatchMinGasPrice: Optional<bigint>,\n  gasDetails: TransactionGasDetails,\n): Promise<DopPopulateTransactionResponse> => {\n  try {\n    const { transaction, nullifiers } = await populateProvedTransaction(\n      networkName,\n      ProofType.CrossContractCalls,\n      dopWalletID,\n      false, // showSenderAddressToRecipient\n      undefined, // memoText\n      [], // erc20AmountRecipients\n      [], // nftAmountRecipients\n      relayAdaptUnshieldERC20Amounts,\n      relayAdaptUnshieldNFTAmounts,\n      relayAdaptShieldERC20Recipients,\n      relayAdaptShieldNFTRecipients,\n      crossContractCalls,\n      relayerFeeERC20AmountRecipient,\n      sendWithPublicWallet,\n      overallBatchMinGasPrice,\n      gasDetails,\n    );\n    delete transaction.from;\n\n    return {\n      nullifiers,\n      transaction,\n    };\n  } catch (err) {\n    throw reportAndSanitizeError(populateProvedCrossContractCalls.name, err);\n  }\n};\n/*\nexport const gasEstimateForUnprovenCrossContractCalls = async (\n  networkName: NetworkName,\n  dopWalletID: string,\n  encryptionKey: string,\n  relayAdaptUnshieldERC20Amounts: DopERC20Amount[],\n  relayAdaptUnshieldNFTAmounts: DopNFTAmount[],\n  relayAdaptShieldERC20Recipients: DopERC20Recipient[],\n  relayAdaptShieldNFTRecipients: DopNFTAmountRecipient[],\n  crossContractCalls: ContractTransaction[],\n  originalGasDetails: TransactionGasDetails,\n  feeTokenDetails: Optional<FeeTokenDetails>,\n  sendWithPublicWallet: boolean,\n  minGasLimit: Optional<bigint>,\n  valueCheck: bigint\n): Promise<DopTransactionGasEstimateResponse> => {\n  try {\n    setCachedProvedTransaction(undefined);\n\n    const overallBatchMinGasPrice = 0n;\n\n    const validCrossContractCalls =\n      createValidCrossContractCalls(crossContractCalls);\n\n    const relayAdaptContract = getRelayAdaptContractForNetwork(networkName);\n\n    const relayAdaptUnshieldERC20AmountRecipients: DopERC20AmountRecipient[] =\n      createRelayAdaptUnshieldERC20AmountRecipients(\n        networkName,\n        relayAdaptUnshieldERC20Amounts,\n      );\n    const relayAdaptUnshieldNFTAmountRecipients: DopNFTAmountRecipient[] =\n      createRelayAdaptUnshieldNFTAmountRecipients(\n        networkName,\n        relayAdaptUnshieldNFTAmounts,\n      );\n\n    const shieldRandom = randomHex(16);\n    const relayShieldRequests =\n      await RelayAdaptHelper.generateRelayShieldRequests(\n        shieldRandom,\n        relayAdaptShieldERC20Recipients,\n        createRelayAdaptShieldNFTRecipients(relayAdaptShieldNFTRecipients),\n      );\n\n    const minimumGasLimit =\n      minGasLimit ?? MINIMUM_RELAY_ADAPT_CROSS_CONTRACT_CALLS_GAS_LIMIT;\n\n    const response = await gasEstimateResponseDummyProofIterativeRelayerFee(\n      (relayerFeeERC20Amount: Optional<DopERC20Amount>) =>\n        generateDummyProofTransactions(\n          ProofType.CrossContractCalls,\n          networkName,\n          dopWalletID,\n          encryptionKey,\n          false, // showSenderAddressToRecipient\n          undefined, // memoText\n          relayAdaptUnshieldERC20AmountRecipients,\n          relayAdaptUnshieldNFTAmountRecipients,\n          relayerFeeERC20Amount,\n          sendWithPublicWallet,\n          overallBatchMinGasPrice,\n          valueCheck\n        ),\n      async (txs: TransactionStruct[]) => {\n        const relayAdaptParamsRandom = randomHex(31);\n\n        // TODO: We should add the relay adapt contract gas limit here.\n        const transaction = await relayAdaptContract.populateCrossContractCalls(\n          txs,\n          validCrossContractCalls,\n          relayShieldRequests,\n          relayAdaptParamsRandom,\n          true, // isGasEstimate\n          !sendWithPublicWallet, // isRelayerTransaction\n          minimumGasLimit,\n        );\n        // Remove gasLimit, we'll set to the minimum below.\n        // TODO: Remove after callbacks upgrade.\n        delete transaction.gasLimit;\n        return transaction;\n      },\n      networkName,\n      dopWalletID,\n      relayAdaptUnshieldERC20AmountRecipients,\n      originalGasDetails,\n      feeTokenDetails,\n      sendWithPublicWallet,\n      true, // isCrossContractCall\n    );\n\n    // TODO: Remove this after callbacks upgrade.\n    // If gas estimate is under the cross-contract-minimum, replace it with the minimum.\n    if (response.gasEstimate) {\n      if (response.gasEstimate < minimumGasLimit) {\n        response.gasEstimate = minimumGasLimit;\n      }\n    }\n\n    return response;\n  } catch (err) {\n    throw reportAndSanitizeError(\n      gasEstimateForUnprovenCrossContractCalls.name,\n      err,\n    );\n  }\n};\n*/\n/*\nexport const generateCrossContractCallsProof = async (\n  networkName: NetworkName,\n  dopWalletID: string,\n  encryptionKey: string,\n  relayAdaptUnshieldERC20Amounts: DopERC20Amount[],\n  relayAdaptUnshieldNFTAmounts: DopNFTAmount[],\n  relayAdaptShieldERC20Recipients: DopERC20Recipient[],\n  relayAdaptShieldNFTRecipients: DopNFTAmountRecipient[],\n  crossContractCalls: ContractTransaction[],\n  relayerFeeERC20AmountRecipient: Optional<DopERC20AmountRecipient>,\n  sendWithPublicWallet: boolean,\n  overallBatchMinGasPrice: Optional<bigint>,\n  minGasLimit: Optional<bigint>,\n  progressCallback: ProverProgressCallback,\n  valueCheck: bigint\n): Promise<void> => {\n  try {\n    setCachedProvedTransaction(undefined);\n\n    const validCrossContractCalls =\n      createValidCrossContractCalls(crossContractCalls);\n\n    const relayAdaptContract = getRelayAdaptContractForNetwork(networkName);\n\n    const relayAdaptUnshieldERC20AmountRecipients: DopERC20AmountRecipient[] =\n      createRelayAdaptUnshieldERC20AmountRecipients(\n        networkName,\n        relayAdaptUnshieldERC20Amounts,\n      );\n    const relayAdaptUnshieldNFTAmountRecipients: DopNFTAmountRecipient[] =\n      createRelayAdaptUnshieldNFTAmountRecipients(\n        networkName,\n        relayAdaptUnshieldNFTAmounts,\n      );\n\n    // Generate dummy txs for relay adapt params.\n    const dummyUnshieldTxs = await generateDummyProofTransactions(\n      ProofType.CrossContractCalls,\n      networkName,\n      dopWalletID,\n      encryptionKey,\n      false, // showSenderAddressToRecipient\n      undefined, // memoText\n      relayAdaptUnshieldERC20AmountRecipients,\n      relayAdaptUnshieldNFTAmountRecipients,\n      relayerFeeERC20AmountRecipient,\n      sendWithPublicWallet,\n      overallBatchMinGasPrice,\n      valueCheck\n    );\n\n    // Generate relay adapt params from dummy transactions.\n    const shieldRandom = randomHex(16);\n\n    const relayShieldRequests =\n      await RelayAdaptHelper.generateRelayShieldRequests(\n        shieldRandom,\n        relayAdaptShieldERC20Recipients,\n        createRelayAdaptShieldNFTRecipients(relayAdaptShieldNFTRecipients),\n      );\n\n    const minimumGasLimit =\n      minGasLimit ?? MINIMUM_RELAY_ADAPT_CROSS_CONTRACT_CALLS_GAS_LIMIT;\n\n    const isRelayerTransaction = !sendWithPublicWallet;\n    const relayAdaptParamsRandom = randomHex(31);\n    const relayAdaptParams =\n      await relayAdaptContract.getRelayAdaptParamsCrossContractCalls(\n        dummyUnshieldTxs,\n        validCrossContractCalls,\n        relayShieldRequests,\n        relayAdaptParamsRandom,\n        isRelayerTransaction,\n        minimumGasLimit,\n      );\n    const relayAdaptID: AdaptID = {\n      contract: relayAdaptContract.address,\n      parameters: relayAdaptParams,\n    };\n\n\n    // console.log(\"====== 4\",\n    //   ProofType.CrossContractCalls,\n    //   networkName,\n    //   dopWalletID,\n    //   encryptionKey,\n    //   false, // showSenderAddressToRecipient\n    //   undefined, // memoText\n    //   relayAdaptUnshieldERC20AmountRecipients,\n    //   relayAdaptUnshieldNFTAmountRecipients,\n    //   relayerFeeERC20AmountRecipient,\n    //   sendWithPublicWallet,\n    //   relayAdaptID,\n    //   false, // useDummyProof\n    //   overallBatchMinGasPrice,\n    //   progressCallback);\n\n    // Create real transactions with relay adapt params.\n    const transactions = await generateProofTransactions(\n      ProofType.CrossContractCalls,\n      networkName,\n      dopWalletID,\n      encryptionKey,\n      false, // showSenderAddressToRecipient\n      undefined, // memoText\n      relayAdaptUnshieldERC20AmountRecipients,\n      relayAdaptUnshieldNFTAmountRecipients,\n      relayerFeeERC20AmountRecipient,\n      sendWithPublicWallet,\n      relayAdaptID,\n      false, // useDummyProof\n      overallBatchMinGasPrice,\n      progressCallback,\n      valueCheck\n    );\n\n    const nullifiers = nullifiersForTransactions(transactions);\n\n    const transaction = await relayAdaptContract.populateCrossContractCalls(\n      transactions,\n      validCrossContractCalls,\n      relayShieldRequests,\n      relayAdaptParamsRandom,\n      false, // isGasEstimate\n      isRelayerTransaction,\n      minimumGasLimit,\n    );\n    delete transaction.from;\n\n    setCachedProvedTransaction({\n      proofType: ProofType.CrossContractCalls,\n      dopWalletID,\n      showSenderAddressToRecipient: false,\n      memoText: undefined,\n      erc20AmountRecipients: [],\n      nftAmountRecipients: [],\n      relayAdaptUnshieldERC20Amounts,\n      relayAdaptUnshieldNFTAmounts,\n      relayAdaptShieldERC20Recipients,\n      relayAdaptShieldNFTRecipients,\n      crossContractCalls: validCrossContractCalls,\n      relayerFeeERC20AmountRecipient,\n      sendWithPublicWallet,\n      transaction,\n      overallBatchMinGasPrice,\n      nullifiers,\n    });\n  } catch (err) {\n    throw reportAndSanitizeError(generateCrossContractCallsProof.name, err);\n  }\n};\n*/\n\nexport const getRelayAdaptTransactionError = (\n  receiptLogs: TransactionReceiptLog[] | readonly Log[],\n): Optional<string> => {\n  try {\n    const relayAdaptError =\n      RelayAdaptContract.getRelayAdaptCallError(receiptLogs);\n    if (isDefined(relayAdaptError)) {\n      sendErrorMessage(relayAdaptError);\n      return relayAdaptError;\n    }\n    return undefined;\n  } catch (err) {\n    throw reportAndSanitizeError(getRelayAdaptTransactionError.name, err);\n  }\n};\n\nexport const parseRelayAdaptReturnValue = (data: string): Optional<string> => {\n  try {\n    const relayAdaptErrorParsed =\n      RelayAdaptContract.parseRelayAdaptReturnValue(data);\n    if (relayAdaptErrorParsed) {\n      sendErrorMessage(relayAdaptErrorParsed.error);\n      return relayAdaptErrorParsed.error;\n    }\n    return undefined;\n  } catch (err) {\n    throw reportAndSanitizeError(getRelayAdaptTransactionError.name, err);\n  }\n};\n"]}
+{"version":3,"file":"tx-cross-contract-calls.js","sourceRoot":"","sources":["../../../src/services/transactions/tx-cross-contract-calls.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  DopPopulateTransactionResponse,\n  DopTransactionGasEstimateResponse,\n  DopERC20Amount,\n  NetworkName,\n  ProofType,\n  TransactionReceiptLog,\n  FeeTokenDetails,\n  DopERC20AmountRecipient,\n  DopNFTAmountRecipient,\n  DopNFTAmount,\n  TransactionGasDetails,\n  isDefined,\n  DopERC20Recipient,\n} from 'dop-sharedmodel';\nimport { getRelayAdaptContractForNetwork } from '../dop/core/providers';\nimport {\n  generateDummyProofTransactions,\n  generateProofTransactions,\n  nullifiersForTransactions,\n} from './tx-generator';\nimport {\n  populateProvedTransaction,\n  setCachedProvedTransaction,\n} from './proof-cache';\nimport { sendErrorMessage } from '../../utils/logger';\nimport {\n  RelayAdaptHelper,\n  AdaptID,\n  TransactionStruct,\n  hexlify,\n  randomHex,\n  RelayAdaptContract,\n  ProverProgressCallback,\n  NFTTokenData,\n  formatToByteLength,\n  ByteLength,\n  MINIMUM_RELAY_ADAPT_CROSS_CONTRACT_CALLS_GAS_LIMIT,\n  RelayAdaptShieldNFTRecipient,\n} from 'dop-engine';\nimport { assertNotBlockedAddress } from '../../utils/blocked-address';\nimport { gasEstimateResponseDummyProofIterativeRelayerFee } from './tx-gas-relayer-fee-estimator';\nimport { reportAndSanitizeError } from '../../utils/error';\nimport { ContractTransaction, Log } from 'ethers';\n\nconst createValidCrossContractCalls = (\n  crossContractCalls: ContractTransaction[],\n): ContractTransaction[] => {\n  if (!crossContractCalls.length) {\n    throw new Error('No cross contract calls in transaction.');\n  }\n  try {\n    return crossContractCalls.map(transactionRequest => {\n      if (!transactionRequest.to || !transactionRequest.data) {\n        throw new Error(`Cross-contract calls require 'to' and 'data' fields.`);\n      }\n      const transaction: ContractTransaction = {\n        to: transactionRequest.to,\n        value: transactionRequest.value,\n        data: hexlify(transactionRequest.data, true),\n      };\n      assertNotBlockedAddress(transaction.to);\n      return transaction;\n    });\n  } catch (err) {\n    if (!(err instanceof Error)) {\n      throw err;\n    }\n    throw reportAndSanitizeError(createValidCrossContractCalls.name, err);\n  }\n};\n\nexport const createRelayAdaptUnshieldERC20AmountRecipients = (\n  networkName: NetworkName,\n  unshieldERC20Amounts: DopERC20Amount[],\n): DopERC20AmountRecipient[] => {\n  const relayAdaptContract = getRelayAdaptContractForNetwork(networkName);\n  const unshieldERC20AmountRecipients: DopERC20AmountRecipient[] =\n    unshieldERC20Amounts.map(unshieldERC20Amount => ({\n      ...unshieldERC20Amount,\n      recipientAddress: relayAdaptContract.address,\n    }));\n  return unshieldERC20AmountRecipients;\n};\n\nexport const createRelayAdaptUnshieldNFTAmountRecipients = (\n  networkName: NetworkName,\n  unshieldNFTAmounts: DopNFTAmount[],\n): DopNFTAmountRecipient[] => {\n  const relayAdaptContract = getRelayAdaptContractForNetwork(networkName);\n  const unshieldNFTAmountRecipients: DopNFTAmountRecipient[] =\n    unshieldNFTAmounts.map(unshieldNFTAmount => ({\n      ...unshieldNFTAmount,\n      recipientAddress: relayAdaptContract.address,\n    }));\n  return unshieldNFTAmountRecipients;\n};\n\nconst isDecimalStr = (str: string): boolean => {\n  const decimalPattern = /^[-+]?(\\d+(\\.\\d*)?|\\.\\d+)$/;\n  return decimalPattern.test(str);\n}\n\nconst bigIntStringToHex = (bigintString: string): string => {\n  return `0x${BigInt(bigintString).toString(16)}`;\n};\n\nexport const createNFTTokenDataFromDopNFTAmount = (\n  nftAmount: DopNFTAmount,\n): NFTTokenData => {\n\n  // const tokenSubIDHex = isDecimalStr(nftAmount.tokenSubID)\n  //   ? bigIntStringToHex(nftAmount.tokenSubID)\n  //   : nftAmount.tokenSubID;\n\n  return {\n    tokenAddress: formatToByteLength(\n      nftAmount.nftAddress,\n      ByteLength.Address,\n      true,\n    ),\n    tokenType: nftAmount.nftTokenType as 1 | 2,\n    tokenSubID: formatToByteLength(\n      nftAmount.tokenSubID,\n      ByteLength.UINT_256,\n      true,\n    ),\n  };\n};\n\nconst createRelayAdaptShieldNFTRecipients = (\n  relayAdaptShieldNFTRecipients: DopNFTAmountRecipient[],\n): RelayAdaptShieldNFTRecipient[] => {\n  return relayAdaptShieldNFTRecipients.map(\n    (nftRecipient: DopNFTAmountRecipient) => ({\n      nftTokenData: createNFTTokenDataFromDopNFTAmount(nftRecipient),\n      recipientAddress: nftRecipient.recipientAddress,\n    }),\n  );\n};\n\nexport const populateProvedCrossContractCalls = async (\n  networkName: NetworkName,\n  dopWalletID: string,\n  relayAdaptUnshieldERC20Amounts: DopERC20Amount[],\n  relayAdaptUnshieldNFTAmounts: DopNFTAmount[],\n  relayAdaptShieldERC20Recipients: DopERC20Recipient[],\n  relayAdaptShieldNFTRecipients: DopNFTAmountRecipient[],\n  crossContractCalls: ContractTransaction[],\n  relayerFeeERC20AmountRecipient: Optional<DopERC20AmountRecipient>,\n  sendWithPublicWallet: boolean,\n  overallBatchMinGasPrice: Optional<bigint>,\n  gasDetails: TransactionGasDetails,\n): Promise<DopPopulateTransactionResponse> => {\n  try {\n    const { transaction, nullifiers } = await populateProvedTransaction(\n      networkName,\n      ProofType.CrossContractCalls,\n      dopWalletID,\n      false, // showSenderAddressToRecipient\n      undefined, // memoText\n      [], // erc20AmountRecipients\n      [], // nftAmountRecipients\n      relayAdaptUnshieldERC20Amounts,\n      relayAdaptUnshieldNFTAmounts,\n      relayAdaptShieldERC20Recipients,\n      relayAdaptShieldNFTRecipients,\n      crossContractCalls,\n      relayerFeeERC20AmountRecipient,\n      sendWithPublicWallet,\n      overallBatchMinGasPrice,\n      gasDetails,\n    );\n    delete transaction.from;\n\n    return {\n      nullifiers,\n      transaction,\n    };\n  } catch (err) {\n    throw reportAndSanitizeError(populateProvedCrossContractCalls.name, err);\n  }\n};\n\nexport const gasEstimateForUnprovenCrossContractCalls = async (\n  networkName: NetworkName,\n  dopWalletID: string,\n  encryptionKey: string,\n  relayAdaptUnshieldERC20Amounts: DopERC20Amount[],\n  relayAdaptUnshieldNFTAmounts: DopNFTAmount[],\n  relayAdaptShieldERC20Recipients: DopERC20Recipient[],\n  relayAdaptShieldNFTRecipients: DopNFTAmountRecipient[],\n  crossContractCalls: ContractTransaction[],\n  originalGasDetails: TransactionGasDetails,\n  feeTokenDetails: Optional<FeeTokenDetails>,\n  sendWithPublicWallet: boolean,\n  minGasLimit: Optional<bigint>,\n): Promise<DopTransactionGasEstimateResponse> => {\n  try {\n    setCachedProvedTransaction(undefined);\n\n    const overallBatchMinGasPrice = 0n;\n\n    const validCrossContractCalls =\n      createValidCrossContractCalls(crossContractCalls);\n\n    const relayAdaptContract = getRelayAdaptContractForNetwork(networkName);\n\n    const relayAdaptUnshieldERC20AmountRecipients: DopERC20AmountRecipient[] =\n      createRelayAdaptUnshieldERC20AmountRecipients(\n        networkName,\n        relayAdaptUnshieldERC20Amounts,\n      );\n    const relayAdaptUnshieldNFTAmountRecipients: DopNFTAmountRecipient[] =\n      createRelayAdaptUnshieldNFTAmountRecipients(\n        networkName,\n        relayAdaptUnshieldNFTAmounts,\n      );\n\n    const shieldRandom = randomHex(16);\n    const relayShieldRequests =\n      await RelayAdaptHelper.generateRelayShieldRequests(\n        shieldRandom,\n        relayAdaptShieldERC20Recipients,\n        createRelayAdaptShieldNFTRecipients(relayAdaptShieldNFTRecipients),\n      );\n\n    const minimumGasLimit =\n      minGasLimit ?? MINIMUM_RELAY_ADAPT_CROSS_CONTRACT_CALLS_GAS_LIMIT;\n\n    const response = await gasEstimateResponseDummyProofIterativeRelayerFee(\n      (relayerFeeERC20Amount: Optional<DopERC20Amount>) =>\n        generateDummyProofTransactions(\n          ProofType.CrossContractCalls,\n          networkName,\n          dopWalletID,\n          encryptionKey,\n          false, // showSenderAddressToRecipient\n          undefined, // memoText\n          relayAdaptUnshieldERC20AmountRecipients,\n          relayAdaptUnshieldNFTAmountRecipients,\n          relayerFeeERC20Amount,\n          sendWithPublicWallet,\n          overallBatchMinGasPrice,\n        ),\n      async (txs: TransactionStruct[]) => {\n        const relayAdaptParamsRandom = randomHex(31);\n\n        // TODO: We should add the relay adapt contract gas limit here.\n        const transaction = await relayAdaptContract.populateCrossContractCalls(\n          txs,\n          validCrossContractCalls,\n          relayShieldRequests,\n          relayAdaptParamsRandom,\n          true, // isGasEstimate\n          !sendWithPublicWallet, // isRelayerTransaction\n          minimumGasLimit,\n        );\n        // Remove gasLimit, we'll set to the minimum below.\n        // TODO: Remove after callbacks upgrade.\n        delete transaction.gasLimit;\n        return transaction;\n      },\n      networkName,\n      dopWalletID,\n      relayAdaptUnshieldERC20AmountRecipients,\n      originalGasDetails,\n      feeTokenDetails,\n      sendWithPublicWallet,\n      true, // isCrossContractCall\n    );\n\n    // TODO: Remove this after callbacks upgrade.\n    // If gas estimate is under the cross-contract-minimum, replace it with the minimum.\n    if (response.gasEstimate) {\n      if (response.gasEstimate < minimumGasLimit) {\n        response.gasEstimate = minimumGasLimit;\n      }\n    }\n\n    return response;\n  } catch (err) {\n    throw reportAndSanitizeError(\n      gasEstimateForUnprovenCrossContractCalls.name,\n      err,\n    );\n  }\n};\n\nexport const generateCrossContractCallsProof = async (\n  networkName: NetworkName,\n  dopWalletID: string,\n  encryptionKey: string,\n  relayAdaptUnshieldERC20Amounts: DopERC20Amount[],\n  relayAdaptUnshieldNFTAmounts: DopNFTAmount[],\n  relayAdaptShieldERC20Recipients: DopERC20Recipient[],\n  relayAdaptShieldNFTRecipients: DopNFTAmountRecipient[],\n  crossContractCalls: ContractTransaction[],\n  relayerFeeERC20AmountRecipient: Optional<DopERC20AmountRecipient>,\n  sendWithPublicWallet: boolean,\n  overallBatchMinGasPrice: Optional<bigint>,\n  minGasLimit: Optional<bigint>,\n  progressCallback: ProverProgressCallback,\n): Promise<void> => {\n  try {\n    setCachedProvedTransaction(undefined);\n\n    const validCrossContractCalls =\n      createValidCrossContractCalls(crossContractCalls);\n\n    const relayAdaptContract = getRelayAdaptContractForNetwork(networkName);\n\n    const relayAdaptUnshieldERC20AmountRecipients: DopERC20AmountRecipient[] =\n      createRelayAdaptUnshieldERC20AmountRecipients(\n        networkName,\n        relayAdaptUnshieldERC20Amounts,\n      );\n    const relayAdaptUnshieldNFTAmountRecipients: DopNFTAmountRecipient[] =\n      createRelayAdaptUnshieldNFTAmountRecipients(\n        networkName,\n        relayAdaptUnshieldNFTAmounts,\n      );\n\n    // Generate dummy txs for relay adapt params.\n    const dummyUnshieldTxs = await generateDummyProofTransactions(\n      ProofType.CrossContractCalls,\n      networkName,\n      dopWalletID,\n      encryptionKey,\n      false, // showSenderAddressToRecipient\n      undefined, // memoText\n      relayAdaptUnshieldERC20AmountRecipients,\n      relayAdaptUnshieldNFTAmountRecipients,\n      relayerFeeERC20AmountRecipient,\n      sendWithPublicWallet,\n      overallBatchMinGasPrice,\n    );\n\n    // Generate relay adapt params from dummy transactions.\n    const shieldRandom = randomHex(16);\n\n    const relayShieldRequests =\n      await RelayAdaptHelper.generateRelayShieldRequests(\n        shieldRandom,\n        relayAdaptShieldERC20Recipients,\n        createRelayAdaptShieldNFTRecipients(relayAdaptShieldNFTRecipients),\n      );\n\n    const minimumGasLimit =\n      minGasLimit ?? MINIMUM_RELAY_ADAPT_CROSS_CONTRACT_CALLS_GAS_LIMIT;\n\n    const isRelayerTransaction = !sendWithPublicWallet;\n    const relayAdaptParamsRandom = randomHex(31);\n    const relayAdaptParams =\n      await relayAdaptContract.getRelayAdaptParamsCrossContractCalls(\n        dummyUnshieldTxs,\n        validCrossContractCalls,\n        relayShieldRequests,\n        relayAdaptParamsRandom,\n        isRelayerTransaction,\n        minimumGasLimit,\n      );\n    const relayAdaptID: AdaptID = {\n      contract: relayAdaptContract.address,\n      parameters: relayAdaptParams,\n    };\n\n\n    // console.log(\"====== 4\",\n    //   ProofType.CrossContractCalls,\n    //   networkName,\n    //   dopWalletID,\n    //   encryptionKey,\n    //   false, // showSenderAddressToRecipient\n    //   undefined, // memoText\n    //   relayAdaptUnshieldERC20AmountRecipients,\n    //   relayAdaptUnshieldNFTAmountRecipients,\n    //   relayerFeeERC20AmountRecipient,\n    //   sendWithPublicWallet,\n    //   relayAdaptID,\n    //   false, // useDummyProof\n    //   overallBatchMinGasPrice,\n    //   progressCallback);\n\n    // Create real transactions with relay adapt params.\n    const transactions = await generateProofTransactions(\n      ProofType.CrossContractCalls,\n      networkName,\n      dopWalletID,\n      encryptionKey,\n      false, // showSenderAddressToRecipient\n      undefined, // memoText\n      relayAdaptUnshieldERC20AmountRecipients,\n      relayAdaptUnshieldNFTAmountRecipients,\n      relayerFeeERC20AmountRecipient,\n      sendWithPublicWallet,\n      relayAdaptID,\n      false, // useDummyProof\n      overallBatchMinGasPrice,\n      progressCallback,\n    );\n\n    const nullifiers = nullifiersForTransactions(transactions);\n\n    const transaction = await relayAdaptContract.populateCrossContractCalls(\n      transactions,\n      validCrossContractCalls,\n      relayShieldRequests,\n      relayAdaptParamsRandom,\n      false, // isGasEstimate\n      isRelayerTransaction,\n      minimumGasLimit,\n    );\n    delete transaction.from;\n\n    setCachedProvedTransaction({\n      proofType: ProofType.CrossContractCalls,\n      dopWalletID,\n      showSenderAddressToRecipient: false,\n      memoText: undefined,\n      erc20AmountRecipients: [],\n      nftAmountRecipients: [],\n      relayAdaptUnshieldERC20Amounts,\n      relayAdaptUnshieldNFTAmounts,\n      relayAdaptShieldERC20Recipients,\n      relayAdaptShieldNFTRecipients,\n      crossContractCalls: validCrossContractCalls,\n      relayerFeeERC20AmountRecipient,\n      sendWithPublicWallet,\n      transaction,\n      overallBatchMinGasPrice,\n      nullifiers,\n    });\n  } catch (err) {\n    throw reportAndSanitizeError(generateCrossContractCallsProof.name, err);\n  }\n};\n\nexport const getRelayAdaptTransactionError = (\n  receiptLogs: TransactionReceiptLog[] | readonly Log[],\n): Optional<string> => {\n  try {\n    const relayAdaptError =\n      RelayAdaptContract.getRelayAdaptCallError(receiptLogs);\n    if (isDefined(relayAdaptError)) {\n      sendErrorMessage(relayAdaptError);\n      return relayAdaptError;\n    }\n    return undefined;\n  } catch (err) {\n    throw reportAndSanitizeError(getRelayAdaptTransactionError.name, err);\n  }\n};\n\nexport const parseRelayAdaptReturnValue = (data: string): Optional<string> => {\n  try {\n    const relayAdaptErrorParsed =\n      RelayAdaptContract.parseRelayAdaptReturnValue(data);\n    if (relayAdaptErrorParsed) {\n      sendErrorMessage(relayAdaptErrorParsed.error);\n      return relayAdaptErrorParsed.error;\n    }\n    return undefined;\n  } catch (err) {\n    throw reportAndSanitizeError(getRelayAdaptTransactionError.name, err);\n  }\n};\n"]}

package/dist/services/transactions/tx-gas-details.d.ts

@@ -1,4 +1,4 @@
-import { DopTransactionGasEstimateResponse, NetworkName, CommitmentSummary, TransactionGasDetails } from 'dop-sharedmodel-v5';
+import { DopTransactionGasEstimateResponse, NetworkName, CommitmentSummary, TransactionGasDetails } from 'dop-sharedmodel';
 import { ContractTransaction } from 'ethers';
 export declare const getGasEstimate: (networkName: NetworkName, transaction: ContractTransaction, fromWalletAddress: string, sendWithPublicWallet: boolean, isCrossContractCall: boolean) => Promise<bigint>;
 export declare const gasEstimateResponse: (gasEstimate: bigint, relayerFeeCommitment: Optional<CommitmentSummary>, isGasEstimateWithDummyProof: boolean) => DopTransactionGasEstimateResponse;