Update default from holesky to Hoodi, add Hoodi

* holesky -> hoodi

* holesky -> hoodi

* fix clippies

Author: scx1332

.github/workflows/ci.yml

@@ -187,8 +187,8 @@ jobs:
       - name: Run tests (docker_03_problems)
         run: cargo test --test docker_03_problems --profile=release-fast -- --test-threads=10
 
-  test_faucet_holesky:
-    name: Test Holesky faucet
+  test_faucet_hoodi:
+    name: Test Hoodi faucet
     timeout-minutes: 20
 
     runs-on: ubuntu-latest
@@ -210,43 +210,43 @@ jobs:
 
       - name: Check if balance is 0
         run: |
-          [ $(cargo run -- balance -c holesky | jq -r '.[] | .gasDecimal') == "0" ]
-          [ $(cargo run -- balance -c holesky | jq -r '.[] | .tokenDecimal') == "0" ]
+          [ $(cargo run -- balance -c hoodi | jq -r '.[] | .gasDecimal') == "0" ]
+          [ $(cargo run -- balance -c hoodi | jq -r '.[] | .tokenDecimal') == "0" ]
 
       - name: Get ETH from faucet
-        run: cargo run -- get-dev-eth -c holesky
+        run: cargo run -- get-dev-eth -c hoodi
 
       - name: Check ETH balance after getting funds from faucet (should be 0.01)
         run: |
           sleep 60 # give time for the blockchain to propagate info about the transaction
-          [ $(cargo run -- balance -c holesky | jq -r '.[] | .gasDecimal') == "0.01" ]
+          [ $(cargo run -- balance -c hoodi | jq -r '.[] | .gasDecimal') == "0.01" ]
 
       - name: Mint tokens
         run: |
-          cargo run -- mint-test-tokens -c holesky
+          cargo run -- mint-test-tokens -c hoodi
           cargo run -- run
 
       - name: Check token balance
         run: |
-          [ $(cargo run -- balance -c holesky | jq -r '.[] | .tokenDecimal') == "1000" ]
+          [ $(cargo run -- balance -c hoodi | jq -r '.[] | .tokenDecimal') == "1000" ]
 
       - name: Transfer 166.6 GLM tokens
         run: |
-          cargo run -- transfer -c holesky --recipient 0x5b984629E2Cc7570cBa7dD745b83c3dD23Ba6d0f --token glm --amount 166.6
+          cargo run -- transfer -c hoodi --recipient 0x5b984629E2Cc7570cBa7dD745b83c3dD23Ba6d0f --token glm --amount 166.6
           cargo run -- run
 
       - name: Transfer all GLM tokens
         run: |
-          cargo run -- transfer -c holesky --recipient 0x5b984629E2Cc7570cBa7dD745b83c3dD23Ba6d0f --token glm --all
+          cargo run -- transfer -c hoodi --recipient 0x5b984629E2Cc7570cBa7dD745b83c3dD23Ba6d0f --token glm --all
           cargo run -- run
 
       - name: Check token balance zero
         run: |
-          [ $(cargo run -- balance -c holesky | jq -r '.[] | .tokenDecimal') == "0" ]
+          [ $(cargo run -- balance -c hoodi | jq -r '.[] | .tokenDecimal') == "0" ]
 
       - name: Transfer all left ETH tokens
         run: |
-          cargo run -- transfer -c holesky --recipient 0x5b984629E2Cc7570cBa7dD745b83c3dD23Ba6d0f --token eth --all
+          cargo run -- transfer -c hoodi --recipient 0x5b984629E2Cc7570cBa7dD745b83c3dD23Ba6d0f --token eth --all
           cargo run -- run
 
   payment_tests_custom:

crates/erc20_payment_lib/config-payments.toml

@@ -349,4 +349,42 @@ allowed-head-behind-secs = 120
 dns-source = "polygon.rpc-node.dev.golem.network."
 
 
