Fix the fraud proof (#124)

* Update contracts submodule * Upgrade go client * Fix the staker challenge tests --------- Co-authored-by: sveitser <sveitser@gmail.com>
EspressoSystems · Jun 4, 2024 · 19bea8d · 19bea8d
1 parent 1e1aa5b
commit 19bea8d
Show file tree

Hide file tree

Showing 48 changed files with 1,392 additions and 505 deletions.
diff --git a/.github/workflows/espresso-e2e.yml b/.github/workflows/espresso-e2e.yml
@@ -135,7 +135,7 @@ jobs:
       - name: Run E2E test
         run: |
           packages=`go list ./... | grep system_tests`
-          gotestsum --format short-verbose --packages="$packages" --rerun-fails=1 -- -v -timeout 30m -p 1 ./... -run 'TestEspressoE2E'
+          gotestsum --format short-verbose --packages="$packages" --rerun-fails=1 -- -v -timeout 35m -p 1 ./... -run 'TestEspressoE2E'
 
       - name: Run switch test
         run: |

diff --git a/arbitrator/Cargo.lock b/arbitrator/Cargo.lock
diff --git a/arbitrator/espresso-crypto-helper/Cargo.toml b/arbitrator/espresso-crypto-helper/Cargo.toml
@@ -11,6 +11,7 @@ ark-ff = "0.4"
 ark-serialize = { version = "0.4", features = ["derive"] }
 ark-std = { version = "0.4", default-features = false }
 base64 = "0.22"
+bytesize = "1.3"
 derive_more = "0.99.17"
 digest = "0.10"
 ethers-core = "2.0.14"

diff --git a/arbitrator/espresso-crypto-helper/src/lib.rs b/arbitrator/espresso-crypto-helper/src/lib.rs
@@ -1,5 +1,6 @@
 mod bytes;
 mod sequencer_data_structures;
+mod utils;
 
 use ark_bn254::Bn254;
 use ark_ff::PrimeField;

diff --git a/arbitrator/espresso-crypto-helper/src/mock_data/header.json b/arbitrator/espresso-crypto-helper/src/mock_data/header.json
@@ -0,0 +1,37 @@
+{
+    "block_merkle_tree_root": "MERKLE_COMM~AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAQA",
+    "builder_commitment": "BUILDER_COMMITMENT~PfISPEAHYbCXqJ08RqlK74d9aSrtrZkKHdnoX7crymG5",
+    "builder_signature": {
+        "r": "0xca39647d5e159ebf62e0efd163ddb2b7946f437948e6c31accdb5360a9f2da17",
+        "s": "0x610e51dced89ede20e3dcc5e9e26fff580738e785371df53389f2f84dadbdb87",
+        "v": 28
+    },
+    "chain_config": {
+        "chain_config": {
+            "Left": {
+                "base_fee": "0",
+                "chain_id": "35353",
+                "fee_contract": "0x0000000000000000000000000000000000000000",
+                "fee_recipient": "0x0000000000000000000000000000000000000000",
+                "max_block_size": "10240"
+            }
+        }
+    },
+    "fee_info": {
+        "account": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
+        "amount": "0"
+    },
+    "fee_merkle_tree_root": "MERKLE_COMM~AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAKA",
+    "height": 42,
+    "l1_finalized": {
+        "hash": "0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef",
+        "number": 123,
+        "timestamp": "0x456"
+    },
+    "l1_head": 124,
+    "ns_table": {
+        "bytes": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+    },
+    "payload_commitment": "HASH~AazstQer_ho1SqgGT0r10_Gs0BnjfbPBHJdSO3HHbp29",
+    "timestamp": 789
+}
diff --git a/arbitrator/espresso-crypto-helper/src/mock_data/test_header.json b/arbitrator/espresso-crypto-helper/src/mock_data/test_header.json
@@ -1,31 +1,31 @@
 {
+  "chain_config": {
     "chain_config": {
-      "chain_config": {
-        "Right": "CHAIN_CONFIG~E_LT4O8oRs3FoSL7pVT1iVaN9Y2XAHNYnKmJuHcz2mXE"
-      }
-    },
-    "height": 1,
-    "timestamp": 1714012810,
-    "l1_head": 40,
-    "l1_finalized": {
-      "number": 32,
-      "timestamp": "0x6629c282",
-      "hash": "0x086c2d889dfc549acffa6ecd53b4df088e770ac87e26e3726d09f849c17db536"
-    },
-    "payload_commitment": "HASH~CcLCyX4_jMHMT_UXK_FsGF8Shvw7pgFj5Og2mjW2y7ao",
-    "builder_commitment": "BUILDER_COMMITMENT~qfiL_spBvy7D19-v1bjtjhB_Yg1oH84s5xE1A5YgMn42",
-    "ns_table": {
-      "bytes": "CgAAABgnAACUCAAAGScAAG4TAAASJwAAcx4AABQnAADQIgAAECcAAOAmAAAWJwAARy8AABMnAABTLwAAEScAALsyAAAXJwAATjoAABonAAAJRQAA"
-    },
-    "block_merkle_tree_root": "MERKLE_COMM~Y9ufYrqN9PnWxV7sGibwrfdNKXkgGzmL2TZDrLZgo1AgAAAAAAAAAAEAAAAAAAAAJA",
-    "fee_merkle_tree_root": "MERKLE_COMM~bYMmugVZtniEfwFcBGTEbMpBnkPHHWmt8YAW5ygWSKAUAAAAAAAAAAYAAAAAAAAAvQ",
-    "builder_signature": {
-      "r": "0x95824a15bb9e854bfbbab2b4ea27c82102078691281b1dc24fb5d63bb2deb663",
-      "s": "0x4419db237be39bfc44cb37f2f69ed78cd1709fe4b01ec15c0bbd08ddd309d7b8",
-      "v": 27
-    },
-    "fee_info": {
-      "account": "0xdf3e18d64bc6a983f673ab319ccae4f1a57c7097",
-      "amount": "0x0"
+      "Right": "CHAIN_CONFIG~E_LT4O8oRs3FoSL7pVT1iVaN9Y2XAHNYnKmJuHcz2mXE"
     }
-  }
+  },
+  "height": 1,
+  "timestamp": 1714012810,
+  "l1_head": 40,
+  "l1_finalized": {
+    "number": 32,
+    "timestamp": "0x6629c282",
+    "hash": "0x086c2d889dfc549acffa6ecd53b4df088e770ac87e26e3726d09f849c17db536"
+  },
+  "payload_commitment": "HASH~CcLCyX4_jMHMT_UXK_FsGF8Shvw7pgFj5Og2mjW2y7ao",
+  "builder_commitment": "BUILDER_COMMITMENT~qfiL_spBvy7D19-v1bjtjhB_Yg1oH84s5xE1A5YgMn42",
+  "ns_table": {
+    "bytes": "CgAAABgnAACUCAAAGScAAG4TAAASJwAAcx4AABQnAADQIgAAECcAAOAmAAAWJwAARy8AABMnAABTLwAAEScAALsyAAAXJwAATjoAABonAAAJRQAA"
+  },
+  "block_merkle_tree_root": "MERKLE_COMM~Y9ufYrqN9PnWxV7sGibwrfdNKXkgGzmL2TZDrLZgo1AgAAAAAAAAAAEAAAAAAAAAJA",
+  "fee_merkle_tree_root": "MERKLE_COMM~bYMmugVZtniEfwFcBGTEbMpBnkPHHWmt8YAW5ygWSKAUAAAAAAAAAAYAAAAAAAAAvQ",
+  "builder_signature": {
+    "r": "0x95824a15bb9e854bfbbab2b4ea27c82102078691281b1dc24fb5d63bb2deb663",
+    "s": "0x4419db237be39bfc44cb37f2f69ed78cd1709fe4b01ec15c0bbd08ddd309d7b8",
+    "v": 27
+  },
+  "fee_info": {
+    "account": "0xdf3e18d64bc6a983f673ab319ccae4f1a57c7097",
+    "amount": "0"
+  }
+}