forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:ethereum/go-ethereum

Browse source
This commit is contained in:
renaynay 2020-03-11 12:56:38 +01:00
commit 94e2d2a803
No known key found for this signature in database
GPG key ID: 731E44FAAFCD0274
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/vm/gas.go
View file

@ -30,7 +30,7 @@ const (
GasExtStep uint64 = 20 GasExtStep uint64 = 20
) )
// calcGas returns the actual gas cost of the call. // callGas returns the actual gas cost of the call.
// //
// The cost of gas was changed during the homestead price change HF. // The cost of gas was changed during the homestead price change HF.
// As part of EIP 150 (TangerineWhistle), the returned gas is gas - base * 63 / 64. // As part of EIP 150 (TangerineWhistle), the returned gas is gas - base * 63 / 64.

3
tests/difficulty_test.go
View file

@ -73,6 +73,9 @@ func TestDifficulty(t *testing.T) {
dt.config("Constantinople", params.ChainConfig{ dt.config("Constantinople", params.ChainConfig{
ConstantinopleBlock: big.NewInt(0), ConstantinopleBlock: big.NewInt(0),
}) })
dt.config("EIP2384", params.ChainConfig{
MuirGlacierBlock: big.NewInt(0),
})
dt.config("difficulty.json", mainnetChainConfig) dt.config("difficulty.json", mainnetChainConfig)
dt.walk(t, difficultyTestDir, func(t *testing.T, name string, test *DifficultyTest) { dt.walk(t, difficultyTestDir, func(t *testing.T, name string, test *DifficultyTest) {

2
tests/testdata

@ -1 +1 @@
Subproject commit b5eb9900ee2147b40d3e681fe86efa4fd693959a Subproject commit 7497b116a019beb26215cbea4028df068dea06be