v0.5: Polygon and Goerli (#157)

* Deployments: reorg dir * v0.5: Goerli * v0.5: Polygon * Docs: add live deployments instructions to readme * forge snapshot * Update polygon deploy block
firm-org · Jan 18, 2023 · 095958c · 095958c
1 parent e33a592
commit 095958c
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 9 deletions.
diff --git a/.gas-snapshot b/.gas-snapshot
@@ -190,12 +190,12 @@ EquityTokenTest:testCantReinitialize() (gas: 15733)
 EquityTokenTest:testCaptableCanPerformAdminActions() (gas: 66509)
 EquityTokenTest:testInitialState() (gas: 21699)
 EquityTokenTest:testNonCaptableCannotPerformAdminActions() (gas: 33583)
-FirmFactoryIntegrationTest:testBudgetStreaming() (gas: 3502352)
-FirmFactoryIntegrationTest:testExecutingPaymentsFromBudget() (gas: 1200604)
-FirmFactoryIntegrationTest:testExecutingProposalsFromVoting() (gas: 2137507)
-FirmFactoryIntegrationTest:testFactoryGas() (gas: 639783)
-FirmFactoryIntegrationTest:testInitialState() (gas: 649595)
-FirmFactoryIntegrationTest:testModuleUpgrades() (gas: 1365589)
+FirmFactoryIntegrationTest:testBudgetStreaming() (gas: 3502379)
+FirmFactoryIntegrationTest:testExecutingPaymentsFromBudget() (gas: 1200620)
+FirmFactoryIntegrationTest:testExecutingProposalsFromVoting() (gas: 2137523)
+FirmFactoryIntegrationTest:testFactoryGas() (gas: 639810)
+FirmFactoryIntegrationTest:testInitialState() (gas: 649622)
+FirmFactoryIntegrationTest:testModuleUpgrades() (gas: 1365616)
 UpgradeableModuleProxyDeployTest:testCannotInitializeWithZeroSafe() (gas: 86232)
 UpgradeableModuleProxyDeployTest:testEventsAreEmittedInOrder() (gas: 159956)
 UpgradeableModuleProxyDeployTest:testFirstStorageSlotIsZero() (gas: 33435)

diff --git a/README.md b/README.md
@@ -38,3 +38,15 @@ was correctly deployed by performing a call to it:
 ```
 cast call [FirmFactory address] "moduleFactory()(address)"
 ```
+
+## Live deployments
+
+Make sure the git repo is not dirty and force a clean build:
+```
+forge build --force
+```
+
+Use `FirmFactoryDeploy` script to deploy to a live network (add flags to `forge script` for your deployment account to be used):
+```
+forge script scripts/FirmFactoryDeploy.s.sol:FirmFactoryDeployLive --broadcast --fork-url [JSON-RPC for network to deploy to]
+```
diff --git a/deployments/testinprod.json → deployments/factory.json b/deployments/testinprod.json → deployments/factory.json
@@ -19,10 +19,15 @@
             "firmFactory": "0xa1b159a50613c8f0c6b01d02b8a2258a94eed480",
             "blockNumber": 7638312
         },
-        "v0.3.0-rc.1": {
+        "v0.3.0": {
             "firmFactory": "0x229f7159dab0840B8dd6215F09Dc7238B11c70e1",
             "modulesFactory": "0x2Ef2b36AD44D5c5fdeECC5a6a38464BFe50b5Da2",
             "blockNumber": 7833032
+        },
+        "v0.5.0": {
+            "firmFactory": "0x757BfeA33a67412a1099BD00f431153509E0e1BC",
+            "modulesFactory": "0x7feED33B89605C5171bfF6051F64954a892Af043",
+            "blockNumber": 8331988
         }
     },
     "137": {
@@ -35,6 +40,11 @@
             "firmFactory": "0x860ff9c3E9cd3A5666Cb9a5E0Ce6027D6627CD1b",
             "modulesFactory": "0x2dd8DA68D62a01Db1B29e87ed6A42E099a7C12E4",
             "blockNumber": 37024174
+        },
+        "v0.5.0": {
+            "firmFactory": "0x9aC87d21984F5a42A549eDC0306a5b4813626843",
+            "modulesFactory": "0x4a04206FCe29faB48D3195F9a2892A6d02D4aC6e",
+            "blockNumber": 38227123
         }
     }
 }
diff --git a/deployments/testnet-faucet.json → deployments/testnet/faucet.json b/deployments/testnet-faucet.json → deployments/testnet/faucet.json
diff --git a/scripts/CreateFirmSeedState.s.sol b/scripts/CreateFirmSeedState.s.sol
@@ -29,10 +29,10 @@ contract CreateFirmSeedState is Test {
     function run() public returns (GnosisSafe safe) {
         if (block.chainid == 5) { // goerli
             faucet = TestnetTokenFaucet(0x88A135e2f78C6Ef38E1b72A4B75Ad835fBd50CCE);
-            factory = FirmFactory(address(0)); // TODO
+            factory = FirmFactory(0x757BfeA33a67412a1099BD00f431153509E0e1BC); // v0.5
         } else if (block.chainid == 137) { // matic
             faucet = TestnetTokenFaucet(0xA1dD2A67E26DC400b6dd31354bA653ea4EeF86F5);
-            factory = FirmFactory(address(0)); // TODO
+            factory = FirmFactory(0x9aC87d21984F5a42A549eDC0306a5b4813626843); // v0.5
         } else if (block.chainid == 31337) { // anvil
             faucet = (new TestnetFaucetDeploy()).run();
             factory = FirmFactory(0x9A9f2CCfdE556A7E9Ff0848998Aa4a0CFD8863AE);