Refact governance simulationbackend (#107)

wemixarchive · Jun 7, 2024 · 752b49f · 752b49f
2 parents a4c1c89 + 12c8e74
commit 752b49f
Show file tree

Hide file tree

Showing 736 changed files with 278 additions and 128,705 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -12,3 +12,9 @@
 [submodule "etcd"]
 	path = etcd
 	url = https://github.com/metadium/etcd
+[submodule "wemix/governance-contract/contracts/openzeppelin/contracts-upgradeable"]
+	path = wemix/governance-contract/contracts/openzeppelin/contracts-upgradeable
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
+[submodule "wemix/governance-contract/contracts/openzeppelin/contracts"]
+	path = wemix/governance-contract/contracts/openzeppelin/contracts
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts
diff --git a/cmd/geth/governancedeploy.go b/cmd/geth/governancedeploy.go
@@ -134,7 +134,7 @@ func deployGovernance(cli Client, ownerOpts *bind.TransactOpts, lockAmount *big.
 	}
 
 	// deploy & set domains
-	contracts, impAddress, err := gov.DeployGovContracts(ownerOpts, cli, domains)
+	contracts, err := gov.DeployGovContracts(ownerOpts, cli, domains)
 	if err != nil {
 		return err
 	}
@@ -151,11 +151,10 @@ func deployGovernance(cli Client, ownerOpts *bind.TransactOpts, lockAmount *big.
   "STAKING_ADDRESS": "%s",
   "ENV_STORAGE_ADDRESS": "%s",
   "BALLOT_STORAGE_ADDRESS": "%s",
-  "GOV_ADDRESS": "%s",
-  "GOV_IMP_ADDRESS": "%s",
+  "GOV_ADDRESS": "%s"
 }
 `,
-		address.Registry, address.Staking, address.EnvStorage, address.BallotStorage, address.Gov, impAddress["GovImp"])
+		address.Registry, address.Staking, address.EnvStorage, address.BallotStorage, address.Gov)
 
 	return nil
 }

diff --git a/wemix/bind/backends/wemix_simulated.go b/wemix/bind/backends/wemix_simulated.go
@@ -139,7 +139,7 @@ func NewWemixSimulatedBackend(pk *ecdsa.PrivateKey, datadir string, alloc core.G
 		return nil, err
 	}
 
-	contracts, _, err := gov.DeployGovContracts(opts, ethClient, map[string]common.Address{
+	contracts, err := gov.DeployGovContracts(opts, ethClient, map[string]common.Address{
 		"StakingReward": opts.From,
 		"Ecosystem":     opts.From,
 		"Maintenance":   opts.From,

diff --git a/wemix/bind/ballotStorage.go b/wemix/bind/ballotStorage.go
diff --git a/wemix/bind/envStorage.go b/wemix/bind/envStorage.go
diff --git a/wemix/bind/gov.go b/wemix/bind/gov.go
diff --git a/wemix/bind/ncpExit.go b/wemix/bind/ncpExit.go
diff --git a/wemix/bind/registry.go b/wemix/bind/registry.go