aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/genesis.go8
-rw-r--r--core/vm/governance.go2
2 files changed, 1 insertions, 9 deletions
diff --git a/core/genesis.go b/core/genesis.go
index 1c95e9c12..94b1deff2 100644
--- a/core/genesis.go
+++ b/core/genesis.go
@@ -32,7 +32,6 @@ import (
"github.com/dexon-foundation/dexon/core/state"
"github.com/dexon-foundation/dexon/core/types"
"github.com/dexon-foundation/dexon/core/vm"
- "github.com/dexon-foundation/dexon/crypto"
"github.com/dexon-foundation/dexon/ethdb"
"github.com/dexon-foundation/dexon/log"
"github.com/dexon-foundation/dexon/params"
@@ -248,13 +247,6 @@ func (g *Genesis) ToBlock(db ethdb.Database) *types.Block {
// Stake in governance state.
if account.Staked.Cmp(big.NewInt(0)) > 0 {
- pk, err := crypto.DecompressPubkey(account.PublicKey)
- if err != nil {
- panic(err)
- }
- if crypto.PubkeyToAddress(*pk) != addr {
- panic(fmt.Errorf("public key does not belones to %s", addr))
- }
govStateHelper.Stake(addr, account.PublicKey, account.Staked)
}
}
diff --git a/core/vm/governance.go b/core/vm/governance.go
index 5bbb5a1ec..0cca0f409 100644
--- a/core/vm/governance.go
+++ b/core/vm/governance.go
@@ -1041,7 +1041,7 @@ func (s *GovernanceStateHelper) Node(index *big.Int) *nodeInfo {
loc = new(big.Int).Add(elementBaseLoc, big.NewInt(2))
node.Staked = s.getStateBigInt(loc)
- return nil
+ return node
}
func (s *GovernanceStateHelper) PushNode(n *nodeInfo) {
// increase length by 1