[SDK] Support ERC-2612 permit for x402 payments

Author: joaquim-verges

.changeset/giant-suns-drive.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Support ERC-2612 permit for x402 payments

packages/thirdweb/scripts/generate/abis/erc20/USDC.json

@@ -0,0 +1,3 @@
+[
+  "function transferWithAuthorization(address from, address to, uint256 value, uint256 validAfter, uint256 validBefore, bytes32 nonce, bytes signature)"
+]

packages/thirdweb/scripts/generate/abis/erc7702/MinimalAccount.json

@@ -24,9 +24,4 @@
   "function getSessionStateForSigner(address signer) view returns (((uint256 remaining, address target, bytes4 selector, uint256 index)[] transferValue, (uint256 remaining, address target, bytes4 selector, uint256 index)[] callValue, (uint256 remaining, address target, bytes4 selector, uint256 index)[] callParams))",
   "function getTransferPoliciesForSigner(address signer) view returns ((address target, uint256 maxValuePerUse, (uint8 limitType, uint256 limit, uint256 period) valueLimit)[])",
   "function isWildcardSigner(address signer) view returns (bool)",
-  "function onERC1155BatchReceived(address, address, uint256[], uint256[], bytes) returns (bytes4)",
-  "function onERC1155Received(address, address, uint256, uint256, bytes) returns (bytes4)",
-  "function onERC721Received(address, address, uint256, bytes) returns (bytes4)",
-  "function supportsInterface(bytes4 interfaceId) view returns (bool)",
-  "receive() external payable"
 ]

packages/thirdweb/src/extensions/erc20/__generated__/USDC/write/transferWithAuthorization.ts

@@ -12,6 +12,14 @@ import {
   type PaymentRequiredResult,
   x402Version,
 } from "./types.js";
+import { isTransferWithAuthorizationSupported } from "../extensions/erc20/__generated__/USDC/write/transferWithAuthorization.js";
+import { getContract } from "../contract/contract.js";
+import { resolveContractAbi } from "../contract/actions/resolve-abi.js";
+import type { Abi } from "abitype";
+import { getCachedChain } from "../chains/utils.js";
+import type { ThirdwebClient } from "../client/client.js";
+import { toFunctionSelector } from "viem/utils";
+import { isPermitSupported } from "../extensions/erc20/__generated__/IERC20Permit/write/permit.js";
 
 type GetPaymentRequirementsResult = {
   status: 200;
@@ -106,7 +114,10 @@ export async function decodePaymentRequest(
       },
       output: outputSchema,
     },
-    extra: (asset as ERC20TokenAmount["asset"]).eip712,
+    extra: {
+      facilitatorAddress: facilitator.address,
+      ...(asset as ERC20TokenAmount["asset"]).eip712,
+    },
   });
 
   // Check for payment header
@@ -234,3 +245,36 @@ async function getDefaultAsset(
     ?.defaultAsset as ERC20TokenAmount["asset"];
   return assetConfig;
 }
+
+export type SupportedAuthorizationMethods = {
+    hasPermit: boolean,
+    hasTransferWithAuthorization: boolean,
+}
+
+export async function detectSupportedAuthorizationMethods(args: {
+    client: ThirdwebClient,
+    asset: string,
+    chainId: number,
+}): Promise<SupportedAuthorizationMethods>   {
+    const abi = await resolveContractAbi<Abi>(
+        getContract({
+          client: args.client,
+          address: args.asset,
+          chain: getCachedChain(args.chainId),
+        }),
+      ).catch((error) => {
+        console.error("Error resolving contract ABI", error);
+        return [] as Abi;
+      });
+      const selectors = abi
+        .filter((f) => f.type === "function")
+        .map((f) => toFunctionSelector(f));
+      const hasPermit = isPermitSupported(selectors);
+      const hasTransferWithAuthorization =
+        isTransferWithAuthorizationSupported(selectors);
+
+      return {
+        hasPermit,
+        hasTransferWithAuthorization,
+      };
+}

packages/thirdweb/src/x402/common.ts

@@ -69,6 +69,7 @@ export function facilitator(config: ThirdwebX402FacilitatorConfig) {
   }
   const facilitator = {
     url: (config.baseUrl ?? DEFAULT_BASE_URL) as `${string}://${string}`,
+    address: serverWalletAddress,
     createAuthHeaders: async () => {
       return {
         verify: {

packages/thirdweb/src/x402/facilitator.ts

@@ -50,7 +50,7 @@ import { createPaymentHeader } from "./sign.js";
  */
 export function wrapFetchWithPayment(
   fetch: typeof globalThis.fetch,
-  _client: ThirdwebClient,
+  client: ThirdwebClient,
   wallet: Wallet,
   maxValue: bigint = BigInt(1 * 10 ** 6), // Default to 1 USDC
 ) {
@@ -103,8 +103,8 @@ export function wrapFetchWithPayment(
     }
 
     const paymentHeader = await createPaymentHeader(
+      client,
       account,
-      x402Version,
       selectedPaymentRequirements,
     );