StakeSquid/dshackle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove ethereum goerli (#462)

Browse Source 
* Remove ethereum goerli

* add Sepolia chains
This commit is contained in:
Anton
2024-04-30 14:33:27 +03:00
committed by GitHub
parent 206adba735
commit 99aacf8979
10 changed files with 32 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
demo/quick-start/dshackle.yaml
View File

@@ -19,9 +19,3 @@ cluster:
ethereum:
rpc:
url: "https://kovan.infura.io/v3/${INFURA_USER}"
- id: infura-goerli
chain: goerli
connection:
ethereum:
rpc:
url: "https://goerli.infura.io/v3/${INFURA_USER}"

2
docs/reference-configuration.adoc
View File

@@ -690,7 +690,7 @@ Fallback role mean that the upstream is used only after other upstreams failed o
| yes
| Blockchain which is the provided by the upstream.
Cluster may have multiple upstreams for a single blockchain.
Accepted types: `bitcoin`, `bitcoin-testnet`, `ethereum`, `ethereum-classic`, `kovan-testnet`, `rinkeby-testnet`, `ropsten-testnet`, or `goerli-testnet`
Accepted types: `bitcoin`, `bitcoin-testnet`, `ethereum`, `ethereum-classic`, `kovan-testnet`, `rinkeby-testnet` or `ropsten-testnet`
| `enabled`
| no

2
emerald-grpc

Submodule emerald-grpc updated: 5b3b521ca5...708f2e8c4a

127
foundation/src/main/resources/chains.yaml
View File

@@ -46,13 +46,6 @@ chain-settings:
grpcId: 100
priority: 100
call-validate-contract: 0x32268860cAAc2948Ab5DdC7b20db5a420467Cf96
- id: Goerli
chain-id: 0x5
code: GOERLI
grpcId: 10005
priority: 1
short-names: [goerli, goerli-testnet]
call-validate-contract: 0xCD9303A1F6da2a68f465A579a24cc2Ee5AE2192f
- id: Sepolia
code: SEPOLIA
grpcId: 10008
@@ -150,14 +143,6 @@ chain-settings:
grpcId: 1004
short-names: [arbitrum, arb]
chain-id: 0xa4b1
- id: Goerli
priority: 1
code: ARBITRUM_TESTNET
grpcId: 10009
short-names: [arbitrum-testnet, arbitrum-goerli]
chain-id: 0x66eed
settings:
expected-block-time: 1s
- id: Sepolia
priority: 10
code: ARBITRUM_SEPOLIA
@@ -182,12 +167,6 @@ chain-settings:
grpcId: 1005
short-names: [optimism]
chain-id: 0xa
- id: Goerli
priority: 1
code: OPTIMISM_TESTNET
grpcId: 10010
short-names: [optimism-testnet, optimism-goerli]
chain-id: 0x1A4
- id: Sepolia
priority: 10
code: OPTIMISM_SEPOLIA
@@ -235,14 +214,6 @@ chain-settings:
grpcId: 1007
short-names: [polygon-zkevm]
chain-id: 0x44d
- id: Testnet
priority: 1
code: POLYGON_ZKEVM_TESTNET
grpcId: 10011
short-names: [polygon-zkevm-testnet]
chain-id: 0x5a2
settings:
expected-block-time: 1m
- id: Cardona
priority: 2
code: POLYGON_ZKEVM_CARDONA_TESTNET
@@ -284,12 +255,6 @@ chain-settings:
grpcId: 1009
chain-id: 0x144
short-names: [zksync]
- id: Testnet
priority: 1
code: ZKS_TESTNET
grpcId: 10012
chain-id: 0x118
short-names: [zksync-testnet]
- id: Sepolia
priority: 1
code: ZKS_SEPOLIA
@@ -314,12 +279,6 @@ chain-settings:
grpcId: 1010
short-names: [base]
chain-id: 0x2105
- id: Goerli
priority: 1
code: BASE_GOERLI
grpcId: 10014
short-names: [base-goerli]
chain-id: 0x14a33
- id: Sepolia
priority: 2
code: BASE_SEPOLIA
@@ -342,14 +301,12 @@ chain-settings:
grpcId: 1011
short-names: [linea]
chain-id: 0xe708
- id: Goerli
priority: 1
code: LINEA_GOERLI
grpcId: 10015
short-names: [linea-goerli]
chain-id: 0xe704
settings:
fork-choice: height # wait for providers
- id: Sepolia
priority: 2
code: LINEA_SEPOLIA
grpcId: 10074
short-names: [ linea-sepolia ]
chain-id: 0xe705
- id: gnosis
label: Gnosis
type: eth
@@ -441,12 +398,6 @@ chain-settings:
grpcId: 1017
short-names: [mantle]
chain-id: 0x1388
- id: Testnet
priority: 1
code: MANTLE_TESTNET
grpcId: 10023
short-names: [mantle-testnet]
chain-id: 0x1389
- id: Sepolia
priority: 10
code: MANTLE_SEPOLIA
@@ -551,12 +502,6 @@ chain-settings:
lagging: 5
fork-choice: quorum
chains:
- id: Alphanet
priority: 1
code: SCROLL_ALPHANET
grpcId: 10022
short-names: [scroll-alphanet]
chain-id: 0x82751
- id: Sepolia
priority: 10
code: SCROLL_SEPOLIA
@@ -619,14 +564,6 @@ chain-settings:
short-names: [metis-sepolia]
chain-id: 0xe9fd
grpcId: 10058
- id: Goerli
priority: 1
code: METIS_GOERLI
short-names: [metis-goerli]
chain-id: 0x257
grpcId: 10031
settings:
fork-choice: height #wait for providers
- id: opbnb
label: opBNB
type: eth
@@ -692,18 +629,12 @@ chain-settings:
short-names: [starknet]
chain-id: 0x534e5f4d41494e
grpcId: 1014
- id: Testnet
- id: Sepolia
priority: 2
code: STARKNET_TESTNET
short-names: [starknet-testnet]
chain-id: 0x534e5f474f45524c49
grpcId: 10019
- id: Testnet 2
priority: 1
code: STARKNET_TESTNET2
short-names: [starknet-testnet2]
chain-id: 0x534e5f474f45524c4932
grpcId: 10020
code: STARKNET_SEPOLIA
short-names: [starknet-sepolia]
chain-id: 0x534e5f5345504f4c4941
grpcId: 10075
- id: immutable-zkevm
label: Immutable zkEVM
type: eth
@@ -726,24 +657,6 @@ chain-settings:
short-names: [immutable-zkevm-testnet]
chain-id: 0x34a1
grpcId: 10034
- id: astar
label: Astar zkEVM
type: eth
settings:
expected-block-time: 1m
options:
validate-peers: false
lags:
syncing: 40
lagging: 20
fork-choice: quorum
chains:
- id: zKatana
priority: 1
code: ASTAR_ZKATANA
short-names: [astar-zkatana]
chain-id: 0x133e40
grpcId: 10035
- id: vara
label: Vara Network
type: polkadot
@@ -918,12 +831,12 @@ chain-settings:
short-names: [manta-pacific]
chain-id: 0xa9
grpcId: 1033
- id: Manta Pacific Testnet
priority: 10
code: MANTA_PACIFIC_TESTNET
short-names: [manta-pacific-testnet]
chain-id: 0x34816d
grpcId: 10045
- id: Manta Pacific Sepolia
priority: 2
code: MANTA_PACIFIC_SEPOLIA
short-names: [manta-pacific-sepolia]
chain-id: 0x34816e
grpcId: 10076
- id: harmony
label: Harmony
type: eth
@@ -1409,12 +1322,6 @@ chain-settings:
code: ETH_BEACON_CHAIN
grpcId: 1053
priority: 100
- id: Goerli
chain-id: 0x0
code: GOERLI_BEACON_CHAIN
grpcId: 10069
priority: 1
short-names: [eth-beacon-chain-goerli]
- id: Sepolia
code: SEPOLIA_BEACON_CHAIN
grpcId: 10070

10
foundation/src/test/kotlin/org/drpc/chainsconfig/ChainsConfigReaderTest.kt
View File

@@ -12,11 +12,11 @@ internal class ChainsConfigReaderTest {
fun `read standard config without custom`() {
val reader = ChainsConfigReader(ChainOptionsReader())
val config = reader.read(null)
val arb = config.resolve("arbitrum-goerli")
assertEquals(arb.chainId, "0x66eed")
assertEquals(arb.expectedBlockTime.seconds, 1L)
assertEquals(arb.options.validatePeers, false)
assertEquals(arb.id, "Goerli")
val arb = config.resolve("sepolia")
assertEquals(arb.chainId, "0xaa36a7")
assertEquals(arb.expectedBlockTime.seconds, 12L)
assertEquals(arb.options.validatePeers, null)
assertEquals(arb.id, "Sepolia")
val ethc = config.resolve("ethereum-classic")
assertEquals(ethc.chainId, "0x3d")

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

@@ -263,7 +263,7 @@ class DefaultEthereumMethods(
private fun getChainSpecificMethods(chain: Chain): List<String> {
return when (chain) {
Chain.OPTIMISM__MAINNET, Chain.OPTIMISM__GOERLI, Chain.MANTLE__MAINNET, Chain.MANTLE__TESTNET ->
Chain.OPTIMISM__MAINNET, Chain.MANTLE__MAINNET ->
listOf(
"rollup_gasPrices",
)
@@ -276,7 +276,7 @@ class DefaultEthereumMethods(
"eth_getRootHash",
)
Chain.POLYGON_ZKEVM__MAINNET, Chain.POLYGON_ZKEVM__TESTNET -> listOf(
Chain.POLYGON_ZKEVM__MAINNET -> listOf(
"zkevm_consolidatedBlockNumber",
"zkevm_isBlockConsolidated",
"zkevm_isBlockVirtualized",
@@ -288,7 +288,7 @@ class DefaultEthereumMethods(
"zkevm_getBroadcastURI",
)
Chain.ZKSYNC__MAINNET, Chain.ZKSYNC__TESTNET -> listOf(
Chain.ZKSYNC__MAINNET -> listOf(
"zks_estimateFee",
"zks_estimateGasL1ToL2",
"zks_getAllAccountBalances",
@@ -324,7 +324,7 @@ class DefaultEthereumMethods(
.plus(harmonySpecialMethods)
.plus(harmonyPossibleNotIndexedMethods)
Chain.LINEA__MAINNET, Chain.LINEA__GOERLI -> listOf(
Chain.LINEA__MAINNET, Chain.LINEA__SEPOLIA -> listOf(
"linea_estimateGas",
)
@@ -335,7 +335,7 @@ class DefaultEthereumMethods(
private fun chainUnsupportedMethods(chain: Chain): Set<String> {
return when (chain) {
Chain.OPTIMISM__MAINNET -> setOf("eth_getAccounts")
Chain.ZKSYNC__MAINNET, Chain.ZKSYNC__TESTNET, Chain.POLYGON_ZKEVM__TESTNET, Chain.POLYGON_ZKEVM__MAINNET ->
Chain.ZKSYNC__MAINNET, Chain.POLYGON_ZKEVM__MAINNET ->
setOf("eth_maxPriorityFeePerGas", "zks_getBytecodeByHash")
Chain.TELOS__MAINNET, Chain.TELOS__TESTNET -> setOf(
"eth_syncing",

6
src/test/groovy/io/emeraldpay/dshackle/config/MainConfigReaderSpec.groovy
View File

@@ -51,7 +51,7 @@ class MainConfigReaderSpec extends Specification {
port == 8082
tls != null
routes != null
routes.size() == 3
routes.size() == 2
with(routes[0]) {
id == "eth"
blockchain == Chain.ETHEREUM__MAINNET
@@ -60,10 +60,6 @@ class MainConfigReaderSpec extends Specification {
id == "etc"
blockchain == Chain.ETHEREUM_CLASSIC__MAINNET
}
with(routes[2]) {
id == "goerli"
blockchain == Chain.ETHEREUM__GOERLI
}
}
with(act.health) {
it.enabled

4
src/test/groovy/io/emeraldpay/dshackle/rpc/NativeCallSpec.groovy
View File

@@ -286,7 +286,7 @@ class NativeCallSpec extends Specification {
def nativeCall = nativeCall(upstreams)
def req = BlockchainOuterClass.NativeCallRequest.newBuilder()
.setChainValue(Chain.ETHEREUM__GOERLI.id)
.setChainValue(Chain.ETHEREUM__SEPOLIA.id)
.addAllItems([1, 2].collect { id ->
return BlockchainOuterClass.NativeCallItem.newBuilder()
.setId(id)
@@ -294,7 +294,7 @@ class NativeCallSpec extends Specification {
.build()
})
.build()
1 * upstreams.isAvailable(Chain.ETHEREUM__GOERLI) >> false
1 * upstreams.isAvailable(Chain.ETHEREUM__SEPOLIA) >> false
when:
def resp = nativeCall.prepareCall(req)
then:

1
src/test/groovy/io/emeraldpay/dshackle/upstream/calls/DefaultEthereumMethodsSpec.groovy
View File

@@ -39,7 +39,6 @@ class DefaultEthereumMethodsSpec extends Specification {
chain | id
Chain.ETHEREUM__MAINNET | '"0x1"'
Chain.ETHEREUM_CLASSIC__MAINNET | '"0x3d"'
Chain.ETHEREUM__GOERLI | '"0x5"'
}
def "Optimism chain unsupported methods"() {

2
src/test/resources/configs/dshackle-full.yaml
View File

@@ -45,8 +45,6 @@ proxy:
blockchain: ethereum
- id: etc
blockchain: ethereum_classic
- id: goerli
blockchain: goerli
cluster:
defaults:
- chains: