change Umbrella to interface

.gitignore

@@ -45,3 +45,5 @@ profile.cov
 /dashboard/assets/package-lock.json
 
 **/yarn-error.log
+
+*.swp

core/blockchain.go

@@ -128,7 +128,7 @@ type BlockChain struct {
 	processor Processor // block processor interface
 	validator Validator // block and state validator interface
 	vmConfig  vm.Config
-	umbrella  *umbrella.Umbrella // travis database interface
+	umbrella  umbrella.Umbrella // travis database interface
 
 	badBlocks *lru.Cache // Bad block cache
 }
@@ -166,7 +166,6 @@ func NewBlockChain(db ethdb.Database, cacheConfig *CacheConfig, chainConfig *par
 	}
 	bc.SetValidator(NewBlockValidator(chainConfig, bc, engine))
 	bc.SetProcessor(NewStateProcessor(chainConfig, bc, engine))
-	bc.SetUmbrella(umbrella.NewUmbrella())
 
 	var err error
 	bc.hc, err = NewHeaderChain(db, chainConfig, engine, bc.getProcInterrupt)
@@ -1555,12 +1554,12 @@ func (bc *BlockChain) Config() *params.ChainConfig { return bc.chainConfig }
 func (bc *BlockChain) Engine() consensus.Engine { return bc.engine }
 
 // SetUmbrella sets the umbrella which is used to communacate with Travis database.
-func (bc *BlockChain) SetUmbrella(umbrella *umbrella.Umbrella) {
+func (bc *BlockChain) SetUmbrella(umbrella umbrella.Umbrella) {
 	bc.umbrella = umbrella
 }
 
 // Umbrella retrieves the blockchain's travis database interface.
-func (bc *BlockChain) Umbrella() *umbrella.Umbrella {
+func (bc *BlockChain) Umbrella() umbrella.Umbrella {
 	return bc.umbrella
 }
 

core/evm.go

@@ -36,7 +36,7 @@ type ChainContext interface {
 	GetHeader(common.Hash, uint64) *types.Header
 
 	// Umbrella retrieves the Travis's database helper component.
-	Umbrella() *umbrella.Umbrella
+	Umbrella() umbrella.Umbrella
 }
 
 // NewEVMContext creates a new context for use in the EVM.

core/vm/evm.go

@@ -93,7 +93,7 @@ type Context struct {
 	Difficulty  *big.Int       // Provides information for DIFFICULTY
 
 	// Travis database helper component
-	Umbrella *umbrella.Umbrella
+	Umbrella umbrella.Umbrella
 }
 
 // EVM is the Ethereum Virtual Machine base object and provides
@@ -130,7 +130,7 @@ type EVM struct {
 	// ethereum native interface handler
 	eni *eni.ENI
 	// umbrella is a hendler to communacate with Travis database
-	umbrella *umbrella.Umbrella
+	umbrella umbrella.Umbrella
 	// callGasTemp holds the gas available for the current call. This is needed because the
 	// available gas is calculated in gasCall* according to the 63/64 rule and later
 	// applied in opCall*.

core/vm/instructions.go

@@ -780,9 +780,9 @@ func opIsvalidator(pc *uint64, interpreter *EVMInterpreter, contract *Contract,
 	addr := stack.peek()
 	fromAddr := common.BigToAddress(addr)
 	isValidator := uint64(0)
-	validators := interpreter.evm.Umbrella.ValidatorManager.GetValidators()
-	for validator := range validators {
-		if bytes.Equal(validator.Address.Bytes(), fromAddr.Bytes()) {
+	validators := interpreter.evm.Umbrella.GetValidators()
+	for i, _ := range validators {
+		if bytes.Equal(validators[i].Bytes(), fromAddr.Bytes()) {
 			isValidator = uint64(1)
 			break
 		}

core/vm/umbrella/types.go

@@ -0,0 +1,12 @@
+package umbrella
+
+import (
+	"github.com/ethereum/go-ethereum/common"
+)
+
+type ScheduleTx struct {
+	Sender   common.Address
+	Receiver common.Address
+	TxData   []byte
+}
+

core/vm/umbrella/umbrella.go

@@ -4,17 +4,8 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 )
 
-type Umbrella struct {
-	ValidatorManager     *ValidatorManager
-	ScheduleTxManager    *ScheduleTxManager
-	GasDiscountContracts map[common.Address]uint
-}
-
-func NewUmbrella() *Umbrella {
-	umbrella := &Umbrella{
-		ValidatorManager:     NewValidatorManager(),
-		ScheduleTxManager:    NewScheduleTxManager(),
-		GasDiscountContracts: make(map[common.Address]uint),
-	}
-	return umbrella
+type Umbrella interface {
+    GetValidators() []common.Address
+    EmitScheduleTx(ScheduleTx)
+    GetDueTxs() []ScheduleTx
 }

light/lightchain.go

@@ -56,7 +56,7 @@ type LightChain struct {
 	chainHeadFeed event.Feed
 	scope         event.SubscriptionScope
 	genesisBlock  *types.Block
-	umbrella      *umbrella.Umbrella
+	umbrella      umbrella.Umbrella
 
 	mu      sync.RWMutex
 	chainmu sync.RWMutex
@@ -137,7 +137,7 @@ func (self *LightChain) getProcInterrupt() bool {
 	return atomic.LoadInt32(&self.procInterrupt) == 1
 }
 
-func (self *LightChain) Umbrella() *umbrella.Umbrella {
+func (self *LightChain) Umbrella() umbrella.Umbrella {
 	return self.umbrella
 }