diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2019-04-08 21:16:05 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-08 21:16:05 +0800 |
| commit | 4e13a09c5033b4cf073db6aeaaa7d159dcf07f30 (patch) | |
| tree | 0f64daac335200ce6fd45d6ee9f62dabc0fb1887 /eth | |
| parent | c942700427557e3ff6de3aaf6b916e2f056c1ec2 (diff) | |
| parent | 009d2fe2d650b1a92e28f0decbf5f7fa628779e9 (diff) | |
| download | dexon-4e13a09c5033b4cf073db6aeaaa7d159dcf07f30.tar dexon-4e13a09c5033b4cf073db6aeaaa7d159dcf07f30.tar.gz dexon-4e13a09c5033b4cf073db6aeaaa7d159dcf07f30.tar.bz2 dexon-4e13a09c5033b4cf073db6aeaaa7d159dcf07f30.tar.lz dexon-4e13a09c5033b4cf073db6aeaaa7d159dcf07f30.tar.xz dexon-4e13a09c5033b4cf073db6aeaaa7d159dcf07f30.tar.zst dexon-4e13a09c5033b4cf073db6aeaaa7d159dcf07f30.zip | |
Merge pull request #19370 from karalabe/geth-1.8.24
Backport PR for the v1.8.24 maintenance release
Diffstat (limited to 'eth')
| -rw-r--r-- | eth/api_backend.go | 4 | ||||
| -rw-r--r-- | eth/config.go | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/eth/api_backend.go b/eth/api_backend.go index a48815e0d..3efc09cc1 100644 --- a/eth/api_backend.go +++ b/eth/api_backend.go @@ -213,6 +213,10 @@ func (b *EthAPIBackend) AccountManager() *accounts.Manager { return b.eth.AccountManager() } +func (b *EthAPIBackend) RPCGasCap() *big.Int { + return b.eth.config.RPCGasCap +} + func (b *EthAPIBackend) BloomStatus() (uint64, uint64) { sections, _, _ := b.eth.bloomIndexer.Sections() return params.BloomBitsBlocks, sections diff --git a/eth/config.go b/eth/config.go index 7c041d1af..5b9db2502 100644 --- a/eth/config.go +++ b/eth/config.go @@ -135,6 +135,9 @@ type Config struct { // Constantinople block override (TODO: remove after the fork) ConstantinopleOverride *big.Int + + // RPCGasCap is the global gas cap for eth-call variants. + RPCGasCap *big.Int `toml:",omitempty"` } type configMarshaling struct { |