Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refact governance simulationbackend #107

Merged
merged 3 commits into from
Jun 7, 2024
Merged

Refact governance simulationbackend #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87d3221
refact : using bind structs
felix-shin-wt Jun 4, 2024
e6d0ce6
refact : submodule openzeppelin
felix-shin-wt Jun 5, 2024
12c8e74
feat : using NCPExit
felix-shin-wt Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 6 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 3 additions & 4 deletions cmd/geth/governancedeploy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion wemix/bind/backends/wemix_simulated.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions wemix/bind/ballotStorage.go
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions wemix/bind/envStorage.go
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions wemix/bind/gov.go
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions wemix/bind/ncpExit.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion wemix/bind/registry.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading