feat: goerli payments

packages/currency/src/aggregators/goerli.json

@@ -0,0 +1,8 @@
+{
+  "0xba62bcfcaafc6622853cca2be6ac7d845bc0f2dc": {
+    "0x775eb53d00dd0acd3ec1696472105d579b9b386b": 1
+  },
+  "0x775eb53d00dd0acd3ec1696472105d579b9b386b": {
+    "0xba62bcfcaafc6622853cca2be6ac7d845bc0f2dc": 1
+  }
+}

packages/currency/src/erc20/networks/goerli.ts

@@ -0,0 +1,17 @@
+import { TokenMap } from './types';
+
+// List of the supported goerli ERC20 tokens
+export const supportedGoerliERC20: TokenMap = {
+  // Request Test token, used for testing on goerli.
+  '0x7af963cF6D228E564e2A0aA0DdBF06210B38615D': {
+    decimals: 18,
+    name: 'Goerli Test Token',
+    symbol: 'TST',
+  },
+  // Faucet Token on goerli network. Easy to use on tests.
+  '0xBA62BCfcAaFc6622853cca2BE6Ac7d845BC0f2Dc': {
+    decimals: 18,
+    name: 'Faucet Token',
+    symbol: 'FAU-goerli',
+  },
+};

packages/payment-detection/src/erc20/address-based.ts

@@ -8,7 +8,7 @@ import { BalanceError } from '../balance-error';
 import Erc20InfoRetriever from './address-based-info-retriever';
 
 import { PaymentDetectorBase } from '../payment-detector-base';
