refactor: update ERC20CommerceEscrowWrapper deployment script to support network-specific contract addresses

packages/payment-detection/codegen.yml

@@ -1,5 +1,5 @@
 overwrite: true
-schema: 'https://subgraph.satsuma-prod.com/e2e4905ab7c8/request-network--434873/request-payments-sepolia/api'
+schema: 'https://api.studio.thegraph.com/query/67444/request-payments-sepolia/version/latest'
 documents: src/thegraph/queries/*.graphql
 generates:
   src/thegraph/generated/graphql.ts:

packages/payment-detection/src/thegraph/client.ts

@@ -11,9 +11,6 @@ const THE_GRAPH_STUDIO_URL =
 const THE_GRAPH_EXPLORER_URL =
   'https://gateway.thegraph.com/api/$API_KEY/subgraphs/id/$SUBGRAPH_ID';
 
-const THE_GRAPH_ALCHEMY_URL =
-  'https://subgraph.satsuma-prod.com/e2e4905ab7c8/request-network--434873/request-payments-$NETWORK/api';
-
 const THE_GRAPH_URL_MANTLE_TESTNET =
   'https://graph.testnet.mantle.xyz/subgraphs/name/requestnetwork/request-payments-mantle-testnet';
 
@@ -23,19 +20,6 @@ const THE_GRAPH_URL_MANTLE =
 const THE_GRAPH_URL_CORE =
   'https://thegraph.coredao.org/subgraphs/name/requestnetwork/request-payments-core';
 
-const THE_GRAPH_ALCHEMY_CHAINS: CurrencyTypes.ChainName[] = [
-  'arbitrum-one',
-  'avalanche',
-  'base',
-  'bsc',
-  'fantom',
-  'mainnet',
-  'matic',
-  'sepolia',
-  'optimism',
-  'zksyncera',
-];
-
 const THE_GRAPH_EXPLORER_SUBGRAPH_ID: Partial<Record<CurrencyTypes.ChainName, string>> = {
   ['arbitrum-one']: '3MtDdHbzvBVNBpzUTYXGuDDLgTd1b8bPYwoH1Hdssgp9',
   avalanche: 'A27V4PeZdKHeyuBkehdBJN8cxNtzVpXvYoqkjHUHRCFp',
@@ -159,10 +143,8 @@ export const getTheGraphClientUrl = (
     '$API_KEY',
     theGraphExplorerApiKey || '',
   ).replace('$SUBGRAPH_ID', theGraphExplorerSubgraphId || '');
-  const theGraphAlchemyUrl = THE_GRAPH_ALCHEMY_URL.replace('$NETWORK', chain);
 
   const shouldUseTheGraphExplorer = !!theGraphExplorerApiKey && !!theGraphExplorerSubgraphId;
-  const shouldUseAlchemy = THE_GRAPH_ALCHEMY_CHAINS.includes(chain);
 
   switch (true) {
     case chain === 'private':
@@ -174,10 +156,6 @@ export const getTheGraphClientUrl = (
     case chain === 'core':
       return THE_GRAPH_URL_CORE;
     default:
-      return shouldUseTheGraphExplorer
-        ? theGraphExplorerUrl
-        : shouldUseAlchemy
-        ? theGraphAlchemyUrl
-        : theGraphStudioUrl;
+      return shouldUseTheGraphExplorer ? theGraphExplorerUrl : theGraphStudioUrl;
   }
 };

packages/payment-detection/test/thegraph/client.test.ts

@@ -5,10 +5,10 @@ describe('getTheGraphClientUrl', () => {
     const url = getTheGraphClientUrl('base', { url: 'test' });
     expect(url).toBe('test');
   });
-  it('should build the correct URL for network supported by Alchemy', () => {
+  it('should build the correct URL for network using TheGraph Studio', () => {
     const url = getTheGraphClientUrl('base');
     expect(url).toBe(
-      'https://subgraph.satsuma-prod.com/e2e4905ab7c8/request-network--434873/request-payments-base/api',
+      'https://api.studio.thegraph.com/query/67444/request-payments-base/version/latest',
     );
   });
   it('should build the correct URL when using TheGraph Explorer API key', () => {

packages/request-client.js/test/index.test.ts

@@ -168,6 +168,7 @@ const waitForConfirmation = async (
 /* eslint-disable @typescript-eslint/no-unused-expressions */
 describe('request-client.js', () => {
   afterEach(() => {
+    jest.useRealTimers();
     jest.resetAllMocks();
   });
 
@@ -204,10 +205,12 @@ describe('request-client.js', () => {
       mockServer.listen({ onUnhandledRequest: 'bypass' });
     });
     beforeEach(() => {
+      mockServer.resetHandlers();
       spyPersistTransaction.mockReturnValue({});
       spyGetTransactionsByChannelId.mockReturnValue({ result: mockedTransactions });
     });
     afterAll(() => {
+      mockServer.resetHandlers();
       mockServer.close();
     });
 
@@ -354,6 +357,7 @@ describe('request-client.js', () => {
       mockServer.close();
     });
     beforeEach(() => {
+      mockServer.resetHandlers();
       hits = { get: 0, post: 0 };
     });
     it('allows to create a request', async () => {
@@ -1156,6 +1160,7 @@ describe('request-client.js', () => {
 
   describe('ETH requests', () => {
     beforeEach(() => {
+      jest.useRealTimers();
       jest.clearAllMocks();
       jest.restoreAllMocks();
     });
@@ -1280,17 +1285,19 @@ describe('request-client.js', () => {
 
     // This test checks that 2 payments with reference `c19da4923539c37f` have reached 0xc12F17Da12cd01a9CDBB216949BA0b41A6Ffc4EB
     it('can get the balance of an ETH request', async () => {
+      jest.useFakeTimers({ advanceTimers: true });
       const etherscanMock = new EtherscanProviderMock();
-      ethers.providers.EtherscanProvider.prototype.getHistory = jest
-        .fn()
-        .mockImplementation(etherscanMock.getHistory);
-      ethers.providers.EtherscanProvider.prototype.getNetwork = jest
-        .fn()
-        .mockImplementation(etherscanMock.getNetwork);
+      jest
+        .spyOn(ethers.providers.EtherscanProvider.prototype, 'getHistory')
+        .mockImplementation(etherscanMock.getHistory.bind(etherscanMock));
+      jest
+        .spyOn(ethers.providers.EtherscanProvider.prototype, 'getNetwork')
+        .mockImplementation(etherscanMock.getNetwork.bind(etherscanMock));
 
       const requestNetwork = new RequestNetwork({
         signatureProvider: TestData.fakeSignatureProvider,
         useMockStorage: true,
+        paymentOptions: { getSubgraphClient: () => undefined },
       });
 
       const paymentNetwork: PaymentTypes.PaymentNetworkCreateParameters = {
@@ -1311,12 +1318,13 @@ describe('request-client.js', () => {
       });
 
       const request = await requestNetwork.createRequest({
+        disablePaymentDetection: true,
         paymentNetwork,
         requestInfo,
         signer: TestData.payee.identity,
       });
-      await request.waitForConfirmation();
 
+      jest.advanceTimersByTime(150);
       const data = await request.refresh();
 
       // Payment reference should be fixed
@@ -1328,6 +1336,8 @@ describe('request-client.js', () => {
         ),
       ).toBe('efce79375b2db9f7');
 
+      request.enablePaymentDetection();
+      jest.advanceTimersByTime(150);
       const dataAfterRefresh = await request.refresh();
 
       expect(dataAfterRefresh.balance?.balance).toBe('12300000000');
@@ -1338,22 +1348,24 @@ describe('request-client.js', () => {
       expect(dataAfterRefresh.balance?.events[0].parameters!.txHash).toBe(
         '0x06d95c3889dcd974106e82fa27358549d9392d6fee6ea14fe1acedadc1013114',
       );
+      jest.useRealTimers();
     });
 
     it('can disable and enable the get the balance of a request', async () => {
-      jest.useFakeTimers();
+      jest.useFakeTimers({ advanceTimers: true });
 
       const etherscanMock = new EtherscanProviderMock();
-      ethers.providers.EtherscanProvider.prototype.getHistory = jest
-        .fn()
-        .mockImplementation(etherscanMock.getHistory);
-      ethers.providers.EtherscanProvider.prototype.getNetwork = jest
-        .fn()
-        .mockImplementation(etherscanMock.getNetwork);
+      jest
+        .spyOn(ethers.providers.EtherscanProvider.prototype, 'getHistory')
+        .mockImplementation(etherscanMock.getHistory.bind(etherscanMock));
+      jest
+        .spyOn(ethers.providers.EtherscanProvider.prototype, 'getNetwork')
+        .mockImplementation(etherscanMock.getNetwork.bind(etherscanMock));
 
       const requestNetwork = new RequestNetwork({
         signatureProvider: TestData.fakeSignatureProvider,
         useMockStorage: true,
+        paymentOptions: { getSubgraphClient: () => undefined },
       });
 
       const paymentNetwork: PaymentTypes.PaymentNetworkCreateParameters = {
@@ -1425,19 +1437,20 @@ describe('request-client.js', () => {
     });
 
     it('can get the balance on a skipped payment detection request', async () => {
-      jest.useFakeTimers();
+      jest.useFakeTimers({ advanceTimers: true });
 
       const etherscanMock = new EtherscanProviderMock();
-      ethers.providers.EtherscanProvider.prototype.getHistory = jest
-        .fn()
-        .mockImplementation(etherscanMock.getHistory);
-      ethers.providers.EtherscanProvider.prototype.getNetwork = jest
-        .fn()
-        .mockImplementation(etherscanMock.getNetwork);
+      jest
+        .spyOn(ethers.providers.EtherscanProvider.prototype, 'getHistory')
+        .mockImplementation(etherscanMock.getHistory.bind(etherscanMock));
+      jest
+        .spyOn(ethers.providers.EtherscanProvider.prototype, 'getNetwork')
+        .mockImplementation(etherscanMock.getNetwork.bind(etherscanMock));
 
       const requestNetwork = new RequestNetwork({
         signatureProvider: TestData.fakeSignatureProvider,
         useMockStorage: true,
+        paymentOptions: { getSubgraphClient: () => undefined },
       });
 
       const paymentNetwork: PaymentTypes.PaymentNetworkCreateParameters = {

packages/smart-contracts/scripts/deploy-erc20-commerce-escrow-wrapper.ts

@@ -1,22 +1,29 @@
 import { HardhatRuntimeEnvironment } from 'hardhat/types';
 import { deployOne } from './deploy-one';
 
-// Base Mainnet & Base Sepolia Contract Addresses
-const BASE_SEPOLIA_CONTRACTS = {
-  AuthCaptureEscrow: '0xBdEA0D1bcC5966192B070Fdf62aB4EF5b4420cff',
-  ERC3009PaymentCollector: '0x0E3dF9510de65469C4518D7843919c0b8C7A7757',
-  Permit2PaymentCollector: '0x992476B9Ee81d52a5BdA0622C333938D0Af0aB26',
-  PreApprovalPaymentCollector: '0x1b77ABd71FCD21fbe2398AE821Aa27D1E6B94bC6',
-  SpendPermissionPaymentCollector: '0x8d9F34934dc9619e5DC3Df27D0A40b4A744E7eAa',
-  OperatorRefundCollector: '0x934907bffd0901b6A21e398B9C53A4A38F02fa5d',
+// Contract Addresses by Network
+const NETWORK_CONTRACTS: Record<
+  string,
+  {
+    AuthCaptureEscrow: string;
+    ERC20FeeProxy?: string;
+  }
+> = {
+  'base-sepolia': {
+    AuthCaptureEscrow: '0xBdEA0D1bcC5966192B070Fdf62aB4EF5b4420cff',
+  },
+  sepolia: {
+    AuthCaptureEscrow: '0xF81E3F293c92CaCfc0d723d2D8183e39Cc3AEdC7',
+    ERC20FeeProxy: '0x399F5EE127ce7432E4921a61b8CF52b0af52cbfE',
+  },
 };
 
 /**
- * Deploy ERC20CommerceEscrowWrapper using official Base contracts
+ * Deploy ERC20CommerceEscrowWrapper using network-specific contracts
  *
  * This script will:
- * 1. Deploy ERC20FeeProxy if not already deployed
- * 2. Use the official AuthCaptureEscrow contract deployed on Base Sepolia
+ * 1. Use existing ERC20FeeProxy if available, or deploy a new one
+ * 2. Use the official AuthCaptureEscrow contract deployed on the target network
  * 3. Deploy ERC20CommerceEscrowWrapper with the above dependencies
  */
 export default async function deployERC20CommerceEscrowWrapper(
@@ -42,16 +49,34 @@ export default async function deployERC20CommerceEscrowWrapper(
   console.log(`Deployer: ${deployer.address}`);
   console.log(`Deployer balance: ${hre.ethers.utils.formatEther(await deployer.getBalance())} ETH`);
 
-  // Step 1: Deploy ERC20FeeProxy
-  console.log('\n--- Step 1: Deploying ERC20FeeProxy ---');
-  const { address: erc20FeeProxyAddress } = await deployOne(args, hre, 'ERC20FeeProxy', {
-    verify: true,
-  });
-  console.log(`✅ ERC20FeeProxy deployed at: ${erc20FeeProxyAddress}`);
+  // Get network-specific contract addresses
+  const networkContracts = NETWORK_CONTRACTS[hre.network.name];
+  if (!networkContracts) {
+    throw new Error(
+      `Network ${hre.network.name} is not configured. Please add contract addresses to NETWORK_CONTRACTS.`,
+    );
+  }
+
+  let erc20FeeProxyAddress: string;
+
+  // Step 1: Get or Deploy ERC20FeeProxy
+  console.log('\n--- Step 1: ERC20FeeProxy ---');
+  if (networkContracts.ERC20FeeProxy) {
+    // Use existing ERC20FeeProxy
+    erc20FeeProxyAddress = networkContracts.ERC20FeeProxy;
+    console.log(`✅ Using existing ERC20FeeProxy at: ${erc20FeeProxyAddress}`);
+  } else {
+    // Deploy ERC20FeeProxy
+    const result = await deployOne(args, hre, 'ERC20FeeProxy', {
+      verify: true,
+    });
+    erc20FeeProxyAddress = result.address;
+    console.log(`✅ ERC20FeeProxy deployed at: ${erc20FeeProxyAddress}`);
+  }
 
   // Step 2: Use official AuthCaptureEscrow contract
   console.log('\n--- Step 2: Using official AuthCaptureEscrow ---');
-  const authCaptureEscrowAddress = BASE_SEPOLIA_CONTRACTS.AuthCaptureEscrow;
+  const authCaptureEscrowAddress = networkContracts.AuthCaptureEscrow;
   console.log(`✅ Using official AuthCaptureEscrow at: ${authCaptureEscrowAddress}`);
 
   // Step 3: Deploy ERC20CommerceEscrowWrapper

packages/smart-contracts/src/lib/artifacts/AuthCaptureEscrow/index.ts

@@ -13,12 +13,12 @@ export const authCaptureEscrowArtifact = new ContractArtifact<AuthCaptureEscrow>
           address: '0x0000000000000000000000000000000000000000',
           creationBlockNumber: 0,
         },
-        // Base Sepolia deployment (same address as mainnet via CREATE2)
+        // Sepolia deployment
         sepolia: {
-          address: '0x1234567890123456789012345678901234567890', // Placeholder - to be updated with actual deployment
-          creationBlockNumber: 0,
+          address: '0xF81E3F293c92CaCfc0d723d2D8183e39Cc3AEdC7',
+          creationBlockNumber: 9795220,
         },
-        // Base Mainnet deployment (same address as sepolia via CREATE2)
+        // Base Mainnet deployment
         base: {
           address: '0xBdEA0D1bcC5966192B070Fdf62aB4EF5b4420cff',
           creationBlockNumber: 29931650,

packages/smart-contracts/src/lib/artifacts/ERC20CommerceEscrowWrapper/index.ts

@@ -15,30 +15,13 @@ export const erc20CommerceEscrowWrapperArtifact = new ContractArtifact<ERC20Comm
         },
         // Testnet deployments for testing
         sepolia: {
-          address: '0x1234567890123456789012345678901234567890', // Placeholder - to be updated with actual deployment
-          creationBlockNumber: 0,
-        },
-        goerli: {
-          address: '0x2345678901234567890123456789012345678901', // Placeholder - to be updated with actual deployment
-          creationBlockNumber: 0,
-        },
-        mumbai: {
-          address: '0x3456789012345678901234567890123456789012', // Placeholder - to be updated with actual deployment
+          address: '0x4062C5c38b14A90f9293010a72b53FA3b400bD46',
           creationBlockNumber: 0,
         },
         'base-sepolia': {
-          address: '0xDF4945F8AB31C666714f34DDF8Ac9445379fD3f5', // To be updated after deployment
+          address: '0xDF4945F8AB31C666714f34DDF8Ac9445379fD3f5',
           creationBlockNumber: 0,
         },
-        // TODO: Add deployment addresses for mainnet networks once deployed
-        // mainnet: {
-        //   address: '0x0000000000000000000000000000000000000000',
-        //   creationBlockNumber: 0,
-        // },
-        // matic: {
-        //   address: '0x0000000000000000000000000000000000000000',
-        //   creationBlockNumber: 0,
-        // },
       },
     },
   },