diff --git a/Cargo.lock b/Cargo.lock index 6faf3b1e..6bb8255c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8971,6 +8971,7 @@ dependencies = [ "nssa", "nssa_core", "optfield", + "rand 0.8.5", "serde", "serde_json", "sha2", diff --git a/bedrock/cfgsync.yaml b/bedrock/cfgsync.yaml index e09fe586..d7caa4a9 100644 --- a/bedrock/cfgsync.yaml +++ b/bedrock/cfgsync.yaml @@ -2,11 +2,23 @@ port: 4400 n_hosts: 4 timeout: 10 +faucet_settings: + enabled: true + +deployment_settings_storage_path: + deployment-settings.yaml + +entropy_file: /etc/logos-blockchain/test_entropy + +mode: Setup + # Tracing tracing_settings: - logger: Stdout + logger: + stdout: true + stderr: true tracing: None filter: None metrics: None console: None - level: DEBUG + level: Debug diff --git a/bedrock/docker-compose.yml b/bedrock/docker-compose.yml index 4f85bf25..d4ba9859 100644 --- a/bedrock/docker-compose.yml +++ b/bedrock/docker-compose.yml @@ -1,14 +1,17 @@ services: cfgsync: - image: ghcr.io/logos-blockchain/logos-blockchain@sha256:000982e751dfd346ca5346b8025c685fc3abc585079c59cde3bde7fd63100657 + platform: linux/amd64 + image: ghcr.io/logos-blockchain/logos-blockchain@sha256:2d35c2564e0e64b1181b5158908ec8842c9c540786cdbd665202026b349f61eb volumes: - ./scripts:/etc/logos-blockchain/scripts - ./cfgsync.yaml:/etc/logos-blockchain/cfgsync.yaml:z + - ./test_entropy:/etc/logos-blockchain/test_entropy:z entrypoint: /etc/logos-blockchain/scripts/run_cfgsync.sh logos-blockchain-node-0: - image: ghcr.io/logos-blockchain/logos-blockchain@sha256:000982e751dfd346ca5346b8025c685fc3abc585079c59cde3bde7fd63100657 + platform: linux/amd64 + image: ghcr.io/logos-blockchain/logos-blockchain@sha256:2d35c2564e0e64b1181b5158908ec8842c9c540786cdbd665202026b349f61eb ports: - "${PORT:-8080}:18080/tcp" volumes: @@ -19,7 +22,8 @@ services: entrypoint: /etc/logos-blockchain/scripts/run_logos_blockchain_node.sh logos-blockchain-node-1: - image: ghcr.io/logos-blockchain/logos-blockchain@sha256:000982e751dfd346ca5346b8025c685fc3abc585079c59cde3bde7fd63100657 + platform: linux/amd64 + image: ghcr.io/logos-blockchain/logos-blockchain@sha256:2d35c2564e0e64b1181b5158908ec8842c9c540786cdbd665202026b349f61eb volumes: - ./scripts:/etc/logos-blockchain/scripts - ./kzgrs_test_params:/kzgrs_test_params:z @@ -28,7 +32,8 @@ services: entrypoint: /etc/logos-blockchain/scripts/run_logos_blockchain_node.sh logos-blockchain-node-2: - image: ghcr.io/logos-blockchain/logos-blockchain@sha256:000982e751dfd346ca5346b8025c685fc3abc585079c59cde3bde7fd63100657 + platform: linux/amd64 + image: ghcr.io/logos-blockchain/logos-blockchain@sha256:2d35c2564e0e64b1181b5158908ec8842c9c540786cdbd665202026b349f61eb volumes: - ./scripts:/etc/logos-blockchain/scripts - ./kzgrs_test_params:/kzgrs_test_params:z @@ -37,7 +42,8 @@ services: entrypoint: /etc/logos-blockchain/scripts/run_logos_blockchain_node.sh logos-blockchain-node-3: - image: ghcr.io/logos-blockchain/logos-blockchain@sha256:000982e751dfd346ca5346b8025c685fc3abc585079c59cde3bde7fd63100657 + platform: linux/amd64 + image: ghcr.io/logos-blockchain/logos-blockchain@sha256:2d35c2564e0e64b1181b5158908ec8842c9c540786cdbd665202026b349f61eb volumes: - ./scripts:/etc/logos-blockchain/scripts - ./kzgrs_test_params:/kzgrs_test_params:z diff --git a/indexer/core/Cargo.toml b/indexer/core/Cargo.toml index 8129c1ea..13e81088 100644 --- a/indexer/core/Cargo.toml +++ b/indexer/core/Cargo.toml @@ -28,4 +28,3 @@ async-stream.workspace = true [dev-dependencies] tempfile.workspace = true - diff --git a/nssa/Cargo.toml b/nssa/Cargo.toml index e1b6805f..b50f189b 100644 --- a/nssa/Cargo.toml +++ b/nssa/Cargo.toml @@ -37,4 +37,4 @@ test-case = "3.3.1" [features] default = [] prove = ["risc0-zkvm/prove"] -test-utils = [] \ No newline at end of file +test-utils = [] diff --git a/programs/amm/Cargo.toml b/programs/amm/Cargo.toml index 449d5dcc..30074ac8 100644 --- a/programs/amm/Cargo.toml +++ b/programs/amm/Cargo.toml @@ -8,10 +8,12 @@ license = { workspace = true } workspace = true [dependencies] -nssa = { workspace = true, optional = true, features = ["test-utils"], default-features = true } +nssa = { workspace = true, optional = true, features = [ + "test-utils", +], default-features = true } nssa_core.workspace = true token_core.workspace = true amm_core.workspace = true [features] -nssa = ["dep:nssa"] \ No newline at end of file +nssa = ["dep:nssa"]