Skip to content

Commit 6c71686

Browse files
committed
fix: add testnet 75 compat
The changes here are mostly related to upstream changes in penumbra-zone/penumbra#4285.
1 parent 04e8588 commit 6c71686

File tree

2 files changed

+7
-16
lines changed

2 files changed

+7
-16
lines changed

src/responder.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,9 @@ where
161161
tracing::info!("processing send request, waiting for readiness");
162162
});
163163

164-
let req = (*addr, values.clone());
164+
let req = (*addr.clone(), values.clone());
165165
reqs.push(req);
166-
sent_addresses.push(*addr);
166+
sent_addresses.push(addr.clone());
167167

168168
span.in_scope(|| {
169169
tracing::info!("submitted send request");
@@ -185,21 +185,21 @@ where
185185
// Run the tasks concurrently.
186186
let mut i = 0;
187187
while let Some(result) = responses.next().await {
188-
let addr = sent_addresses[i];
188+
let addr = &sent_addresses[i];
189189
match result {
190190
Ok(id) => {
191191
// Reply to the originating message with the address
192192
let span = tracing::info_span!("send", address = %addr);
193193
span.in_scope(|| {
194194
tracing::info!(id = %id, "send request succeeded");
195195
});
196-
succeeded.push((addr, id));
196+
succeeded.push((*addr.clone(), id));
197197
}
198198
// By default, anyhow::Error's Display impl only prints the outermost error;
199199
// using the alternate formate specifier prints the entire chain of causes.
200200
Err(e) => {
201201
tracing::error!(?addr, ?e, "Failed to send funds");
202-
failed.push((addr, format!("{:#}", e)))
202+
failed.push((*addr.clone(), format!("{:#}", e)))
203203
}
204204
}
205205

src/sender.rs

+2-11
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ use penumbra_proto::view::v1::broadcast_transaction_response::Status as Broadcas
1212
use penumbra_asset::Value;
1313
use penumbra_custody::{AuthorizeRequest, CustodyClient};
1414
use penumbra_keys::{Address, FullViewingKey};
15-
use penumbra_transaction::memo::MemoPlaintext;
1615
use penumbra_txhash::TransactionId;
1716
use penumbra_view::ViewClient;
1817
use penumbra_wallet::plan::Planner;
@@ -73,17 +72,9 @@ where
7372
}
7473
let mut planner = Planner::new(OsRng);
7574
for value in values {
76-
planner.output(value, address);
75+
planner.output(value, address.clone());
7776
}
78-
planner
79-
.memo(
80-
MemoPlaintext::new(
81-
self2.fvk.payment_address(0.into()).0,
82-
"Hello from Galileo, the Penumbra faucet bot".to_string(),
83-
)
84-
.expect("can create memo"),
85-
)
86-
.unwrap();
77+
planner.memo("Hello from Galileo, the Penumbra faucet bot".to_string());
8778
let plan = planner.plan(&mut self2.view, self2.account.into()).await?;
8879

8980
// 2. Authorize and build the transaction.

0 commit comments

Comments
 (0)