app: Fixed config generation problem.

OrchidTechnologies · Dec 6, 2022 · c30d1ed · c30d1ed
1 parent 79c34df
commit c30d1ed
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 10 deletions.
diff --git a/gui-orchid/lib/api/configuration/orchid_vpn_config/orchid_vpn_config_generate.dart b/gui-orchid/lib/api/configuration/orchid_vpn_config/orchid_vpn_config_generate.dart
@@ -82,7 +82,7 @@ class OrchidVPNConfigGenerate {
     };
 
     var chain = hop.account.chain;
-    var currency = chain.nativeCurrency.exchangeRateSource.symbolOverride ??
+    var currency = chain.nativeCurrency.configSymbolOverride ??
         chain.nativeCurrency.symbol;
 
     // V1 fields

diff --git a/gui-orchid/lib/api/orchid_eth/token_type.dart b/gui-orchid/lib/api/orchid_eth/token_type.dart
@@ -18,6 +18,9 @@ class TokenType {
   final ExchangeRateSource exchangeRateSource;
   final String iconPath;
 
+  /// The symbol name to be used in the Orchid config for the back-end.
+  final String configSymbolOverride;
+
   /// The ERC20 contract address if this is a non-native token on its chain.
   final EthereumAddress erc20Address;
 
@@ -37,6 +40,7 @@ class TokenType {
   const TokenType({
     @required this.chainId,
     @required this.symbol,
+    this.configSymbolOverride,
     this.exchangeRateSource,
     this.decimals = 18,
     this.erc20Address,

diff --git a/gui-orchid/lib/api/orchid_eth/tokens.dart b/gui-orchid/lib/api/orchid_eth/tokens.dart
@@ -33,7 +33,7 @@ class Tokens {
 
   static const TokenType XDAI = TokenType(
     symbol: 'xDAI',
-    // Binance lists DAIUSDT but the value is bogus. The real pair is USDTDAI, so invert.
+    configSymbolOverride: 'DAI',
     exchangeRateSource: CoinGeckoExchangeRateSource(tokenId: 'xdai'),
     chainId: Chains.GNOSIS_CHAINID,
     iconPath: OrchidAssetSvgToken.xdai_token_path,
@@ -108,6 +108,7 @@ class Tokens {
 
   static const TokenType RBTC = TokenType(
     symbol: 'RTBC',
+    configSymbolOverride: 'BTC',
     exchangeRateSource: CoinGeckoExchangeRateSource(tokenId: 'bitcoin'),
     chainId: Chains.RSK_CHAINID,
     iconPath: OrchidAssetSvgToken.bitcoin_btc_token_path,

diff --git a/gui-orchid/lib/api/pricing/binance_pricing.dart b/gui-orchid/lib/api/pricing/binance_pricing.dart
@@ -13,10 +13,9 @@ class BinanceExchangeRateSource extends ExchangeRateSource {
   /// the rate consistent with that. e.g. for DAI we must use 1/USDTDAI and
   /// not DAIUSDT since DAIUSDT was delisted.
   final bool inverted;
+  final String symbolOverride;
 
-  const BinanceExchangeRateSource(
-      {this.inverted = false, String symbolOverride})
-      : super(symbolOverride: symbolOverride); // Binance exchange rates
+  const BinanceExchangeRateSource({this.inverted = false, this.symbolOverride});
 
   // https://api.binance.com/api/v3/avgPrice?symbol=ETHUSDT
   String _url(TokenType tokenType) {

diff --git a/gui-orchid/lib/api/pricing/coingecko_pricing.dart b/gui-orchid/lib/api/pricing/coingecko_pricing.dart
@@ -11,7 +11,7 @@ import 'orchid_pricing.dart';
 class CoinGeckoExchangeRateSource extends ExchangeRateSource {
   final String tokenId;
 
-  const CoinGeckoExchangeRateSource({required this.tokenId}) : super();
+  const CoinGeckoExchangeRateSource({required this.tokenId});
 
   /// Return the price, USD/Token: Tokens * Rate = USD
   Future<double?> tokenToUsdRate(TokenType tokenType) async {

diff --git a/gui-orchid/lib/api/pricing/orchid_pricing.dart b/gui-orchid/lib/api/pricing/orchid_pricing.dart
@@ -64,9 +64,7 @@ class OrchidPricing {
 }
 
 abstract class ExchangeRateSource {
-  final String symbolOverride;
-
-  const ExchangeRateSource({this.symbolOverride});
+  const ExchangeRateSource();
 
   /// Return the price (USD/Token): tokens * Rate = USD
   Future<double> tokenToUsdRate(TokenType tokenType);
@@ -79,4 +77,3 @@ abstract class ExchangeRateSource {
     return 1.0 / rate;
   }
 }
-
diff --git a/gui-orchid/test/service_test.dart b/gui-orchid/test/service_test.dart
@@ -6,6 +6,7 @@ import 'package:orchid/api/orchid_eth/chains.dart';
 import 'package:orchid/api/orchid_eth/token_type.dart';
 import 'package:orchid/api/orchid_eth/tokens.dart';
 import 'package:orchid/api/orchid_eth/v1/orchid_eth_v1.dart';
+import 'package:orchid/api/pricing/binance_pricing.dart';
 import 'package:orchid/api/pricing/orchid_pricing.dart';
 import 'package:orchid/api/purchase/orchid_pac_seller.dart';
 import 'package:orchid/api/purchase/orchid_pac_server.dart';