dop-wallet-v6 1.1.9 → 1.2.0

package/dist/services/dop/util/commitment.d.ts

@@ -1,2 +1,3 @@
-import { TransactionStruct, CommitmentSummary } from 'dop-engine-v5';
+import { TransactionStruct } from 'dop-engine-v5';
+import { CommitmentSummary } from 'dop-sharedmodel-v5';
 export declare const convertTransactionStructToCommitmentSummary: (transactionStruct: TransactionStruct, commitmentIndex: number) => CommitmentSummary;

package/dist/services/dop/util/commitment.js

@@ -6,11 +6,10 @@ const convertTransactionStructToCommitmentSummary = (transactionStruct, commitme
     const commitmentCiphertextStruct = transactionStruct.boundParams
         .commitmentCiphertext[commitmentIndex];
     const commitmentCiphertext = (0, dop_engine_v5_1.formatCommitmentCiphertext)(commitmentCiphertextStruct);
-    // const commitmentHash = transactionStruct.commitments[
-    //   commitmentIndex
-    // ] as string;
+    const commitmentHash = transactionStruct.commitments[commitmentIndex];
     return {
         commitmentCiphertext,
+        commitmentHash,
     };
 };
 exports.convertTransactionStructToCommitmentSummary = convertTransactionStructToCommitmentSummary;

package/dist/services/dop/util/commitment.js.map

@@ -1 +1 @@
-{"version":3,"file":"commitment.js","sourceRoot":"","sources":["../../../../src/services/dop/util/commitment.ts"],"names":[],"mappings":";;;AAAA,iDAKuB;AAMhB,MAAM,2CAA2C,GAAG,CACzD,iBAAoC,EACpC,eAAuB,EACJ,EAAE;IACrB,MAAM,0BAA0B,GAAG,iBAAiB,CAAC,WAAW;SAC7D,oBAAoB,CAAC,eAAe,CAAqC,CAAC;IAE7E,MAAM,oBAAoB,GAAyB,IAAA,0CAA0B,EAC3E,0BAA0B,CAC3B,CAAC;IACF,wDAAwD;IACxD,oBAAoB;IACpB,eAAe;IAEf,OAAO;QACL,oBAAoB;KACrB,CAAC;AACJ,CAAC,CAAC;AAjBW,QAAA,2CAA2C,+CAiBtD","sourcesContent":["import {\n  CommitmentCiphertextStructOutput,\n  TransactionStruct,\n  formatCommitmentCiphertext,\n  CommitmentSummary,\n} from 'dop-engine-v5';\n\nimport {\n  CommitmentCiphertext,\n} from 'dop-sharedmodel-v5';\n\nexport const convertTransactionStructToCommitmentSummary = (\n  transactionStruct: TransactionStruct,\n  commitmentIndex: number,\n): CommitmentSummary => {\n  const commitmentCiphertextStruct = transactionStruct.boundParams\n    .commitmentCiphertext[commitmentIndex] as CommitmentCiphertextStructOutput;\n\n  const commitmentCiphertext: CommitmentCiphertext = formatCommitmentCiphertext(\n    commitmentCiphertextStruct,\n  );\n  // const commitmentHash = transactionStruct.commitments[\n  //   commitmentIndex\n  // ] as string;\n\n  return {\n    commitmentCiphertext,\n  };\n};\n"]}
+{"version":3,"file":"commitment.js","sourceRoot":"","sources":["../../../../src/services/dop/util/commitment.ts"],"names":[],"mappings":";;;AAAA,iDAIuB;AAMhB,MAAM,2CAA2C,GAAG,CACzD,iBAAoC,EACpC,eAAuB,EACJ,EAAE;IACrB,MAAM,0BAA0B,GAAG,iBAAiB,CAAC,WAAW;SAC7D,oBAAoB,CAAC,eAAe,CAAqC,CAAC;IAE7E,MAAM,oBAAoB,GAAyB,IAAA,0CAA0B,EAC3E,0BAA0B,CAC3B,CAAC;IACF,MAAM,cAAc,GAAG,iBAAiB,CAAC,WAAW,CAClD,eAAe,CACN,CAAC;IAEZ,OAAO;QACL,oBAAoB;QACpB,cAAc;KACf,CAAC;AACJ,CAAC,CAAC;AAlBW,QAAA,2CAA2C,+CAkBtD","sourcesContent":["import {\n  CommitmentCiphertextStructOutput,\n  TransactionStruct,\n  formatCommitmentCiphertext,\n} from 'dop-engine-v5';\nimport {\n  CommitmentCiphertext,\n  CommitmentSummary,\n} from 'dop-sharedmodel-v5';\n\nexport const convertTransactionStructToCommitmentSummary = (\n  transactionStruct: TransactionStruct,\n  commitmentIndex: number,\n): CommitmentSummary => {\n  const commitmentCiphertextStruct = transactionStruct.boundParams\n    .commitmentCiphertext[commitmentIndex] as CommitmentCiphertextStructOutput;\n\n  const commitmentCiphertext: CommitmentCiphertext = formatCommitmentCiphertext(\n    commitmentCiphertextStruct,\n  );\n  const commitmentHash = transactionStruct.commitments[\n    commitmentIndex\n  ] as string;\n\n  return {\n    commitmentCiphertext,\n    commitmentHash,\n  };\n};\n"]}

