Skip to content

Commit 28d8f22

Browse files
zpokenzpoken
authored
update verifier & dockerfiles, fix backend & warnings & readme (#19)
* update verifier & dockerfiles, fix backend & warnings & readme - Updated the verifier contract. - Updated tests and scripts for the verifier. - Redeveloped smart contracts on the Sepolia test network. - Applied Rust code formatting. - Updated the README and documentation. - Fixed backend issues. - Updated Dockerfile. - Fix warnings. * Add tests * Update tests: - add more unit tests; - update coverage files; - fix code formatting; - update README; - fix warnings * Update coverage & fix block duplication
1 parent 69702f2 commit 28d8f22

File tree

204 files changed

+405687
-2577
lines changed

Some content is hidden

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

204 files changed

+405687
-2577
lines changed

‎.github/workflows/gnark.yml

+3
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,6 @@ jobs:
4646

4747
- name: Run golint
4848
run: golint ./...
49+
50+
- name: Run tests
51+
run: go test -v ./tests -skip TestBlockCircuitProver

‎.gitignore

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
/target
21
Cargo.lock
3-
.idea
2+
.idea

‎.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "near/contracts/foundry/verifier/lib/openzeppelin-contracts-upgradeable"]
2+
path = near/contracts/foundry/verifier/lib/openzeppelin-contracts-upgradeable
3+
url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable

‎near/.cargo/config.toml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[alias]
2+
xtask = "run --package xtask --"

‎near/.dockerignore

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
.git
22
.github
3+
contracts
34
data
45
database
5-
hardhat
66
proofs
7-
schemes
7+
schemes
8+
script

‎near/.gitignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
target/
21
.DS_Store
32
.vscode/
43
Cargo.lock
@@ -11,3 +10,7 @@ near_state_proofs/vault-contract/target
1110

1211
**/*.db
1312
**/*.proof
13+
14+
*.profraw
15+
16+
target/

‎near/.gitmodules

-3
This file was deleted.

‎near/CHANGELOG.md

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
2024-04-22
2+
3+
- Add more unit tests.
4+
- Update coverage files.
5+
- Fix code formatting.
6+
- Update README.
7+
- Fix warnings.
8+
9+
2024-03-29
10+
11+
- Updated the verifier contract.
12+
- Updated tests and scripts for the verifier.
13+
- Redeveloped smart contracts on the Sepolia test network.
14+
- Applied Rust code formatting.
15+
- Updated the README and documentation.
16+
- Fixed backend issues.
17+
- Updated Dockerfile.
18+
- Fix warnings.

‎near/Cargo.toml

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[workspace]
22
members = [
3-
"block_finality",
43
"crypto/plonky2_ed25519",
54
"crypto/plonky2_sha512",
5+
"block_finality",
66
"crypto/plonky2_sha256_u32",
77
"crypto/plonky2_bn128"
8-
]
8+
, "xtask"]
99

1010
[workspace.package]
1111
authors = [ "Zpoken" ]
@@ -38,13 +38,13 @@ sha2 = { version = "0.10" }
3838
sha3 = { version = "0.10" }
3939
static_assertions = { version = "1.1.0" }
4040
unroll = { version = "0.1.5" }
41-
rand = { version = "0.8.4" }
41+
rand = { version = "0.8.4" }
4242

4343
# Local dependencies
44-
plonky2 = { git = "https://github.com/wormhole-foundation/plonky2-near", rev = "7a6566d98ab1a93886b066bdcdd63043fb722021", features = ["parallel"] }
45-
plonky2_field = { git = "https://github.com/wormhole-foundation/plonky2-near", rev = "7a6566d98ab1a93886b066bdcdd63043fb722021" }
46-
plonky2_util = { git = "https://github.com/wormhole-foundation/plonky2-near", rev = "7a6566d98ab1a93886b066bdcdd63043fb722021" }
47-
plonky2_maybe_rayon = { git = "https://github.com/wormhole-foundation/plonky2-near", rev = "7a6566d98ab1a93886b066bdcdd63043fb722021", features = ["parallel"] }
44+
plonky2 = { git = "https://github.com/wormhole-foundation/plonky2-near", rev = "2244a9d802aa74f15c32ca7f4139959c61126819", features = ["parallel"] }
45+
plonky2_field = { git = "https://github.com/wormhole-foundation/plonky2-near", rev = "2244a9d802aa74f15c32ca7f4139959c61126819" }
46+
plonky2_util = { git = "https://github.com/wormhole-foundation/plonky2-near", rev = "2244a9d802aa74f15c32ca7f4139959c61126819" }
47+
plonky2_maybe_rayon = { git = "https://github.com/wormhole-foundation/plonky2-near", rev = "2244a9d802aa74f15c32ca7f4139959c61126819", features = ["parallel"] }
4848
plonky2_u32 = { path = "crypto/plonky2_u32" }
4949
plonky2_ecdsa = { path = "crypto/plonky2_ecdsa" }
5050
plonky2_ed25519 = { path = "crypto/plonky2_ed25519" }

‎near/README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ defined set of validators ======> defined next_bp_hash ======> defined block has
2121
<!-- ![Illustrative scheme](/schemes/Illustrative_scheme.png) -->
2222

2323
<figure>
24-
<img src="/schemes/Illustrative_scheme.png" alt="Architecture Diagram">
24+
<img src="/near/schemes/Illustrative_scheme.png" alt="Architecture Diagram">
2525
<figcaption>Figure: Illustrative Scheme for Block Proving.</figcaption>
2626
</figure>
2727

2828
### Input parameters for proof generation
29-
1. Block for which the proof is generated `(epoch N)` [Example](https://github.com/ZpokenWeb3/zk-light-client-implementation/blob/main/script/data/block-A6Gcz5uXxyTrigefyr48AXwag6gB7D6txzPSR3jBqqg2/block_header.json)
29+
1. Block for which the proof is generated `(epoch N)` [Example](/near/script/data/block-A6Gcz5uXxyTrigefyr48AXwag6gB7D6txzPSR3jBqqg2/block_header.json)
3030

31-
2. Block of the previous epoch `(epoch N-1)` [Example](https://github.com/ZpokenWeb3/zk-light-client-implementation/blob/main/script/data/block-A6Gcz5uXxyTrigefyr48AXwag6gB7D6txzPSR3jBqqg2/block_header.json)
31+
2. Block of the previous epoch `(epoch N-1)` [Example](/near/script/data/block-A6Gcz5uXxyTrigefyr48AXwag6gB7D6txzPSR3jBqqg2/block_header.json)
3232

33-
3. List of block producers for `epoch N ` [Example](https://github.com/ZpokenWeb3/zk-light-client-implementation/blob/main/script/data/block-A6Gcz5uXxyTrigefyr48AXwag6gB7D6txzPSR3jBqqg2/validators_ordered.json)
33+
3. List of block producers for `epoch N ` [Example](/near/script/data/block-A6Gcz5uXxyTrigefyr48AXwag6gB7D6txzPSR3jBqqg2/validators_ordered.json)
3434

3535

3636
## Near State Proofs
@@ -42,6 +42,6 @@ defined set of validators ======> defined next_bp_hash ======> defined block has
4242
- This ensures the data's validity and its presence in a specific blockchain state.
4343

4444
> [!TIP]
45-
> Read the example here [NEAR_STATE_PROOFS.md](/near_state_proofs/NEAR_STATE_PROOFS.md)
45+
> Read the example here [NEAR_STATE_PROOFS.md](/near/near_state_proofs/NEAR_STATE_PROOFS.md)
4646
4747
Developed by [Zpoken Cryptography Team](https://zpoken.io/)

‎near/backend/.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@ node_modules
22
# Keep environment variables out of version control
33
.env
44
.vscode/
5-
/proofs/
5+
proofs/*
6+
7+
!proofs/.gitkeep

‎near/backend/Dockerfile

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
FROM node:current-alpine
22

3+
# Install curl
4+
RUN apk update && apk add --no-cache curl
5+
36
WORKDIR /app
47

5-
COPY package.json yarn.lock .env /app
8+
COPY package.json yarn.lock /app
69

710
RUN yarn install
811

@@ -12,7 +15,5 @@ COPY ./proofs /app/proofs
1215

1316
RUN yarn db:push
1417

15-
ENV NATS_URL=nats://195.189.60.190:4222
16-
1718
EXPOSE 9024
18-
CMD yarn start
19+
CMD yarn start

‎near/backend/eslint.config.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// @ts-check
22

3-
import eslint from '@eslint/js';
4-
import tseslint from 'typescript-eslint';
3+
const eslint = require('@eslint/js');
4+
const tseslint = require('typescript-eslint');
55

6-
export default tseslint.config(eslint.configs.recommended, ...tseslint.configs.recommended);
6+
module.exports = tseslint.config(eslint.configs.recommended, ...tseslint.configs.recommended);

0 commit comments

Comments
 (0)