dop-wallet-v6 1.1.9 → 1.2.0

package/dist/services/transactions/tx-generator.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateTransact = exports.generateDummyProofTransactions = exports.createDummyRelayerFeeERC20Amount = exports.nullifiersForTransactions = exports.generateProofTransactions = exports.DUMMY_FROM_ADDRESS = void 0;
+exports.generateUnshieldBaseToken = exports.generateTransact = exports.generateDummyProofTransactions = exports.createDummyRelayerFeeERC20Amount = exports.nullifiersForTransactions = exports.generateProofTransactions = exports.DUMMY_FROM_ADDRESS = void 0;
 const dop_engine_v5_1 = require("dop-engine-v5");
 const dop_sharedmodel_v5_1 = require("dop-sharedmodel-v5");
 const engine_1 = require("../dop/core/engine");
@@ -12,11 +12,9 @@ const blocked_address_1 = require("../../utils/blocked-address");
 const gas_price_1 = require("../../utils/gas-price");
 const DUMMY_AMOUNT = 0n;
 exports.DUMMY_FROM_ADDRESS = '0x000000000000000000000000000000000000dEaD';
-const generateProofTransactions = async (proofType, networkName, dopWalletID, encryptionKey, showSenderAddressToRecipient, memoText, erc20AmountRecipients, nftAmountRecipients, relayerFeeERC20AmountRecipient, sendWithPublicWallet, relayAdaptID, useDummyProof, overallBatchMinGasPrice, progressCallback, valueCheck) => {
+const generateProofTransactions = async (proofType, networkName, dopWalletID, encryptionKey, showSenderAddressToRecipient, memoText, erc20AmountRecipients, nftAmountRecipients, relayerFeeERC20AmountRecipient, sendWithPublicWallet, relayAdaptID, useDummyProof, overallBatchMinGasPrice, progressCallback) => {
     const dopWallet = (0, engine_1.fullWalletForID)(dopWalletID);
-    console.log("txs transactionsFromERC20Amounts111", proofType, erc20AmountRecipients, nftAmountRecipients, dopWallet, encryptionKey, showSenderAddressToRecipient, memoText, networkName, relayerFeeERC20AmountRecipient, sendWithPublicWallet, relayAdaptID, useDummyProof, overallBatchMinGasPrice, progressCallback, valueCheck);
-    const txs = await transactionsFromERC20Amounts(proofType, erc20AmountRecipients, nftAmountRecipients, dopWallet, encryptionKey, showSenderAddressToRecipient, memoText, networkName, relayerFeeERC20AmountRecipient, sendWithPublicWallet, relayAdaptID, useDummyProof, overallBatchMinGasPrice, progressCallback, valueCheck);
-    console.log("txs transactionsFromERC20Amounts", txs);
+    const txs = await transactionsFromERC20Amounts(proofType, erc20AmountRecipients, nftAmountRecipients, dopWallet, encryptionKey, showSenderAddressToRecipient, memoText, networkName, relayerFeeERC20AmountRecipient, sendWithPublicWallet, relayAdaptID, useDummyProof, overallBatchMinGasPrice, progressCallback);
     return txs;
 };
 exports.generateProofTransactions = generateProofTransactions;
@@ -24,9 +22,6 @@ const nullifiersForTransactions = (transactions) => {
     return transactions
         .map(transaction => transaction.nullifiers)
         .flat();
-    // return transactions
-    //   .map(transaction => transaction.commitments)
-    //   .flat() as string[];
 };
 exports.nullifiersForTransactions = nullifiersForTransactions;
 const createDummyRelayerFeeERC20Amount = (feeTokenAddress) => {
@@ -37,7 +32,7 @@ const createDummyRelayerFeeERC20Amount = (feeTokenAddress) => {
     return relayerFeeERC20Amount;
 };
 exports.createDummyRelayerFeeERC20Amount = createDummyRelayerFeeERC20Amount;
-const generateDummyProofTransactions = async (proofType, networkName, dopWalletID, encryptionKey, showSenderAddressToRecipient, memoText, erc20AmountRecipients, nftAmountRecipients, relayerFeeERC20Amount, sendWithPublicWallet, overallBatchMinGasPrice, valueCheck) => {
+const generateDummyProofTransactions = async (proofType, networkName, dopWalletID, encryptionKey, showSenderAddressToRecipient, memoText, erc20AmountRecipients, nftAmountRecipients, relayerFeeERC20Amount, sendWithPublicWallet, overallBatchMinGasPrice) => {
     if (!relayerFeeERC20Amount && !sendWithPublicWallet) {
         throw new Error('Must send with relayer or public wallet.');
     }
@@ -52,8 +47,7 @@ const generateDummyProofTransactions = async (proofType, networkName, dopWalletI
         : undefined;
     return (0, exports.generateProofTransactions)(proofType, networkName, dopWalletID, encryptionKey, showSenderAddressToRecipient, memoText, erc20AmountRecipients, nftAmountRecipients, relayerFeeERC20AmountRecipient, sendWithPublicWallet, undefined, // relayAdaptID
     true, // useDummyProof
-    overallBatchMinGasPrice, () => { }, // progressCallback (not necessary for dummy txs)
-    valueCheck);
+    overallBatchMinGasPrice, () => { });
 };
 exports.generateDummyProofTransactions = generateDummyProofTransactions;
 const generateTransact = async (txs, networkName, useDummyProof = false) => {
@@ -68,46 +62,32 @@ const generateTransact = async (txs, networkName, useDummyProof = false) => {
     return transaction;
 };
 exports.generateTransact = generateTransact;
-/*export const generateUnshieldBaseToken = async (
-  txs: TransactionStruct[],
-  networkName: NetworkName,
-  toWalletAddress: string,
-  relayAdaptParamsRandom: string,
-  useDummyProof = false,
-): Promise<ContractTransaction> => {
-  assertValidEthAddress(toWalletAddress);
-  assertNotBlockedAddress(toWalletAddress);
-
-  const relayAdaptContract = getRelayAdaptContractForNetwork(networkName);
-
-  const transaction = await relayAdaptContract.populateUnshieldBaseToken(
-    txs,
-    toWalletAddress,
-    relayAdaptParamsRandom,
-  );
-  if (useDummyProof) {
-    return {
-      ...transaction,
-      from: DUMMY_FROM_ADDRESS,
-    };
-  }
-  return transaction;
-};*/
-const transactionsFromERC20Amounts = async (proofType, erc20AmountRecipients, nftAmountRecipients, dopWallet, encryptionKey, showSenderAddressToRecipient, memoText, networkName, relayerFeeERC20AmountRecipient, sendWithPublicWallet, relayAdaptID, useDummyProof, overallBatchMinGasPrice, progressCallback, valueCheck) => {
+const generateUnshieldBaseToken = async (txs, networkName, toWalletAddress, relayAdaptParamsRandom, useDummyProof = false) => {
+    (0, dop_1.assertValidEthAddress)(toWalletAddress);
+    (0, blocked_address_1.assertNotBlockedAddress)(toWalletAddress);
+    const relayAdaptContract = (0, providers_1.getRelayAdaptContractForNetwork)(networkName);
+    const transaction = await relayAdaptContract.populateUnshieldBaseToken(txs, toWalletAddress, relayAdaptParamsRandom);
+    if (useDummyProof) {
+        return {
+            ...transaction,
+            from: exports.DUMMY_FROM_ADDRESS,
+        };
+    }
+    return transaction;
+};
+exports.generateUnshieldBaseToken = generateUnshieldBaseToken;
+const transactionsFromERC20Amounts = async (proofType, erc20AmountRecipients, nftAmountRecipients, dopWallet, encryptionKey, showSenderAddressToRecipient, memoText, networkName, relayerFeeERC20AmountRecipient, sendWithPublicWallet, relayAdaptID, useDummyProof, overallBatchMinGasPrice, progressCallback) => {
     const network = dop_sharedmodel_v5_1.NETWORK_CONFIG[networkName];
     const { chain } = network;
-    console.log("generateProofTransactions chain000", chain);
     // Removes overallBatchMinGasPrice for L2 networks.
     const validatedOverallBatchMinGasPrice = (0, gas_price_1.shouldSetOverallBatchMinGasPriceForNetwork)(networkName)
         ? BigInt(overallBatchMinGasPrice ?? 0)
         : BigInt(0);
-    console.log("generateProofTransactions transactionBatch000", validatedOverallBatchMinGasPrice);
     const transactionBatch = new dop_engine_v5_1.TransactionBatch(chain, validatedOverallBatchMinGasPrice);
     // const transactionBatchNew = new TransactionBatch(
     //   chain,
     //   validatedOverallBatchMinGasPrice,
     // );
-    console.log("generateProofTransactions transactionBatch000", transactionBatch);
     if (relayAdaptID) {
         transactionBatch.setAdaptID(relayAdaptID);
     }
@@ -117,16 +97,13 @@ const transactionsFromERC20Amounts = async (proofType, erc20AmountRecipients, nf
         transactionBatch.addOutput((0, tx_notes_1.erc20NoteFromERC20AmountRecipient)(relayerFeeERC20AmountRecipient, dopWallet, dop_engine_v5_1.OutputType.RelayerFee, false, // showSenderAddressToRecipient - never show sender for Relayer fees
         undefined));
     }
-    console.log("generateProofTransactions erc20AmountRecipient11", erc20AmountRecipients);
     erc20AmountRecipients.forEach((erc20AmountRecipient) => {
         addTransactionOutputsERC20(proofType, transactionBatch, erc20AmountRecipient, dopWallet, showSenderAddressToRecipient, memoText);
     });
     nftAmountRecipients.forEach((nftAmountRecipient) => {
         addTransactionOutputsNFT(proofType, transactionBatch, nftAmountRecipient, dopWallet, showSenderAddressToRecipient, memoText);
     });
-    console.log("generateProofTransactions generateAllProofs bef", transactionBatch);
-    const txBatches = await generateAllProofs(transactionBatch, dopWallet, encryptionKey, useDummyProof, progressCallback, valueCheck);
-    console.log("txBatches generateAllProofs", txBatches);
+    const txBatches = await generateAllProofs(transactionBatch, dopWallet, encryptionKey, useDummyProof, progressCallback);
     return txBatches;
 };
 const addTransactionOutputsERC20 = (proofType, transactionBatch, erc20AmountRecipient, dopWallet, showSenderAddressToRecipient, memoText) => {
@@ -190,16 +167,10 @@ const addTransactionOutputsUnshieldNFT = (transactionBatch, nftAmountRecipient,
         allowOverride,
     });
 };
-const generateAllProofs = (transactionBatch, dopWallet, encryptionKey, useDummyProof, progressCallback, valueCheck) => {
+const generateAllProofs = (transactionBatch, dopWallet, encryptionKey, useDummyProof, progressCallback) => {
     const prover = (0, prover_1.getProver)();
-    // return useDummyProof
-    // ? transactionBatch.generateDummyTransactions(
-    //     prover,
-    //     dopWallet,
-    //     encryptionKey,
-    //   )
-    // : 
-    console.log("generateProofTransactions generateAllProofs in 0", transactionBatch);
-    return transactionBatch.generateTransactions(prover, dopWallet, encryptionKey, progressCallback, valueCheck);
+    return useDummyProof
+        ? transactionBatch.generateDummyTransactions(prover, dopWallet, encryptionKey)
+        : transactionBatch.generateTransactions(prover, dopWallet, encryptionKey, progressCallback);
 };
 //# sourceMappingURL=tx-generator.js.map

package/dist/services/transactions/tx-generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"tx-generator.js","sourceRoot":"","sources":["../../../src/services/transactions/tx-generator.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  DopWallet,\n  TransactionBatch,\n  AdaptID,\n  OutputType,\n  TransactionStruct,\n  ProverProgressCallback,\n  getTokenDataERC20,\n  getTokenDataNFT,\n  ERC721_NOTE_VALUE,\n  NFTTokenData,\n} from 'dop-engine-v5';\nimport {\n  DopERC20Amount,\n  DopERC20AmountRecipient,\n  NetworkName,\n  NETWORK_CONFIG,\n  ProofType,\n  DopNFTAmountRecipient,\n  NFTTokenType,\n} from 'dop-sharedmodel-v5';\nimport { fullWalletForID, walletForID } from '../dop/core/engine';\nimport {\n  getDopSmartWalletContractForNetwork,\n  getRelayAdaptContractForNetwork,\n} from '../dop/core/providers';\nimport {\n  erc20NoteFromERC20AmountRecipient,\n  nftNoteFromNFTAmountRecipient,\n} from './tx-notes';\nimport { getProver } from '../dop/core/prover';\nimport { assertValidEthAddress, assertValidDopAddress } from '../dop';\nimport { assertNotBlockedAddress } from '../../utils/blocked-address';\nimport { shouldSetOverallBatchMinGasPriceForNetwork } from '../../utils/gas-price';\nimport { ContractTransaction } from 'ethers';\n\nconst DUMMY_AMOUNT = 0n;\nexport const DUMMY_FROM_ADDRESS = '0x000000000000000000000000000000000000dEaD';\n\nexport const generateProofTransactions = async (\n  proofType: ProofType,\n  networkName: NetworkName,\n  dopWalletID: string,\n  encryptionKey: string,\n  showSenderAddressToRecipient: boolean,\n  memoText: Optional<string>,\n  erc20AmountRecipients: DopERC20AmountRecipient[],\n  nftAmountRecipients: DopNFTAmountRecipient[],\n  relayerFeeERC20AmountRecipient: Optional<DopERC20AmountRecipient>,\n  sendWithPublicWallet: boolean,\n  relayAdaptID: Optional<AdaptID>,\n  useDummyProof: boolean,\n  overallBatchMinGasPrice: Optional<bigint>,\n  progressCallback: ProverProgressCallback,\n  valueCheck: bigint,\n): Promise<TransactionStruct[]> => {\n  const dopWallet = fullWalletForID(dopWalletID);\n\n  console.log(\"txs transactionsFromERC20Amounts111\", proofType,\n    erc20AmountRecipients,\n    nftAmountRecipients,\n    dopWallet,\n    encryptionKey,\n    showSenderAddressToRecipient,\n    memoText,\n    networkName,\n    relayerFeeERC20AmountRecipient,\n    sendWithPublicWallet,\n    relayAdaptID,\n    useDummyProof,\n    overallBatchMinGasPrice,\n    progressCallback,\n    valueCheck\n  );\n\n  const txs: TransactionStruct[] = await transactionsFromERC20Amounts(\n    proofType,\n    erc20AmountRecipients,\n    nftAmountRecipients,\n    dopWallet,\n    encryptionKey,\n    showSenderAddressToRecipient,\n    memoText,\n    networkName,\n    relayerFeeERC20AmountRecipient,\n    sendWithPublicWallet,\n    relayAdaptID,\n    useDummyProof,\n    overallBatchMinGasPrice,\n    progressCallback,\n    valueCheck,\n  );\n  console.log(\"txs transactionsFromERC20Amounts\", txs);\n  return txs;\n};\n\nexport const nullifiersForTransactions = (\n  transactions: TransactionStruct[],\n): string[] => {\n  return transactions\n    .map(transaction => transaction.nullifiers)\n    .flat() as string[];\n  // return transactions\n  //   .map(transaction => transaction.commitments)\n  //   .flat() as string[];\n};\n\nexport const createDummyRelayerFeeERC20Amount = (feeTokenAddress: string) => {\n  const relayerFeeERC20Amount: DopERC20Amount = {\n    tokenAddress: feeTokenAddress,\n    amount: DUMMY_AMOUNT,\n  };\n  return relayerFeeERC20Amount;\n};\n\nexport const generateDummyProofTransactions = async (\n  proofType: ProofType,\n  networkName: NetworkName,\n  dopWalletID: string,\n  encryptionKey: string,\n  showSenderAddressToRecipient: boolean,\n  memoText: Optional<string>,\n  erc20AmountRecipients: DopERC20AmountRecipient[],\n  nftAmountRecipients: DopNFTAmountRecipient[],\n  relayerFeeERC20Amount: Optional<DopERC20Amount>,\n  sendWithPublicWallet: boolean,\n  overallBatchMinGasPrice: Optional<bigint>,\n  valueCheck: bigint,\n): Promise<TransactionStruct[]> => {\n  if (!relayerFeeERC20Amount && !sendWithPublicWallet) {\n    throw new Error('Must send with relayer or public wallet.');\n  }\n\n  const dopWallet = walletForID(dopWalletID);\n\n  // Use self-wallet as dummy relayer address.\n  const relayerDopAddress = dopWallet.getAddress(undefined);\n\n  const relayerFeeERC20AmountRecipient: Optional<DopERC20AmountRecipient> =\n    relayerFeeERC20Amount\n      ? {\n          ...relayerFeeERC20Amount,\n          recipientAddress: relayerDopAddress,\n        }\n      : undefined;\n\n  return generateProofTransactions(\n    proofType,\n    networkName,\n    dopWalletID,\n    encryptionKey,\n    showSenderAddressToRecipient,\n    memoText,\n    erc20AmountRecipients,\n    nftAmountRecipients,\n    relayerFeeERC20AmountRecipient,\n    sendWithPublicWallet,\n    undefined, // relayAdaptID\n    true, // useDummyProof\n    overallBatchMinGasPrice,\n    () => {}, // progressCallback (not necessary for dummy txs)\n    valueCheck,\n  );\n};\n\nexport const generateTransact = async (\n  txs: TransactionStruct[],\n  networkName: NetworkName,\n  useDummyProof = false,\n): Promise<ContractTransaction> => {\n  const dopSmartWalletContract =\n    getDopSmartWalletContractForNetwork(networkName);\n\n  const transaction = await dopSmartWalletContract.transact(txs);\n  if (useDummyProof) {\n    return {\n      ...transaction,\n      from: DUMMY_FROM_ADDRESS,\n    };\n  }\n  return transaction;\n};\n\n/*export const generateUnshieldBaseToken = async (\n  txs: TransactionStruct[],\n  networkName: NetworkName,\n  toWalletAddress: string,\n  relayAdaptParamsRandom: string,\n  useDummyProof = false,\n): Promise<ContractTransaction> => {\n  assertValidEthAddress(toWalletAddress);\n  assertNotBlockedAddress(toWalletAddress);\n\n  const relayAdaptContract = getRelayAdaptContractForNetwork(networkName);\n\n  const transaction = await relayAdaptContract.populateUnshieldBaseToken(\n    txs,\n    toWalletAddress,\n    relayAdaptParamsRandom,\n  );\n  if (useDummyProof) {\n    return {\n      ...transaction,\n      from: DUMMY_FROM_ADDRESS,\n    };\n  }\n  return transaction;\n};*/\n\nconst transactionsFromERC20Amounts = async (\n  proofType: ProofType,\n  erc20AmountRecipients: DopERC20AmountRecipient[],\n  nftAmountRecipients: DopNFTAmountRecipient[],\n  dopWallet: DopWallet,\n  encryptionKey: string,\n  showSenderAddressToRecipient: boolean,\n  memoText: Optional<string>,\n  networkName: NetworkName,\n  relayerFeeERC20AmountRecipient: Optional<DopERC20AmountRecipient>,\n  sendWithPublicWallet: boolean,\n  relayAdaptID: Optional<AdaptID>,\n  useDummyProof: boolean,\n  overallBatchMinGasPrice: Optional<bigint>,\n  progressCallback: ProverProgressCallback,\n  valueCheck: bigint,\n): Promise<TransactionStruct[]> => {\n  const network = NETWORK_CONFIG[networkName];\n  const { chain } = network;\n  console.log(\"generateProofTransactions chain000\", chain);\n\n  // Removes overallBatchMinGasPrice for L2 networks.\n  const validatedOverallBatchMinGasPrice =\n    shouldSetOverallBatchMinGasPriceForNetwork(networkName)\n      ? BigInt(overallBatchMinGasPrice ?? 0)\n      : BigInt(0);\n\n    console.log(\"generateProofTransactions transactionBatch000\", validatedOverallBatchMinGasPrice);\n\n  const transactionBatch = new TransactionBatch(\n    chain,\n    validatedOverallBatchMinGasPrice,\n  );\n  // const transactionBatchNew = new TransactionBatch(\n  //   chain,\n  //   validatedOverallBatchMinGasPrice,\n  // );\n  console.log(\"generateProofTransactions transactionBatch000\", transactionBatch);\n\n  if (relayAdaptID) {\n    transactionBatch.setAdaptID(relayAdaptID);\n  }\n\n  if (relayerFeeERC20AmountRecipient && !sendWithPublicWallet) {\n    assertValidDopAddress(relayerFeeERC20AmountRecipient.recipientAddress);\n\n    // Add Relayer Fee - must be first transaction in the batch, and first output for the transaction.\n    transactionBatch.addOutput(\n      erc20NoteFromERC20AmountRecipient(\n        relayerFeeERC20AmountRecipient,\n        dopWallet,\n        OutputType.RelayerFee,\n        false, // showSenderAddressToRecipient - never show sender for Relayer fees\n        undefined, // memoText\n      ),\n    );\n  }\n  console.log(\"generateProofTransactions erc20AmountRecipient11\", erc20AmountRecipients);\n\n  erc20AmountRecipients.forEach(\n    (erc20AmountRecipient: DopERC20AmountRecipient) => {\n      addTransactionOutputsERC20(\n        proofType,\n        transactionBatch,\n        erc20AmountRecipient,\n        dopWallet,\n        showSenderAddressToRecipient,\n        memoText,\n      );\n    },\n  );\n\n  nftAmountRecipients.forEach((nftAmountRecipient: DopNFTAmountRecipient) => {\n    addTransactionOutputsNFT(\n      proofType,\n      transactionBatch,\n      nftAmountRecipient,\n      dopWallet,\n      showSenderAddressToRecipient,\n      memoText,\n    );\n  });\n  console.log(\"generateProofTransactions generateAllProofs bef\", transactionBatch);\n  \n  const txBatches = await generateAllProofs(\n    transactionBatch,\n    dopWallet,\n    encryptionKey,\n    useDummyProof,\n    progressCallback,\n    valueCheck,\n  );\n\n  console.log(\"txBatches generateAllProofs\", txBatches)\n  return txBatches;\n};\n\nconst addTransactionOutputsERC20 = (\n  proofType: ProofType,\n  transactionBatch: TransactionBatch,\n  erc20AmountRecipient: DopERC20AmountRecipient,\n  dopWallet: DopWallet,\n  showSenderAddressToRecipient: boolean,\n  memoText: Optional<string>,\n) => {\n  switch (proofType) {\n    case ProofType.Transfer: {\n      addTransactionOutputsTransferERC20(\n        transactionBatch,\n        erc20AmountRecipient,\n        dopWallet,\n        showSenderAddressToRecipient,\n        memoText,\n      );\n      break;\n    }\n    case ProofType.CrossContractCalls:\n    case ProofType.UnshieldBaseToken:\n    case ProofType.Unshield: {\n      addTransactionOutputsUnshieldERC20(\n        transactionBatch,\n        erc20AmountRecipient,\n        false, // allowOverride\n      );\n      break;\n    }\n  }\n};\n\nconst addTransactionOutputsNFT = (\n  proofType: ProofType,\n  transactionBatch: TransactionBatch,\n  nftAmountRecipient: DopNFTAmountRecipient,\n  dopWallet: DopWallet,\n  showSenderAddressToRecipient: boolean,\n  memoText: Optional<string>,\n) => {\n  switch (proofType) {\n    case ProofType.Transfer: {\n      addTransactionOutputsTransferNFT(\n        transactionBatch,\n        nftAmountRecipient,\n        dopWallet,\n        showSenderAddressToRecipient,\n        memoText,\n      );\n      break;\n    }\n    case ProofType.CrossContractCalls:\n    case ProofType.UnshieldBaseToken:\n    case ProofType.Unshield: {\n      addTransactionOutputsUnshieldNFT(\n        transactionBatch,\n        nftAmountRecipient,\n        false, // allowOverride\n      );\n      break;\n    }\n  }\n};\n\nconst addTransactionOutputsTransferERC20 = (\n  transactionBatch: TransactionBatch,\n  erc20AmountRecipient: DopERC20AmountRecipient,\n  dopWallet: DopWallet,\n  showSenderAddressToRecipient: boolean,\n  memoText: Optional<string>,\n) => {\n  assertValidDopAddress(erc20AmountRecipient.recipientAddress);\n\n  transactionBatch.addOutput(\n    erc20NoteFromERC20AmountRecipient(\n      erc20AmountRecipient,\n      dopWallet,\n      OutputType.Transfer,\n      showSenderAddressToRecipient,\n      memoText,\n    ),\n  );\n};\n\nconst addTransactionOutputsUnshieldERC20 = (\n  transactionBatch: TransactionBatch,\n  erc20AmountRecipient: DopERC20AmountRecipient,\n  allowOverride?: boolean,\n) => {\n  const { recipientAddress, amount } = erc20AmountRecipient;\n\n  assertValidEthAddress(recipientAddress);\n  assertNotBlockedAddress(recipientAddress);\n\n  const tokenData = getTokenDataERC20(erc20AmountRecipient.tokenAddress);\n\n  transactionBatch.addUnshieldData({\n    toAddress: recipientAddress,\n    value: amount,\n    tokenData,\n    allowOverride,\n  });\n};\n\nconst addTransactionOutputsTransferNFT = (\n  transactionBatch: TransactionBatch,\n  nftAmountRecipient: DopNFTAmountRecipient,\n  dopWallet: DopWallet,\n  showSenderAddressToRecipient: boolean,\n  memoText: Optional<string>,\n) => {\n  assertValidDopAddress(nftAmountRecipient.recipientAddress);\n\n  transactionBatch.addOutput(\n    nftNoteFromNFTAmountRecipient(\n      nftAmountRecipient,\n      dopWallet,\n      showSenderAddressToRecipient,\n      memoText,\n    ),\n  );\n};\n\nconst addTransactionOutputsUnshieldNFT = (\n  transactionBatch: TransactionBatch,\n  nftAmountRecipient: DopNFTAmountRecipient,\n  allowOverride?: boolean,\n) => {\n  const { recipientAddress, nftAddress, tokenSubID, nftTokenType, amount } =\n    nftAmountRecipient;\n\n  assertValidEthAddress(recipientAddress);\n  assertNotBlockedAddress(recipientAddress);\n\n  const tokenData: NFTTokenData = getTokenDataNFT(\n    nftAddress,\n    nftTokenType as 1 | 2,\n    tokenSubID,\n  );\n\n  const value: bigint =\n    nftTokenType === NFTTokenType.ERC721 ? ERC721_NOTE_VALUE : amount;\n\n  transactionBatch.addUnshieldData({\n    toAddress: recipientAddress,\n    value,\n    tokenData,\n    allowOverride,\n  });\n};\n\nconst generateAllProofs = (\n  transactionBatch: TransactionBatch,\n  dopWallet: DopWallet,\n  encryptionKey: string,\n  useDummyProof: boolean,\n  progressCallback: ProverProgressCallback,\n  valueCheck: bigint,\n): Promise<TransactionStruct[]> => {\n  const prover = getProver();\n  // return useDummyProof\n    // ? transactionBatch.generateDummyTransactions(\n    //     prover,\n    //     dopWallet,\n    //     encryptionKey,\n    //   )\n    // : \n  console.log(\"generateProofTransactions generateAllProofs in 0\", transactionBatch);\n\n    return transactionBatch.generateTransactions(\n        prover,\n        dopWallet,\n        encryptionKey,\n        progressCallback,\n        valueCheck\n      );\n};\n"]}
+{"version":3,"file":"tx-generator.js","sourceRoot":"","sources":["../../../src/services/transactions/tx-generator.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  DopWallet,\n  TransactionBatch,\n  AdaptID,\n  OutputType,\n  TransactionStruct,\n  ProverProgressCallback,\n  getTokenDataERC20,\n  getTokenDataNFT,\n  ERC721_NOTE_VALUE,\n  NFTTokenData,\n} from 'dop-engine-v5';\nimport {\n  DopERC20Amount,\n  DopERC20AmountRecipient,\n  NetworkName,\n  NETWORK_CONFIG,\n  ProofType,\n  DopNFTAmountRecipient,\n  NFTTokenType,\n} from 'dop-sharedmodel-v5';\nimport { fullWalletForID, walletForID } from '../dop/core/engine';\nimport {\n  getDopSmartWalletContractForNetwork,\n  getRelayAdaptContractForNetwork,\n} from '../dop/core/providers';\nimport {\n  erc20NoteFromERC20AmountRecipient,\n  nftNoteFromNFTAmountRecipient,\n} from './tx-notes';\nimport { getProver } from '../dop/core/prover';\nimport { assertValidEthAddress, assertValidDopAddress } from '../dop';\nimport { assertNotBlockedAddress } from '../../utils/blocked-address';\nimport { shouldSetOverallBatchMinGasPriceForNetwork } from '../../utils/gas-price';\nimport { ContractTransaction } from 'ethers';\n\nconst DUMMY_AMOUNT = 0n;\nexport const DUMMY_FROM_ADDRESS = '0x000000000000000000000000000000000000dEaD';\n\nexport const generateProofTransactions = async (\n  proofType: ProofType,\n  networkName: NetworkName,\n  dopWalletID: string,\n  encryptionKey: string,\n  showSenderAddressToRecipient: boolean,\n  memoText: Optional<string>,\n  erc20AmountRecipients: DopERC20AmountRecipient[],\n  nftAmountRecipients: DopNFTAmountRecipient[],\n  relayerFeeERC20AmountRecipient: Optional<DopERC20AmountRecipient>,\n  sendWithPublicWallet: boolean,\n  relayAdaptID: Optional<AdaptID>,\n  useDummyProof: boolean,\n  overallBatchMinGasPrice: Optional<bigint>,\n  progressCallback: ProverProgressCallback,\n): Promise<TransactionStruct[]> => {\n  const dopWallet = fullWalletForID(dopWalletID);\n\n  const txs: TransactionStruct[] = await transactionsFromERC20Amounts(\n    proofType,\n    erc20AmountRecipients,\n    nftAmountRecipients,\n    dopWallet,\n    encryptionKey,\n    showSenderAddressToRecipient,\n    memoText,\n    networkName,\n    relayerFeeERC20AmountRecipient,\n    sendWithPublicWallet,\n    relayAdaptID,\n    useDummyProof,\n    overallBatchMinGasPrice,\n    progressCallback,\n  );\n  return txs;\n};\n\nexport const nullifiersForTransactions = (\n  transactions: TransactionStruct[],\n): string[] => {\n  return transactions\n    .map(transaction => transaction.nullifiers)\n    .flat() as string[];\n};\n\nexport const createDummyRelayerFeeERC20Amount = (feeTokenAddress: string) => {\n  const relayerFeeERC20Amount: DopERC20Amount = {\n    tokenAddress: feeTokenAddress,\n    amount: DUMMY_AMOUNT,\n  };\n  return relayerFeeERC20Amount;\n};\n\nexport const generateDummyProofTransactions = async (\n  proofType: ProofType,\n  networkName: NetworkName,\n  dopWalletID: string,\n  encryptionKey: string,\n  showSenderAddressToRecipient: boolean,\n  memoText: Optional<string>,\n  erc20AmountRecipients: DopERC20AmountRecipient[],\n  nftAmountRecipients: DopNFTAmountRecipient[],\n  relayerFeeERC20Amount: Optional<DopERC20Amount>,\n  sendWithPublicWallet: boolean,\n  overallBatchMinGasPrice: Optional<bigint>,\n): Promise<TransactionStruct[]> => {\n  if (!relayerFeeERC20Amount && !sendWithPublicWallet) {\n    throw new Error('Must send with relayer or public wallet.');\n  }\n\n  const dopWallet = walletForID(dopWalletID);\n\n  // Use self-wallet as dummy relayer address.\n  const relayerDopAddress = dopWallet.getAddress(undefined);\n\n  const relayerFeeERC20AmountRecipient: Optional<DopERC20AmountRecipient> =\n    relayerFeeERC20Amount\n      ? {\n          ...relayerFeeERC20Amount,\n          recipientAddress: relayerDopAddress,\n        }\n      : undefined;\n\n  return generateProofTransactions(\n    proofType,\n    networkName,\n    dopWalletID,\n    encryptionKey,\n    showSenderAddressToRecipient,\n    memoText,\n    erc20AmountRecipients,\n    nftAmountRecipients,\n    relayerFeeERC20AmountRecipient,\n    sendWithPublicWallet,\n    undefined, // relayAdaptID\n    true, // useDummyProof\n    overallBatchMinGasPrice,\n    () => {}, // progressCallback (not necessary for dummy txs)\n  );\n};\n\nexport const generateTransact = async (\n  txs: TransactionStruct[],\n  networkName: NetworkName,\n  useDummyProof = false,\n): Promise<ContractTransaction> => {\n  const dopSmartWalletContract =\n    getDopSmartWalletContractForNetwork(networkName);\n\n  const transaction = await dopSmartWalletContract.transact(txs);\n  if (useDummyProof) {\n    return {\n      ...transaction,\n      from: DUMMY_FROM_ADDRESS,\n    };\n  }\n  return transaction;\n};\n\nexport const generateUnshieldBaseToken = async (\n  txs: TransactionStruct[],\n  networkName: NetworkName,\n  toWalletAddress: string,\n  relayAdaptParamsRandom: string,\n  useDummyProof = false,\n): Promise<ContractTransaction> => {\n  assertValidEthAddress(toWalletAddress);\n  assertNotBlockedAddress(toWalletAddress);\n\n  const relayAdaptContract = getRelayAdaptContractForNetwork(networkName);\n\n  const transaction = await relayAdaptContract.populateUnshieldBaseToken(\n    txs,\n    toWalletAddress,\n    relayAdaptParamsRandom,\n  );\n  if (useDummyProof) {\n    return {\n      ...transaction,\n      from: DUMMY_FROM_ADDRESS,\n    };\n  }\n  return transaction;\n};\n\nconst transactionsFromERC20Amounts = async (\n  proofType: ProofType,\n  erc20AmountRecipients: DopERC20AmountRecipient[],\n  nftAmountRecipients: DopNFTAmountRecipient[],\n  dopWallet: DopWallet,\n  encryptionKey: string,\n  showSenderAddressToRecipient: boolean,\n  memoText: Optional<string>,\n  networkName: NetworkName,\n  relayerFeeERC20AmountRecipient: Optional<DopERC20AmountRecipient>,\n  sendWithPublicWallet: boolean,\n  relayAdaptID: Optional<AdaptID>,\n  useDummyProof: boolean,\n  overallBatchMinGasPrice: Optional<bigint>,\n  progressCallback: ProverProgressCallback,\n): Promise<TransactionStruct[]> => {\n  const network = NETWORK_CONFIG[networkName];\n  const { chain } = network;\n\n  // Removes overallBatchMinGasPrice for L2 networks.\n  const validatedOverallBatchMinGasPrice =\n    shouldSetOverallBatchMinGasPriceForNetwork(networkName)\n      ? BigInt(overallBatchMinGasPrice ?? 0)\n      : BigInt(0);\n\n  const transactionBatch = new TransactionBatch(\n    chain,\n    validatedOverallBatchMinGasPrice,\n  );\n  // const transactionBatchNew = new TransactionBatch(\n  //   chain,\n  //   validatedOverallBatchMinGasPrice,\n  // );\n  if (relayAdaptID) {\n    transactionBatch.setAdaptID(relayAdaptID);\n  }\n\n  if (relayerFeeERC20AmountRecipient && !sendWithPublicWallet) {\n    assertValidDopAddress(relayerFeeERC20AmountRecipient.recipientAddress);\n\n    // Add Relayer Fee - must be first transaction in the batch, and first output for the transaction.\n    transactionBatch.addOutput(\n      erc20NoteFromERC20AmountRecipient(\n        relayerFeeERC20AmountRecipient,\n        dopWallet,\n        OutputType.RelayerFee,\n        false, // showSenderAddressToRecipient - never show sender for Relayer fees\n        undefined, // memoText\n      ),\n    );\n  }\n\n  erc20AmountRecipients.forEach(\n    (erc20AmountRecipient: DopERC20AmountRecipient) => {\n      addTransactionOutputsERC20(\n        proofType,\n        transactionBatch,\n        erc20AmountRecipient,\n        dopWallet,\n        showSenderAddressToRecipient,\n        memoText,\n      );\n    },\n  );\n\n  nftAmountRecipients.forEach((nftAmountRecipient: DopNFTAmountRecipient) => {\n    addTransactionOutputsNFT(\n      proofType,\n      transactionBatch,\n      nftAmountRecipient,\n      dopWallet,\n      showSenderAddressToRecipient,\n      memoText,\n    );\n  });\n  \n  const txBatches = await generateAllProofs(\n    transactionBatch,\n    dopWallet,\n    encryptionKey,\n    useDummyProof,\n    progressCallback,\n  );\n  return txBatches;\n};\n\nconst addTransactionOutputsERC20 = (\n  proofType: ProofType,\n  transactionBatch: TransactionBatch,\n  erc20AmountRecipient: DopERC20AmountRecipient,\n  dopWallet: DopWallet,\n  showSenderAddressToRecipient: boolean,\n  memoText: Optional<string>,\n) => {\n  switch (proofType) {\n    case ProofType.Transfer: {\n      addTransactionOutputsTransferERC20(\n        transactionBatch,\n        erc20AmountRecipient,\n        dopWallet,\n        showSenderAddressToRecipient,\n        memoText,\n      );\n      break;\n    }\n    case ProofType.CrossContractCalls:\n    case ProofType.UnshieldBaseToken:\n    case ProofType.Unshield: {\n      addTransactionOutputsUnshieldERC20(\n        transactionBatch,\n        erc20AmountRecipient,\n        false, // allowOverride\n      );\n      break;\n    }\n  }\n};\n\nconst addTransactionOutputsNFT = (\n  proofType: ProofType,\n  transactionBatch: TransactionBatch,\n  nftAmountRecipient: DopNFTAmountRecipient,\n  dopWallet: DopWallet,\n  showSenderAddressToRecipient: boolean,\n  memoText: Optional<string>,\n) => {\n  switch (proofType) {\n    case ProofType.Transfer: {\n      addTransactionOutputsTransferNFT(\n        transactionBatch,\n        nftAmountRecipient,\n        dopWallet,\n        showSenderAddressToRecipient,\n        memoText,\n      );\n      break;\n    }\n    case ProofType.CrossContractCalls:\n    case ProofType.UnshieldBaseToken:\n    case ProofType.Unshield: {\n      addTransactionOutputsUnshieldNFT(\n        transactionBatch,\n        nftAmountRecipient,\n        false, // allowOverride\n      );\n      break;\n    }\n  }\n};\n\nconst addTransactionOutputsTransferERC20 = (\n  transactionBatch: TransactionBatch,\n  erc20AmountRecipient: DopERC20AmountRecipient,\n  dopWallet: DopWallet,\n  showSenderAddressToRecipient: boolean,\n  memoText: Optional<string>,\n) => {\n  assertValidDopAddress(erc20AmountRecipient.recipientAddress);\n\n  transactionBatch.addOutput(\n    erc20NoteFromERC20AmountRecipient(\n      erc20AmountRecipient,\n      dopWallet,\n      OutputType.Transfer,\n      showSenderAddressToRecipient,\n      memoText,\n    ),\n  );\n};\n\nconst addTransactionOutputsUnshieldERC20 = (\n  transactionBatch: TransactionBatch,\n  erc20AmountRecipient: DopERC20AmountRecipient,\n  allowOverride?: boolean,\n) => {\n  const { recipientAddress, amount } = erc20AmountRecipient;\n\n  assertValidEthAddress(recipientAddress);\n  assertNotBlockedAddress(recipientAddress);\n\n  const tokenData = getTokenDataERC20(erc20AmountRecipient.tokenAddress);\n\n  transactionBatch.addUnshieldData({\n    toAddress: recipientAddress,\n    value: amount,\n    tokenData,\n    allowOverride,\n  });\n};\n\nconst addTransactionOutputsTransferNFT = (\n  transactionBatch: TransactionBatch,\n  nftAmountRecipient: DopNFTAmountRecipient,\n  dopWallet: DopWallet,\n  showSenderAddressToRecipient: boolean,\n  memoText: Optional<string>,\n) => {\n  assertValidDopAddress(nftAmountRecipient.recipientAddress);\n\n  transactionBatch.addOutput(\n    nftNoteFromNFTAmountRecipient(\n      nftAmountRecipient,\n      dopWallet,\n      showSenderAddressToRecipient,\n      memoText,\n    ),\n  );\n};\n\nconst addTransactionOutputsUnshieldNFT = (\n  transactionBatch: TransactionBatch,\n  nftAmountRecipient: DopNFTAmountRecipient,\n  allowOverride?: boolean,\n) => {\n  const { recipientAddress, nftAddress, tokenSubID, nftTokenType, amount } =\n    nftAmountRecipient;\n\n  assertValidEthAddress(recipientAddress);\n  assertNotBlockedAddress(recipientAddress);\n\n  const tokenData: NFTTokenData = getTokenDataNFT(\n    nftAddress,\n    nftTokenType as 1 | 2,\n    tokenSubID,\n  );\n\n  const value: bigint =\n    nftTokenType === NFTTokenType.ERC721 ? ERC721_NOTE_VALUE : amount;\n\n  transactionBatch.addUnshieldData({\n    toAddress: recipientAddress,\n    value,\n    tokenData,\n    allowOverride,\n  });\n};\n\nconst generateAllProofs = (\n  transactionBatch: TransactionBatch,\n  dopWallet: DopWallet,\n  encryptionKey: string,\n  useDummyProof: boolean,\n  progressCallback: ProverProgressCallback,\n): Promise<TransactionStruct[]> => {\n  const prover = getProver();\n  return useDummyProof\n    ? transactionBatch.generateDummyTransactions(\n        prover,\n        dopWallet,\n        encryptionKey,\n      )\n    : transactionBatch.generateTransactions(\n        prover,\n        dopWallet,\n        encryptionKey,\n        progressCallback,\n      );\n};\n"]}

package/dist/services/transactions/tx-proof-transfer.d.ts

@@ -1,4 +1,3 @@
 import { NetworkName, DopERC20AmountRecipient, DopNFTAmountRecipient } from 'dop-sharedmodel-v5';
-import { TransactionStruct } from 'dop-engine-v5';
 import { ProverProgressCallback } from 'dop-engine-v5';
-export declare const generateTransferProof: (networkName: NetworkName, dopWalletID: string, encryptionKey: string, showSenderAddressToRecipient: boolean, memoText: Optional<string>, erc20AmountRecipients: DopERC20AmountRecipient[], nftAmountRecipients: DopNFTAmountRecipient[], relayerFeeERC20AmountRecipient: Optional<DopERC20AmountRecipient>, sendWithPublicWallet: boolean, overallBatchMinGasPrice: Optional<bigint>, progressCallback: ProverProgressCallback, valueCheck: bigint) => Promise<TransactionStruct[]>;
+export declare const generateTransferProof: (networkName: NetworkName, dopWalletID: string, encryptionKey: string, showSenderAddressToRecipient: boolean, memoText: Optional<string>, erc20AmountRecipients: DopERC20AmountRecipient[], nftAmountRecipients: DopNFTAmountRecipient[], relayerFeeERC20AmountRecipient: Optional<DopERC20AmountRecipient>, sendWithPublicWallet: boolean, overallBatchMinGasPrice: Optional<bigint>, progressCallback: ProverProgressCallback) => Promise<void>;

package/dist/services/transactions/tx-proof-transfer.js

@@ -5,23 +5,29 @@ const dop_sharedmodel_v5_1 = require("dop-sharedmodel-v5");
 const tx_generator_1 = require("./tx-generator");
 const proof_cache_1 = require("./proof-cache");
 const error_1 = require("../../utils/error");
-const generateTransferProof = async (networkName, dopWalletID, encryptionKey, showSenderAddressToRecipient, memoText, erc20AmountRecipients, nftAmountRecipients, relayerFeeERC20AmountRecipient, sendWithPublicWallet, overallBatchMinGasPrice, progressCallback, valueCheck) => {
+const generateTransferProof = async (networkName, dopWalletID, encryptionKey, showSenderAddressToRecipient, memoText, erc20AmountRecipients, nftAmountRecipients, relayerFeeERC20AmountRecipient, sendWithPublicWallet, overallBatchMinGasPrice, progressCallback) => {
     try {
         (0, proof_cache_1.setCachedProvedTransaction)(undefined);
-        console.log("====== 2", dop_sharedmodel_v5_1.ProofType.Unshield, networkName, dopWalletID, encryptionKey, false, // showSenderAddressToRecipient
-        undefined, // memoText
-        erc20AmountRecipients, nftAmountRecipients, relayerFeeERC20AmountRecipient, sendWithPublicWallet, undefined, // relayAdaptID
-        false, // useDummyProof
-        overallBatchMinGasPrice, progressCallback);
+        // console.log("====== 2",
+        //   ProofType.Unshield,
+        //   networkName,
+        //   dopWalletID,
+        //   encryptionKey,
+        //   false, // showSenderAddressToRecipient
+        //   undefined, // memoText
+        //   erc20AmountRecipients,
+        //   nftAmountRecipients,
+        //   relayerFeeERC20AmountRecipient,
+        //   sendWithPublicWallet,
+        //   undefined, // relayAdaptID
+        //   false, // useDummyProof
+        //   overallBatchMinGasPrice,
+        //   progressCallback);
         const transactions = await (0, tx_generator_1.generateProofTransactions)(dop_sharedmodel_v5_1.ProofType.Transfer, networkName, dopWalletID, encryptionKey, showSenderAddressToRecipient, memoText, erc20AmountRecipients, nftAmountRecipients, relayerFeeERC20AmountRecipient, sendWithPublicWallet, undefined, // relayAdaptID
         false, // useDummyProof
-        overallBatchMinGasPrice, progressCallback, valueCheck);
-        console.log("generateProofTransactions generateTransferProof0", transactions);
-        return transactions;
+        overallBatchMinGasPrice, progressCallback);
         const transaction = await (0, tx_generator_1.generateTransact)(transactions, networkName);
-        console.log("generateProofTransactions transaction1", transactions);
         const nullifiers = (0, tx_generator_1.nullifiersForTransactions)(transactions);
-        console.log("generateProofTransactions nullifiers0", nullifiers);
         (0, proof_cache_1.setCachedProvedTransaction)({
             proofType: dop_sharedmodel_v5_1.ProofType.Transfer,
             dopWalletID,

package/dist/services/transactions/tx-proof-transfer.js.map

@@ -1 +1 @@
-{"version":3,"file":"tx-proof-transfer.js","sourceRoot":"","sources":["../../../src/services/transactions/tx-proof-transfer.ts"],"names":[],"mappings":";;;AAAA,2DAK4B;AAI5B,iDAIwB;AACxB,+CAA2D;AAE3D,6CAA2D;AAEpD,MAAM,qBAAqB,GAAG,KAAK,EACxC,WAAwB,EACxB,WAAmB,EACnB,aAAqB,EACrB,4BAAqC,EACrC,QAA0B,EAC1B,qBAAgD,EAChD,mBAA4C,EAC5C,8BAAiE,EACjE,oBAA6B,EAC7B,uBAAyC,EACzC,gBAAwC,EACxC,UAAkB,EACY,EAAE;IAChC,IAAI;QACF,IAAA,wCAA0B,EAAC,SAAS,CAAC,CAAC;QAGtC,OAAO,CAAC,GAAG,CAAC,UAAU,EACpB,8BAAS,CAAC,QAAQ,EAClB,WAAW,EACX,WAAW,EACX,aAAa,EACb,KAAK,EAAE,+BAA+B;QACtC,SAAS,EAAE,WAAW;QACtB,qBAAqB,EACrB,mBAAmB,EACnB,8BAA8B,EAC9B,oBAAoB,EACpB,SAAS,EAAE,eAAe;QAC1B,KAAK,EAAE,gBAAgB;QACvB,uBAAuB,EACvB,gBAAgB,CAAC,CAAC;QAEpB,MAAM,YAAY,GAAG,MAAM,IAAA,wCAAyB,EAClD,8BAAS,CAAC,QAAQ,EAClB,WAAW,EACX,WAAW,EACX,aAAa,EACb,4BAA4B,EAC5B,QAAQ,EACR,qBAAqB,EACrB,mBAAmB,EACnB,8BAA8B,EAC9B,oBAAoB,EACpB,SAAS,EAAE,eAAe;QAC1B,KAAK,EAAE,gBAAgB;QACvB,uBAAuB,EACvB,gBAAgB,EAChB,UAAU,CACX,CAAC;QAEF,OAAO,CAAC,GAAG,CAAC,kDAAkD,EAAE,YAAY,CAAC,CAAC;QAC9E,OAAO,YAAY,CAAC;QAEpB,MAAM,WAAW,GAAG,MAAM,IAAA,+BAAgB,EAAC,YAAY,EAAE,WAAW,CAAC,CAAC;QAEtE,OAAO,CAAC,GAAG,CAAC,wCAAwC,EAAE,YAAY,CAAC,CAAC;QAGpE,MAAM,UAAU,GAAG,IAAA,wCAAyB,EAAC,YAAY,CAAC,CAAC;QAE3D,OAAO,CAAC,GAAG,CAAC,uCAAuC,EAAE,UAAU,CAAC,CAAC;QAGjE,IAAA,wCAA0B,EAAC;YACzB,SAAS,EAAE,8BAAS,CAAC,QAAQ;YAC7B,WAAW;YACX,4BAA4B;YAC5B,QAAQ;YACR,qBAAqB;YACrB,mBAAmB;YACnB,8BAA8B,EAAE,SAAS;YACzC,4BAA4B,EAAE,SAAS;YACvC,+BAA+B,EAAE,SAAS;YAC1C,6BAA6B,EAAE,SAAS;YACxC,kBAAkB,EAAE,SAAS;YAC7B,8BAA8B;YAC9B,oBAAoB;YACpB,WAAW;YACX,uBAAuB;YACvB,UAAU;SACX,CAAC,CAAC;KACJ;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAA,8BAAsB,EAAC,6BAAqB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;KAC/D;AACH,CAAC,CAAC;AAtFW,QAAA,qBAAqB,yBAsFhC","sourcesContent":["import {\n  NetworkName,\n  ProofType,\n  DopERC20AmountRecipient,\n  DopNFTAmountRecipient,\n} from 'dop-sharedmodel-v5';\nimport {\n  TransactionStruct\n} from 'dop-engine-v5';\nimport {\n  generateProofTransactions,\n  generateTransact,\n  nullifiersForTransactions,\n} from './tx-generator';\nimport { setCachedProvedTransaction } from './proof-cache';\nimport { ProverProgressCallback } from 'dop-engine-v5';\nimport { reportAndSanitizeError } from '../../utils/error';\n\nexport const generateTransferProof = async (\n  networkName: NetworkName,\n  dopWalletID: string,\n  encryptionKey: string,\n  showSenderAddressToRecipient: boolean,\n  memoText: Optional<string>,\n  erc20AmountRecipients: DopERC20AmountRecipient[],\n  nftAmountRecipients: DopNFTAmountRecipient[],\n  relayerFeeERC20AmountRecipient: Optional<DopERC20AmountRecipient>,\n  sendWithPublicWallet: boolean,\n  overallBatchMinGasPrice: Optional<bigint>,\n  progressCallback: ProverProgressCallback,\n  valueCheck: bigint,\n): Promise<TransactionStruct[]> => {\n  try {\n    setCachedProvedTransaction(undefined);\n\n\n    console.log(\"====== 2\",\n      ProofType.Unshield,\n      networkName,\n      dopWalletID,\n      encryptionKey,\n      false, // showSenderAddressToRecipient\n      undefined, // memoText\n      erc20AmountRecipients,\n      nftAmountRecipients,\n      relayerFeeERC20AmountRecipient,\n      sendWithPublicWallet,\n      undefined, // relayAdaptID\n      false, // useDummyProof\n      overallBatchMinGasPrice,\n      progressCallback);\n      \n    const transactions = await generateProofTransactions(\n      ProofType.Transfer,\n      networkName,\n      dopWalletID,\n      encryptionKey,\n      showSenderAddressToRecipient,\n      memoText,\n      erc20AmountRecipients,\n      nftAmountRecipients,\n      relayerFeeERC20AmountRecipient,\n      sendWithPublicWallet,\n      undefined, // relayAdaptID\n      false, // useDummyProof\n      overallBatchMinGasPrice,\n      progressCallback,\n      valueCheck,\n    );\n\n    console.log(\"generateProofTransactions generateTransferProof0\", transactions);\n    return transactions;\n\n    const transaction = await generateTransact(transactions, networkName);\n\n    console.log(\"generateProofTransactions transaction1\", transactions);\n\n\n    const nullifiers = nullifiersForTransactions(transactions);\n\n    console.log(\"generateProofTransactions nullifiers0\", nullifiers);\n\n\n    setCachedProvedTransaction({\n      proofType: ProofType.Transfer,\n      dopWalletID,\n      showSenderAddressToRecipient,\n      memoText,\n      erc20AmountRecipients,\n      nftAmountRecipients,\n      relayAdaptUnshieldERC20Amounts: undefined,\n      relayAdaptUnshieldNFTAmounts: undefined,\n      relayAdaptShieldERC20Recipients: undefined,\n      relayAdaptShieldNFTRecipients: undefined,\n      crossContractCalls: undefined,\n      relayerFeeERC20AmountRecipient,\n      sendWithPublicWallet,\n      transaction,\n      overallBatchMinGasPrice,\n      nullifiers,\n    });\n  } catch (err) {\n    throw reportAndSanitizeError(generateTransferProof.name, err);\n  }\n};\n"]}
+{"version":3,"file":"tx-proof-transfer.js","sourceRoot":"","sources":["../../../src/services/transactions/tx-proof-transfer.ts"],"names":[],"mappings":";;;AAAA,2DAK4B;AAC5B,iDAIwB;AACxB,+CAA2D;AAE3D,6CAA2D;AAEpD,MAAM,qBAAqB,GAAG,KAAK,EACxC,WAAwB,EACxB,WAAmB,EACnB,aAAqB,EACrB,4BAAqC,EACrC,QAA0B,EAC1B,qBAAgD,EAChD,mBAA4C,EAC5C,8BAAiE,EACjE,oBAA6B,EAC7B,uBAAyC,EACzC,gBAAwC,EACzB,EAAE;IACjB,IAAI;QACF,IAAA,wCAA0B,EAAC,SAAS,CAAC,CAAC;QAGtC,0BAA0B;QAC1B,wBAAwB;QACxB,iBAAiB;QACjB,iBAAiB;QACjB,mBAAmB;QACnB,2CAA2C;QAC3C,2BAA2B;QAC3B,2BAA2B;QAC3B,yBAAyB;QACzB,oCAAoC;QACpC,0BAA0B;QAC1B,+BAA+B;QAC/B,4BAA4B;QAC5B,6BAA6B;QAC7B,uBAAuB;QACvB,MAAM,YAAY,GAAG,MAAM,IAAA,wCAAyB,EAClD,8BAAS,CAAC,QAAQ,EAClB,WAAW,EACX,WAAW,EACX,aAAa,EACb,4BAA4B,EAC5B,QAAQ,EACR,qBAAqB,EACrB,mBAAmB,EACnB,8BAA8B,EAC9B,oBAAoB,EACpB,SAAS,EAAE,eAAe;QAC1B,KAAK,EAAE,gBAAgB;QACvB,uBAAuB,EACvB,gBAAgB,CACjB,CAAC;QACF,MAAM,WAAW,GAAG,MAAM,IAAA,+BAAgB,EAAC,YAAY,EAAE,WAAW,CAAC,CAAC;QAEtE,MAAM,UAAU,GAAG,IAAA,wCAAyB,EAAC,YAAY,CAAC,CAAC;QAE3D,IAAA,wCAA0B,EAAC;YACzB,SAAS,EAAE,8BAAS,CAAC,QAAQ;YAC7B,WAAW;YACX,4BAA4B;YAC5B,QAAQ;YACR,qBAAqB;YACrB,mBAAmB;YACnB,8BAA8B,EAAE,SAAS;YACzC,4BAA4B,EAAE,SAAS;YACvC,+BAA+B,EAAE,SAAS;YAC1C,6BAA6B,EAAE,SAAS;YACxC,kBAAkB,EAAE,SAAS;YAC7B,8BAA8B;YAC9B,oBAAoB;YACpB,WAAW;YACX,uBAAuB;YACvB,UAAU;SACX,CAAC,CAAC;KACJ;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAA,8BAAsB,EAAC,6BAAqB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;KAC/D;AACH,CAAC,CAAC;AAzEW,QAAA,qBAAqB,yBAyEhC","sourcesContent":["import {\n  NetworkName,\n  ProofType,\n  DopERC20AmountRecipient,\n  DopNFTAmountRecipient,\n} from 'dop-sharedmodel-v5';\nimport {\n  generateProofTransactions,\n  generateTransact,\n  nullifiersForTransactions,\n} from './tx-generator';\nimport { setCachedProvedTransaction } from './proof-cache';\nimport { ProverProgressCallback } from 'dop-engine-v5';\nimport { reportAndSanitizeError } from '../../utils/error';\n\nexport const generateTransferProof = async (\n  networkName: NetworkName,\n  dopWalletID: string,\n  encryptionKey: string,\n  showSenderAddressToRecipient: boolean,\n  memoText: Optional<string>,\n  erc20AmountRecipients: DopERC20AmountRecipient[],\n  nftAmountRecipients: DopNFTAmountRecipient[],\n  relayerFeeERC20AmountRecipient: Optional<DopERC20AmountRecipient>,\n  sendWithPublicWallet: boolean,\n  overallBatchMinGasPrice: Optional<bigint>,\n  progressCallback: ProverProgressCallback,\n): Promise<void> => {\n  try {\n    setCachedProvedTransaction(undefined);\n\n\n    // console.log(\"====== 2\",\n    //   ProofType.Unshield,\n    //   networkName,\n    //   dopWalletID,\n    //   encryptionKey,\n    //   false, // showSenderAddressToRecipient\n    //   undefined, // memoText\n    //   erc20AmountRecipients,\n    //   nftAmountRecipients,\n    //   relayerFeeERC20AmountRecipient,\n    //   sendWithPublicWallet,\n    //   undefined, // relayAdaptID\n    //   false, // useDummyProof\n    //   overallBatchMinGasPrice,\n    //   progressCallback);\n    const transactions = await generateProofTransactions(\n      ProofType.Transfer,\n      networkName,\n      dopWalletID,\n      encryptionKey,\n      showSenderAddressToRecipient,\n      memoText,\n      erc20AmountRecipients,\n      nftAmountRecipients,\n      relayerFeeERC20AmountRecipient,\n      sendWithPublicWallet,\n      undefined, // relayAdaptID\n      false, // useDummyProof\n      overallBatchMinGasPrice,\n      progressCallback,\n    );\n    const transaction = await generateTransact(transactions, networkName);\n\n    const nullifiers = nullifiersForTransactions(transactions);\n\n    setCachedProvedTransaction({\n      proofType: ProofType.Transfer,\n      dopWalletID,\n      showSenderAddressToRecipient,\n      memoText,\n      erc20AmountRecipients,\n      nftAmountRecipients,\n      relayAdaptUnshieldERC20Amounts: undefined,\n      relayAdaptUnshieldNFTAmounts: undefined,\n      relayAdaptShieldERC20Recipients: undefined,\n      relayAdaptShieldNFTRecipients: undefined,\n      crossContractCalls: undefined,\n      relayerFeeERC20AmountRecipient,\n      sendWithPublicWallet,\n      transaction,\n      overallBatchMinGasPrice,\n      nullifiers,\n    });\n  } catch (err) {\n    throw reportAndSanitizeError(generateTransferProof.name, err);\n  }\n};\n"]}

package/dist/services/transactions/tx-proof-unshield.d.ts

@@ -1,3 +1,4 @@
-import { NetworkName, DopERC20AmountRecipient, DopNFTAmountRecipient } from 'dop-sharedmodel-v5';
+import { DopERC20Amount, NetworkName, DopERC20AmountRecipient, DopNFTAmountRecipient } from 'dop-sharedmodel-v5';
 import { ProverProgressCallback } from 'dop-engine-v5';
-export declare const generateUnshieldProof: (networkName: NetworkName, dopWalletID: string, encryptionKey: string, erc20AmountRecipients: DopERC20AmountRecipient[], nftAmountRecipients: DopNFTAmountRecipient[], relayerFeeERC20AmountRecipient: Optional<DopERC20AmountRecipient>, sendWithPublicWallet: boolean, overallBatchMinGasPrice: Optional<bigint>, progressCallback: ProverProgressCallback, valueCheck: bigint) => Promise<void>;
+export declare const generateUnshieldProof: (networkName: NetworkName, dopWalletID: string, encryptionKey: string, erc20AmountRecipients: DopERC20AmountRecipient[], nftAmountRecipients: DopNFTAmountRecipient[], relayerFeeERC20AmountRecipient: Optional<DopERC20AmountRecipient>, sendWithPublicWallet: boolean, overallBatchMinGasPrice: Optional<bigint>, progressCallback: ProverProgressCallback) => Promise<void>;
+export declare const generateUnshieldBaseTokenProof: (networkName: NetworkName, publicWalletAddress: string, dopWalletID: string, encryptionKey: string, wrappedERC20Amount: DopERC20Amount, relayerFeeERC20AmountRecipient: Optional<DopERC20AmountRecipient>, sendWithPublicWallet: boolean, overallBatchMinGasPrice: Optional<bigint>, progressCallback: ProverProgressCallback) => Promise<void>;

package/dist/services/transactions/tx-proof-unshield.js

@@ -1,18 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateUnshieldProof = void 0;
+exports.generateUnshieldBaseTokenProof = exports.generateUnshieldProof = void 0;
 const dop_sharedmodel_v5_1 = require("dop-sharedmodel-v5");
 const tx_generator_1 = require("./tx-generator");
+const wallets_1 = require("../dop/wallets/wallets");
 const proof_cache_1 = require("./proof-cache");
+const providers_1 = require("../dop/core/providers");
+const dop_engine_v5_1 = require("dop-engine-v5");
+const blocked_address_1 = require("../../utils/blocked-address");
+const tx_cross_contract_calls_1 = require("./tx-cross-contract-calls");
 const error_1 = require("../../utils/error");
-const generateUnshieldProof = async (networkName, dopWalletID, encryptionKey, erc20AmountRecipients, nftAmountRecipients, relayerFeeERC20AmountRecipient, sendWithPublicWallet, overallBatchMinGasPrice, progressCallback, valueCheck) => {
+const generateUnshieldProof = async (networkName, dopWalletID, encryptionKey, erc20AmountRecipients, nftAmountRecipients, relayerFeeERC20AmountRecipient, sendWithPublicWallet, overallBatchMinGasPrice, progressCallback) => {
     try {
         (0, proof_cache_1.setCachedProvedTransaction)(undefined);
         const transactions = await (0, tx_generator_1.generateProofTransactions)(dop_sharedmodel_v5_1.ProofType.Unshield, networkName, dopWalletID, encryptionKey, false, // showSenderAddressToRecipient
         undefined, // memoText
         erc20AmountRecipients, nftAmountRecipients, relayerFeeERC20AmountRecipient, sendWithPublicWallet, undefined, // relayAdaptID
         false, // useDummyProof
-        overallBatchMinGasPrice, progressCallback, valueCheck);
+        overallBatchMinGasPrice, progressCallback);
         const transaction = await (0, tx_generator_1.generateTransact)(transactions, networkName);
         const nullifiers = (0, tx_generator_1.nullifiersForTransactions)(transactions);
         (0, proof_cache_1.setCachedProvedTransaction)({
@@ -39,145 +44,81 @@ const generateUnshieldProof = async (networkName, dopWalletID, encryptionKey, er
     }
 };
 exports.generateUnshieldProof = generateUnshieldProof;
-/*
-export const generateUnshieldBaseTokenProof = async (
-  networkName: NetworkName,
-  publicWalletAddress: string,
-  dopWalletID: string,
-  encryptionKey: string,
-  wrappedERC20Amount: DopERC20Amount,
-  relayerFeeERC20AmountRecipient: Optional<DopERC20AmountRecipient>,
-  sendWithPublicWallet: boolean,
-  overallBatchMinGasPrice: Optional<bigint>,
-  progressCallback: ProverProgressCallback,
-  valueCheck: bigint,
-): Promise<void> => {
-  try {
-    assertNotBlockedAddress(publicWalletAddress);
-    assertValidEthAddress(publicWalletAddress);
-
-    setCachedProvedTransaction(undefined);
-
-    const erc20AmountRecipients: DopERC20AmountRecipient[] = [
-      {
-        ...wrappedERC20Amount,
-        recipientAddress: publicWalletAddress,
-      },
-    ];
-
-    const relayAdaptUnshieldERC20Amounts: DopERC20Amount[] = [
-      wrappedERC20Amount,
-    ];
-
-    const relayAdaptUnshieldERC20AmountRecipients: DopERC20AmountRecipient[] =
-      createRelayAdaptUnshieldERC20AmountRecipients(networkName, [
-        wrappedERC20Amount,
-      ]);
-
-    // Empty NFT recipients.
-    const nftAmountRecipients: DopNFTAmountRecipient[] = [];
-    const relayAdaptUnshieldNFTAmountRecipients: DopNFTAmountRecipient[] =
-      [];
-
-    const relayAdaptContract = getRelayAdaptContractForNetwork(networkName);
-
-    // Generate dummy txs for relay adapt params.
-    const dummyTxs = await generateDummyProofTransactions(
-      ProofType.UnshieldBaseToken,
-      networkName,
-      dopWalletID,
-      encryptionKey,
-      false, // showSenderAddressToRecipient
-      undefined, // memoText
-      relayAdaptUnshieldERC20AmountRecipients,
-      relayAdaptUnshieldNFTAmountRecipients,
-      relayerFeeERC20AmountRecipient,
-      sendWithPublicWallet,
-      overallBatchMinGasPrice,
-      valueCheck
-    );
-
-    const relayAdaptParamsRandom = randomHex(31);
-    const relayAdaptParams =
-      await relayAdaptContract.getRelayAdaptParamsUnshieldBaseToken(
-        dummyTxs,
-        publicWalletAddress,
-        relayAdaptParamsRandom,
-      );
-    const relayAdaptID: AdaptID = {
-      contract: relayAdaptContract.address,
-      parameters: relayAdaptParams,
-    };
-
-    const showSenderAddressToRecipient = false;
-    const memoText: Optional<string> = undefined;
-
-
-    // console.log("====== 1",
-    //   ProofType.Unshield,
-    //   networkName,
-    //   dopWalletID,
-    //   encryptionKey,
-    //   false, // showSenderAddressToRecipient
-    //   undefined, // memoText
-    //   erc20AmountRecipients,
-    //   nftAmountRecipients,
-    //   relayerFeeERC20AmountRecipient,
-    //   sendWithPublicWallet,
-    //   undefined, // relayAdaptID
-    //   false, // useDummyProof
-    //   overallBatchMinGasPrice,
-    //   progressCallback);
-    // Generate final txs with relay adapt ID.
-    const transactions = await generateProofTransactions(
-      ProofType.UnshieldBaseToken,
-      networkName,
-      dopWalletID,
-      encryptionKey,
-      showSenderAddressToRecipient,
-      memoText,
-      relayAdaptUnshieldERC20AmountRecipients,
-      relayAdaptUnshieldNFTAmountRecipients,
-      relayerFeeERC20AmountRecipient,
-      sendWithPublicWallet,
-      relayAdaptID,
-      false, // useDummyProof
-      overallBatchMinGasPrice,
-      progressCallback,
-      valueCheck
-    );
-
-    const transaction = await generateUnshieldBaseToken(
-      transactions,
-      networkName,
-      publicWalletAddress,
-      relayAdaptParamsRandom,
-      false, // useDummyProof
-    );
-
-    const nullifiers = nullifiersForTransactions(transactions);
-
-    setCachedProvedTransaction({
-      proofType: ProofType.UnshieldBaseToken,
-      dopWalletID,
-      showSenderAddressToRecipient,
-      memoText,
-      erc20AmountRecipients,
-      nftAmountRecipients,
-      relayAdaptUnshieldERC20Amounts,
-      relayAdaptUnshieldNFTAmounts: undefined,
-      relayAdaptShieldERC20Recipients: undefined,
-      relayAdaptShieldNFTRecipients: undefined,
-      crossContractCalls: undefined,
-      relayerFeeERC20AmountRecipient,
-      sendWithPublicWallet,
-      transaction,
-      overallBatchMinGasPrice,
-      nullifiers,
-    });
-  } catch (err) {
-    throw reportAndSanitizeError(generateUnshieldBaseTokenProof.name, err);
-  }
+const generateUnshieldBaseTokenProof = async (networkName, publicWalletAddress, dopWalletID, encryptionKey, wrappedERC20Amount, relayerFeeERC20AmountRecipient, sendWithPublicWallet, overallBatchMinGasPrice, progressCallback) => {
+    try {
+        (0, blocked_address_1.assertNotBlockedAddress)(publicWalletAddress);
+        (0, wallets_1.assertValidEthAddress)(publicWalletAddress);
+        (0, proof_cache_1.setCachedProvedTransaction)(undefined);
+        const erc20AmountRecipients = [
+            {
+                ...wrappedERC20Amount,
+                recipientAddress: publicWalletAddress,
+            },
+        ];
+        const relayAdaptUnshieldERC20Amounts = [
+            wrappedERC20Amount,
+        ];
+        const relayAdaptUnshieldERC20AmountRecipients = (0, tx_cross_contract_calls_1.createRelayAdaptUnshieldERC20AmountRecipients)(networkName, [
+            wrappedERC20Amount,
+        ]);
+        // Empty NFT recipients.
+        const nftAmountRecipients = [];
+        const relayAdaptUnshieldNFTAmountRecipients = [];
+        const relayAdaptContract = (0, providers_1.getRelayAdaptContractForNetwork)(networkName);
+        // Generate dummy txs for relay adapt params.
+        const dummyTxs = await (0, tx_generator_1.generateDummyProofTransactions)(dop_sharedmodel_v5_1.ProofType.UnshieldBaseToken, networkName, dopWalletID, encryptionKey, false, // showSenderAddressToRecipient
+        undefined, // memoText
+        relayAdaptUnshieldERC20AmountRecipients, relayAdaptUnshieldNFTAmountRecipients, relayerFeeERC20AmountRecipient, sendWithPublicWallet, overallBatchMinGasPrice);
+        const relayAdaptParamsRandom = (0, dop_engine_v5_1.randomHex)(31);
+        const relayAdaptParams = await relayAdaptContract.getRelayAdaptParamsUnshieldBaseToken(dummyTxs, publicWalletAddress, relayAdaptParamsRandom);
+        const relayAdaptID = {
+            contract: relayAdaptContract.address,
+            parameters: relayAdaptParams,
+        };
+        const showSenderAddressToRecipient = false;
+        const memoText = undefined;
+        // console.log("====== 1",
+        //   ProofType.Unshield,
+        //   networkName,
+        //   dopWalletID,
+        //   encryptionKey,
+        //   false, // showSenderAddressToRecipient
+        //   undefined, // memoText
+        //   erc20AmountRecipients,
+        //   nftAmountRecipients,
+        //   relayerFeeERC20AmountRecipient,
+        //   sendWithPublicWallet,
+        //   undefined, // relayAdaptID
+        //   false, // useDummyProof
+        //   overallBatchMinGasPrice,
+        //   progressCallback);
+        // Generate final txs with relay adapt ID.
+        const transactions = await (0, tx_generator_1.generateProofTransactions)(dop_sharedmodel_v5_1.ProofType.UnshieldBaseToken, networkName, dopWalletID, encryptionKey, showSenderAddressToRecipient, memoText, relayAdaptUnshieldERC20AmountRecipients, relayAdaptUnshieldNFTAmountRecipients, relayerFeeERC20AmountRecipient, sendWithPublicWallet, relayAdaptID, false, // useDummyProof
+        overallBatchMinGasPrice, progressCallback);
+        const transaction = await (0, tx_generator_1.generateUnshieldBaseToken)(transactions, networkName, publicWalletAddress, relayAdaptParamsRandom, false);
+        const nullifiers = (0, tx_generator_1.nullifiersForTransactions)(transactions);
+        (0, proof_cache_1.setCachedProvedTransaction)({
+            proofType: dop_sharedmodel_v5_1.ProofType.UnshieldBaseToken,
+            dopWalletID,
+            showSenderAddressToRecipient,
+            memoText,
+            erc20AmountRecipients,
+            nftAmountRecipients,
+            relayAdaptUnshieldERC20Amounts,
+            relayAdaptUnshieldNFTAmounts: undefined,
+            relayAdaptShieldERC20Recipients: undefined,
+            relayAdaptShieldNFTRecipients: undefined,
+            crossContractCalls: undefined,
+            relayerFeeERC20AmountRecipient,
+            sendWithPublicWallet,
+            transaction,
+            overallBatchMinGasPrice,
+            nullifiers,
+        });
+    }
+    catch (err) {
+        throw (0, error_1.reportAndSanitizeError)(exports.generateUnshieldBaseTokenProof.name, err);
+    }
 };
-*/ 
+exports.generateUnshieldBaseTokenProof = generateUnshieldBaseTokenProof;
 //# sourceMappingURL=tx-proof-unshield.js.map