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

refactor chain names

Browse Source
This commit is contained in:
a10zn8
2023-06-29 00:01:53 +04:00
parent 2607758197
commit aff954b533
52 changed files with 458 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/main/kotlin/io/emeraldpay/dshackle/BlockchainType.kt
View File

@@ -6,36 +6,36 @@ enum class BlockchainType {
companion object {
@JvmStatic
fun from(chain: Chain): BlockchainType {
if (chain == Chain.TESTNET_ROPSTEN ||
chain == Chain.POLYGON ||
chain == Chain.OPTIMISM ||
chain == Chain.ARBITRUM ||
chain == Chain.BSC ||
chain == Chain.TESTNET_GOERLI ||
chain == Chain.ETHEREUM ||
chain == Chain.TESTNET_SEPOLIA ||
chain == Chain.TESTNET_ARBITRUM ||
chain == Chain.TESTNET_OPTIMISM ||
chain == Chain.ARBITRUM_NOVA ||
chain == Chain.POLYGON_ZKEVM ||
chain == Chain.TESTNET_POLYGON_ZKEVM ||
chain == Chain.ZKSYNC ||
chain == Chain.TESTNET_ZKSYNC ||
chain == Chain.TESTNET_POYGON_POS_MUMBAI
if (chain == Chain.ETHEREUM__ROPSTEN ||
chain == Chain.POLYGON_POS__MAINNET ||
chain == Chain.OPTIMISM__MAINNET ||
chain == Chain.ARBITRUM__MAINNET ||
chain == Chain.BSC__MAINNET ||
chain == Chain.ETHEREUM__GOERLI ||
chain == Chain.ETHEREUM__MAINNET ||
chain == Chain.ETHEREUM__SEPOLIA ||
chain == Chain.ARBITRUM__GOERLI ||
chain == Chain.OPTIMISM__GOERLI ||
chain == Chain.ARBITRUM_NOVA__MAINNET ||
chain == Chain.POLYGON_ZKEVM__MAINNET ||
chain == Chain.POLYGON_ZKEVM__TESTNET ||
chain == Chain.ZKSYNC__MAINNET ||
chain == Chain.ZKSYNC__TESTNET ||
chain == Chain.POYGON_POS__MUMBAI
) {
return EVM_POS
}
if (chain == Chain.ETHEREUM_CLASSIC ||
chain == Chain.FANTOM ||
chain == Chain.RSK ||
chain == Chain.TESTNET_KOVAN ||
chain == Chain.TESTNET_MORDEN ||
chain == Chain.TESTNET_RINKEBY
if (chain == Chain.ETHEREUM_CLASSIC__MAINNET ||
chain == Chain.FANTOM__MAINNET ||
chain == Chain.RSK__MAINNET ||
chain == Chain.ETHEREUM__KOVAN ||
chain == Chain.ETHEREUM__MORDEN ||
chain == Chain.ETHEREUM__RINKEBY
) {
return EVM_POW
}
if (chain == Chain.BITCOIN ||
chain == Chain.TESTNET_BITCOIN
if (chain == Chain.BITCOIN__MAINNET ||
chain == Chain.BITCOIN__TESTNET
) {
return BITCOIN
}

48
src/main/kotlin/io/emeraldpay/dshackle/Chain.kt
View File

@@ -17,70 +17,70 @@ package io.emeraldpay.dshackle
enum class Chain(val id: Int, val chainCode: String, val chainName: String) {
UNSPECIFIED(0, "UNSPECIFIED", "Unknown"),
BITCOIN(1, "BTC", "Bitcoin"), // GRIN(2, "GRIN", "Grin"),
BITCOIN__MAINNET(1, "BTC", "Bitcoin"), // GRIN(2, "GRIN", "Grin"),
// Networks with tokens
ETHEREUM(100, "ETH", "Ethereum"),
ETHEREUM_CLASSIC(101, "ETC", "Ethereum Classic"),
FANTOM(
ETHEREUM__MAINNET(100, "ETH", "Ethereum"),
ETHEREUM_CLASSIC__MAINNET(101, "ETC", "Ethereum Classic"),
FANTOM__MAINNET(
102,
"FTM",
"Fantom"
), // LIGHTNING(1001, "BTC_LN", "Bitcoin Lightning"),
POLYGON(1002, "POLYGON", "Polygon Matic"),
RSK(1003, "RSK", "Bitcoin RSK"),
ARBITRUM(
POLYGON_POS__MAINNET(1002, "POLYGON", "Polygon Matic"),
RSK__MAINNET(1003, "RSK", "Bitcoin RSK"),
ARBITRUM__MAINNET(
1004,
"ARBITRUM",
"Arbitrum"
),
OPTIMISM(1005, "OPTIMISM", "Optimism"),
BSC(1006, "BSC", "Binance Smart Chain"),
POLYGON_ZKEVM(
OPTIMISM__MAINNET(1005, "OPTIMISM", "Optimism"),
BSC__MAINNET(1006, "BSC", "Binance Smart Chain"),
POLYGON_ZKEVM__MAINNET(
1007,
"POLYGON_ZKEVM",
"Polygon ZK-EVM"
),
ARBITRUM_NOVA(
ARBITRUM_NOVA__MAINNET(
1008,
"ARBITRUM_NOVA",
"Arbitrum Nova"
),
ZKSYNC(1009, "ZKSYNC", "ZkSync Era"),
ZKSYNC__MAINNET(1009, "ZKSYNC", "ZkSync Era"),
// Testnets
TESTNET_MORDEN(10001, "MORDEN", "Morden Testnet"),
TESTNET_KOVAN(10002, "KOVAN", "Kovan Testnet"),
TESTNET_BITCOIN(
ETHEREUM__MORDEN(10001, "MORDEN", "Morden Testnet"),
ETHEREUM__KOVAN(10002, "KOVAN", "Kovan Testnet"),
BITCOIN__TESTNET(
10003,
"TESTNET_BITCOIN",
"Bitcoin Testnet"
), // TESTNET_FLOONET(10004, "FLOONET", "Floonet Testnet"),
TESTNET_GOERLI(10005, "GOERLI", "Goerli Testnet"),
TESTNET_ROPSTEN(
ETHEREUM__GOERLI(10005, "GOERLI", "Goerli Testnet"),
ETHEREUM__ROPSTEN(
10006,
"ROPSTEN",
"Ropsten Testnet"
),
TESTNET_RINKEBY(10007, "RINKEBY", "Rinkeby Testnet"),
TESTNET_SEPOLIA(10008, "SEPOLIA", "Sepolia Testnet"),
TESTNET_ARBITRUM(
ETHEREUM__RINKEBY(10007, "RINKEBY", "Rinkeby Testnet"),
ETHEREUM__SEPOLIA(10008, "SEPOLIA", "Sepolia Testnet"),
ARBITRUM__GOERLI(
10009,
"ARBITRUM_TESTNET",
"Arbitrum Testnet"
),
TESTNET_OPTIMISM(10010, "OPTIMISM_TESTNET", "Optimism Testnet"),
TESTNET_POLYGON_ZKEVM(
OPTIMISM__GOERLI(10010, "OPTIMISM_TESTNET", "Optimism Testnet"),
POLYGON_ZKEVM__TESTNET(
10011,
"POLYGON_ZKEVM_TESTNET",
"Polygon ZK-EVM Testnet"
),
TESTNET_ZKSYNC(
ZKSYNC__TESTNET(
10012,
"ZKS_TESTNET",
"ZkSync Testnet"
),
TESTNET_POYGON_POS_MUMBAI(
POYGON_POS__MUMBAI(
10013,
"POLYGON_POS_MUMBAI",
"Polygon POS Mumbai Testnet"

66
src/main/kotlin/io/emeraldpay/dshackle/Global.kt
View File

@@ -44,39 +44,39 @@ class Global {
var metricsExtended = false
val chainNames = mapOf(
"ethereum" to Chain.ETHEREUM,
"ethereum-classic" to Chain.ETHEREUM_CLASSIC,
"eth" to Chain.ETHEREUM,
"polygon" to Chain.POLYGON,
"matic" to Chain.POLYGON,
"arbitrum" to Chain.ARBITRUM,
"arb" to Chain.ARBITRUM,
"optimism" to Chain.OPTIMISM,
"binance" to Chain.BSC,
"bsc" to Chain.BSC,
"bnb-smart-chain" to Chain.BSC,
"etc" to Chain.ETHEREUM_CLASSIC,
"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,
"rinkeby" to Chain.TESTNET_RINKEBY,
"rinkeby-testnet" to Chain.TESTNET_RINKEBY,
"ropsten" to Chain.TESTNET_ROPSTEN,
"ropsten-testnet" to Chain.TESTNET_ROPSTEN,
"bitcoin" to Chain.BITCOIN,
"bitcoin-testnet" to Chain.TESTNET_BITCOIN,
"sepolia" to Chain.TESTNET_SEPOLIA,
"sepolia-testnet" to Chain.TESTNET_SEPOLIA,
"optimism-testnet" to Chain.TESTNET_OPTIMISM,
"arbitrum-testnet" to Chain.TESTNET_ARBITRUM,
"arbitrum-nova" to Chain.ARBITRUM_NOVA,
"polygon-zkevm" to Chain.POLYGON_ZKEVM,
"polygon-zkevm-testnet" to Chain.TESTNET_POLYGON_ZKEVM,
"zksync" to Chain.ZKSYNC,
"zksync-testnet" to Chain.TESTNET_ZKSYNC,
"polygon-mumbai" to Chain.TESTNET_POYGON_POS_MUMBAI,
"ethereum" to Chain.ETHEREUM__MAINNET,
"ethereum-classic" to Chain.ETHEREUM_CLASSIC__MAINNET,
"eth" to Chain.ETHEREUM__MAINNET,
"polygon" to Chain.POLYGON_POS__MAINNET,
"matic" to Chain.POLYGON_POS__MAINNET,
"arbitrum" to Chain.ARBITRUM__MAINNET,
"arb" to Chain.ARBITRUM__MAINNET,
"optimism" to Chain.OPTIMISM__MAINNET,
"binance" to Chain.BSC__MAINNET,
"bsc" to Chain.BSC__MAINNET,
"bnb-smart-chain" to Chain.BSC__MAINNET,
"etc" to Chain.ETHEREUM_CLASSIC__MAINNET,
"morden" to Chain.ETHEREUM__MORDEN,
"kovan" to Chain.ETHEREUM__KOVAN,
"kovan-testnet" to Chain.ETHEREUM__KOVAN,
"goerli" to Chain.ETHEREUM__GOERLI,
"goerli-testnet" to Chain.ETHEREUM__GOERLI,
"rinkeby" to Chain.ETHEREUM__RINKEBY,
"rinkeby-testnet" to Chain.ETHEREUM__RINKEBY,
"ropsten" to Chain.ETHEREUM__ROPSTEN,
"ropsten-testnet" to Chain.ETHEREUM__ROPSTEN,
"bitcoin" to Chain.BITCOIN__MAINNET,
"bitcoin-testnet" to Chain.BITCOIN__TESTNET,
"sepolia" to Chain.ETHEREUM__SEPOLIA,
"sepolia-testnet" to Chain.ETHEREUM__SEPOLIA,
"optimism-testnet" to Chain.OPTIMISM__GOERLI,
"arbitrum-testnet" to Chain.ARBITRUM__GOERLI,
"arbitrum-nova" to Chain.ARBITRUM_NOVA__MAINNET,
"polygon-zkevm" to Chain.POLYGON_ZKEVM__MAINNET,
"polygon-zkevm-testnet" to Chain.POLYGON_ZKEVM__TESTNET,
"zksync" to Chain.ZKSYNC__MAINNET,
"zksync-testnet" to Chain.ZKSYNC__TESTNET,
"polygon-mumbai" to Chain.POYGON_POS__MUMBAI,
)
fun chainById(id: String?): Chain {

2
src/main/kotlin/io/emeraldpay/dshackle/rpc/TrackBitcoinAddress.kt
View File

@@ -287,7 +287,7 @@ class TrackBitcoinAddress(
// TODO use bitcoin class for address
class Address(val chain: Chain, val address: String) {
val network = if (chain == Chain.BITCOIN) {
val network = if (chain == Chain.BITCOIN__MAINNET) {
MainNetParams()
} else {
TestNet3Params()

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

@@ -172,10 +172,10 @@ class DefaultEthereumMethods(
private fun getChainSpecificMethods(chain: Chain): List<String> {
return when (chain) {
Chain.OPTIMISM, Chain.TESTNET_OPTIMISM -> listOf(
Chain.OPTIMISM__MAINNET, Chain.OPTIMISM__GOERLI -> listOf(
"rollup_gasPrices"
)
Chain.POLYGON, Chain.TESTNET_POYGON_POS_MUMBAI -> listOf(
Chain.POLYGON_POS__MAINNET, Chain.POYGON_POS__MUMBAI -> listOf(
"bor_getAuthor",
"bor_getCurrentValidators",
"bor_getCurrentProposer",
@@ -183,7 +183,7 @@ class DefaultEthereumMethods(
"bor_getSignersAtHash",
"eth_getRootHash"
)
Chain.POLYGON_ZKEVM, Chain.TESTNET_POLYGON_ZKEVM -> listOf(
Chain.POLYGON_ZKEVM__MAINNET, Chain.POLYGON_ZKEVM__TESTNET -> listOf(
"zkevm_consolidatedBlockNumber",
"zkevm_isBlockConsolidated",
"zkevm_isBlockVirtualized",
@@ -194,7 +194,7 @@ class DefaultEthereumMethods(
"zkevm_getBatchByNumber",
"zkevm_getBroadcastURI"
)
Chain.ZKSYNC, Chain.TESTNET_ZKSYNC -> listOf(
Chain.ZKSYNC__MAINNET, Chain.ZKSYNC__TESTNET -> listOf(
"zks_estimateFee",
"zks_estimateGasL1ToL2",
"zks_getAllAccountBalances",
@@ -219,7 +219,7 @@ class DefaultEthereumMethods(
}
private fun chainUnsupportedMethods(chain: Chain): Set<String> {
if (chain == Chain.OPTIMISM) {
if (chain == Chain.OPTIMISM__MAINNET) {
return setOf("eth_getAccounts")
}
return emptySet()
@@ -239,79 +239,79 @@ class DefaultEthereumMethods(
val json = when (method) {
"net_version" -> {
when {
Chain.ETHEREUM == chain -> {
Chain.ETHEREUM__MAINNET == chain -> {
"\"1\""
}
Chain.ETHEREUM_CLASSIC == chain -> {
Chain.ETHEREUM_CLASSIC__MAINNET == chain -> {
"\"1\""
}
Chain.POLYGON == chain -> {
Chain.POLYGON_POS__MAINNET == chain -> {
"\"137\""
}
Chain.TESTNET_MORDEN == chain -> {
Chain.ETHEREUM__MORDEN == chain -> {
"\"2\""
}
Chain.TESTNET_ROPSTEN == chain -> {
Chain.ETHEREUM__ROPSTEN == chain -> {
"\"3\""
}
Chain.TESTNET_RINKEBY == chain -> {
Chain.ETHEREUM__RINKEBY == chain -> {
"\"4\""
}
Chain.TESTNET_KOVAN == chain -> {
Chain.ETHEREUM__KOVAN == chain -> {
"\"42\""
}
Chain.TESTNET_GOERLI == chain -> {
Chain.ETHEREUM__GOERLI == chain -> {
"\"5\""
}
Chain.TESTNET_SEPOLIA == chain -> {
Chain.ETHEREUM__SEPOLIA == chain -> {
"\"11155111\""
}
Chain.ARBITRUM == chain -> {
Chain.ARBITRUM__MAINNET == chain -> {
"\"42161\""
}
Chain.OPTIMISM == chain -> {
Chain.OPTIMISM__MAINNET == chain -> {
"\"10\""
}
Chain.TESTNET_ARBITRUM == chain -> {
Chain.ARBITRUM__GOERLI == chain -> {
"\"421613\""
}
Chain.TESTNET_OPTIMISM == chain -> {
Chain.OPTIMISM__GOERLI == chain -> {
"\"420\""
}
Chain.ARBITRUM_NOVA == chain -> {
Chain.ARBITRUM_NOVA__MAINNET == chain -> {
"\"42170\""
}
Chain.POLYGON_ZKEVM == chain -> {
Chain.POLYGON_ZKEVM__MAINNET == chain -> {
"\"1101\""
}
Chain.TESTNET_POLYGON_ZKEVM == chain -> {
Chain.POLYGON_ZKEVM__TESTNET == chain -> {
"\"1442\""
}
Chain.ZKSYNC == chain -> {
Chain.ZKSYNC__MAINNET == chain -> {
"\"324\""
}
Chain.TESTNET_ZKSYNC == chain -> {
Chain.ZKSYNC__TESTNET == chain -> {
"\"280\""
}
Chain.TESTNET_POYGON_POS_MUMBAI == chain -> {
Chain.POYGON_POS__MUMBAI == chain -> {
"\"80001\""
}
@@ -321,79 +321,79 @@ class DefaultEthereumMethods(
"eth_chainId" -> {
when {
Chain.ETHEREUM == chain -> {
Chain.ETHEREUM__MAINNET == chain -> {
"\"0x1\""
}
Chain.POLYGON == chain -> {
Chain.POLYGON_POS__MAINNET == chain -> {
"\"0x89\""
}
Chain.TESTNET_ROPSTEN == chain -> {
Chain.ETHEREUM__ROPSTEN == chain -> {
"\"0x3\""
}
Chain.TESTNET_RINKEBY == chain -> {
Chain.ETHEREUM__RINKEBY == chain -> {
"\"0x4\""
}
Chain.ETHEREUM_CLASSIC == chain -> {
Chain.ETHEREUM_CLASSIC__MAINNET == chain -> {
"\"0x3d\""
}
Chain.TESTNET_MORDEN == chain -> {
Chain.ETHEREUM__MORDEN == chain -> {
"\"0x3c\""
}
Chain.TESTNET_KOVAN == chain -> {
Chain.ETHEREUM__KOVAN == chain -> {
"\"0x2a\""
}
Chain.TESTNET_GOERLI == chain -> {
Chain.ETHEREUM__GOERLI == chain -> {
"\"0x5\""
}
Chain.TESTNET_SEPOLIA == chain -> {
Chain.ETHEREUM__SEPOLIA == chain -> {
"\"0xaa36a7\""
}
Chain.ARBITRUM == chain -> {
Chain.ARBITRUM__MAINNET == chain -> {
"\"0xa4b1\""
}
Chain.OPTIMISM == chain -> {
Chain.OPTIMISM__MAINNET == chain -> {
"\"0xa\""
}
Chain.TESTNET_ARBITRUM == chain -> {
Chain.ARBITRUM__GOERLI == chain -> {
"\"0x66eed\""
}
Chain.TESTNET_OPTIMISM == chain -> {
Chain.OPTIMISM__GOERLI == chain -> {
"\"0x1A4\""
}
Chain.ARBITRUM_NOVA == chain -> {
Chain.ARBITRUM_NOVA__MAINNET == chain -> {
"\"0xa4ba\""
}
Chain.POLYGON_ZKEVM == chain -> {
Chain.POLYGON_ZKEVM__MAINNET == chain -> {
"\"0x44d\""
}
Chain.TESTNET_POLYGON_ZKEVM == chain -> {
Chain.POLYGON_ZKEVM__TESTNET == chain -> {
"\"0x5a2\""
}
Chain.ZKSYNC == chain -> {
Chain.ZKSYNC__MAINNET == chain -> {
"\"0x144\""
}
Chain.TESTNET_ZKSYNC == chain -> {
Chain.ZKSYNC__TESTNET == chain -> {
"\"0x118\""
}
Chain.TESTNET_POYGON_POS_MUMBAI == chain -> {
Chain.POYGON_POS__MUMBAI == chain -> {
"\"0x13881\""
}

26
src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumMultistream.kt
View File

@@ -66,19 +66,19 @@ open class EthereumMultistream(
private var subscribe = EthereumEgressSubscription(this, headScheduler, NoPendingTxes())
private val supportsEIP1559set = setOf(
Chain.ETHEREUM, Chain.TESTNET_ROPSTEN,
Chain.TESTNET_GOERLI,
Chain.TESTNET_RINKEBY,
Chain.TESTNET_SEPOLIA,
Chain.ARBITRUM,
Chain.OPTIMISM,
Chain.TESTNET_ARBITRUM,
Chain.TESTNET_OPTIMISM,
Chain.POLYGON_ZKEVM,
Chain.TESTNET_POLYGON_ZKEVM,
Chain.ZKSYNC,
Chain.TESTNET_ZKSYNC,
Chain.ARBITRUM_NOVA
Chain.ETHEREUM__MAINNET, Chain.ETHEREUM__ROPSTEN,
Chain.ETHEREUM__GOERLI,
Chain.ETHEREUM__RINKEBY,
Chain.ETHEREUM__SEPOLIA,
Chain.ARBITRUM__MAINNET,
Chain.OPTIMISM__MAINNET,
Chain.ARBITRUM__GOERLI,
Chain.OPTIMISM__GOERLI,
Chain.POLYGON_ZKEVM__MAINNET,
Chain.POLYGON_ZKEVM__TESTNET,
Chain.ZKSYNC__MAINNET,
Chain.ZKSYNC__TESTNET,
Chain.ARBITRUM_NOVA__MAINNET
)
private val supportsEIP1559 = supportsEIP1559set.contains(chain)