Merge branch 'main' into main

Author: lukeiannucci

.github/workflows/build-and-test.yml

@@ -31,6 +31,10 @@ jobs:
         wget https://github.com/casey/just/releases/download/1.14.0/just-1.14.0-x86_64-unknown-linux-musl.tar.gz
         tar -vxf just-1.14.0-x86_64-unknown-linux-musl.tar.gz just
         sudo cp just /usr/bin/just
+    - name: Install rustfmt for nightly
+      run: rustup component add --toolchain nightly rustfmt
+    - name: Install Foundry
+      uses: foundry-rs/foundry-toolchain@v1
     - name: Install protobuf compiler
       run: |
         sudo apt-get update
@@ -60,6 +64,10 @@ jobs:
         wget https://github.com/casey/just/releases/download/1.14.0/just-1.14.0-x86_64-unknown-linux-musl.tar.gz
         tar -vxf just-1.14.0-x86_64-unknown-linux-musl.tar.gz just
         sudo cp just /usr/bin/just
+    - name: Install rustfmt for nightly
+      run: rustup component add --toolchain nightly rustfmt
+    - name: Install Foundry
+      uses: foundry-rs/foundry-toolchain@v1
     - name: Run tests
       run: just test_ci
 
@@ -81,12 +89,14 @@ jobs:
         sudo cp just /usr/bin/just
     - name: Install rustfmt for nightly
       run: rustup component add --toolchain nightly rustfmt
+    - name: Install Foundry
+      uses: foundry-rs/foundry-toolchain@v1
     - name: Check packages individually
       run: just check-individually
     - name: Run lint
       run: just lint
+
   build-docker:
-    needs: build
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -101,6 +111,7 @@ jobs:
         sudo cp just /usr/bin/just
     - name: Build Docker
       run: just build_docker
+
   integration:
     runs-on: ubuntu-latest
     timeout-minutes: 25
@@ -118,12 +129,36 @@ jobs:
         wget https://github.com/casey/just/releases/download/1.14.0/just-1.14.0-x86_64-unknown-linux-musl.tar.gz
         tar -vxf just-1.14.0-x86_64-unknown-linux-musl.tar.gz just
         sudo cp just /usr/bin/just
+    - name: Install rustfmt for nightly
+      run: rustup component add --toolchain nightly rustfmt
+    - name: Install Foundry
+      uses: foundry-rs/foundry-toolchain@v1
     - name: Run tests
       run: just run_demo -s /tmp/stamp --ignore-stamp --yapper -k test-configs/local-5.json
     - name: Run tests with late-start node
       run: just run_demo -l -s /tmp/stamp --ignore-stamp --yapper -k test-configs/local-5.json
     - name: Run sailfish demo
       run: just run_sailfish_demo
+
+  contracts:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: recursive
+        fetch-depth: 0
+    - name: Install Just
+      run: |
+        wget https://github.com/casey/just/releases/download/1.14.0/just-1.14.0-x86_64-unknown-linux-musl.tar.gz
+        tar -vxf just-1.14.0-x86_64-unknown-linux-musl.tar.gz just
+        sudo cp just /usr/bin/just
+    - name: Install rustfmt for nightly
+      run: rustup component add --toolchain nightly rustfmt
+    - name: Install Foundry
+      uses: foundry-rs/foundry-toolchain@v1
+    - name: Run contract tests
+      run: forge test -vvv
+
   nitro-timeboost-integration:
     runs-on: ubuntu-latest
     timeout-minutes: 60
@@ -141,6 +176,10 @@ jobs:
         wget https://github.com/casey/just/releases/download/1.14.0/just-1.14.0-x86_64-unknown-linux-musl.tar.gz
         tar -vxf just-1.14.0-x86_64-unknown-linux-musl.tar.gz just
         sudo cp just /usr/bin/just
+    - name: Install rustfmt for nightly
+      run: rustup component add --toolchain nightly rustfmt
+    - name: Install Foundry
+      uses: foundry-rs/foundry-toolchain@v1
     - name: Clone Espresso Testnode Repository
       run: |
         git clone --recursive https://github.com/EspressoSystems/decentralized-timeboost-nitro-testnode.git
@@ -159,5 +198,5 @@ jobs:
       run: just run_demo -s /tmp/stamp --ignore-stamp -k test-configs/local-2.json --rounds 10000 --yapper --nitro
     - name: Verify sequencer blocks
       run: |
-        just verify_blocks
+        RUST_LOG=info just verify_blocks
 

.gitignore

@@ -3,10 +3,6 @@
 debug/
 target/
 
-# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
-# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
-Cargo.lock
-
 # Exclude sources generated by protoc.
 timeboost-proto/src/*.rs
 
@@ -35,4 +31,7 @@ timeboost-proto/src/*.rs
 bacon.toml
 
 __pycache__/
+*.DS_Store
 
+# Rust bindings for smart contracts
+timeboost-contract/src/bindings

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "timeboost-proto/protos"]
 	path = timeboost-proto/protos
 	url = https://github.com/EspressoSystems/timeboost-proto.git
+[submodule "contracts/lib/openzeppelin-contracts-upgradeable"]
+	path = contracts/lib/openzeppelin-contracts-upgradeable
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable