Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move starknet settlement to zaun #125

Merged
merged 109 commits into from
Oct 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
b4abf82
update dependencies
byteZorvin Sep 17, 2024
827fed4
update imports
byteZorvin Sep 17, 2024
c2e9bf1
updated changelog
byteZorvin Sep 17, 2024
47b7c64
added testcase for bytes conversion
byteZorvin Sep 17, 2024
35a02ca
fix clippy error
byteZorvin Sep 17, 2024
1fefb12
use zaun for starknet
byteZorvin Sep 18, 2024
db67889
Merge branch 'dependency-bump' into zaun
byteZorvin Sep 18, 2024
c674a6a
add simple test for settlement
byteZorvin Sep 26, 2024
a5a6e18
add sepolia issue
byteZorvin Sep 26, 2024
4aa76ba
to be fixed: validation error
byteZorvin Sep 26, 2024
003b3ae
add madara update state test
byteZorvin Sep 27, 2024
d6b5e67
use relative path
byteZorvin Sep 27, 2024
01b4061
add ci for settlement client
byteZorvin Sep 28, 2024
59185d3
fix workflow debug
byteZorvin Sep 28, 2024
1d590cf
fix workflow debug
byteZorvin Sep 28, 2024
4ebfb4e
add scarb build
byteZorvin Sep 28, 2024
e150e0c
ignore flaky test
byteZorvin Sep 28, 2024
2a074d0
fix threads issue
byteZorvin Sep 28, 2024
d2c5729
add scarb build for madara
byteZorvin Sep 28, 2024
c575e7b
check if tool version present
byteZorvin Sep 28, 2024
ac4cda5
fix workflow debug
byteZorvin Sep 28, 2024
fc7be88
fix workflwo
byteZorvin Sep 28, 2024
b8eab20
fix directory
byteZorvin Sep 28, 2024
7daf808
should fix it
byteZorvin Sep 28, 2024
8fb2450
fix bash command
byteZorvin Sep 28, 2024
a2b536e
fix bash command
byteZorvin Sep 28, 2024
0d0fefe
make scarb installation separate step
byteZorvin Sep 28, 2024
99dd1dd
use swm action
byteZorvin Sep 28, 2024
56c4144
fix ci path
byteZorvin Sep 28, 2024
66ebcd5
lint fixed
byteZorvin Sep 28, 2024
09e82b6
fix env path for tests
byteZorvin Sep 28, 2024
fc44027
fix lint
byteZorvin Sep 28, 2024
d539edb
remove extra path
byteZorvin Sep 28, 2024
16f934d
try checking structure
byteZorvin Sep 28, 2024
df4e955
check
byteZorvin Sep 28, 2024
1a14f38
fix env path
byteZorvin Sep 28, 2024
328fa0c
fix the directory
byteZorvin Sep 28, 2024
c49cb70
try go into
byteZorvin Sep 29, 2024
2a2a1dd
fix path
byteZorvin Sep 29, 2024
c8c9a53
remove working directory
byteZorvin Sep 29, 2024
4753c2c
final fix
byteZorvin Sep 29, 2024
76c3f59
fix: gets triggered multiple times
byteZorvin Sep 29, 2024
08261c4
fix path
byteZorvin Sep 29, 2024
577b327
fix prettier
byteZorvin Sep 29, 2024
e6eaf2e
change calldata type to (#133)
apoorvsadana Sep 30, 2024
e537cae
update workflow
byteZorvin Sep 30, 2024
b10bb6a
Merge branch 'zaun' of https://github.com/madara-alliance/madara-orch…
byteZorvin Sep 30, 2024
dc22f6e
fix lints
byteZorvin Sep 30, 2024
9a075cd
Update crates/settlement-clients/starknet/src/tests/test.rs
byteZorvin Sep 30, 2024
58d007f
resolve comments
byteZorvin Sep 30, 2024
ec2017d
fix e2e test flow
byteZorvin Oct 1, 2024
d629354
fix toml lint
byteZorvin Oct 1, 2024
7dbeccb
Update crates/settlement-clients/starknet/src/tests/test.rs
byteZorvin Oct 1, 2024
1bbf8dc
changed envs
byteZorvin Oct 1, 2024
58f323e
Merge branch 'zaun' of https://github.com/madara-alliance/madara-orch…
byteZorvin Oct 1, 2024
4ba8d6f
add conversion function and test
byteZorvin Oct 1, 2024
1c39968
remove redundant test
byteZorvin Oct 1, 2024
dd0a579
update workflow commit hash
byteZorvin Oct 1, 2024
975ea22
change commit and add prettierignore
byteZorvin Oct 1, 2024
fde129e
Merge branch 'main' into zaun
byteZorvin Oct 1, 2024
93a7aee
nonce implementaion and optimise code
byteZorvin Oct 1, 2024
3fd9dc2
remove coverage bin env
byteZorvin Oct 3, 2024
3788498
changed to logs
byteZorvin Oct 3, 2024
db2df7a
added preset file
byteZorvin Oct 3, 2024
0a57792
update versioned constants path
byteZorvin Oct 3, 2024
f9203e5
fix current_path
byteZorvin Oct 3, 2024
767d766
should do inplace replacement
byteZorvin Oct 3, 2024
81ab43e
fix base path
byteZorvin Oct 3, 2024
781ae30
fix final coverage workflow
byteZorvin Oct 3, 2024
ed64847
update preset
byteZorvin Oct 3, 2024
51d0345
change runner
byteZorvin Oct 3, 2024
06089b9
install dependencies
byteZorvin Oct 3, 2024
8880c4e
run linter
byteZorvin Oct 3, 2024
29645db
remove path
byteZorvin Oct 3, 2024
5c8941e
reword
byteZorvin Oct 3, 2024
5ca8d3a
change default rust
byteZorvin Oct 3, 2024
31faee0
rerun
byteZorvin Oct 3, 2024
144ac31
install libclang
byteZorvin Oct 3, 2024
86190f9
install more dependencies
byteZorvin Oct 3, 2024
ee0a88f
install yq
byteZorvin Oct 3, 2024
b2e1562
install via snap
byteZorvin Oct 3, 2024
8bc8e03
install snap first
byteZorvin Oct 3, 2024
f9fe926
add y flag
byteZorvin Oct 3, 2024
06f23ec
no y flag
byteZorvin Oct 3, 2024
ed0d204
enable snapd service
byteZorvin Oct 3, 2024
2fca4d1
use gh action for yq
byteZorvin Oct 3, 2024
73c9221
yq action
byteZorvin Oct 3, 2024
bdeedbf
remove working-directory
byteZorvin Oct 3, 2024
85d711e
check env variable
byteZorvin Oct 4, 2024
a1ec248
fix ci
byteZorvin Oct 4, 2024
af28cb2
remove override in e2e
byteZorvin Oct 4, 2024
cfd2389
dotenvy::from_filename
byteZorvin Oct 4, 2024
393d417
should also build
byteZorvin Oct 4, 2024
3e8f485
env override
byteZorvin Oct 4, 2024
7b9acfa
ignore flaky test
byteZorvin Oct 4, 2024
ec9c600
restart ci
byteZorvin Oct 4, 2024
8c2848f
enable cargo build
byteZorvin Oct 4, 2024
029b27f
override in starknet client
byteZorvin Oct 4, 2024
dd96afe
only starknet
byteZorvin Oct 4, 2024
be9ee77
retry running
byteZorvin Oct 4, 2024
cb68ba0
test settle should work
byteZorvin Oct 4, 2024
5dc682b
remove fail fast
byteZorvin Oct 4, 2024
7a9ca1a
update blocktime
byteZorvin Oct 4, 2024
3a80afa
change commit
byteZorvin Oct 4, 2024
29a6ceb
run all tests
byteZorvin Oct 4, 2024
cf5f53e
resolve comments
byteZorvin Oct 5, 2024
aaad425
added test for get nonce
byteZorvin Oct 5, 2024
13ee0e1
Merge branch 'main' into zaun
byteZorvin Oct 5, 2024
4e68523
remove log
byteZorvin Oct 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,11 @@ PRIVATE_KEY=
ETHEREUM_PRIVATE_KEY=
STARKNET_SOLIDITY_CORE_CONTRACT_ADDRESS=

##### STARKNET SETTLEMENT (L3s) #####
STARKNET_PRIVATE_KEY=
apoorvsadana marked this conversation as resolved.
Show resolved Hide resolved
STARKNET_ACCOUNT_ADDRESS=

##### Instrumentation #####
OTEL_SERVICE_NAME=
OTEL_COLLECTOR_ENDPOINT=
TRACING_LEVEL=
TRACING_LEVEL=
8 changes: 7 additions & 1 deletion .env.test
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,13 @@ TEST_DUMMY_CONTRACT_ADDRESS="0xE5b6F5e695BA6E4aeD92B68c4CC8Df1160D69A81"
STARKNET_OPERATOR_ADDRESS="0x2C169DFe5fBbA12957Bdd0Ba47d9CEDbFE260CA7"
ETHEREUM_BLAST_RPC_URL="https://eth-mainnet.public.blastapi.io"


##### STARKNET SETTLEMENT TEST #####
STARKNET_PRIVATE_KEY=0x76f2ccdb23f29bc7b69278e947c01c6160a31cf02c19d06d0f6e5ab1d768b86
STARKNET_ACCOUNT_ADDRESS=0x3bb306a004034dba19e6cf7b161e7a4fef64bc1078419e8ad1876192f0b8cd1
MADARA_BINARY_PATH="/path/to/madara"

## Instrumentation
OTEL_SERVICE_NAME="madara_orchestrator"
OTEL_COLLECTOR_ENDPOINT=""
TRACING_LEVEL="info"
TRACING_LEVEL="info"
38 changes: 35 additions & 3 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
coverage:
runs-on: ubuntu-latest
runs-on: karnot-arc-runner-set

services:
localstack:
Expand All @@ -30,14 +30,18 @@ jobs:

# selecting a toolchain either by action or manual `rustup` calls should happen
# before the plugin, as the cache uses the current rustc version as its cache key
- run: rustup show
- name: Install necessary dependencies
run: |
sudo apt update
sudo apt-get install -y clang llvm libudev-dev protobuf-compiler gcc g++ build-essential libssl-dev pkg-config curl wget git libclang-dev

- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
override: true
default: true

- name: Rust Cache
uses: Swatinem/rust-cache@v2
Expand All @@ -62,14 +66,42 @@ jobs:
- name: Install nextest
uses: taiki-e/install-action@nextest

- name: Setup scarb
uses: software-mansion/setup-scarb@v1
with:
scarb-version: "2.8.2"

- name: Build Mock Contracts using Scarb
run: |
cd crates/settlement-clients/starknet/src/tests/mock_contracts
scarb fmt --check
scarb build

- name: Checkout Madara
uses: actions/checkout@v4
with:
repository: madara-alliance/madara
ref: "0c821aecd1cafc516d00548473fcaddaa4dc0ce4"
path: madara

- name: Build Madara
working-directory: madara
run: |
cargo build
mv target/debug/madara ../madara-binary
cd ..
echo -e "
MADARA_BINARY_PATH=\"$(pwd)/madara-binary\"" >> .env.test
cat .env.test

- name: Getting neccesary files for testing
run: |
wget -P ./crates/prover-services/sharp-service/tests/artifacts https://madara-orchestrator-sharp-pie.s3.amazonaws.com/238996-SN.zip

- name: Run llvm-cov tests
env:
ETHEREUM_BLAST_RPC_URL: ${{ secrets.ETHEREUM_BLAST_RPC_URL }}
run: RUST_LOG=debug RUST_BACKTRACE=1 cargo llvm-cov nextest --release --features testing --lcov --output-path lcov.info --test-threads=1 --workspace --exclude=e2e-tests
run: RUST_LOG=debug RUST_BACKTRACE=1 cargo llvm-cov nextest --release --features testing --lcov --output-path lcov.info --test-threads=1 --workspace --exclude=e2e-tests --no-fail-fast

- name: Coveralls
uses: coverallsapp/github-action@v2
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*.code-workspace
.vscode


lcov.info

**/*-SN.zip
**/*-SN.zip
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
dashboards
target/
dashboards
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).

## Changed

- Bumped dependencies, and associated api changes done
- ethereum DA client builder
- AWS config built from TestConfigBuilder.
- Better TestConfigBuilder, with sync config clients.
Expand Down
Loading
Loading