Merge branch 'master' into update-factory-to-latest

gnosisguild · Sep 5, 2022 · 04f704c · 04f704c
2 parents daad00a + bdc965f
commit 04f704c
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 8 deletions.
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -32,7 +32,10 @@ if (PK) {
   };
 }
 
-if (["rinkeby", "mainnet"].includes(argv.network) && INFURA_KEY === undefined) {
+if (
+  ["rinkeby", "mainnet", "goerli", "ropsten"].includes(argv.network) &&
+  INFURA_KEY === undefined
+) {
   throw new Error(
     `Could not find Infura key in env, unable to connect to network ${argv.network}`
   );
@@ -61,6 +64,10 @@ export default {
       ...sharedNetworkConfig,
       url: `https://ropsten.infura.io/v3/${INFURA_KEY}`,
     },
+    goerli: {
+      ...sharedNetworkConfig,
+      url: `https://goerli.infura.io/v3/${INFURA_KEY}`,
+    },
     gnosis: {
       ...sharedNetworkConfig,
       url: "https://rpc.gnosischain.com",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gnosis.pm/zodiac",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "Zodiac is a composable design philosophy and collection of standards for building DAO ecosystem tooling.",
   "author": "Auryn Macmillan <auryn.macmillan@gnosis.io>",
   "license": "LGPL-3.0+",

diff --git a/src/deployments.json b/src/deployments.json
@@ -1,9 +1,9 @@
 {
   "1": {
-    "optimisticGovernor":{
+    "optimisticGovernor": {
       "v1.0.0": "0xC419A1dc987d7c34243f98d66211d356023F344E"
     },
-    "tellor":{
+    "tellor": {
       "v1.0.1": "0x7D5f5EaF541AC203Ee1424895b6997041C886FBE"
     },
     "realityETH": {
@@ -38,10 +38,10 @@
     }
   },
   "4": {
-    "optimisticGovernor":{
+    "optimisticGovernor": {
       "v1.0.0": "0x6Ff461b854F5349857c2Ad41e0f558C19953DF89"
     },
-    "tellor":{
+    "tellor": {
       "v1.0.1": "0x2b0bfeBCDFE2228cAbA56dfDE9F067643B357343"
     },
     "realityETH": {
@@ -75,6 +75,38 @@
       "v1.1.0": "0x71530ec830CBE363bab28F4EC52964a550C0AB1E"
     }
   },
+  "5": {
+    "realityETH": {
+      "v1.0.0": "0x72d453a685c27580acDFcF495830EB16B7E165f8"
+    },
+    "realityERC20": {
+      "v1.0.0": "0x6f628F0c3A3Ff75c39CF310901f10d79692Ed889"
+    },
+    "bridge": {
+      "v1.0.0": "0x457042756F2B1056487173003D27f37644C119f3"
+    },
+    "delay": {
+      "v1.0.0": "0xeD2323128055cE9539c6C99e5d7EBF4CA44A2485"
+    },
+    "factory": {
+      "v1.0.0": "0x00000000062c52e29e8029dc2413172f6d619d85",
+      "v1.1.0": "0x00000000000DC7F163742Eb4aBEf650037b1f588"
+    },
+    "exitERC20": {
+      "v1.0.0": "0x35E35dcDc7Cd112B93C7c55987C86e5D6D419C69",
+      "v1.1.0": "0x33bCa41bda8A3983afbAd8fc8936Ce2Fb29121da"
+    },
+    "exitERC721": {
+      "v1.1.0": "0xD3579C14a4181EfC3DF35C3103D20823A8C8d718"
+    },
+    "circulatingSupplyERC20": {
+      "v1.0.0": "0xd7a85e7D0813F8440602E243Acb67df3CCeb5a60",
+      "v1.1.0": "0xb50fab2e2892E3323A5300870C042B428B564FE3"
+    },
+    "circulatingSupplyERC721": {
+      "v1.1.0": "0x71530ec830CBE363bab28F4EC52964a550C0AB1E"
+    }
+  },
   "56": {
     "realityETH": {
       "v1.0.0": "0x72d453a685c27580acDFcF495830EB16B7E165f8"
@@ -139,7 +171,7 @@
     }
   },
   "137": {
-    "optimisticGovernor":{
+    "optimisticGovernor": {
       "v1.0.0": "0x59bC80BC7703f2573C0B31542828fFF993548994"
     },
     "tellor": {

diff --git a/src/factory/README.md b/src/factory/README.md
@@ -65,7 +65,7 @@ This method is used to calculate the resulting address of a deployed module give
 
 - Interface: `calculateProxyAddress(factory, masterCopy, initData)`
 - Arguments:
-  - `factory`: Address of the Module Proxy Factory contract
+  - `factory`: Factory contract object of the Module Proxy Factory contract
   - `masterCopy`: Address of the Master Copy of the Module
   - `initData`: Encoded function data that is used to set up the module
 - Returns: A string with the expected address

diff --git a/src/factory/constants.ts b/src/factory/constants.ts
@@ -3,6 +3,7 @@ import { ContractAddresses, KnownContracts } from "./types";
 /*
  * 1     - Mainnet
  * 4     - Rinkeby
+ * 5     - Goerli
  * 56    - Binance smart chain
  * 100   - Gnosis chain (Previously xdai)
  * 137   - Polygon
@@ -45,6 +46,7 @@ export const CONTRACT_ADDRESSES: Record<
     [KnownContracts.OPTIMISTIC_GOVERNOR]:
       "0x6Ff461b854F5349857c2Ad41e0f558C19953DF89",
   },
+  5: { ...MasterCopyAddresses },
   56: { ...MasterCopyAddresses },
   100: { ...MasterCopyAddresses },
   137: {

diff --git a/yarn.lock b/yarn.lock
@@ -3791,6 +3791,14 @@ eth-sig-util@3.0.0:
     tweetnacl "^1.0.0"
     tweetnacl-util "^0.15.0"
 
+eth-sig-util@^1.4.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/eth-sig-util/-/eth-sig-util-1.4.2.tgz#8d958202c7edbaae839707fba6f09ff327606210"
+  integrity sha512-iNZ576iTOGcfllftB73cPB5AN+XUQAT/T8xzsILsghXC1o8gJUqe3RHlcDqagu+biFpYQ61KQrZZJza8eRSYqw==
+  dependencies:
+    ethereumjs-abi "git+https://github.com/ethereumjs/ethereumjs-abi.git"
+    ethereumjs-util "^5.1.1"
+
 eth-sig-util@^2.5.2:
   version "2.5.4"
   resolved "https://registry.npmjs.org/eth-sig-util/-/eth-sig-util-2.5.4.tgz"
@@ -3892,6 +3900,13 @@ ethereumjs-abi@0.6.8, ethereumjs-abi@^0.6.8:
     bn.js "^4.11.8"
     ethereumjs-util "^6.0.0"
 
+"ethereumjs-abi@git+https://github.com/ethereumjs/ethereumjs-abi.git":
+  version "0.6.8"
+  resolved "git+https://github.com/ethereumjs/ethereumjs-abi.git#ee3994657fa7a427238e6ba92a84d0b529bbcde0"
+  dependencies:
+    bn.js "^4.11.8"
+    ethereumjs-util "^6.0.0"
+
 ethereumjs-account@3.0.0, ethereumjs-account@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/ethereumjs-account/-/ethereumjs-account-3.0.0.tgz"