Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,10 @@ rust-version = "1.93"
version = "0.14.9"

# Optimize the cryptography for faster tests involving account creation.
[profile.test.package.miden-crypto]
opt-level = 2
[profile.test.package."*"]
opt-level = 3
Comment on lines +38 to +39
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be much more specific, I just haven't bothered bisecting.

debug-assertions = false
overflow-checks = false

[profile.release]
debug = true
Expand Down Expand Up @@ -120,6 +122,10 @@ tracing = { version = "0.1" }
tracing-subscriber = { features = ["env-filter", "fmt", "json"], version = "0.3" }
url = { features = ["serde"], version = "2.5" }

[patch.crates-io]
miden-prover = { path = "vendor/miden-prover" }
miden-tx = { path = "vendor/miden-tx" }

# Lints are set to warn for development, which are promoted to errors in CI.
[workspace.lints.clippy]
# Pedantic lints are set to a lower priority which allows lints in the group to be selectively enabled.
Expand Down
8 changes: 5 additions & 3 deletions bin/remote-prover/src/server/prover.rs
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,11 @@ impl ProveRequest for LocalTransactionProver {
type Output = ProvenTransaction;

async fn prove(&self, input: Self::Input) -> Result<Self::Output, tonic::Status> {
LocalTransactionProver::prove(self, input).await.map_err(|e| {
tonic::Status::internal(e.as_report_context("failed to prove transaction"))
})
LocalTransactionProver::prove_transaction_inputs(self, input)
.await
.map_err(|e| {
tonic::Status::internal(e.as_report_context("failed to prove transaction"))
})
}
}

Expand Down
5 changes: 4 additions & 1 deletion bin/remote-prover/src/server/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,10 @@ impl ProofRequest {
.unwrap();

let tx = Box::pin(tx.execute()).await.unwrap();
let tx = LocalTransactionProver::default().prove(tx.tx_inputs().clone()).await.unwrap();
let tx = LocalTransactionProver::default()
.prove_transaction_inputs(tx.tx_inputs().clone())
.await
.unwrap();

ProposedBatch::new(
vec![Arc::new(tx)],
Expand Down
2 changes: 1 addition & 1 deletion crates/ntx-builder/src/actor/execute.rs
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ impl NtxContext {
} else {
// Only perform tx inputs clone for local proving.
let tx_inputs = tx_inputs.clone();
LocalTransactionProver::default().prove(tx_inputs).await
LocalTransactionProver::default().prove_transaction_inputs(tx_inputs).await
}
.map_err(NtxError::Proving)
}
Expand Down
1 change: 1 addition & 0 deletions vendor/miden-prover/.cargo-ok
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"v":1}
6 changes: 6 additions & 0 deletions vendor/miden-prover/.cargo_vcs_info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"git": {
"sha1": "b59f1d07b76a23e628511d9ea538d07c144c2044"
},
"path_in_vcs": "prover"
}
Loading
Loading