Skip to content

Commit

Permalink
Fix/test aws (#186)
Browse files Browse the repository at this point in the history
* fix: atlantic added in clap, get status code updated and snos branch updated as well

* fix: atlantic tests and url update

* update: starknet-os version

* verification values udpated for proving

* verification logic changed

* dockerfile updated

* atlantic query response updated

* nack->ack and max 10 blocks in update state

* fix: aws event bridge setup

* update: delete storage setup

* update: fixed serialization of trigger message

* update: fix worker trigger for aws

* update: re-fix CI issue

* random commit to re-trigger CI

* update: added more metric

* update: Bucket Region from ENV

* update: reworked location constraint

---------

Co-authored-by: mohiiit <[email protected]>
Co-authored-by: apoorvsadana <[email protected]>
  • Loading branch information
3 people authored Dec 10, 2024
1 parent 4b0fce4 commit 9d5ace8
Show file tree
Hide file tree
Showing 32 changed files with 694 additions and 173 deletions.
12 changes: 9 additions & 3 deletions .env.test
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,18 @@
AWS_ACCESS_KEY_ID=AWS_ACCESS_KEY_ID
AWS_SECRET_ACCESS_KEY=AWS_SECRET_ACCESS_KEY
AWS_REGION=us-east-1

# For Aws sdk
AWS_ENDPOINT_URL=http://localhost.localstack.cloud:4566
# For Omniqueue
AWS_DEFAULT_REGION=localhost

# For EventBridge

MADARA_ORCHESTRATOR_EVENT_BRIDGE_TRIGGER_RULE_NAME=madara-orchestrator-worker-trigger
MADARA_ORCHESTRATOR_EVENT_BRIDGE_TRIGGER_ROLE_NAME=madara-orchestrator-worker-trigger-role
MADARA_ORCHESTRATOR_EVENT_BRIDGE_TRIGGER_POLICY_NAME=madara-orchestrator-worker-trigger-policy



#### ALERTS ####

Expand Down Expand Up @@ -46,7 +52,7 @@ MADARA_ORCHESTRATOR_GPS_VERIFIER_CONTRACT_ADDRESS=0x07ec0D28e50322Eb0C159B9090ec

## ATLANTIC ##

MADARA_ORCHESTRATOR_ATLANTIC_API_KEY="73307f1b-6464-412d-8cce-9473b5073cc2"
MADARA_ORCHESTRATOR_ATLANTIC_API_KEY="API-KEY"
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")
Expand All @@ -59,6 +65,7 @@ MADARA_ORCHESTRATOR_ATLANTIC_RPC_NODE_URL=http://127.0.0.1:8545

MADARA_ORCHESTRATOR_SQS_PREFIX=madara_orchestrator
MADARA_ORCHESTRATOR_SQS_SUFFIX=queue
MADARA_ORCHESTRATOR_EVENT_BRIDGE_TARGET_QUEUE_NAME=madara_orchestrator_worker_trigger_queue
MADARA_ORCHESTRATOR_SQS_BASE_QUEUE_URL=http://sqs.us-east-1.localhost.localstack.cloud:4566/000000000000

#### SETTLEMENT ####
Expand Down Expand Up @@ -92,7 +99,6 @@ MADARA_ORCHESTRATOR_AWS_S3_BUCKET_NAME=madara-orchestrator-test-bucket

MADARA_ORCHESTRATOR_OTEL_SERVICE_NAME=orchestrator


#### SERVER ####

MADARA_ORCHESTRATOR_HOST=127.0.0.1
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).

## Fixed

- refactor: aws setup for Event Bridge
- refactor: RUST_LOG filtering support
- refactor: cargo.toml files cleaned
- blob data formation process from state update
Expand Down
113 changes: 81 additions & 32 deletions Cargo.lock

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

10 changes: 6 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ aws-sdk-s3 = { version = "1.38.0", features = ["behavior-version-latest"] }
aws-sdk-eventbridge = { version = "1.41.0", features = [
"behavior-version-latest",
] }
aws-sdk-iam = "1.52.0"
aws-sdk-scheduler = "1.49.0"
aws-sdk-sns = { version = "1.40.0", features = ["behavior-version-latest"] }
aws-credential-types = { version = "1.2.1", features = [
"hardcoded-credentials",
Expand Down Expand Up @@ -122,17 +124,17 @@ tracing-subscriber = { version = "0.3.18", features = [
tracing-opentelemetry = "0.26.0"

# Cairo VM
cairo-vm = { git = "https://github.com/Moonsong-Labs/cairo-vm", branch = "herman/fix-pie-serialization", features = [
cairo-vm = { git = "https://github.com/Moonsong-Labs/cairo-vm", branch = "notlesh/snos-2024-11-04", features = [
"cairo-1-hints",
"extensive_hints",
"mod_builtin",
] }


# Snos & Sharp (Starkware)
# TODO: need to update this once the updated PR merges
starknet-os = { git = "https://github.com/Mohiiit/snos", rev = "2dcd3b0f0c6bfa368a802de12de29cd124c72bb8" }
prove_block = { git = "https://github.com/Mohiiit/snos", rev = "2dcd3b0f0c6bfa368a802de12de29cd124c72bb8" }

starknet-os = { git = "https://github.com/keep-starknet-strange/snos", branch = "tmp/snos_devnet_zero_txs" }
prove_block = { git = "https://github.com/keep-starknet-strange/snos", branch = "tmp/snos_devnet_zero_txs" }

# Madara prover API
madara-prover-common = { git = "https://github.com/Moonsong-Labs/madara-prover-api", branch = "od/use-latest-cairo-vm" }
Expand Down
Loading

0 comments on commit 9d5ace8

Please sign in to comment.