From 2c808da2a4e8b7c4801efef67a5b4bb91e392357 Mon Sep 17 00:00:00 2001
From: Wei-Ning Huang <w@cobinhood.com>
Date: Sat, 13 Oct 2018 16:21:51 +0800
Subject: dex: bug fix to allow running geth without crashing

---
 core/genesis.go       | 8 --------
 core/vm/governance.go | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

(limited to 'core')

diff --git a/core/genesis.go b/core/genesis.go
index 149241cf5..043a9f428 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
-- 
cgit v1.2.3