Skip to content

Commit fa72be5

Browse files
authored
Merge branch 'main' into main
2 parents 0acce4c + 4752437 commit fa72be5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+1824
-1937
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ jobs:
114114

115115
integration:
116116
runs-on: ubuntu-latest
117-
timeout-minutes: 25
117+
timeout-minutes: 35
118118
steps:
119119
- uses: actions/checkout@v5
120120
with:
@@ -141,6 +141,8 @@ jobs:
141141
run: just run_sailfish_demo
142142
- name: Test with block-maker
143143
run: just test-all
144+
- name: Test dynamic committee change
145+
run: just test-dyn-comm
144146

145147
contracts:
146148
runs-on: ubuntu-latest

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +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
74
[submodule "contracts"]
85
path = contracts
96
url = https://github.com/EspressoSystems/timeboost-contracts.git

0 commit comments

Comments
 (0)