diff options
author | Sonic <sonic@dexon.org> | 2018-11-13 17:51:27 +0800 |
---|---|---|
committer | Wei-Ning Huang <w@dexon.org> | 2019-03-12 12:19:09 +0800 |
commit | f5c7287520cbf55a4634b0f07078ac4803882e0a (patch) | |
tree | 805f95f7b4e7d9bcc997f5a3709a5cca02177ade /core/vm | |
parent | 7088082f533f170866f4f17f855ea98f774c0fea (diff) | |
download | dexon-f5c7287520cbf55a4634b0f07078ac4803882e0a.tar dexon-f5c7287520cbf55a4634b0f07078ac4803882e0a.tar.gz dexon-f5c7287520cbf55a4634b0f07078ac4803882e0a.tar.bz2 dexon-f5c7287520cbf55a4634b0f07078ac4803882e0a.tar.lz dexon-f5c7287520cbf55a4634b0f07078ac4803882e0a.tar.xz dexon-f5c7287520cbf55a4634b0f07078ac4803882e0a.tar.zst dexon-f5c7287520cbf55a4634b0f07078ac4803882e0a.zip |
core: push height of round 0 in genesis block (#17)
* core: push height of round 0 in genesis block
* vm: fix governance dispatch method name mismatch with abi
also rename RoundHeightLoc to roundHeightLoc
Diffstat (limited to 'core/vm')
-rw-r--r-- | core/vm/governance.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/core/vm/governance.go b/core/vm/governance.go index cc453ace7..49141761f 100644 --- a/core/vm/governance.go +++ b/core/vm/governance.go @@ -917,7 +917,7 @@ func RunGovernanceContract(evm *EVM, input []byte, contract *Contract) ( return nil, errExecutionReverted } return res, nil - case "RoundHeight": + case "roundHeight": round := new(big.Int) if err := method.Inputs.Unpack(&round, arguments); err != nil { return nil, errExecutionReverted @@ -939,7 +939,7 @@ func RunGovernanceContract(evm *EVM, input []byte, contract *Contract) ( // Storage position enums. const ( - RoundHeightLoc = iota + roundHeightLoc = iota nodesLoc offsetLoc crsLoc @@ -1096,21 +1096,21 @@ func (s *GovernanceStateHelper) appendTo2DByteArray(pos, index *big.Int, data [] s.writeBytes(elementLoc, data) } -// uint256[] public RoundHeight; +// uint256[] public roundHeight; func (s *GovernanceStateHelper) LenRoundHeight() *big.Int { - return s.getStateBigInt(big.NewInt(RoundHeightLoc)) + return s.getStateBigInt(big.NewInt(roundHeightLoc)) } func (s *GovernanceStateHelper) RoundHeight(round *big.Int) *big.Int { - baseLoc := s.getSlotLoc(big.NewInt(RoundHeightLoc)) + baseLoc := s.getSlotLoc(big.NewInt(roundHeightLoc)) loc := new(big.Int).Add(baseLoc, round) return s.getStateBigInt(loc) } func (s *GovernanceStateHelper) PushRoundHeight(height *big.Int) { // increase length by 1. - length := s.getStateBigInt(big.NewInt(RoundHeightLoc)) - s.setStateBigInt(big.NewInt(RoundHeightLoc), new(big.Int).Add(length, big.NewInt(1))) + length := s.getStateBigInt(big.NewInt(roundHeightLoc)) + s.setStateBigInt(big.NewInt(roundHeightLoc), new(big.Int).Add(length, big.NewInt(1))) - baseLoc := s.getSlotLoc(big.NewInt(RoundHeightLoc)) + baseLoc := s.getSlotLoc(big.NewInt(roundHeightLoc)) loc := new(big.Int).Add(baseLoc, length) s.setStateBigInt(loc, height) |