Skip to content

Commit 32f6049

Browse files
JamesSmartCellJamesSmartCell
committed
Bump gradle for point release
resolve deprecated testnet RPCs
1 parent 69ed135 commit 32f6049

File tree

4 files changed

+18
-23
lines changed

4 files changed

+18
-23
lines changed

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ android {
8585
}
8686
}
8787
defaultConfig {
88-
versionCode 204
89-
versionName "3.60"
88+
versionCode 205
89+
versionName "3.61"
9090

9191
applicationId "io.stormbird.wallet"
9292
minSdkVersion 23

‎app/src/main/java/com/alphawallet/app/repository/EthereumNetworkBase.java‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -122,21 +122,15 @@ public abstract class EthereumNetworkBase implements EthereumNetworkRepositoryTy
122122
public static final String FREE_MAINNET_RPC_URL = "https://rpc.ankr.com/eth";
123123
public static final String FREE_POLYGON_RPC_URL = "https://polygon-rpc.com";
124124
public static final String FREE_ARBITRUM_RPC_URL = "https://arbitrum.public-rpc.com";
125-
public static final String FREE_RINKEBY_RPC_URL = "https://rpc.ankr.com/eth_rinkeby";
126125
public static final String FREE_GOERLI_RPC_URL = "https://rpc.ankr.com/eth_goerli";
127126
public static final String FREE_MUMBAI_RPC_URL = "https://rpc-mumbai.maticvigil.com";
128127
public static final String FREE_ARBITRUM_TEST_RPC_URL = "https://rinkeby.arbitrum.io/rpc";
129-
public static final String FREE_KOVAN_RPC_URL = "https://kovan.poa.network";
130128
public static final String FREE_PALM_RPC_URL = "https://palm-mainnet.infura.io/v3/3a961d6501e54add9a41aa53f15de99b";
131129
public static final String FREE_PALM_TEST_RPC_URL = "https://palm-testnet.infura.io/v3/3a961d6501e54add9a41aa53f15de99b";
132130
public static final String FREE_CRONOS_MAIN_BETA_RPC_URL = "https://evm.cronos.org";
133131

134132
public static final String MAINNET_RPC_URL = usesProductionKey ? "https://mainnet.infura.io/v3/" + keyProvider.getInfuraKey()
135133
: FREE_MAINNET_RPC_URL;
136-
public static final String RINKEBY_RPC_URL = usesProductionKey ? "https://rinkeby.infura.io/v3/" + keyProvider.getInfuraKey()
137-
: FREE_RINKEBY_RPC_URL;
138-
public static final String KOVAN_RPC_URL = usesProductionKey ? "https://kovan.infura.io/v3/" + keyProvider.getInfuraKey()
139-
: FREE_KOVAN_RPC_URL;
140134
public static final String GOERLI_RPC_URL = usesProductionKey ? "https://goerli.infura.io/v3/" + keyProvider.getInfuraKey()
141135
: FREE_GOERLI_RPC_URL;
142136
public static final String POLYGON_RPC_URL = usesProductionKey ? "https://polygon-mainnet.infura.io/v3/" + keyProvider.getInfuraKey()
@@ -147,10 +141,6 @@ public abstract class EthereumNetworkBase implements EthereumNetworkRepositoryTy
147141
: FREE_MUMBAI_RPC_URL;
148142
public static final String OPTIMISTIC_MAIN_URL = usesProductionKey ? "https://optimism-mainnet.infura.io/v3/" + keyProvider.getInfuraKey()
149143
: OPTIMISTIC_MAIN_FALLBACK_URL;
150-
public static final String OPTIMISTIC_TEST_URL = usesProductionKey ? "https://optimism-kovan.infura.io/v3/" + keyProvider.getInfuraKey()
151-
: OPTIMISTIC_TEST_FALLBACK_URL;
152-
public static final String ARBITRUM_TESTNET_RPC = usesProductionKey ? "https://arbitrum-rinkeby.infura.io/v3/" + keyProvider.getInfuraKey()
153-
: FREE_ARBITRUM_TEST_RPC_URL;
154144
public static final String PALM_RPC_URL = usesProductionKey ? "https://palm-mainnet.infura.io/v3/" + keyProvider.getInfuraKey()
155145
: FREE_PALM_RPC_URL;
156146
public static final String PALM_TEST_RPC_URL = usesProductionKey ? "https://palm-testnet.infura.io/v3/" + keyProvider.getInfuraKey()
@@ -163,22 +153,27 @@ public abstract class EthereumNetworkBase implements EthereumNetworkRepositoryTy
163153

164154
// Use the "Free" routes as backup in order to diversify node usage; to avoid single point of failure
165155
public static final String MAINNET_FALLBACK_RPC_URL = usesProductionKey ? FREE_MAINNET_RPC_URL : "https://mainnet.infura.io/v3/" + keyProvider.getSecondaryInfuraKey();
166-
public static final String RINKEBY_FALLBACK_RPC_URL = usesProductionKey ? FREE_RINKEBY_RPC_URL : "https://rinkeby.infura.io/v3/" + keyProvider.getSecondaryInfuraKey();
167-
public static final String KOVAN_FALLBACK_RPC_URL = usesProductionKey ? FREE_KOVAN_RPC_URL : "https://kovan.infura.io/v3/" + keyProvider.getSecondaryInfuraKey();
168156
public static final String GOERLI_FALLBACK_RPC_URL = usesProductionKey ? FREE_GOERLI_RPC_URL : "https://goerli.infura.io/v3/" + keyProvider.getSecondaryInfuraKey();
169157
public static final String ARBITRUM_FALLBACK_MAINNET_RPC = usesProductionKey ? FREE_ARBITRUM_RPC_URL : "https://arbitrum-mainnet.infura.io/v3/" + keyProvider.getSecondaryInfuraKey();
170158
public static final String PALM_RPC_FALLBACK_URL = usesProductionKey ? FREE_PALM_RPC_URL : "https://palm-mainnet.infura.io/v3/" + keyProvider.getSecondaryInfuraKey();
171159
public static final String PALM_TEST_RPC_FALLBACK_URL = usesProductionKey ? FREE_PALM_RPC_URL : "https://palm-testnet.infura.io/v3/" + keyProvider.getSecondaryInfuraKey();
172160

161+
//Deprecated: for now these RPCs still work
162+
public static final String ROPSTEN_RPC_URL = "https://rpc.ankr.com/eth_ropsten";
163+
public static final String RINKEBY_RPC_URL = "https://rpc.ankr.com/eth_rinkeby";
164+
public static final String ARBITRUM_TESTNET_RPC = FREE_ARBITRUM_TEST_RPC_URL;
165+
public static final String SOKOL_RPC_URL = "https://sokol.poa.network";
166+
167+
//These Networks are no longer running
168+
public static final String KOVAN_RPC_URL = "https://kovan.poa.network";
169+
public static final String OPTIMISTIC_TEST_URL = OPTIMISTIC_TEST_FALLBACK_URL;
170+
173171
//Note that AlphaWallet now uses a double node configuration. See class AWHttpService comment 'try primary node'.
174172
//If you supply a main RPC and secondary it will try the secondary if the primary node times out after 10 seconds.
175173
//See the declaration of NetworkInfo - it has a member backupNodeUrl. Put your secondary node here.
176174

177-
public static final String ROPSTEN_FALLBACK_RPC_URL = "https://ropsten.infura.io/v3/" + keyProvider.getSecondaryInfuraKey();
178175
public static final String CLASSIC_RPC_URL = "https://www.ethercluster.com/etc";
179176
public static final String POA_RPC_URL = "https://core.poa.network/";
180-
public static final String ROPSTEN_RPC_URL = "https://ropsten.infura.io/v3/" + keyProvider.getInfuraKey();
181-
public static final String SOKOL_RPC_URL = "https://sokol.poa.network";
182177
public static final String ARTIS_SIGMA1_RPC_URL = "https://rpc.sigma1.artis.network";
183178
public static final String ARTIS_TAU1_RPC_URL = "https://rpc.tau1.artis.network";
184179
public static final String BINANCE_TEST_RPC_URL = "https://data-seed-prebsc-1-s3.binance.org:8545";
@@ -363,15 +358,15 @@ public abstract class EthereumNetworkBase implements EthereumNetworkRepositoryTy
363358
put(ROPSTEN_ID, new NetworkInfo(C.ROPSTEN_NETWORK_NAME, C.ETH_SYMBOL,
364359
ROPSTEN_RPC_URL,
365360
"https://ropsten.etherscan.io/tx/", ROPSTEN_ID,
366-
ROPSTEN_FALLBACK_RPC_URL, "https://api-ropsten.etherscan.io/api?"));
361+
ROPSTEN_RPC_URL, "https://api-ropsten.etherscan.io/api?"));
367362
put(RINKEBY_ID, new NetworkInfo(C.RINKEBY_NETWORK_NAME, C.ETH_SYMBOL,
368363
RINKEBY_RPC_URL,
369364
"https://rinkeby.etherscan.io/tx/", RINKEBY_ID,
370-
RINKEBY_FALLBACK_RPC_URL, "https://api-rinkeby.etherscan.io/api?"));
365+
RINKEBY_RPC_URL, "https://api-rinkeby.etherscan.io/api?"));
371366
put(KOVAN_ID, new NetworkInfo(C.KOVAN_NETWORK_NAME, C.ETH_SYMBOL,
372367
KOVAN_RPC_URL,
373368
"https://kovan.etherscan.io/tx/", KOVAN_ID,
374-
KOVAN_FALLBACK_RPC_URL, "https://api-kovan.etherscan.io/api?"));
369+
KOVAN_RPC_URL, "https://api-kovan.etherscan.io/api?"));
375370
put(SOKOL_ID, new NetworkInfo(C.SOKOL_NETWORK_NAME, C.POA_SYMBOL,
376371
SOKOL_RPC_URL,
377372
"https://blockscout.com/poa/sokol/tx/", SOKOL_ID,

‎app/src/main/java/com/alphawallet/app/service/TickerService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878

7979
public class TickerService
8080
{
81-
private static final int UPDATE_TICKER_CYCLE = 1; //5 Minutes
81+
private static final int UPDATE_TICKER_CYCLE = 5; //5 Minutes
8282
private static final String MEDIANIZER = "0x729D19f657BD0614b4985Cf1D82531c67569197B";
8383
private static final String MARKET_ORACLE_CONTRACT = "0xdAcAf435f241B1a062B021abEED9CA2F76F22F8D";
8484
private static final String CONTRACT_ADDR = "[CONTRACT_ADDR]";
@@ -229,7 +229,7 @@ private Single<Integer> updateTickersFromOracle(double conversionRate)
229229
return Single.fromCallable(() -> {
230230
int tickerSize = 0;
231231
final Web3j web3j = TokenRepository.getWeb3jService(POLYGON_TEST_ID);
232-
//fetch current tickerscd
232+
//fetch current tickers
233233
Function function = getTickers();
234234
String responseValue = callSmartContractFunction(web3j, function, MARKET_ORACLE_CONTRACT);
235235
List<Type> responseValues = FunctionReturnDecoder.decode(responseValue, function.getOutputParameters());

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ buildscript {
2525
}
2626

2727
allprojects {
28-
apply from: rootProject.file("codestyle.gradle")
28+
//apply from: rootProject.file("codestyle.gradle")
2929

3030
repositories {
3131
google()

0 commit comments

Comments
 (0)