Remove POA network and all references (#3132)

pull/3140/head
justindg 2 years ago committed by GitHub
parent b800fc7b7d
commit f826c58cfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      README.md
  2. 3
      app/src/main/java/com/alphawallet/app/C.java
  3. 11
      app/src/main/java/com/alphawallet/app/repository/EthereumNetworkBase.java
  4. 2
      app/src/main/java/com/alphawallet/app/service/TickerService.java
  5. 2
      app/src/main/java/com/alphawallet/app/util/Utils.java
  6. 22
      app/src/main/res/drawable/ic_icons_network_poa.xml
  7. 24
      app/src/main/res/drawable/ic_poa_logo.xml
  8. 1
      app/src/main/res/values/colors_misc.xml
  9. 3
      dmz/src/main/java/com/alphawallet/token/web/Service/EthRPCNodes.java
  10. 2
      fastlane/metadata/android/en-US/full_description.txt
  11. 4
      lib/src/main/java/com/alphawallet/ethereum/EthereumNetworkBase.java
  12. 9
      lib/src/main/java/com/alphawallet/token/entity/MagicLinkInfo.java

@ -21,7 +21,7 @@ AlphaWallet and TokenScript have been used by tokenisation projects like FIFA an
## About AlphaWallet - Features
Easy to use and secure open source Ethereum wallet for Android and iOS, with native ERC20, ERC721, ERC1155 and ERC875 support. AlphaWallet supports all Ethereum based networks: Ethereum, xDai, Ethereum Classic, Artis, POA, Binance Smart Chain, Heco, Polygon, Avalanche, Fantom, L2 chains Optimistic and Arbitrum, and Palm.
Easy to use and secure open source Ethereum wallet for Android and iOS, with native ERC20, ERC721, ERC1155 and ERC875 support. AlphaWallet supports all Ethereum based networks: Ethereum, xDai, Ethereum Classic, Artis, Binance Smart Chain, Heco, Polygon, Avalanche, Fantom, L2 chains Optimistic and Arbitrum, and Palm.
TestChains: Goerli, Binance Test, Heco Test, Fuji (Avalanche test), Fantom Test, Polygon Test, Optimistic and Arbitrum Test, Cronos Test and Palm test.
- Beginner Friendly

@ -22,7 +22,6 @@ public abstract class C {
public static final String ETHEREUM_NETWORK_NAME = "Ethereum";
public static final String CLASSIC_NETWORK_NAME = "Ethereum Classic";
public static final String POA_NETWORK_NAME = "POA";
public static final String XDAI_NETWORK_NAME = "Gnosis";
public static final String GOERLI_NETWORK_NAME = "Görli (Test)";
public static final String ARTIS_SIGMA1_NETWORK = "ARTIS sigma1";
@ -63,12 +62,10 @@ public abstract class C {
public static final String BINANCE_TICKER = "binance";
public static final String ETHEREUM_TICKER = "ethereum";
public static final String POA_TICKER = "poa";
public static final String USD_SYMBOL = "$";
public static final String ETH_SYMBOL = "ETH";
public static final String xDAI_SYMBOL = "xDai";
public static final String POA_SYMBOL = "POA";
public static final String ETC_SYMBOL = "ETC";
public static final String GOERLI_SYMBOL = "GÖETH";
public static final String ARTIS_SIGMA1_SYMBOL = "ATS";

@ -56,7 +56,6 @@ import static com.alphawallet.ethereum.EthereumNetworkBase.OPTIMISTIC_MAIN_FALLB
import static com.alphawallet.ethereum.EthereumNetworkBase.OPTIMISTIC_MAIN_ID;
import static com.alphawallet.ethereum.EthereumNetworkBase.PALM_ID;
import static com.alphawallet.ethereum.EthereumNetworkBase.PALM_TEST_ID;
import static com.alphawallet.ethereum.EthereumNetworkBase.POA_ID;
import static com.alphawallet.ethereum.EthereumNetworkBase.POLYGON_ID;
import static com.alphawallet.ethereum.EthereumNetworkBase.POLYGON_TEST_ID;
import static com.alphawallet.ethereum.EthereumNetworkBase.SEPOLIA_TESTNET_ID;
@ -157,7 +156,6 @@ public abstract class EthereumNetworkBase implements EthereumNetworkRepositoryTy
//See the declaration of NetworkInfo - it has a member backupNodeUrl. Put your secondary node here.
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 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";
@ -178,7 +176,7 @@ public abstract class EthereumNetworkBase implements EthereumNetworkRepositoryTy
//If your wallet prioritises xDai for example, you may want to move the XDAI_ID to the front of this list,
//Then xDai would appear as the first token at the top of the wallet
private static final List<Long> hasValue = new ArrayList<>(Arrays.asList(
MAINNET_ID, GNOSIS_ID, POLYGON_ID, CLASSIC_ID, POA_ID, ARTIS_SIGMA1_ID, BINANCE_MAIN_ID, HECO_ID, AVALANCHE_ID,
MAINNET_ID, GNOSIS_ID, POLYGON_ID, CLASSIC_ID, ARTIS_SIGMA1_ID, BINANCE_MAIN_ID, HECO_ID, AVALANCHE_ID,
FANTOM_ID, OPTIMISTIC_MAIN_ID, CRONOS_MAIN_ID, ARBITRUM_MAIN_ID, PALM_ID, KLAYTN_ID, IOTEX_MAINNET_ID, AURORA_MAINNET_ID, MILKOMEDA_C1_ID, OKX_ID));
private static final List<Long> testnetList = new ArrayList<>(Arrays.asList(
@ -234,10 +232,6 @@ public abstract class EthereumNetworkBase implements EthereumNetworkRepositoryTy
XDAI_RPC_URL,
"https://blockscout.com/xdai/mainnet/tx/", GNOSIS_ID,
"https://rpc.ankr.com/gnosis", "https://blockscout.com/xdai/mainnet/api?"));
put(POA_ID, new NetworkInfo(C.POA_NETWORK_NAME, C.POA_SYMBOL,
POA_RPC_URL,
"https://blockscout.com/poa/core/tx/", POA_ID, POA_RPC_URL,
"https://blockscout.com/poa/core/api?"));
put(ARTIS_SIGMA1_ID, new NetworkInfo(C.ARTIS_SIGMA1_NETWORK, C.ARTIS_SIGMA1_SYMBOL,
ARTIS_SIGMA1_RPC_URL,
"https://explorer.sigma1.artis.network/tx/", ARTIS_SIGMA1_ID,
@ -373,7 +367,6 @@ public abstract class EthereumNetworkBase implements EthereumNetworkRepositoryTy
{
put(MAINNET_ID, R.drawable.ic_token_eth);
put(CLASSIC_ID, R.drawable.ic_icons_network_etc); //classic_logo
put(POA_ID, R.drawable.ic_poa_logo);
put(GNOSIS_ID, R.drawable.ic_icons_network_gnosis);
put(GOERLI_ID, R.drawable.ic_goerli);
put(ARTIS_SIGMA1_ID, R.drawable.ic_artis_sigma_logo);
@ -414,7 +407,6 @@ public abstract class EthereumNetworkBase implements EthereumNetworkRepositoryTy
{
put(MAINNET_ID, R.drawable.ic_icons_network_eth);
put(CLASSIC_ID, R.drawable.ic_icons_network_etc);
put(POA_ID, R.drawable.ic_icons_network_poa);
put(GNOSIS_ID, R.drawable.ic_icons_network_gnosis);
put(GOERLI_ID, R.drawable.ic_goerli);
put(ARTIS_SIGMA1_ID, R.drawable.ic_icons_network_artis);
@ -455,7 +447,6 @@ public abstract class EthereumNetworkBase implements EthereumNetworkRepositoryTy
{
put(MAINNET_ID, R.color.mainnet);
put(CLASSIC_ID, R.color.classic);
put(POA_ID, R.color.poa);
put(GNOSIS_ID, R.color.xdai);
put(GOERLI_ID, R.color.goerli);
put(ARTIS_SIGMA1_ID, R.color.artis_sigma1);

@ -17,7 +17,6 @@ import static com.alphawallet.ethereum.EthereumNetworkBase.MAINNET_ID;
import static com.alphawallet.ethereum.EthereumNetworkBase.MILKOMEDA_C1_ID;
import static com.alphawallet.ethereum.EthereumNetworkBase.OKX_ID;
import static com.alphawallet.ethereum.EthereumNetworkBase.OPTIMISTIC_MAIN_ID;
import static com.alphawallet.ethereum.EthereumNetworkBase.POA_ID;
import static com.alphawallet.ethereum.EthereumNetworkBase.POLYGON_ID;
import static com.alphawallet.ethereum.EthereumNetworkBase.POLYGON_TEST_ID;
import static org.web3j.protocol.core.methods.request.Transaction.createEthCallTransaction;
@ -759,7 +758,6 @@ public class TickerService
{{
put(MAINNET_ID, "ethereum");
put(CLASSIC_ID, "ethereum-classic");
put(POA_ID, "poa-network");
put(GNOSIS_ID, "xdai");
put(BINANCE_MAIN_ID, "binancecoin");
put(HECO_ID, "huobi-token");

@ -6,7 +6,6 @@ import static com.alphawallet.ethereum.EthereumNetworkBase.CLASSIC_ID;
import static com.alphawallet.ethereum.EthereumNetworkBase.GNOSIS_ID;
import static com.alphawallet.ethereum.EthereumNetworkBase.MAINNET_ID;
import static com.alphawallet.ethereum.EthereumNetworkBase.OPTIMISTIC_MAIN_ID;
import static com.alphawallet.ethereum.EthereumNetworkBase.POA_ID;
import static com.alphawallet.ethereum.EthereumNetworkBase.POLYGON_ID;
import android.app.Activity;
@ -803,7 +802,6 @@ public class Utils
{
put(CLASSIC_ID, "classic");
put(GNOSIS_ID, "xdai");
put(POA_ID, "poa");
put(BINANCE_MAIN_ID, "smartchain");
put(AVALANCHE_ID, "avalanche");
put(OPTIMISTIC_MAIN_ID, "optimism");

@ -1,22 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="16dp"
android:viewportWidth="16"
android:viewportHeight="16">
<path
android:pathData="M8,8m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
android:fillColor="#6325AD"
android:fillType="evenOdd"/>
<path
android:pathData="M8.2,3.2a1,1 0,0 1,1 1v2.999L12.2,7.2a1,1 0,0 1,1 1v3.6a1,1 0,1 1,-2 0L11.2,9.2L9.2,9.2v2.6a1,1 0,1 1,-2 0L7.2,9.2L5.2,9.2v2.6a1,1 0,1 1,-2 0L3.2,8.2a1,1 0,0 1,0.883 -0.993L4.2,7.2l3,-0.001L7.2,4.2a1,1 0,0 1,1 -1z"
android:fillColor="#FFF"
android:fillType="evenOdd"/>
<path
android:pathData="M12.2,3.2L12.2,3.2A1,1 0,0 1,13.2 4.2L13.2,4.2A1,1 0,0 1,12.2 5.2L12.2,5.2A1,1 0,0 1,11.2 4.2L11.2,4.2A1,1 0,0 1,12.2 3.2z"
android:fillColor="#FFF"
android:fillType="evenOdd"/>
<path
android:pathData="M4.2,3.2L4.2,3.2A1,1 0,0 1,5.2 4.2L5.2,4.2A1,1 0,0 1,4.2 5.2L4.2,5.2A1,1 0,0 1,3.2 4.2L3.2,4.2A1,1 0,0 1,4.2 3.2z"
android:fillColor="#FFF"
android:fillType="evenOdd"/>
</vector>

@ -1,24 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="40dp"
android:height="40dp"
android:viewportWidth="40"
android:viewportHeight="40">
<path
android:strokeWidth="1"
android:pathData="M20,20m-19.5,0a19.5,19.5 0,1 1,39 0a19.5,19.5 0,1 1,-39 0"
android:fillColor="#FFF"
android:strokeColor="#DDD"
android:fillType="evenOdd"/>
<group>
<clip-path
android:pathData="M8,8.055L31.84,8.055 31.84,31.894 8,31.894z"/>
<path
android:pathData="M8.006,24.74c0,-2.29 0.004,-4.58 -0.006,-6.87 -0.001,-0.237 0.065,-0.284 0.29,-0.283 2.983,0.008 5.966,0.002 8.949,0.01 0.236,0.001 0.306,-0.045 0.305,-0.296C17.534,14.318 17.54,11.335 17.53,8.352c0,-0.251 0.069,-0.299 0.305,-0.297 1.394,0.012 2.789,0.012 4.183,0 0.226,-0.001 0.29,0.048 0.29,0.283 -0.009,2.983 -0.002,5.966 -0.012,8.949 -0.001,0.259 0.073,0.311 0.318,0.31 2.974,-0.008 5.947,-0.002 8.92,-0.01 0.236,-0.001 0.306,0.044 0.306,0.296 -0.01,4.571 -0.01,9.142 0,13.714 0,0.25 -0.067,0.3 -0.304,0.297 -1.395,-0.012 -2.79,-0.011 -4.184,0 -0.225,0.002 -0.29,-0.046 -0.29,-0.283 0.009,-2.983 0.002,-5.965 0.012,-8.948 0.001,-0.259 -0.072,-0.314 -0.318,-0.311 -1.394,0.011 -2.789,0.01 -4.183,0 -0.21,0 -0.278,0.043 -0.276,0.268 0.011,1.413 0,2.826 0.011,4.24 0.002,0.223 -0.065,0.269 -0.276,0.267 -1.413,-0.009 -2.826,-0.008 -4.239,0 -0.2,0.002 -0.263,-0.04 -0.262,-0.254 0.011,-1.413 0,-2.826 0.012,-4.239 0.002,-0.236 -0.065,-0.284 -0.29,-0.282 -1.395,0.01 -2.79,0.011 -4.184,0 -0.236,-0.002 -0.305,0.046 -0.304,0.297 0.01,2.983 0.003,5.965 0.013,8.948 0,0.252 -0.07,0.299 -0.305,0.297 -1.394,-0.012 -2.789,-0.011 -4.183,0 -0.226,0.002 -0.291,-0.048 -0.29,-0.283 0.01,-2.29 0.006,-4.58 0.006,-6.871"
android:fillColor="#6325AD"
android:fillType="evenOdd"/>
</group>
<path
android:pathData="M8.006,10.43c0,-0.711 0.004,-1.422 -0.003,-2.133C8,8.132 8.022,8.055 8.22,8.057c1.45,0.009 2.9,0.006 4.35,0.001 0.152,0 0.205,0.035 0.204,0.197 -0.006,1.46 -0.006,2.919 0,4.378 0,0.162 -0.053,0.197 -0.205,0.197 -1.45,-0.006 -2.9,-0.008 -4.35,0.002 -0.199,0 -0.219,-0.077 -0.217,-0.241 0.007,-0.72 0.003,-1.44 0.003,-2.161M29.461,8.061c0.72,0 1.44,0.006 2.16,-0.004 0.172,-0.002 0.217,0.045 0.216,0.216 -0.007,1.45 -0.007,2.9 0,4.35 0.002,0.182 -0.063,0.207 -0.222,0.207 -1.44,-0.006 -2.881,-0.007 -4.322,0 -0.181,0.002 -0.23,-0.048 -0.23,-0.229 0.008,-1.44 0.009,-2.88 0,-4.321 -0.001,-0.194 0.068,-0.224 0.237,-0.222 0.72,0.008 1.44,0.003 2.161,0.003"
android:fillColor="#6325AD"
android:fillType="evenOdd"/>
</vector>

@ -16,7 +16,6 @@
<color name="mainnet">#2986AF</color>
<color name="xdai">#48A9A6</color>
<color name="classic">#378937</color>
<color name="poa">#5838A3</color>
<color name="goerli">#BBAE9A</color>
<color name="artis_sigma1">#53A271</color>
<color name="artis_tau1">#F97599</color>

@ -9,7 +9,6 @@ public class EthRPCNodes
private static final String MAINNET_RPC_URL = "https://mainnet.infura.io/v3/" + getInfuraKey();
private static final String CLASSIC_RPC_URL = "https://www.ethercluster.com/etc";
private static final String XDAI_RPC_URL = EthereumNetworkBase.XDAI_RPC_URL;
private static final String POA_RPC_URL = "https://core.poa.network/";
private static final String GOERLI_RPC_URL = "https://goerli.infura.io/v3/" + getInfuraKey();
private static final String ARTIS_SIGMA1_RPC_URL = "https://rpc.sigma1.artis.network";
private static final String ARTIS_TAU1_RPC_URL = "https://rpc.tau1.artis.network";
@ -19,8 +18,6 @@ public class EthRPCNodes
switch ((int)networkId) {
case (int)EthereumNetworkBase.MAINNET_ID:
return MAINNET_RPC_URL;
case (int)EthereumNetworkBase.POA_ID:
return POA_RPC_URL;
case (int)EthereumNetworkBase.CLASSIC_ID:
return CLASSIC_RPC_URL;
case (int)EthereumNetworkBase.GNOSIS_ID:

@ -1,4 +1,4 @@
AlphaWallet is an easy to use and secure Ethereum wallet with native ERC20, ERC721 and ERC875 support. AlphaWallet supports all Ethereum based networks, Ethereum, xDai, Ethereum Classic, Artis, POA, and Goerli.
AlphaWallet is an easy to use and secure Ethereum wallet with native ERC20, ERC721 and ERC875 support. AlphaWallet supports all Ethereum based networks, Ethereum, xDai, Ethereum Classic, Artis, and Goerli.
Focus on Defi:
- Shows comprehensive breakdown on Token transactions & swaps.

@ -11,7 +11,6 @@ public abstract class EthereumNetworkBase
{ // implements EthereumNetworkRepositoryType
public static final long MAINNET_ID = 1;
public static final long CLASSIC_ID = 61;
public static final long POA_ID = 99;
public static final long GNOSIS_ID = 100;
public static final long GOERLI_ID = 5;
public static final long ARTIS_SIGMA1_ID = 246529;
@ -49,7 +48,6 @@ public abstract class EthereumNetworkBase
public static final String MAINNET_RPC_URL = "https://mainnet.infura.io/v3/da3717f25f824cc1baa32d812386d93f";
public static final String CLASSIC_RPC_URL = "https://www.ethercluster.com/etc";
public static final String XDAI_RPC_URL = "https://rpc.gnosischain.com";
public static final String POA_RPC_URL = "https://core.poa.network/";
public static final String GOERLI_RPC_URL = "https://goerli.infura.io/v3/da3717f25f824cc1baa32d812386d93f";
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";
@ -91,8 +89,6 @@ public abstract class EthereumNetworkBase
CLASSIC_ID, false));
put(GNOSIS_ID, new NetworkInfo("Gnosis", "xDAi", XDAI_RPC_URL, "https://blockscout.com/xdai/mainnet/tx/",
GNOSIS_ID, false));
put(POA_ID, new NetworkInfo("POA", "POA", POA_RPC_URL, "https://blockscout.com/poa/core/tx/",
POA_ID, false));
put(ARTIS_SIGMA1_ID, new NetworkInfo("ARTIS sigma1", "ATS", ARTIS_SIGMA1_RPC_URL, "https://explorer.sigma1.artis.network/tx/",
ARTIS_SIGMA1_ID, false));
put(GOERLI_ID, new NetworkInfo("Görli (Test)", "GÖETH", GOERLI_RPC_URL, "https://goerli.etherscan.io/tx/",

@ -8,7 +8,6 @@ import static com.alphawallet.ethereum.EthereumNetworkBase.ARTIS_TAU1_ID;
import static com.alphawallet.ethereum.EthereumNetworkBase.CLASSIC_ID;
import static com.alphawallet.ethereum.EthereumNetworkBase.GOERLI_ID;
import static com.alphawallet.ethereum.EthereumNetworkBase.MAINNET_ID;
import static com.alphawallet.ethereum.EthereumNetworkBase.POA_ID;
import static com.alphawallet.ethereum.EthereumNetworkBase.GNOSIS_ID;
/**
@ -22,7 +21,6 @@ public class MagicLinkInfo
private static final String legacyMagicLinkDomain = "app.awallet.io";
private static final String classicMagicLinkDomain = "classic.aw.app";
private static final String callistoMagicLinkDomain = "callisto.aw.app";
private static final String poaMagicLinkDomain = "poa.aw.app";
private static final String xDaiMagicLinkDomain = "xdai.aw.app";
private static final String goerliMagicLinkDomain = "goerli.aw.app";
private static final String artisSigma1MagicLinkDomain = "artissigma1.aw.app";
@ -33,7 +31,6 @@ public class MagicLinkInfo
private static final String mainNetEtherscan = "https://cn.etherscan.com/";
private static final String classicEtherscan = "https://blockscout.com/etc/mainnet/";
private static final String callistoEtherscan = "https://etherscan.io/"; //TODO: determine callisto etherscan
private static final String poaEtherscan = "https://blockscout.com/poa/core/";
private static final String xDaiEtherscan = "https://blockscout.com/poa/dai/";
private static final String goerliEtherscan = "https://goerli.etherscan.io/";
private static final String artisSigma1Etherscan = "https://explorer.sigma1.artis.network/";
@ -58,8 +55,6 @@ public class MagicLinkInfo
case (int)MAINNET_ID:
default:
return mainnetMagicLinkDomain;
case (int)POA_ID:
return poaMagicLinkDomain;
case (int)CLASSIC_ID:
return classicMagicLinkDomain;
case (int) GNOSIS_ID:
@ -84,8 +79,6 @@ public class MagicLinkInfo
return MAINNET_ID;
case classicMagicLinkDomain:
return CLASSIC_ID;
case poaMagicLinkDomain:
return POA_ID;
case xDaiMagicLinkDomain:
return GNOSIS_ID;
case goerliMagicLinkDomain:
@ -103,8 +96,6 @@ public class MagicLinkInfo
case (int)MAINNET_ID:
default:
return mainNetEtherscan;
case (int)POA_ID:
return poaEtherscan;
case (int)CLASSIC_ID:
return classicEtherscan;
case (int) GNOSIS_ID:

Loading…
Cancel
Save