Use new custody format

Author: zbuc

Cargo.toml

@@ -36,10 +36,8 @@ rand = "0.8"
 reqwest = "0.11"
 indexmap = "1.8"
 chrono = { version = "0.4", features = ["serde"] }
+toml                                   = "0.7"
 tonic = { version = "0.10", features = ["tls-webpki-roots", "tls"] }
 serde = { version = "1", features = ["derive"] }
-# The commit `17ba6f3cedec7f5908e4cc2b3c39f61a778df2ec` from 2023-12-03 broke compilation,
-# so we pin the prior git revision.
-# binance = { git = "https://github.com/wisespace-io/binance-rs.git", rev = "17ba6f3cedec7f5908e4cc2b3c39f61a778df2ec" }
-binance = { git = "https://github.com/wisespace-io/binance-rs.git", rev = "3017e136cc4439c9b6a67fdccb76a7c3a94f8440" }
+binance = { git = "https://github.com/wisespace-io/binance-rs.git", rev = "04a78c9272062a84029a612f3c9e8a5845480a4a" }
 url = "2"

src/binance_fetcher.rs

@@ -37,6 +37,7 @@ impl BinanceFetcher {
 
     /// Run the fetcher.
     pub async fn run(mut self) -> anyhow::Result<()> {
+        tracing::info!("starting binance fetcher");
         let _fetcher_span = tracing::debug_span!("binance-fetcher").entered();
         let keep_running = AtomicBool::new(true); // Used to control the event loop
         let endpoints = self

src/opt/serve.rs

@@ -50,7 +50,7 @@ impl Serve {
             .iter()
             .flat_map(|s1| self.symbols.iter().map(move |s2| (s1, s2)))
             .filter(|(s1, s2)| s1 != s2)
-            .map(|(s1, s2)| format!("{}{}", s1, s2))
+            .map(|(s1, s2)| format!("{}{}", s2, s1))
             .collect::<Vec<_>>();
 
         let mut symbols = Vec::new();
@@ -92,11 +92,10 @@ impl Serve {
         });
         std::fs::create_dir_all(&data_dir).context("can create data dir")?;
 
-        let custody_file = data_dir.clone().join("custody.json");
-
         // Build a custody service...
-        let wallet =
-            Wallet::load(custody_file).context("Failed to load wallet from local custody file")?;
+        let pcli_config_file = data_dir.clone().join("config.toml");
+        let wallet = Wallet::load(pcli_config_file)
+            .context("failed to load wallet from local custody file")?;
         let soft_kms = SoftKms::new(wallet.spend_key.clone().into());
         let custody = CustodyServiceClient::new(CustodyServiceServer::new(soft_kms));
 
@@ -105,8 +104,15 @@ impl Serve {
         // Wait to synchronize the chain before doing anything else.
         tracing::info!(%self.node, "starting initial sync: ");
         // Instantiate an in-memory view service.
+        let view_file = data_dir.join("pcli-view.sqlite");
+        let view_filepath = Some(
+            view_file
+                .to_str()
+                .ok_or_else(|| anyhow::anyhow!("Non-UTF8 view path"))?
+                .to_string(),
+        );
         let view_storage =
-            penumbra_view::Storage::load_or_initialize(None::<&str>, &fvk, self.node.clone())
+            penumbra_view::Storage::load_or_initialize(view_filepath, &fvk, self.node.clone())
                 .await?;
 
         // Now build the view and custody clients, doing gRPC with ourselves

src/trader.rs

@@ -37,27 +37,32 @@ lazy_static! {
         (
             // ETH priced in terms of BTC
             "ETHBTC".to_string(),
-            DirectedUnitPair::from_str("test_btc:test_eth").unwrap()
+            DirectedUnitPair::from_str("test_eth:test_btc").unwrap()
         ),
         (
-            // ETH priced in terms of USD
-            "ETHUSD".to_string(),
-            DirectedUnitPair::from_str("test_usd:test_eth").unwrap()
+            // ETH priced in terms of USDT
+            "ETHUSDT".to_string(),
+            DirectedUnitPair::from_str("test_eth:test_usd").unwrap()
         ),
         (
             // BTC priced in terms of USD
-            "BTCUSD".to_string(),
-            DirectedUnitPair::from_str("test_usd:test_btc").unwrap()
+            "BTCUSDT".to_string(),
+            DirectedUnitPair::from_str("test_btc:test_usd").unwrap()
         ),
         (
             // ATOM priced in terms of BTC
             "ATOMBTC".to_string(),
-            DirectedUnitPair::from_str("test_btc:test_atom").unwrap()
+            DirectedUnitPair::from_str("test_atom:test_btc").unwrap()
         ),
         (
-            // ATOM priced in terms of USD
-            "ATOMUSD".to_string(),
-            DirectedUnitPair::from_str("test_usd:test_atom").unwrap()
+            // ATOM priced in terms of USDT
+            "ATOMUSDT".to_string(),
+            DirectedUnitPair::from_str("test_atom:test_usd").unwrap()
+        ),
+        (
+            // OSMO priced in terms of USDT
+            "OSMOUSDT".to_string(),
+            DirectedUnitPair::from_str("test_osmo:test_usd").unwrap()
         ),
     ]);
 }
@@ -122,6 +127,7 @@ where
 
     /// Run the trader.
     pub async fn run(mut self) -> anyhow::Result<()> {
+        tracing::info!("starting trader");
         let trader_span = tracing::debug_span!("trader");
         // TODO figure out why this span doesn't display in logs
         let _ = trader_span.enter();
@@ -312,6 +318,13 @@ where
         quote: BookTickerEvent,
         plan: &mut Planner<OsRng>,
     ) -> anyhow::Result<()> {
+        tracing::debug!(
+            ?market,
+            ?reserves_1,
+            ?reserves_2,
+            ?quote,
+            "opening liquidity position"
+        );
         // put up half the available reserves
         // TODO: this isn't quite right as it's half the _remaining_ reserves
         // and there might be multiple positions involving reserves with the same

src/wallet.rs

@@ -12,13 +12,16 @@ pub struct Wallet {
 impl Wallet {
     /// Read the wallet data from the provided path.
     pub fn load(path: impl AsRef<std::path::Path>) -> anyhow::Result<Self> {
-        let custody_json: serde_json::Value =
-            serde_json::from_slice(std::fs::read(path)?.as_slice())?;
-        let sk_str = match custody_json["spend_key"].as_str() {
+        let config_contents = std::fs::read_to_string(&path).context(
+            "pcli config file not found. hint: run 'pcli init soft-kms import-phrase' to import key material",
+        )?;
+        let config_toml: toml::Table = toml::from_str(&config_contents)?;
+
+        let sk_str = match config_toml["custody"]["spend_key"].as_str() {
             Some(s) => s,
             None => {
                 return Err(anyhow::anyhow!(
-                    "'spend_key' field not found in custody JSON file"
+                    "'spend_key' field not found in custody TOML file"
                 ))
             }
         };