Merge pull request #126 from getamis/downgrade-1.8.19

Downgrade 1.8.19
getamis · Jan 16, 2019 · 80b89ca · 80b89ca
2 parents 3ddf731 + b553417
commit 80b89ca
Show file tree

Hide file tree

Showing 91 changed files with 5,922 additions and 1,719 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -27,7 +27,7 @@
 [[override]]
   name = "github.com/ethereum/go-ethereum"
   source = "github.com/getamis/go-ethereum"
-  branch = "indexer-1.8.20"
+  branch = "indexer-1.8.19"
 
 [[constraint]]
   name = "github.com/getamis/sirius"

diff --git a/common/utils.go b/common/utils.go
@@ -224,7 +224,7 @@ func AccumulateRewards(header *types.Header, uncles []*types.Header) (minerBaseR
 	if params.MainnetChainConfig.ByzantiumBlock.Cmp(header.Number) <= 0 {
 		minerBaseReward = ethash.ByzantiumBlockReward
 	}
-	if params.MainnetChainConfig.ConstantinopleBlock.Cmp(header.Number) <= 0 {
+	if params.MainnetChainConfig.ConstantinopleBlock != nil && params.MainnetChainConfig.ConstantinopleBlock.Cmp(header.Number) <= 0 {
 		minerBaseReward = ethash.ConstantinopleBlockReward
 	}
 

diff --git a/common/utils_test.go b/common/utils_test.go
@@ -28,6 +28,7 @@ import (
 )
 
 func TestAccumulateRewards(t *testing.T) {
+	t.Skip("skip this test because of constantinople postpone")
 	byzantiumBlock := big.NewInt(5862127)
 	constantinopleBlock := big.NewInt(7162127)
 	tests := []struct {

diff --git a/vendor/github.com/ethereum/go-ethereum/README.md b/vendor/github.com/ethereum/go-ethereum/README.md
diff --git a/vendor/github.com/ethereum/go-ethereum/accounts/abi/argument.go b/vendor/github.com/ethereum/go-ethereum/accounts/abi/argument.go
diff --git a/vendor/github.com/ethereum/go-ethereum/accounts/abi/type.go b/vendor/github.com/ethereum/go-ethereum/accounts/abi/type.go
diff --git a/vendor/github.com/ethereum/go-ethereum/accounts/keystore/account_cache.go b/vendor/github.com/ethereum/go-ethereum/accounts/keystore/account_cache.go
diff --git a/vendor/github.com/ethereum/go-ethereum/accounts/keystore/key.go b/vendor/github.com/ethereum/go-ethereum/accounts/keystore/key.go
diff --git a/...-ethereum/accounts/keystore/passphrase.go → .../accounts/keystore/keystore_passphrase.go b/...-ethereum/accounts/keystore/passphrase.go → .../accounts/keystore/keystore_passphrase.go
diff --git a/...um/go-ethereum/accounts/keystore/plain.go → ...ereum/accounts/keystore/keystore_plain.go b/...um/go-ethereum/accounts/keystore/plain.go → ...ereum/accounts/keystore/keystore_plain.go
diff --git a/...m/go-ethereum/accounts/keystore/wallet.go → ...reum/accounts/keystore/keystore_wallet.go b/...m/go-ethereum/accounts/keystore/wallet.go → ...reum/accounts/keystore/keystore_wallet.go
diff --git a/vendor/github.com/ethereum/go-ethereum/accounts/keystore/presale.go b/vendor/github.com/ethereum/go-ethereum/accounts/keystore/presale.go
diff --git a/...hereum/go-ethereum/core/vm/logger_json.go → ...hereum/go-ethereum/cmd/evm/json_logger.go b/...hereum/go-ethereum/core/vm/logger_json.go → ...hereum/go-ethereum/cmd/evm/json_logger.go
diff --git a/vendor/github.com/ethereum/go-ethereum/cmd/evm/runner.go b/vendor/github.com/ethereum/go-ethereum/cmd/evm/runner.go
diff --git a/vendor/github.com/ethereum/go-ethereum/cmd/evm/staterunner.go b/vendor/github.com/ethereum/go-ethereum/cmd/evm/staterunner.go
diff --git a/vendor/github.com/ethereum/go-ethereum/cmd/faucet/faucet.go b/vendor/github.com/ethereum/go-ethereum/cmd/faucet/faucet.go
diff --git a/vendor/github.com/ethereum/go-ethereum/cmd/geth/config.go b/vendor/github.com/ethereum/go-ethereum/cmd/geth/config.go
diff --git a/vendor/github.com/ethereum/go-ethereum/cmd/geth/main.go b/vendor/github.com/ethereum/go-ethereum/cmd/geth/main.go
diff --git a/vendor/github.com/ethereum/go-ethereum/cmd/geth/usage.go b/vendor/github.com/ethereum/go-ethereum/cmd/geth/usage.go