Merge pull request ethereum#4 from bas-vk/zero-gasprice

cmd,eth enforce gas price of 0

Author: patrickmn

accounts/abi/bind/auth.go

@@ -22,6 +22,8 @@ import (
 	"io"
 	"io/ioutil"
 
+	"math/big"
+
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
@@ -58,5 +60,6 @@ func NewKeyedTransactor(key *ecdsa.PrivateKey) *TransactOpts {
 			}
 			return tx.WithSignature(signature)
 		},
+		GasPrice: new(big.Int),
 	}
 }

accounts/abi/bind/base.go

@@ -207,9 +207,9 @@ func (c *BoundContract) transact(opts *TransactOpts, contract *common.Address, i
 	// Create the transaction, sign it and schedule it for execution
 	var rawTx *types.Transaction
 	if contract == nil {
-		rawTx = types.NewContractCreation(nonce, value, gasLimit, gasPrice, input)
+		rawTx = types.NewContractCreation(nonce, value, gasLimit, nil, input)
 	} else {
-		rawTx = types.NewTransaction(nonce, c.address, value, gasLimit, gasPrice, input)
+		rawTx = types.NewTransaction(nonce, c.address, value, gasLimit, nil, input)
 	}
 	if opts.Signer == nil {
 		return nil, errors.New("no signer to authorize the transaction with")

accounts/abi/bind/util_test.go

@@ -59,7 +59,7 @@ func TestWaitDeployed(t *testing.T) {
 		})
 
 		// Create the transaction.
-		tx := types.NewContractCreation(0, big.NewInt(0), test.gas, big.NewInt(1), common.FromHex(test.code))
+		tx := types.NewContractCreation(0, big.NewInt(0), test.gas, big.NewInt(0), common.FromHex(test.code))
 		tx, _ = tx.SignECDSA(testKey)
 
 		// Wait for it to get mined in the background.

cmd/geth/main.go

@@ -116,7 +116,6 @@ participating.
 		utils.MaxPeersFlag,
 		utils.MaxPendingPeersFlag,
 		utils.EtherbaseFlag,
-		utils.GasPriceFlag,
 		utils.AutoDAGFlag,
 		utils.TargetGasLimitFlag,
 		utils.NATFlag,
@@ -149,12 +148,6 @@ participating.
 		utils.MetricsEnabledFlag,
 		utils.FakePoWFlag,
 		utils.SolcPathFlag,
-		utils.GpoMinGasPriceFlag,
-		utils.GpoMaxGasPriceFlag,
-		utils.GpoFullBlockRatioFlag,
-		utils.GpobaseStepDownFlag,
-		utils.GpobaseStepUpFlag,
-		utils.GpobaseCorrectionFactorFlag,
 		utils.ExtraDataFlag,
 		utils.VoteAccountFlag,
 		utils.VoteAccountPasswordFlag,

cmd/geth/usage.go

@@ -134,17 +134,6 @@ var AppHelpFlagGroups = []flagGroup{
 			utils.NodeKeyHexFlag,
 		},
 	},
-	{
-		Name: "GAS PRICE ORACLE",
-		Flags: []cli.Flag{
-			utils.GpoMinGasPriceFlag,
-			utils.GpoMaxGasPriceFlag,
-			utils.GpoFullBlockRatioFlag,
-			utils.GpobaseStepDownFlag,
-			utils.GpobaseStepUpFlag,
-			utils.GpobaseCorrectionFactorFlag,
-		},
-	},
 	{
 		Name: "VIRTUAL MACHINE",
 		Flags: []cli.Flag{

cmd/utils/flags.go

@@ -169,11 +169,6 @@ var (
 		Usage: "Public address for block mining rewards (default = first account created)",
 		Value: "0",
 	}
-	GasPriceFlag = cli.StringFlag{
-		Name:  "gasprice",
-		Usage: "Minimal gas price to accept for mining a transactions",
-		Value: common.Big0.String(),
-	}
 	ExtraDataFlag = cli.StringFlag{
 		Name:  "extradata",
 		Usage: "Block extra data set by the miner (default = client version)",
@@ -339,38 +334,6 @@ var (
 		Usage: "Solidity compiler command to be used",
 		Value: "solc",
 	}
-
-	// Gas price oracle settings
-	GpoMinGasPriceFlag = cli.StringFlag{
-		Name:  "gpomin",
-		Usage: "Minimum suggested gas price",
-		Value: new(big.Int).Mul(big.NewInt(20), common.Shannon).String(),
-	}
-	GpoMaxGasPriceFlag = cli.StringFlag{
-		Name:  "gpomax",
-		Usage: "Maximum suggested gas price",
-		Value: new(big.Int).Mul(big.NewInt(500), common.Shannon).String(),
-	}
-	GpoFullBlockRatioFlag = cli.IntFlag{
-		Name:  "gpofull",
-		Usage: "Full block threshold for gas price calculation (%)",
-		Value: 80,
-	}
-	GpobaseStepDownFlag = cli.IntFlag{
-		Name:  "gpobasedown",
-		Usage: "Suggested gas price base step down ratio (1/1000)",
-		Value: 10,
-	}
-	GpobaseStepUpFlag = cli.IntFlag{
-		Name:  "gpobaseup",
-		Usage: "Suggested gas price base step up ratio (1/1000)",
-		Value: 100,
-	}
-	GpobaseCorrectionFactorFlag = cli.IntFlag{
-		Name:  "gpobasecf",
-		Usage: "Suggested gas price base correction factor (%)",
-		Value: 110,
-	}
 	// Quorum flags
 	VoteAccountFlag = cli.StringFlag{
 		Name:  "voteaccount",
@@ -688,27 +651,20 @@ func RegisterEthService(ctx *cli.Context, stack *node.Node, extra []byte) {
 	}
 
 	ethConf := &eth.Config{
-		Etherbase:               MakeEtherbase(stack.AccountManager(), ctx),
-		ChainConfig:             MakeChainConfig(ctx, stack),
-		SingleBlockMaker:        ctx.GlobalBool(SingleBlockMakerFlag.Name),
-		DatabaseCache:           ctx.GlobalInt(CacheFlag.Name),
-		DatabaseHandles:         MakeDatabaseHandles(),
-		NetworkId:               ctx.GlobalInt(NetworkIdFlag.Name),
-		ExtraData:               MakeMinerExtra(extra, ctx),
-		NatSpec:                 ctx.GlobalBool(NatspecEnabledFlag.Name),
-		DocRoot:                 ctx.GlobalString(DocRootFlag.Name),
-		EnableJit:               jitEnabled,
-		ForceJit:                ctx.GlobalBool(VMForceJitFlag.Name),
-		GasPrice:                common.String2Big(ctx.GlobalString(GasPriceFlag.Name)),
-		GpoMinGasPrice:          common.String2Big(ctx.GlobalString(GpoMinGasPriceFlag.Name)),
-		GpoMaxGasPrice:          common.String2Big(ctx.GlobalString(GpoMaxGasPriceFlag.Name)),
-		GpoFullBlockRatio:       ctx.GlobalInt(GpoFullBlockRatioFlag.Name),
-		GpobaseStepDown:         ctx.GlobalInt(GpobaseStepDownFlag.Name),
-		GpobaseStepUp:           ctx.GlobalInt(GpobaseStepUpFlag.Name),
-		GpobaseCorrectionFactor: ctx.GlobalInt(GpobaseCorrectionFactorFlag.Name),
-		SolcPath:                ctx.GlobalString(SolcPathFlag.Name),
-		VoteMinBlockTime:        uint(ctx.GlobalInt(VoteMinBlockTimeFlag.Name)),
-		VoteMaxBlockTime:        uint(ctx.GlobalInt(VoteMaxBlockTimeFlag.Name)),
+		Etherbase:        MakeEtherbase(stack.AccountManager(), ctx),
+		ChainConfig:      MakeChainConfig(ctx, stack),
+		SingleBlockMaker: ctx.GlobalBool(SingleBlockMakerFlag.Name),
+		DatabaseCache:    ctx.GlobalInt(CacheFlag.Name),
+		DatabaseHandles:  MakeDatabaseHandles(),
+		NetworkId:        ctx.GlobalInt(NetworkIdFlag.Name),
+		ExtraData:        MakeMinerExtra(extra, ctx),
+		NatSpec:          ctx.GlobalBool(NatspecEnabledFlag.Name),
+		DocRoot:          ctx.GlobalString(DocRootFlag.Name),
+		EnableJit:        jitEnabled,
+		ForceJit:         ctx.GlobalBool(VMForceJitFlag.Name),
+		SolcPath:         ctx.GlobalString(SolcPathFlag.Name),
+		VoteMinBlockTime: uint(ctx.GlobalInt(VoteMinBlockTimeFlag.Name)),
+		VoteMaxBlockTime: uint(ctx.GlobalInt(VoteMaxBlockTimeFlag.Name)),
 	}
 
 	// Override any default configs in dev mode or the test net
@@ -728,9 +684,6 @@ func RegisterEthService(ctx *cli.Context, stack *node.Node, extra []byte) {
 
 	case ctx.GlobalBool(DevModeFlag.Name):
 		ethConf.Genesis = core.OlympicGenesisBlock()
-		if !ctx.GlobalIsSet(GasPriceFlag.Name) {
-			ethConf.GasPrice = new(big.Int)
-		}
 		ethConf.PowTest = true
 	}
 	// Override any global options pertaining to the Ethereum protocol

common/registrar/ethreg/api.go

@@ -223,7 +223,6 @@ func (be *registryAPIBackend) Transact(fromStr, toStr, nonceStr, valueStr, gasSt
 		to               = common.HexToAddress(toStr)
 		value            = common.Big(valueStr)
 		gas              *big.Int
-		price            *big.Int
 		data             []byte
 		contractCreation bool
 	)
@@ -234,12 +233,6 @@ func (be *registryAPIBackend) Transact(fromStr, toStr, nonceStr, valueStr, gasSt
 		gas = common.Big(gasStr)
 	}
 
-	if len(gasPriceStr) == 0 {
-		price = big.NewInt(10000000000000)
-	} else {
-		price = common.Big(gasPriceStr)
-	}
-
 	data = common.FromHex(codeStr)
 	if len(toStr) == 0 {
 		contractCreation = true
@@ -252,9 +245,9 @@ func (be *registryAPIBackend) Transact(fromStr, toStr, nonceStr, valueStr, gasSt
 
 	var tx *types.Transaction
 	if contractCreation {
-		tx = types.NewContractCreation(nonce, value, gas, price, data)
+		tx = types.NewContractCreation(nonce, value, gas, nil, data)
 	} else {
-		tx = types.NewTransaction(nonce, to, value, gas, price, data)
+		tx = types.NewTransaction(nonce, to, value, gas, nil, data)
 	}
 
 	signature, err := be.am.SignEthereum(from, tx.SigHash().Bytes())

core/quorum/block_maker.go

@@ -3,8 +3,6 @@ package quorum
 import (
 	"time"
 
-	"math/big"
-
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/state"
@@ -64,7 +62,6 @@ func (ps *pendingState) applyTransactions(txs *types.TransactionsByPriorityAndNo
 	var (
 		lowGasTxs types.Transactions
 		failedTxs types.Transactions
-		gasPrice  = new(big.Int).Mul(big.NewInt(20), common.Shannon)
 	)
 
 	var coalescedLogs vm.Logs
@@ -78,14 +75,6 @@ func (ps *pendingState) applyTransactions(txs *types.TransactionsByPriorityAndNo
 		// during transaction acceptance is the transaction pool.
 		from, _ := tx.From()
 
-		// Ignore any transactions (and accounts subsequently) with low gas limits
-		if tx.GasPrice().Cmp(gasPrice) < 0 && !ps.ownedAccounts.Has(from) {
-			// Pop the current low-priced transaction without shifting in the next from the account
-			glog.V(logger.Info).Infof("Transaction (%x) below gas price (tx=%v ask=%v). All sequential txs from this address(%x) will be ignored\n", tx.Hash().Bytes()[:4], common.CurrencyToString(tx.GasPrice()), common.CurrencyToString(gasPrice), from[:4])
-			lowGasTxs = append(lowGasTxs, tx)
-			txs.Pop()
-			continue
-		}
 		// Start executing the transaction
 		ps.state.StartRecord(tx.Hash(), common.Hash{}, 0)
 

core/quorum/block_voting.go

@@ -85,14 +85,13 @@ type CreateBlock struct {
 // Note, don't forget to call Start.
 func NewBlockVoting(bc *core.BlockChain, chainConfig *core.ChainConfig, txpool *core.TxPool, mux *event.TypeMux, db ethdb.Database, accountMgr *accounts.Manager, isSynchronised bool) *BlockVoting {
 	bv := &BlockVoting{
-		bc:       bc,
-		cc:       chainConfig,
-		txpool:   txpool,
-		mux:      mux,
-		db:       db,
-		am:       accountMgr,
-		synced:   isSynchronised,
-		gasPrice: new(big.Int).Mul(big.NewInt(10), common.Shannon),
+		bc:     bc,
+		cc:     chainConfig,
+		txpool: txpool,
+		mux:    mux,
+		db:     db,
+		am:     accountMgr,
+		synced: isSynchronised,
 	}
 
 	return bv

core/state_processor.go

@@ -19,6 +19,7 @@ package core
 import (
 	"math/big"
 
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/core/vm"
@@ -87,6 +88,11 @@ func ApplyTransaction(config *ChainConfig, bc *BlockChain, gp *GasPool, publicSt
 	if !tx.IsPrivate() {
 		privateState = publicState
 	}
+
+	if tx.GasPrice() != nil && tx.GasPrice().Cmp(common.Big0) > 0 {
+		return nil, nil, nil, ErrInvalidGasPrice
+	}
+
 	_, gas, err := ApplyMessage(NewEnv(publicState, privateState, config, bc, tx, header, cfg), tx, gp)
 	if err != nil {
 		return nil, nil, nil, err

core/tx_list_test.go

@@ -33,7 +33,7 @@ func TestStrictTxListAdd(t *testing.T) {
 
 	txs := make(types.Transactions, 1024)
 	for i := 0; i < len(txs); i++ {
-		txs[i] = transaction(uint64(i), new(big.Int), key)
+		txs[i] = transaction(uint64(i), new(big.Int), new(big.Int), key)
 	}
 	// Insert the transactions in a random order
 	list := newTxList(true)

core/tx_pool.go

@@ -37,13 +37,12 @@ var (
 	// Transaction Pool Errors
 	ErrInvalidSender      = errors.New("Invalid sender")
 	ErrNonce              = errors.New("Nonce too low")
-	ErrCheap              = errors.New("Gas price too low for acceptance")
-	ErrBalance            = errors.New("Insufficient balance")
-	ErrNonExistentAccount = errors.New("Account does not exist or account balance too low")
+	ErrInvalidGasPrice    = errors.New("Gas price not 0")
 	ErrInsufficientFunds  = errors.New("Insufficient funds for gas * price + value")
 	ErrIntrinsicGas       = errors.New("Intrinsic gas too low")
 	ErrGasLimit           = errors.New("Exceeds block gas limit")
 	ErrNegativeValue      = errors.New("Negative value")
+	ErrNonExistentAccount = errors.New("Account doesn't exist")
 )
 
 var (
@@ -69,7 +68,6 @@ type TxPool struct {
 	currentState stateFn // The state function which will allow us to do some pre checks
 	pendingState *state.ManagedState
 	gasLimit     func() *big.Int // The current gas limit function callback
-	minGasPrice  *big.Int
 	eventMux     *event.TypeMux
 	events       event.Subscription
 	localTx      *txSet
@@ -96,10 +94,9 @@ func NewTxPool(config *ChainConfig, eventMux *event.TypeMux, currentStateFn stat
 		eventMux:     eventMux,
 		currentState: currentStateFn,
 		gasLimit:     gasLimitFn,
-		minGasPrice:  new(big.Int),
 		pendingState: nil,
 		localTx:      newTxSet(),
-		events:       eventMux.Subscribe(ChainHeadEvent{}, GasPriceChanged{}, RemovedTransactionEvent{}),
+		events:       eventMux.Subscribe(ChainHeadEvent{}, RemovedTransactionEvent{}),
 		quit:         make(chan struct{}),
 	}
 
@@ -126,10 +123,6 @@ func (pool *TxPool) eventLoop() {
 
 			pool.resetState()
 			pool.mu.Unlock()
-		case GasPriceChanged:
-			pool.mu.Lock()
-			pool.minGasPrice = ev.Price
-			pool.mu.Unlock()
 		case RemovedTransactionEvent:
 			pool.AddBatch(ev.Txs)
 		}
@@ -151,8 +144,7 @@ func (pool *TxPool) resetState() {
 
 	// validate the pool of pending transactions, this will remove
 	// any transactions that have been included in the block or
-	// have been invalidated because of another transaction (e.g.
-	// higher gas price)
+	// have been invalidated because of another transaction.
 	pool.demoteUnexecutables()
 
 	// Update all accounts to the latest known pending nonce
@@ -231,8 +223,7 @@ func (pool *TxPool) Pending() map[common.Address]types.Transactions {
 	return pending
 }
 
-// SetLocal marks a transaction as local, skipping gas price
-//  check against local miner minimum in the future
+// SetLocal marks a transaction as local.
 func (pool *TxPool) SetLocal(tx *types.Transaction) {
 	pool.mu.Lock()
 	defer pool.mu.Unlock()
@@ -242,10 +233,10 @@ func (pool *TxPool) SetLocal(tx *types.Transaction) {
 // validateTx checks whether a transaction is valid according
 // to the consensus rules.
 func (pool *TxPool) validateTx(tx *types.Transaction) error {
-	local := pool.localTx.contains(tx.Hash())
-	// Drop transactions under our own minimal accepted gas price
-	if !local && pool.minGasPrice.Cmp(tx.GasPrice()) > 0 {
-		return ErrCheap
+	// due to dual state balances of private accounts cannot be determined.
+	// only accept transactions with a gas price of 0
+	if tx.GasPrice().Cmp(common.Big0) != 0 {
+		return ErrInvalidGasPrice
 	}
 
 	currentState, _, err := pool.currentState()