bet

.gitignore

@@ -14,6 +14,7 @@
 */**/*tx_database*
 */**/*dapps*
 build/_vendor/pkg
+data
 
 #*
 .#*

Makefile

@@ -37,4 +37,4 @@ devtools:
 	env GOBIN= go install github.com/golang/protobuf/protoc-gen-go@latest
 	env GOBIN= go install ./cmd/abigen
 	@type "solc" 2> /dev/null || echo 'Please install solc'
-	@type "protoc" 2> /dev/null || echo 'Please install protoc'a
+	@type "protoc" 2> /dev/null || echo 'Please install protoc'

consensus/beacon/consensus.go

@@ -358,7 +358,7 @@ func (beacon *Beacon) Finalize(chain consensus.ChainHeaderReader, header *types.
 		amount := new(big.Int).SetUint64(w.Amount)
 		amount = amount.Mul(amount, big.NewInt(params.GWei))
 		state.AddBalance(w.Address, amount)
-	} 
+	}
 	// No block reward which is issued by consensus layer instead.
 }
 

core/state/statedb.go

@@ -138,13 +138,6 @@ type StateDB struct {
 
 	// Testing hooks
 	onCommit func(states *triestate.Set) // Hook invoked when commit is performed
-
-	extJournal Revertable
-}
-
-type Revertable interface {
-	Snapshot() int
-	RevertToSnapshot(int)
 }
 
 // New creates a new state from a given trie.
@@ -801,11 +794,6 @@ func (s *StateDB) Snapshot() int {
 	id := s.nextRevisionId
 	s.nextRevisionId++
 	s.validRevisions = append(s.validRevisions, revision{id, s.journal.length()})
-	if s.extJournal != nil {
-		if s.extJournal.Snapshot() != id {
-			panic("REEEE")
-		}
-	}
 	return id
 }
 
@@ -823,10 +811,6 @@ func (s *StateDB) RevertToSnapshot(revid int) {
 	// Replay the journal to undo changes and remove invalidated snapshots
 	s.journal.revert(s, snapshot)
 	s.validRevisions = s.validRevisions[:idx]
-
-	if s.extJournal != nil {
-		s.extJournal.RevertToSnapshot(revid)
-	}
 }
 
 // GetRefund returns the current value of the refund counter.

p2p/server.go

@@ -486,7 +486,6 @@ func (srv *Server) Start() (err error) {
 	if err := srv.setupLocalNode(); err != nil {
 		return err
 	}
-
 	srv.setupPortMapping()
 
 	if srv.ListenAddr != "" {