@bosonprotocol/core-sdk 1.25.0-alpha.19 → 1.25.0-alpha.20

package/dist/esm/voucher/interface.js

@@ -62,4 +62,56 @@ export function encodeWithdrawToProtocol(tokenList) {
         tokenList
     ]);
 }
+const ownableIface = new Interface([
+    {
+        inputs: [],
+        name: "owner",
+        outputs: [
+            {
+                internalType: "address",
+                name: "",
+                type: "address"
+            }
+        ],
+        stateMutability: "view",
+        type: "function"
+    }
+]);
+export function encodeOwner() {
+    return ownableIface.encodeFunctionData("owner");
+}
+export function decodeOwner(result) {
+    const [owner] = ownableIface.decodeFunctionResult("owner", result);
+    return owner;
+}
+const eRC2771ContextIface = new Interface([
+    {
+        inputs: [
+            {
+                internalType: "address",
+                name: "forwarder",
+                type: "address"
+            }
+        ],
+        name: "isTrustedForwarder",
+        outputs: [
+            {
+                internalType: "bool",
+                name: "",
+                type: "bool"
+            }
+        ],
+        stateMutability: "view",
+        type: "function"
+    }
+]);
+export function encodeIsTrustedForwarder(forwarder) {
+    return eRC2771ContextIface.encodeFunctionData("isTrustedForwarder", [
+        forwarder
+    ]);
+}
+export function decodeIsTrustedForwarder(result) {
+    const [isTrustedForwarder] = eRC2771ContextIface.decodeFunctionResult("isTrustedForwarder", result);
+    return isTrustedForwarder;
+}
 //# sourceMappingURL=interface.js.map

package/dist/esm/voucher/interface.js.map

@@ -1 +1 @@
-{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../../src/voucher/interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAG/C,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;AAEtE,MAAM,UAAU,2BAA2B,CAAC,OAAqB;IAC/D,OAAO,iBAAiB,CAAC,kBAAkB,CAAC,uBAAuB,EAAE;QACnE,OAAO;KACR,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,OAAqB;IAC9D,OAAO,iBAAiB,CAAC,kBAAkB,CAAC,sBAAsB,EAAE;QAClE,OAAO;KACR,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,MAAc;IACvD,OAAO,iBAAiB,CAAC,oBAAoB,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAC;AAChF,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,KAAa,EAAE,QAAgB;IACpE,OAAO,iBAAiB,CAAC,kBAAkB,CAAC,kBAAkB,EAAE;QAC9D,KAAK;QACL,QAAQ;KACT,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,MAAc;IACnD,OAAO,iBAAiB,CAAC,oBAAoB,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;AAC5E,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,OAAqB;IAC3D,OAAO,iBAAiB,CAAC,kBAAkB,CAAC,mBAAmB,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;AAC9E,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,MAAc;IACpD,OAAO,iBAAiB,CAAC,oBAAoB,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;AAC7E,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,OAAqB,EAAE,MAAoB;IACvE,OAAO,iBAAiB,CAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;AAC5E,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,QAAgB,EAAE,QAAiB;IACzE,OAAO,iBAAiB,CAAC,kBAAkB,CAAC,mBAAmB,EAAE;QAC/D,QAAQ;QACR,QAAQ;KACT,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,IAAkB,EAClB,EAAgB,EAChB,OAAqB;IAErB,OAAO,iBAAiB,CAAC,kBAAkB,CAAC,cAAc,EAAE;QAC1D,IAAI;QACJ,EAAE;QACF,OAAO;KACR,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,EAAU,EAAE,IAAY;IACjE,OAAO,iBAAiB,CAAC,kBAAkB,CAAC,sBAAsB,EAAE;QAClE,EAAE;QACF,IAAI;KACL,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,iCAAiC,CAC/C,QAAgB,EAChB,QAAiB;IAEjB,OAAO,iBAAiB,CAAC,kBAAkB,CAAC,6BAA6B,EAAE;QACzE,QAAQ;QACR,QAAQ;KACT,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,SAAmB;IAC1D,OAAO,iBAAiB,CAAC,kBAAkB,CAAC,oBAAoB,EAAE;QAChE,SAAS;KACV,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../../src/voucher/interface.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bosonprotocol/core-sdk",
-  "version": "1.25.0-alpha.19",
+  "version": "1.25.0-alpha.20",
   "description": "Facilitates interaction with the contracts and subgraphs of the Boson Protocol",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
@@ -33,7 +33,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@bosonprotocol/common": "^1.21.0-alpha.19",
+    "@bosonprotocol/common": "^1.21.0-alpha.20",
     "@ethersproject/abi": "^5.5.0",
     "@ethersproject/address": "^5.5.0",
     "@ethersproject/bignumber": "^5.5.0",
@@ -54,5 +54,5 @@
     "ts-jest": "^27.1.3",
     "typescript": "^4.5.5"
   },
