@bosonprotocol/core-sdk 1.22.0 → 1.23.0-alpha.0

package/src/core-sdk.ts

@@ -1636,6 +1636,25 @@ export class CoreSDK {
     });
   }
 
+  /**
+   * Encodes and signs a meta transaction for `completeExchangeBatch` that can be relayed.
+   * @param args - Meta transaction args.
+   * @returns Signature.
+   */
+  public async signMetaTxCompleteExchange(
+    args: Omit<
+      Parameters<typeof metaTx.handler.signMetaTxCompleteExchange>[0],
+      "web3Lib" | "metaTxHandlerAddress" | "chainId"
+    >
+  ) {
+    return metaTx.handler.signMetaTxCompleteExchange({
+      web3Lib: this._web3Lib,
+      metaTxHandlerAddress: this._protocolDiamond,
+      chainId: this._chainId,
+      ...args
+    });
+  }
+
   /**
    * Encodes and signs a meta transaction for `completeExchangeBatch` that can be relayed.
    * @param args - Meta transaction args.
@@ -1731,6 +1750,25 @@ export class CoreSDK {
     });
   }
 
+  /**
+   * Encodes and signs a meta transaction for `revokeVoucher` that can be relayed.
+   * @param args - Meta transaction args.
+   * @returns Signature.
+   */
+  public async signMetaTxRevokeVoucher(
+    args: Omit<
+      Parameters<typeof metaTx.handler.signMetaTxRevokeVoucher>[0],
+      "web3Lib" | "metaTxHandlerAddress" | "chainId"
+    >
+  ) {
+    return metaTx.handler.signMetaTxRevokeVoucher({
+      web3Lib: this._web3Lib,
+      metaTxHandlerAddress: this._protocolDiamond,
+      chainId: this._chainId,
+      ...args
+    });
+  }
+
   /**
    * Encodes and signs a meta transaction for `retractDispute` that can be relayed.
    * @param args - Meta transaction args.
@@ -1807,6 +1845,25 @@ export class CoreSDK {
     });
   }
 
+  /**
+   * Encodes and signs a meta transaction for `extendDisputeTimeout` that can be relayed.
+   * @param args - Meta transaction args.
+   * @returns Signature.
+   */
+  public async signMetaTxExtendDisputeTimeout(
+    args: Omit<
+      Parameters<typeof metaTx.handler.signMetaTxExtendDisputeTimeout>[0],
+      "web3Lib" | "metaTxHandlerAddress" | "chainId"
+    >
+  ) {
+    return metaTx.handler.signMetaTxExtendDisputeTimeout({
+      web3Lib: this._web3Lib,
+      metaTxHandlerAddress: this._protocolDiamond,
+      chainId: this._chainId,
+      ...args
+    });
+  }
+
   /**
    * Encodes and signs a meta transaction for `withdrawFunds` that can be relayed.
    * @param args - Meta transaction args.

package/src/meta-tx/handler.ts

@@ -215,6 +215,21 @@ export async function signMetaTxExpireVoucher(
   });
 }
 
+export async function signMetaTxRevokeVoucher(
+  args: BaseMetaTxArgs & {
+    exchangeId: BigNumberish;
+  }
+) {
+  return signMetaTx({
+    ...args,
+    functionName: "revokeVoucher(uint256)",
+    functionSignature: bosonExchangeHandlerIface.encodeFunctionData(
+      "revokeVoucher",
+      [args.exchangeId]
+    )
+  });
+}
+
 export async function signMetaTxCreateGroup(
   args: BaseMetaTxArgs & {
     createGroupArgs: CreateGroupArgs;
@@ -431,6 +446,22 @@ export async function signMetaTxResolveDispute(
   };
 }
 
+export async function signMetaTxExtendDisputeTimeout(
+  args: BaseMetaTxArgs & {
+    exchangeId: BigNumberish;
+    newTimeout: BigNumberish;
+  }
+) {
+  return signMetaTx({
+    ...args,
+    functionName: "extendDisputeTimeout(uint256,uint256)",
+    functionSignature: bosonDisputeHandlerIface.encodeFunctionData(
+      "extendDisputeTimeout",
+      [args.exchangeId, args.newTimeout]
+    )
+  });
+}
+
 export async function signMetaTxWithdrawFunds(
   args: BaseMetaTxArgs & {
     entityId: BigNumberish;

package/src/native-meta-tx/handler.ts

@@ -1,3 +1,4 @@
+import { tokenSpecifics } from "./tokenSpecifics";
 import {
   MetaTxConfig,
   Web3LibAdapter,
@@ -8,7 +9,10 @@ import { BytesLike } from "@ethersproject/bytes";
 import { Biconomy } from "../meta-tx/biconomy";
 import { BaseMetaTxArgs, SignedMetaTx } from "../meta-tx/handler";
 import { prepareDataSignatureParameters } from "../utils/signature";
-import { nativeMetaTransactionsIface } from "./interface";
+import {
+  nativeMetaTransactionsIface,
+  alternativeNonceIface
+} from "./interface";
 import { getName as getERC20Name } from "../erc20/handler";
 import { erc20Iface } from "../erc20/interface";
 
@@ -19,18 +23,38 @@ export async function getNonce(args: {
   user: string;
   web3Lib: Web3LibAdapter;
 }): Promise<string> {
-  const result = await args.web3Lib.call({
-    to: args.contractAddress,
-    data: nativeMetaTransactionsIface.encodeFunctionData("getNonce", [
-      args.user
-    ])
-  });
-
-  const [nonce] = nativeMetaTransactionsIface.decodeFunctionResult(
-    "getNonce",
-    result
-  );
-  return String(nonce);
+  try {
+    const result = await args.web3Lib.call({
+      to: args.contractAddress,
+      data: nativeMetaTransactionsIface.encodeFunctionData("getNonce", [
+        args.user
+      ])
+    });
+    const [nonce] = nativeMetaTransactionsIface.decodeFunctionResult(
+      "getNonce",
+      result
+    );
+    return String(nonce);
+  } catch (e) {
+    // Check if the error means the 'getNonce()' function does not exists in the contract
+    if (
+      (e.message as string)?.match(
+        /Transaction reverted without a reason string/
+      )
+    ) {
+      // If so, call 'nonces()' instead (USDC case, for instance)
+      const result = await args.web3Lib.call({
+        to: args.contractAddress,
+        data: alternativeNonceIface.encodeFunctionData("nonces", [args.user])
+      });
+      const [nonce] = alternativeNonceIface.decodeFunctionResult(
+        "nonces",
+        result
+      );
+      return String(nonce);
+    }
+    throw e;
+  }
 }
 
 export async function signNativeMetaTx(
@@ -90,7 +114,9 @@ export async function signNativeMetaTxApproveExchangeToken(args: {
       contractAddress: args.exchangeToken,
       web3Lib: args.web3Lib
     }),
-    version: ERC712_VERSION
+    version:
+      tokenSpecifics[args.chainId]?.[args.exchangeToken]?.ERC712_VERSION ||
+      ERC712_VERSION
   };
   const nonce = await getNonce({
     contractAddress: args.exchangeToken,

package/src/native-meta-tx/interface.ts

@@ -4,3 +4,28 @@ import { Interface } from "@ethersproject/abi";
 export const nativeMetaTransactionsIface = new Interface(
   abis.NativeMetaTransactionABI
 );
+
+const noncesAbi = [
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "owner",
+        type: "address"
+      }
+    ],
+    name: "nonces",
+    outputs: [
+      {
+        internalType: "uint256",
+        name: "",
+        type: "uint256"
+      }
+    ],
+    stateMutability: "view",
+    type: "function"
+  }
+];
+
+// Some tokens (USDC) does not implement getNonces(), but nonces() instead
+export const alternativeNonceIface = new Interface(noncesAbi);

package/src/native-meta-tx/tokenSpecifics.ts

@@ -0,0 +1,14 @@
+type TokenSpecifics = {
+  ERC712_VERSION?: string;
+};
+
+/** Configuration items that are specific to some tokens on some chain */
+export const tokenSpecifics: Record<number, Record<string, TokenSpecifics>> = {
+  80001: {
+    // MUMBAI
+    "0xe6b8a5CF854791412c1f6EFC7CAf629f5Df1c747": {
+      // USDC Token
+      ERC712_VERSION: "2" // On MUMBAI, ERC712_VERSION is different than on Polygon
+    }
+  }
+};