diff --git a/Cargo.lock b/Cargo.lock index 2a9d8df4..a0ac8e67 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4399,7 +4399,7 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "logos-blockchain-blend-crypto" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=1da154c74b911318fb853d37261f8a05ffe513b4#1da154c74b911318fb853d37261f8a05ffe513b4" dependencies = [ "blake2", "logos-blockchain-groth16", @@ -4413,7 +4413,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-message" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=1da154c74b911318fb853d37261f8a05ffe513b4#1da154c74b911318fb853d37261f8a05ffe513b4" dependencies = [ "blake2", "derivative", @@ -4436,7 +4436,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-proofs" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=1da154c74b911318fb853d37261f8a05ffe513b4#1da154c74b911318fb853d37261f8a05ffe513b4" dependencies = [ "ed25519-dalek", "generic-array 1.3.5", @@ -4455,7 +4455,7 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-broadcast-service" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=1da154c74b911318fb853d37261f8a05ffe513b4#1da154c74b911318fb853d37261f8a05ffe513b4" dependencies = [ "async-trait", "derivative", @@ -4471,7 +4471,7 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-service" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=1da154c74b911318fb853d37261f8a05ffe513b4#1da154c74b911318fb853d37261f8a05ffe513b4" dependencies = [ "async-trait", "bytes", @@ -4502,7 +4502,7 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-prover" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=1da154c74b911318fb853d37261f8a05ffe513b4#1da154c74b911318fb853d37261f8a05ffe513b4" dependencies = [ "logos-blockchain-circuits-utils", "tempfile", @@ -4511,7 +4511,7 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-utils" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=1da154c74b911318fb853d37261f8a05ffe513b4#1da154c74b911318fb853d37261f8a05ffe513b4" dependencies = [ "dirs", ] @@ -4519,7 +4519,7 @@ dependencies = [ [[package]] name = "logos-blockchain-common-http-client" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=1da154c74b911318fb853d37261f8a05ffe513b4#1da154c74b911318fb853d37261f8a05ffe513b4" dependencies = [ "futures", "hex", @@ -4539,7 +4539,7 @@ dependencies = [ [[package]] name = "logos-blockchain-core" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=1da154c74b911318fb853d37261f8a05ffe513b4#1da154c74b911318fb853d37261f8a05ffe513b4" dependencies = [ "ark-ff 0.4.2", "bincode", @@ -4569,7 +4569,7 @@ dependencies = [ [[package]] name = "logos-blockchain-cryptarchia-engine" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=1da154c74b911318fb853d37261f8a05ffe513b4#1da154c74b911318fb853d37261f8a05ffe513b4" dependencies = [ "cfg_eval", "logos-blockchain-pol", @@ -4585,7 +4585,7 @@ dependencies = [ [[package]] name = "logos-blockchain-cryptarchia-sync" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=1da154c74b911318fb853d37261f8a05ffe513b4#1da154c74b911318fb853d37261f8a05ffe513b4" dependencies = [ "bytes", "futures", @@ -4602,7 +4602,7 @@ dependencies = [ [[package]] name = "logos-blockchain-groth16" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=1da154c74b911318fb853d37261f8a05ffe513b4#1da154c74b911318fb853d37261f8a05ffe513b4" dependencies = [ "ark-bn254 0.4.0", "ark-ec 0.4.2", @@ -4620,7 +4620,7 @@ dependencies = [ [[package]] name = "logos-blockchain-http-api-common" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=1da154c74b911318fb853d37261f8a05ffe513b4#1da154c74b911318fb853d37261f8a05ffe513b4" dependencies = [ "axum 0.7.9", "logos-blockchain-core", @@ -4635,7 +4635,7 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-keys" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=1da154c74b911318fb853d37261f8a05ffe513b4#1da154c74b911318fb853d37261f8a05ffe513b4" dependencies = [ "async-trait", "bytes", @@ -4661,7 +4661,7 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-macros" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=1da154c74b911318fb853d37261f8a05ffe513b4#1da154c74b911318fb853d37261f8a05ffe513b4" dependencies = [ "proc-macro2", "quote", @@ -4671,7 +4671,7 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-operators" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=1da154c74b911318fb853d37261f8a05ffe513b4#1da154c74b911318fb853d37261f8a05ffe513b4" dependencies = [ "async-trait", "logos-blockchain-blend-proofs", @@ -4687,7 +4687,7 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-service" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=1da154c74b911318fb853d37261f8a05ffe513b4#1da154c74b911318fb853d37261f8a05ffe513b4" dependencies = [ "async-trait", "log", @@ -4704,7 +4704,7 @@ dependencies = [ [[package]] name = "logos-blockchain-ledger" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=1da154c74b911318fb853d37261f8a05ffe513b4#1da154c74b911318fb853d37261f8a05ffe513b4" dependencies = [ "derivative", "logos-blockchain-blend-crypto", @@ -4729,7 +4729,7 @@ dependencies = [ [[package]] name = "logos-blockchain-network-service" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=1da154c74b911318fb853d37261f8a05ffe513b4#1da154c74b911318fb853d37261f8a05ffe513b4" dependencies = [ "async-trait", "futures", @@ -4746,7 +4746,7 @@ dependencies = [ [[package]] name = "logos-blockchain-poc" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=1da154c74b911318fb853d37261f8a05ffe513b4#1da154c74b911318fb853d37261f8a05ffe513b4" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", @@ -4762,7 +4762,7 @@ dependencies = [ [[package]] name = "logos-blockchain-pol" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=1da154c74b911318fb853d37261f8a05ffe513b4#1da154c74b911318fb853d37261f8a05ffe513b4" dependencies = [ "astro-float", "logos-blockchain-circuits-prover", @@ -4781,7 +4781,7 @@ dependencies = [ [[package]] name = "logos-blockchain-poq" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=1da154c74b911318fb853d37261f8a05ffe513b4#1da154c74b911318fb853d37261f8a05ffe513b4" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", @@ -4798,7 +4798,7 @@ dependencies = [ [[package]] name = "logos-blockchain-poseidon2" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=1da154c74b911318fb853d37261f8a05ffe513b4#1da154c74b911318fb853d37261f8a05ffe513b4" dependencies = [ "ark-bn254 0.4.0", "ark-ff 0.4.2", @@ -4809,7 +4809,7 @@ dependencies = [ [[package]] name = "logos-blockchain-services-utils" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=1da154c74b911318fb853d37261f8a05ffe513b4#1da154c74b911318fb853d37261f8a05ffe513b4" dependencies = [ "async-trait", "futures", @@ -4824,7 +4824,7 @@ dependencies = [ [[package]] name = "logos-blockchain-storage-service" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=1da154c74b911318fb853d37261f8a05ffe513b4#1da154c74b911318fb853d37261f8a05ffe513b4" dependencies = [ "async-trait", "bytes", @@ -4842,7 +4842,7 @@ dependencies = [ [[package]] name = "logos-blockchain-time-service" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=1da154c74b911318fb853d37261f8a05ffe513b4#1da154c74b911318fb853d37261f8a05ffe513b4" dependencies = [ "async-trait", "futures", @@ -4861,7 +4861,7 @@ dependencies = [ [[package]] name = "logos-blockchain-tracing" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=1da154c74b911318fb853d37261f8a05ffe513b4#1da154c74b911318fb853d37261f8a05ffe513b4" dependencies = [ "opentelemetry", "opentelemetry-appender-tracing", @@ -4884,7 +4884,7 @@ dependencies = [ [[package]] name = "logos-blockchain-utils" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=1da154c74b911318fb853d37261f8a05ffe513b4#1da154c74b911318fb853d37261f8a05ffe513b4" dependencies = [ "async-trait", "blake2", @@ -4901,7 +4901,7 @@ dependencies = [ [[package]] name = "logos-blockchain-utxotree" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=1da154c74b911318fb853d37261f8a05ffe513b4#1da154c74b911318fb853d37261f8a05ffe513b4" dependencies = [ "ark-ff 0.4.2", "logos-blockchain-groth16", @@ -4915,7 +4915,7 @@ dependencies = [ [[package]] name = "logos-blockchain-witness-generator" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=1da154c74b911318fb853d37261f8a05ffe513b4#1da154c74b911318fb853d37261f8a05ffe513b4" dependencies = [ "tempfile", ] @@ -4923,7 +4923,7 @@ dependencies = [ [[package]] name = "logos-blockchain-zksign" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=1da154c74b911318fb853d37261f8a05ffe513b4#1da154c74b911318fb853d37261f8a05ffe513b4" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", diff --git a/Cargo.toml b/Cargo.toml index 45b52b2a..c87cc4a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -120,11 +120,11 @@ tokio-retry = "0.3.0" schemars = "1.2" async-stream = "0.3.6" -logos-blockchain-common-http-client = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "44c9513a1525372b725ba1010169d04ab00768b5" } -logos-blockchain-key-management-system-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "44c9513a1525372b725ba1010169d04ab00768b5" } -logos-blockchain-core = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "44c9513a1525372b725ba1010169d04ab00768b5" } -logos-blockchain-chain-broadcast-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "44c9513a1525372b725ba1010169d04ab00768b5" } -logos-blockchain-chain-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "44c9513a1525372b725ba1010169d04ab00768b5" } +logos-blockchain-common-http-client = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "1da154c74b911318fb853d37261f8a05ffe513b4" } +logos-blockchain-key-management-system-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "1da154c74b911318fb853d37261f8a05ffe513b4" } +logos-blockchain-core = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "1da154c74b911318fb853d37261f8a05ffe513b4" } +logos-blockchain-chain-broadcast-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "1da154c74b911318fb853d37261f8a05ffe513b4" } +logos-blockchain-chain-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "1da154c74b911318fb853d37261f8a05ffe513b4" } rocksdb = { version = "0.24.0", default-features = false, features = [ "snappy", diff --git a/bedrock/docker-compose.yml b/bedrock/docker-compose.yml index ce231530..2c428a0b 100644 --- a/bedrock/docker-compose.yml +++ b/bedrock/docker-compose.yml @@ -1,7 +1,7 @@ services: cfgsync: - image: ghcr.io/logos-blockchain/logos-blockchain@sha256:093d0319a366a5b7b7db1a29fd54510dea37336f24accbda6d5d1b94d15fb64b + image: ghcr.io/logos-blockchain/logos-blockchain@sha256:c5243681b353278cabb562a176f0a5cfbefc2056f18cebc47fe0e3720c29fb12 volumes: - ./scripts:/etc/logos-blockchain/scripts - ./cfgsync.yaml:/etc/logos-blockchain/cfgsync.yaml:z @@ -9,12 +9,13 @@ services: entrypoint: /etc/logos-blockchain/scripts/run_cfgsync.sh logos-blockchain-node-0: - image: ghcr.io/logos-blockchain/logos-blockchain@sha256:093d0319a366a5b7b7db1a29fd54510dea37336f24accbda6d5d1b94d15fb64b + image: ghcr.io/logos-blockchain/logos-blockchain@sha256:c5243681b353278cabb562a176f0a5cfbefc2056f18cebc47fe0e3720c29fb12 ports: - "${PORT:-8080}:18080/tcp" volumes: - ./scripts:/etc/logos-blockchain/scripts - ./kzgrs_test_params:/kzgrs_test_params:z + - ./deployment-settings.yaml:/etc/logos-blockchain/deployment-settings.yaml:z depends_on: - cfgsync entrypoint: /etc/logos-blockchain/scripts/run_logos_blockchain_node.sh diff --git a/bedrock/scripts/run_logos_blockchain_node.sh b/bedrock/scripts/run_logos_blockchain_node.sh index 1d326f22..59db0c31 100755 --- a/bedrock/scripts/run_logos_blockchain_node.sh +++ b/bedrock/scripts/run_logos_blockchain_node.sh @@ -11,19 +11,10 @@ export CFG_FILE_PATH="/config.yaml" \ /usr/bin/logos-blockchain-cfgsync-client -# Download deployment settings generated by cfgsync -curl -sf "${CFG_SERVER_ADDR}/deployment-settings" -o /deployment-settings.yaml +# Use the static deployment-settings.yaml (mounted from host) with consensus +# params pre-configured for single-node integration tests. Only the +# chain_start_time needs to be set dynamically to "now". +sed -i "s/PLACEHOLDER_CHAIN_START_TIME/$(date -u '+%Y-%m-%d %H:%M:%S.000000 +00:00:00')/" \ + /etc/logos-blockchain/deployment-settings.yaml -# Single-node test setup: bump slot_activation_coeff from 1/10 to 1/2 so blocks -# (and LIB) advance ~5x faster, keeping the indexer integration test within budget. -# Safe with 1 node since there are no reorgs. -# Range-based sed: within the 4 lines after `slot_activation_coeff:`, rewrite any -# `denominator: ` to `denominator: 2` regardless of field order or spacing. -sed -i '/slot_activation_coeff:/,+4 s/denominator: [0-9]\+/denominator: 2/' /deployment-settings.yaml - -# Lower security_param so finalization (LIB) lag is shorter — the indexer only -# sees finalized blocks, so a smaller security_param makes inscriptions visible -# to the indexer much sooner. -sed -i 's/security_param: [0-9]\+/security_param: 10/' /deployment-settings.yaml - -exec /usr/bin/logos-blockchain-node /config.yaml --deployment /deployment-settings.yaml +exec /usr/bin/logos-blockchain-node /config.yaml --deployment /etc/logos-blockchain/deployment-settings.yaml