dop-wallet-v6 1.1.8 → 1.2.0

package/dist/services/dop/wallets/wallets.d.ts

@@ -1,5 +1,7 @@
 import { AddressData } from 'dop-engine-v5';
 import { DopWalletInfo } from 'dop-sharedmodel-v5';
+export declare const createWalletFromTransaction: (leaf: any, viewingPrivateKey: Uint8Array, chain: any, encryptionKey: string, mnemonic: string, index?: number) => Promise<any>;
+export declare const createUserWalletWithID: (encryptionKey: string, id: string, leaf: any, viewingPrivateKey: Uint8Array, chain: any) => Promise<any>;
 export declare const createDopWallet: (encryptionKey: string, mnemonic: string, creationBlockNumbers: Optional<MapType<number>>) => Promise<DopWalletInfo>;
 export declare const createViewOnlyDopWallet: (encryptionKey: string, shareableViewingKey: string, creationBlockNumbers: Optional<MapType<number>>) => Promise<DopWalletInfo>;
 export declare const loadWalletByID: (encryptionKey: string, dopWalletID: string, isViewOnlyWallet: boolean) => Promise<DopWalletInfo>;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWalletShareableViewingKey = exports.getDopAddress = exports.validateEthAddress = exports.assertValidEthAddress = exports.validateDopAddress = exports.assertValidDopAddress = exports.signWithWalletViewingKey = exports.getDopWalletPrivateViewingKey = exports.getDopWalletAddressData = exports.getWalletMnemonic = exports.deleteWalletByID = exports.unloadWalletByID = exports.loadWalletByID = exports.createViewOnlyDopWallet = exports.createDopWallet = void 0;
+exports.getWalletShareableViewingKey = exports.getDopAddress = exports.validateEthAddress = exports.assertValidEthAddress = exports.validateDopAddress = exports.assertValidDopAddress = exports.signWithWalletViewingKey = exports.getDopWalletPrivateViewingKey = exports.getDopWalletAddressData = exports.getWalletMnemonic = exports.deleteWalletByID = exports.unloadWalletByID = exports.loadWalletByID = exports.createViewOnlyDopWallet = exports.createDopWallet = exports.createUserWalletWithID = exports.createWalletFromTransaction = void 0;
 const dop_engine_v5_1 = require("dop-engine-v5");
 const dop_sharedmodel_v5_1 = require("dop-sharedmodel-v5");
 const engine_1 = require("../core/engine");
@@ -48,6 +48,20 @@ const loadExistingWallet = async (encryptionKey, dopWalletID, isViewOnlyWallet)
     subscribeToBalanceEvents(wallet);
     return infoForWallet(wallet);
 };
