dop-wallet-v6 1.1.8 → 1.1.9

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

@@ -1 +1 @@
-{"version":3,"file":"tx-proof-unshield.js","sourceRoot":"","sources":["../../../src/services/transactions/tx-proof-unshield.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  DopERC20Amount,\n  NetworkName,\n  ProofType,\n  DopERC20AmountRecipient,\n  DopNFTAmountRecipient,\n} from 'dop-sharedmodel-v5';\nimport {\n  generateDummyProofTransactions,\n  generateProofTransactions,\n  generateTransact,\n  generateUnshieldBaseToken,\n  nullifiersForTransactions,\n} from './tx-generator';\nimport { assertValidEthAddress } from '../dop/wallets/wallets';\nimport { setCachedProvedTransaction } from './proof-cache';\nimport { getRelayAdaptContractForNetwork } from '../dop/core/providers';\nimport {\n  AdaptID,\n  ProverProgressCallback,\n  randomHex,\n} from 'dop-engine-v5';\nimport { assertNotBlockedAddress } from '../../utils/blocked-address';\nimport { createRelayAdaptUnshieldERC20AmountRecipients } from './tx-cross-contract-calls';\nimport { reportAndSanitizeError } from '../../utils/error';\n\nexport const generateUnshieldProof = async (\n  networkName: NetworkName,\n  dopWalletID: string,\n  encryptionKey: 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    const transactions = await generateProofTransactions(\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 transaction = await generateTransact(transactions, networkName);\n\n    const nullifiers = nullifiersForTransactions(transactions);\n\n    setCachedProvedTransaction({\n      proofType: ProofType.Unshield,\n      dopWalletID,\n      showSenderAddressToRecipient: false,\n      memoText: undefined,\n      erc20AmountRecipients,\n      nftAmountRecipients,\n      relayAdaptUnshieldERC20Amounts: undefined,\n      relayAdaptUnshieldNFTAmounts: undefined,\n      relayAdaptShieldERC20Recipients: undefined,\n      relayAdaptShieldNFTRecipients: undefined,\n      crossContractCalls: undefined,\n      relayerFeeERC20AmountRecipient,\n      transaction,\n      sendWithPublicWallet,\n      overallBatchMinGasPrice,\n      nullifiers,\n    });\n  } catch (err) {\n    throw reportAndSanitizeError(generateUnshieldProof.name, err);\n  }\n};\n\nexport const generateUnshieldBaseTokenProof = async (\n  networkName: NetworkName,\n  publicWalletAddress: string,\n  dopWalletID: string,\n  encryptionKey: string,\n  wrappedERC20Amount: DopERC20Amount,\n  relayerFeeERC20AmountRecipient: Optional<DopERC20AmountRecipient>,\n  sendWithPublicWallet: boolean,\n  overallBatchMinGasPrice: Optional<bigint>,\n  progressCallback: ProverProgressCallback,\n): Promise<void> => {\n  try {\n    assertNotBlockedAddress(publicWalletAddress);\n    assertValidEthAddress(publicWalletAddress);\n\n    setCachedProvedTransaction(undefined);\n\n    const erc20AmountRecipients: DopERC20AmountRecipient[] = [\n      {\n        ...wrappedERC20Amount,\n        recipientAddress: publicWalletAddress,\n      },\n    ];\n\n    const relayAdaptUnshieldERC20Amounts: DopERC20Amount[] = [\n      wrappedERC20Amount,\n    ];\n\n    const relayAdaptUnshieldERC20AmountRecipients: DopERC20AmountRecipient[] =\n      createRelayAdaptUnshieldERC20AmountRecipients(networkName, [\n        wrappedERC20Amount,\n      ]);\n\n    // Empty NFT recipients.\n    const nftAmountRecipients: DopNFTAmountRecipient[] = [];\n    const relayAdaptUnshieldNFTAmountRecipients: DopNFTAmountRecipient[] =\n      [];\n\n    const relayAdaptContract = getRelayAdaptContractForNetwork(networkName);\n\n    // Generate dummy txs for relay adapt params.\n    const dummyTxs = await generateDummyProofTransactions(\n      ProofType.UnshieldBaseToken,\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    const relayAdaptParamsRandom = randomHex(31);\n    const relayAdaptParams =\n      await relayAdaptContract.getRelayAdaptParamsUnshieldBaseToken(\n        dummyTxs,\n        publicWalletAddress,\n        relayAdaptParamsRandom,\n      );\n    const relayAdaptID: AdaptID = {\n      contract: relayAdaptContract.address,\n      parameters: relayAdaptParams,\n    };\n\n    const showSenderAddressToRecipient = false;\n    const memoText: Optional<string> = undefined;\n\n\n    // console.log(\"====== 1\",\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    // Generate final txs with relay adapt ID.\n    const transactions = await generateProofTransactions(\n      ProofType.UnshieldBaseToken,\n      networkName,\n      dopWalletID,\n      encryptionKey,\n      showSenderAddressToRecipient,\n      memoText,\n      relayAdaptUnshieldERC20AmountRecipients,\n      relayAdaptUnshieldNFTAmountRecipients,\n      relayerFeeERC20AmountRecipient,\n      sendWithPublicWallet,\n      relayAdaptID,\n      false, // useDummyProof\n      overallBatchMinGasPrice,\n      progressCallback,\n    );\n\n    const transaction = await generateUnshieldBaseToken(\n      transactions,\n      networkName,\n      publicWalletAddress,\n      relayAdaptParamsRandom,\n      false, // useDummyProof\n    );\n\n    const nullifiers = nullifiersForTransactions(transactions);\n\n    setCachedProvedTransaction({\n      proofType: ProofType.UnshieldBaseToken,\n      dopWalletID,\n      showSenderAddressToRecipient,\n      memoText,\n      erc20AmountRecipients,\n      nftAmountRecipients,\n      relayAdaptUnshieldERC20Amounts,\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(generateUnshieldBaseTokenProof.name, err);\n  }\n};\n"]}
+{"version":3,"file":"tx-proof-unshield.js","sourceRoot":"","sources":["../../../src/services/transactions/tx-proof-unshield.ts"],"names":[],"mappings":";;;AAAA,2DAM4B;AAC5B,iDAMwB;AAExB,+CAA2D;AAS3D,6CAA2D;AAEpD,MAAM,qBAAqB,GAAG,KAAK,EACxC,WAAwB,EACxB,WAAmB,EACnB,aAAqB,EACrB,qBAAgD,EAChD,mBAA4C,EAC5C,8BAAiE,EACjE,oBAA6B,EAC7B,uBAAyC,EACzC,gBAAwC,EACxC,UAAkB,EACH,EAAE;IACjB,IAAI;QACF,IAAA,wCAA0B,EAAC,SAAS,CAAC,CAAC;QAEtC,MAAM,YAAY,GAAG,MAAM,IAAA,wCAAyB,EAClD,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,EAChB,UAAU,CACX,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,EAAE,KAAK;YACnC,QAAQ,EAAE,SAAS;YACnB,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,WAAW;YACX,oBAAoB;YACpB,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;AAzDW,QAAA,qBAAqB,yBAyDhC;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4IE","sourcesContent":["import {\n  DopERC20Amount,\n  NetworkName,\n  ProofType,\n  DopERC20AmountRecipient,\n  DopNFTAmountRecipient,\n} from 'dop-sharedmodel-v5';\nimport {\n  generateDummyProofTransactions,\n  generateProofTransactions,\n  generateTransact,\n  // generateUnshieldBaseToken,\n  nullifiersForTransactions,\n} from './tx-generator';\nimport { assertValidEthAddress } from '../dop/wallets/wallets';\nimport { setCachedProvedTransaction } from './proof-cache';\nimport { getRelayAdaptContractForNetwork } from '../dop/core/providers';\nimport {\n  AdaptID,\n  ProverProgressCallback,\n  randomHex,\n} from 'dop-engine-v5';\nimport { assertNotBlockedAddress } from '../../utils/blocked-address';\nimport { createRelayAdaptUnshieldERC20AmountRecipients } from './tx-cross-contract-calls';\nimport { reportAndSanitizeError } from '../../utils/error';\n\nexport const generateUnshieldProof = async (\n  networkName: NetworkName,\n  dopWalletID: string,\n  encryptionKey: 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<void> => {\n  try {\n    setCachedProvedTransaction(undefined);\n\n    const transactions = await generateProofTransactions(\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      valueCheck,\n    );\n    const transaction = await generateTransact(transactions, networkName);\n\n    const nullifiers = nullifiersForTransactions(transactions);\n\n    setCachedProvedTransaction({\n      proofType: ProofType.Unshield,\n      dopWalletID,\n      showSenderAddressToRecipient: false,\n      memoText: undefined,\n      erc20AmountRecipients,\n      nftAmountRecipients,\n      relayAdaptUnshieldERC20Amounts: undefined,\n      relayAdaptUnshieldNFTAmounts: undefined,\n      relayAdaptShieldERC20Recipients: undefined,\n      relayAdaptShieldNFTRecipients: undefined,\n      crossContractCalls: undefined,\n      relayerFeeERC20AmountRecipient,\n      transaction,\n      sendWithPublicWallet,\n      overallBatchMinGasPrice,\n      nullifiers,\n    });\n  } catch (err) {\n    throw reportAndSanitizeError(generateUnshieldProof.name, err);\n  }\n};\n/*\nexport const generateUnshieldBaseTokenProof = async (\n  networkName: NetworkName,\n  publicWalletAddress: string,\n  dopWalletID: string,\n  encryptionKey: string,\n  wrappedERC20Amount: DopERC20Amount,\n  relayerFeeERC20AmountRecipient: Optional<DopERC20AmountRecipient>,\n  sendWithPublicWallet: boolean,\n  overallBatchMinGasPrice: Optional<bigint>,\n  progressCallback: ProverProgressCallback,\n  valueCheck: bigint,\n): Promise<void> => {\n  try {\n    assertNotBlockedAddress(publicWalletAddress);\n    assertValidEthAddress(publicWalletAddress);\n\n    setCachedProvedTransaction(undefined);\n\n    const erc20AmountRecipients: DopERC20AmountRecipient[] = [\n      {\n        ...wrappedERC20Amount,\n        recipientAddress: publicWalletAddress,\n      },\n    ];\n\n    const relayAdaptUnshieldERC20Amounts: DopERC20Amount[] = [\n      wrappedERC20Amount,\n    ];\n\n    const relayAdaptUnshieldERC20AmountRecipients: DopERC20AmountRecipient[] =\n      createRelayAdaptUnshieldERC20AmountRecipients(networkName, [\n        wrappedERC20Amount,\n      ]);\n\n    // Empty NFT recipients.\n    const nftAmountRecipients: DopNFTAmountRecipient[] = [];\n    const relayAdaptUnshieldNFTAmountRecipients: DopNFTAmountRecipient[] =\n      [];\n\n    const relayAdaptContract = getRelayAdaptContractForNetwork(networkName);\n\n    // Generate dummy txs for relay adapt params.\n    const dummyTxs = await generateDummyProofTransactions(\n      ProofType.UnshieldBaseToken,\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    const relayAdaptParamsRandom = randomHex(31);\n    const relayAdaptParams =\n      await relayAdaptContract.getRelayAdaptParamsUnshieldBaseToken(\n        dummyTxs,\n        publicWalletAddress,\n        relayAdaptParamsRandom,\n      );\n    const relayAdaptID: AdaptID = {\n      contract: relayAdaptContract.address,\n      parameters: relayAdaptParams,\n    };\n\n    const showSenderAddressToRecipient = false;\n    const memoText: Optional<string> = undefined;\n\n\n    // console.log(\"====== 1\",\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    // Generate final txs with relay adapt ID.\n    const transactions = await generateProofTransactions(\n      ProofType.UnshieldBaseToken,\n      networkName,\n      dopWalletID,\n      encryptionKey,\n      showSenderAddressToRecipient,\n      memoText,\n      relayAdaptUnshieldERC20AmountRecipients,\n      relayAdaptUnshieldNFTAmountRecipients,\n      relayerFeeERC20AmountRecipient,\n      sendWithPublicWallet,\n      relayAdaptID,\n      false, // useDummyProof\n      overallBatchMinGasPrice,\n      progressCallback,\n      valueCheck\n    );\n\n    const transaction = await generateUnshieldBaseToken(\n      transactions,\n      networkName,\n      publicWalletAddress,\n      relayAdaptParamsRandom,\n      false, // useDummyProof\n    );\n\n    const nullifiers = nullifiersForTransactions(transactions);\n\n    setCachedProvedTransaction({\n      proofType: ProofType.UnshieldBaseToken,\n      dopWalletID,\n      showSenderAddressToRecipient,\n      memoText,\n      erc20AmountRecipients,\n      nftAmountRecipients,\n      relayAdaptUnshieldERC20Amounts,\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(generateUnshieldBaseTokenProof.name, err);\n  }\n};\n*/"]}

package/dist/services/transactions/tx-shield-base-token.d.ts

@@ -1,3 +1,3 @@
 import { DopPopulateTransactionResponse, DopTransactionGasEstimateResponse, DopERC20Amount, NetworkName, TransactionGasDetails } from 'dop-sharedmodel-v5';
