Implement hashing and proofs for multistacks #201

anodar · 2024-01-23T15:23:41Z

That accepts prover so that we can use it both for values and stack frames.

arbitrator/prover/src/machine.rs

…g to match order in proving

tsahee

got better definitions working on solidity code. Could still change, but seems right.

arbitrator/prover/src/machine.rs

tsahee

some minor comments.
This looks great and I can certainly start integration with this version.

tsahee · 2024-01-31T22:47:27Z

arbitrator/prover/src/machine.rs

@@ -972,6 +1027,7 @@ pub fn get_empty_preimage_resolver() -> PreimageResolver {

 impl Machine {
    pub const MAX_STEPS: u64 = 1 << 43;
+    pub const NO_STACK_HASH: Bytes32 = Bytes32::new([255_u8; 32]);


I don't think you should need that.
Something like 'Bytes32([255_u8;32])' and/or something like '[255_u8;32].into()' should work

Bytes32([255_u8;32]) works!

Tried .into()/from() before but that complained about non-static fn used in static initialization.

tsahee · 2024-01-31T22:47:44Z

arbitrator/arbutil/src/types.rs

@@ -13,6 +13,14 @@ use std::{
 #[repr(C)]
 pub struct Bytes32(pub [u8; 32]);

+
+impl Bytes32 {
+    pub const fn new(bytes: [u8; 32]) -> Self {


I don't think you need that.. see comment where you use it

tsahee · 2024-01-31T22:50:30Z

arbitrator/arbutil/src/types.rs

@@ -13,6 +13,14 @@ use std::{
 #[repr(C)]
 pub struct Bytes32(pub [u8; 32]);

+


extra blank line

tsahee · 2024-01-31T22:50:38Z

arbitrator/arbutil/src/types.rs

+    }
+}
+
+


extra blank line

tsahee · 2024-01-31T22:51:05Z

arbitrator/prover/src/machine.rs

+    hash_stack(multistack.iter().map(|v| stack_hasher(v)), "cothread:")
+}
+
+


extra blank line

tsahee · 2024-01-31T22:51:21Z

arbitrator/prover/src/machine.rs

+{
+    let mut data = Vec::with_capacity(33);
+
+


2 blank lines

tsahee · 2024-01-31T22:51:40Z

arbitrator/prover/src/machine.rs

+    data
+}
+
+


extra blank line

tsahee · 2024-01-31T22:56:38Z

I got some new warnings during rust compilation

warning: unused variable: `a`
   --> prover/src/machine.rs:938:13
    |
938 |     let mut a = Machine::NO_STACK_HASH;
    |             ^ help: if this is intentional, prefix it with an underscore: `_a`
    |
    = note: `#[warn(unused_variables)]` on by default

warning: variable does not need to be mutable
   --> prover/src/machine.rs:938:9
    |
938 |     let mut a = Machine::NO_STACK_HASH;
    |         ----^
    |         |
    |         help: remove this `mut`
    |
    = note: `#[warn(unused_mut)]` on by default

warning: variable does not need to be mutable
   --> prover/src/machine.rs:945:13
    |
945 |         let mut last_hash = match items.len() > 1{
    |             ----^^^^^^^^^
    |             |
    |             help: remove this `mut`

warning: variable does not need to be mutable
   --> prover/src/machine.rs:951:9
    |
951 |     let mut hash: Bytes32 = match items.len() > 2 {
    |         ----^^^^
    |         |
    |         help: remove this `mut`

tsahee · 2024-01-31T23:53:35Z

arbitrator/prover/src/machine.rs

+        //      "multistack: " 
+        //      + hash_stack(first_stack)
+        //      + hash_stack(last_stack)
+        //      + Keccak("cothread: " + 2nd_stack+Keccak("cothread" + 3drd_stack + ...)


code does "cothread:" (no space)

Done. Dropped it from multistack for consistency as well.

tsahee · 2024-01-31T23:59:14Z

arbitrator/prover/src/machine.rs

+    }
+    let mut hash: Bytes32 = match items.len() > 2 {
+        true => Machine::NO_STACK_HASH,
+        _ => {


these two are switched

tsahee · 2024-02-01T04:38:27Z

arbitrator/prover/src/machine.rs

+
+        let mut last_hash = match items.len() > 1{
+            true => {Machine::NO_STACK_HASH},
+            _ => stack_hasher(items.last().unwrap()),


these two are switched

anodar · 2024-02-01T12:38:53Z

Addressed comments, PTAL.

tsahee · 2024-02-07T02:20:18Z

added some small fixes and merged into go_wasi

Implement prove_stacks for stack of stacks

f0ea078

cla-bot bot added the s label Jan 23, 2024

anodar requested a review from tsahee January 23, 2024 15:23

anodar changed the title ~~Implement prove_stacks for stack of stacks~~ Implement proofs for stack of stacks Jan 23, 2024

anodar added 2 commits January 23, 2024 18:01

Drop comment

8a47edb

Implement hashing of all value/frame stacks in hashing the machine

cc39670

tsahee reviewed Jan 24, 2024

View reviewed changes

arbitrator/prover/src/machine.rs Outdated Show resolved Hide resolved

Reorder stack elements to from 0...n-1 to 0,n-1,1,2,...,n-2 in hashin…

e925b7c

…g to match order in proving

anodar requested a review from tsahee January 24, 2024 18:26

tsahee requested changes Jan 26, 2024

View reviewed changes

arbitrator/prover/src/machine.rs Outdated Show resolved Hide resolved

arbitrator/prover/src/machine.rs Outdated Show resolved Hide resolved

arbitrator/prover/src/machine.rs Show resolved Hide resolved

Change order of elements in hashing/proving

4b32ed3

anodar requested a review from tsahee January 29, 2024 16:40

tsahee requested changes Jan 30, 2024

View reviewed changes

tsahee reviewed Jan 30, 2024

View reviewed changes

arbitrator/prover/src/machine.rs Outdated Show resolved Hide resolved

anodar added 2 commits January 31, 2024 12:50

Reorder multistack hashing, add cothread into proving and hashing

70c64b0

Address rest of the comments

50b9610

anodar requested a review from tsahee January 31, 2024 15:01

tsahee reviewed Jan 31, 2024

View reviewed changes

tsahee reviewed Feb 1, 2024

View reviewed changes

Cargo fmt, fix match statements, drop static constructor from Bytes32

e423f3e

anodar requested a review from tsahee February 1, 2024 12:38

anodar added 3 commits February 1, 2024 13:52

Extra colon in comment

bcb76f6

Change match to if, inline cothread_to_bytes

43b4613

Merge branch 'go_wasi' into multiple_stacks

b2dca3e

anodar changed the title ~~Implement proofs for stack of stacks~~ Implement hashing and proofs for multistacks Feb 2, 2024

Drop commented out fn

0605998

tsahee added 3 commits February 2, 2024 19:06

Merge branch 'go_wasi' into multiple_stacks

f2f950c

machine: fix multistack hashing

7730865

Merge branch 'go_wasi' into multiple_stacks

933046e

tsahee merged commit 933046e into go_wasi Feb 7, 2024
1 of 7 checks passed

tsahee deleted the multiple_stacks branch February 7, 2024 02:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement hashing and proofs for multistacks #201

Implement hashing and proofs for multistacks #201

anodar commented Jan 23, 2024 •

edited

Loading

tsahee left a comment

tsahee left a comment

tsahee Jan 31, 2024

anodar Feb 1, 2024

tsahee Jan 31, 2024

anodar Feb 1, 2024

tsahee Jan 31, 2024

anodar Feb 1, 2024

tsahee Jan 31, 2024

anodar Feb 1, 2024

tsahee Jan 31, 2024

anodar Feb 1, 2024

tsahee Jan 31, 2024

anodar Feb 1, 2024

tsahee Jan 31, 2024

anodar Feb 1, 2024

tsahee commented Jan 31, 2024

tsahee Jan 31, 2024

anodar Feb 1, 2024

tsahee Jan 31, 2024

anodar Feb 1, 2024

tsahee Feb 1, 2024

anodar Feb 1, 2024

anodar commented Feb 1, 2024

tsahee commented Feb 7, 2024

		@@ -13,6 +13,14 @@ use std::{
		#[repr(C)]
		pub struct Bytes32(pub [u8; 32]);

		hash_stack(multistack.iter().map(\|v\| stack_hasher(v)), "cothread:")
		}

Implement hashing and proofs for multistacks #201

Implement hashing and proofs for multistacks #201

Conversation

anodar commented Jan 23, 2024 • edited Loading

tsahee left a comment

Choose a reason for hiding this comment

tsahee left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tsahee commented Jan 31, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

anodar commented Feb 1, 2024

tsahee commented Feb 7, 2024

anodar commented Jan 23, 2024 •

edited

Loading