diff options
| -rw-r--r-- | eth/api_backend.go | 28 | ||||
| -rw-r--r-- | eth/gasprice/gasprice.go | 72 | ||||
| -rw-r--r-- | notes/copied-list.txt (renamed from copied-list.txt) | 0 | ||||
| -rw-r--r-- | notes/hacked-list.txt (renamed from hacked-list.txt) | 0 | ||||
| -rw-r--r-- | params/protocol_params.go | 4 | ||||
| -rw-r--r-- | plugin/evm/block.go | 3 | ||||
| -rw-r--r-- | plugin/evm/vm.go | 10 |
7 files changed, 26 insertions, 91 deletions
diff --git a/eth/api_backend.go b/eth/api_backend.go index bbc8691..6c5ebd8 100644 --- a/eth/api_backend.go +++ b/eth/api_backend.go @@ -65,10 +65,12 @@ func (b *EthAPIBackend) SetHead(number uint64) { } func (b *EthAPIBackend) HeaderByNumber(ctx context.Context, number rpc.BlockNumber) (*types.Header, error) { - // Pending block is only known by the miner + // Pending block is only known by the miner in + // Ethereum, but Coreth does not have the same notion. + // So we treat requests for the pending block identically + // to the latest accepted block instead if number == rpc.PendingBlockNumber { - block := b.eth.miner.PendingBlock() - return block.Header(), nil + return b.eth.AcceptedBlock().Header(), nil } // Otherwise resolve and return the block if number == rpc.LatestBlockNumber { @@ -102,10 +104,12 @@ func (b *EthAPIBackend) HeaderByHash(ctx context.Context, hash common.Hash) (*ty } func (b *EthAPIBackend) BlockByNumber(ctx context.Context, number rpc.BlockNumber) (*types.Block, error) { - // Pending block is only known by the miner + // Pending block is only known by the miner in + // Ethereum, but Coreth does not have the same notion. + // So we treat requests for the pending block identically + // to the latest accepted block instead if number == rpc.PendingBlockNumber { - block := b.eth.miner.PendingBlock() - return block, nil + return b.eth.AcceptedBlock(), nil } // Otherwise resolve and return the block if number == rpc.LatestBlockNumber { @@ -143,12 +147,12 @@ func (b *EthAPIBackend) BlockByNumberOrHash(ctx context.Context, blockNrOrHash r } func (b *EthAPIBackend) StateAndHeaderByNumber(ctx context.Context, number rpc.BlockNumber) (*state.StateDB, *types.Header, error) { - // Pending state is only known by the miner - if number == rpc.PendingBlockNumber { - block, state := b.eth.miner.Pending() - return state, block.Header(), nil - } - // Otherwise resolve the block number and return its state + // Note: Ethereum typically first checks if the request is for + // the pending block (by rpc.PendingBlockNumber), but Coreth + // does not have the same notion of the miner having a pending + // block, so this is skipped here + + // Request the block by its number and retrieve its state header, err := b.HeaderByNumber(ctx, number) if err != nil { return nil, nil, err diff --git a/eth/gasprice/gasprice.go b/eth/gasprice/gasprice.go index 14f50b1..14476ab 100644 --- a/eth/gasprice/gasprice.go +++ b/eth/gasprice/gasprice.go @@ -95,77 +95,7 @@ func NewOracle(backend OracleBackend, params Config) *Oracle { // SuggestPrice returns a gasprice so that newly created transaction can // have a very high chance to be included in the following blocks. func (gpo *Oracle) SuggestPrice(ctx context.Context) (*big.Int, error) { - head, _ := gpo.backend.HeaderByNumber(ctx, rpc.LatestBlockNumber) - headHash := head.Hash() - - // If the latest gasprice is still available, return it. - gpo.cacheLock.RLock() - lastHead, lastPrice := gpo.lastHead, gpo.lastPrice - gpo.cacheLock.RUnlock() - if headHash == lastHead { - return lastPrice, nil - } - gpo.fetchLock.Lock() - defer gpo.fetchLock.Unlock() - - // Try checking the cache again, maybe the last fetch fetched what we need - gpo.cacheLock.RLock() - lastHead, lastPrice = gpo.lastHead, gpo.lastPrice - gpo.cacheLock.RUnlock() - if headHash == lastHead { - return lastPrice, nil - } - var ( - sent, exp int - number = head.Number.Uint64() - result = make(chan getBlockPricesResult, gpo.checkBlocks) - quit = make(chan struct{}) - txPrices []*big.Int - ) - for sent < gpo.checkBlocks && number > 0 { - go gpo.getBlockPrices(ctx, types.MakeSigner(gpo.backend.ChainConfig(), big.NewInt(int64(number))), number, sampleNumber, result, quit) - sent++ - exp++ - number-- - } - for exp > 0 { - res := <-result - if res.err != nil { - close(quit) - return lastPrice, res.err - } - exp-- - // Nothing returned. There are two special cases here: - // - The block is empty - // - All the transactions included are sent by the miner itself. - // In these cases, use the latest calculated price for samping. - if len(res.prices) == 0 { - res.prices = []*big.Int{lastPrice} - } - // Besides, in order to collect enough data for sampling, if nothing - // meaningful returned, try to query more blocks. But the maximum - // is 2*checkBlocks. - if len(res.prices) == 1 && len(txPrices)+1+exp < gpo.checkBlocks*2 && number > 0 { - go gpo.getBlockPrices(ctx, types.MakeSigner(gpo.backend.ChainConfig(), big.NewInt(int64(number))), number, sampleNumber, result, quit) - sent++ - exp++ - number-- - } - txPrices = append(txPrices, res.prices...) - } - price := lastPrice - if len(txPrices) > 0 { - sort.Sort(bigIntArray(txPrices)) - price = txPrices[(len(txPrices)-1)*gpo.percentile/100] - } - if price.Cmp(gpo.maxPrice) > 0 { - price = new(big.Int).Set(gpo.maxPrice) - } - gpo.cacheLock.Lock() - gpo.lastHead = headHash - gpo.lastPrice = price - gpo.cacheLock.Unlock() - return price, nil + return params.MinGasPrice, nil } type getBlockPricesResult struct { diff --git a/copied-list.txt b/notes/copied-list.txt index 94353ff..94353ff 100644 --- a/copied-list.txt +++ b/notes/copied-list.txt diff --git a/hacked-list.txt b/notes/hacked-list.txt index 3182b56..3182b56 100644 --- a/hacked-list.txt +++ b/notes/hacked-list.txt diff --git a/params/protocol_params.go b/params/protocol_params.go index cbd036b..3536c83 100644 --- a/params/protocol_params.go +++ b/params/protocol_params.go @@ -150,4 +150,8 @@ var ( GenesisDifficulty = big.NewInt(131072) // Difficulty of the Genesis block. MinimumDifficulty = big.NewInt(131072) // The minimum that the difficulty may ever be. DurationLimit = big.NewInt(13) // The decision boundary on the blocktime duration used to determine whether difficulty should go up or not. + + // MinGasPrice is the number of nAVAX required per gas unit for a transaction + // to be valid, measured in wei + MinGasPrice = big.NewInt(470 * GWei) ) diff --git a/plugin/evm/block.go b/plugin/evm/block.go index 1e1d710..ee5b7c6 100644 --- a/plugin/evm/block.go +++ b/plugin/evm/block.go @@ -8,6 +8,7 @@ import ( "fmt" "github.com/ava-labs/coreth/core/types" + "github.com/ava-labs/coreth/params" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/rlp" @@ -80,7 +81,7 @@ func (b *Block) Verify() error { if b.vm.ctx.IsBootstrapped() { // Ensure the minimum gas price is paid for every transaction for _, tx := range b.ethBlock.Transactions() { - if tx.GasPrice().Cmp(minGasPrice) < 0 { + if tx.GasPrice().Cmp(params.MinGasPrice) < 0 { return errInvalidBlock } } diff --git a/plugin/evm/vm.go b/plugin/evm/vm.go index 13d4d3f..2c6dc1a 100644 --- a/plugin/evm/vm.go +++ b/plugin/evm/vm.go @@ -87,10 +87,6 @@ const ( ) var ( - // minGasPrice is the number of nAVAX required per gas unit for a transaction - // to be valid, measured in wei - minGasPrice = big.NewInt(470 * params.GWei) - txFee = units.MilliAvax errEmptyBlock = errors.New("empty block") @@ -258,10 +254,10 @@ func (vm *VM) Initialize( // Set minimum price for mining and default gas price oracle value to the min // gas price to prevent so transactions and blocks all use the correct fees - config.Miner.GasPrice = minGasPrice + config.Miner.GasPrice = params.MinGasPrice config.RPCTxFeeCap = 100 // 100 AVAX - config.GPO.Default = minGasPrice - config.TxPool.PriceLimit = minGasPrice.Uint64() + config.GPO.Default = params.MinGasPrice + config.TxPool.PriceLimit = params.MinGasPrice.Uint64() config.TxPool.NoLocals = true if err := config.SetGCMode("archive"); err != nil { |