package/dist/services/dop/wallets/wallets.js

@@ -206,7 +206,7 @@ const getWalletShareableViewingKey = async (dopWalletID) => {
 exports.getWalletShareableViewingKey = getWalletShareableViewingKey;
 const formatCreationBlockNumbers = (creationBlockNumbers) => {
     var _a;
-    // Format creationBlockNumbers from client side { <NetworkName>: <BlockNumber> } map to dop-engine-tranparency's number[][] type
+    // Format creationBlockNumbers from client side { <NetworkName>: <BlockNumber> } map to dop-engine's number[][] type
     if (!creationBlockNumbers)
         return;
     const formattedCreationBlockNumbers = [];

package/dist/services/dop/wallets/wallets.js.map

@@ -1 +1 @@
-{"version":3,"file":"wallets.js","sourceRoot":"","sources":["../../../../src/services/dop/wallets/wallets.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  DopWallet,\n  EngineEvent,\n  WalletScannedEventData,\n  AbstractWallet,\n  WalletData,\n  AddressData,\n  DopEngine,\n  hexlify,\n  hexStringToBytes,\n} from 'dop-engine-v5';\nimport {\n  DopWalletInfo,\n  NetworkName,\n  NETWORK_CONFIG,\n  isDefined,\n} from 'dop-sharedmodel-v5';\nimport { getEngine, walletForID } from '../core/engine';\nimport { onBalancesUpdate } from './balance-update';\nimport { reportAndSanitizeError } from '../../../utils/error';\nimport { getAddress } from 'ethers';\n\nconst subscribeToBalanceEvents = (wallet: AbstractWallet) => {\n  wallet.on(\n    EngineEvent.WalletScanComplete,\n    ({ chain }: WalletScannedEventData) => {\n      // eslint-disable-next-line @typescript-eslint/no-floating-promises\n      onBalancesUpdate(wallet, chain);\n    },\n  );\n};\n\nconst addressForWallet = (wallet: AbstractWallet): string => {\n  return wallet.getAddress();\n};\n\nconst infoForWallet = (wallet: AbstractWallet): DopWalletInfo => {\n  const dopAddress = addressForWallet(wallet);\n  return {\n    id: wallet.id,\n    dopAddress,\n  };\n};\n\nconst getExistingWallet = (\n  dopWalletID: string,\n): Optional<AbstractWallet> => {\n  try {\n    const existingWallet = walletForID(dopWalletID);\n    return existingWallet;\n  } catch (_err) {\n    return undefined;\n  }\n};\n\nconst loadExistingWallet = async (\n  encryptionKey: string,\n  dopWalletID: string,\n  isViewOnlyWallet: boolean,\n): Promise<DopWalletInfo> => {\n  const existingWallet = getExistingWallet(dopWalletID);\n  if (existingWallet) {\n    return infoForWallet(existingWallet);\n  }\n  const engine = getEngine();\n  let wallet: AbstractWallet;\n\n  if (isViewOnlyWallet) {\n    wallet = await engine.loadExistingViewOnlyWallet(\n      encryptionKey,\n      dopWalletID,\n    );\n  } else {\n    wallet = await engine.loadExistingWallet(encryptionKey, dopWalletID);\n  }\n\n  subscribeToBalanceEvents(wallet);\n  return infoForWallet(wallet);\n};\n// here\nexport const createWalletFromTransaction = async (\n  leaf: any,\n  viewingPrivateKey: Uint8Array,\n  chain: any,\n  encryptionKey: string,\n  mnemonic: string,\n  index: number = 0,\n): Promise<any> => {\n\n  const engine = getEngine();\n  const res = engine.createUserWalletFromTransaction(leaf, viewingPrivateKey, chain, encryptionKey, mnemonic, index);\n  return res;\n};\n\n// here\nexport const createUserWalletWithID = async (\n  encryptionKey: string,\n  id: string,\n  leaf: any,\n  viewingPrivateKey: Uint8Array,\n  chain: any\n): Promise<any> => {\n\n  const engine = getEngine();\n  const res = engine.createUserWalletWithID(\n    encryptionKey,\n    id,\n    leaf,\n    viewingPrivateKey,\n    chain\n    );\n  return res;\n};\n\n\nconst createWallet = async (\n  encryptionKey: string,\n  mnemonic: string,\n  creationBlockNumbers: Optional<MapType<number>>,\n): Promise<DopWalletInfo> => {\n  const formattedCreationBlockNumbers =\n    formatCreationBlockNumbers(creationBlockNumbers);\n\n  const engine = getEngine();\n\n  const wallet = await engine.createWalletFromMnemonic(\n    encryptionKey,\n    mnemonic,\n    0,\n    formattedCreationBlockNumbers,\n  );\n  subscribeToBalanceEvents(wallet);\n  return infoForWallet(wallet);\n};\n\nconst createViewOnlyWallet = async (\n  encryptionKey: string,\n  shareableViewingKey: string,\n  creationBlockNumbers: Optional<MapType<number>>,\n): Promise<DopWalletInfo> => {\n  const formattedCreationBlockNumbers =\n    formatCreationBlockNumbers(creationBlockNumbers);\n\n  const engine = getEngine();\n  const wallet = await engine.createViewOnlyWalletFromShareableViewingKey(\n    encryptionKey,\n    shareableViewingKey,\n    formattedCreationBlockNumbers,\n  );\n  subscribeToBalanceEvents(wallet);\n  return infoForWallet(wallet);\n};\n// here \nexport const createDopWallet = async (\n  encryptionKey: string,\n  mnemonic: string,\n  creationBlockNumbers: Optional<MapType<number>>,\n): Promise<DopWalletInfo> => {\n  try {\n\n    return await createWallet(encryptionKey, mnemonic, creationBlockNumbers);\n  } catch (err) {\n    throw reportAndSanitizeError(createDopWallet.name, err);\n  }\n};\n\nexport const createViewOnlyDopWallet = async (\n  encryptionKey: string,\n  shareableViewingKey: string,\n  creationBlockNumbers: Optional<MapType<number>>,\n): Promise<DopWalletInfo> => {\n  try {\n    return await createViewOnlyWallet(\n      encryptionKey,\n      shareableViewingKey,\n      creationBlockNumbers,\n    );\n  } catch (err) {\n    throw reportAndSanitizeError(createViewOnlyDopWallet.name, err);\n  }\n};\n\nexport const loadWalletByID = async (\n  encryptionKey: string,\n  dopWalletID: string,\n  isViewOnlyWallet: boolean,\n): Promise<DopWalletInfo> => {\n  try {\n    return await loadExistingWallet(\n      encryptionKey,\n      dopWalletID,\n      isViewOnlyWallet,\n    );\n  } catch (err) {\n    const sanitizedError = reportAndSanitizeError(loadWalletByID.name, err);\n    throw new Error(`Could not load DOP wallet: ${sanitizedError.message}`);\n  }\n};\n\nexport const unloadWalletByID = (dopWalletID: string): void => {\n  try {\n    const engine = getEngine();\n    engine.unloadWallet(dopWalletID);\n  } catch (err) {\n    throw new Error('Could not unload DOP wallet.');\n  }\n};\n\nexport const deleteWalletByID = async (\n  dopWalletID: string,\n): Promise<void> => {\n  try {\n    const engine = getEngine();\n    await engine.deleteWallet(dopWalletID);\n  } catch (err) {\n    throw new Error('Could not delete DOP wallet.');\n  }\n};\n\nexport const getWalletMnemonic = async (\n  encryptionKey: string,\n  dopWalletID: string,\n) => {\n  const { db } = getEngine();\n  // Reload wallet to ensure that encryption key is valid.\n  const walletData = (await DopWallet.getEncryptedData(\n    db,\n    encryptionKey,\n    dopWalletID,\n  )) as WalletData;\n\n  if (!walletData.mnemonic) {\n    throw new Error('No mnemonic for wallet.');\n  }\n  return walletData.mnemonic;\n};\n\nexport const getDopWalletAddressData = (address: string): AddressData => {\n  assertValidDopAddress(address);\n  return DopEngine.decodeAddress(address);\n};\n\nexport const getDopWalletPrivateViewingKey = (\n  dopWalletID: string,\n): Uint8Array => {\n  const wallet = walletForID(dopWalletID);\n  return wallet.getViewingKeyPair().privateKey;\n};\n\nexport const signWithWalletViewingKey = async (\n  dopWalletID: string,\n  message: string,\n): Promise<string> => {\n  const wallet = walletForID(dopWalletID);\n  const signature = await wallet.signWithViewingKey(hexStringToBytes(message));\n  return hexlify(signature);\n};\n\n\n\nexport const assertValidDopAddress = (address: string): void => {\n  if (!validateDopAddress(address)) {\n    throw new Error('Invalid DOP address.');\n  }\n};\n\nexport const validateDopAddress = (address: string): boolean => {\n  try {\n    return DopEngine.decodeAddress(address) != null;\n  } catch (err) {\n    return false;\n  }\n};\n\nexport const assertValidEthAddress = (address: string) => {\n  if (!validateEthAddress(address)) {\n    throw new Error('Invalid wallet address.');\n  }\n};\n\nexport const validateEthAddress = (address: string): boolean => {\n  try {\n    getAddress(address);\n    return true;\n  } catch (err) {\n    return false;\n  }\n};\n\nexport const getDopAddress = (\n  dopWalletID: string,\n): Optional<string> => {\n  try {\n    const wallet = walletForID(dopWalletID);\n    return wallet.getAddress();\n  } catch (err) {\n    reportAndSanitizeError(getDopAddress.name, err);\n    return undefined;\n  }\n};\n\nexport const getWalletShareableViewingKey = async (\n  dopWalletID: string,\n): Promise<Optional<string>> => {\n  try {\n    const wallet = walletForID(dopWalletID);\n    return wallet.generateShareableViewingKey();\n  } catch (err) {\n    reportAndSanitizeError(getWalletShareableViewingKey.name, err);\n    return undefined;\n  }\n};\n\nconst formatCreationBlockNumbers = (\n  creationBlockNumbers: Optional<MapType<number>>,\n): Optional<number[][]> => {\n  // Format creationBlockNumbers from client side { <NetworkName>: <BlockNumber> } map to dop-engine-tranparency's number[][] type\n  if (!creationBlockNumbers) return;\n\n  const formattedCreationBlockNumbers: number[][] = [];\n  const networksNames = Object.keys(creationBlockNumbers) as NetworkName[];\n\n  for (const networkName of networksNames) {\n    const network = NETWORK_CONFIG[networkName];\n\n    const blockNumber = creationBlockNumbers[networkName];\n    if (!isDefined(blockNumber)) {\n      continue;\n    }\n\n    formattedCreationBlockNumbers[network.chain.type] ??= [];\n    formattedCreationBlockNumbers[network.chain.type][network.chain.id] =\n      blockNumber;\n  }\n\n  return formattedCreationBlockNumbers;\n};\n"]}
+{"version":3,"file":"wallets.js","sourceRoot":"","sources":["../../../../src/services/dop/wallets/wallets.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  DopWallet,\n  EngineEvent,\n  WalletScannedEventData,\n  AbstractWallet,\n  WalletData,\n  AddressData,\n  DopEngine,\n  hexlify,\n  hexStringToBytes,\n} from 'dop-engine-v5';\nimport {\n  DopWalletInfo,\n  NetworkName,\n  NETWORK_CONFIG,\n  isDefined,\n} from 'dop-sharedmodel-v5';\nimport { getEngine, walletForID } from '../core/engine';\nimport { onBalancesUpdate } from './balance-update';\nimport { reportAndSanitizeError } from '../../../utils/error';\nimport { getAddress } from 'ethers';\n\nconst subscribeToBalanceEvents = (wallet: AbstractWallet) => {\n  wallet.on(\n    EngineEvent.WalletScanComplete,\n    ({ chain }: WalletScannedEventData) => {\n      // eslint-disable-next-line @typescript-eslint/no-floating-promises\n      onBalancesUpdate(wallet, chain);\n    },\n  );\n};\n\nconst addressForWallet = (wallet: AbstractWallet): string => {\n  return wallet.getAddress();\n};\n\nconst infoForWallet = (wallet: AbstractWallet): DopWalletInfo => {\n  const dopAddress = addressForWallet(wallet);\n  return {\n    id: wallet.id,\n    dopAddress,\n  };\n};\n\nconst getExistingWallet = (\n  dopWalletID: string,\n): Optional<AbstractWallet> => {\n  try {\n    const existingWallet = walletForID(dopWalletID);\n    return existingWallet;\n  } catch (_err) {\n    return undefined;\n  }\n};\n\nconst loadExistingWallet = async (\n  encryptionKey: string,\n  dopWalletID: string,\n  isViewOnlyWallet: boolean,\n): Promise<DopWalletInfo> => {\n  const existingWallet = getExistingWallet(dopWalletID);\n  if (existingWallet) {\n    return infoForWallet(existingWallet);\n  }\n  const engine = getEngine();\n  let wallet: AbstractWallet;\n\n  if (isViewOnlyWallet) {\n    wallet = await engine.loadExistingViewOnlyWallet(\n      encryptionKey,\n      dopWalletID,\n    );\n  } else {\n    wallet = await engine.loadExistingWallet(encryptionKey, dopWalletID);\n  }\n\n  subscribeToBalanceEvents(wallet);\n  return infoForWallet(wallet);\n};\n// here\nexport const createWalletFromTransaction = async (\n  leaf: any,\n  viewingPrivateKey: Uint8Array,\n  chain: any,\n  encryptionKey: string,\n  mnemonic: string,\n  index: number = 0,\n): Promise<any> => {\n\n  const engine = getEngine();\n  const res = engine.createUserWalletFromTransaction(leaf, viewingPrivateKey, chain, encryptionKey, mnemonic, index);\n  return res;\n};\n\n// here\nexport const createUserWalletWithID = async (\n  encryptionKey: string,\n  id: string,\n  leaf: any,\n  viewingPrivateKey: Uint8Array,\n  chain: any\n): Promise<any> => {\n\n  const engine = getEngine();\n  const res = engine.createUserWalletWithID(\n    encryptionKey,\n    id,\n    leaf,\n    viewingPrivateKey,\n    chain\n    );\n  return res;\n};\n\n\nconst createWallet = async (\n  encryptionKey: string,\n  mnemonic: string,\n  creationBlockNumbers: Optional<MapType<number>>,\n): Promise<DopWalletInfo> => {\n  const formattedCreationBlockNumbers =\n    formatCreationBlockNumbers(creationBlockNumbers);\n\n  const engine = getEngine();\n\n  const wallet = await engine.createWalletFromMnemonic(\n    encryptionKey,\n    mnemonic,\n    0,\n    formattedCreationBlockNumbers,\n  );\n  subscribeToBalanceEvents(wallet);\n  return infoForWallet(wallet);\n};\n\nconst createViewOnlyWallet = async (\n  encryptionKey: string,\n  shareableViewingKey: string,\n  creationBlockNumbers: Optional<MapType<number>>,\n): Promise<DopWalletInfo> => {\n  const formattedCreationBlockNumbers =\n    formatCreationBlockNumbers(creationBlockNumbers);\n\n  const engine = getEngine();\n  const wallet = await engine.createViewOnlyWalletFromShareableViewingKey(\n    encryptionKey,\n    shareableViewingKey,\n    formattedCreationBlockNumbers,\n  );\n  subscribeToBalanceEvents(wallet);\n  return infoForWallet(wallet);\n};\n// here \nexport const createDopWallet = async (\n  encryptionKey: string,\n  mnemonic: string,\n  creationBlockNumbers: Optional<MapType<number>>,\n): Promise<DopWalletInfo> => {\n  try {\n\n    return await createWallet(encryptionKey, mnemonic, creationBlockNumbers);\n  } catch (err) {\n    throw reportAndSanitizeError(createDopWallet.name, err);\n  }\n};\n\nexport const createViewOnlyDopWallet = async (\n  encryptionKey: string,\n  shareableViewingKey: string,\n  creationBlockNumbers: Optional<MapType<number>>,\n): Promise<DopWalletInfo> => {\n  try {\n    return await createViewOnlyWallet(\n      encryptionKey,\n      shareableViewingKey,\n      creationBlockNumbers,\n    );\n  } catch (err) {\n    throw reportAndSanitizeError(createViewOnlyDopWallet.name, err);\n  }\n};\n\nexport const loadWalletByID = async (\n  encryptionKey: string,\n  dopWalletID: string,\n  isViewOnlyWallet: boolean,\n): Promise<DopWalletInfo> => {\n  try {\n    return await loadExistingWallet(\n      encryptionKey,\n      dopWalletID,\n      isViewOnlyWallet,\n    );\n  } catch (err) {\n    const sanitizedError = reportAndSanitizeError(loadWalletByID.name, err);\n    throw new Error(`Could not load DOP wallet: ${sanitizedError.message}`);\n  }\n};\n\nexport const unloadWalletByID = (dopWalletID: string): void => {\n  try {\n    const engine = getEngine();\n    engine.unloadWallet(dopWalletID);\n  } catch (err) {\n    throw new Error('Could not unload DOP wallet.');\n  }\n};\n\nexport const deleteWalletByID = async (\n  dopWalletID: string,\n): Promise<void> => {\n  try {\n    const engine = getEngine();\n    await engine.deleteWallet(dopWalletID);\n  } catch (err) {\n    throw new Error('Could not delete DOP wallet.');\n  }\n};\n\nexport const getWalletMnemonic = async (\n  encryptionKey: string,\n  dopWalletID: string,\n) => {\n  const { db } = getEngine();\n  // Reload wallet to ensure that encryption key is valid.\n  const walletData = (await DopWallet.getEncryptedData(\n    db,\n    encryptionKey,\n    dopWalletID,\n  )) as WalletData;\n\n  if (!walletData.mnemonic) {\n    throw new Error('No mnemonic for wallet.');\n  }\n  return walletData.mnemonic;\n};\n\nexport const getDopWalletAddressData = (address: string): AddressData => {\n  assertValidDopAddress(address);\n  return DopEngine.decodeAddress(address);\n};\n\nexport const getDopWalletPrivateViewingKey = (\n  dopWalletID: string,\n): Uint8Array => {\n  const wallet = walletForID(dopWalletID);\n  return wallet.getViewingKeyPair().privateKey;\n};\n\nexport const signWithWalletViewingKey = async (\n  dopWalletID: string,\n  message: string,\n): Promise<string> => {\n  const wallet = walletForID(dopWalletID);\n  const signature = await wallet.signWithViewingKey(hexStringToBytes(message));\n  return hexlify(signature);\n};\n\n\n\nexport const assertValidDopAddress = (address: string): void => {\n  if (!validateDopAddress(address)) {\n    throw new Error('Invalid DOP address.');\n  }\n};\n\nexport const validateDopAddress = (address: string): boolean => {\n  try {\n    return DopEngine.decodeAddress(address) != null;\n  } catch (err) {\n    return false;\n  }\n};\n\nexport const assertValidEthAddress = (address: string) => {\n  if (!validateEthAddress(address)) {\n    throw new Error('Invalid wallet address.');\n  }\n};\n\nexport const validateEthAddress = (address: string): boolean => {\n  try {\n    getAddress(address);\n    return true;\n  } catch (err) {\n    return false;\n  }\n};\n\nexport const getDopAddress = (\n  dopWalletID: string,\n): Optional<string> => {\n  try {\n    const wallet = walletForID(dopWalletID);\n    return wallet.getAddress();\n  } catch (err) {\n    reportAndSanitizeError(getDopAddress.name, err);\n    return undefined;\n  }\n};\n\nexport const getWalletShareableViewingKey = async (\n  dopWalletID: string,\n): Promise<Optional<string>> => {\n  try {\n    const wallet = walletForID(dopWalletID);\n    return wallet.generateShareableViewingKey();\n  } catch (err) {\n    reportAndSanitizeError(getWalletShareableViewingKey.name, err);\n    return undefined;\n  }\n};\n\nconst formatCreationBlockNumbers = (\n  creationBlockNumbers: Optional<MapType<number>>,\n): Optional<number[][]> => {\n  // Format creationBlockNumbers from client side { <NetworkName>: <BlockNumber> } map to dop-engine's number[][] type\n  if (!creationBlockNumbers) return;\n\n  const formattedCreationBlockNumbers: number[][] = [];\n  const networksNames = Object.keys(creationBlockNumbers) as NetworkName[];\n\n  for (const networkName of networksNames) {\n    const network = NETWORK_CONFIG[networkName];\n\n    const blockNumber = creationBlockNumbers[networkName];\n    if (!isDefined(blockNumber)) {\n      continue;\n    }\n\n    formattedCreationBlockNumbers[network.chain.type] ??= [];\n    formattedCreationBlockNumbers[network.chain.type][network.chain.id] =\n      blockNumber;\n  }\n\n  return formattedCreationBlockNumbers;\n};\n"]}

package/dist/services/transactions/tx-cross-contract-calls.d.ts

@@ -1,9 +1,11 @@
-import { DopPopulateTransactionResponse, DopERC20Amount, NetworkName, TransactionReceiptLog, DopERC20AmountRecipient, DopNFTAmountRecipient, DopNFTAmount, TransactionGasDetails, DopERC20Recipient } from 'dop-sharedmodel-v5';
-import { NFTTokenData } from 'dop-engine-v5';
+import { DopPopulateTransactionResponse, DopTransactionGasEstimateResponse, DopERC20Amount, NetworkName, TransactionReceiptLog, FeeTokenDetails, DopERC20AmountRecipient, DopNFTAmountRecipient, DopNFTAmount, TransactionGasDetails, DopERC20Recipient } from 'dop-sharedmodel-v5';
+import { ProverProgressCallback, NFTTokenData } from 'dop-engine-v5';
 import { ContractTransaction, Log } from 'ethers';
 export declare const createRelayAdaptUnshieldERC20AmountRecipients: (networkName: NetworkName, unshieldERC20Amounts: DopERC20Amount[]) => DopERC20AmountRecipient[];
 export declare const createRelayAdaptUnshieldNFTAmountRecipients: (networkName: NetworkName, unshieldNFTAmounts: DopNFTAmount[]) => DopNFTAmountRecipient[];
 export declare const createNFTTokenDataFromDopNFTAmount: (nftAmount: DopNFTAmount) => NFTTokenData;
 export declare const populateProvedCrossContractCalls: (networkName: NetworkName, dopWalletID: string, relayAdaptUnshieldERC20Amounts: DopERC20Amount[], relayAdaptUnshieldNFTAmounts: DopNFTAmount[], relayAdaptShieldERC20Recipients: DopERC20Recipient[], relayAdaptShieldNFTRecipients: DopNFTAmountRecipient[], crossContractCalls: ContractTransaction[], relayerFeeERC20AmountRecipient: Optional<DopERC20AmountRecipient>, sendWithPublicWallet: boolean, overallBatchMinGasPrice: Optional<bigint>, gasDetails: TransactionGasDetails) => Promise<DopPopulateTransactionResponse>;
+export declare const gasEstimateForUnprovenCrossContractCalls: (networkName: NetworkName, dopWalletID: string, encryptionKey: string, relayAdaptUnshieldERC20Amounts: DopERC20Amount[], relayAdaptUnshieldNFTAmounts: DopNFTAmount[], relayAdaptShieldERC20Recipients: DopERC20Recipient[], relayAdaptShieldNFTRecipients: DopNFTAmountRecipient[], crossContractCalls: ContractTransaction[], originalGasDetails: TransactionGasDetails, feeTokenDetails: Optional<FeeTokenDetails>, sendWithPublicWallet: boolean, minGasLimit: Optional<bigint>) => Promise<DopTransactionGasEstimateResponse>;
+export declare const generateCrossContractCallsProof: (networkName: NetworkName, dopWalletID: string, encryptionKey: string, relayAdaptUnshieldERC20Amounts: DopERC20Amount[], relayAdaptUnshieldNFTAmounts: DopNFTAmount[], relayAdaptShieldERC20Recipients: DopERC20Recipient[], relayAdaptShieldNFTRecipients: DopNFTAmountRecipient[], crossContractCalls: ContractTransaction[], relayerFeeERC20AmountRecipient: Optional<DopERC20AmountRecipient>, sendWithPublicWallet: boolean, overallBatchMinGasPrice: Optional<bigint>, minGasLimit: Optional<bigint>, progressCallback: ProverProgressCallback) => Promise<void>;
 export declare const getRelayAdaptTransactionError: (receiptLogs: TransactionReceiptLog[] | readonly Log[]) => Optional<string>;
 export declare const parseRelayAdaptReturnValue: (data: string) => Optional<string>;

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

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