-  "gitHead": "27e66ae0274b5b3c28a73f0e01c868306e13470a"
+  "gitHead": "afdb1457d2c904f3748db41f5af8436ae1f049c1"
 }

package/src/forwarder/handler.ts

@@ -7,13 +7,13 @@ export async function getNonce(args: {
   contractAddress: string;
   user: string;
   web3Lib: Web3LibAdapter;
-  batchId: BigNumberish;
+  batchId?: BigNumberish;
   forwarderAbi: typeof abis.MockForwarderABI | typeof abis.BiconomyForwarderABI;
 }): Promise<string> {
   const isMock = args.forwarderAbi === mockInterface.abi;
   const data = isMock
     ? mockInterface.encodeGetNonce(args.user)
-    : biconomyInterface.encodeGetNonce(args.user, args.batchId);
+    : biconomyInterface.encodeGetNonce(args.user, args.batchId || "0");
 
   const result = await args.web3Lib.call({
     to: args.contractAddress,
@@ -45,12 +45,10 @@ export async function verifyEIP712(args: {
     args.signature
   );
   try {
-    const result = await args.web3Lib.call({
+    await args.web3Lib.call({
       to: args.contractAddress,
       data
     });
-    const ret = biconomyInterface.decodeVerifyEIP712(result);
-    console.log({ ret });
     return true;
   } catch (e) {
     return false;

package/src/meta-tx/biconomy.ts

@@ -44,13 +44,46 @@ export type GetRetriedHashesArgs = {
   transactionHash: string;
 };
 
+export type ForwarderDomainData = {
+  name: string;
+  version: string;
+  verifyingContract: string;
+  salt: string;
+};
+
 export class Biconomy {
   public constructor(
     private _relayerUrl: string,
-    private _apiKey: string,
-    private _apiId: string
+    private _apiKey?: string,
+    private _apiId?: string
   ) {}
 
+  public async getForwarderDomainDetails(
+    args: { chainId: number },
+    overrides: Partial<{
+      relayerUrl: string;
+      forwarderAddress: string;
+    }> = {}
+  ): Promise<{ [key: string]: ForwarderDomainData }> {
+    const url = `${
+      overrides.relayerUrl || this._relayerUrl
+    }/api/v2/meta-tx/systemInfo?networkId=${args.chainId}`;
+    const response = await fetch(url, { method: "GET" });
+
+    if (!response.ok) {
+      let message;
+      try {
+        const jsonResponse = await response.json();
+        message = JSON.stringify(jsonResponse);
+      } catch {
+        message = response.statusText;
+      }
+      throw new ApiError(response.status, `Failed to relay tx: ${message}`);
+    }
+    const txResponse = await response.json();
+    return txResponse?.forwarderDomainDetails;
+  }
+
   public async relayTransaction(
     args: RelayTransactionArgs,
     overrides: Partial<RelayOverrides> = {}

package/src/meta-tx/handler.ts

@@ -30,7 +30,11 @@ import {
   encodeReserveRange
 } from "../offers/interface";
 import { prepareDataSignatureParameters } from "../utils/signature";
-import { Biconomy, GetRetriedHashesData } from "./biconomy";
+import {
+  Biconomy,
+  ForwarderDomainData,
+  GetRetriedHashesData
+} from "./biconomy";
 import { isAddress } from "@ethersproject/address";
 import { AddressZero } from "@ethersproject/constants";
 import { encodeDepositFunds, encodeWithdrawFunds } from "../funds/interface";
@@ -48,8 +52,9 @@ import { keccak256 } from "@ethersproject/keccak256";
 import { id } from "@ethersproject/hash";
 import { defaultAbiCoder } from "@ethersproject/abi";
 import { ERC20ForwardRequest } from "../forwarder/biconomy-interface";
-import { verifyEIP712 } from "../forwarder/handler";
+import { getNonce, verifyEIP712 } from "../forwarder/handler";
 import { MockForwardRequest } from "../forwarder/mock-interface";
+import { isTrustedForwarder, owner } from "../voucher/handler";
 
 export type BaseMetaTxArgs = {
   web3Lib: Web3LibAdapter;
@@ -60,9 +65,7 @@ export type BaseMetaTxArgs = {
 
 export type BaseVoucherMetaTxArgs = {
   web3Lib: Web3LibAdapter;
-  nonce: BigNumberish;
   bosonVoucherAddress: string;
-  forwarderAddress: string;
   chainId: number;
 };
 
@@ -126,7 +129,9 @@ export async function signMetaTx(
 
 export async function signVoucherMetaTx(
   args: BaseVoucherMetaTxArgs & {
+    forwarderAbi: typeof abis.MockForwarderABI;
     functionSignature: string;
+    forwarderAddress: string;
   }
 ): Promise<SignedVoucherMetaTx> {
   const forwardType = [
@@ -148,11 +153,17 @@ export async function signVoucherMetaTx(
 
   const signerAddress = await args.web3Lib.getSignerAddress();
   const chainId = await args.web3Lib.getChainId();
+  const nonce = await getNonce({
+    contractAddress: args.forwarderAddress,
+    user: signerAddress,
+    web3Lib: args.web3Lib,
+    forwarderAbi: args.forwarderAbi
+  });
 
   const message = {
     from: signerAddress,
     to: args.bosonVoucherAddress,
-    nonce: args.nonce,
+    nonce,
     data: args.functionSignature
   };
 
@@ -186,6 +197,7 @@ export async function signBiconomyVoucherMetaTx(
       | typeof abis.MockForwarderABI
       | typeof abis.BiconomyForwarderABI;
     txGas: BigNumberish;
+    relayerUrl: string;
   }
 ): Promise<SignedVoucherMetaTx> {
   const customSignatureType = {
@@ -213,6 +225,43 @@ export async function signBiconomyVoucherMetaTx(
   const signerAddress = await args.web3Lib.getSignerAddress();
   const chainId = await args.web3Lib.getChainId();
 
+  // Check which forwarder needs to be used for the contract
+  const biconomyForwarderDomainDetails = await new Biconomy(
+    args.relayerUrl
+  ).getForwarderDomainDetails({ chainId });
+
+  const biconomyForwarderDomainData = await new Promise<
+    ForwarderDomainData | undefined
+    // eslint-disable-next-line no-async-promise-executor
+  >(async (resolve, reject) => {
+    try {
+      for (const bFDD of Object.values(biconomyForwarderDomainDetails)) {
+        const ret = await isTrustedForwarder({
+          forwarder: bFDD.verifyingContract,
+          contractAddress: args.bosonVoucherAddress,
+          web3Lib: args.web3Lib
+        });
+        if (ret) {
+          resolve(bFDD);
+        }
+      }
+      resolve(undefined);
+    } catch (e) {
+      reject(e);
+    }
+  });
+  if (!biconomyForwarderDomainData) {
+    throw `Unable to find the trusted forwarder for BosonVoucher contract ${args.bosonVoucherAddress}`;
+  }
+
+  const nonce = await getNonce({
+    contractAddress: biconomyForwarderDomainData.verifyingContract,
+    user: signerAddress,
+    web3Lib: args.web3Lib,
+    batchId: args.batchId,
+    forwarderAbi: args.forwarderAbi
+  });
+
   const message = {
     from: signerAddress,
     to: args.bosonVoucherAddress,
@@ -220,22 +269,15 @@ export async function signBiconomyVoucherMetaTx(
     txGas: args.txGas,
     tokenGasPrice: "0",
     batchId: args.batchId,
-    batchNonce: args.nonce,
+    batchNonce: nonce,
     deadline: Math.floor(Date.now() / 1000 + 3600),
     data: args.functionSignature
   };
 
-  const biconomyForwarderDomainData = {
-    name: "Biconomy Forwarder",
-    version: "1",
-    verifyingContract: args.forwarderAddress,
-    salt: hexZeroPad(BigNumber.from(chainId).toHexString(), 32)
-  };
-
   const signatureParams = await prepareDataSignatureParameters({
     ...args,
     chainId,
-    verifyingContractAddress: args.forwarderAddress,
+    verifyingContractAddress: biconomyForwarderDomainData.verifyingContract,
     customSignatureType,
     primaryType: "ERC20ForwardRequest",
     message,
@@ -268,7 +310,7 @@ export async function signBiconomyVoucherMetaTx(
   // verify signature
   const signatureVerified = await verifyEIP712({
     request: message,
-    contractAddress: args.forwarderAddress,
+    contractAddress: biconomyForwarderDomainData.verifyingContract,
     web3Lib: args.web3Lib,
     domainSeparator,
     forwarderAbi: args.forwarderAbi,
@@ -573,10 +615,12 @@ export async function signMetaTxPreMint(
   args: BaseVoucherMetaTxArgs & {
     offerId: BigNumberish;
     amount: BigNumberish;
-    batchId: BigNumberish;
+    batchId?: BigNumberish;
+    forwarderAddress?: string;
     forwarderAbi:
       | typeof abis.MockForwarderABI
       | typeof abis.BiconomyForwarderABI;
+    relayerUrl: string;
   }
 ): Promise<SignedVoucherMetaTx> {
   const localConfig = defaultConfigs.find(
@@ -587,13 +631,17 @@ export async function signMetaTxPreMint(
   if (isLocal) {
     return signVoucherMetaTx({
       ...args,
-      functionSignature
+      forwarderAddress: args.forwarderAddress,
+      functionSignature,
+      forwarderAbi: args.forwarderAbi as typeof abis.MockForwarderABI
     });
   }
   const txGas = 200000 + BigNumber.from(args.amount).mul(2500).toNumber(); // ~(180000 + 2250*N) estimation on 2023/02/03
   return signBiconomyVoucherMetaTx({
     ...args,
     functionSignature,
+    forwarderAbi: args.forwarderAbi as typeof abis.BiconomyForwarderABI,
+    batchId: args.batchId || "0",
     txGas
   });
 }
@@ -602,10 +650,12 @@ export async function signMetaTxSetApprovalForAll(
   args: BaseVoucherMetaTxArgs & {
     operator: string;
     approved: boolean;
-    batchId: BigNumberish;
+    batchId?: BigNumberish;
+    forwarderAddress?: string;
     forwarderAbi:
       | typeof abis.MockForwarderABI
       | typeof abis.BiconomyForwarderABI;
+    relayerUrl: string;
   }
 ): Promise<SignedVoucherMetaTx> {
   const localConfig = defaultConfigs.find(
@@ -619,13 +669,17 @@ export async function signMetaTxSetApprovalForAll(
   if (isLocal) {
     return signVoucherMetaTx({
       ...args,
-      functionSignature
+      forwarderAddress: args.forwarderAddress,
+      functionSignature,
+      forwarderAbi: args.forwarderAbi as typeof abis.MockForwarderABI
     });
   }
   const txGas = 100000; // ~70000 estimation on 2023/02/03
   return signBiconomyVoucherMetaTx({
     ...args,
     functionSignature,
+    forwarderAbi: args.forwarderAbi as typeof abis.BiconomyForwarderABI,
+    batchId: args.batchId || "0",
     txGas
   });
 }
@@ -634,10 +688,12 @@ export async function signMetaTxSetApprovalForAllToContract(
   args: BaseVoucherMetaTxArgs & {
     operator: string;
     approved: boolean;
-    batchId: BigNumberish;
+    batchId?: BigNumberish;
+    forwarderAddress?: string;
     forwarderAbi:
       | typeof abis.MockForwarderABI
       | typeof abis.BiconomyForwarderABI;
+    relayerUrl: string;
   },
   overrides: {
     txGas?: number;
@@ -654,13 +710,17 @@ export async function signMetaTxSetApprovalForAllToContract(
   if (isLocal) {
     return signVoucherMetaTx({
       ...args,
-      functionSignature
+      forwarderAddress: args.forwarderAddress,
+      functionSignature,
+      forwarderAbi: args.forwarderAbi as typeof abis.MockForwarderABI
     });
   }
   const txGas = overrides.txGas || 100000; // TODO: estimate the gas needed
   return signBiconomyVoucherMetaTx({
     ...args,
     functionSignature,
+    forwarderAbi: args.forwarderAbi as typeof abis.BiconomyForwarderABI,
+    batchId: args.batchId || "0",
     txGas
   });
 }
@@ -669,10 +729,12 @@ export async function signMetaTxCallExternalContract(
   args: BaseVoucherMetaTxArgs & {
     to: string;
     data: string;
-    batchId: BigNumberish;
+    batchId?: BigNumberish;
+    forwarderAddress?: string;
     forwarderAbi:
       | typeof abis.MockForwarderABI
       | typeof abis.BiconomyForwarderABI;
+    relayerUrl: string;
   },
   overrides: {
     txGas?: number;
@@ -686,13 +748,17 @@ export async function signMetaTxCallExternalContract(
   if (isLocal) {
     return signVoucherMetaTx({
       ...args,
-      functionSignature
+      forwarderAddress: args.forwarderAddress,
+      functionSignature,
+      forwarderAbi: args.forwarderAbi as typeof abis.MockForwarderABI
     });
   }
   const txGas = overrides.txGas || 500000; // TODO: estimate the gas needed
   return signBiconomyVoucherMetaTx({
     ...args,
     functionSignature,
+    forwarderAbi: args.forwarderAbi as typeof abis.BiconomyForwarderABI,
+    batchId: args.batchId || "0",
     txGas
   });
 }

package/src/meta-tx/mixin.ts

@@ -165,25 +165,17 @@ export class MetaTxMixin extends BaseCoreSDK {
       | "web3Lib"
       | "bosonVoucherAddress"
       | "chainId"
-      | "nonce"
       | "forwarderAddress"
       | "batchId"
       | "forwarderAbi"
+      | "relayerUrl"
     >,
     overrides: Partial<{
       batchId: BigNumberish;
     }> = {}
   ) {
-    const signerAddress = await this._web3Lib.getSignerAddress();
     const forwarderAddress = this._contracts.forwarder;
     const batchId = overrides.batchId || 0;
-    const nonce = await getNonce({
-      contractAddress: forwarderAddress,
-      user: signerAddress,
-      web3Lib: this._web3Lib,
-      batchId,
-      forwarderAbi: this._metaTxConfig.forwarderAbi
-    });
     const offerFromSubgraph = await getOfferById(
       this._subgraphUrl,
       args.offerId
@@ -192,10 +184,10 @@ export class MetaTxMixin extends BaseCoreSDK {
       web3Lib: this._web3Lib,
       bosonVoucherAddress: offerFromSubgraph.seller.voucherCloneAddress,
       chainId: this._chainId,
-      nonce,
       forwarderAddress,
       batchId,
       forwarderAbi: this._metaTxConfig.forwarderAbi,
+      relayerUrl: this._metaTxConfig.relayerUrl,
       ...args
     });
   }
@@ -210,6 +202,7 @@ export class MetaTxMixin extends BaseCoreSDK {
       | "forwarderAddress"
       | "batchId"
       | "forwarderAbi"
+      | "relayerUrl"
     >,
     overrides: Partial<{
       batchId: BigNumberish;
@@ -222,22 +215,15 @@ export class MetaTxMixin extends BaseCoreSDK {
     );
     const forwarderAddress = this._contracts.forwarder;
     const batchId = overrides.batchId || 0;
-    const nonce = await getNonce({
-      contractAddress: forwarderAddress,
-      user: sellerAddress,
-      web3Lib: this._web3Lib,
-      batchId,
-      forwarderAbi: this._metaTxConfig.forwarderAbi
-    });
 
     return handler.signMetaTxSetApprovalForAll({
       web3Lib: this._web3Lib,
       bosonVoucherAddress: seller.voucherCloneAddress,
       chainId: this._chainId,
-      nonce,
       forwarderAddress,
       batchId,
       forwarderAbi: this._metaTxConfig.forwarderAbi,
+      relayerUrl: this._metaTxConfig.relayerUrl,
       ...args
     });
   }
@@ -252,6 +238,7 @@ export class MetaTxMixin extends BaseCoreSDK {
       | "forwarderAddress"
       | "batchId"
       | "forwarderAbi"
+      | "relayerUrl"
     >,
     overrides: Partial<{
       batchId?: BigNumberish;
@@ -265,23 +252,16 @@ export class MetaTxMixin extends BaseCoreSDK {
     );
     const forwarderAddress = this._contracts.forwarder;
     const batchId = overrides.batchId || 0;
-    const nonce = await getNonce({
-      contractAddress: forwarderAddress,
-      user: sellerAddress,
-      web3Lib: this._web3Lib,
-      batchId,
-      forwarderAbi: this._metaTxConfig.forwarderAbi
-    });
 
     return handler.signMetaTxSetApprovalForAllToContract(
       {
         web3Lib: this._web3Lib,
         bosonVoucherAddress: seller.voucherCloneAddress,
         chainId: this._chainId,
-        nonce,
         forwarderAddress,
         batchId,
         forwarderAbi: this._metaTxConfig.forwarderAbi,
+        relayerUrl: this._metaTxConfig.relayerUrl,
         ...args
       },
       {
@@ -300,6 +280,7 @@ export class MetaTxMixin extends BaseCoreSDK {
       | "forwarderAddress"
       | "batchId"
       | "forwarderAbi"
+      | "relayerUrl"
     >,
     overrides: Partial<{
       batchId?: BigNumberish;
@@ -313,23 +294,16 @@ export class MetaTxMixin extends BaseCoreSDK {
     );
     const forwarderAddress = this._contracts.forwarder;
     const batchId = overrides.batchId || 0;
-    const nonce = await getNonce({
-      contractAddress: forwarderAddress,
-      user: sellerAddress,
-      web3Lib: this._web3Lib,
-      batchId,
-      forwarderAbi: this._metaTxConfig.forwarderAbi
-    });
 
     return handler.signMetaTxCallExternalContract(
       {
         web3Lib: this._web3Lib,
         bosonVoucherAddress: seller.voucherCloneAddress,
         chainId: this._chainId,
-        nonce,
         forwarderAddress,
         batchId,
         forwarderAbi: this._metaTxConfig.forwarderAbi,
+        relayerUrl: this._metaTxConfig.relayerUrl,
         ...args
       },
       {

package/src/voucher/handler.ts

@@ -5,11 +5,15 @@ import {
   decodeGetAvailablePreMints,
   decodeGetRangeByOfferId,
   decodeIsApprovedForAll,
+  decodeIsTrustedForwarder,
+  decodeOwner,
   encodeBurnPremintedVouchers,
   encodeCallExternalContract,
   encodeGetAvailablePreMints,
   encodeGetRangeByOfferId,
   encodeIsApprovedForAll,
+  encodeIsTrustedForwarder,
+  encodeOwner,
   encodePreMint,
   encodeSetApprovalForAllToContract,
   encodeTransferFrom,
@@ -27,6 +31,29 @@ export async function burnPremintedVouchers(args: {
   });
 }
 
+export async function owner(args: {
+  contractAddress: string;
+  web3Lib: Web3LibAdapter;
+}): Promise<string> {
+  const result = await args.web3Lib.call({
+    to: args.contractAddress,
+    data: encodeOwner()
+  });
+  return decodeOwner(result);
+}
+
+export async function isTrustedForwarder(args: {
+  forwarder: string;
+  contractAddress: string;
+  web3Lib: Web3LibAdapter;
+}): Promise<boolean> {
+  const result = await args.web3Lib.call({
+    to: args.contractAddress,
+    data: encodeIsTrustedForwarder(args.forwarder)
+  });
+  return decodeIsTrustedForwarder(result);
+}
+
 export async function getAvailablePreMints(args: {
   offerId: BigNumberish;
   contractAddress: string;

package/src/voucher/interface.ts

@@ -84,3 +84,64 @@ export function encodeWithdrawToProtocol(tokenList: string[]) {
     tokenList
   ]);
 }
+
+const ownableIface = new Interface([
+  {
+    inputs: [],
+    name: "owner",
+    outputs: [
+      {
+        internalType: "address",
+        name: "",
+        type: "address"
+      }
+    ],
+    stateMutability: "view",
+    type: "function"
+  }
+]);
+
+export function encodeOwner() {
+  return ownableIface.encodeFunctionData("owner");
+}
+
+export function decodeOwner(result: string): string {
+  const [owner] = ownableIface.decodeFunctionResult("owner", result);
+  return owner;
+}
+
+const eRC2771ContextIface = new Interface([
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "forwarder",
+        type: "address"
+      }
+    ],
+    name: "isTrustedForwarder",
+    outputs: [
+      {
+        internalType: "bool",
+        name: "",
+        type: "bool"
+      }
+    ],
+    stateMutability: "view",
+    type: "function"
+  }
+]);
+
+export function encodeIsTrustedForwarder(forwarder: string) {
+  return eRC2771ContextIface.encodeFunctionData("isTrustedForwarder", [
+    forwarder
+  ]);
+}
+
+export function decodeIsTrustedForwarder(result: string): boolean {
+  const [isTrustedForwarder] = eRC2771ContextIface.decodeFunctionResult(
+    "isTrustedForwarder",
+    result
+  );
+  return isTrustedForwarder;
+}