Skip to content

Commit 23675dd

Browse files
committed
Fix Etherscan V2 transactions api
1 parent 3b88c12 commit 23675dd

File tree

5 files changed

+7
-76
lines changed

5 files changed

+7
-76
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ val evmKit = EthereumKit.getInstance(
4646
address,
4747
Chain.Ethereum,
4848
RpcSource.ethereumInfuraHttp("projectId", "projectSecret"),
49-
TransactionSource.ethereumEtherscan("apiKey"),
49+
TransactionSource.etherscanApi("apiKey"),
5050
"unique_wallet_id"
5151
)
5252
```

app/src/main/java/io/horizontalsystems/ethereumkit/sample/Configuration.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ object Configuration {
1313

1414
const val ethereumRpc = "https://api-dev.blocksdecoded.com/v1/ethereum-rpc/mainnet"
1515
const val etherscanKey = "GKNHXT22ED7PRVCKZATFZQD1YI7FK9AAYE"
16-
const val arbiscanApiKey = "Z43JN5434XVNA5D73UGPWKF26G5D9MGDPZ"
17-
const val bscScanKey = "5ZGSHWYHZVA8XZHB8PF6UUTRNNB4KT43ZZ"
1816

1917
val erc20Tokens: List<Erc20Token>
2018
get() {

app/src/main/java/io/horizontalsystems/ethereumkit/sample/modules/addresswatch/AddressWatchViewModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,11 @@ class AddressWatchViewModel : ViewModel() {
129129

130130
when (Configuration.chain) {
131131
Chain.BinanceSmartChain -> {
132-
transactionSource = TransactionSource.bscscan(listOf(Configuration.bscScanKey))
132+
transactionSource = TransactionSource.etherscanApi(Configuration.etherscanKey.split(","))
133133
rpcSource = RpcSource.binanceSmartChainHttp()
134134
}
135135
Chain.Ethereum -> {
136-
transactionSource = TransactionSource.ethereumEtherscan(Configuration.etherscanKey.split(","))
136+
transactionSource = TransactionSource.etherscanApi(Configuration.etherscanKey.split(","))
137137
rpcSource = RpcSource.Http(listOf(URI(Configuration.ethereumRpc)), null)
138138
}
139139
else -> {

app/src/main/java/io/horizontalsystems/ethereumkit/sample/modules/main/MainViewModel.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,17 +193,17 @@ class MainViewModel : ViewModel() {
193193
private fun createKit(): EthereumKit {
194194
when (Configuration.chain) {
195195
Chain.BinanceSmartChain -> {
196-
transactionSource = TransactionSource.bscscan(listOf(Configuration.bscScanKey))
196+
transactionSource = TransactionSource.etherscanApi(Configuration.etherscanKey.split(","))
197197
rpcSource = RpcSource.binanceSmartChainHttp()
198198
}
199199

200200
Chain.Ethereum -> {
201-
transactionSource = TransactionSource.ethereumEtherscan(Configuration.etherscanKey.split(","))
201+
transactionSource = TransactionSource.etherscanApi(Configuration.etherscanKey.split(","))
202202
rpcSource = RpcSource.Http(listOf(URI(Configuration.ethereumRpc)), null)
203203
}
204204

205205
Chain.ArbitrumOne -> {
206-
transactionSource = TransactionSource.arbiscan(listOf(Configuration.arbiscanApiKey),)
206+
transactionSource = TransactionSource.etherscanApi(Configuration.etherscanKey.split(","))
207207
rpcSource = RpcSource.arbitrumOneRpcHttp()
208208
}
209209

ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/models/TransactionSource.kt

Lines changed: 1 addition & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -19,77 +19,10 @@ class TransactionSource(val name: String, val type: SourceType) {
1919
)
2020
}
2121

22-
fun ethereumEtherscan(apiKeys: List<String>): TransactionSource {
22+
fun etherscanApi(apiKeys: List<String>): TransactionSource {
2323
return etherscan("api", null, apiKeys)
2424
}
2525

26-
fun goerliEtherscan(apiKeys: List<String>): TransactionSource {
27-
return etherscan("api-goerli", "goerli", apiKeys)
28-
}
29-
30-
fun bscscan(apiKeys: List<String>): TransactionSource {
31-
return TransactionSource(
32-
"bscscan.com",
33-
SourceType.Etherscan("https://api.bscscan.com", "https://bscscan.com", apiKeys)
34-
)
35-
}
36-
37-
fun polygonscan(apiKeys: List<String>): TransactionSource {
38-
return TransactionSource(
39-
"polygonscan.com",
40-
SourceType.Etherscan("https://api.polygonscan.com", "https://polygonscan.com", apiKeys)
41-
)
42-
}
43-
44-
fun optimisticEtherscan(apiKeys: List<String>): TransactionSource {
45-
return TransactionSource(
46-
"optimistic.etherscan.io",
47-
SourceType.Etherscan("https://api-optimistic.etherscan.io", "https://optimistic.etherscan.io", apiKeys)
48-
)
49-
}
50-
51-
fun arbiscan(apiKeys: List<String>): TransactionSource {
52-
return TransactionSource(
53-
"arbiscan.io",
54-
SourceType.Etherscan("https://api.arbiscan.io", "https://arbiscan.io", apiKeys)
55-
)
56-
}
57-
58-
fun snowtrace(apiKeys: List<String>): TransactionSource {
59-
return TransactionSource(
60-
"snowtrace.io",
61-
SourceType.Etherscan("https://api.snowtrace.io", "https://snowtrace.io", apiKeys)
62-
)
63-
}
64-
65-
fun gnosis(apiKeys: List<String>): TransactionSource {
66-
return TransactionSource(
67-
"gnosisscan.io",
68-
SourceType.Etherscan("https://api.gnosisscan.io", "https://gnosisscan.io", apiKeys)
69-
)
70-
}
71-
72-
fun fantom(apiKeys: List<String>): TransactionSource {
73-
return TransactionSource(
74-
"ftmscan.com",
75-
SourceType.Etherscan("https://api.ftmscan.com", "https://ftmscan.com", apiKeys)
76-
)
77-
}
78-
79-
fun basescan(apiKeys: List<String>): TransactionSource {
80-
return TransactionSource(
81-
"basescan.org",
82-
SourceType.Etherscan("https://api.basescan.org", "https://basescan.org", apiKeys)
83-
)
84-
}
85-
86-
fun eraZkSync(apiKeys: List<String>): TransactionSource {
87-
return TransactionSource(
88-
"era.zksync.network",
89-
SourceType.Etherscan("https://api-era.zksync.network", "https://era.zksync.network", apiKeys)
90-
)
91-
}
92-
9326
}
9427

9528
}

0 commit comments

Comments
 (0)