Skip to content

Commit f5f080d

Browse files
committed
Merge remote-tracking branch 'origin/main' into ax/vess-bench
2 parents 7d10147 + a2ad64c commit f5f080d

File tree

18 files changed

+1264
-286
lines changed

18 files changed

+1264
-286
lines changed

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

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ jobs:
3131
wget https://github.com/casey/just/releases/download/1.14.0/just-1.14.0-x86_64-unknown-linux-musl.tar.gz
3232
tar -vxf just-1.14.0-x86_64-unknown-linux-musl.tar.gz just
3333
sudo cp just /usr/bin/just
34+
- name: Install rustfmt for nightly
35+
run: rustup component add --toolchain nightly rustfmt
36+
- name: Install Foundry
37+
uses: foundry-rs/foundry-toolchain@v1
3438
- name: Install protobuf compiler
3539
run: |
3640
sudo apt-get update
@@ -60,6 +64,10 @@ jobs:
6064
wget https://github.com/casey/just/releases/download/1.14.0/just-1.14.0-x86_64-unknown-linux-musl.tar.gz
6165
tar -vxf just-1.14.0-x86_64-unknown-linux-musl.tar.gz just
6266
sudo cp just /usr/bin/just
67+
- name: Install rustfmt for nightly
68+
run: rustup component add --toolchain nightly rustfmt
69+
- name: Install Foundry
70+
uses: foundry-rs/foundry-toolchain@v1
6371
- name: Run tests
6472
run: just test_ci
6573

@@ -81,10 +89,13 @@ jobs:
8189
sudo cp just /usr/bin/just
8290
- name: Install rustfmt for nightly
8391
run: rustup component add --toolchain nightly rustfmt
92+
- name: Install Foundry
93+
uses: foundry-rs/foundry-toolchain@v1
8494
- name: Check packages individually
8595
run: just check-individually
8696
- name: Run lint
8797
run: just lint
98+
8899
build-docker:
89100
runs-on: ubuntu-latest
90101
steps:
@@ -100,6 +111,7 @@ jobs:
100111
sudo cp just /usr/bin/just
101112
- name: Build Docker
102113
run: just build_docker
114+
103115
integration:
104116
runs-on: ubuntu-latest
105117
timeout-minutes: 25
@@ -117,12 +129,36 @@ jobs:
117129
wget https://github.com/casey/just/releases/download/1.14.0/just-1.14.0-x86_64-unknown-linux-musl.tar.gz
118130
tar -vxf just-1.14.0-x86_64-unknown-linux-musl.tar.gz just
119131
sudo cp just /usr/bin/just
132+
- name: Install rustfmt for nightly
133+
run: rustup component add --toolchain nightly rustfmt
134+
- name: Install Foundry
135+
uses: foundry-rs/foundry-toolchain@v1
120136
- name: Run tests
121137
run: just run_demo -s /tmp/stamp --ignore-stamp --yapper -k test-configs/local-5.json
122138
- name: Run tests with late-start node
123139
run: just run_demo -l -s /tmp/stamp --ignore-stamp --yapper -k test-configs/local-5.json
124140
- name: Run sailfish demo
125141
run: just run_sailfish_demo
142+
143+
contracts:
144+
runs-on: ubuntu-latest
145+
steps:
146+
- uses: actions/checkout@v4
147+
with:
148+
submodules: recursive
149+
fetch-depth: 0
150+
- name: Install Just
151+
run: |
152+
wget https://github.com/casey/just/releases/download/1.14.0/just-1.14.0-x86_64-unknown-linux-musl.tar.gz
153+
tar -vxf just-1.14.0-x86_64-unknown-linux-musl.tar.gz just
154+
sudo cp just /usr/bin/just
155+
- name: Install rustfmt for nightly
156+
run: rustup component add --toolchain nightly rustfmt
157+
- name: Install Foundry
158+
uses: foundry-rs/foundry-toolchain@v1
159+
- name: Run contract tests
160+
run: forge test -vvv
161+
126162
nitro-timeboost-integration:
127163
runs-on: ubuntu-latest
128164
timeout-minutes: 60
@@ -140,6 +176,10 @@ jobs:
140176
wget https://github.com/casey/just/releases/download/1.14.0/just-1.14.0-x86_64-unknown-linux-musl.tar.gz
141177
tar -vxf just-1.14.0-x86_64-unknown-linux-musl.tar.gz just
142178
sudo cp just /usr/bin/just
179+
- name: Install rustfmt for nightly
180+
run: rustup component add --toolchain nightly rustfmt
181+
- name: Install Foundry
182+
uses: foundry-rs/foundry-toolchain@v1
143183
- name: Clone Espresso Testnode Repository
144184
run: |
145185
git clone --recursive https://github.com/EspressoSystems/decentralized-timeboost-nitro-testnode.git

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,7 @@ timeboost-proto/src/*.rs
3131
bacon.toml
3232

3333
__pycache__/
34+
*.DS_Store
3435

36+
# Rust bindings for smart contracts
37+
timeboost-contract/src/bindings

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "timeboost-proto/protos"]
22
path = timeboost-proto/protos
33
url = https://github.com/EspressoSystems/timeboost-proto.git
4+
[submodule "contracts/lib/openzeppelin-contracts-upgradeable"]
5+
path = contracts/lib/openzeppelin-contracts-upgradeable
6+
url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable

0 commit comments

Comments
 (0)