From 8b8cf079388728d628c3e3506061b2bcff535c5a Mon Sep 17 00:00:00 2001 From: Jorge Izquierdo Date: Mon, 19 Dec 2022 16:58:22 +0100 Subject: [PATCH 1/3] v0.4-rc.1: Polygon --- deployments/testinprod.json | 5 +++++ scripts/TestinprodDeploy.s.sol | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/deployments/testinprod.json b/deployments/testinprod.json index 90cd2ee..97b9f87 100644 --- 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 } } } \ No newline at end of file diff --git a/scripts/TestinprodDeploy.s.sol b/scripts/TestinprodDeploy.s.sol index 5e94a40..a72e635 100644 --- 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), From d368d79a0bb34ac32a938c25dfecbb0e625e1554 Mon Sep 17 00:00:00 2001 From: Jorge Izquierdo Date: Tue, 3 Jan 2023 14:20:46 +0100 Subject: [PATCH 2/3] Rename version to rc.1 --- deployments/testinprod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/testinprod.json b/deployments/testinprod.json index 97b9f87..ea3fe1c 100644 --- a/deployments/testinprod.json +++ b/deployments/testinprod.json @@ -31,7 +31,7 @@ "modulesFactory": "0xCb3Dee447443B7F34aCd640AC8e304188512c2EC", "blockNumber": 34868283 }, - "v0.4.0": { + "v0.4.0-rc.1": { "firmFactory": "0x860ff9c3E9cd3A5666Cb9a5E0Ce6027D6627CD1b", "modulesFactory": "0x2dd8DA68D62a01Db1B29e87ed6A42E099a7C12E4", "blockNumber": 37024174 From 3eb533b2bc984a04015b2a52fa48a7da6e9c4cfb Mon Sep 17 00:00:00 2001 From: Jorge Izquierdo Date: Mon, 9 Jan 2023 11:31:23 +0100 Subject: [PATCH 3/3] 0.4: promote rc in Polygon --- deployments/testinprod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/testinprod.json b/deployments/testinprod.json index ea3fe1c..97b9f87 100644 --- a/deployments/testinprod.json +++ b/deployments/testinprod.json @@ -31,7 +31,7 @@ "modulesFactory": "0xCb3Dee447443B7F34aCd640AC8e304188512c2EC", "blockNumber": 34868283 }, - "v0.4.0-rc.1": { + "v0.4.0": { "firmFactory": "0x860ff9c3E9cd3A5666Cb9a5E0Ce6027D6627CD1b", "modulesFactory": "0x2dd8DA68D62a01Db1B29e87ed6A42E099a7C12E4", "blockNumber": 37024174