Merge branch 'master' into go-1.15.5-recompile

Author: vsmk98

cmd/geth/config.go

@@ -166,7 +166,7 @@ func makeFullNode(ctx *cli.Context) *node.Node {
 	}
 
 	if cfg.Node.IsPermissionEnabled() {
-		utils.RegisterPermissionService(stack)
+		utils.RegisterPermissionService(stack, ctx.Bool(utils.RaftDNSEnabledFlag.Name))
 	}
 
 	if ctx.GlobalBool(utils.RaftModeFlag.Name) {

cmd/geth/main.go

@@ -462,13 +462,16 @@ func startNode(ctx *cli.Context, stack *node.Node) {
 	// Quorum
 	//
 	// checking if permissions is enabled and staring the permissions service
-	if stack.IsPermissionEnabled() {
-		var permissionService *permission.PermissionCtrl
-		if err := stack.Service(&permissionService); err != nil {
-			utils.Fatalf("Permission service not runnning: %v", err)
-		}
-		if err := permissionService.AfterStart(); err != nil {
-			utils.Fatalf("Permission service post construct failure: %v", err)
+	if stack.Config().EnableNodePermission {
+		stack.Server().SetIsNodePermissioned(permission.IsNodePermissioned)
+		if stack.IsPermissionEnabled() {
+			var permissionService *permission.PermissionCtrl
+			if err := stack.Service(&permissionService); err != nil {
+				utils.Fatalf("Permission service not runnning: %v", err)
+			}
+			if err := permissionService.AfterStart(); err != nil {
+				utils.Fatalf("Permission service post construct failure: %v", err)
+			}
 		}
 	}
 

cmd/utils/flags.go

@@ -68,6 +68,7 @@ import (
 	"github.com/ethereum/go-ethereum/p2p/netutil"
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/permission"
+	"github.com/ethereum/go-ethereum/permission/core/types"
 	"github.com/ethereum/go-ethereum/plugin"
 	"github.com/ethereum/go-ethereum/private"
 	"github.com/ethereum/go-ethereum/raft"
@@ -1833,14 +1834,14 @@ func RegisterPluginService(stack *node.Node, cfg *node.Config, skipVerify bool,
 }
 
 // Configure smart-contract-based permissioning service
-func RegisterPermissionService(stack *node.Node) {
+func RegisterPermissionService(stack *node.Node, useDns bool) {
 	if err := stack.Register(func(sctx *node.ServiceContext) (node.Service, error) {
-		permissionConfig, err := permission.ParsePermissionConfig(stack.DataDir())
+		permissionConfig, err := types.ParsePermissionConfig(stack.DataDir())
 		if err != nil {
 			return nil, fmt.Errorf("loading of %s failed due to %v", params.PERMISSION_MODEL_CONFIG, err)
 		}
 		// start the permissions management service
-		pc, err := permission.NewQuorumPermissionCtrl(stack, &permissionConfig)
+		pc, err := permission.NewQuorumPermissionCtrl(stack, &permissionConfig, useDns)
 		if err != nil {
 			return nil, fmt.Errorf("failed to load the permission contracts as given in %s due to %v", params.PERMISSION_MODEL_CONFIG, err)
 		}
@@ -1898,6 +1899,7 @@ func RegisterRaftService(stack *node.Node, ctx *cli.Context, nodeCfg *node.Confi
 	}); err != nil {
 		Fatalf("Failed to register the Raft service: %v", err)
 	}
+	log.Info("raft service registered")
 }
 
 func RegisterExtensionService(stack *node.Node, ethChan chan *eth.Ethereum) {

core/forkid/forkid.go

@@ -224,6 +224,11 @@ func gatherForks(config *params.ChainConfig) []uint64 {
 		if field.Type != reflect.TypeOf(new(big.Int)) {
 			continue
 		}
+
+		// ignoring QIP714Block from fork check
+		if field.Name == "QIP714Block" {
+			continue
+		}
 		// Extract the fork rule block number and aggregate it
 		rule := conf.Field(i).Interface().(*big.Int)
 		if rule != nil {

core/state_processor.go

@@ -25,6 +25,7 @@ import (
 	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/params"
+	"github.com/ethereum/go-ethereum/permission/core"
 )
 
 // StateProcessor is a basic Processor, which takes care of transitioning
@@ -114,6 +115,13 @@ func ApplyTransaction(config *params.ChainConfig, bc *BlockChain, author *common
 	privateStateDbToUse := PrivateStateDBForTxn(config.IsQuorum, tx.IsPrivate(), statedb, privateState)
 	// /Quorum
 
+	// Quorum - check for account permissions to execute the transaction
+	if core.IsV2Permission() {
+		if err := core.CheckAccountPermission(tx.From(), tx.To(), tx.Value(), tx.Data(), tx.Gas(), tx.GasPrice()); err != nil {
+			return nil, nil, err
+		}
+	}
+
 	if config.IsQuorum && tx.GasPrice() != nil && tx.GasPrice().Cmp(common.Big0) > 0 {
 		return nil, nil, ErrInvalidGasPrice
 	}

core/tx_pool.go

@@ -33,6 +33,7 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/metrics"
 	"github.com/ethereum/go-ethereum/params"
+	pcore "github.com/ethereum/go-ethereum/permission/core"
 )
 
 const (
@@ -153,7 +154,6 @@ type TxPoolConfig struct {
 	// Quorum
 	TransactionSizeLimit uint64 // Maximum size allowed for valid transaction (in KB)
 	MaxCodeSize          uint64 // Maximum size allowed of contract code that can be deployed (in KB)
-
 }
 
 // DefaultTxPoolConfig contains the default configurations for the transaction
@@ -560,8 +560,8 @@ func (pool *TxPool) validateTx(tx *types.Transaction, local bool) error {
 		if tx.IsPrivate() && (len(tx.Data()) == 0 || tx.Value().Sign() != 0) {
 			return ErrEtherValueUnsupported
 		}
-		// Check if the sender account is authorized to perform the transaction
-		if err := checkAccount(from, tx.To()); err != nil {
+		// Quorum - check if the sender account is authorized to perform the transaction
+		if err := pcore.CheckAccountPermission(tx.From(), tx.To(), tx.Value(), tx.Data(), tx.Gas(), tx.GasPrice()); err != nil {
 			return err
 		}
 	} else {
@@ -1595,26 +1595,6 @@ func (t *txLookup) Remove(hash common.Hash) {
 	delete(t.all, hash)
 }
 
-// checks if the account is has the necessary access for the transaction
-func checkAccount(fromAcct common.Address, toAcct *common.Address) error {
-	access := types.GetAcctAccess(fromAcct)
-
-	switch access {
-	case types.ReadOnly:
-		return errors.New("read only account. cannot transact")
-
-	case types.Transact:
-		if toAcct == nil {
-			return errors.New("account does not have contract create permissions")
-		}
-
-	case types.FullAccess, types.ContractDeploy:
-		return nil
-
-	}
-	return nil
-}
-
 // helper function to return chainHeadChannel size
 func GetChainHeadChannleSize() int {
 	return chainHeadChanSize

core/types/transaction.go

@@ -19,12 +19,11 @@ package types
 import (
 	"container/heap"
 	"errors"
+	"fmt"
 	"io"
 	"math/big"
 	"sync/atomic"
 
-	fmt "fmt"
-
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/crypto"

eth/api_backend.go

@@ -37,6 +37,7 @@ import (
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/event"
 	"github.com/ethereum/go-ethereum/params"
+	pcore "github.com/ethereum/go-ethereum/permission/core"
 	"github.com/ethereum/go-ethereum/rpc"
 )
 
@@ -261,7 +262,7 @@ func (b *EthAPIBackend) SubscribeLogsEvent(ch chan<- []*types.Log) event.Subscri
 func (b *EthAPIBackend) SendTx(ctx context.Context, signedTx *types.Transaction) error {
 	// validation for node need to happen here and cannot be done as a part of
 	// validateTx in tx_pool.go as tx_pool validation will happen in every node
-	if b.hexNodeId != "" && !types.ValidateNodeForTxn(b.hexNodeId, signedTx.From()) {
+	if b.hexNodeId != "" && !pcore.ValidateNodeForTxn(b.hexNodeId, signedTx.From()) {
 		return errors.New("cannot send transaction from this node")
 	}
 	return b.eth.txPool.AddLocal(signedTx)

eth/downloader/downloader.go

@@ -34,6 +34,7 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/metrics"
 	"github.com/ethereum/go-ethereum/params"
+	"github.com/ethereum/go-ethereum/permission/core"
 	"github.com/ethereum/go-ethereum/trie"
 )
 
@@ -362,7 +363,7 @@ func (d *Downloader) synchronise(id string, hash common.Hash, td *big.Int, mode
 
 	// Quorum
 	// changes for permissions. added set sync status to indicate permissions that node sync has started
-	types.SetSyncStatus()
+	core.SetSyncStatus()
 
 	defer atomic.StoreInt32(&d.synchronising, 0)
 

eth/sync.go

@@ -26,6 +26,7 @@ import (
 	"github.com/ethereum/go-ethereum/eth/downloader"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/p2p/enode"
+	"github.com/ethereum/go-ethereum/permission/core"
 )
 
 const (
@@ -179,7 +180,7 @@ func (pm *ProtocolManager) synchronise(peer *peer) {
 		// Quorum
 		// added for permissions changes to indicate node sync up has started
 		// if peer's TD is smaller than ours, no sync will happen
-		types.SetSyncStatus()
+		core.SetSyncStatus()
 		return
 	}
 	// Otherwise try to sync with the downloader