Skip to content

Commit

Permalink
Integration of Atlantic Service and HTTP Client Infrastructure (#182)
Browse files Browse the repository at this point in the history
* initialised atlantic service

* feat: added l1 and l2 proving apis

* add header

* feat:added testcases for atlantic service

* chore: change to atlantic proving service

* fix: change layout to 'starknet_with_keccak'

* change layout to all_cairo for testing

* update gps verifier

* chore: add program hash log

* fix: change program hash

* ran formatter

* refactor init commit

* broken http client

* refactor: http_client and prover services refactored

* fix: build issue fixed with temp snos

* chore: linting and formatting

* chore: todo added for later to change snos

* refactor: atlantic test updated as pwe the new changes

* chore: linting and removed print statements

* refactor: prover-service renamed to prover-clients

* changelog: updated

* chore: formatting and linting

* fix: changing prover service to sharp

* fix: adding proof layout to env file

* fix: updated the prvoving zip

* fix: program hash fixed and fact of the block registered

* fix: sleep added after setting fact

* refactor: toml files cleaning and http mock version update

* update: duplicate SNOS_PROOD_LAYOUT removed

* changelog: updated

* chore: linting

* fix: snos layout updated to dynamic

* fix: linting and proof layout

* refactor: added different layout name for snos and proving

* fix: comments resolved, docker-compose deleted, request-builder updated

* changelog: updated

* resolved: comments and path updated in yaml for s3 download

* refactor: replaced mock server with dummy url to create http client

* fix: atlantic endpoint updated

* refactor: atlantic test now use mock server

* fix: files added

* fix: env variable's name updated

* chores: removed extra print statement

---------

Co-authored-by: byteZorvin <[email protected]>
Co-authored-by: apoorvsadana <[email protected]>
Co-authored-by: mohiiit <[email protected]>
  • Loading branch information
4 people authored Nov 20, 2024
1 parent 58cca2c commit 2ab2291
Show file tree
Hide file tree
Showing 53 changed files with 2,656 additions and 512 deletions.
9 changes: 9 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,22 @@ MADARA_ORCHESTRATOR_DATABASE_NAME=
##### PROVER #####

PROVER_SERVICE=

## if using sharp
MADARA_ORCHESTRATOR_SHARP_CUSTOMER_ID=
MADARA_ORCHESTRATOR_SHARP_URL=
MADARA_ORCHESTRATOR_SHARP_USER_CRT=
MADARA_ORCHESTRATOR_SHARP_USER_KEY=
MADARA_ORCHESTRATOR_SHARP_SERVER_CRT=
MADARA_ORCHESTRATOR_SHARP_PROOF_LAYOUT=


## if using atlantic
MADARA_ORCHESTRATOR_ATLANTIC_API_KEY=
MADARA_ORCHESTRATOR_ATLANTIC_URL=
MADARA_ORCHESTRATOR_MOCK_FACT_HASH=
MADARA_ORCHESTRATOR_PROVER_TYPE=

##### ON CHAIN CONFIG #####

DA_LAYER=
Expand Down
10 changes: 9 additions & 1 deletion .env.test
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,15 @@ MADARA_ORCHESTRATOR_SHARP_RPC_NODE_URL=http://127.0.0.1:8545
MADARA_ORCHESTRATOR_SHARP_PROOF_LAYOUT=small
MADARA_ORCHESTRATOR_GPS_VERIFIER_CONTRACT_ADDRESS=0x07ec0D28e50322Eb0C159B9090ecF3aeA8346DFe


## ATLANTIC ##

MADARA_ORCHESTRATOR_ATLANTIC_API_KEY="73307f1b-6464-412d-8cce-9473b5073cc2"
MADARA_ORCHESTRATOR_ATLANTIC_SERVICE_URL="https://atlantic.api.herodotus.cloud"
MADARA_ORCHESTRATOR_ATLANTIC_MOCK_FACT_HASH="false" # Whether to use mock fact registry
MADARA_ORCHESTRATOR_ATLANTIC_PROVER_TYPE="herodotus" # ("herodotus" | "starkware")
MADARA_ORCHESTRATOR_ATLANTIC_SETTLEMENT_LAYER="ethereum" # ("ethereum" | "starknet")
MADARA_ORCHESTRATOR_ATLANTIC_VERIFIER_CONTRACT_ADDRESS=0x07ec0D28e50322Eb0C159B9090ecF3aeA8346DFe
MADARA_ORCHESTRATOR_ATLANTIC_RPC_NODE_URL=http://127.0.0.1:8545
#### QUEUE ####

## AWS SQS ##
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,9 @@ jobs:
- 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
wget -P ./crates/prover-clients/sharp-service/tests/artifacts https://madara-orchestrator-sharp-pie.s3.amazonaws.com/238996-SN.zip
# TODO: this can be optimised
cp ./crates/prover-services/sharp-service/tests/artifacts/238996-SN.zip ./crates/orchestrator/src/tests/artifacts/238996-SN.zip
cp ./crates/prover-clients/sharp-service/tests/artifacts/238996-SN.zip ./crates/orchestrator/src/tests/artifacts/238996-SN.zip
- name: Build SNOS files
run: |
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).

## Added

- tests: http_client tests added
- Added Atlantic proving service integration
- setup functions added for cloud and db
- Added cli args support for all the services
- Setup functions added for cloud and db
- panic handling in process job
Expand Down Expand Up @@ -45,6 +48,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).

## Changed

- refactor: http_mock version updated
- refactor: prover-services renamed to prover-clients
- refactor: update json made generic to update any json file
- refactor: makefile updated as per bootstraper changes
- removed error return in case of JobAlreadyExists in `create_job` function
Expand All @@ -68,12 +73,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).

## Removed

- docker-compose removed
- revert CI changes from settlement client PR.
- `init_config` from all the tests.
- `fetch_from_test` argument

## Fixed

- refactor: cargo.toml files cleaned
- blob data formation process from state update
- OTEL config refactor
- indexing for get_jobs_without_successor
Expand Down
Loading

0 comments on commit 2ab2291

Please sign in to comment.