update governance deploy #96
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
felix-shin-wt
requested review from
egonspace,
Noah-jhkim,
kai-yu-wm,
jed-wemade,
eomti-wm,
jennwiederholen and
paul-ahn-wm
egonspace
reviewed
May 31, 2024
egonspace
reviewed
May 31, 2024
jed-wemade
reviewed
May 31, 2024
egonspace
reviewed
Jun 3, 2024
egonspace
approved these changes
Jun 3, 2024
jed-wemade
reviewed
Jun 3, 2024
jed-wemade
approved these changes
Jun 4, 2024
steve-oh-wt
reviewed
Jun 4, 2024
| @@ -165,38 +173,40 @@ func DeployGovContracts(opts *bind.TransactOpts, backend IBackend, optionDomains | |||
| } | |||
| } | |||
|
|
|||
| // deploy proxys | |||
| // deploy proxies | |||
| txs = make([]*types.Transaction, 0) | |||
There was a problem hiding this comment.
common code for no size slice initialization
txs = txs[:0]
| @@ -208,6 +218,7 @@ func DeployGovContracts(opts *bind.TransactOpts, backend IBackend, optionDomains | |||
| } | |||
|
|
|||
| // setup registry | |||
| logger.Info("Setting registry...") | |||
| txs = make([]*types.Transaction, 0) | |||
There was a problem hiding this comment.
common code for no size slice initialization
txs = txs[:0]
| @@ -208,6 +218,7 @@ func DeployGovContracts(opts *bind.TransactOpts, backend IBackend, optionDomains | |||
| } | |||
|
|
|||
| // setup registry | |||
| logger.Info("Setting registry...") | |||
| txs = make([]*types.Transaction, 0) | |||
| if tx, err := gov.Registry.SetContractDomain(opts, metclient.ToBytes32("GovernanceContract"), gov.address.Gov); err != nil { | |||
There was a problem hiding this comment.
You can use the code below.
optionDomains["GovernanceContract"] = gov.address.Gov
optionDomains["Staking"] = gov.address.Staking
optionDomains["BallotStorage"] = gov.address.BallotStorage
optionDomains["EnvStorage"] = gov.address.EnvStorage
for name, address := range optionDomains {
if tx, err := gov.Registry.SetContractDomain(opts, metclient.ToBytes32(name), address); err != nil {
return nil, nil, errors.Wrap(err, fmt.Sprintf("SetContractDomain(%s)", name))
} else {
txs = append(txs, tx)
}
}
steve-oh-wt
reviewed
Jun 4, 2024
| @@ -438,7 +460,6 @@ type InitEnvStorage struct { | |||
| BLOCK_GASLIMIT *big.Int | |||
| BASE_FEE_MAX_CHANGE_RATE *big.Int | |||
| GAS_TARGET_PERCENTAGE *big.Int | |||
| Options map[string]*big.Int | |||
| } | |||
There was a problem hiding this comment.
- Remove duplicate code using reflect and tag
- Easily check method names and variable names
- Process all without missing members
type InitEnvStorage struct {
BLOCKS_PER *big.Int `method:"blocksPer"`
BALLOT_DURATION_MIN *big.Int `method:"ballotDurationMin"`
BALLOT_DURATION_MAX *big.Int `method:"ballotDurationMax"`
STAKING_MIN *big.Int `method:"stakingMin"`
STAKING_MAX *big.Int `method:"stakingMax"`
MAX_IDLE_BLOCK_INTERVAL *big.Int `method:"MaxIdleBlockInterval"`
BLOCK_CREATION_TIME *big.Int `method:"blockCreationTime"`
BLOCK_REWARD_AMOUNT *big.Int `method:"blockRewardAmount"`
MAX_PRIORITY_FEE_PER_GAS *big.Int `method:"maxPriorityFeePerGas"`
BLOCK_REWARD_DISTRIBUTION_BLOCK_PRODUCER *big.Int `method:"blockRewardDistributionBlockProducer"`
BLOCK_REWARD_DISTRIBUTION_STAKING_REWARD *big.Int `method:"blockRewardDistributionStakingReward"`
BLOCK_REWARD_DISTRIBUTION_ECOSYSTEM *big.Int `method:"blockRewardDistributionEcosystem"`
BLOCK_REWARD_DISTRIBUTION_MAINTENANCE *big.Int `method:"blockRewardDistributionMaintenance"`
MAX_BASE_FEE *big.Int `method:"maxBaseFee"`
BLOCK_GASLIMIT *big.Int `method:"blockGasLimit"`
BASE_FEE_MAX_CHANGE_RATE *big.Int `method:"baseFeeMaxChangeRate"`
GAS_TARGET_PERCENTAGE *big.Int `method:"gasTargetPercentage"`
}
func (cfg InitEnvStorage) Args() (names [][32]byte, values []*big.Int) {
v := reflect.ValueOf(cfg)
t := reflect.TypeOf(cfg)
numField := v.NumField()
names = [][32]byte{}
values = []*big.Int{}
for i := 0; i < numField; i++ {
value, ok := v.Field(i).Interface().(*big.Int)
if ok && value != nil && value.Sign() > 0 {
tag := t.Field(i).Tag.Get("method")
names = append(names, crypto.Keccak256Hash([]byte(tag)))
values = append(values, value)
}
}
return
}
steve-oh-wt
reviewed
Jun 4, 2024
| @@ -527,20 +541,19 @@ var DefaultInitEnvStorage InitEnvStorage = InitEnvStorage{ | |||
| BALLOT_DURATION_MIN: big.NewInt(86400), | |||
| BALLOT_DURATION_MAX: big.NewInt(604800), | |||
| STAKING_MIN: new(big.Int).Mul(big.NewInt(1500000), big.NewInt(params.Ether)), | |||
| STAKING_MAX: new(big.Int).Mul(big.NewInt(1500000), big.NewInt(params.Ether)), | |||
There was a problem hiding this comment.
common code
var DefaultInitEnvStorage InitEnvStorage = InitEnvStorage{
->
var DefaultInitEnvStorage = InitEnvStorage{
Merged
This was referenced Oct 8, 2024
Closed
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix the logic to deploy using the structure of
wemix/bind.Removed unnecessary files