CipherLabs
/
alpha-wallet-android
mirror of https://github.com/AlphaWallet/alpha-wallet-android
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump gradle for point release

Browse Source 
resolve deprecated testnet RPCs
pull/2887/merge
James Brown 2 years ago
parent 69ed135773
commit 32f60498b5
4 changed files with 18 additions and 23 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      app/build.gradle
  2. 31
      app/src/main/java/com/alphawallet/app/repository/EthereumNetworkBase.java
  3. 4
      app/src/main/java/com/alphawallet/app/service/TickerService.java
  4. 2
      build.gradle

4
app/build.gradle
Unescape View File

@ -85,8 +85,8 @@ android {
}
}
defaultConfig {
versionCode 204
versionName "3.60"
versionCode 205
versionName "3.61"
applicationId "io.stormbird.wallet"
minSdkVersion 23

31
app/src/main/java/com/alphawallet/app/repository/EthereumNetworkBase.java
Unescape View File

@ -122,21 +122,15 @@ public abstract class EthereumNetworkBase implements EthereumNetworkRepositoryTy
public static final String FREE_MAINNET_RPC_URL = "https://rpc.ankr.com/eth";
public static final String FREE_POLYGON_RPC_URL = "https://polygon-rpc.com";
public static final String FREE_ARBITRUM_RPC_URL = "https://arbitrum.public-rpc.com";
public static final String FREE_RINKEBY_RPC_URL = "https://rpc.ankr.com/eth_rinkeby";
public static final String FREE_GOERLI_RPC_URL = "https://rpc.ankr.com/eth_goerli";
public static final String FREE_MUMBAI_RPC_URL = "https://rpc-mumbai.maticvigil.com";
public static final String FREE_ARBITRUM_TEST_RPC_URL = "https://rinkeby.arbitrum.io/rpc";
public static final String FREE_KOVAN_RPC_URL = "https://kovan.poa.network";
public static final String FREE_PALM_RPC_URL = "https://palm-mainnet.infura.io/v3/3a961d6501e54add9a41aa53f15de99b";
public static final String FREE_PALM_TEST_RPC_URL = "https://palm-testnet.infura.io/v3/3a961d6501e54add9a41aa53f15de99b";
public static final String FREE_CRONOS_MAIN_BETA_RPC_URL = "https://evm.cronos.org";
public static final String MAINNET_RPC_URL = usesProductionKey ? "https://mainnet.infura.io/v3/" + keyProvider.getInfuraKey()
: FREE_MAINNET_RPC_URL;
public static final String RINKEBY_RPC_URL = usesProductionKey ? "https://rinkeby.infura.io/v3/" + keyProvider.getInfuraKey()
: FREE_RINKEBY_RPC_URL;
public static final String KOVAN_RPC_URL = usesProductionKey ? "https://kovan.infura.io/v3/" + keyProvider.getInfuraKey()
: FREE_KOVAN_RPC_URL;
public static final String GOERLI_RPC_URL = usesProductionKey ? "https://goerli.infura.io/v3/" + keyProvider.getInfuraKey()
: FREE_GOERLI_RPC_URL;
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
: FREE_MUMBAI_RPC_URL;
public static final String OPTIMISTIC_MAIN_URL = usesProductionKey ? "https://optimism-mainnet.infura.io/v3/" + keyProvider.getInfuraKey()
: OPTIMISTIC_MAIN_FALLBACK_URL;
public static final String OPTIMISTIC_TEST_URL = usesProductionKey ? "https://optimism-kovan.infura.io/v3/" + keyProvider.getInfuraKey()
: OPTIMISTIC_TEST_FALLBACK_URL;
public static final String ARBITRUM_TESTNET_RPC = usesProductionKey ? "https://arbitrum-rinkeby.infura.io/v3/" + keyProvider.getInfuraKey()
: FREE_ARBITRUM_TEST_RPC_URL;
public static final String PALM_RPC_URL = usesProductionKey ? "https://palm-mainnet.infura.io/v3/" + keyProvider.getInfuraKey()
: FREE_PALM_RPC_URL;
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
// Use the "Free" routes as backup in order to diversify node usage; to avoid single point of failure
public static final String MAINNET_FALLBACK_RPC_URL = usesProductionKey ? FREE_MAINNET_RPC_URL : "https://mainnet.infura.io/v3/" + keyProvider.getSecondaryInfuraKey();
public static final String RINKEBY_FALLBACK_RPC_URL = usesProductionKey ? FREE_RINKEBY_RPC_URL : "https://rinkeby.infura.io/v3/" + keyProvider.getSecondaryInfuraKey();
public static final String KOVAN_FALLBACK_RPC_URL = usesProductionKey ? FREE_KOVAN_RPC_URL : "https://kovan.infura.io/v3/" + keyProvider.getSecondaryInfuraKey();
public static final String GOERLI_FALLBACK_RPC_URL = usesProductionKey ? FREE_GOERLI_RPC_URL : "https://goerli.infura.io/v3/" + keyProvider.getSecondaryInfuraKey();
public static final String ARBITRUM_FALLBACK_MAINNET_RPC = usesProductionKey ? FREE_ARBITRUM_RPC_URL : "https://arbitrum-mainnet.infura.io/v3/" + keyProvider.getSecondaryInfuraKey();
public static final String PALM_RPC_FALLBACK_URL = usesProductionKey ? FREE_PALM_RPC_URL : "https://palm-mainnet.infura.io/v3/" + keyProvider.getSecondaryInfuraKey();
public static final String PALM_TEST_RPC_FALLBACK_URL = usesProductionKey ? FREE_PALM_RPC_URL : "https://palm-testnet.infura.io/v3/" + keyProvider.getSecondaryInfuraKey();
//Deprecated: for now these RPCs still work
public static final String ROPSTEN_RPC_URL = "https://rpc.ankr.com/eth_ropsten";
public static final String RINKEBY_RPC_URL = "https://rpc.ankr.com/eth_rinkeby";
public static final String ARBITRUM_TESTNET_RPC = FREE_ARBITRUM_TEST_RPC_URL;
public static final String SOKOL_RPC_URL = "https://sokol.poa.network";
//These Networks are no longer running
public static final String KOVAN_RPC_URL = "https://kovan.poa.network";
public static final String OPTIMISTIC_TEST_URL = OPTIMISTIC_TEST_FALLBACK_URL;
//Note that AlphaWallet now uses a double node configuration. See class AWHttpService comment 'try primary node'.
//If you supply a main RPC and secondary it will try the secondary if the primary node times out after 10 seconds.
//See the declaration of NetworkInfo - it has a member backupNodeUrl. Put your secondary node here.
public static final String ROPSTEN_FALLBACK_RPC_URL = "https://ropsten.infura.io/v3/" + keyProvider.getSecondaryInfuraKey();
public static final String CLASSIC_RPC_URL = "https://www.ethercluster.com/etc";
public static final String POA_RPC_URL = "https://core.poa.network/";
public static final String ROPSTEN_RPC_URL = "https://ropsten.infura.io/v3/" + keyProvider.getInfuraKey();
public static final String SOKOL_RPC_URL = "https://sokol.poa.network";
public static final String ARTIS_SIGMA1_RPC_URL = "https://rpc.sigma1.artis.network";
public static final String ARTIS_TAU1_RPC_URL = "https://rpc.tau1.artis.network";
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
put(ROPSTEN_ID, new NetworkInfo(C.ROPSTEN_NETWORK_NAME, C.ETH_SYMBOL,
ROPSTEN_RPC_URL,
"https://ropsten.etherscan.io/tx/", ROPSTEN_ID,
ROPSTEN_FALLBACK_RPC_URL, "https://api-ropsten.etherscan.io/api?"));
ROPSTEN_RPC_URL, "https://api-ropsten.etherscan.io/api?"));
put(RINKEBY_ID, new NetworkInfo(C.RINKEBY_NETWORK_NAME, C.ETH_SYMBOL,
RINKEBY_RPC_URL,
"https://rinkeby.etherscan.io/tx/", RINKEBY_ID,
RINKEBY_FALLBACK_RPC_URL, "https://api-rinkeby.etherscan.io/api?"));
RINKEBY_RPC_URL, "https://api-rinkeby.etherscan.io/api?"));
put(KOVAN_ID, new NetworkInfo(C.KOVAN_NETWORK_NAME, C.ETH_SYMBOL,
KOVAN_RPC_URL,
"https://kovan.etherscan.io/tx/", KOVAN_ID,
KOVAN_FALLBACK_RPC_URL, "https://api-kovan.etherscan.io/api?"));
KOVAN_RPC_URL, "https://api-kovan.etherscan.io/api?"));
put(SOKOL_ID, new NetworkInfo(C.SOKOL_NETWORK_NAME, C.POA_SYMBOL,
SOKOL_RPC_URL,
"https://blockscout.com/poa/sokol/tx/", SOKOL_ID,

4
app/src/main/java/com/alphawallet/app/service/TickerService.java
Unescape View File

@ -78,7 +78,7 @@ import timber.log.Timber;
public class TickerService
{
private static final int UPDATE_TICKER_CYCLE = 1; //5 Minutes
private static final int UPDATE_TICKER_CYCLE = 5; //5 Minutes
private static final String MEDIANIZER = "0x729D19f657BD0614b4985Cf1D82531c67569197B";
private static final String MARKET_ORACLE_CONTRACT = "0xdAcAf435f241B1a062B021abEED9CA2F76F22F8D";
private static final String CONTRACT_ADDR = "[CONTRACT_ADDR]";
@ -229,7 +229,7 @@ public class TickerService
return Single.fromCallable(() -> {
int tickerSize = 0;
final Web3j web3j = TokenRepository.getWeb3jService(POLYGON_TEST_ID);
//fetch current tickerscd
//fetch current tickers
Function function = getTickers();
String responseValue = callSmartContractFunction(web3j, function, MARKET_ORACLE_CONTRACT);
List<Type> responseValues = FunctionReturnDecoder.decode(responseValue, function.getOutputParameters());

2
build.gradle
Unescape View File

@ -25,7 +25,7 @@ buildscript {
}
allprojects {
apply from: rootProject.file("codestyle.gradle")
//apply from: rootProject.file("codestyle.gradle")
repositories {
google()

Write Preview
Loading…
Cancel
Save