feat: hd wallet generation, token deceimal types

subfile-exchange/Cargo.toml

@@ -28,6 +28,7 @@ ethers = "2.0.11"
 # ethers = {version = "2.0.11", features = [  "abigen-online" ]}
 ethers-core = "2.0.11"
 futures = { version = "0.3", features = ["compat"] }
+hdwallet = "0.4.1"
 hex = "0.4.3"
 http = "0.2"
 hyper = { version = "0.14.27", features = [ "server" ]}
@@ -43,7 +44,7 @@ secp256k1 = "0.28.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_yaml = "0.9"
-sha2 = "0.10.8"
+sha2 = "0.10"
 tap_core = { version = "0.7.0", git = "https://github.com/semiotic-ai/timeline-aggregation-protocol" }
 tempfile = "3.2.0"
 tokio = { version = "1.28", features = ["time", "sync", "macros", "test-util", "rt-multi-thread"] }

subfile-exchange/src/config.rs

@@ -7,6 +7,8 @@ use tracing::subscriber::SetGlobalDefaultError;
 use tracing_subscriber::EnvFilter;
 use tracing_subscriber::FmtSubscriber;
 
+use crate::util::parse_key;
+
 #[derive(Clone, Debug, Parser, Serialize, Deserialize)]
 #[command(
     name = "subfile-exchange",
@@ -51,67 +53,68 @@ impl Cli {
 pub enum Role {
     Downloader(DownloaderArgs),
     Publisher(PublisherArgs),
-    Server(ServerArgs),
+    Wallet(WalletArgs),
 }
 
 #[derive(Clone, Debug, Args, Serialize, Deserialize, Default)]
 #[group(required = false, multiple = true)]
-pub struct ServerArgs {
+pub struct WalletArgs {
     #[arg(
         long,
         value_name = "HOST",
         default_value = "127.0.0.1",
         env = "HOST",
         help = "Subfile server host"
     )]
-    pub host: String,
+    pub host: Option<String>,
     #[arg(
         long,
         value_name = "PORT",
         default_value = "5678",
         env = "PORT",
         help = "Subfile server port"
     )]
-    pub port: usize,
-    // Taking from config right now, later can read from DB table for managing server states
-    #[arg(
-        long,
-        value_name = "SUBFILES",
-        env = "SUBFILES",
-        value_delimiter = ',',
-        help = "Comma separated list of IPFS hashes and local location of the subfiles to serve upon start-up; format: [ipfs_hash:local_path]"
-    )]
-    pub subfiles: Vec<String>,
+    pub port: Option<usize>,
     #[clap(
         long,
-        value_name = "free-query-auth-token",
-        env = "FREE_QUERY_AUTH_TOKEN",
-        help = "Auth token that clients can use to query for free"
+        value_name = "KEY",
+        value_parser = parse_key,
+        env = "PRIVATE_KEY",
+        hide_env_values = true,
+        help = "Private key to the Graphcast ID wallet (Precendence over mnemonics)",
     )]
-    pub free_query_auth_token: Option<String>,
+    pub private_key: Option<String>,
     #[clap(
         long,
-        value_name = "admin-auth-token",
-        env = "ADMIN_AUTH_TOKEN",
-        help = "Admin Auth token for server management"
+        value_name = "KEY",
+        value_parser = parse_key,
+        env = "MNEMONIC",
+        hide_env_values = true,
+        help = "Mnemonic to the Graphcast ID wallet (first address of the wallet is used; Only one of private key or mnemonic is needed)",
     )]
-    pub admin_auth_token: Option<String>,
+    pub mnemonic: Option<String>,
     #[clap(
         long,
-        value_name = "mnemonic",
-        env = "MNEMONIC",
-        help = "Mnemonic for the operator wallet"
+        value_name = "provider_url",
+        env = "PROVIDER",
+        help = "Blockchain provider endpoint"
     )]
-    pub mnemonic: String,
-    //TODO: More complex price management
-    #[arg(
+    pub provider: String,
+    //TODO: chain id should be resolvable through provider
+    // #[clap(
+    //     long,
+    //     value_name = "chain_id",
+    //     env = "CHAIN_ID",
+    //     help = "Protocol network's Chain ID"
+    // )]
+    // pub chain_id: u64,
+    #[clap(
         long,
-        value_name = "PRICE_PER_BYTE",
-        default_value = "1",
-        env = "PRICE_PER_BYTE",
-        help = "Price per byte; price do not currently have a unit, perhaps use DAI or GRT, refer to TAP"
+        value_name = "verifier",
+        env = "VERIFIER",
+        help = "TAP verifier contract address"
     )]
-    pub price_per_byte: f32,
+    pub verifier: Option<String>,
 }
 
 #[derive(Clone, Debug, Args, Serialize, Deserialize, Default)]

subfile-exchange/src/errors.rs

@@ -16,6 +16,7 @@ pub enum Error {
     InvalidPriceFormat(String),
     ContractError(String),
     ObjectStoreError(object_store::Error),
+    WalletError(ethers::signers::WalletError),
 }
 
 impl fmt::Display for Error {
@@ -35,6 +36,7 @@ impl fmt::Display for Error {
             Error::InvalidPriceFormat(ref msg) => write!(f, "Price format error: {}", msg),
             Error::ContractError(ref msg) => write!(f, "Contract call error: {}", msg),
             Error::ObjectStoreError(ref err) => write!(f, "Object store error: {}", err),
+            Error::WalletError(ref err) => write!(f, "Wallet error: {}", err),
         }
     }
 }

subfile-exchange/src/main.rs

@@ -53,11 +53,23 @@ async fn main() {
                 }
             }
         }
-        Role::Server(server_args) => {
+        Role::Wallet(wallet_args) => {
             tracing::info!(
-                server = tracing::field::debug(&server_args),
-                "Use subfile-service crate"
+                server = tracing::field::debug(&wallet_args),
+                "Use the provided wallet to send transactions"
             );
+
+            // Server enable payments through the staking contract,
+            // assume indexer is already registered on the staking registry contract
+            //1. `allocate` - indexer address, Qm hash in bytes32, token amount, allocation_id, metadata: utils.hexlify(Array(32).fill(0)), allocation_id_proof
+            //2. `close_allocate` -allocationID: String, poi: BytesLike (0x0 32bytes)
+            //3. `close_allocate` and then `allocate`
+            // receipt validation and storage is handled by the indexer-service framework
+            // receipt redemption is handled by indexer-agent
+
+            // Client payments - assume client signer is valid (should work without gateways)
+            //1. `deposit` - to a sender address and an amount
+            //2. `depositMany` - to Vec<sender address, an amount>
         }
     }
 }