Skip to content
Merged
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
17 changes: 9 additions & 8 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions bindings/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.0.0-beta"
edition = "2024"

[dependencies]
arm_risc0 = { git = "https://github.com/anoma/arm-risc0.git", rev = "1379cbaa2db78e94c4d32fdcfd2c97cd7195d6d8", package = "arm", features = [
arm_risc0 = { git = "https://github.com/anoma/arm-risc0.git", rev = "b4810fad7bb5dee1b0314d96854137d0e6bd5dbd", package = "arm", features = [
#"groth16_prover", # Add this feature to generate regular transactions. Note that proof aggregation won't work.
"groth16_aggregation",
"bonsai",
Expand All @@ -14,7 +14,7 @@ alloy = { version = "1.0.30", features = ["full", "eip712", "node-bindings"] }
tokio = { version = "1.44", features = ["rt-multi-thread"] }
serde = { version = "1.0.197", default-features = false }
sha2 = { version = "0.10.9" }
simple_transfer_app = { git = "https://github.com/anoma/arm-risc0.git", rev = "1379cbaa2db78e94c4d32fdcfd2c97cd7195d6d8", package = "simple-transfer-app" }
simple_transfer_app = { git = "https://github.com/anoma/arm-risc0.git", rev = "b4810fad7bb5dee1b0314d96854137d0e6bd5dbd", package = "simple-transfer-app" }



Expand Down
2 changes: 1 addition & 1 deletion contracts/src/ProtocolAdapter.sol
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ contract ProtocolAdapter is

// Aggregate the compliance instance
if (isProofAggregated) {
encodedJournal = abi.encodePacked(RiscZeroUtils._COMPLIANCE_INSTANCE_PADDING, journal);
encodedJournal = journal;
}
// Verify the compliance proof.
else {
Expand Down
6 changes: 0 additions & 6 deletions contracts/src/libs/RiscZeroUtils.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@ library RiscZeroUtils {
using RiscZeroUtils for bytes;
using RiscZeroUtils for bool;

/// @notice The RISC Zero padding bytes for the compliance instance obtained from its length (`7 * 32 bytes`)
/// divided by 4 (bytes) representing the number of RISC Zero words in little-endian order
/// (https://dev.risczero.com/api/zkvm/optimization#unaligned-data-access-is-significantly-more-expensive).
/// @dev `uint32(56).toRiscZero() = bytes4(0x38000000)`
bytes4 internal constant _COMPLIANCE_INSTANCE_PADDING = bytes4(0x38000000);

/// @notice Converts the compliance instance to the RISC Zero journal format.
/// @param instance The compliance instance.
/// @return journal The resulting RISC Zero journal.
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/proving/Aggregation.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ library Aggregation {

/// @notice The aggregation verifying key.
/// @dev The key is fixed as long as the aggregation circuit binary is not changed.
bytes32 internal constant _VERIFYING_KEY = 0x96dcbee66a8780979442bd2abc2f7373957e450336f377704041ba6f9b95ff6a;
bytes32 internal constant _VERIFYING_KEY = 0xa9c9a22ee9df47fd35ed2b319cd272c3f328a171ea04dab5e44ee15e33f5b9ce;
}
Binary file modified contracts/test/examples/transactions/test_tx_agg_01.bin
Binary file not shown.
Binary file modified contracts/test/examples/transactions/test_tx_agg_05.bin
Binary file not shown.
Binary file modified contracts/test/examples/transactions/test_tx_agg_10.bin
Binary file not shown.
Binary file modified contracts/test/examples/transactions/test_tx_agg_15.bin
Binary file not shown.
Binary file modified contracts/test/examples/transactions/test_tx_agg_20.bin
Binary file not shown.
14 changes: 0 additions & 14 deletions contracts/test/proofs/RiscZeroUtils.t.sol

This file was deleted.

Loading