-const supportedNetworks = ['mainnet', 'rinkeby', 'private'];
+const supportedNetworks = ['mainnet', 'rinkeby', 'goerli', 'private'];
 
 /**
  * Handle payment networks with ERC20 based address extension

packages/payment-detection/test/any/any-to-erc20-proxy-contract.test.ts

@@ -31,7 +31,7 @@ const mockAdvancedLogic: AdvancedLogicTypes.IAdvancedLogic = {
   },
   extensions: {
     anyToErc20Proxy: {
-      supportedNetworks: ['mainnet', 'rinkeby', 'private'],
+      supportedNetworks: ['mainnet', 'rinkeby', 'goerli', 'private'],
       createAddPaymentAddressAction,
       createAddRefundAddressAction,
       createCreationAction,
@@ -56,7 +56,7 @@ describe('api/any/conversion-fee-proxy-contract', () => {
     jest.clearAllMocks();
   });
 
-  it('can createExtensionsDataForCreation', async () => {
+  it('can createExtensionsDataForCreation (Rinkeby)', async () => {
     await anyToErc20Proxy.createExtensionsDataForCreation({
       paymentAddress: 'ethereum address',
       salt: 'ea3bc7caf64110ca',
@@ -77,7 +77,28 @@ describe('api/any/conversion-fee-proxy-contract', () => {
     });
   });
 
-  it('can createExtensionsDataForCreation with fee amount and address', async () => {
+  it('can createExtensionsDataForCreation (Goerli)', async () => {
+    await anyToErc20Proxy.createExtensionsDataForCreation({
+      paymentAddress: 'ethereum address',
+      salt: 'ea3bc7caf64110ca',
+      acceptedTokens: ['ethereum address2'],
+      network: 'goerli',
+      maxRateTimespan: 1000,
+    });
+
+    expect(createCreationAction).toHaveBeenCalledWith({
+      feeAddress: undefined,
+      feeAmount: undefined,
+      paymentAddress: 'ethereum address',
+      refundAddress: undefined,
+      salt: 'ea3bc7caf64110ca',
+      acceptedTokens: ['ethereum address2'],
+      network: 'goerli',
+      maxRateTimespan: 1000,
+    });
+  });
+
+  it('can createExtensionsDataForCreation with fee amount and address (Rinkeby)', async () => {
     await anyToErc20Proxy.createExtensionsDataForCreation({
       feeAddress: 'fee address',
       feeAmount: '2000',
@@ -98,6 +119,27 @@ describe('api/any/conversion-fee-proxy-contract', () => {
     });
   });
 
+  it('can createExtensionsDataForCreation with fee amount and address (Goerli)', async () => {
+    await anyToErc20Proxy.createExtensionsDataForCreation({
+      feeAddress: 'fee address',
+      feeAmount: '2000',
+      paymentAddress: 'ethereum address',
+      salt: 'ea3bc7caf64110ca',
+      acceptedTokens: ['ethereum address2'],
+      network: 'goerli',
+    });
+
+    expect(createCreationAction).toHaveBeenCalledWith({
+      feeAddress: 'fee address',
+      feeAmount: '2000',
+      paymentAddress: 'ethereum address',
+      refundAddress: undefined,
+      salt: 'ea3bc7caf64110ca',
+      acceptedTokens: ['ethereum address2'],
+      network: 'goerli',
+    });
+  });
+
   it('can createExtensionsDataForCreation without salt', async () => {
     await anyToErc20Proxy.createExtensionsDataForCreation({
       paymentAddress: 'ethereum address',

packages/payment-detection/test/erc20/address-based.test.ts

@@ -126,7 +126,7 @@ describe('api/erc20/address-based', () => {
       error: {
         code: PaymentTypes.BALANCE_ERROR_CODE.NETWORK_NOT_SUPPORTED,
         message:
-          'Payment network wrong not supported by ERC20 payment detection. Supported networks: mainnet, rinkeby, private',
+          'Payment network wrong not supported by ERC20 payment detection. Supported networks: mainnet, rinkeby, goerli, private',
       },
       events: [],
     });

packages/payment-detection/test/erc20/escrow-info-retriever.test.ts

@@ -161,4 +161,28 @@ describe('api/erc20/escrow-info-retriever', () => {
       expect(escrowChainData.isFrozen).toEqual(true);
     });
   });
+
+  describe('test on goerli', () => {
+    let infoRetriever: EscrowERC20InfoRetriever;
+    beforeAll(() => {
+      infoRetriever = new EscrowERC20InfoRetriever(
+        paymentReferenceMock,
+        '0xd2777001fD7D89331D8E87eC439f78079179322b',
+        0,
+        '',
+        '',
+        'goerli',
+      );
+    });
+    it('should get escrow chain data', async () => {
+      const escrowChainData = await infoRetriever.getEscrowRequestMapping();
+      // Not yet ERC777 token on goerli
+      expect(escrowChainData.payer).toEqual('0xffb1D8EfeCAA177DeEf1cD1AB202E5E9f6a84db4');
+      expect(escrowChainData.amount.toString()).toEqual('1');
+      expect(escrowChainData.unlockDate.toString()).toEqual('0');
+      expect(escrowChainData.emergencyClaimDate.toString()).toEqual('0');
+      expect(escrowChainData.emergencyState).toEqual(false);
+      expect(escrowChainData.isFrozen).toEqual(false);
+    });
+  });
 });

packages/payment-detection/test/erc20/fee-proxy-contract.test.ts

@@ -23,7 +23,7 @@ const mockAdvancedLogic: AdvancedLogicTypes.IAdvancedLogic = {
   },
   extensions: {
     feeProxyContractErc20: {
-      supportedNetworks: ['mainnet', 'private', 'rinkeby'],
+      supportedNetworks: ['mainnet', 'private', 'rinkeby', 'goerli'],
       createAddPaymentAddressAction,
       createAddRefundAddressAction,
       createCreationAction,
@@ -283,7 +283,7 @@ describe('api/erc20/fee-proxy-contract', () => {
     ).toBe('7');
   });
 
-  it('should have gasFee & gasUsed in the payment eventl', async () => {
+  it('should have gasFee & gasUsed in the payment event', async () => {
     const mockRequest: RequestLogicTypes.IRequest = {
       creator: { type: IdentityTypes.TYPE.ETHEREUM_ADDRESS, value: '0x2' },
       currency: {

packages/payment-detection/test/erc20/proxy-contract.test.ts

@@ -25,7 +25,7 @@ const mockAdvancedLogic: AdvancedLogicTypes.IAdvancedLogic = {
   },
   extensions: {
     proxyContractErc20: {
-      supportedNetworks: ['mainnet', 'rinkeby'],
+      supportedNetworks: ['mainnet', 'rinkeby', 'goerli'],
       createAddPaymentAddressAction,
       createAddRefundAddressAction,
       createCreationAction,
@@ -160,7 +160,7 @@ describe('api/erc20/proxy-contract', () => {
       error: {
         code: PaymentTypes.BALANCE_ERROR_CODE.NETWORK_NOT_SUPPORTED,
         message:
-          'Payment network WRONG not supported by pn-erc20-proxy-contract payment detection. Supported networks: mainnet, rinkeby',
+          'Payment network WRONG not supported by pn-erc20-proxy-contract payment detection. Supported networks: mainnet, rinkeby, goerli',
       },
       events: [],
     });

packages/payment-detection/test/erc20/thegraph-info-retriever.test.ts

@@ -51,7 +51,7 @@ describe('api/erc20/thegraph-info-retriever', () => {
       expect(transferEvents[0].parameters?.feeAmount).toEqual(paymentData.feeAmount);
     });
 
-    it('should get payment event from ethFeeConversionProxy via subgraph', async () => {
+    it('should get payment event from ethFeeConversionProxy via subgraph (Rinkeby)', async () => {
       const paymentData = {
         reference: '0x6c93723bc5f82e6fbb2ea994bf0fb572fa19f7a2a3146065e21752b95668efe5',
         txHash: '0x2f7b4752aa259166c038cd9073056c5979760cf0eea55d093fca2095c229313b',
@@ -89,4 +89,90 @@ describe('api/erc20/thegraph-info-retriever', () => {
       expect(transferEvents[0].parameters?.block).toEqual(paymentData.block);
     });
   });
+
+  describe('on goerli', () => {
+    const GOERLI_ETH_FEE_PROXY_CONTRACT = '0xe11BF2fDA23bF0A98365e1A4c04A87C9339e8687';
+    const GOERLI_ETH_CONVERSION_PROXY_CONTRACT = '0xED250D9219EB93098Bb67aEbc992963172B9c8DA';
+
+    it('should get payment event from ethFeeProxy via subgraph', async () => {
+      const paymentData = {
+        reference: '0x6c93723bc5f82e6fbb2ea994bf0fb572fa19f7a2a3146065e21752b95668efe5',
+        txHash: '0x29a55b7f978a902275746f6eb930abf608dc77c0592fce9cf6c326128fcf7493',
+        from: '0xBc9643B7Bd7c8621F4a68280433796484b9E525d',
+        to: '0x5000ee9fb9c96a2a09d8efb695ac21d6c429ff11',
+        network: 'goerli',
+        salt: '0ee84db293a752c6',
+        amount: '600000000000000',
+        requestId: '0188791633ff0ec72a7dbdefb886d2db6cccfa98287320839c2f173c7a4e3ce7e1',
+        block: 7230236,
+        feeAddress: '0x5000EE9FB9c96A2A09D8efB695aC21D6C429fF11',
+        feeAmount: '0',
+      };
+      const paymentReference = PaymentReferenceCalculator.calculate(
+        paymentData.requestId,
+        paymentData.salt,
+        paymentData.to,
+      );
+      const onChainReference = utils.keccak256(`0x${paymentReference}`);
+      expect(onChainReference).toEqual(paymentData.reference);
+
+      const graphRetriever = new TheGraphInfoRetriever(
+        paymentReference,
+        GOERLI_ETH_FEE_PROXY_CONTRACT,
+        null,
+        paymentData.to,
+        PaymentTypes.EVENTS_NAMES.PAYMENT,
+        paymentData.network,
+      );
+      const allNetworkEvents = await graphRetriever.getTransferEvents();
+      const transferEvents = allNetworkEvents.paymentEvents;
+      // expect(transferEvents).toHaveLength(1);
+      expect(transferEvents[0].amount).toEqual('600000000000000');
+      expect(transferEvents[0].name).toEqual('payment');
+      expect(transferEvents[0].parameters?.to).toEqual(paymentData.to);
+      expect(transferEvents[0].parameters?.txHash).toEqual(paymentData.txHash);
+      expect(transferEvents[0].parameters?.block).toEqual(paymentData.block);
+      expect(transferEvents[0].parameters?.feeAddress).toEqual(paymentData.feeAddress);
+      expect(transferEvents[0].parameters?.feeAmount).toEqual(paymentData.feeAmount);
+    });
+
+    // doesn't work because chainlink doesn't have oracles on goerli
+    it.skip('should get payment event from ethFeeConversionProxy via subgraph', async () => {
+      const paymentData = {
+        reference: '0x6c93723bc5f82e6fbb2ea994bf0fb572fa19f7a2a3146065e21752b95668efe5',
+        txHash: '0x2f7b4752aa259166c038cd9073056c5979760cf0eea55d093fca2095c229313b',
+        from: '0x186e7fe6c34ea0eca7f9c2fd29651fc0443e3f29',
+        to: '0x5000ee9fb9c96a2a09d8efb695ac21d6c429ff11',
+        network: 'goerli',
+        salt: '0ee84db293a752c6',
+        amount: '7000',
+        block: 9610470,
+        requestId: '0188791633ff0ec72a7dbdefb886d2db6cccfa98287320839c2f173c7a4e3ce7e1',
+      };
+
+      const shortReference = PaymentReferenceCalculator.calculate(
+        paymentData.requestId,
+        paymentData.salt,
+        paymentData.to,
+      );
+      const onChainReference = utils.keccak256(`0x${shortReference}`);
+      expect(onChainReference).toEqual(paymentData.reference);
+
+      const graphRetriever = new TheGraphInfoRetriever(
+        shortReference,
+        GOERLI_ETH_CONVERSION_PROXY_CONTRACT,
+        null,
+        paymentData.to,
+        PaymentTypes.EVENTS_NAMES.PAYMENT,
+        paymentData.network,
+      );
+      const allNetworkEvents = await graphRetriever.getTransferEvents();
+      const transferEvents = allNetworkEvents.paymentEvents;
+      // expect(transferEvents).toHaveLength(1);
+      expect(transferEvents[0].amount).toEqual(paymentData.amount);
+      expect(transferEvents[0].parameters?.to).toEqual(paymentData.to);
+      expect(transferEvents[0].parameters?.txHash).toEqual(paymentData.txHash);
+      expect(transferEvents[0].parameters?.block).toEqual(paymentData.block);
+    });
+  });
 });

packages/payment-detection/test/erc777/mocks.ts

@@ -76,7 +76,7 @@ const mockFlows = [
     },
     {
       transactionHash: '0xe472ca1b52751b058fbdaeaffebd98c0cc43b45aa31794b3eb06834ede19f7be',
-      blockNumber: '9945543',
+      blockNumber: 9945543,
       timestamp: '1641495767',
       sender: '0x9c040e2d6fd83a8b35069aa7154b69674961e0f7',
       flowRate: '0',