solution: goerli support

Co-authored-by: Chase Wright <mysticryuujin@protonmail.com>

src/main/kotlin/io/emeraldpay/dshackle/BlockchainType.kt

@@ -30,7 +30,7 @@ enum class BlockchainType {
     companion object {
         @JvmStatic
         fun fromBlockchain(blockchain: Chain): BlockchainType {
-            if (blockchain == Chain.ETHEREUM || blockchain == Chain.ETHEREUM_CLASSIC || blockchain == Chain.TESTNET_KOVAN || blockchain == Chain.TESTNET_MORDEN) {
+            if (blockchain == Chain.ETHEREUM || blockchain == Chain.ETHEREUM_CLASSIC || blockchain == Chain.TESTNET_KOVAN || blockchain == Chain.TESTNET_MORDEN || blockchain == Chain.TESTNET_GOERLI) {
                 return ETHEREUM
             }
             if (blockchain == Chain.BITCOIN || blockchain == Chain.TESTNET_BITCOIN) {

src/main/kotlin/io/emeraldpay/dshackle/startup/ConfiguredUpstreams.kt

@@ -63,6 +63,8 @@ open class ConfiguredUpstreams(
             "morden" to Chain.TESTNET_MORDEN,
             "kovan" to Chain.TESTNET_KOVAN,
             "kovan-testnet" to Chain.TESTNET_KOVAN,
+            "goerli" to Chain.TESTNET_GOERLI,
+            "goerli-testnet" to Chain.TESTNET_GOERLI,
             "bitcoin" to Chain.BITCOIN,
             "bitcoin-testnet" to Chain.TESTNET_BITCOIN
     )

src/main/kotlin/io/emeraldpay/dshackle/upstream/calls/DefaultEthereumMethods.kt

@@ -123,6 +123,9 @@ class DefaultEthereumMethods(
                     Chain.TESTNET_KOVAN == chain -> {
                         "42"
                     }
+                    Chain.TESTNET_GOERLI == chain -> {
+                        "5"
+                    }
                     else -> throw RpcException(-32602, "Invalid chain")
                 }
             }
@@ -140,6 +143,9 @@ class DefaultEthereumMethods(
                     Chain.TESTNET_KOVAN == chain -> {
                         "\"0x2a\""
                     }
+                    Chain.TESTNET_GOERLI == chain -> {
+                        "\"0x5\""
+                    }
                     else -> throw RpcException(-32602, "Invalid chain")
                 }
             }

src/test/groovy/io/emeraldpay/dshackle/BlockchainTypeSpec.groovy

@@ -24,7 +24,7 @@ class BlockchainTypeSpec extends Specification {
         expect:
         BlockchainType.fromBlockchain(chain) == BlockchainType.ETHEREUM
         where:
-        chain << [Chain.ETHEREUM, Chain.ETHEREUM_CLASSIC, Chain.TESTNET_KOVAN, Chain.TESTNET_MORDEN]
+        chain << [Chain.ETHEREUM, Chain.ETHEREUM_CLASSIC, Chain.TESTNET_KOVAN, Chain.TESTNET_GOERLI, Chain.TESTNET_MORDEN]
     }
 
     def "Correct type for bitcoin"() {

src/test/groovy/io/emeraldpay/dshackle/config/MainConfigReaderSpec.groovy

@@ -51,7 +51,7 @@ class MainConfigReaderSpec extends Specification {
             port == 8082
             tls != null
             routes != null
-            routes.size() == 3
+            routes.size() == 4
             with(routes[0]) {
                 id == "eth"
                 blockchain == Chain.ETHEREUM
@@ -64,6 +64,10 @@ class MainConfigReaderSpec extends Specification {
                 id == "kovan"
                 blockchain == Chain.TESTNET_KOVAN
             }
+            with(routes[3]) {
+                id == "goerli"
+                blockchain == Chain.TESTNET_GOERLI
+            }
         }
         act.upstreams != null
         with(act.upstreams) {

src/test/groovy/io/emeraldpay/dshackle/upstream/calls/DefaultEthereumMethodsSpec.groovy

@@ -22,5 +22,6 @@ class DefaultEthereumMethodsSpec extends Specification {
         Chain.ETHEREUM         | '"0x0"'
         Chain.ETHEREUM_CLASSIC | '"0x3d"'
         Chain.TESTNET_KOVAN    | '"0x2a"'
+        Chain.TESTNET_GOERLI    | '"0x5"'
     }
 }

src/test/resources/dshackle-full.yaml

@@ -33,6 +33,8 @@ proxy:
       blockchain: ethereum_classic
     - id: kovan
       blockchain: kovan
+    - id: goerli
+      blockchain: goerli
 
 cluster:
   defaults: