Merge pull request #535 from etclabscore/merge/foundation-release/1.1…

…1-rm-other-client-configs

Merge/foundation release/1.11 rm other client configs

.github/workflows/go-generate-check.yml

@@ -55,7 +55,10 @@ jobs:
           # Intentionally revert this commit which has a custom modification to the genesis unmarshaling,
           # with regards reading different genesis formats origniating from different clients
           # This way, this script can alert us on any code changes that have to be applied on if file gets changed.
-          git revert --no-edit 4b2cf83737ffe7c46c334a11414d151de049e0b3
+          # This commit implements genesis JSON unmarshaling for supported data types.
+          git revert --no-edit 7dafb43840f8d229845b006ca8d5353f073e788c
+          # This commit implements omit-empty JSON marshaling for Receipt's effectiveGasPrice field.
+          git revert --no-edit 9024b6e494388fee55d0376e8e115e876ba42b5e
 
       - name: Check for modified files
         id: git-check

cmd/echainspec/main.go

@@ -13,8 +13,6 @@ import (
 	"github.com/ethereum/go-ethereum/params/types/ctypes"
 	"github.com/ethereum/go-ethereum/params/types/genesisT"
 	"github.com/ethereum/go-ethereum/params/types/goethereum"
-	"github.com/ethereum/go-ethereum/params/types/multigeth"
-	"github.com/ethereum/go-ethereum/params/types/parity"
 	"gopkg.in/urfave/cli.v1"
 )
 
@@ -26,15 +24,9 @@ var (
 		"coregeth": &genesisT.Genesis{
 			Config: &coregeth.CoreGethChainConfig{},
 		},
-		"multigeth": &genesisT.Genesis{
-			Config: &multigeth.ChainConfig{},
-		},
 		"geth": &genesisT.Genesis{
 			Config: &goethereum.ChainConfig{},
 		},
-		"parity": &parity.ParityChainSpec{},
-		// TODO
-		// "aleth"
 		// "retesteth"
 	}
 )

cmd/echainspec/util.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/ethereum/go-ethereum/params/types/ctypes"
 	"github.com/ethereum/go-ethereum/params/types/genesisT"
-	"github.com/ethereum/go-ethereum/params/types/parity"
 	"gopkg.in/urfave/cli.v1"
 )
 
@@ -48,8 +47,6 @@ func unmarshalChainSpec(format string, data []byte) (conf ctypes.Configurator, e
 	switch t := configurator.(type) {
 	case *genesisT.Genesis:
 		d.Config = t.Config
-	case *parity.ParityChainSpec:
-		// Don't need to do anything here; the Parity type already conforms to ChainConfigurator.
 	default:
 		return nil, fmt.Errorf("unhandled chainspec type: %v %v", format, t)
 	}