+// here
+const createWalletFromTransaction = async (leaf, viewingPrivateKey, chain, encryptionKey, mnemonic, index = 0) => {
+    const engine = (0, engine_1.getEngine)();
+    const res = engine.createUserWalletFromTransaction(leaf, viewingPrivateKey, chain, encryptionKey, mnemonic, index);
+    return res;
+};
+exports.createWalletFromTransaction = createWalletFromTransaction;
+// here
+const createUserWalletWithID = async (encryptionKey, id, leaf, viewingPrivateKey, chain) => {
+    const engine = (0, engine_1.getEngine)();
+    const res = engine.createUserWalletWithID(encryptionKey, id, leaf, viewingPrivateKey, chain);
+    return res;
+};
+exports.createUserWalletWithID = createUserWalletWithID;
 const createWallet = async (encryptionKey, mnemonic, creationBlockNumbers) => {
     const formattedCreationBlockNumbers = formatCreationBlockNumbers(creationBlockNumbers);
     const engine = (0, engine_1.getEngine)();
@@ -62,6 +76,7 @@ const createViewOnlyWallet = async (encryptionKey, shareableViewingKey, creation
     subscribeToBalanceEvents(wallet);
     return infoForWallet(wallet);
 };
+// here 
 const createDopWallet = async (encryptionKey, mnemonic, creationBlockNumbers) => {
     try {
         return await createWallet(encryptionKey, mnemonic, creationBlockNumbers);

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\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  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\nexport const createDopWallet = async (\n  encryptionKey: string,\n  mnemonic: string,\n  creationBlockNumbers: Optional<MapType<number>>,\n): Promise<DopWalletInfo> => {\n  try {\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\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"]}
+{"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-gas-details.js

@@ -14,11 +14,13 @@ const getGasEstimate = async (networkName, transaction, fromWalletAddress, sendW
         from: fromWalletAddress,
         type: evmGasType,
     };
+    console.log("estimateGasTransactionRequest:::1", estimateGasTransactionRequest);
     if (shouldRemoveGasLimitForL2GasEstimate(networkName)) {
         delete estimateGasTransactionRequest.gasLimit;
     }
     try {
         const gasEstimate = await estimateGas(networkName, estimateGasTransactionRequest, isCrossContractCall);
+        console.log("before gasEstimate", gasEstimate);
         return gasEstimate;
     }
     catch (err) {
@@ -26,13 +28,21 @@ const getGasEstimate = async (networkName, transaction, fromWalletAddress, sendW
     }
 };
 exports.getGasEstimate = getGasEstimate;
+0xe4899c1300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000100000000000000000000000000261705b09939a2271eb98b782fb02435c02beeda000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000024e9a059a3000000000000000000000000000000000000000000000000002386f26fc1000000000000000000000000000000000000000000000000000000000000000000000000000000000000261705b09939a2271eb98b782fb02435c02beeda000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000184bf8d1c5b000000000000000000000000000000000000000000000000000000000000004000000000000000000000000082389495bb548e00e901f8ac82e9761152898834000000000000000000000000000000000000000000000000000000000000000120cd37ba9a49df5deeddb3f6355431c55d21b8aeaa6a2a91dddd12378bd76ebc00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d500b1d8e8ef31e21c99d1db9a6444d3adf12700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002386f26fc10000504b0dc14f036567d6deb04c09480a1f36c4682faa260c0bf15ff98e66714d252592874afaf1beb2866a003fd1677caaf7b128cbd075709aa8d494dbf482c04d3958b0826a15613654d15cce9a622b2dc1553ead6243f9c77fbc6f15d01c985f8026f7ae910774362b20aa14a3e4f6bb8e8762038d58f4094576bd9ffe92c87200000000000000000000000000000000000000000000000000000000;
 const estimateGas = (networkName, transaction, isCrossContractCall) => {
     const provider = (0, dop_1.getFallbackProviderForNetwork)(networkName);
+    console.log("before isCrossContractCall", isCrossContractCall);
     if (isCrossContractCall) {
         // Includes custom error handler for relay-adapt transactions.
         return dop_engine_v5_1.RelayAdaptContract.estimateGasWithErrorHandler(provider, transaction);
     }
-    return provider.estimateGas(transaction);
+    try {
+        return provider.estimateGas(transaction);
+    }
+    catch (e) {
+        console.log("before error:::", e);
+        return new Promise(resolve => resolve);
+    }
 };
 /**
  * Gas estimates can fail for relay-adapt transactions on L2s like Arbitrum.
@@ -64,10 +74,12 @@ const gasEstimateResponse = (gasEstimate, relayerFeeCommitment, isGasEstimateWit
     const gasEstimateWithDummyProofVariance = isGasEstimateWithDummyProof
         ? gasEstimate + BigInt(dop_engine_v5_1.GAS_ESTIMATE_VARIANCE_DUMMY_TO_ACTUAL_TRANSACTION)
         : gasEstimate;
+    console.log("gasEstimateWithDummyProofVariance:::2", gasEstimateWithDummyProofVariance);
     const response = {
         gasEstimate: gasEstimateWithDummyProofVariance,
         relayerFeeCommitment,
     };
+    console.log("before DopTransactionGasEstimateResponse return:::1");
     return response;
 };
 exports.gasEstimateResponse = gasEstimateResponse;

package/dist/services/transactions/tx-gas-details.js.map

@@ -1 +1 @@
-{"version":3,"file":"tx-gas-details.js","sourceRoot":"","sources":["../../../src/services/transactions/tx-gas-details.ts"],"names":[],"mappings":";;;AAAA,2DAQ4B;AAC5B,gCAAuD;AACvD,6CAA2D;AAC3D,iDAGuB;AAGhB,MAAM,cAAc,GAAG,KAAK,EACjC,WAAwB,EACxB,WAAgC,EAChC,iBAAyB,EACzB,oBAA6B,EAC7B,mBAA4B,EACX,EAAE;IACnB,MAAM,UAAU,GAAG,IAAA,gDAA2B,EAC5C,WAAW,EACX,oBAAoB,CACrB,CAAC;IAEF,0DAA0D;IAC1D,iFAAiF;IACjF,MAAM,6BAA6B,GAAwB;QACzD,GAAG,WAAW;QACd,IAAI,EAAE,iBAAiB;QACvB,IAAI,EAAE,UAAU;KACjB,CAAC;IAEF,IAAI,oCAAoC,CAAC,WAAW,CAAC,EAAE;QACrD,OAAO,6BAA6B,CAAC,QAAQ,CAAC;KAC/C;IAED,IAAI;QACF,MAAM,WAAW,GAAG,MAAM,WAAW,CACnC,WAAW,EACX,6BAA6B,EAC7B,mBAAmB,CACpB,CAAC;QAEF,OAAO,WAAW,CAAC;KACpB;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAA,8BAAsB,EAAC,sBAAc,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;KACxD;AACH,CAAC,CAAC;AAnCW,QAAA,cAAc,kBAmCzB;AAEF,MAAM,WAAW,GAAG,CAClB,WAAwB,EACxB,WAAgC,EAChC,mBAA4B,EACX,EAAE;IACnB,MAAM,QAAQ,GAAG,IAAA,mCAA6B,EAAC,WAAW,CAAC,CAAC;IAE5D,IAAI,mBAAmB,EAAE;QACvB,8DAA8D;QAC9D,OAAO,kCAAkB,CAAC,2BAA2B,CACnD,QAAQ,EACR,WAAW,CACZ,CAAC;KACH;IACD,OAAO,QAAQ,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;AAC3C,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,oCAAoC,GAAG,CAAC,WAAwB,EAAE,EAAE;IACxE,QAAQ,WAAW,EAAE;QACnB,KAAK,gCAAW,CAAC,QAAQ,CAAC;QAC1B,KAAK,gCAAW,CAAC,cAAc;YAC7B,OAAO,IAAI,CAAC;QACd,KAAK,gCAAW,CAAC,MAAM,CAAC;QACxB,KAAK,gCAAW,CAAC,aAAa;YAC5B,OAAO,IAAI,CAAC;QACd,KAAK,gCAAW,CAAC,GAAG;YAClB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACrD,KAAK,gCAAW,CAAC,QAAQ,CAAC;QAC1B,KAAK,gCAAW,CAAC,QAAQ,CAAC;QAC1B,KAAK,gCAAW,CAAC,OAAO,CAAC;QACzB,KAAK,gCAAW,CAAC,0BAA0B,CAAC;QAC5C,KAAK,gCAAW,CAAC,cAAc,CAAC;QAChC,KAAK,gCAAW,CAAC,aAAa,CAAC;QAC/B,KAAK,gCAAW,CAAC,OAAO;YACtB,OAAO,KAAK,CAAC;KAChB;AACH,CAAC,CAAC;AAEK,MAAM,mBAAmB,GAAG,CACjC,WAAmB,EACnB,oBAAiD,EACjD,2BAAoC,EACD,EAAE;IACrC,gDAAgD;IAChD,iEAAiE;IACjE,MAAM,iCAAiC,GAAG,2BAA2B;QACnE,CAAC,CAAC,WAAW,GAAG,MAAM,CAAC,iEAAiD,CAAC;QACzE,CAAC,CAAC,WAAW,CAAC;IAIhB,MAAM,QAAQ,GAAsC;QAClD,WAAW,EAAE,iCAAiC;QAC9C,oBAAoB;KACrB,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAnBW,QAAA,mBAAmB,uBAmB9B;AAEK,MAAM,2BAA2B,GAAG,CACzC,WAAwB,EACxB,WAAgC,EAChC,UAAiC,EACjC,oBAA6B,EAC7B,EAAE;IACF,MAAM,EAAE,WAAW,EAAE,GAAG,UAAU,CAAC;IAEnC,6CAA6C;IAC7C,WAAW,CAAC,QAAQ,GAAG,IAAA,sCAAiB,EAAC,WAAW,CAAC,CAAC;IAEtD,MAAM,UAAU,GAAG,IAAA,gDAA2B,EAC5C,WAAW,EACX,oBAAoB,CACrB,CAAC;IAEF,IAAI,UAAU,CAAC,UAAU,KAAK,UAAU,EAAE;QACxC,MAAM,eAAe,GAAG,oBAAoB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC;QACzE,MAAM,IAAI,KAAK,CACb,0BAA0B,WAAW,KAAK,eAAe,mBAAmB,UAAU,kBAAkB,UAAU,CAAC,UAAU,mGAAmG,CACjO,CAAC;KACH;IAED,6CAA6C;IAC7C,WAAW,CAAC,IAAI,GAAG,UAAU,CAAC,UAAU,CAAC;IAEzC,QAAQ,UAAU,CAAC,UAAU,EAAE;QAC7B,KAAK,+BAAU,CAAC,KAAK,CAAC,CAAC;YACrB,6CAA6C;YAC7C,WAAW,CAAC,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC;YAC3C,6CAA6C;YAC7C,OAAO,WAAW,CAAC,UAAU,CAAC;YAC9B,MAAM;SACP;QACD,KAAK,+BAAU,CAAC,KAAK,CAAC,CAAC;YACrB,6CAA6C;YAC7C,WAAW,CAAC,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC;YAC3C,MAAM;SACP;QACD,KAAK,+BAAU,CAAC,KAAK,CAAC,CAAC;YACrB,6CAA6C;YAC7C,WAAW,CAAC,YAAY,GAAG,UAAU,CAAC,YAAY,CAAC;YACnD,6CAA6C;YAC7C,WAAW,CAAC,oBAAoB,GAAG,UAAU,CAAC,oBAAoB,CAAC;YACnE,MAAM;SACP;KACF;AACH,CAAC,CAAC;AA/CW,QAAA,2BAA2B,+BA+CtC","sourcesContent":["import {\n  DopTransactionGasEstimateResponse,\n  EVMGasType,\n  calculateGasLimit,\n  NetworkName,\n  getEVMGasTypeForTransaction,\n  CommitmentSummary,\n  TransactionGasDetails,\n} from 'dop-sharedmodel-v5';\nimport { getFallbackProviderForNetwork } from '../dop';\nimport { reportAndSanitizeError } from '../../utils/error';\nimport {\n  GAS_ESTIMATE_VARIANCE_DUMMY_TO_ACTUAL_TRANSACTION,\n  RelayAdaptContract,\n} from 'dop-engine-v5';\nimport { ContractTransaction } from 'ethers';\n\nexport const getGasEstimate = async (\n  networkName: NetworkName,\n  transaction: ContractTransaction,\n  fromWalletAddress: string,\n  sendWithPublicWallet: boolean,\n  isCrossContractCall: boolean,\n): Promise<bigint> => {\n  const evmGasType = getEVMGasTypeForTransaction(\n    networkName,\n    sendWithPublicWallet,\n  );\n\n  // Add 'from' field, which is required, as a mock address.\n  // Note that DEPOSIT needs a real address, as it checks the balance for transfer.\n  const estimateGasTransactionRequest: ContractTransaction = {\n    ...transaction,\n    from: fromWalletAddress,\n    type: evmGasType,\n  };\n\n  if (shouldRemoveGasLimitForL2GasEstimate(networkName)) {\n    delete estimateGasTransactionRequest.gasLimit;\n  }\n\n  try {\n    const gasEstimate = await estimateGas(\n      networkName,\n      estimateGasTransactionRequest,\n      isCrossContractCall,\n    );\n\n    return gasEstimate;\n  } catch (err) {\n    throw reportAndSanitizeError(getGasEstimate.name, err);\n  }\n};\n\nconst estimateGas = (\n  networkName: NetworkName,\n  transaction: ContractTransaction,\n  isCrossContractCall: boolean,\n): Promise<bigint> => {\n  const provider = getFallbackProviderForNetwork(networkName);\n\n  if (isCrossContractCall) {\n    // Includes custom error handler for relay-adapt transactions.\n    return RelayAdaptContract.estimateGasWithErrorHandler(\n      provider,\n      transaction,\n    );\n  }\n  return provider.estimateGas(transaction);\n};\n\n/**\n * Gas estimates can fail for relay-adapt transactions on L2s like Arbitrum.\n * This occurs on cross-contract calls (relay-adapt) which have a manual minimum gas limit set by Dop Engine.\n */\nconst shouldRemoveGasLimitForL2GasEstimate = (networkName: NetworkName) => {\n  switch (networkName) {\n    case NetworkName.Arbitrum:\n    case NetworkName.ArbitrumGoerli:\n      return true;\n    case NetworkName.Xlayer:\n    case NetworkName.XlayerTestnet:\n      return true;\n    case NetworkName.Dop:\n      throw new Error('Invalid network for transaction');\n    case NetworkName.Ethereum:\n    case NetworkName.BNBChain:\n    case NetworkName.Polygon:\n    case NetworkName.EthereumRopsten_DEPRECATED:\n    case NetworkName.EthereumGoerli:\n    case NetworkName.PolygonMumbai:\n    case NetworkName.Hardhat:\n      return false;\n  }\n};\n\nexport const gasEstimateResponse = (\n  gasEstimate: bigint,\n  relayerFeeCommitment: Optional<CommitmentSummary>,\n  isGasEstimateWithDummyProof: boolean,\n): DopTransactionGasEstimateResponse => {\n  // TODO: This variance will be different on L2s.\n  // However, it's small enough that it shouldn't matter very much.\n  const gasEstimateWithDummyProofVariance = isGasEstimateWithDummyProof\n    ? gasEstimate + BigInt(GAS_ESTIMATE_VARIANCE_DUMMY_TO_ACTUAL_TRANSACTION)\n    : gasEstimate;\n\n\n\n  const response: DopTransactionGasEstimateResponse = {\n    gasEstimate: gasEstimateWithDummyProofVariance,\n    relayerFeeCommitment,\n  };\n\n  return response;\n};\n\nexport const setGasDetailsForTransaction = (\n  networkName: NetworkName,\n  transaction: ContractTransaction,\n  gasDetails: TransactionGasDetails,\n  sendWithPublicWallet: boolean,\n) => {\n  const { gasEstimate } = gasDetails;\n\n  // eslint-disable-next-line no-param-reassign\n  transaction.gasLimit = calculateGasLimit(gasEstimate);\n\n  const evmGasType = getEVMGasTypeForTransaction(\n    networkName,\n    sendWithPublicWallet,\n  );\n\n  if (gasDetails.evmGasType !== evmGasType) {\n    const transactionType = sendWithPublicWallet ? 'self-signed' : 'Relayer';\n    throw new Error(\n      `Invalid evmGasType for ${networkName} (${transactionType}): expected Type${evmGasType}, received Type${gasDetails.evmGasType} in gasDetails. Retrieve appropriate gas type with getEVMGasTypeForTransaction (dop-sharedmodel).`,\n    );\n  }\n\n  // eslint-disable-next-line no-param-reassign\n  transaction.type = gasDetails.evmGasType;\n\n  switch (gasDetails.evmGasType) {\n    case EVMGasType.Type0: {\n      // eslint-disable-next-line no-param-reassign\n      transaction.gasPrice = gasDetails.gasPrice;\n      // eslint-disable-next-line no-param-reassign\n      delete transaction.accessList;\n      break;\n    }\n    case EVMGasType.Type1: {\n      // eslint-disable-next-line no-param-reassign\n      transaction.gasPrice = gasDetails.gasPrice;\n      break;\n    }\n    case EVMGasType.Type2: {\n      // eslint-disable-next-line no-param-reassign\n      transaction.maxFeePerGas = gasDetails.maxFeePerGas;\n      // eslint-disable-next-line no-param-reassign\n      transaction.maxPriorityFeePerGas = gasDetails.maxPriorityFeePerGas;\n      break;\n    }\n  }\n};\n"]}
+{"version":3,"file":"tx-gas-details.js","sourceRoot":"","sources":["../../../src/services/transactions/tx-gas-details.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  DopTransactionGasEstimateResponse,\n  EVMGasType,\n  calculateGasLimit,\n  NetworkName,\n  getEVMGasTypeForTransaction,\n  CommitmentSummary,\n  TransactionGasDetails,\n} from 'dop-sharedmodel-v5';\nimport { getFallbackProviderForNetwork } from '../dop';\nimport { reportAndSanitizeError } from '../../utils/error';\nimport {\n  GAS_ESTIMATE_VARIANCE_DUMMY_TO_ACTUAL_TRANSACTION,\n  RelayAdaptContract,\n} from 'dop-engine-v5';\nimport { ContractTransaction } from 'ethers';\n\nexport const getGasEstimate = async (\n  networkName: NetworkName,\n  transaction: ContractTransaction,\n  fromWalletAddress: string,\n  sendWithPublicWallet: boolean,\n  isCrossContractCall: boolean,\n): Promise<bigint> => {\n  const evmGasType = getEVMGasTypeForTransaction(\n    networkName,\n    sendWithPublicWallet,\n  );\n\n  // Add 'from' field, which is required, as a mock address.\n  // Note that DEPOSIT needs a real address, as it checks the balance for transfer.\n  const estimateGasTransactionRequest: ContractTransaction = {\n    ...transaction,\n    from: fromWalletAddress,\n    type: evmGasType,\n  };\n  console.log(\"estimateGasTransactionRequest:::1\", estimateGasTransactionRequest);\n\n\n  if (shouldRemoveGasLimitForL2GasEstimate(networkName)) {\n    delete estimateGasTransactionRequest.gasLimit;\n  }\n\n  try {\n    const gasEstimate = await estimateGas(\n      networkName,\n      estimateGasTransactionRequest,\n      isCrossContractCall,\n    );\n    console.log(\"before gasEstimate\", gasEstimate);\n\n    return gasEstimate;\n  } catch (err) {\n    throw reportAndSanitizeError(getGasEstimate.name, err);\n  }\n};\n\n0xe4899c1300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000100000000000000000000000000261705b09939a2271eb98b782fb02435c02beeda000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000024e9a059a3000000000000000000000000000000000000000000000000002386f26fc1000000000000000000000000000000000000000000000000000000000000000000000000000000000000261705b09939a2271eb98b782fb02435c02beeda000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000184bf8d1c5b000000000000000000000000000000000000000000000000000000000000004000000000000000000000000082389495bb548e00e901f8ac82e9761152898834000000000000000000000000000000000000000000000000000000000000000120cd37ba9a49df5deeddb3f6355431c55d21b8aeaa6a2a91dddd12378bd76ebc00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d500b1d8e8ef31e21c99d1db9a6444d3adf12700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002386f26fc10000504b0dc14f036567d6deb04c09480a1f36c4682faa260c0bf15ff98e66714d252592874afaf1beb2866a003fd1677caaf7b128cbd075709aa8d494dbf482c04d3958b0826a15613654d15cce9a622b2dc1553ead6243f9c77fbc6f15d01c985f8026f7ae910774362b20aa14a3e4f6bb8e8762038d58f4094576bd9ffe92c87200000000000000000000000000000000000000000000000000000000\n\nconst estimateGas = (\n  networkName: NetworkName,\n  transaction: ContractTransaction,\n  isCrossContractCall: boolean,\n): Promise<bigint> => {\n  const provider = getFallbackProviderForNetwork(networkName);\n  console.log(\"before isCrossContractCall\", isCrossContractCall);\n\n  if (isCrossContractCall) {\n    // Includes custom error handler for relay-adapt transactions.\n    return RelayAdaptContract.estimateGasWithErrorHandler(\n      provider,\n      transaction,\n    );\n  }\n  try{\n\n    return provider.estimateGas(transaction);\n  }catch(e){\n    console.log(\"before error:::\", e)\n    return new Promise(resolve => resolve)\n  }\n};\n\n/**\n * Gas estimates can fail for relay-adapt transactions on L2s like Arbitrum.\n * This occurs on cross-contract calls (relay-adapt) which have a manual minimum gas limit set by Dop Engine.\n */\nconst shouldRemoveGasLimitForL2GasEstimate = (networkName: NetworkName) => {\n  switch (networkName) {\n    case NetworkName.Arbitrum:\n    case NetworkName.ArbitrumGoerli:\n      return true;\n    case NetworkName.Xlayer:\n    case NetworkName.XlayerTestnet:\n      return true;\n    case NetworkName.Dop:\n      throw new Error('Invalid network for transaction');\n    case NetworkName.Ethereum:\n    case NetworkName.BNBChain:\n    case NetworkName.Polygon:\n    case NetworkName.EthereumRopsten_DEPRECATED:\n    case NetworkName.EthereumGoerli:\n    case NetworkName.PolygonMumbai:\n    case NetworkName.Hardhat:\n      return false;\n  }\n};\n\nexport const gasEstimateResponse = (\n  gasEstimate: bigint,\n  relayerFeeCommitment: Optional<CommitmentSummary>,\n  isGasEstimateWithDummyProof: boolean,\n): DopTransactionGasEstimateResponse => {\n  // TODO: This variance will be different on L2s.\n  // However, it's small enough that it shouldn't matter very much.\n  const gasEstimateWithDummyProofVariance = isGasEstimateWithDummyProof\n    ? gasEstimate + BigInt(GAS_ESTIMATE_VARIANCE_DUMMY_TO_ACTUAL_TRANSACTION)\n    : gasEstimate;\n\n    console.log(\"gasEstimateWithDummyProofVariance:::2\", gasEstimateWithDummyProofVariance);\n\n  const response: DopTransactionGasEstimateResponse = {\n    gasEstimate: gasEstimateWithDummyProofVariance,\n    relayerFeeCommitment,\n  };\n  console.log(\"before DopTransactionGasEstimateResponse return:::1\");\n\n\n  return response;\n};\n\nexport const setGasDetailsForTransaction = (\n  networkName: NetworkName,\n  transaction: ContractTransaction,\n  gasDetails: TransactionGasDetails,\n  sendWithPublicWallet: boolean,\n) => {\n  const { gasEstimate } = gasDetails;\n\n  // eslint-disable-next-line no-param-reassign\n  transaction.gasLimit = calculateGasLimit(gasEstimate);\n\n  const evmGasType = getEVMGasTypeForTransaction(\n    networkName,\n    sendWithPublicWallet,\n  );\n\n  if (gasDetails.evmGasType !== evmGasType) {\n    const transactionType = sendWithPublicWallet ? 'self-signed' : 'Relayer';\n    throw new Error(\n      `Invalid evmGasType for ${networkName} (${transactionType}): expected Type${evmGasType}, received Type${gasDetails.evmGasType} in gasDetails. Retrieve appropriate gas type with getEVMGasTypeForTransaction (dop-sharedmodel).`,\n    );\n  }\n\n  // eslint-disable-next-line no-param-reassign\n  transaction.type = gasDetails.evmGasType;\n\n  switch (gasDetails.evmGasType) {\n    case EVMGasType.Type0: {\n      // eslint-disable-next-line no-param-reassign\n      transaction.gasPrice = gasDetails.gasPrice;\n      // eslint-disable-next-line no-param-reassign\n      delete transaction.accessList;\n      break;\n    }\n    case EVMGasType.Type1: {\n      // eslint-disable-next-line no-param-reassign\n      transaction.gasPrice = gasDetails.gasPrice;\n      break;\n    }\n    case EVMGasType.Type2: {\n      // eslint-disable-next-line no-param-reassign\n      transaction.maxFeePerGas = gasDetails.maxFeePerGas;\n      // eslint-disable-next-line no-param-reassign\n      transaction.maxPriorityFeePerGas = gasDetails.maxPriorityFeePerGas;\n      break;\n    }\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":"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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\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\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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dop-wallet-v6",
-  "version": "1.1.8",
+  "version": "1.2.0",
   "description": "DOP Wallet SDK, compatible with mobile, browser and nodejs environments.",
   "main": "dist/index.js",
   "license": "MIT",
@@ -38,22 +38,23 @@
     "@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",
     "@whatwg-node/fetch": "^0.8.4",
     "assert": "2.0.0",
+    "axios": "0.27.2",
+    "brotli": "^1.3.3",
     "buffer": "^6.0.3",
     "crypto-browserify": "3.12.0",
-    "ethers": "github:web3-devv/ethers.js#v6.7.6",
+    "dop-engine-v5": "1.1.8",
+    "dop-sharedmodel-v5": "1.1.8",
     "ethereum-cryptography": "^2.0.0",
+    "ethers": "github:web3-devv/ethers.js#v6.7.6",
     "events": "3.3.0",
-    "axios": "0.27.2",
-    "brotli": "^1.3.3",
     "graphql": "^16.6.0",
     "stream-browserify": "3.0.0"
   },
   "devDependencies": {
     "@graphprotocol/client-cli": "^2.2.20",
+    "@types/abstract-leveldown": "^7.2.5",
     "@types/chai": "^4.3.4",
     "@types/chai-as-promised": "^7.1.5",
     "@types/leveldown": "^4.0.3",