@iexec/web3mail 1.9.0 → 2.0.0

package/src/web3mail/IExecWeb3mail.ts

@@ -11,7 +11,7 @@ import {
   Contact,
   FetchUserContactsParams,
   SendEmailParams,
-  AddressOrENS,
+  Address,
   Web3MailConfigOptions,
   SendEmailResponse,
   Web3SignerProvider,
@@ -34,8 +34,8 @@ type EthersCompatibleProvider =
   | string;
 
 interface Web3mailResolvedConfig {
-  dappAddressOrENS: AddressOrENS;
-  dappWhitelistAddress: AddressOrENS;
+  dappAddress: Address;
+  dappWhitelistAddress: Address;
   graphQLClient: GraphQLClient;
   ipfsNode: string;
   ipfsGateway: string;
@@ -45,9 +45,9 @@ interface Web3mailResolvedConfig {
 }
 
 export class IExecWeb3mail {
-  private dappAddressOrENS!: AddressOrENS;
+  private dappAddress!: Address;
 
-  private dappWhitelistAddress!: AddressOrENS;
+  private dappWhitelistAddress!: Address;
 
   private graphQLClient!: GraphQLClient;
 
@@ -68,17 +68,17 @@ export class IExecWeb3mail {
   private options: Web3MailConfigOptions;
 
   constructor(
-    ethProvider?: EthersCompatibleProvider,
+    ethProvider: EthersCompatibleProvider,
     options?: Web3MailConfigOptions
   ) {
-    this.ethProvider = ethProvider || 'bellecour';
+    this.ethProvider = ethProvider;
     this.options = options || {};
   }
 
   async init(): Promise<void> {
     if (!this.initPromise) {
       this.initPromise = this.resolveConfig().then((config) => {
-        this.dappAddressOrENS = config.dappAddressOrENS;
+        this.dappAddress = config.dappAddress;
         this.dappWhitelistAddress = config.dappWhitelistAddress;
         this.graphQLClient = config.graphQLClient;
         this.ipfsNode = config.ipfsNode;
@@ -99,7 +99,7 @@ export class IExecWeb3mail {
       ...args,
       iexec: this.iexec,
       graphQLClient: this.graphQLClient,
-      dappAddressOrENS: this.dappAddressOrENS,
+      dappAddress: this.dappAddress,
       dappWhitelistAddress: this.dappWhitelistAddress,
     });
   }
@@ -111,7 +111,7 @@ export class IExecWeb3mail {
       ...args,
       iexec: this.iexec,
       graphQLClient: this.graphQLClient,
-      dappAddressOrENS: this.dappAddressOrENS,
+      dappAddress: this.dappAddress,
       dappWhitelistAddress: this.dappWhitelistAddress,
     });
   }
@@ -121,12 +121,11 @@ export class IExecWeb3mail {
     await isValidProvider(this.iexec);
     return sendEmail({
       ...args,
-      workerpoolAddressOrEns:
-        args.workerpoolAddressOrEns || this.defaultWorkerpool,
+      workerpoolAddress: args.workerpoolAddress || this.defaultWorkerpool,
       iexec: this.iexec,
       ipfsNode: this.ipfsNode,
       ipfsGateway: this.ipfsGateway,
-      dappAddressOrENS: this.dappAddressOrENS,
+      dappAddress: this.dappAddress,
       dappWhitelistAddress: this.dappWhitelistAddress,
       graphQLClient: this.graphQLClient,
     });
@@ -136,16 +135,15 @@ export class IExecWeb3mail {
     args: PrepareEmailCampaignParams
   ): Promise<PrepareEmailCampaignResponse> {
     await this.init();
-    await isValidProvider(this.iexec);
+
     return prepareEmailCampaign({
       ...args,
-      workerpoolAddressOrEns:
-        args.workerpoolAddressOrEns || this.defaultWorkerpool,
+      workerpoolAddress: args.workerpoolAddress || this.defaultWorkerpool,
       iexec: this.iexec,
       dataProtector: this.dataProtector,
       ipfsNode: this.ipfsNode,
       ipfsGateway: this.ipfsGateway,
-      dappAddressOrENS: this.dappAddressOrENS,
+      dappAddress: this.dappAddress,
     });
   }
 
@@ -156,8 +154,7 @@ export class IExecWeb3mail {
     await isValidProvider(this.iexec);
     return sendEmailCampaign({
       ...args,
-      workerpoolAddressOrEns:
-        args.workerpoolAddressOrEns || this.defaultWorkerpool,
+      workerpoolAddress: args.workerpoolAddress || this.defaultWorkerpool,
       dataProtector: this.dataProtector,
     });
   }
@@ -189,8 +186,8 @@ export class IExecWeb3mail {
     const subgraphUrl =
       this.options?.dataProtectorSubgraph ||
       chainDefaultConfig?.dataProtectorSubgraph;
-    const dappAddressOrENS =
-      this.options?.dappAddressOrENS ||
+    const dappAddress =
+      this.options?.dappAddress ||
       chainDefaultConfig?.dappAddress ||
       (await resolveDappAddressFromCompass(
         await iexec.config.resolveCompassURL(),
@@ -205,7 +202,7 @@ export class IExecWeb3mail {
 
     const missing = [];
     if (!subgraphUrl) missing.push('dataProtectorSubgraph');
-    if (!dappAddressOrENS) missing.push('dappAddress');
+    if (!dappAddress) missing.push('dappAddress');
     if (!dappWhitelistAddress) missing.push('whitelistSmartContract');
     if (!ipfsGateway) missing.push('ipfsGateway');
     if (!defaultWorkerpool) missing.push('prodWorkerpoolAddress');
@@ -237,7 +234,7 @@ export class IExecWeb3mail {
     });
 
     return {
-      dappAddressOrENS,
+      dappAddress,
       dappWhitelistAddress: dappWhitelistAddress.toLowerCase(),
       defaultWorkerpool,
       graphQLClient,

package/src/web3mail/fetchMyContacts.ts

@@ -13,7 +13,7 @@ export type FetchMyContacts = typeof fetchMyContacts;
 export const fetchMyContacts = async ({
   graphQLClient = throwIfMissing(),
   iexec = throwIfMissing(),
-  dappAddressOrENS = throwIfMissing(),
+  dappAddress = throwIfMissing(),
   dappWhitelistAddress = throwIfMissing(),
   isUserStrict = false,
   bulkOnly = false,
@@ -31,7 +31,7 @@ export const fetchMyContacts = async ({
   return fetchUserContacts({
     iexec,
     graphQLClient,
-    dappAddressOrENS,
+    dappAddress,
     dappWhitelistAddress,
     userAddress,
     isUserStrict: vIsUserStrict,

package/src/web3mail/fetchUserContacts.ts

@@ -6,10 +6,8 @@ import { handleIfProtocolError, WorkflowError } from '../utils/errors.js';
 import { autoPaginateRequest } from '../utils/paginate.js';
 import { getValidContact } from '../utils/subgraphQuery.js';
 import {
-  addressOrEnsSchema,
   addressSchema,
   booleanSchema,
-  isEnsTest,
   throwIfMissing,
 } from '../utils/validators.js';
 import { Contact, FetchUserContactsParams } from './types.js';
@@ -23,7 +21,7 @@ import {
 export const fetchUserContacts = async ({
   graphQLClient = throwIfMissing(),
   iexec = throwIfMissing(),
-  dappAddressOrENS = throwIfMissing(),
+  dappAddress = throwIfMissing(),
   dappWhitelistAddress = throwIfMissing(),
   userAddress,
   isUserStrict = false,
@@ -33,29 +31,29 @@ export const fetchUserContacts = async ({
   DappAddressConsumer &
   DappWhitelistAddressConsumer &
   FetchUserContactsParams): Promise<Contact[]> => {
-  const vDappAddressOrENS = addressOrEnsSchema()
-    .required()
-    .label('dappAddressOrENS')
-    .validateSync(dappAddressOrENS);
-  const vDappWhitelistAddress = addressSchema()
-    .required()
-    .label('dappWhitelistAddress')
-    .validateSync(dappWhitelistAddress);
-  const vUserAddress = addressOrEnsSchema()
-    .required()
-    .label('userAddress')
-    .validateSync(userAddress);
-  const vIsUserStrict = booleanSchema()
-    .label('isUserStrict')
-    .validateSync(isUserStrict);
-  const vBulkOnly = booleanSchema().label('bulkOnly').validateSync(bulkOnly);
-
   try {
+    const address = addressSchema()
+      .required()
+      .label('dappAddress')
+      .validateSync(dappAddress);
+    const vDappWhitelistAddress = addressSchema()
+      .required()
+      .label('dappWhitelistAddress')
+      .validateSync(dappWhitelistAddress);
+    const vUserAddress = addressSchema()
+      .required()
+      .label('userAddress')
+      .validateSync(userAddress);
+    const vIsUserStrict = booleanSchema()
+      .label('isUserStrict')
+      .validateSync(isUserStrict);
+    const vBulkOnly = booleanSchema().label('bulkOnly').validateSync(bulkOnly);
+
     const [dappOrders, whitelistOrders] = await Promise.all([
       fetchAllOrdersByApp({
         iexec,
         userAddress: vUserAddress,
-        appAddress: vDappAddressOrENS,
+        appAddress: address,
         isUserStrict: vIsUserStrict,
         bulkOnly: vBulkOnly,
       }),
@@ -70,14 +68,10 @@ export const fetchUserContacts = async ({
 
     const orders = dappOrders.concat(whitelistOrders);
     const myContacts: Omit<Contact, 'name'>[] = [];
-    let web3DappResolvedAddress = vDappAddressOrENS;
-    if (isEnsTest(vDappAddressOrENS)) {
-      web3DappResolvedAddress = await iexec.ens.resolveName(vDappAddressOrENS);
-    }
+
     orders.forEach((order) => {
       if (
-        order.order.apprestrict.toLowerCase() ===
-          web3DappResolvedAddress.toLowerCase() ||
+        order.order.apprestrict.toLowerCase() === address.toLowerCase() ||
         order.order.apprestrict.toLowerCase() ===
           vDappWhitelistAddress.toLowerCase()
       ) {

package/src/web3mail/internalTypes.ts

@@ -1,6 +1,6 @@
 import { IExec } from 'iexec';
 import { IExecDataProtectorCore } from '@iexec/dataprotector';
-import { AddressOrENS } from './types.js';
+import { Address } from './types.js';
 import { GraphQLClient } from 'graphql-request';
 
 export type ProtectedDataQuery = {
@@ -13,7 +13,7 @@ export type GraphQLResponse = {
 };
 
 export type DappAddressConsumer = {
-  dappAddressOrENS: AddressOrENS;
+  dappAddress: Address;
 };
 
 export type IpfsNodeConfigConsumer = {

package/src/web3mail/prepareEmailCampaign.ts

@@ -7,7 +7,7 @@ import {
 import { handleIfProtocolError, WorkflowError } from '../utils/errors.js';
 import * as ipfs from '../utils/ipfs-service.js';
 import {
-  addressOrEnsSchema,
+  addressSchema,
   contentTypeSchema,
   emailContentSchema,
   emailSubjectSchema,
@@ -33,8 +33,8 @@ export type PrepareEmailCampaign = typeof prepareEmailCampaign;
 export const prepareEmailCampaign = async ({
   iexec = throwIfMissing(),
   dataProtector = throwIfMissing(),
-  workerpoolAddressOrEns,
-  dappAddressOrENS,
+  workerpoolAddress,
+  dappAddress,
   ipfsNode,
   ipfsGateway,
   senderName,
@@ -53,9 +53,9 @@ export const prepareEmailCampaign = async ({
   DataProtectorConsumer &
   PrepareEmailCampaignParams): Promise<PrepareEmailCampaignResponse> => {
   try {
-    const vWorkerpoolAddressOrEns = addressOrEnsSchema()
-      .label('WorkerpoolAddressOrEns')
-      .validateSync(workerpoolAddressOrEns);
+    const vWorkerpoolAddress = addressSchema()
+      .label('workerpoolAddress')
+      .validateSync(workerpoolAddress);
 
     const vSenderName = senderNameSchema()
       .label('senderName')
@@ -77,10 +77,10 @@ export const prepareEmailCampaign = async ({
 
     const vLabel = labelSchema().label('label').validateSync(label);
 
-    const vDappAddressOrENS = addressOrEnsSchema()
+    const vDappAddress = addressSchema()
       .required()
-      .label('dappAddressOrENS')
-      .validateSync(dappAddressOrENS);
+      .label('dappAddress')
+      .validateSync(dappAddress);
 
     const vAppMaxPrice = positiveNumberSchema()
       .label('appMaxPrice')
@@ -139,10 +139,10 @@ export const prepareEmailCampaign = async ({
     // TODO: end factor this
     const { bulkRequest: campaignRequest } =
       await dataProtector.prepareBulkRequest({
-        app: vDappAddressOrENS,
+        app: vDappAddress,
         appMaxPrice: vAppMaxPrice,
         workerpoolMaxPrice: vWorkerpoolMaxPrice,
-        workerpool: vWorkerpoolAddressOrEns,
+        workerpool: vWorkerpoolAddress,
         args: vLabel,
         inputFiles: [],
         secrets,

package/src/web3mail/sendEmail.models.ts

@@ -1,88 +1,26 @@
-import { Address, BN } from 'iexec';
 import { PublishedWorkerpoolorder } from 'iexec/IExecOrderbookModule';
-// import { VoucherInfo } from 'iexec/IExecVoucherModule';
-
-// To import from 'iexec' once exported
-type VoucherInfo = {
-  owner: Address;
-  address: Address;
-  type: BN;
-  balance: BN;
-  expirationTimestamp: BN;
-  sponsoredApps: Address[];
-  sponsoredDatasets: Address[];
-  sponsoredWorkerpools: Address[];
-  allowanceAmount: BN;
-  authorizedAccounts: Address[];
-};
-
-function bnToNumber(bn: BN) {
-  return Number(bn.toString());
-}
-
-export function checkUserVoucher({
-  userVoucher,
-}: {
-  userVoucher: VoucherInfo;
-}) {
-  if (bnToNumber(userVoucher.expirationTimestamp) < Date.now() / 1000) {
-    throw new Error(
-      'Oops, it seems your voucher has expired. You might want to ask for a top up. Check on https://builder.iex.ec/'
-    );
-  }
-
-  if (bnToNumber(userVoucher.balance) === 0) {
-    throw new Error(
-      'Oops, it seems your voucher is empty. You might want to ask for a top up. Check on https://builder.iex.ec/'
-    );
-  }
-}
 
 export function filterWorkerpoolOrders({
   workerpoolOrders,
   workerpoolMaxPrice,
-  useVoucher,
-  userVoucher,
 }: {
   workerpoolOrders: PublishedWorkerpoolorder[];
   workerpoolMaxPrice: number;
-  useVoucher: boolean;
-  userVoucher?: VoucherInfo;
 }) {
   if (workerpoolOrders.length === 0) {
     return null;
   }
 
-  let eligibleWorkerpoolOrders = workerpoolOrders;
-  let maxVoucherSponsoredAmount = 0; // may be safer to use bigint
-
-  if (useVoucher) {
-    if (!userVoucher) {
-      throw new Error(
-        'useVoucher === true but userVoucher is undefined? Hum...'
-      );
-    }
-    // only voucher sponsored workerpoolorders
-    eligibleWorkerpoolOrders = eligibleWorkerpoolOrders.filter(({ order }) =>
-      userVoucher.sponsoredWorkerpools.includes(order.workerpool)
+  const [cheapestOrder] = workerpoolOrders
+    .slice()
+    .sort(
+      (order1, order2) =>
+        order1.order.workerpoolprice - order2.order.workerpoolprice
     );
-    if (eligibleWorkerpoolOrders.length === 0) {
-      throw new Error(
-        'Found some workerpool orders but none can be sponsored by your voucher.'
-      );
-    }
-    maxVoucherSponsoredAmount = bnToNumber(userVoucher.balance);
-  }
-
-  const [cheapestOrder] = eligibleWorkerpoolOrders.sort(
-    (order1, order2) =>
-      order1.order.workerpoolprice - order2.order.workerpoolprice
-  );
 
   if (
     !cheapestOrder ||
-    cheapestOrder.order.workerpoolprice >
-      workerpoolMaxPrice + maxVoucherSponsoredAmount
+    cheapestOrder.order.workerpoolprice > workerpoolMaxPrice
   ) {
     return null;
   }

package/src/web3mail/sendEmail.ts

@@ -11,9 +11,7 @@ import { generateSecureUniqueId } from '../utils/generateUniqueId.js';
 import * as ipfs from '../utils/ipfs-service.js';
 import { checkProtectedDataValidity } from '../utils/subgraphQuery.js';
 import {
-  addressOrEnsSchema,
   addressSchema,
-  booleanSchema,
   contentTypeSchema,
   emailContentSchema,
   emailSubjectSchema,
@@ -22,10 +20,7 @@ import {
   senderNameSchema,
   throwIfMissing,
 } from '../utils/validators.js';
-import {
-  checkUserVoucher,
-  filterWorkerpoolOrders,
-} from './sendEmail.models.js';
+import { filterWorkerpoolOrders } from './sendEmail.models.js';
 import { SendEmailParams, SendEmailResponse } from './types.js';
 import {
   DappAddressConsumer,
@@ -41,8 +36,8 @@ export type SendEmail = typeof sendEmail;
 export const sendEmail = async ({
   graphQLClient = throwIfMissing(),
   iexec = throwIfMissing(),
-  workerpoolAddressOrEns,
-  dappAddressOrENS,
+  workerpoolAddress,
+  dappAddress,
   dappWhitelistAddress,
   ipfsNode,
   ipfsGateway,
@@ -55,7 +50,6 @@ export const sendEmail = async ({
   workerpoolMaxPrice = MAX_DESIRED_WORKERPOOL_ORDER_PRICE,
   senderName,
   protectedData,
-  useVoucher = false,
 }: IExecConsumer &
   SubgraphConsumer &
   DappAddressConsumer &
@@ -63,7 +57,7 @@ export const sendEmail = async ({
   IpfsNodeConfigConsumer &
   IpfsGatewayConfigConsumer &
   SendEmailParams): Promise<SendEmailResponse> => {
-  const vDatasetAddress = addressOrEnsSchema()
+  const vDatasetAddress = addressSchema()
     .required()
     .label('protectedData')
     .validateSync(protectedData);
@@ -89,15 +83,15 @@ export const sendEmail = async ({
 
   const vLabel = labelSchema().label('label').validateSync(label);
 
-  const vWorkerpoolAddressOrEns = addressOrEnsSchema()
+  const vWorkerpoolAddress = addressSchema()
     .required()
-    .label('WorkerpoolAddressOrEns')
-    .validateSync(workerpoolAddressOrEns);
+    .label('workerpoolAddress')
+    .validateSync(workerpoolAddress);
 
-  const vDappAddressOrENS = addressOrEnsSchema()
+  const vDappAddress = addressSchema()
     .required()
-    .label('dappAddressOrENS')
-    .validateSync(dappAddressOrENS);
+    .label('dappAddress')
+    .validateSync(dappAddress);
 
   const vDappWhitelistAddress = addressSchema()
     .required()
@@ -116,10 +110,6 @@ export const sendEmail = async ({
     .label('workerpoolMaxPrice')
     .validateSync(workerpoolMaxPrice);
 
-  const vUseVoucher = booleanSchema()
-    .label('useVoucher')
-    .validateSync(useVoucher);
-
   // Check protected data schema through subgraph
   const isValidProtectedData = await checkProtectedDataValidity(
     graphQLClient,
@@ -134,28 +124,13 @@ export const sendEmail = async ({
 
   const requesterAddress = await iexec.wallet.getAddress();
 
-  let userVoucher;
-  if (vUseVoucher) {
-    try {
-      userVoucher = await iexec.voucher.showUserVoucher(requesterAddress);
-      checkUserVoucher({ userVoucher });
-    } catch (err) {
-      if (err?.message?.startsWith('No Voucher found for address')) {
-        throw new Error(
-          'Oops, it seems your wallet is not associated with any voucher. Check on https://builder.iex.ec/'
-        );
-      }
-      throw err;
-    }
-  }
-
   try {
     // Fetch app order first to determine TEE framework
     const apporder = await iexec.orderbook
       .fetchAppOrderbook({
-        app: dappAddressOrENS,
+        app: vDappAddress,
         minTag: ['tee'],
-        workerpool: workerpoolAddressOrEns,
+        workerpool: vWorkerpoolAddress,
       })
       .then((appOrderbook) => {
         const desiredPriceAppOrderbook = appOrderbook.orders.filter(
@@ -176,7 +151,7 @@ export const sendEmail = async ({
         iexec.orderbook
           .fetchDatasetOrderbook({
             dataset: vDatasetAddress,
-            app: dappAddressOrENS,
+            app: vDappAddress,
             requester: requesterAddress,
           })
           .then((datasetOrderbook) => {
@@ -203,21 +178,19 @@ export const sendEmail = async ({
         Promise.all([
           // for app
           iexec.orderbook.fetchWorkerpoolOrderbook({
-            workerpool: workerpoolAddressOrEns,
-            app: vDappAddressOrENS,
+            workerpool: vWorkerpoolAddress,
+            app: vDappAddress,
             dataset: vDatasetAddress,
-            requester: requesterAddress, // public orders + user specific orders
-            isRequesterStrict: useVoucher, // If voucher, we only want user specific orders
+            requester: requesterAddress,
             minTag: workerpoolMinTag,
             category: 0,
           }),
           // for app whitelist
           iexec.orderbook.fetchWorkerpoolOrderbook({
-            workerpool: workerpoolAddressOrEns,
+            workerpool: vWorkerpoolAddress,
             app: vDappWhitelistAddress,
             dataset: vDatasetAddress,
-            requester: requesterAddress, // public orders + user specific orders
-            isRequesterStrict: useVoucher, // If voucher, we only want user specific orders
+            requester: requesterAddress,
             minTag: workerpoolMinTag,
             category: 0,
           }),
@@ -229,8 +202,6 @@ export const sendEmail = async ({
                 ...workerpoolOrderbookForAppWhitelist.orders,
               ],
               workerpoolMaxPrice: vWorkerpoolMaxPrice,
-              useVoucher: vUseVoucher,
-              userVoucher,
             });
 
             if (!desiredPriceWorkerpoolOrder) {
@@ -292,14 +263,14 @@ export const sendEmail = async ({
     );
 
     const requestorderToSign = await iexec.order.createRequestorder({
-      app: vDappAddressOrENS,
+      app: vDappAddress,
       category: workerpoolorder.category,
       dataset: vDatasetAddress,
       datasetmaxprice: datasetorder.datasetprice,
       appmaxprice: apporder.appprice,
       workerpoolmaxprice: workerpoolorder.workerpoolprice,
       tag: ['tee'],
-      workerpool: vWorkerpoolAddressOrEns,
+      workerpool: vWorkerpoolAddress,
       callback: CALLBACK_WEB3MAIL,
       params: {
         iexec_secrets: {
@@ -312,15 +283,12 @@ export const sendEmail = async ({
     const requestorder = await iexec.order.signRequestorder(requestorderToSign);
 
     // Match orders and compute task ID
-    const { dealid: dealId } = await iexec.order.matchOrders(
-      {
-        apporder: apporder,
-        datasetorder: datasetorder,
-        workerpoolorder: workerpoolorder,
-        requestorder: requestorder,
-      },
-      { useVoucher: vUseVoucher }
-    );
+    const { dealid: dealId } = await iexec.order.matchOrders({
+      apporder: apporder,
+      datasetorder: datasetorder,
+      workerpoolorder: workerpoolorder,
+      requestorder: requestorder,
+    });
 
     const taskId = await iexec.deal.computeTaskId(dealId, 0);
 

package/src/web3mail/sendEmailCampaign.ts

@@ -2,7 +2,7 @@ import { NULL_ADDRESS } from 'iexec/utils';
 import { ValidationError } from 'yup';
 import { handleIfProtocolError, WorkflowError } from '../utils/errors.js';
 import {
-  addressOrEnsSchema,
+  addressSchema,
   campaignRequestSchema,
   throwIfMissing,
 } from '../utils/validators.js';
@@ -17,7 +17,7 @@ export type SendEmailCampaign = typeof sendEmailCampaign;
 
 export const sendEmailCampaign = async ({
   dataProtector = throwIfMissing(),
-  workerpoolAddressOrEns = throwIfMissing(),
+  workerpoolAddress = throwIfMissing(),
   campaignRequest,
 }: DataProtectorConsumer &
   SendEmailCampaignParams): Promise<SendEmailCampaignResponse> => {
@@ -26,18 +26,18 @@ export const sendEmailCampaign = async ({
     .label('campaignRequest')
     .validateSync(campaignRequest) as CampaignRequest;
 
-  const vWorkerpoolAddressOrEns = addressOrEnsSchema()
+  const vWorkerpoolAddress = addressSchema()
     .required()
-    .label('workerpoolAddressOrEns')
-    .validateSync(workerpoolAddressOrEns);
+    .label('workerpoolAddress')
+    .validateSync(workerpoolAddress);
 
   if (
     vCampaignRequest.workerpool !== NULL_ADDRESS &&
     vCampaignRequest.workerpool.toLowerCase() !==
-      vWorkerpoolAddressOrEns.toLowerCase()
+      vWorkerpoolAddress.toLowerCase()
   ) {
     throw new ValidationError(
-      "workerpoolAddressOrEns doesn't match campaignRequest workerpool"
+      "workerpoolAddress doesn't match campaignRequest workerpool"
     );
   }
 
@@ -45,7 +45,7 @@ export const sendEmailCampaign = async ({
     // Process the prepared bulk request
     const processBulkRequestResponse = await dataProtector.processBulkRequest({
       bulkRequest: vCampaignRequest,
-      workerpool: vWorkerpoolAddressOrEns,
+      workerpool: vWorkerpoolAddress,
       waitForResult: false,
     });
 
@@ -57,13 +57,12 @@ export const sendEmailCampaign = async ({
     }
 
     // Handle protocol errors - this will throw if it's an ApiCallError
-    // handleIfProtocolError transforms ApiCallError into a WorkflowError with isProtocolError=true
-    handleIfProtocolError(error);
+    handleIfProtocolError(error as Error);
 
     // For all other errors
     throw new WorkflowError({
       message: 'Failed to sendEmailCampaign',
-      errorCause: error,
+      errorCause: error as Error,
     });
   }
 };