+[chain.hoodi]
+chain-name = "Hoodi"
+chain-id = 560048
+currency-symbol = "tETH"
+priority-fee = 0.000001
+max-fee-per-gas = 20.0
+transaction-timeout = 100
+wrapper-contract = { address = "0x7E69E00E00293D80F0f3E7e0Db5eab6D5d4E0EfF" }
+token = { address = "0x55555555555556AcFf9C332Ed151758858bd7a26", symbol = "tGLM" }
+multi-contract = { address = "0x222222222220C9269Cfb43eD434888F604d1dC21", max-at-once = 10 }
+mint-contract = { address = "0x500F965199C63865A3E666cA3fF55B64F1c8Bc8b", max-glm-allowed = 400 }
+distributor-contract = { address = "0x16684CcBC9b5c250D927d32f8F937fbbd058837A" }
+faucet-client = { max-eth-allowed = 0.009, faucet-srv = "_hoodi-faucet._tcp", faucet-host = "faucet.testnet.golem.network", faucet-lookup-domain = "dev.golem.network", faucet-srv-port = 4004 }
+confirmation-blocks = 0
+block-explorer-url = "https://hoodi.etherscan.io"
+external-source-check-interval = 300
+
+[[chain.hoodi.rpc-endpoints]]
+priority = 0
+max-timeout-ms = 5000
+verify-interval-secs = 300
+allowed-head-behind-secs = 120
+dns-source = "hoodi.rpc-node.dev.golem.network."
+
+[[chain.hoodi.rpc-endpoints]]
+names = """
+    hoodi.rpc-node.dev.golem.network
+"""
+
+endpoints = """
+    https://hoodi.rpc-node.dev.golem.network/
+"""
+priority = 0
+max-timeout-ms = 5000
+verify-interval-secs = 60
+allowed-head-behind-secs = 120
+
+
 

crates/erc20_payment_lib/src/account_balance.rs

@@ -4,7 +4,6 @@ use crate::error::ErrorBag;
 use crate::error::PaymentError;
 use crate::runtime::SharedState;
 use crate::setup::PaymentSetup;
-use serde::{Deserialize, Serialize};
 use std::str::FromStr;
 use std::sync::Arc;
 use structopt::StructOpt;
@@ -24,17 +23,6 @@ pub struct BalanceOptions2 {
     pub debug_loop: Option<u64>,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct BalanceResult2 {
-    pub gas: Option<String>,
-    pub gas_decimal: Option<String>,
-    pub gas_human: Option<String>,
-    pub token: Option<String>,
-    pub token_decimal: Option<String>,
-    pub token_human: Option<String>,
-}
-
 pub async fn test_balance_loop(
     _shared_state: Option<Arc<std::sync::Mutex<SharedState>>>,
     payment_setup: PaymentSetup,

crates/erc20_payment_lib/src/lib.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::result_large_err)]
+
 mod account_balance;
 pub mod config;
 mod contracts;

crates/erc20_payment_lib_common/src/lib.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::result_large_err)]
+
 mod db;
 pub mod error;
 mod events;

crates/erc20_payment_lib_extra/src/account_balance.rs

@@ -19,7 +19,7 @@ use web3::types::Address;
 #[derive(Clone, StructOpt)]
 #[structopt(about = "Payment statistics options")]
 pub struct BalanceOptions {
-    #[structopt(short = "c", long = "chain-name", default_value = "holesky")]
+    #[structopt(short = "c", long = "chain-name", default_value = "hoodi")]
     pub chain_name: String,
 
     ///list of accounts separated by comma

frontend/src/Accounts.tsx

@@ -13,7 +13,7 @@ const Accounts = () => {
     const [accounts, setAccounts] = React.useState<SenderAccounts | null>(null);
     const { backendSettings } = useContext(BackendSettingsContext);
     const [selectedAccount, setSelectedAccount] = React.useState<string | null>(null);
-    const [selectedChain, setSelectedChain] = React.useState<string | null>("17000");
+    const [selectedChain, setSelectedChain] = React.useState<string | null>("560048");
     const config = useConfig();
 
     const loadTxCount = useCallback(async () => {

src/actions/deposit/close.rs

@@ -12,7 +12,7 @@ use web3::types::{Address, U256};
 #[derive(StructOpt)]
 #[structopt(about = "Close deposit if you are spender")]
 pub struct CloseDepositOptions {
-    #[structopt(short = "c", long = "chain-name", default_value = "holesky")]
+    #[structopt(short = "c", long = "chain-name", default_value = "hoodi")]
     pub chain_name: String,
 
     #[structopt(long = "address", help = "Address (has to have private key)")]

src/actions/deposit/create.rs

@@ -19,7 +19,7 @@ use web3::types::{Address, U256};
 #[derive(StructOpt)]
 #[structopt(about = "Create deposit for use by spender")]
 pub struct CreateDepositOptions {
-    #[structopt(short = "c", long = "chain-name", default_value = "holesky")]
+    #[structopt(short = "c", long = "chain-name", default_value = "hoodi")]
     pub chain_name: String,
 
     #[structopt(long = "address", help = "Address (has to have private key)")]

src/actions/deposit/details.rs

@@ -13,7 +13,7 @@ use web3::types::{Address, U256};
 #[derive(StructOpt)]
 #[structopt(about = "Show details of given deposit")]
 pub struct CheckDepositOptions {
-    #[structopt(short = "c", long = "chain-name", default_value = "holesky")]
+    #[structopt(short = "c", long = "chain-name", default_value = "hoodi")]
     pub chain_name: String,
 
     #[structopt(long = "deposit-id", help = "Deposit id to use")]