chore: update event handling for deployment

Author: aimensahnoun

packages/payment-processor/src/payment/single-request-proxy.ts

@@ -91,13 +91,17 @@ export async function deploySingleRequestProxy(
 
   const receipt = await tx.wait();
 
-  const event = receipt.events?.[0];
+  const event = receipt.events?.find(
+    (e) =>
+      e.event ===
+      (isERC20 ? 'ERC20SingleRequestProxyCreated' : 'EthereumSingleRequestProxyCreated'),
+  );
 
   if (!event) {
     throw new Error('Single request proxy creation event not found');
   }
 
-  const proxyAddress = ethers.utils.defaultAbiCoder.decode(['address', 'address'], event.data)[0];
+  const proxyAddress = event.args?.proxyAddress || event.args?.[0];
 
   if (!proxyAddress) {
     throw new Error('Proxy address not found in event data');

packages/payment-processor/test/payment/single-request-proxy.test.ts

@@ -187,23 +187,19 @@ describe('deploySingleRequestProxy', () => {
 
     expect(events.length).toBeGreaterThan(0);
 
-    const eventData = utils.defaultAbiCoder.decode(
-      ['address', 'address', 'address', 'uint256', 'address'],
-      events[0].data,
-    );
-
-    expect(eventData[0]).toBe(proxyAddress);
-    expect(eventData[1]).toBe(ethRequest.payee?.value);
-    expect(eventData[2]).toBe(
+    const event = events[0];
+    expect(event.args?.proxyAddress).toBe(proxyAddress);
+    expect(event.args?.payee).toBe(ethRequest.payee?.value);
+    expect(event.args?.feeAddress).toBe(
       ethRequest.extensions[ExtensionTypes.PAYMENT_NETWORK_ID.ETH_FEE_PROXY_CONTRACT].values
         .feeAddress,
     );
-    expect(eventData[3]).toBe(
+    expect(event.args?.feeAmount.toString()).toBe(
       ethRequest.extensions[ExtensionTypes.PAYMENT_NETWORK_ID.ETH_FEE_PROXY_CONTRACT].values
         .feeAmount,
     );
     const feeProxyUsed = await singleRequestProxyFactory.ethereumFeeProxy();
-    expect(eventData[4]).toBe(feeProxyUsed);
+    expect(event.args?.feeProxyUsed).toBe(feeProxyUsed);
   });
 
   it('should deploy ERC20SingleRequestProxy and emit event', async () => {
@@ -226,24 +222,20 @@ describe('deploySingleRequestProxy', () => {
 
     expect(events.length).toBeGreaterThan(0);
 
-    const eventData = utils.defaultAbiCoder.decode(
-      ['address', 'address', 'address', 'address', 'uint256', 'address'],
-      events[0].data,
-    );
-
-    expect(eventData[0]).toBe(proxyAddress);
-    expect(eventData[1]).toBe(erc20Request.payee?.value);
-    expect(eventData[2]).toBe(erc20Request.currencyInfo.value);
-    expect(eventData[3]).toBe(
+    const event = events[0];
+    expect(event.args?.proxyAddress).toBe(proxyAddress);
+    expect(event.args?.payee).toBe(erc20Request.payee?.value);
+    expect(event.args?.tokenAddress).toBe(erc20Request.currencyInfo.value);
+    expect(event.args?.feeAddress).toBe(
       erc20Request.extensions[ExtensionTypes.PAYMENT_NETWORK_ID.ERC20_FEE_PROXY_CONTRACT].values
         .feeAddress,
     );
-    expect(eventData[4]).toBe(
+    expect(event.args?.feeAmount.toString()).toBe(
       erc20Request.extensions[ExtensionTypes.PAYMENT_NETWORK_ID.ERC20_FEE_PROXY_CONTRACT].values
         .feeAmount,
     );
     const feeProxyUsed = await singleRequestProxyFactory.erc20FeeProxy();
-    expect(eventData[5]).toBe(feeProxyUsed);
+    expect(event.args?.feeProxyUsed).toBe(feeProxyUsed);
   });
 
   it('should throw error when trying to pay with invalid single request proxy', async () => {

packages/smart-contracts/src/lib/artifacts/SingleRequestProxyFactory/0.1.0.json

@@ -60,6 +60,24 @@
           "internalType": "bytes",
           "name": "paymentReference",
           "type": "bytes"
+        },
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "feeAddress",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "feeAmount",
+          "type": "uint256"
+        },
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "feeProxyUsed",
+          "type": "address"
         }
       ],
       "name": "ERC20SingleRequestProxyCreated",
@@ -98,6 +116,24 @@
           "internalType": "bytes",
           "name": "paymentReference",
           "type": "bytes"
+        },
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "feeAddress",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "feeAmount",
+          "type": "uint256"
+        },
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "feeProxyUsed",
+          "type": "address"
         }
       ],
       "name": "EthereumSingleRequestProxyCreated",

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

@@ -13,6 +13,10 @@ export const singleRequestProxyFactoryArtifact = new ContractArtifact<SingleRequ
           address: '0x9d075ae44D859191C121d7522da0Cc3B104b8837',
           creationBlockNumber: 0,
         },
+        sepolia: {
+          address: '0xf8cACE7EE4c03Eb4f225434B0709527938D365b4',
+          creationBlockNumber: 7038199,
+        },
       },
     },
   },