Merge branch 'release-0.4' into 0.4-master

firm-org · Jan 9, 2023 · a2c7dbb · a2c7dbb
2 parents 64b0aba + 3eb533b
commit a2c7dbb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/deployments/testinprod.json b/deployments/testinprod.json
@@ -30,6 +30,11 @@
             "firmFactory": "0x74dBa876C971b05B36806F67bd749f1abe8B4f7b",
             "modulesFactory": "0xCb3Dee447443B7F34aCd640AC8e304188512c2EC",
             "blockNumber": 34868283
+        },
+        "v0.4.0": {
+            "firmFactory": "0x860ff9c3E9cd3A5666Cb9a5E0Ce6027D6627CD1b",
+            "modulesFactory": "0x2dd8DA68D62a01Db1B29e87ed6A42E099a7C12E4",
+            "blockNumber": 37024174
         }
     }
 }
diff --git a/scripts/TestinprodDeploy.s.sol b/scripts/TestinprodDeploy.s.sol
@@ -8,10 +8,15 @@ import {GnosisSafeProxyFactory} from "gnosis-safe/proxies/GnosisSafeProxyFactory
 
 import {TestinprodFactory, UpgradeableModuleProxyFactory} from "src/factory/TestinprodFactory.sol";
 import {FirmRelayer} from "src/metatx/FirmRelayer.sol";
+
 import {Roles} from "src/roles/Roles.sol";
+
 import {Budget} from "src/budget/Budget.sol";
 import {LlamaPayStreams, LlamaPayFactory} from "src/budget/modules/streams/LlamaPayStreams.sol";
 
+import {Captable} from "src/captable/Captable.sol";
+import {VestingController} from "src/captable/controllers/VestingController.sol";
+
 abstract contract DeployBase is Test {
     function baseContracts() internal virtual returns (address safeProxyFactory, address safeImpl, address llamaPayFactory);
 
@@ -24,6 +29,8 @@ abstract contract DeployBase is Test {
         moduleFactory.register(new Roles());
         moduleFactory.register(new Budget());
         moduleFactory.register(new LlamaPayStreams(LlamaPayFactory(llamaPayFactory)));
+        moduleFactory.register(new Captable());
+        moduleFactory.register(new VestingController());
 
         factory = new TestinprodFactory(
             GnosisSafeProxyFactory(safeProxyFactory),