chore: update api for testnet 65

Includes changes for:

    * txhash refactor
    * new box grpc feature for proto crate
    * proto version bump v1alpha1 -> v1
    * updates to new web URL format

Refs penumbra-zone/penumbra#3554

Author: conorsch

Cargo.toml

@@ -13,7 +13,7 @@ parallel = ["penumbra-wallet/parallel"]
 
 [dependencies]
 # Penumbra dependencies
-penumbra-proto = { path = "../penumbra/crates/proto" }
+penumbra-proto = { path = "../penumbra/crates/proto", features = ["rpc", "box-grpc"] }
 penumbra-asset = { path = "../penumbra/crates/core/asset" }
 penumbra-keys = { path = "../penumbra/crates/core/keys" }
 penumbra-custody = { path = "../penumbra/crates/custody" }
@@ -22,6 +22,7 @@ penumbra-view = { path = "../penumbra/crates/view" }
 penumbra-transaction = { path = "../penumbra/crates/core/transaction", features = [
     "download-proving-keys",
 ] }
+penumbra-txhash = { path = "../penumbra/crates/core/txhash" }
 
 # External dependencies
 tower = { version = "0.4", features = ["balance"] }

src/opt/serve.rs

@@ -7,16 +7,12 @@ use num_traits::identities::Zero;
 use penumbra_asset::Value;
 use penumbra_custody::soft_kms::SoftKms;
 use penumbra_proto::{
-    custody::v1alpha1::{
-        custody_protocol_service_client::CustodyProtocolServiceClient,
-        custody_protocol_service_server::CustodyProtocolServiceServer,
-    },
-    view::v1alpha1::{
-        view_protocol_service_client::ViewProtocolServiceClient,
-        view_protocol_service_server::ViewProtocolServiceServer,
+    custody::v1::{
+        custody_service_client::CustodyServiceClient, custody_service_server::CustodyServiceServer,
     },
+    view::v1::{view_service_client::ViewServiceClient, view_service_server::ViewServiceServer},
 };
-use penumbra_view::{ViewClient, ViewService};
+use penumbra_view::{ViewClient, ViewServer};
 use serenity::prelude::GatewayIntents;
 use std::{env, path::PathBuf, time::Duration};
 use tokio::sync::mpsc;
@@ -91,8 +87,7 @@ impl Serve {
         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 =
-            CustodyProtocolServiceClient::new(CustodyProtocolServiceServer::new(soft_kms));
+        let custody = CustodyServiceClient::new(CustodyServiceServer::new(soft_kms));
         let fvk = wallet.spend_key.full_viewing_key().clone();
 
         // Initialize view client, to scan Penumbra chain.
@@ -107,16 +102,16 @@ impl Serve {
         let view_storage =
             penumbra_view::Storage::load_or_initialize(view_filepath, &fvk, self.node.clone())
                 .await?;
-        let view_service = ViewService::new(view_storage, self.node.clone()).await?;
+        let view_service = ViewServer::new(view_storage, self.node.clone()).await?;
 
         // Now build the view and custody clients, doing gRPC with ourselves
-        let mut view = ViewProtocolServiceClient::new(ViewProtocolServiceServer::new(view_service));
+        let mut view = ViewServiceClient::new(ViewServiceServer::new(view_service));
 
         // Wait to synchronize the chain before doing anything else.
         tracing::info!(
             "starting initial sync: please wait for sync to complete before requesting tokens"
         );
-        ViewClient::status_stream(&mut view, fvk.wallet_id())
+        ViewClient::status_stream(&mut view)
             .await?
             .try_collect::<Vec<_>>()
             .await?;

src/responder.rs

@@ -4,7 +4,7 @@ use futures_util::StreamExt as _;
 use penumbra_asset::Value;
 use penumbra_custody::CustodyClient;
 use penumbra_keys::Address;
-use penumbra_transaction::Id;
+use penumbra_txhash::TransactionId;
 use penumbra_view::ViewClient;
 use serenity::prelude::TypeMapKey;
 use tokio::sync::mpsc;
@@ -136,7 +136,7 @@ where
     C: CustodyClient + Clone + Send + 'static,
 {
     // Track addresses to which we successfully dispensed tokens
-    let mut succeeded = Vec::<(Address, Id)>::new();
+    let mut succeeded = Vec::<(Address, TransactionId)>::new();
 
     // Track addresses (and associated errors) which we tried to send tokens to, but failed
     let mut failed = Vec::<(Address, String)>::new();

src/responder/response.rs

@@ -1,14 +1,14 @@
 use std::fmt::Write;
 
 use penumbra_keys::Address;
-use penumbra_transaction::Id;
+use penumbra_txhash::TransactionId;
 use serenity::{client::Cache, model::id::GuildId};
 
 /// The response from a request to dispense tokens to a set of addresses.
 #[derive(Debug, Clone)]
 pub struct Response {
     /// The addresses that were successfully dispensed tokens.
-    pub(super) succeeded: Vec<(Address, Id)>,
+    pub(super) succeeded: Vec<(Address, TransactionId)>,
     /// The addresses that failed to be dispensed tokens, accompanied by a string describing the
     /// error.
     pub(super) failed: Vec<(Address, String)>,
@@ -21,7 +21,7 @@ pub struct Response {
 
 impl Response {
     /// Returns the addresses that were successfully dispensed tokens.
-    pub fn succeeded(&self) -> &[(Address, Id)] {
+    pub fn succeeded(&self) -> &[(Address, TransactionId)] {
         &self.succeeded
     }
 
@@ -64,7 +64,7 @@ impl Response {
             for (addr, id) in self.succeeded.iter() {
                 write!(
                     response,
-                    "\n`{}`\ntry `pcli v tx {}`\nor visit https://app.testnet.penumbra.zone/tx/{}",
+                    "\n`{}`\ntry `pcli v tx {}`\nor visit https://app.testnet.penumbra.zone/#/tx/{}",
                     addr.display_short_form(),
                     id,
                     id,

src/sender.rs

@@ -5,10 +5,15 @@ use std::{
 
 use futures::{Future, FutureExt};
 use futures_util::Stream;
+use futures_util::TryStreamExt;
+
+use penumbra_proto::view::v1::broadcast_transaction_response::Status as BroadcastStatus;
+
 use penumbra_asset::Value;
 use penumbra_custody::{AuthorizeRequest, CustodyClient};
 use penumbra_keys::{Address, FullViewingKey};
 use penumbra_transaction::memo::MemoPlaintext;
+use penumbra_txhash::TransactionId;
 use penumbra_view::ViewClient;
 use penumbra_wallet::plan::Planner;
 use pin_project_lite::pin_project;
@@ -51,7 +56,7 @@ where
     V: ViewClient + Clone + Send + 'static,
     C: CustodyClient + Clone + Send + 'static,
 {
-    type Response = penumbra_transaction::Id;
+    type Response = TransactionId;
     type Error = anyhow::Error;
     type Future =
         Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>> + Send + 'static>>;
@@ -71,13 +76,15 @@ where
                 planner.output(value, address);
             }
             planner
-                .memo(MemoPlaintext {
-                    text: "Hello from Galileo, the Penumbra faucet bot".to_string(),
-                    return_address: self2.fvk.payment_address(0.into()).0,
-                })
+                .memo(
+                    MemoPlaintext::new(
+                        self2.fvk.payment_address(0.into()).0,
+                        "Hello from Galileo, the Penumbra faucet bot".to_string(),
+                    )
+                    .expect("can create memo"),
+                )
                 .unwrap();
-            let plan = planner.plan(&mut self2.view, self2.fvk.wallet_id(), self2.account.into());
-            let plan = plan.await?;
+            let plan = planner.plan(&mut self2.view, self2.account.into()).await?;
 
             // 2. Authorize and build the transaction.
             let auth_data = self2
@@ -90,14 +97,32 @@ where
                 .data
                 .ok_or_else(|| anyhow::anyhow!("no auth data"))?
                 .try_into()?;
-            let witness_data = self2.view.witness(self2.fvk.wallet_id(), &plan).await?;
+            let witness_data = self2.view.witness(&plan).await?;
             let tx = plan
                 .build_concurrent(&self2.fvk, &witness_data, &auth_data)
                 .await?;
 
             // 3. Broadcast the transaction and wait for confirmation.
-            let (tx_id, _detection_height) = self2.view.broadcast_transaction(tx, true).await?;
-            Ok(tx_id)
+            let id = tx.id();
+            let mut rsp = self2.view.broadcast_transaction(tx, true).await?;
+            while let Some(rsp) = rsp.try_next().await? {
+                match rsp.status {
+                    Some(BroadcastStatus::BroadcastSuccess(_)) => {
+                        println!("transaction broadcast successfully: {}", id);
+                    }
+                    Some(BroadcastStatus::Confirmed(c)) => {
+                        println!(
+                            "transaction confirmed and detected: {} @ height {}",
+                            id, c.detection_height
+                        );
+                        return Ok(id);
+                    }
+                    _ => {}
+                }
+            }
+            Err(anyhow::anyhow!(
+                "view server closed stream without reporting transaction confirmation"
+            ))
         }
         .boxed()
     }
@@ -128,7 +153,7 @@ impl<S> SenderSet<S> {
 
 impl<S> Stream for SenderSet<S>
 where
-    S: Service<(Address, Vec<Value>), Response = penumbra_transaction::Id, Error = anyhow::Error>,
+    S: Service<(Address, Vec<Value>), Response = TransactionId, Error = anyhow::Error>,
 {
     type Item = Result<Change<Key, S>, anyhow::Error>;