poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

merge with quorum upstream 

params: config.go and denomination.go merged with conflicts
This commit is contained in:
amalraj.manigmail.com 2019-03-18 11:43:03 +08:00
parent 849eca21da
commit b286409b7a
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/genesis_test.go
View File

@ -17,10 +17,10 @@
package core package core
import ( import (
"errors"
"math/big" "math/big"
"reflect" "reflect"
"testing" "testing"
"errors"
"github.com/davecgh/go-spew/spew" "github.com/davecgh/go-spew/spew"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"

2
core/tx_pool.go
View File

@ -583,7 +583,7 @@ func (pool *TxPool) validateTx(tx *types.Transaction, local bool) error {
return ErrInvalidGasPrice return ErrInvalidGasPrice
} }
// Reject transactions over 32KB (or manually set limit) to prevent DOS attacks // Reject transactions over 32KB (or manually set limit) to prevent DOS attacks
if float64(tx.Size()) > float64(sizeLimit * 1024) { if float64(tx.Size()) > float64(sizeLimit*1024) {
return ErrOversizedData return ErrOversizedData
} }
// Transactions can't be negative. This may never happen using RLP decoded // Transactions can't be negative. This may never happen using RLP decoded

2
internal/ethapi/api.go
View File

@ -863,7 +863,7 @@ func (s *PublicBlockChainAPI) EstimateGas(ctx context.Context, args CallArgs) (h
intrinsicGasPrivate, _ := core.IntrinsicGas(common.Hex2Bytes(maxPrivateIntrinsicDataHex), args.To == nil, isHomestead) intrinsicGasPrivate, _ := core.IntrinsicGas(common.Hex2Bytes(maxPrivateIntrinsicDataHex), args.To == nil, isHomestead)
if intrinsicGasPrivate > intrinsicGasPublic { if intrinsicGasPrivate > intrinsicGasPublic {
if math.MaxUint64 - hi < intrinsicGasPrivate - intrinsicGasPublic { if math.MaxUint64-hi < intrinsicGasPrivate-intrinsicGasPublic {
return 0, fmt.Errorf("private intrinsic gas addition exceeds allowance") return 0, fmt.Errorf("private intrinsic gas addition exceeds allowance")
} }
return hexutil.Uint64(hi + (intrinsicGasPrivate - intrinsicGasPublic)), nil return hexutil.Uint64(hi + (intrinsicGasPrivate - intrinsicGasPublic)), nil

2
params/config.go
View File

@ -17,10 +17,10 @@
package params package params
import ( import (
"errors"
"fmt" "fmt"
"math" "math"
"math/big" "math/big"
"errors"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
) )

1
params/denomination.go
View File

@ -25,4 +25,5 @@ const (
Wei = 1 Wei = 1
GWei = 1e9 GWei = 1e9
Ether = 1e18 Ether = 1e18
Shannon = 1e9
) )