feat: added merged update-client and membership program (#55)

* refactor

* refactor: membership

* imp: cloned verify membership

* updated contracts

* imp: uc-and-mem contract done

* imp: added new program

* imp: added prover

* imp: added new cli

* imp: added fixture

* imp: updated fixtures

* imp: tendermint test fixed

* imp: added fixture to cli

* fix: wrong block

* imp: generated mock fixtures

* imp: justfile

* fixtures generated

* imp: minor test improvement

* imp: tests passing!

* imp: test

* test: improved

* regenerated genesis

* imp: contract

* ci: fixed rust.yml

* ci: added new program

.github/workflows/programs.yml

@@ -38,10 +38,10 @@ jobs:
           cd programs/update-client
           ~/.config/.sp1/bin/cargo-prove prove build
 
-  verify-membership:
+  membership:
     strategy:
       fail-fast: true
-    name: Build verify-membership
+    name: Build membership
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
@@ -65,3 +65,31 @@ jobs:
         run: |
           cd programs/membership
           ~/.config/.sp1/bin/cargo-prove prove build
+
+  uc-and-membership:
+    strategy:
+      fail-fast: true
+    name: Build uc-and-membership
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly-2024-04-17
+          override: true
+
+      - name: Install SP1 toolchain
+        run: |
+          curl -L https://sp1.succinct.xyz | bash
+          ~/.config/.sp1/bin/sp1up 
+          ~/.config/.sp1/bin/cargo-prove prove --version
+
+      - name: Build SP1 program
+        run: |
+          cd programs/uc-and-membership
+          ~/.config/.sp1/bin/cargo-prove prove build

.github/workflows/rust.yml

@@ -31,10 +31,9 @@ jobs:
         with:
           command: clippy
 
-  build-all-features:
-    name: Build (without programs)
+  tests:
+    name: Unit Tests
     runs-on: ubuntu-latest
-    continue-on-error: true
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
@@ -49,11 +48,26 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --workspace --exclude sp1-ics07-tendermint-update-client --exclude sp1-ics07-tendermint-membership --locked --all-features
+          args: --workspace --exclude sp1-ics07-tendermint-update-client --exclude sp1-ics07-tendermint-membership --exclude sp1-ics07-tendermint-uc-and-membership --locked
         env:
           RUST_BACKTRACE: 1
+
+  build-all-features:
+    name: Build (without programs)
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+      - name: Install stable toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: 1.79.0
+          override: true
+          components: rustfmt, clippy
       - name: Build
         uses: actions-rs/cargo@v1
         with:
           command: build
-          args: --workspace --exclude sp1-ics07-tendermint-update-client --exclude sp1-ics07-tendermint-membership--locked --all-features
+          args: --workspace --exclude sp1-ics07-tendermint-update-client --exclude sp1-ics07-tendermint-membership--locked --exclude sp1-ics07-tendermint-uc-and-membership --all-features

Cargo.toml

@@ -21,6 +21,7 @@ sp1-helper = { git = "https://github.com/succinctlabs/sp1.git", tag = "v1.0.5-te
 
 sp1-ics07-tendermint-solidity = { path = "./packages/solidity/" }
 sp1-ics07-tendermint-update-client = { path = "./programs/update-client/" }
+sp1-ics07-tendermint-membership = { path = "./programs/membership/" }
 
 tendermint-light-client-verifier = { version = "0.36.0", default-features = false }
 ibc-client-tendermint = { version = "0.53.0", default-features = false, features = ["serde"] }