Update cannonfile.toml (#2247)

* Update cannonfile.toml needs to use `fromCall.func` instead of usual * bump * more changes were needed --------- Co-authored-by: meb <[email protected]>
Synthetixio · Aug 30, 2024 · 00002cd · 00002cd
1 parent 2e2a719
commit 00002cd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/protocol/governance/cannonfile.satellite.toml b/protocol/governance/cannonfile.satellite.toml
@@ -53,7 +53,7 @@ contracts = [
 
 [invoke.upgrade_core_proxy]
 target = ["InitialProxy"]
-from = "<%= settings.owner %>"
+fromCall.func = "owner"
 func = "upgradeTo"
 args = ["<%= contracts.CoreRouter.address %>"]
 factory.GovernanceProxy.abiOf = ["CoreRouter"]
@@ -63,6 +63,7 @@ factory.GovernanceProxy.highlight = true
 
 [invoke.init_election_module]
 target = ["GovernanceProxy"]
+fromCall.func = "owner"
 func = "initElectionModuleSatellite(uint256,uint64,uint64,uint64,uint64,address,address,address[])"
 args = [
     "<%= settings.initial_epoch_index %>",
@@ -76,4 +77,3 @@ args = [
         "<%= settings.initial_council_member %>",
     ],
 ]
-from = "<%= settings.owner %>"
diff --git a/protocol/governance/cannonfile.toml b/protocol/governance/cannonfile.toml
@@ -57,7 +57,7 @@ contracts = [
 
 [invoke.upgrade_core_proxy]
 target = ["InitialProxy"]
-from = "<%= settings.owner %>"
+fromCall.func = "owner"
 func = "upgradeTo"
 args = ["<%= contracts.CoreRouter.address %>"]
 factory.GovernanceProxy.abiOf = ["CoreRouter"]
@@ -68,6 +68,7 @@ factory.GovernanceProxy.highlight = true
 [invoke.init_election_module]
 target = ["GovernanceProxy"]
 func = "initOrUpdateElectionSettings(address[],address,address,uint8,uint64,uint64,uint64,uint64)"
+fromCall.func = "owner"
 args = [
     [
         "<%= settings.initial_council_member %>",
@@ -80,4 +81,3 @@ args = [
     "<%= settings.nomination_period_duration %>",
     "<%= settings.voting_period_duration %>",
 ]
-from = "<%= settings.owner %>"
diff --git a/protocol/governance/package.json b/protocol/governance/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@synthetixio/governance",
-  "version": "3.0.5",
+  "version": "3.0.7",
   "description": "On-Chain elections for all Synthetix councils",
   "private": true,
   "scripts": {

diff --git a/protocol/governance/tomls/council-token.toml b/protocol/governance/tomls/council-token.toml
@@ -15,7 +15,7 @@ contracts = ["CouncilTokenModule", "InitialModuleBundle"]
 
 [invoke.init_council_token]
 target = ["GovernanceProxy"]
-from = "<%= settings.owner %>"
+fromCall.func = "owner"
 func = "initOrUpgradeNft"
 args = [
     "<%= formatBytes32String('councilToken') %>",