Merge pull request #41 from ironbeer/fix-validator-schedule

Extend block difficulty

consensus/consensus.go

@@ -47,6 +47,9 @@ type ChainHeaderReader interface {
 
 	// GetTd retrieves the total difficulty from the database by hash and number.
 	GetTd(hash common.Hash, number uint64) *big.Int
+
+	// GetCanonicalHash returns the canonical hash for a given block number
+	GetCanonicalHash(number uint64) common.Hash
 }
 
 // ChainReader defines a small collection of methods needed to access the local

consensus/oasys/contract.go

@@ -278,7 +278,8 @@ func (c *Oasys) IsSystemTransaction(tx *types.Transaction, header *types.Header)
 			return false, nil
 		} else if _, ok := methods[called.RawName]; ok {
 			log.Info("System method transacted",
-				"validator", header.Coinbase.Hex(), "tx", tx.Hash().Hex(),
+				"number", header.Number, "hash", header.Hash().Hex(),
+				"tx", tx.Hash().Hex(), "validator", header.Coinbase.Hex(),
 				"contract", contract.address.Hex(), "method", called.RawName)
 			return true, nil
 		}
@@ -332,7 +333,7 @@ func (c *Oasys) initializeSystemContracts(
 // Transact the `StakeManager.slash` method.
 func (c *Oasys) slash(
 	validator common.Address,
-	schedule map[uint64]common.Address,
+	schedules []*common.Address,
 	state *state.StateDB,
 	header *types.Header,
 	cx core.ChainContext,
@@ -343,8 +344,8 @@ func (c *Oasys) slash(
 	mining bool,
 ) error {
 	blocks := int64(0)
-	for _, address := range schedule {
-		if address == validator {
+	for _, address := range schedules {
+		if *address == validator {
 			blocks++
 		}
 	}

consensus/oasys/contract_test.go

@@ -107,7 +107,7 @@ func TestSlash(t *testing.T) {
 	}
 
 	validator := accounts[0].Address
-	schedule := map[uint64]common.Address{}
+	schedule := []*common.Address{}
 	header := &types.Header{
 		Number:     big.NewInt(50),
 		Coinbase:   accounts[0].Address,