-export declare const populateShieldBaseToken: (networkName: NetworkName, dopAddress: string, shieldPrivateKey: string, wrappedERC20Amount: DopERC20Amount, gasDetails?: TransactionGasDetails) => Promise<DopPopulateTransactionResponse>;
+export declare const populateShieldBaseToken: (networkName: NetworkName, dopAddress: string, shieldPrivateKey: string, wrappedERC20Amount: DopERC20Amount, fromWalletAddress: string, gasDetails?: TransactionGasDetails) => Promise<DopPopulateTransactionResponse>;
 export declare const gasEstimateForShieldBaseToken: (networkName: NetworkName, dopAddress: string, shieldPrivateKey: string, wrappedERC20Amount: DopERC20Amount, fromWalletAddress: string) => Promise<DopTransactionGasEstimateResponse>;

package/dist/services/transactions/tx-shield-base-token.js

@@ -7,7 +7,7 @@ const blocked_address_1 = require("../../utils/blocked-address");
 const dop_engine_v5_1 = require("dop-engine-v5");
 const dop_1 = require("../dop");
 const error_1 = require("../../utils/error");
-const generateShieldBaseTokenTransaction = async (networkName, dopAddress, shieldPrivateKey, wrappedERC20Amount) => {
+const generateShieldBaseTokenTransaction = async (networkName, dopAddress, shieldPrivateKey, wrappedERC20Amount, fromWalletAddress) => {
     try {
         const relayAdaptContract = (0, providers_1.getRelayAdaptContractForNetwork)(networkName);
         const { masterPublicKey, viewingPublicKey } = dop_engine_v5_1.DopEngine.decodeAddress(dopAddress);
@@ -15,7 +15,8 @@ const generateShieldBaseTokenTransaction = async (networkName, dopAddress, shiel
         const { amount, tokenAddress } = wrappedERC20Amount;
         const shield = new dop_engine_v5_1.ShieldNoteERC20(masterPublicKey, random, amount, tokenAddress);
         const shieldRequest = await shield.serialize((0, dop_engine_v5_1.hexToBytes)(shieldPrivateKey), viewingPublicKey);
-        const transaction = await relayAdaptContract.populateShieldBaseToken(shieldRequest);
+        console.log("before populateShieldBaseToken");
+        const transaction = await relayAdaptContract.populateShieldBaseToken(shieldRequest, fromWalletAddress);
         return transaction;
     }
     catch (err) {
@@ -23,10 +24,10 @@ const generateShieldBaseTokenTransaction = async (networkName, dopAddress, shiel
         throw sanitizedError;
     }
 };
-const populateShieldBaseToken = async (networkName, dopAddress, shieldPrivateKey, wrappedERC20Amount, gasDetails) => {
+const populateShieldBaseToken = async (networkName, dopAddress, shieldPrivateKey, wrappedERC20Amount, fromWalletAddress, gasDetails) => {
     try {
         (0, dop_1.assertValidDopAddress)(dopAddress);
-        const transaction = await generateShieldBaseTokenTransaction(networkName, dopAddress, shieldPrivateKey, wrappedERC20Amount);
+        const transaction = await generateShieldBaseTokenTransaction(networkName, dopAddress, shieldPrivateKey, wrappedERC20Amount, fromWalletAddress);
         if (gasDetails) {
             const sendWithPublicWallet = true;
             (0, tx_gas_details_1.setGasDetailsForTransaction)(networkName, transaction, gasDetails, sendWithPublicWallet);
@@ -44,7 +45,9 @@ const gasEstimateForShieldBaseToken = async (networkName, dopAddress, shieldPriv
     try {
         (0, dop_1.assertValidDopAddress)(dopAddress);
         (0, blocked_address_1.assertNotBlockedAddress)(fromWalletAddress);
-        const transaction = await generateShieldBaseTokenTransaction(networkName, dopAddress, shieldPrivateKey, wrappedERC20Amount);
+        console.log("before generateShieldBaseTokenTransaction");
+        const transaction = await generateShieldBaseTokenTransaction(networkName, dopAddress, shieldPrivateKey, wrappedERC20Amount, fromWalletAddress);
+        console.log("before generateShieldBaseTokenTransaction2");
         const sendWithPublicWallet = true;
         const isGasEstimateWithDummyProof = false;
         return (0, tx_gas_details_1.gasEstimateResponse)(await (0, tx_gas_details_1.getGasEstimate)(networkName, transaction, fromWalletAddress, sendWithPublicWallet, false), undefined, // relayerFeeCommitment

package/dist/services/transactions/tx-shield-base-token.js.map

@@ -1 +1 @@
-{"version":3,"file":"tx-shield-base-token.js","sourceRoot":"","sources":["../../../src/services/transactions/tx-shield-base-token.ts"],"names":[],"mappings":";;;AAOA,qDAAwE;AACxE,qDAI0B;AAC1B,iEAAsE;AACtE,iDAKuB;AACvB,gCAA+C;AAC/C,6CAA2D;AAG3D,MAAM,kCAAkC,GAAG,KAAK,EAC9C,WAAwB,EACxB,UAAkB,EAClB,gBAAwB,EACxB,kBAAkC,EACJ,EAAE;IAChC,IAAI;QACF,MAAM,kBAAkB,GAAG,IAAA,2CAA+B,EAAC,WAAW,CAAC,CAAC;QACxE,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,GACzC,yBAAS,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QACtC,MAAM,MAAM,GAAG,IAAA,yBAAS,EAAC,EAAE,CAAC,CAAC;QAE7B,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,kBAAkB,CAAC;QAEpD,MAAM,MAAM,GAAG,IAAI,+BAAe,CAChC,eAAe,EACf,MAAM,EACN,MAAM,EACN,YAAY,CACb,CAAC;QAEF,MAAM,aAAa,GAAG,MAAM,MAAM,CAAC,SAAS,CAC1C,IAAA,0BAAU,EAAC,gBAAgB,CAAC,EAC5B,gBAAgB,CACjB,CAAC;QAEF,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAAC,uBAAuB,CAClE,aAAa,CACd,CAAC;QAEF,OAAO,WAAW,CAAC;KACpB;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,cAAc,GAAG,IAAA,8BAAsB,EAC3C,kCAAkC,CAAC,IAAI,EACvC,GAAG,CACJ,CAAC;QACF,MAAM,cAAc,CAAC;KACtB;AACH,CAAC,CAAC;AAEK,MAAM,uBAAuB,GAAG,KAAK,EAC1C,WAAwB,EACxB,UAAkB,EAClB,gBAAwB,EACxB,kBAAkC,EAClC,UAAkC,EACO,EAAE;IAC3C,IAAI;QACF,IAAA,2BAAqB,EAAC,UAAU,CAAC,CAAC;QAElC,MAAM,WAAW,GAAG,MAAM,kCAAkC,CAC1D,WAAW,EACX,UAAU,EACV,gBAAgB,EAChB,kBAAkB,CACnB,CAAC;QAEF,IAAI,UAAU,EAAE;YACd,MAAM,oBAAoB,GAAG,IAAI,CAAC;YAClC,IAAA,4CAA2B,EACzB,WAAW,EACX,WAAW,EACX,UAAU,EACV,oBAAoB,CACrB,CAAC;SACH;QAED,OAAO;YACL,WAAW;SACZ,CAAC;KACH;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAA,8BAAsB,EAAC,+BAAuB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;KACjE;AACH,CAAC,CAAC;AAjCW,QAAA,uBAAuB,2BAiClC;AAEK,MAAM,6BAA6B,GAAG,KAAK,EAChD,WAAwB,EACxB,UAAkB,EAClB,gBAAwB,EACxB,kBAAkC,EAClC,iBAAyB,EACmB,EAAE;IAC9C,IAAI;QACF,IAAA,2BAAqB,EAAC,UAAU,CAAC,CAAC;QAClC,IAAA,yCAAuB,EAAC,iBAAiB,CAAC,CAAC;QAE3C,MAAM,WAAW,GAAG,MAAM,kCAAkC,CAC1D,WAAW,EACX,UAAU,EACV,gBAAgB,EAChB,kBAAkB,CACnB,CAAC;QAEF,MAAM,oBAAoB,GAAG,IAAI,CAAC;QAClC,MAAM,2BAA2B,GAAG,KAAK,CAAC;QAC1C,OAAO,IAAA,oCAAmB,EACxB,MAAM,IAAA,+BAAc,EAClB,WAAW,EACX,WAAW,EACX,iBAAiB,EACjB,oBAAoB,EACpB,KAAK,CACN,EACD,SAAS,EAAE,uBAAuB;QAClC,2BAA2B,CAC5B,CAAC;KACH;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAA,8BAAsB,EAAC,qCAA6B,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;KACvE;AACH,CAAC,CAAC;AAlCW,QAAA,6BAA6B,iCAkCxC","sourcesContent":["import {\n  DopPopulateTransactionResponse,\n  DopTransactionGasEstimateResponse,\n  DopERC20Amount,\n  NetworkName,\n  TransactionGasDetails,\n} from 'dop-sharedmodel-v5';\nimport { getRelayAdaptContractForNetwork } from '../dop/core/providers';\nimport {\n  gasEstimateResponse,\n  getGasEstimate,\n  setGasDetailsForTransaction,\n} from './tx-gas-details';\nimport { assertNotBlockedAddress } from '../../utils/blocked-address';\nimport {\n  randomHex,\n  ShieldNoteERC20,\n  DopEngine,\n  hexToBytes,\n} from 'dop-engine-v5';\nimport { assertValidDopAddress } from '../dop';\nimport { reportAndSanitizeError } from '../../utils/error';\nimport { ContractTransaction } from 'ethers';\n\nconst generateShieldBaseTokenTransaction = async (\n  networkName: NetworkName,\n  dopAddress: string,\n  shieldPrivateKey: string,\n  wrappedERC20Amount: DopERC20Amount,\n): Promise<ContractTransaction> => {\n  try {\n    const relayAdaptContract = getRelayAdaptContractForNetwork(networkName);\n    const { masterPublicKey, viewingPublicKey } =\n      DopEngine.decodeAddress(dopAddress);\n    const random = randomHex(16);\n\n    const { amount, tokenAddress } = wrappedERC20Amount;\n\n    const shield = new ShieldNoteERC20(\n      masterPublicKey,\n      random,\n      amount,\n      tokenAddress,\n    );\n\n    const shieldRequest = await shield.serialize(\n      hexToBytes(shieldPrivateKey),\n      viewingPublicKey,\n    );\n\n    const transaction = await relayAdaptContract.populateShieldBaseToken(\n      shieldRequest,\n    );\n\n    return transaction;\n  } catch (err) {\n    const sanitizedError = reportAndSanitizeError(\n      generateShieldBaseTokenTransaction.name,\n      err,\n    );\n    throw sanitizedError;\n  }\n};\n\nexport const populateShieldBaseToken = async (\n  networkName: NetworkName,\n  dopAddress: string,\n  shieldPrivateKey: string,\n  wrappedERC20Amount: DopERC20Amount,\n  gasDetails?: TransactionGasDetails,\n): Promise<DopPopulateTransactionResponse> => {\n  try {\n    assertValidDopAddress(dopAddress);\n\n    const transaction = await generateShieldBaseTokenTransaction(\n      networkName,\n      dopAddress,\n      shieldPrivateKey,\n      wrappedERC20Amount,\n    );\n\n    if (gasDetails) {\n      const sendWithPublicWallet = true;\n      setGasDetailsForTransaction(\n        networkName,\n        transaction,\n        gasDetails,\n        sendWithPublicWallet,\n      );\n    }\n\n    return {\n      transaction,\n    };\n  } catch (err) {\n    throw reportAndSanitizeError(populateShieldBaseToken.name, err);\n  }\n};\n\nexport const gasEstimateForShieldBaseToken = async (\n  networkName: NetworkName,\n  dopAddress: string,\n  shieldPrivateKey: string,\n  wrappedERC20Amount: DopERC20Amount,\n  fromWalletAddress: string,\n): Promise<DopTransactionGasEstimateResponse> => {\n  try {\n    assertValidDopAddress(dopAddress);\n    assertNotBlockedAddress(fromWalletAddress);\n\n    const transaction = await generateShieldBaseTokenTransaction(\n      networkName,\n      dopAddress,\n      shieldPrivateKey,\n      wrappedERC20Amount,\n    );\n\n    const sendWithPublicWallet = true;\n    const isGasEstimateWithDummyProof = false;\n    return gasEstimateResponse(\n      await getGasEstimate(\n        networkName,\n        transaction,\n        fromWalletAddress,\n        sendWithPublicWallet,\n        false, // isCrossContractCall\n      ),\n      undefined, // relayerFeeCommitment\n      isGasEstimateWithDummyProof,\n    );\n  } catch (err) {\n    throw reportAndSanitizeError(gasEstimateForShieldBaseToken.name, err);\n  }\n};\n"]}
+{"version":3,"file":"tx-shield-base-token.js","sourceRoot":"","sources":["../../../src/services/transactions/tx-shield-base-token.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  DopPopulateTransactionResponse,\n  DopTransactionGasEstimateResponse,\n  DopERC20Amount,\n  NetworkName,\n  TransactionGasDetails,\n} from 'dop-sharedmodel-v5';\nimport { getRelayAdaptContractForNetwork } from '../dop/core/providers';\nimport {\n  gasEstimateResponse,\n  getGasEstimate,\n  setGasDetailsForTransaction,\n} from './tx-gas-details';\nimport { assertNotBlockedAddress } from '../../utils/blocked-address';\nimport {\n  randomHex,\n  ShieldNoteERC20,\n  DopEngine,\n  hexToBytes,\n} from 'dop-engine-v5';\nimport { assertValidDopAddress } from '../dop';\nimport { reportAndSanitizeError } from '../../utils/error';\nimport { ContractTransaction } from 'ethers';\n\nconst generateShieldBaseTokenTransaction = async (\n  networkName: NetworkName,\n  dopAddress: string,\n  shieldPrivateKey: string,\n  wrappedERC20Amount: DopERC20Amount,\n  fromWalletAddress: string\n): Promise<ContractTransaction> => {\n  try {\n    const relayAdaptContract = getRelayAdaptContractForNetwork(networkName);\n    const { masterPublicKey, viewingPublicKey } =\n      DopEngine.decodeAddress(dopAddress);\n    const random = randomHex(16);\n\n    const { amount, tokenAddress } = wrappedERC20Amount;\n\n    const shield = new ShieldNoteERC20(\n      masterPublicKey,\n      random,\n      amount,\n      tokenAddress,\n    );\n\n    const shieldRequest = await shield.serialize(\n      hexToBytes(shieldPrivateKey),\n      viewingPublicKey,\n    );\n    console.log(\"before populateShieldBaseToken\")\n\n\n    const transaction = await relayAdaptContract.populateShieldBaseToken(\n      shieldRequest,\n      fromWalletAddress\n    );\n\n    return transaction;\n  } catch (err) {\n    const sanitizedError = reportAndSanitizeError(\n      generateShieldBaseTokenTransaction.name,\n      err,\n    );\n    throw sanitizedError;\n  }\n};\n\nexport const populateShieldBaseToken = async (\n  networkName: NetworkName,\n  dopAddress: string,\n  shieldPrivateKey: string,\n  wrappedERC20Amount: DopERC20Amount,\n  fromWalletAddress: string,\n  gasDetails?: TransactionGasDetails,\n): Promise<DopPopulateTransactionResponse> => {\n  try {\n    assertValidDopAddress(dopAddress);\n\n    const transaction = await generateShieldBaseTokenTransaction(\n      networkName,\n      dopAddress,\n      shieldPrivateKey,\n      wrappedERC20Amount,\n      fromWalletAddress,\n    );\n\n    if (gasDetails) {\n      const sendWithPublicWallet = true;\n      setGasDetailsForTransaction(\n        networkName,\n        transaction,\n        gasDetails,\n        sendWithPublicWallet,\n      );\n    }\n\n    return {\n      transaction,\n    };\n  } catch (err) {\n    throw reportAndSanitizeError(populateShieldBaseToken.name, err);\n  }\n};\n\nexport const gasEstimateForShieldBaseToken = async (\n  networkName: NetworkName,\n  dopAddress: string,\n  shieldPrivateKey: string,\n  wrappedERC20Amount: DopERC20Amount,\n  fromWalletAddress: string,\n): Promise<DopTransactionGasEstimateResponse> => {\n  try {\n    assertValidDopAddress(dopAddress);\n    assertNotBlockedAddress(fromWalletAddress);\n    console.log(\"before generateShieldBaseTokenTransaction\")\n\n    const transaction = await generateShieldBaseTokenTransaction(\n      networkName,\n      dopAddress,\n      shieldPrivateKey,\n      wrappedERC20Amount,\n      fromWalletAddress,\n    );\n\n    console.log(\"before generateShieldBaseTokenTransaction2\")\n\n\n    const sendWithPublicWallet = true;\n    const isGasEstimateWithDummyProof = false;\n    return gasEstimateResponse(\n      await getGasEstimate(\n        networkName,\n        transaction,\n        fromWalletAddress,\n        sendWithPublicWallet,\n        false, // isCrossContractCall\n      ),\n      undefined, // relayerFeeCommitment\n      isGasEstimateWithDummyProof,\n    );\n  } catch (err) {\n    throw reportAndSanitizeError(gasEstimateForShieldBaseToken.name, err);\n  }\n};\n"]}

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

@@ -38,7 +38,9 @@ const generateShieldTransaction = async (networkName, shieldPrivateKey, erc20Amo
             ...erc20AmountRecipients.map(erc20AmountRecipient => generateERC20ShieldRequests(erc20AmountRecipient, random, shieldPrivateKey)),
             ...nftAmountRecipients.map(nftAmountRecipient => generateNFTShieldRequests(nftAmountRecipient, random, shieldPrivateKey)),
         ]);
+        console.log("shieldInputs:::", shieldInputs);
         const transaction = await dopSmartWalletContract.generateShield(shieldInputs);
+        console.log("transaction:::", transaction);
         return transaction;
     }
     catch (err) {
@@ -50,6 +52,7 @@ exports.generateShieldTransaction = generateShieldTransaction;
 const populateShield = async (networkName, shieldPrivateKey, erc20AmountRecipients, nftAmountRecipients, gasDetails) => {
     try {
         const transaction = await (0, exports.generateShieldTransaction)(networkName, shieldPrivateKey, erc20AmountRecipients, nftAmountRecipients);
+        console.log("transaction:::0", transaction);
         if (gasDetails) {
             const sendWithPublicWallet = true;
             (0, tx_gas_details_1.setGasDetailsForTransaction)(networkName, transaction, gasDetails, sendWithPublicWallet);
@@ -67,6 +70,7 @@ const gasEstimateForShield = async (networkName, shieldPrivateKey, erc20AmountRe
     try {
         (0, blocked_address_1.assertNotBlockedAddress)(fromWalletAddress);
         const transaction = await (0, exports.generateShieldTransaction)(networkName, shieldPrivateKey, erc20AmountRecipients, nftAmountRecipients);
+        console.log("transaction:::1", transaction);
         const sendWithPublicWallet = true;
         const isGasEstimateWithDummyProof = false;
         return (0, tx_gas_details_1.gasEstimateResponse)(await (0, tx_gas_details_1.getGasEstimate)(networkName, transaction, fromWalletAddress, sendWithPublicWallet, false), undefined, // relayerFeeCommitment

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

@@ -1 +1 @@
-{"version":3,"file":"tx-shield.js","sourceRoot":"","sources":["../../../src/services/transactions/tx-shield.ts"],"names":[],"mappings":";;;AAAA,2DAQ4B;AAC5B,iDASuB;AACvB,qDAI0B;AAC1B,iEAAsE;AACtE,gCAGgB;AAChB,uEAA+E;AAC/E,6CAA2D;AAGpD,MAAM,mCAAmC,GAAG,GAAG,EAAE;IACtD,OAAO,0BAAU,CAAC,mCAAmC,EAAE,CAAC;AAC1D,CAAC,CAAC;AAFW,QAAA,mCAAmC,uCAE9C;AAEF,MAAM,2BAA2B,GAAG,KAAK,EACvC,oBAA6C,EAC7C,MAAc,EACd,gBAAwB,EACM,EAAE;IAChC,MAAM,UAAU,GAAG,oBAAoB,CAAC,gBAAgB,CAAC;IAEzD,IAAA,2BAAqB,EAAC,UAAU,CAAC,CAAC;IAElC,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,GACzC,yBAAS,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IAEtC,MAAM,MAAM,GAAG,IAAI,+BAAe,CAChC,eAAe,EACf,MAAM,EACN,oBAAoB,CAAC,MAAM,EAC3B,oBAAoB,CAAC,YAAY,CAClC,CAAC;IACF,OAAO,MAAM,CAAC,SAAS,CAAC,IAAA,0BAAU,EAAC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC,CAAC;AAC1E,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAAG,KAAK,EACrC,kBAAyC,EACzC,MAAc,EACd,gBAAwB,EACM,EAAE;IAChC,MAAM,UAAU,GAAG,kBAAkB,CAAC,gBAAgB,CAAC;IAEvD,IAAA,2BAAqB,EAAC,UAAU,CAAC,CAAC;IAElC,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,GACzC,yBAAS,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IAEtC,MAAM,KAAK,GACT,kBAAkB,CAAC,YAAY,KAAK,iCAAY,CAAC,MAAM;QACrD,CAAC,CAAC,iCAAiB;QACnB,CAAC,CAAC,kBAAkB,CAAC,MAAM,CAAC;IAGhC,MAAM,YAAY,GAChB,IAAA,4DAAkC,EAAC,kBAAkB,CAAC,CAAC;IAEzD,MAAM,MAAM,GAAG,IAAI,6BAAa,CAC9B,eAAe,EACf,MAAM,EACN,KAAK,EACL,YAAY,CACb,CAAC;IAEF,OAAO,MAAM,CAAC,SAAS,CAAC,IAAA,0BAAU,EAAC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC,CAAC;AAC1E,CAAC,CAAC;AAEK,MAAM,yBAAyB,GAAG,KAAK,EAC5C,WAAwB,EACxB,gBAAwB,EACxB,qBAAgD,EAChD,mBAA4C,EACd,EAAE;IAChC,IAAI;QACF,MAAM,sBAAsB,GAC1B,IAAA,yCAAmC,EAAC,WAAW,CAAC,CAAC;QAEnD,MAAM,MAAM,GAAG,IAAA,yBAAS,EAAC,EAAE,CAAC,CAAC;QAE7B,MAAM,YAAY,GAA0B,MAAM,OAAO,CAAC,GAAG,CAAC;YAC5D,GAAG,qBAAqB,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE,CAClD,2BAA2B,CACzB,oBAAoB,EACpB,MAAM,EACN,gBAAgB,CACjB,CACF;YACD,GAAG,mBAAmB,CAAC,GAAG,CAAC,kBAAkB,CAAC,EAAE,CAC9C,yBAAyB,CAAC,kBAAkB,EAAE,MAAM,EAAE,gBAAgB,CAAC,CACxE;SACF,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,MAAM,sBAAsB,CAAC,cAAc,CAC7D,YAAY,CACb,CAAC;QAEF,OAAO,WAAW,CAAC;KACpB;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,cAAc,GAAG,IAAA,8BAAsB,EAC3C,iCAAyB,CAAC,IAAI,EAC9B,GAAG,CACJ,CAAC;QACF,MAAM,cAAc,CAAC;KACtB;AACH,CAAC,CAAC;AArCW,QAAA,yBAAyB,6BAqCpC;AAEK,MAAM,cAAc,GAAG,KAAK,EACjC,WAAwB,EACxB,gBAAwB,EACxB,qBAAgD,EAChD,mBAA4C,EAC5C,UAAkC,EACO,EAAE;IAC3C,IAAI;QACF,MAAM,WAAW,GAAG,MAAM,IAAA,iCAAyB,EACjD,WAAW,EACX,gBAAgB,EAChB,qBAAqB,EACrB,mBAAmB,CACpB,CAAC;QAEF,IAAI,UAAU,EAAE;YACd,MAAM,oBAAoB,GAAG,IAAI,CAAC;YAClC,IAAA,4CAA2B,EACzB,WAAW,EACX,WAAW,EACX,UAAU,EACV,oBAAoB,CACrB,CAAC;SACH;QAED,OAAO;YACL,WAAW;SACZ,CAAC;KACH;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAA,8BAAsB,EAAC,sBAAc,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;KACxD;AACH,CAAC,CAAC;AA/BW,QAAA,cAAc,kBA+BzB;AAEK,MAAM,oBAAoB,GAAG,KAAK,EACvC,WAAwB,EACxB,gBAAwB,EACxB,qBAAgD,EAChD,mBAA4C,EAC5C,iBAAyB,EACmB,EAAE;IAC9C,IAAI;QACF,IAAA,yCAAuB,EAAC,iBAAiB,CAAC,CAAC;QAE3C,MAAM,WAAW,GAAG,MAAM,IAAA,iCAAyB,EACjD,WAAW,EACX,gBAAgB,EAChB,qBAAqB,EACrB,mBAAmB,CACpB,CAAC;QAGF,MAAM,oBAAoB,GAAG,IAAI,CAAC;QAClC,MAAM,2BAA2B,GAAG,KAAK,CAAC;QAC1C,OAAO,IAAA,oCAAmB,EACxB,MAAM,IAAA,+BAAc,EAClB,WAAW,EACX,WAAW,EACX,iBAAiB,EACjB,oBAAoB,EACpB,KAAK,CACN,EACD,SAAS,EAAE,uBAAuB;QAClC,2BAA2B,CAC5B,CAAC;KACH;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAA,8BAAsB,EAAC,4BAAoB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;KAC9D;AACH,CAAC,CAAC;AAlCW,QAAA,oBAAoB,wBAkC/B","sourcesContent":["import {\n  DopPopulateTransactionResponse,\n  DopTransactionGasEstimateResponse,\n  NetworkName,\n  DopERC20AmountRecipient,\n  DopNFTAmountRecipient,\n  NFTTokenType,\n  TransactionGasDetails,\n} from 'dop-sharedmodel-v5';\nimport {\n  ShieldNote,\n  DopEngine,\n  ShieldRequestStruct,\n  randomHex,\n  hexToBytes,\n  ShieldNoteERC20,\n  ShieldNoteNFT,\n  ERC721_NOTE_VALUE,\n} from 'dop-engine-v5';\nimport {\n  gasEstimateResponse,\n  getGasEstimate,\n  setGasDetailsForTransaction,\n} from './tx-gas-details';\nimport { assertNotBlockedAddress } from '../../utils/blocked-address';\nimport {\n  assertValidDopAddress,\n  getDopSmartWalletContractForNetwork,\n} from '../dop';\nimport { createNFTTokenDataFromDopNFTAmount } from './tx-cross-contract-calls';\nimport { reportAndSanitizeError } from '../../utils/error';\nimport { ContractTransaction } from 'ethers';\n\nexport const getShieldPrivateKeySignatureMessage = () => {\n  return ShieldNote.getShieldPrivateKeySignatureMessage();\n};\n\nconst generateERC20ShieldRequests = async (\n  erc20AmountRecipient: DopERC20AmountRecipient,\n  random: string,\n  shieldPrivateKey: string,\n): Promise<ShieldRequestStruct> => {\n  const dopAddress = erc20AmountRecipient.recipientAddress;\n\n  assertValidDopAddress(dopAddress);\n\n  const { masterPublicKey, viewingPublicKey } =\n    DopEngine.decodeAddress(dopAddress);\n\n  const shield = new ShieldNoteERC20(\n    masterPublicKey,\n    random,\n    erc20AmountRecipient.amount,\n    erc20AmountRecipient.tokenAddress,\n  );\n  return shield.serialize(hexToBytes(shieldPrivateKey), viewingPublicKey);\n};\n\nconst generateNFTShieldRequests = async (\n  nftAmountRecipient: DopNFTAmountRecipient,\n  random: string,\n  shieldPrivateKey: string,\n): Promise<ShieldRequestStruct> => {\n  const dopAddress = nftAmountRecipient.recipientAddress;\n\n  assertValidDopAddress(dopAddress);\n\n  const { masterPublicKey, viewingPublicKey } =\n    DopEngine.decodeAddress(dopAddress);\n\n  const value =\n    nftAmountRecipient.nftTokenType === NFTTokenType.ERC721\n      ? ERC721_NOTE_VALUE\n      : nftAmountRecipient.amount;\n\n\n  const nftTokenData =\n    createNFTTokenDataFromDopNFTAmount(nftAmountRecipient);\n\n  const shield = new ShieldNoteNFT(\n    masterPublicKey,\n    random,\n    value,\n    nftTokenData,\n  );\n\n  return shield.serialize(hexToBytes(shieldPrivateKey), viewingPublicKey);\n};\n\nexport const generateShieldTransaction = async (\n  networkName: NetworkName,\n  shieldPrivateKey: string,\n  erc20AmountRecipients: DopERC20AmountRecipient[],\n  nftAmountRecipients: DopNFTAmountRecipient[],\n): Promise<ContractTransaction> => {\n  try {\n    const dopSmartWalletContract =\n      getDopSmartWalletContractForNetwork(networkName);\n\n    const random = randomHex(16);\n\n    const shieldInputs: ShieldRequestStruct[] = await Promise.all([\n      ...erc20AmountRecipients.map(erc20AmountRecipient =>\n        generateERC20ShieldRequests(\n          erc20AmountRecipient,\n          random,\n          shieldPrivateKey,\n        ),\n      ),\n      ...nftAmountRecipients.map(nftAmountRecipient =>\n        generateNFTShieldRequests(nftAmountRecipient, random, shieldPrivateKey),\n      ),\n    ]);\n\n    const transaction = await dopSmartWalletContract.generateShield(\n      shieldInputs,\n    );\n\n    return transaction;\n  } catch (err) {\n    const sanitizedError = reportAndSanitizeError(\n      generateShieldTransaction.name,\n      err,\n    );\n    throw sanitizedError;\n  }\n};\n\nexport const populateShield = async (\n  networkName: NetworkName,\n  shieldPrivateKey: string,\n  erc20AmountRecipients: DopERC20AmountRecipient[],\n  nftAmountRecipients: DopNFTAmountRecipient[],\n  gasDetails?: TransactionGasDetails,\n): Promise<DopPopulateTransactionResponse> => {\n  try {\n    const transaction = await generateShieldTransaction(\n      networkName,\n      shieldPrivateKey,\n      erc20AmountRecipients,\n      nftAmountRecipients,\n    );\n\n    if (gasDetails) {\n      const sendWithPublicWallet = true;\n      setGasDetailsForTransaction(\n        networkName,\n        transaction,\n        gasDetails,\n        sendWithPublicWallet,\n      );\n    }\n\n    return {\n      transaction,\n    };\n  } catch (err) {\n    throw reportAndSanitizeError(populateShield.name, err);\n  }\n};\n\nexport const gasEstimateForShield = async (\n  networkName: NetworkName,\n  shieldPrivateKey: string,\n  erc20AmountRecipients: DopERC20AmountRecipient[],\n  nftAmountRecipients: DopNFTAmountRecipient[],\n  fromWalletAddress: string,\n): Promise<DopTransactionGasEstimateResponse> => {\n  try {\n    assertNotBlockedAddress(fromWalletAddress);\n\n    const transaction = await generateShieldTransaction(\n      networkName,\n      shieldPrivateKey,\n      erc20AmountRecipients,\n      nftAmountRecipients,\n    );\n\n\n    const sendWithPublicWallet = true;\n    const isGasEstimateWithDummyProof = false;\n    return gasEstimateResponse(\n      await getGasEstimate(\n        networkName,\n        transaction,\n        fromWalletAddress,\n        sendWithPublicWallet,\n        false, // isCrossContractCall\n      ),\n      undefined, // relayerFeeCommitment\n      isGasEstimateWithDummyProof,\n    );\n  } catch (err) {\n    throw reportAndSanitizeError(gasEstimateForShield.name, err);\n  }\n};\n"]}
+{"version":3,"file":"tx-shield.js","sourceRoot":"","sources":["../../../src/services/transactions/tx-shield.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  DopPopulateTransactionResponse,\n  DopTransactionGasEstimateResponse,\n  NetworkName,\n  DopERC20AmountRecipient,\n  DopNFTAmountRecipient,\n  NFTTokenType,\n  TransactionGasDetails,\n} from 'dop-sharedmodel-v5';\nimport {\n  ShieldNote,\n  DopEngine,\n  ShieldRequestStruct,\n  randomHex,\n  hexToBytes,\n  ShieldNoteERC20,\n  ShieldNoteNFT,\n  ERC721_NOTE_VALUE,\n} from 'dop-engine-v5';\nimport {\n  gasEstimateResponse,\n  getGasEstimate,\n  setGasDetailsForTransaction,\n} from './tx-gas-details';\nimport { assertNotBlockedAddress } from '../../utils/blocked-address';\nimport {\n  assertValidDopAddress,\n  getDopSmartWalletContractForNetwork,\n} from '../dop';\nimport { createNFTTokenDataFromDopNFTAmount } from './tx-cross-contract-calls';\nimport { reportAndSanitizeError } from '../../utils/error';\nimport { ContractTransaction } from 'ethers';\n\nexport const getShieldPrivateKeySignatureMessage = () => {\n  return ShieldNote.getShieldPrivateKeySignatureMessage();\n};\n\nconst generateERC20ShieldRequests = async (\n  erc20AmountRecipient: DopERC20AmountRecipient,\n  random: string,\n  shieldPrivateKey: string,\n): Promise<ShieldRequestStruct> => {\n  const dopAddress = erc20AmountRecipient.recipientAddress;\n\n  assertValidDopAddress(dopAddress);\n\n  const { masterPublicKey, viewingPublicKey } =\n    DopEngine.decodeAddress(dopAddress);\n\n  const shield = new ShieldNoteERC20(\n    masterPublicKey,\n    random,\n    erc20AmountRecipient.amount,\n    erc20AmountRecipient.tokenAddress,\n  );\n  return shield.serialize(hexToBytes(shieldPrivateKey), viewingPublicKey);\n};\n\nconst generateNFTShieldRequests = async (\n  nftAmountRecipient: DopNFTAmountRecipient,\n  random: string,\n  shieldPrivateKey: string,\n): Promise<ShieldRequestStruct> => {\n  const dopAddress = nftAmountRecipient.recipientAddress;\n\n  assertValidDopAddress(dopAddress);\n\n  const { masterPublicKey, viewingPublicKey } =\n    DopEngine.decodeAddress(dopAddress);\n\n  const value =\n    nftAmountRecipient.nftTokenType === NFTTokenType.ERC721\n      ? ERC721_NOTE_VALUE\n      : nftAmountRecipient.amount;\n\n\n  const nftTokenData =\n    createNFTTokenDataFromDopNFTAmount(nftAmountRecipient);\n\n  const shield = new ShieldNoteNFT(\n    masterPublicKey,\n    random,\n    value,\n    nftTokenData,\n  );\n\n  return shield.serialize(hexToBytes(shieldPrivateKey), viewingPublicKey);\n};\n\nexport const generateShieldTransaction = async (\n  networkName: NetworkName,\n  shieldPrivateKey: string,\n  erc20AmountRecipients: DopERC20AmountRecipient[],\n  nftAmountRecipients: DopNFTAmountRecipient[],\n): Promise<ContractTransaction> => {\n  try {\n    const dopSmartWalletContract =\n      getDopSmartWalletContractForNetwork(networkName);\n\n    const random = randomHex(16);\n\n    const shieldInputs: ShieldRequestStruct[] = await Promise.all([\n      ...erc20AmountRecipients.map(erc20AmountRecipient =>\n        generateERC20ShieldRequests(\n          erc20AmountRecipient,\n          random,\n          shieldPrivateKey,\n        ),\n      ),\n      ...nftAmountRecipients.map(nftAmountRecipient =>\n        generateNFTShieldRequests(nftAmountRecipient, random, shieldPrivateKey),\n      ),\n    ]);\n    console.log(\"shieldInputs:::\", shieldInputs);\n\n    const transaction = await dopSmartWalletContract.generateShield(\n      shieldInputs,\n    );\n    console.log(\"transaction:::\", transaction);\n\n    return transaction;\n  } catch (err) {\n    const sanitizedError = reportAndSanitizeError(\n      generateShieldTransaction.name,\n      err,\n    );\n    throw sanitizedError;\n  }\n};\n\nexport const populateShield = async (\n  networkName: NetworkName,\n  shieldPrivateKey: string,\n  erc20AmountRecipients: DopERC20AmountRecipient[],\n  nftAmountRecipients: DopNFTAmountRecipient[],\n  gasDetails?: TransactionGasDetails,\n): Promise<DopPopulateTransactionResponse> => {\n  try {\n    const transaction = await generateShieldTransaction(\n      networkName,\n      shieldPrivateKey,\n      erc20AmountRecipients,\n      nftAmountRecipients,\n    );\n    console.log(\"transaction:::0\", transaction);\n\n\n    if (gasDetails) {\n      const sendWithPublicWallet = true;\n      setGasDetailsForTransaction(\n        networkName,\n        transaction,\n        gasDetails,\n        sendWithPublicWallet,\n      );\n    }\n\n    return {\n      transaction,\n    };\n  } catch (err) {\n    throw reportAndSanitizeError(populateShield.name, err);\n  }\n};\n\nexport const gasEstimateForShield = async (\n  networkName: NetworkName,\n  shieldPrivateKey: string,\n  erc20AmountRecipients: DopERC20AmountRecipient[],\n  nftAmountRecipients: DopNFTAmountRecipient[],\n  fromWalletAddress: string,\n): Promise<DopTransactionGasEstimateResponse> => {\n  try {\n    assertNotBlockedAddress(fromWalletAddress);\n\n    const transaction = await generateShieldTransaction(\n      networkName,\n      shieldPrivateKey,\n      erc20AmountRecipients,\n      nftAmountRecipients,\n    );\n    console.log(\"transaction:::1\", transaction);\n\n\n    const sendWithPublicWallet = true;\n    const isGasEstimateWithDummyProof = false;\n    return gasEstimateResponse(\n      await getGasEstimate(\n        networkName,\n        transaction,\n        fromWalletAddress,\n        sendWithPublicWallet,\n        false, // isCrossContractCall\n      ),\n      undefined, // relayerFeeCommitment\n      isGasEstimateWithDummyProof,\n    );\n  } catch (err) {\n    throw reportAndSanitizeError(gasEstimateForShield.name, err);\n  }\n};\n"]}

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

@@ -1,3 +1,2 @@
-import { DopPopulateTransactionResponse, DopTransactionGasEstimateResponse, NetworkName, FeeTokenDetails, DopERC20AmountRecipient, DopNFTAmountRecipient, TransactionGasDetails } from 'dop-sharedmodel-v5';
+import { DopPopulateTransactionResponse, NetworkName, DopERC20AmountRecipient, DopNFTAmountRecipient, TransactionGasDetails } from 'dop-sharedmodel-v5';
 export declare const populateProvedTransfer: (networkName: NetworkName, dopWalletID: string, showSenderAddressToRecipient: boolean, memoText: Optional<string>, erc20AmountRecipients: DopERC20AmountRecipient[], nftAmountRecipients: DopNFTAmountRecipient[], relayerFeeERC20AmountRecipient: Optional<DopERC20AmountRecipient>, sendWithPublicWallet: boolean, overallBatchMinGasPrice: Optional<bigint>, gasDetails: TransactionGasDetails) => Promise<DopPopulateTransactionResponse>;
-export declare const gasEstimateForUnprovenTransfer: (networkName: NetworkName, dopWalletID: string, encryptionKey: string, memoText: Optional<string>, erc20AmountRecipients: DopERC20AmountRecipient[], nftAmountRecipients: DopNFTAmountRecipient[], originalGasDetails: TransactionGasDetails, feeTokenDetails: Optional<FeeTokenDetails>, sendWithPublicWallet: boolean) => Promise<DopTransactionGasEstimateResponse>;

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

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.gasEstimateForUnprovenTransfer = exports.populateProvedTransfer = void 0;
+exports.populateProvedTransfer = void 0;
 const dop_sharedmodel_v5_1 = require("dop-sharedmodel-v5");
-const tx_generator_1 = require("./tx-generator");
 const proof_cache_1 = require("./proof-cache");
-const tx_gas_relayer_fee_estimator_1 = require("./tx-gas-relayer-fee-estimator");
+// import { gasEstimateResponseDummyProofIterativeRelayerFee } from './tx-gas-relayer-fee-estimator';
 const error_1 = require("../../utils/error");
 const populateProvedTransfer = async (networkName, dopWalletID, showSenderAddressToRecipient, memoText, erc20AmountRecipients, nftAmountRecipients, relayerFeeERC20AmountRecipient, sendWithPublicWallet, overallBatchMinGasPrice, gasDetails) => {
     try {
@@ -24,16 +23,56 @@ const populateProvedTransfer = async (networkName, dopWalletID, showSenderAddres
     }
 };
 exports.populateProvedTransfer = populateProvedTransfer;
-const gasEstimateForUnprovenTransfer = async (networkName, dopWalletID, encryptionKey, memoText, erc20AmountRecipients, nftAmountRecipients, originalGasDetails, feeTokenDetails, sendWithPublicWallet) => {
-    try {
-        const overallBatchMinGasPrice = 0n;
-        const response = await (0, tx_gas_relayer_fee_estimator_1.gasEstimateResponseDummyProofIterativeRelayerFee)((relayerFeeERC20Amount) => (0, tx_generator_1.generateDummyProofTransactions)(dop_sharedmodel_v5_1.ProofType.Transfer, networkName, dopWalletID, encryptionKey, false, // showSenderAddressToRecipient - doesn't matter for gas estimate.
-        memoText, erc20AmountRecipients, nftAmountRecipients, relayerFeeERC20Amount, sendWithPublicWallet, overallBatchMinGasPrice), (txs) => (0, tx_generator_1.generateTransact)(txs, networkName, true), networkName, dopWalletID, erc20AmountRecipients, originalGasDetails, feeTokenDetails, sendWithPublicWallet, false);
-        return response;
-    }
-    catch (err) {
-        throw (0, error_1.reportAndSanitizeError)(exports.gasEstimateForUnprovenTransfer.name, err);
-    }
+/*
+export const gasEstimateForUnprovenTransfer = async (
+  networkName: NetworkName,
+  dopWalletID: string,
+  encryptionKey: string,
+  memoText: Optional<string>,
+  erc20AmountRecipients: DopERC20AmountRecipient[],
+  nftAmountRecipients: DopNFTAmountRecipient[],
+  originalGasDetails: TransactionGasDetails,
+  feeTokenDetails: Optional<FeeTokenDetails>,
+  sendWithPublicWallet: boolean,
+  valueCheck: bigint,
+): Promise<DopTransactionGasEstimateResponse> => {
+  try {
+    const overallBatchMinGasPrice = 0n;
+
+    const response = await gasEstimateResponseDummyProofIterativeRelayerFee(
+      (relayerFeeERC20Amount: Optional<DopERC20Amount>) =>
+        generateDummyProofTransactions(
+          ProofType.Transfer,
+          networkName,
+          dopWalletID,
+          encryptionKey,
+          false, // showSenderAddressToRecipient - doesn't matter for gas estimate.
+          memoText,
+          erc20AmountRecipients,
+          nftAmountRecipients,
+          relayerFeeERC20Amount,
+          sendWithPublicWallet,
+          overallBatchMinGasPrice,
+          valueCheck,
+        ),
+      (txs: TransactionStruct[]) =>
+        generateTransact(
+          txs,
+          networkName,
+          true, // useDummyProof
+        ),
+      networkName,
+      dopWalletID,
+      erc20AmountRecipients,
+      originalGasDetails,
+      feeTokenDetails,
+      sendWithPublicWallet,
+      false, // isCrossContractCall
+    );
+    return response;
+  } catch (err) {
+    throw reportAndSanitizeError(gasEstimateForUnprovenTransfer.name, err);
+  }
 };
-exports.gasEstimateForUnprovenTransfer = gasEstimateForUnprovenTransfer;
+*/ 
 //# sourceMappingURL=tx-transfer.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"tx-transfer.js","sourceRoot":"","sources":["../../../src/services/transactions/tx-transfer.ts"],"names":[],"mappings":";;;AAAA,2DAU4B;AAC5B,iDAGwB;AACxB,+CAA0D;AAE1D,iFAAkG;AAClG,6CAA2D;AAEpD,MAAM,sBAAsB,GAAG,KAAK,EACzC,WAAwB,EACxB,WAAmB,EACnB,4BAAqC,EACrC,QAA0B,EAC1B,qBAAgD,EAChD,mBAA4C,EAC5C,8BAAiE,EACjE,oBAA6B,EAC7B,uBAAyC,EACzC,UAAiC,EACQ,EAAE;IAC3C,IAAI;QACF,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,uCAAyB,EACjE,WAAW,EACX,8BAAS,CAAC,QAAQ,EAClB,WAAW,EACX,4BAA4B,EAC5B,QAAQ,EACR,qBAAqB,EACrB,mBAAmB,EACnB,SAAS,EAAE,0CAA0C;QACrD,SAAS,EAAE,+BAA+B;QAC1C,SAAS,EAAE,kCAAkC;QAC7C,SAAS,EAAE,gCAAgC;QAC3C,SAAS,EAAE,qBAAqB;QAChC,8BAA8B,EAC9B,oBAAoB,EACpB,uBAAuB,EACvB,UAAU,CACX,CAAC;QACF,OAAO;YACL,UAAU;YACV,WAAW;SACZ,CAAC;KACH;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAA,8BAAsB,EAAC,8BAAsB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;KAChE;AACH,CAAC,CAAC;AAtCW,QAAA,sBAAsB,0BAsCjC;AAEK,MAAM,8BAA8B,GAAG,KAAK,EACjD,WAAwB,EACxB,WAAmB,EACnB,aAAqB,EACrB,QAA0B,EAC1B,qBAAgD,EAChD,mBAA4C,EAC5C,kBAAyC,EACzC,eAA0C,EAC1C,oBAA6B,EACe,EAAE;IAC9C,IAAI;QACF,MAAM,uBAAuB,GAAG,EAAE,CAAC;QAEnC,MAAM,QAAQ,GAAG,MAAM,IAAA,+EAAgD,EACrE,CAAC,qBAA+C,EAAE,EAAE,CAClD,IAAA,6CAA8B,EAC5B,8BAAS,CAAC,QAAQ,EAClB,WAAW,EACX,WAAW,EACX,aAAa,EACb,KAAK,EAAE,kEAAkE;QACzE,QAAQ,EACR,qBAAqB,EACrB,mBAAmB,EACnB,qBAAqB,EACrB,oBAAoB,EACpB,uBAAuB,CACxB,EACH,CAAC,GAAwB,EAAE,EAAE,CAC3B,IAAA,+BAAgB,EACd,GAAG,EACH,WAAW,EACX,IAAI,CACL,EACH,WAAW,EACX,WAAW,EACX,qBAAqB,EACrB,kBAAkB,EAClB,eAAe,EACf,oBAAoB,EACpB,KAAK,CACN,CAAC;QACF,OAAO,QAAQ,CAAC;KACjB;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAA,8BAAsB,EAAC,sCAA8B,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;KACxE;AACH,CAAC,CAAC;AA/CW,QAAA,8BAA8B,kCA+CzC","sourcesContent":["import {\n  DopPopulateTransactionResponse,\n  DopTransactionGasEstimateResponse,\n  DopERC20Amount,\n  NetworkName,\n  ProofType,\n  FeeTokenDetails,\n  DopERC20AmountRecipient,\n  DopNFTAmountRecipient,\n  TransactionGasDetails,\n} from 'dop-sharedmodel-v5';\nimport {\n  generateDummyProofTransactions,\n  generateTransact,\n} from './tx-generator';\nimport { populateProvedTransaction } from './proof-cache';\nimport { TransactionStruct } from 'dop-engine-v5';\nimport { gasEstimateResponseDummyProofIterativeRelayerFee } from './tx-gas-relayer-fee-estimator';\nimport { reportAndSanitizeError } from '../../utils/error';\n\nexport const populateProvedTransfer = async (\n  networkName: NetworkName,\n  dopWalletID: 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  gasDetails: TransactionGasDetails,\n): Promise<DopPopulateTransactionResponse> => {\n  try {\n    const { transaction, nullifiers } = await populateProvedTransaction(\n      networkName,\n      ProofType.Transfer,\n      dopWalletID,\n      showSenderAddressToRecipient,\n      memoText,\n      erc20AmountRecipients,\n      nftAmountRecipients,\n      undefined, // relayAdaptUnshieldERC20AmountRecipients\n      undefined, // relayAdaptUnshieldNFTAmounts\n      undefined, // relayAdaptShieldERC20Recipients\n      undefined, // relayAdaptShieldNFTRecipients\n      undefined, // crossContractCalls\n      relayerFeeERC20AmountRecipient,\n      sendWithPublicWallet,\n      overallBatchMinGasPrice,\n      gasDetails,\n    );\n    return {\n      nullifiers,\n      transaction,\n    };\n  } catch (err) {\n    throw reportAndSanitizeError(populateProvedTransfer.name, err);\n  }\n};\n\nexport const gasEstimateForUnprovenTransfer = async (\n  networkName: NetworkName,\n  dopWalletID: string,\n  encryptionKey: string,\n  memoText: Optional<string>,\n  erc20AmountRecipients: DopERC20AmountRecipient[],\n  nftAmountRecipients: DopNFTAmountRecipient[],\n  originalGasDetails: TransactionGasDetails,\n  feeTokenDetails: Optional<FeeTokenDetails>,\n  sendWithPublicWallet: boolean,\n): Promise<DopTransactionGasEstimateResponse> => {\n  try {\n    const overallBatchMinGasPrice = 0n;\n\n    const response = await gasEstimateResponseDummyProofIterativeRelayerFee(\n      (relayerFeeERC20Amount: Optional<DopERC20Amount>) =>\n        generateDummyProofTransactions(\n          ProofType.Transfer,\n          networkName,\n          dopWalletID,\n          encryptionKey,\n          false, // showSenderAddressToRecipient - doesn't matter for gas estimate.\n          memoText,\n          erc20AmountRecipients,\n          nftAmountRecipients,\n          relayerFeeERC20Amount,\n          sendWithPublicWallet,\n          overallBatchMinGasPrice,\n        ),\n      (txs: TransactionStruct[]) =>\n        generateTransact(\n          txs,\n          networkName,\n          true, // useDummyProof\n        ),\n      networkName,\n      dopWalletID,\n      erc20AmountRecipients,\n      originalGasDetails,\n      feeTokenDetails,\n      sendWithPublicWallet,\n      false, // isCrossContractCall\n    );\n    return response;\n  } catch (err) {\n    throw reportAndSanitizeError(gasEstimateForUnprovenTransfer.name, err);\n  }\n};\n"]}
+{"version":3,"file":"tx-transfer.js","sourceRoot":"","sources":["../../../src/services/transactions/tx-transfer.ts"],"names":[],"mappings":";;;AAAA,2DAU4B;AAK5B,+CAA0D;AAE1D,qGAAqG;AACrG,6CAA2D;AAEpD,MAAM,sBAAsB,GAAG,KAAK,EACzC,WAAwB,EACxB,WAAmB,EACnB,4BAAqC,EACrC,QAA0B,EAC1B,qBAAgD,EAChD,mBAA4C,EAC5C,8BAAiE,EACjE,oBAA6B,EAC7B,uBAAyC,EACzC,UAAiC,EACQ,EAAE;IAC3C,IAAI;QACF,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,uCAAyB,EACjE,WAAW,EACX,8BAAS,CAAC,QAAQ,EAClB,WAAW,EACX,4BAA4B,EAC5B,QAAQ,EACR,qBAAqB,EACrB,mBAAmB,EACnB,SAAS,EAAE,0CAA0C;QACrD,SAAS,EAAE,+BAA+B;QAC1C,SAAS,EAAE,kCAAkC;QAC7C,SAAS,EAAE,gCAAgC;QAC3C,SAAS,EAAE,qBAAqB;QAChC,8BAA8B,EAC9B,oBAAoB,EACpB,uBAAuB,EACvB,UAAU,CACX,CAAC;QACF,OAAO;YACL,UAAU;YACV,WAAW;SACZ,CAAC;KACH;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAA,8BAAsB,EAAC,8BAAsB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;KAChE;AACH,CAAC,CAAC;AAtCW,QAAA,sBAAsB,0BAsCjC;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAmDE","sourcesContent":["import {\n  DopPopulateTransactionResponse,\n  DopTransactionGasEstimateResponse,\n  DopERC20Amount,\n  NetworkName,\n  ProofType,\n  FeeTokenDetails,\n  DopERC20AmountRecipient,\n  DopNFTAmountRecipient,\n  TransactionGasDetails,\n} from 'dop-sharedmodel-v5';\nimport {\n  generateDummyProofTransactions,\n  generateTransact,\n} from './tx-generator';\nimport { populateProvedTransaction } from './proof-cache';\nimport { TransactionStruct } from 'dop-engine-v5';\n// import { gasEstimateResponseDummyProofIterativeRelayerFee } from './tx-gas-relayer-fee-estimator';\nimport { reportAndSanitizeError } from '../../utils/error';\n\nexport const populateProvedTransfer = async (\n  networkName: NetworkName,\n  dopWalletID: 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  gasDetails: TransactionGasDetails,\n): Promise<DopPopulateTransactionResponse> => {\n  try {\n    const { transaction, nullifiers } = await populateProvedTransaction(\n      networkName,\n      ProofType.Transfer,\n      dopWalletID,\n      showSenderAddressToRecipient,\n      memoText,\n      erc20AmountRecipients,\n      nftAmountRecipients,\n      undefined, // relayAdaptUnshieldERC20AmountRecipients\n      undefined, // relayAdaptUnshieldNFTAmounts\n      undefined, // relayAdaptShieldERC20Recipients\n      undefined, // relayAdaptShieldNFTRecipients\n      undefined, // crossContractCalls\n      relayerFeeERC20AmountRecipient,\n      sendWithPublicWallet,\n      overallBatchMinGasPrice,\n      gasDetails,\n    );\n    return {\n      nullifiers,\n      transaction,\n    };\n  } catch (err) {\n    throw reportAndSanitizeError(populateProvedTransfer.name, err);\n  }\n};\n/*\nexport const gasEstimateForUnprovenTransfer = async (\n  networkName: NetworkName,\n  dopWalletID: string,\n  encryptionKey: string,\n  memoText: Optional<string>,\n  erc20AmountRecipients: DopERC20AmountRecipient[],\n  nftAmountRecipients: DopNFTAmountRecipient[],\n  originalGasDetails: TransactionGasDetails,\n  feeTokenDetails: Optional<FeeTokenDetails>,\n  sendWithPublicWallet: boolean,\n  valueCheck: bigint,\n): Promise<DopTransactionGasEstimateResponse> => {\n  try {\n    const overallBatchMinGasPrice = 0n;\n\n    const response = await gasEstimateResponseDummyProofIterativeRelayerFee(\n      (relayerFeeERC20Amount: Optional<DopERC20Amount>) =>\n        generateDummyProofTransactions(\n          ProofType.Transfer,\n          networkName,\n          dopWalletID,\n          encryptionKey,\n          false, // showSenderAddressToRecipient - doesn't matter for gas estimate.\n          memoText,\n          erc20AmountRecipients,\n          nftAmountRecipients,\n          relayerFeeERC20Amount,\n          sendWithPublicWallet,\n          overallBatchMinGasPrice,\n          valueCheck,\n        ),\n      (txs: TransactionStruct[]) =>\n        generateTransact(\n          txs,\n          networkName,\n          true, // useDummyProof\n        ),\n      networkName,\n      dopWalletID,\n      erc20AmountRecipients,\n      originalGasDetails,\n      feeTokenDetails,\n      sendWithPublicWallet,\n      false, // isCrossContractCall\n    );\n    return response;\n  } catch (err) {\n    throw reportAndSanitizeError(gasEstimateForUnprovenTransfer.name, err);\n  }\n};\n*/"]}

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

@@ -1,5 +1,3 @@
-import { DopPopulateTransactionResponse, DopTransactionGasEstimateResponse, DopERC20Amount, NetworkName, FeeTokenDetails, DopERC20AmountRecipient, DopNFTAmountRecipient, TransactionGasDetails } from 'dop-sharedmodel-v5';
+import { DopPopulateTransactionResponse, DopERC20Amount, NetworkName, DopERC20AmountRecipient, DopNFTAmountRecipient, TransactionGasDetails } from 'dop-sharedmodel-v5';
 export declare const populateProvedUnshield: (networkName: NetworkName, dopWalletID: string, erc20AmountRecipients: DopERC20AmountRecipient[], nftAmountRecipients: DopNFTAmountRecipient[], relayerFeeERC20AmountRecipient: Optional<DopERC20AmountRecipient>, sendWithPublicWallet: boolean, overallBatchMinGasPrice: Optional<bigint>, gasDetails: TransactionGasDetails) => Promise<DopPopulateTransactionResponse>;
 export declare const populateProvedUnshieldBaseToken: (networkName: NetworkName, publicWalletAddress: string, dopWalletID: string, wrappedERC20Amount: DopERC20Amount, relayerFeeERC20AmountRecipient: Optional<DopERC20AmountRecipient>, sendWithPublicWallet: boolean, overallBatchMinGasPrice: Optional<bigint>, gasDetails: TransactionGasDetails) => Promise<DopPopulateTransactionResponse>;
-export declare const gasEstimateForUnprovenUnshield: (networkName: NetworkName, dopWalletID: string, encryptionKey: string, erc20AmountRecipients: DopERC20AmountRecipient[], nftAmountRecipients: DopNFTAmountRecipient[], originalGasDetails: TransactionGasDetails, feeTokenDetails: Optional<FeeTokenDetails>, sendWithPublicWallet: boolean) => Promise<DopTransactionGasEstimateResponse>;
-export declare const gasEstimateForUnprovenUnshieldBaseToken: (networkName: NetworkName, publicWalletAddress: string, dopWalletID: string, encryptionKey: string, wrappedERC20Amount: DopERC20Amount, originalGasDetails: TransactionGasDetails, feeTokenDetails: Optional<FeeTokenDetails>, sendWithPublicWallet: boolean) => Promise<DopTransactionGasEstimateResponse>;

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

@@ -1,12 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.gasEstimateForUnprovenUnshieldBaseToken = exports.gasEstimateForUnprovenUnshield = exports.populateProvedUnshieldBaseToken = exports.populateProvedUnshield = void 0;
+exports.populateProvedUnshieldBaseToken = exports.populateProvedUnshield = void 0;
 const dop_sharedmodel_v5_1 = require("dop-sharedmodel-v5");
-const tx_generator_1 = require("./tx-generator");
 const proof_cache_1 = require("./proof-cache");
-const dop_engine_v5_1 = require("dop-engine-v5");
-const tx_gas_relayer_fee_estimator_1 = require("./tx-gas-relayer-fee-estimator");
-const tx_cross_contract_calls_1 = require("./tx-cross-contract-calls");
 const error_1 = require("../../utils/error");
 const populateProvedUnshield = async (networkName, dopWalletID, erc20AmountRecipients, nftAmountRecipients, relayerFeeERC20AmountRecipient, sendWithPublicWallet, overallBatchMinGasPrice, gasDetails) => {
     try {
@@ -58,38 +54,121 @@ const populateProvedUnshieldBaseToken = async (networkName, publicWalletAddress,
     }
 };
 exports.populateProvedUnshieldBaseToken = populateProvedUnshieldBaseToken;
-const gasEstimateForUnprovenUnshield = async (networkName, dopWalletID, encryptionKey, erc20AmountRecipients, nftAmountRecipients, originalGasDetails, feeTokenDetails, sendWithPublicWallet) => {
-    try {
-        const overallBatchMinGasPrice = 0n;
-        const response = await (0, tx_gas_relayer_fee_estimator_1.gasEstimateResponseDummyProofIterativeRelayerFee)((relayerFeeERC20Amount) => (0, tx_generator_1.generateDummyProofTransactions)(dop_sharedmodel_v5_1.ProofType.Unshield, networkName, dopWalletID, encryptionKey, false, // showSenderAddressToRecipient
-        undefined, // memoText
-        erc20AmountRecipients, nftAmountRecipients, relayerFeeERC20Amount, sendWithPublicWallet, overallBatchMinGasPrice), (txs) => (0, tx_generator_1.generateTransact)(txs, networkName, true), networkName, dopWalletID, erc20AmountRecipients, originalGasDetails, feeTokenDetails, sendWithPublicWallet, false);
-        return response;
-    }
-    catch (err) {
-        throw (0, error_1.reportAndSanitizeError)(exports.gasEstimateForUnprovenUnshield.name, err);
-    }
+/*
+export const gasEstimateForUnprovenUnshield = async (
+  networkName: NetworkName,
+  dopWalletID: string,
+  encryptionKey: string,
+  erc20AmountRecipients: DopERC20AmountRecipient[],
+  nftAmountRecipients: DopNFTAmountRecipient[],
+  originalGasDetails: TransactionGasDetails,
+  feeTokenDetails: Optional<FeeTokenDetails>,
+  sendWithPublicWallet: boolean,
+  valueCheck: bigint,
+): Promise<DopTransactionGasEstimateResponse> => {
+  try {
+    const overallBatchMinGasPrice = 0n;
+
+    const response = await gasEstimateResponseDummyProofIterativeRelayerFee(
+      (relayerFeeERC20Amount: Optional<DopERC20Amount>) =>
+        generateDummyProofTransactions(
+          ProofType.Unshield,
+          networkName,
+          dopWalletID,
+          encryptionKey,
+          false, // showSenderAddressToRecipient
+          undefined, // memoText
+          erc20AmountRecipients,
+          nftAmountRecipients,
+          relayerFeeERC20Amount,
+          sendWithPublicWallet,
+          overallBatchMinGasPrice,
+          valueCheck
+        ),
+      (txs: TransactionStruct[]) =>
+        generateTransact(
+          txs,
+          networkName,
+          true, // useDummyProof
+        ),
+      networkName,
+      dopWalletID,
+      erc20AmountRecipients,
+      originalGasDetails,
+      feeTokenDetails,
+      sendWithPublicWallet,
+      false, // isCrossContractCall
+    );
+    return response;
+  } catch (err) {
+    throw reportAndSanitizeError(gasEstimateForUnprovenUnshield.name, err);
+  }
 };
-exports.gasEstimateForUnprovenUnshield = gasEstimateForUnprovenUnshield;
-const gasEstimateForUnprovenUnshieldBaseToken = async (networkName, publicWalletAddress, dopWalletID, encryptionKey, wrappedERC20Amount, originalGasDetails, feeTokenDetails, sendWithPublicWallet) => {
-    try {
-        const relayAdaptUnshieldERC20AmountRecipients = (0, tx_cross_contract_calls_1.createRelayAdaptUnshieldERC20AmountRecipients)(networkName, [
-            wrappedERC20Amount,
-        ]);
-        // Empty NFT Recipients.
-        const nftAmountRecipients = [];
-        const overallBatchMinGasPrice = 0n;
-        const response = await (0, tx_gas_relayer_fee_estimator_1.gasEstimateResponseDummyProofIterativeRelayerFee)((relayerFeeERC20Amount) => (0, tx_generator_1.generateDummyProofTransactions)(dop_sharedmodel_v5_1.ProofType.UnshieldBaseToken, networkName, dopWalletID, encryptionKey, false, // showSenderAddressToRecipient
-        undefined, // memoText
-        relayAdaptUnshieldERC20AmountRecipients, nftAmountRecipients, relayerFeeERC20Amount, sendWithPublicWallet, overallBatchMinGasPrice), (txs) => {
-            const relayAdaptParamsRandom = (0, dop_engine_v5_1.randomHex)(31);
-            return (0, tx_generator_1.generateUnshieldBaseToken)(txs, networkName, publicWalletAddress, relayAdaptParamsRandom, true);
-        }, networkName, dopWalletID, relayAdaptUnshieldERC20AmountRecipients, originalGasDetails, feeTokenDetails, sendWithPublicWallet, false);
-        return response;
-    }
-    catch (err) {
-        throw (0, error_1.reportAndSanitizeError)(exports.gasEstimateForUnprovenUnshieldBaseToken.name, err);
-    }
+*/
+/*
+export const gasEstimateForUnprovenUnshieldBaseToken = async (
+  networkName: NetworkName,
+  publicWalletAddress: string,
+  dopWalletID: string,
+  encryptionKey: string,
+  wrappedERC20Amount: DopERC20Amount,
+  originalGasDetails: TransactionGasDetails,
+  feeTokenDetails: Optional<FeeTokenDetails>,
+  sendWithPublicWallet: boolean,
+  valueCheck: bigint,
+): Promise<DopTransactionGasEstimateResponse> => {
+  try {
+    const relayAdaptUnshieldERC20AmountRecipients: DopERC20AmountRecipient[] =
+      createRelayAdaptUnshieldERC20AmountRecipients(networkName, [
+        wrappedERC20Amount,
+      ]);
+
+    // Empty NFT Recipients.
+    const nftAmountRecipients: DopNFTAmountRecipient[] = [];
+
+    const overallBatchMinGasPrice = 0n;
+
+    const response = await gasEstimateResponseDummyProofIterativeRelayerFee(
+      (relayerFeeERC20Amount: Optional<DopERC20Amount>) =>
+        generateDummyProofTransactions(
+          ProofType.UnshieldBaseToken,
+          networkName,
+          dopWalletID,
+          encryptionKey,
+          false, // showSenderAddressToRecipient
+          undefined, // memoText
+          relayAdaptUnshieldERC20AmountRecipients,
+          nftAmountRecipients,
+          relayerFeeERC20Amount,
+          sendWithPublicWallet,
+          overallBatchMinGasPrice,
+          valueCheck
+        ),
+      (txs: TransactionStruct[]) => {
+        const relayAdaptParamsRandom = randomHex(31);
+        return generateUnshieldBaseToken(
+          txs,
+          networkName,
+          publicWalletAddress,
+          relayAdaptParamsRandom,
+          true, // useDummyProof
+        );
+      },
+      networkName,
+      dopWalletID,
+      relayAdaptUnshieldERC20AmountRecipients,
+      originalGasDetails,
+      feeTokenDetails,
+      sendWithPublicWallet,
+      false, // isCrossContractCall
+    );
+    return response;
+  } catch (err) {
+    throw reportAndSanitizeError(
+      gasEstimateForUnprovenUnshieldBaseToken.name,
+      err,
+    );
+  }
 };
-exports.gasEstimateForUnprovenUnshieldBaseToken = gasEstimateForUnprovenUnshieldBaseToken;
+*/ 
 //# sourceMappingURL=tx-unshield.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"tx-unshield.js","sourceRoot":"","sources":["../../../src/services/transactions/tx-unshield.ts"],"names":[],"mappings":";;;AAAA,2DAU4B;AAC5B,iDAIwB;AACxB,+CAA0D;AAC1D,iDAA6D;AAC7D,iFAAkG;AAClG,uEAA0F;AAC1F,6CAA2D;AAEpD,MAAM,sBAAsB,GAAG,KAAK,EACzC,WAAwB,EACxB,WAAmB,EACnB,qBAAgD,EAChD,mBAA4C,EAC5C,8BAAiE,EACjE,oBAA6B,EAC7B,uBAAyC,EACzC,UAAiC,EACQ,EAAE;IAC3C,IAAI;QACF,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,uCAAyB,EACjE,WAAW,EACX,8BAAS,CAAC,QAAQ,EAClB,WAAW,EACX,KAAK,EAAE,+BAA+B;QACtC,SAAS,EAAE,WAAW;QACtB,qBAAqB,EACrB,mBAAmB,EACnB,SAAS,EAAE,0CAA0C;QACrD,SAAS,EAAE,+BAA+B;QAC1C,SAAS,EAAE,kCAAkC;QAC7C,SAAS,EAAE,gCAAgC;QAC3C,SAAS,EAAE,qBAAqB;QAChC,8BAA8B,EAC9B,oBAAoB,EACpB,uBAAuB,EACvB,UAAU,CACX,CAAC;QACF,OAAO;YACL,UAAU;YACV,WAAW;SACZ,CAAC;KACH;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAA,8BAAsB,EAAC,8BAAsB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;KAChE;AACH,CAAC,CAAC;AApCW,QAAA,sBAAsB,0BAoCjC;AAEK,MAAM,+BAA+B,GAAG,KAAK,EAClD,WAAwB,EACxB,mBAA2B,EAC3B,WAAmB,EACnB,kBAAkC,EAClC,8BAAiE,EACjE,oBAA6B,EAC7B,uBAAyC,EACzC,UAAiC,EACQ,EAAE;IAC3C,IAAI;QACF,MAAM,qBAAqB,GAA8B;YACvD;gBACE,GAAG,kBAAkB;gBACrB,gBAAgB,EAAE,mBAAmB;aACtC;SACF,CAAC;QACF,MAAM,8BAA8B,GAAqB;YACvD,kBAAkB;SACnB,CAAC;QAEF,wBAAwB;QACxB,MAAM,mBAAmB,GAA4B,EAAE,CAAC;QAExD,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,uCAAyB,EACjE,WAAW,EACX,8BAAS,CAAC,iBAAiB,EAC3B,WAAW,EACX,KAAK,EAAE,+BAA+B;QACtC,SAAS,EAAE,WAAW;QACtB,qBAAqB,EACrB,mBAAmB,EACnB,8BAA8B,EAC9B,SAAS,EAAE,+BAA+B;QAC1C,SAAS,EAAE,kCAAkC;QAC7C,SAAS,EAAE,gCAAgC;QAC3C,SAAS,EAAE,qBAAqB;QAChC,8BAA8B,EAC9B,oBAAoB,EACpB,uBAAuB,EACvB,UAAU,CACX,CAAC;QACF,OAAO;YACL,UAAU;YACV,WAAW;SACZ,CAAC;KACH;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAA,8BAAsB,EAAC,uCAA+B,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;KACzE;AACH,CAAC,CAAC;AAjDW,QAAA,+BAA+B,mCAiD1C;AAEK,MAAM,8BAA8B,GAAG,KAAK,EACjD,WAAwB,EACxB,WAAmB,EACnB,aAAqB,EACrB,qBAAgD,EAChD,mBAA4C,EAC5C,kBAAyC,EACzC,eAA0C,EAC1C,oBAA6B,EACe,EAAE;IAC9C,IAAI;QACF,MAAM,uBAAuB,GAAG,EAAE,CAAC;QAEnC,MAAM,QAAQ,GAAG,MAAM,IAAA,+EAAgD,EACrE,CAAC,qBAA+C,EAAE,EAAE,CAClD,IAAA,6CAA8B,EAC5B,8BAAS,CAAC,QAAQ,EAClB,WAAW,EACX,WAAW,EACX,aAAa,EACb,KAAK,EAAE,+BAA+B;QACtC,SAAS,EAAE,WAAW;QACtB,qBAAqB,EACrB,mBAAmB,EACnB,qBAAqB,EACrB,oBAAoB,EACpB,uBAAuB,CACxB,EACH,CAAC,GAAwB,EAAE,EAAE,CAC3B,IAAA,+BAAgB,EACd,GAAG,EACH,WAAW,EACX,IAAI,CACL,EACH,WAAW,EACX,WAAW,EACX,qBAAqB,EACrB,kBAAkB,EAClB,eAAe,EACf,oBAAoB,EACpB,KAAK,CACN,CAAC;QACF,OAAO,QAAQ,CAAC;KACjB;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAA,8BAAsB,EAAC,sCAA8B,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;KACxE;AACH,CAAC,CAAC;AA9CW,QAAA,8BAA8B,kCA8CzC;AAEK,MAAM,uCAAuC,GAAG,KAAK,EAC1D,WAAwB,EACxB,mBAA2B,EAC3B,WAAmB,EACnB,aAAqB,EACrB,kBAAkC,EAClC,kBAAyC,EACzC,eAA0C,EAC1C,oBAA6B,EACe,EAAE;IAC9C,IAAI;QACF,MAAM,uCAAuC,GAC3C,IAAA,uEAA6C,EAAC,WAAW,EAAE;YACzD,kBAAkB;SACnB,CAAC,CAAC;QAEL,wBAAwB;QACxB,MAAM,mBAAmB,GAA4B,EAAE,CAAC;QAExD,MAAM,uBAAuB,GAAG,EAAE,CAAC;QAEnC,MAAM,QAAQ,GAAG,MAAM,IAAA,+EAAgD,EACrE,CAAC,qBAA+C,EAAE,EAAE,CAClD,IAAA,6CAA8B,EAC5B,8BAAS,CAAC,iBAAiB,EAC3B,WAAW,EACX,WAAW,EACX,aAAa,EACb,KAAK,EAAE,+BAA+B;QACtC,SAAS,EAAE,WAAW;QACtB,uCAAuC,EACvC,mBAAmB,EACnB,qBAAqB,EACrB,oBAAoB,EACpB,uBAAuB,CACxB,EACH,CAAC,GAAwB,EAAE,EAAE;YAC3B,MAAM,sBAAsB,GAAG,IAAA,yBAAS,EAAC,EAAE,CAAC,CAAC;YAC7C,OAAO,IAAA,wCAAyB,EAC9B,GAAG,EACH,WAAW,EACX,mBAAmB,EACnB,sBAAsB,EACtB,IAAI,CACL,CAAC;QACJ,CAAC,EACD,WAAW,EACX,WAAW,EACX,uCAAuC,EACvC,kBAAkB,EAClB,eAAe,EACf,oBAAoB,EACpB,KAAK,CACN,CAAC;QACF,OAAO,QAAQ,CAAC;KACjB;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAA,8BAAsB,EAC1B,+CAAuC,CAAC,IAAI,EAC5C,GAAG,CACJ,CAAC;KACH;AACH,CAAC,CAAC;AA7DW,QAAA,uCAAuC,2CA6DlD","sourcesContent":["import {\n  DopPopulateTransactionResponse,\n  DopTransactionGasEstimateResponse,\n  DopERC20Amount,\n  NetworkName,\n  ProofType,\n  FeeTokenDetails,\n  DopERC20AmountRecipient,\n  DopNFTAmountRecipient,\n  TransactionGasDetails,\n} from 'dop-sharedmodel-v5';\nimport {\n  generateDummyProofTransactions,\n  generateTransact,\n  generateUnshieldBaseToken,\n} from './tx-generator';\nimport { populateProvedTransaction } from './proof-cache';\nimport { randomHex, TransactionStruct } from 'dop-engine-v5';\nimport { gasEstimateResponseDummyProofIterativeRelayerFee } from './tx-gas-relayer-fee-estimator';\nimport { createRelayAdaptUnshieldERC20AmountRecipients } from './tx-cross-contract-calls';\nimport { reportAndSanitizeError } from '../../utils/error';\n\nexport const populateProvedUnshield = async (\n  networkName: NetworkName,\n  dopWalletID: string,\n  erc20AmountRecipients: DopERC20AmountRecipient[],\n  nftAmountRecipients: DopNFTAmountRecipient[],\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.Unshield,\n      dopWalletID,\n      false, // showSenderAddressToRecipient\n      undefined, // memoText\n      erc20AmountRecipients,\n      nftAmountRecipients,\n      undefined, // relayAdaptUnshieldERC20AmountRecipients\n      undefined, // relayAdaptUnshieldNFTAmounts\n      undefined, // relayAdaptShieldERC20Recipients\n      undefined, // relayAdaptShieldNFTRecipients\n      undefined, // crossContractCalls\n      relayerFeeERC20AmountRecipient,\n      sendWithPublicWallet,\n      overallBatchMinGasPrice,\n      gasDetails,\n    );\n    return {\n      nullifiers,\n      transaction,\n    };\n  } catch (err) {\n    throw reportAndSanitizeError(populateProvedUnshield.name, err);\n  }\n};\n\nexport const populateProvedUnshieldBaseToken = async (\n  networkName: NetworkName,\n  publicWalletAddress: string,\n  dopWalletID: string,\n  wrappedERC20Amount: DopERC20Amount,\n  relayerFeeERC20AmountRecipient: Optional<DopERC20AmountRecipient>,\n  sendWithPublicWallet: boolean,\n  overallBatchMinGasPrice: Optional<bigint>,\n  gasDetails: TransactionGasDetails,\n): Promise<DopPopulateTransactionResponse> => {\n  try {\n    const erc20AmountRecipients: DopERC20AmountRecipient[] = [\n      {\n        ...wrappedERC20Amount,\n        recipientAddress: publicWalletAddress,\n      },\n    ];\n    const relayAdaptUnshieldERC20Amounts: DopERC20Amount[] = [\n      wrappedERC20Amount,\n    ];\n\n    // Empty NFT Recipients.\n    const nftAmountRecipients: DopNFTAmountRecipient[] = [];\n\n    const { transaction, nullifiers } = await populateProvedTransaction(\n      networkName,\n      ProofType.UnshieldBaseToken,\n      dopWalletID,\n      false, // showSenderAddressToRecipient\n      undefined, // memoText\n      erc20AmountRecipients,\n      nftAmountRecipients,\n      relayAdaptUnshieldERC20Amounts,\n      undefined, // relayAdaptUnshieldNFTAmounts\n      undefined, // relayAdaptShieldERC20Recipients\n      undefined, // relayAdaptShieldNFTRecipients\n      undefined, // crossContractCalls\n      relayerFeeERC20AmountRecipient,\n      sendWithPublicWallet,\n      overallBatchMinGasPrice,\n      gasDetails,\n    );\n    return {\n      nullifiers,\n      transaction,\n    };\n  } catch (err) {\n    throw reportAndSanitizeError(populateProvedUnshieldBaseToken.name, err);\n  }\n};\n\nexport const gasEstimateForUnprovenUnshield = async (\n  networkName: NetworkName,\n  dopWalletID: string,\n  encryptionKey: string,\n  erc20AmountRecipients: DopERC20AmountRecipient[],\n  nftAmountRecipients: DopNFTAmountRecipient[],\n  originalGasDetails: TransactionGasDetails,\n  feeTokenDetails: Optional<FeeTokenDetails>,\n  sendWithPublicWallet: boolean,\n): Promise<DopTransactionGasEstimateResponse> => {\n  try {\n    const overallBatchMinGasPrice = 0n;\n\n    const response = await gasEstimateResponseDummyProofIterativeRelayerFee(\n      (relayerFeeERC20Amount: Optional<DopERC20Amount>) =>\n        generateDummyProofTransactions(\n          ProofType.Unshield,\n          networkName,\n          dopWalletID,\n          encryptionKey,\n          false, // showSenderAddressToRecipient\n          undefined, // memoText\n          erc20AmountRecipients,\n          nftAmountRecipients,\n          relayerFeeERC20Amount,\n          sendWithPublicWallet,\n          overallBatchMinGasPrice,\n        ),\n      (txs: TransactionStruct[]) =>\n        generateTransact(\n          txs,\n          networkName,\n          true, // useDummyProof\n        ),\n      networkName,\n      dopWalletID,\n      erc20AmountRecipients,\n      originalGasDetails,\n      feeTokenDetails,\n      sendWithPublicWallet,\n      false, // isCrossContractCall\n    );\n    return response;\n  } catch (err) {\n    throw reportAndSanitizeError(gasEstimateForUnprovenUnshield.name, err);\n  }\n};\n\nexport const gasEstimateForUnprovenUnshieldBaseToken = async (\n  networkName: NetworkName,\n  publicWalletAddress: string,\n  dopWalletID: string,\n  encryptionKey: string,\n  wrappedERC20Amount: DopERC20Amount,\n  originalGasDetails: TransactionGasDetails,\n  feeTokenDetails: Optional<FeeTokenDetails>,\n  sendWithPublicWallet: boolean,\n): Promise<DopTransactionGasEstimateResponse> => {\n  try {\n    const relayAdaptUnshieldERC20AmountRecipients: DopERC20AmountRecipient[] =\n      createRelayAdaptUnshieldERC20AmountRecipients(networkName, [\n        wrappedERC20Amount,\n      ]);\n\n    // Empty NFT Recipients.\n    const nftAmountRecipients: DopNFTAmountRecipient[] = [];\n\n    const overallBatchMinGasPrice = 0n;\n\n    const response = await gasEstimateResponseDummyProofIterativeRelayerFee(\n      (relayerFeeERC20Amount: Optional<DopERC20Amount>) =>\n        generateDummyProofTransactions(\n          ProofType.UnshieldBaseToken,\n          networkName,\n          dopWalletID,\n          encryptionKey,\n          false, // showSenderAddressToRecipient\n          undefined, // memoText\n          relayAdaptUnshieldERC20AmountRecipients,\n          nftAmountRecipients,\n          relayerFeeERC20Amount,\n          sendWithPublicWallet,\n          overallBatchMinGasPrice,\n        ),\n      (txs: TransactionStruct[]) => {\n        const relayAdaptParamsRandom = randomHex(31);\n        return generateUnshieldBaseToken(\n          txs,\n          networkName,\n          publicWalletAddress,\n          relayAdaptParamsRandom,\n          true, // useDummyProof\n        );\n      },\n      networkName,\n      dopWalletID,\n      relayAdaptUnshieldERC20AmountRecipients,\n      originalGasDetails,\n      feeTokenDetails,\n      sendWithPublicWallet,\n      false, // isCrossContractCall\n    );\n    return response;\n  } catch (err) {\n    throw reportAndSanitizeError(\n      gasEstimateForUnprovenUnshieldBaseToken.name,\n      err,\n    );\n  }\n};\n"]}
+{"version":3,"file":"tx-unshield.js","sourceRoot":"","sources":["../../../src/services/transactions/tx-unshield.ts"],"names":[],"mappings":";;;AAAA,2DAU4B;AAM5B,+CAA0D;AAI1D,6CAA2D;AAEpD,MAAM,sBAAsB,GAAG,KAAK,EACzC,WAAwB,EACxB,WAAmB,EACnB,qBAAgD,EAChD,mBAA4C,EAC5C,8BAAiE,EACjE,oBAA6B,EAC7B,uBAAyC,EACzC,UAAiC,EACQ,EAAE;IAC3C,IAAI;QACF,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,uCAAyB,EACjE,WAAW,EACX,8BAAS,CAAC,QAAQ,EAClB,WAAW,EACX,KAAK,EAAE,+BAA+B;QACtC,SAAS,EAAE,WAAW;QACtB,qBAAqB,EACrB,mBAAmB,EACnB,SAAS,EAAE,0CAA0C;QACrD,SAAS,EAAE,+BAA+B;QAC1C,SAAS,EAAE,kCAAkC;QAC7C,SAAS,EAAE,gCAAgC;QAC3C,SAAS,EAAE,qBAAqB;QAChC,8BAA8B,EAC9B,oBAAoB,EACpB,uBAAuB,EACvB,UAAU,CACX,CAAC;QACF,OAAO;YACL,UAAU;YACV,WAAW;SACZ,CAAC;KACH;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAA,8BAAsB,EAAC,8BAAsB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;KAChE;AACH,CAAC,CAAC;AApCW,QAAA,sBAAsB,0BAoCjC;AAEK,MAAM,+BAA+B,GAAG,KAAK,EAClD,WAAwB,EACxB,mBAA2B,EAC3B,WAAmB,EACnB,kBAAkC,EAClC,8BAAiE,EACjE,oBAA6B,EAC7B,uBAAyC,EACzC,UAAiC,EACQ,EAAE;IAC3C,IAAI;QACF,MAAM,qBAAqB,GAA8B;YACvD;gBACE,GAAG,kBAAkB;gBACrB,gBAAgB,EAAE,mBAAmB;aACtC;SACF,CAAC;QACF,MAAM,8BAA8B,GAAqB;YACvD,kBAAkB;SACnB,CAAC;QAEF,wBAAwB;QACxB,MAAM,mBAAmB,GAA4B,EAAE,CAAC;QAExD,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,uCAAyB,EACjE,WAAW,EACX,8BAAS,CAAC,iBAAiB,EAC3B,WAAW,EACX,KAAK,EAAE,+BAA+B;QACtC,SAAS,EAAE,WAAW;QACtB,qBAAqB,EACrB,mBAAmB,EACnB,8BAA8B,EAC9B,SAAS,EAAE,+BAA+B;QAC1C,SAAS,EAAE,kCAAkC;QAC7C,SAAS,EAAE,gCAAgC;QAC3C,SAAS,EAAE,qBAAqB;QAChC,8BAA8B,EAC9B,oBAAoB,EACpB,uBAAuB,EACvB,UAAU,CACX,CAAC;QACF,OAAO;YACL,UAAU;YACV,WAAW;SACZ,CAAC;KACH;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAA,8BAAsB,EAAC,uCAA+B,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;KACzE;AACH,CAAC,CAAC;AAjDW,QAAA,+BAA+B,mCAiD1C;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkDE;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiEE","sourcesContent":["import {\n  DopPopulateTransactionResponse,\n  DopTransactionGasEstimateResponse,\n  DopERC20Amount,\n  NetworkName,\n  ProofType,\n  FeeTokenDetails,\n  DopERC20AmountRecipient,\n  DopNFTAmountRecipient,\n  TransactionGasDetails,\n} from 'dop-sharedmodel-v5';\nimport {\n  generateDummyProofTransactions,\n  generateTransact,\n  // generateUnshieldBaseToken,\n} from './tx-generator';\nimport { populateProvedTransaction } from './proof-cache';\nimport { randomHex, TransactionStruct } from 'dop-engine-v5';\n// import { gasEstimateResponseDummyProofIterativeRelayerFee } from './tx-gas-relayer-fee-estimator';\nimport { createRelayAdaptUnshieldERC20AmountRecipients } from './tx-cross-contract-calls';\nimport { reportAndSanitizeError } from '../../utils/error';\n\nexport const populateProvedUnshield = async (\n  networkName: NetworkName,\n  dopWalletID: string,\n  erc20AmountRecipients: DopERC20AmountRecipient[],\n  nftAmountRecipients: DopNFTAmountRecipient[],\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.Unshield,\n      dopWalletID,\n      false, // showSenderAddressToRecipient\n      undefined, // memoText\n      erc20AmountRecipients,\n      nftAmountRecipients,\n      undefined, // relayAdaptUnshieldERC20AmountRecipients\n      undefined, // relayAdaptUnshieldNFTAmounts\n      undefined, // relayAdaptShieldERC20Recipients\n      undefined, // relayAdaptShieldNFTRecipients\n      undefined, // crossContractCalls\n      relayerFeeERC20AmountRecipient,\n      sendWithPublicWallet,\n      overallBatchMinGasPrice,\n      gasDetails,\n    );\n    return {\n      nullifiers,\n      transaction,\n    };\n  } catch (err) {\n    throw reportAndSanitizeError(populateProvedUnshield.name, err);\n  }\n};\n\nexport const populateProvedUnshieldBaseToken = async (\n  networkName: NetworkName,\n  publicWalletAddress: string,\n  dopWalletID: string,\n  wrappedERC20Amount: DopERC20Amount,\n  relayerFeeERC20AmountRecipient: Optional<DopERC20AmountRecipient>,\n  sendWithPublicWallet: boolean,\n  overallBatchMinGasPrice: Optional<bigint>,\n  gasDetails: TransactionGasDetails,\n): Promise<DopPopulateTransactionResponse> => {\n  try {\n    const erc20AmountRecipients: DopERC20AmountRecipient[] = [\n      {\n        ...wrappedERC20Amount,\n        recipientAddress: publicWalletAddress,\n      },\n    ];\n    const relayAdaptUnshieldERC20Amounts: DopERC20Amount[] = [\n      wrappedERC20Amount,\n    ];\n\n    // Empty NFT Recipients.\n    const nftAmountRecipients: DopNFTAmountRecipient[] = [];\n\n    const { transaction, nullifiers } = await populateProvedTransaction(\n      networkName,\n      ProofType.UnshieldBaseToken,\n      dopWalletID,\n      false, // showSenderAddressToRecipient\n      undefined, // memoText\n      erc20AmountRecipients,\n      nftAmountRecipients,\n      relayAdaptUnshieldERC20Amounts,\n      undefined, // relayAdaptUnshieldNFTAmounts\n      undefined, // relayAdaptShieldERC20Recipients\n      undefined, // relayAdaptShieldNFTRecipients\n      undefined, // crossContractCalls\n      relayerFeeERC20AmountRecipient,\n      sendWithPublicWallet,\n      overallBatchMinGasPrice,\n      gasDetails,\n    );\n    return {\n      nullifiers,\n      transaction,\n    };\n  } catch (err) {\n    throw reportAndSanitizeError(populateProvedUnshieldBaseToken.name, err);\n  }\n};\n/*\nexport const gasEstimateForUnprovenUnshield = async (\n  networkName: NetworkName,\n  dopWalletID: string,\n  encryptionKey: string,\n  erc20AmountRecipients: DopERC20AmountRecipient[],\n  nftAmountRecipients: DopNFTAmountRecipient[],\n  originalGasDetails: TransactionGasDetails,\n  feeTokenDetails: Optional<FeeTokenDetails>,\n  sendWithPublicWallet: boolean,\n  valueCheck: bigint,\n): Promise<DopTransactionGasEstimateResponse> => {\n  try {\n    const overallBatchMinGasPrice = 0n;\n\n    const response = await gasEstimateResponseDummyProofIterativeRelayerFee(\n      (relayerFeeERC20Amount: Optional<DopERC20Amount>) =>\n        generateDummyProofTransactions(\n          ProofType.Unshield,\n          networkName,\n          dopWalletID,\n          encryptionKey,\n          false, // showSenderAddressToRecipient\n          undefined, // memoText\n          erc20AmountRecipients,\n          nftAmountRecipients,\n          relayerFeeERC20Amount,\n          sendWithPublicWallet,\n          overallBatchMinGasPrice,\n          valueCheck\n        ),\n      (txs: TransactionStruct[]) =>\n        generateTransact(\n          txs,\n          networkName,\n          true, // useDummyProof\n        ),\n      networkName,\n      dopWalletID,\n      erc20AmountRecipients,\n      originalGasDetails,\n      feeTokenDetails,\n      sendWithPublicWallet,\n      false, // isCrossContractCall\n    );\n    return response;\n  } catch (err) {\n    throw reportAndSanitizeError(gasEstimateForUnprovenUnshield.name, err);\n  }\n};\n*/\n/*\nexport const gasEstimateForUnprovenUnshieldBaseToken = async (\n  networkName: NetworkName,\n  publicWalletAddress: string,\n  dopWalletID: string,\n  encryptionKey: string,\n  wrappedERC20Amount: DopERC20Amount,\n  originalGasDetails: TransactionGasDetails,\n  feeTokenDetails: Optional<FeeTokenDetails>,\n  sendWithPublicWallet: boolean,\n  valueCheck: bigint,\n): Promise<DopTransactionGasEstimateResponse> => {\n  try {\n    const relayAdaptUnshieldERC20AmountRecipients: DopERC20AmountRecipient[] =\n      createRelayAdaptUnshieldERC20AmountRecipients(networkName, [\n        wrappedERC20Amount,\n      ]);\n\n    // Empty NFT Recipients.\n    const nftAmountRecipients: DopNFTAmountRecipient[] = [];\n\n    const overallBatchMinGasPrice = 0n;\n\n    const response = await gasEstimateResponseDummyProofIterativeRelayerFee(\n      (relayerFeeERC20Amount: Optional<DopERC20Amount>) =>\n        generateDummyProofTransactions(\n          ProofType.UnshieldBaseToken,\n          networkName,\n          dopWalletID,\n          encryptionKey,\n          false, // showSenderAddressToRecipient\n          undefined, // memoText\n          relayAdaptUnshieldERC20AmountRecipients,\n          nftAmountRecipients,\n          relayerFeeERC20Amount,\n          sendWithPublicWallet,\n          overallBatchMinGasPrice,\n          valueCheck\n        ),\n      (txs: TransactionStruct[]) => {\n        const relayAdaptParamsRandom = randomHex(31);\n        return generateUnshieldBaseToken(\n          txs,\n          networkName,\n          publicWalletAddress,\n          relayAdaptParamsRandom,\n          true, // useDummyProof\n        );\n      },\n      networkName,\n      dopWalletID,\n      relayAdaptUnshieldERC20AmountRecipients,\n      originalGasDetails,\n      feeTokenDetails,\n      sendWithPublicWallet,\n      false, // isCrossContractCall\n    );\n    return response;\n  } catch (err) {\n    throw reportAndSanitizeError(\n      gasEstimateForUnprovenUnshieldBaseToken.name,\n      err,\n    );\n  }\n};\n*/"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dop-wallet-v6",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "description": "DOP Wallet SDK, compatible with mobile, browser and nodejs environments.",
   "main": "dist/index.js",
   "license": "MIT",
@@ -38,8 +38,8 @@
     "@graphql-mesh/types": "^0.91.14",
     "@graphql-mesh/utils": "^0.43.22",
     "@noble/ed25519": "^1.7.1",
-    "dop-engine-v5": "1.1.6",
-    "dop-sharedmodel-v5": "1.1.6",
+    "dop-engine-v5": "1.1.7",
+    "dop-sharedmodel-v5": "1.1.7",
     "@whatwg-node/fetch": "^0.8.4",
     "assert": "2.0.0",
     "buffer": "^6.0.3",