diff options
| author | chriseth <chris@ethereum.org> | 2018-02-14 12:00:41 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-14 12:00:41 +0800 |
| commit | 3155dd8058672ce8f04bc2c0f2536cb549067d0a (patch) | |
| tree | 7ddb56e276c74db30671eb17ffdde5eda027142d /libevmasm/GasMeter.cpp | |
| parent | c4cbbb054b5ed3b8ceaa21ee5b47b0704762ff40 (diff) | |
| parent | ef8292c6bb337d3c4b27836da6732b85021d1c5d (diff) | |
| download | dexon-solidity-3155dd8058672ce8f04bc2c0f2536cb549067d0a.tar dexon-solidity-3155dd8058672ce8f04bc2c0f2536cb549067d0a.tar.gz dexon-solidity-3155dd8058672ce8f04bc2c0f2536cb549067d0a.tar.bz2 dexon-solidity-3155dd8058672ce8f04bc2c0f2536cb549067d0a.tar.lz dexon-solidity-3155dd8058672ce8f04bc2c0f2536cb549067d0a.tar.xz dexon-solidity-3155dd8058672ce8f04bc2c0f2536cb549067d0a.tar.zst dexon-solidity-3155dd8058672ce8f04bc2c0f2536cb549067d0a.zip | |
Merge pull request #3503 from ethereum/develop
Merge develop into release for v0.4.20.
Diffstat (limited to 'libevmasm/GasMeter.cpp')
| -rw-r--r-- | libevmasm/GasMeter.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libevmasm/GasMeter.cpp b/libevmasm/GasMeter.cpp index dad952bc..543f1cbc 100644 --- a/libevmasm/GasMeter.cpp +++ b/libevmasm/GasMeter.cpp @@ -52,6 +52,7 @@ GasMeter::GasConsumption GasMeter::estimateMax(AssemblyItem const& _item, bool _ case PushSubSize: case PushProgramSize: case PushLibraryAddress: + case PushDeployTimeAddress: gas = runGas(Instruction::PUSH1); break; case Tag: |