From 6acb1d24ebd3c76a35a793abffb1a974ebd95331 Mon Sep 17 00:00:00 2001
From: Romain TREFAULT <romain.trefault@epita.fr>
Date: Wed, 6 Jul 2022 14:28:20 +0200
Subject: [PATCH 1/3] feat: add goerli

---
 packages/ethereum-storage/src/ethereum-utils.ts       | 1 +
 packages/ethereum-storage/test/ethereum-utils.test.ts | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/packages/ethereum-storage/src/ethereum-utils.ts b/packages/ethereum-storage/src/ethereum-utils.ts
index 9b879685d..75351078f 100644
--- a/packages/ethereum-storage/src/ethereum-utils.ts
+++ b/packages/ethereum-storage/src/ethereum-utils.ts
@@ -8,6 +8,7 @@ const networks = {
   [StorageTypes.EthereumNetwork.MAINNET]: 'mainnet',
   [StorageTypes.EthereumNetwork.KOVAN]: 'kovan',
   [StorageTypes.EthereumNetwork.RINKEBY]: 'rinkeby',
+  [StorageTypes.EthereumNetwork.GOERLI]: 'goerli',
   [StorageTypes.EthereumNetwork.SOKOL]: 'sokol',
   [StorageTypes.EthereumNetwork.XDAI]: 'xdai',
 };
diff --git a/packages/ethereum-storage/test/ethereum-utils.test.ts b/packages/ethereum-storage/test/ethereum-utils.test.ts
index 17fc6d353..a423b9dda 100644
--- a/packages/ethereum-storage/test/ethereum-utils.test.ts
+++ b/packages/ethereum-storage/test/ethereum-utils.test.ts
@@ -21,6 +21,9 @@ describe('Ethereum Utils', () => {
       expect(EthereumUtils.getEthereumNetworkNameFromId(StorageTypes.EthereumNetwork.RINKEBY)).toBe(
         'rinkeby',
       );
+      expect(EthereumUtils.getEthereumNetworkNameFromId(StorageTypes.EthereumNetwork.GOERLI)).toBe(
+        'goerli',
+      );
       expect(EthereumUtils.getEthereumNetworkNameFromId(StorageTypes.EthereumNetwork.SOKOL)).toBe(
         'sokol',
       );
@@ -48,6 +51,9 @@ describe('Ethereum Utils', () => {
       expect(EthereumUtils.getEthereumIdFromNetworkName('rinkeby')).toBe(
         StorageTypes.EthereumNetwork.RINKEBY,
       );
+      expect(EthereumUtils.getEthereumIdFromNetworkName('goerli')).toBe(
+        StorageTypes.EthereumNetwork.GOERLI,
+      );
       expect(EthereumUtils.getEthereumIdFromNetworkName('sokol')).toBe(
         StorageTypes.EthereumNetwork.SOKOL,
       );

From 35fae9881d04b7e8335a072c5db05d7a998e834e Mon Sep 17 00:00:00 2001
From: Romain TREFAULT <romain.trefault@epita.fr>
Date: Wed, 6 Jul 2022 14:43:02 +0200
Subject: [PATCH 2/3] feat: add goerli ID in storage types

---
 packages/types/src/storage-types.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/types/src/storage-types.ts b/packages/types/src/storage-types.ts
index c6e51c33b..4ab5c6702 100644
--- a/packages/types/src/storage-types.ts
+++ b/packages/types/src/storage-types.ts
@@ -136,6 +136,7 @@ export enum EthereumNetwork {
   PRIVATE = 0,
   MAINNET = 1,
   RINKEBY = 4,
+  GOERLI = 5,
   KOVAN = 42,
   SOKOL = 77,
   XDAI = 100,

From 3a8e6f9891934c883a0b1cb57c1adb0e273b808a Mon Sep 17 00:00:00 2001
From: Romain TREFAULT <romain.trefault@epita.fr>
Date: Wed, 6 Jul 2022 16:01:48 +0200
Subject: [PATCH 3/3] feat: add goerli smart-contract support

---
 .../src/lib/artifacts/RequestHashStorage/index.ts             | 4 ++++
 .../src/lib/artifacts/RequestHashSubmitter/index.ts           | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/packages/smart-contracts/src/lib/artifacts/RequestHashStorage/index.ts b/packages/smart-contracts/src/lib/artifacts/RequestHashStorage/index.ts
index e3e0981d6..d9b4ae963 100644
--- a/packages/smart-contracts/src/lib/artifacts/RequestHashStorage/index.ts
+++ b/packages/smart-contracts/src/lib/artifacts/RequestHashStorage/index.ts
@@ -21,6 +21,10 @@ export const requestHashStorageArtifact = new ContractArtifact<RequestHashStorag
           address: '0x309a3a9898f9cafc26499243a980992156671e5e',
           creationBlockNumber: 4742809,
         },
+        goerli: {
+          address: '0x132D0c7309Ca3286a644668469D3b09dFb81f757',
+          creationBlockNumber: 7145146,
+        },
         xdai: {
           address: '0x2256938E8225a998C498bf86B43c1768EE14b90B',
           creationBlockNumber: 15193752,
diff --git a/packages/smart-contracts/src/lib/artifacts/RequestHashSubmitter/index.ts b/packages/smart-contracts/src/lib/artifacts/RequestHashSubmitter/index.ts
index 1c5f92548..7bd15964d 100644
--- a/packages/smart-contracts/src/lib/artifacts/RequestHashSubmitter/index.ts
+++ b/packages/smart-contracts/src/lib/artifacts/RequestHashSubmitter/index.ts
@@ -21,6 +21,10 @@ export const requestHashSubmitterArtifact = new ContractArtifact<RequestOpenHash
           address: '0xf4eacf30944a1a029b567a9ed29db8d120452c2c',
           creationBlockNumber: 4742922,
         },
+        goerli: {
+          address: '0x2C96132bae414000E267E6A8d4BfFd8bfaa21309',
+          creationBlockNumber: 7145146,
+        },
         xdai: {
           address: '0x268C146Afb4790902Ee26A6D2d3aff968623Ec80',
           creationBlockNumber: 15193804,