Skip to content

Commit

Permalink
Added concatenated balance for nonzero constraint process (#294)
Browse files Browse the repository at this point in the history
* Added concatenated balance for nonzero constraint process

* fix: order of assigning balance value following the order of concatenated balance

* fixing typo

* Fix selector and concatenated balance on nonzero-constrain

* fix typo

* fix: following review comments

* fix: added assertions for N_CURRENCIES in the gate

* fix: gh workflow
  • Loading branch information
sifnoc committed Jul 26, 2024
1 parent 2460efe commit b1fea0a
Show file tree
Hide file tree
Showing 19 changed files with 413 additions and 326 deletions.
47 changes: 0 additions & 47 deletions .github/workflows/benchmark.yml

This file was deleted.

23 changes: 0 additions & 23 deletions .github/workflows/contracts.yml

This file was deleted.

68 changes: 23 additions & 45 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,53 +14,31 @@ env:
CARGO_TERM_COLOR: always

jobs:
wakeup:
test-zk-prover:
runs-on: ubuntu-latest
permissions:
id-token: write
contents: read

steps:
- uses: actions/checkout@v3

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: arn:aws:iam::490752553772:role/summa-solvency-ec2-slc
role-duration-seconds: 900
aws-region: us-west-2

- name: Wakeup runner
run: .github/scripts/wakeup.sh

build:
runs-on: [summa-solvency-runner]
needs: [wakeup]

steps:
- uses: actions/checkout@v3

- name: Set Environment
run: echo "PATH=/home/ubuntu/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" >> "$GITHUB_ENV"

- name: Install solc
run: (hash svm 2>/dev/null || cargo install --version 0.2.23 svm-rs) && svm install 0.8.20 && solc --version

- name: Test Prover
- name: Test Zk Prover
run: |
cd prover
cargo test --release -- --nocapture
- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1

# TODO restore workflow
# - name: Test backend
# run: |
# cd backend
# cargo test --release -- --nocapture

# - name: Test example
# run: |
# cd backend
# cargo run --release --example summa_solvency_flow
cargo test --release --features dev-graph -- --nocapture
# TODO: restore workflow after fix backend
# test-backend:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v3
# - name: Test backend
# run: |
# cd backend
# cargo test --release -- --nocapture

# test-backend-examples:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v3
# - name: Test backend example
# run: |
# cd backend
# cargo run --release --example summa_solvency_flow

2 changes: 1 addition & 1 deletion backend/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion backend/examples/summa_solvency_flow.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
//
// Initialize the `Round` instance to submit the liability commitment.
let entry_csv = "../csv/entry_16.csv";
let mut entries: Vec<Entry<N_CURRENCIES>> = vec![Entry::init_empty(); N_USERS];
let mut entries: Vec<Entry<N_USERS, N_CURRENCIES>> = vec![Entry::init_empty(); N_USERS];
let mut cryptos = vec![Cryptocurrency::init_empty(); N_CURRENCIES];
parse_csv_to_entries::<&str, N_CURRENCIES>(entry_csv, &mut entries, &mut cryptos).unwrap();

Expand Down
4 changes: 2 additions & 2 deletions backend/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ mod test {
.await?;

let entry_csv = "../csv/entry_16.csv";
let mut entries: Vec<Entry<N_CURRENCIES>> = vec![Entry::init_empty(); N_USERS];
let mut entries: Vec<Entry<N_USERS, N_CURRENCIES>> = vec![Entry::init_empty(); N_USERS];
let mut cryptos = vec![Cryptocurrency::init_empty(); N_CURRENCIES];
parse_csv_to_entries::<&str, N_CURRENCIES>(entry_csv, &mut entries, &mut cryptos).unwrap();

Expand Down Expand Up @@ -299,7 +299,7 @@ mod test {

// Initialize Round.
let entry_csv = "../csv/entry_16.csv";
let mut entries: Vec<Entry<N_CURRENCIES>> = vec![Entry::init_empty(); N_USERS];
let mut entries: Vec<Entry<N_USERS, N_CURRENCIES>> = vec![Entry::init_empty(); N_USERS];
let mut cryptos = vec![Cryptocurrency::init_empty(); N_CURRENCIES];
parse_csv_to_entries::<&str, N_CURRENCIES>(entry_csv, &mut entries, &mut cryptos).unwrap();

Expand Down
Loading

0 comments on commit b1fea0a

Please sign in to comment.