Switch default network to Holesky

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "yagna"
-version = "0.14.0"
+version = "0.15.0"
 description = "Open platform and marketplace for distributed computations"
 readme = "README.md"
 authors = ["Golem Factory <[email protected]>"]

core/model/src/payment.rs

@@ -538,7 +538,7 @@ pub mod local {
         #[structopt(long, possible_values = DriverName::VARIANTS, default_value = DriverName::Erc20Next.into())]
         pub driver: DriverName,
         /// Payment network
-        #[structopt(long, possible_values = NetworkName::VARIANTS, default_value = NetworkName::Goerli.into())]
+        #[structopt(long, possible_values = NetworkName::VARIANTS, default_value = NetworkName::Holesky.into())]
         pub network: NetworkName,
     }
 
@@ -569,7 +569,7 @@ pub mod local {
             let a = AccountCli::from_iter(&[""]);
             assert_eq!(None, a.address());
             assert_eq!("erc20next", a.driver());
-            assert_eq!("goerli", a.network());
+            assert_eq!("holesky", a.network());
             assert_eq!("tGLM", a.token());
         }
     }

core/payment-driver/base/src/db/models.rs

@@ -114,8 +114,8 @@ pub struct PaymentEntity {
 pub enum Network {
     Mainnet = 1, //Main Ethereum chain
     Rinkeby = 4, //Rinkeby is Ethereum testnet
+    Goerli = 5,  //Goerli is another Ethereum testnet
     #[default]
-    Goerli = 5, //Goerli is another Ethereum testnet
     Holesky = 17000, //Holesky is testnet for Holesky network
     Mumbai = 80001, //Mumbai is testnet for Polygon network
     Polygon = 137, //Polygon is Polygon production network

core/payment-driver/erc20next/src/driver.rs

@@ -38,8 +38,8 @@ use ya_payment_driver::{
 use crate::erc20::utils;
 use crate::erc20::utils::{big_dec_to_u256, u256_to_big_dec};
 use crate::network::platform_to_currency;
-use crate::{driver::PaymentDetails, network};
-use crate::{network::SUPPORTED_NETWORKS, DRIVER_NAME, RINKEBY_NETWORK};
+use crate::{driver::PaymentDetails, network, HOLESKY_NETWORK};
+use crate::{network::SUPPORTED_NETWORKS, DRIVER_NAME};
 
 mod cli;
 
@@ -427,7 +427,7 @@ impl PaymentDriver for Erc20NextDriver {
     }
 
     fn get_default_network(&self) -> String {
-        RINKEBY_NETWORK.to_string()
+        HOLESKY_NETWORK.to_string()
     }
 
     fn get_networks(&self) -> HashMap<String, NetworkConfig> {

core/payment/src/cli.rs

@@ -502,7 +502,6 @@ Typically operation should take less than 1 minute.
                         "network".to_owned(),
                         "default?".to_owned(),
                         "token".to_owned(),
-                        "default?".to_owned(),
                         "platform".to_owned(),
                     ],
                     values: drivers
@@ -519,7 +518,6 @@ Typically operation should take less than 1 minute.
                                                 network,
                                                 if &dd.default_network == network { "X" } else { "" },
                                                 token,
-                                                if &n.default_token == token { "X" } else { "" },
                                                 platform,
                                             ]}
                                         )