Skip to content

Commit

Permalink
Aggregation v2 (#296)
Browse files Browse the repository at this point in the history 
* feat: accumulator v2 (wip 1)

* feat: accumulator v2 (wip 2)

* chore: fix some warnings and fix validator build

* feat: accumulator v2 (wip 3)

* feat: skip message buffer aggregation if all price feeds use v2 aggregation

* feat: combine v1 and v2 aggregation price feed messages in the merkle tree

* refactor: clean up and avoid extra vector

* fix: don't aggregate if already aggregated in the program

* test: bring back old pyth tests (wip)

* test: fix old pyth tests

* test: add initial v2 tests to validator

* refactor: unify env var handling

* chore: fix build for stable Rust by ignoring lints

* test: fix and expand accumulator-v2 tests

* chore: clean up comments

* chore: update dependency

* chore: fix clippy and fmt

* test: add extra check

* chore: bump version to 1.14.175

---------

Co-authored-by: Reisen <[email protected]>
  • Loading branch information
@Riateche @Reisen
Riateche and Reisen authored Jul 24, 2024
1 parent ea2ab27 commit a378583
Show file tree
Hide file tree
Showing 154 changed files with 3,178 additions and 1,965 deletions.
904 changes: 493 additions & 411 deletions Cargo.lock
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions account-decoder/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "solana-account-decoder"
version = "1.14.174"
version = "1.14.175"
description = "Solana account decoder"
authors = ["Solana Maintainers <[email protected]>"]
repository = "https://github.com/solana-labs/solana"
Expand All @@ -19,10 +19,10 @@ lazy_static = "1.4.0"
serde = "1.0.138"
serde_derive = "1.0.103"
serde_json = "1.0.81"
solana-address-lookup-table-program = { path = "../programs/address-lookup-table", version = "=1.14.174" }
solana-config-program = { path = "../programs/config", version = "=1.14.174" }
solana-sdk = { path = "../sdk", version = "=1.14.174" }
solana-vote-program = { path = "../programs/vote", version = "=1.14.174" }
solana-address-lookup-table-program = { path = "../programs/address-lookup-table", version = "=1.14.175" }
solana-config-program = { path = "../programs/config", version = "=1.14.175" }
solana-sdk = { path = "../sdk", version = "=1.14.175" }
solana-vote-program = { path = "../programs/vote", version = "=1.14.175" }
spl-token = { version = "=3.5.0", features = ["no-entrypoint"] }
spl-token-2022 = { version = "=0.6.0", features = ["no-entrypoint"] }
thiserror = "1.0"
Expand Down
12 changes: 6 additions & 6 deletions accounts-bench/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
authors = ["Solana Maintainers <[email protected]>"]
edition = "2021"
name = "solana-accounts-bench"
version = "1.14.174"
version = "1.14.175"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
Expand All @@ -12,11 +12,11 @@ publish = false
clap = "2.33.1"
log = "0.4.17"
rayon = "1.5.3"
solana-logger = { path = "../logger", version = "=1.14.174" }
solana-measure = { path = "../measure", version = "=1.14.174" }
solana-runtime = { path = "../runtime", version = "=1.14.174" }
solana-sdk = { path = "../sdk", version = "=1.14.174" }
solana-version = { path = "../version", version = "=1.14.174" }
solana-logger = { path = "../logger", version = "=1.14.175" }
solana-measure = { path = "../measure", version = "=1.14.175" }
solana-runtime = { path = "../runtime", version = "=1.14.175" }
solana-sdk = { path = "../sdk", version = "=1.14.175" }
solana-version = { path = "../version", version = "=1.14.175" }

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
34 changes: 17 additions & 17 deletions accounts-cluster-bench/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
authors = ["Solana Maintainers <[email protected]>"]
edition = "2021"
name = "solana-accounts-cluster-bench"
version = "1.14.174"
version = "1.14.175"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
Expand All @@ -13,25 +13,25 @@ clap = "2.33.1"
log = "0.4.17"
rand = "0.7.0"
rayon = "1.5.3"
solana-account-decoder = { path = "../account-decoder", version = "=1.14.174" }
solana-clap-utils = { path = "../clap-utils", version = "=1.14.174" }
solana-client = { path = "../client", version = "=1.14.174" }
solana-faucet = { path = "../faucet", version = "=1.14.174" }
solana-gossip = { path = "../gossip", version = "=1.14.174" }
solana-logger = { path = "../logger", version = "=1.14.174" }
solana-measure = { path = "../measure", version = "=1.14.174" }
solana-net-utils = { path = "../net-utils", version = "=1.14.174" }
solana-runtime = { path = "../runtime", version = "=1.14.174" }
solana-sdk = { path = "../sdk", version = "=1.14.174" }
solana-streamer = { path = "../streamer", version = "=1.14.174" }
solana-transaction-status = { path = "../transaction-status", version = "=1.14.174" }
solana-version = { path = "../version", version = "=1.14.174" }
solana-account-decoder = { path = "../account-decoder", version = "=1.14.175" }
solana-clap-utils = { path = "../clap-utils", version = "=1.14.175" }
solana-client = { path = "../client", version = "=1.14.175" }
solana-faucet = { path = "../faucet", version = "=1.14.175" }
solana-gossip = { path = "../gossip", version = "=1.14.175" }
solana-logger = { path = "../logger", version = "=1.14.175" }
solana-measure = { path = "../measure", version = "=1.14.175" }
solana-net-utils = { path = "../net-utils", version = "=1.14.175" }
solana-runtime = { path = "../runtime", version = "=1.14.175" }
solana-sdk = { path = "../sdk", version = "=1.14.175" }
solana-streamer = { path = "../streamer", version = "=1.14.175" }
solana-transaction-status = { path = "../transaction-status", version = "=1.14.175" }
solana-version = { path = "../version", version = "=1.14.175" }
spl-token = { version = "=3.5.0", features = ["no-entrypoint"] }

[dev-dependencies]
solana-core = { path = "../core", version = "=1.14.174" }
solana-local-cluster = { path = "../local-cluster", version = "=1.14.174" }
solana-test-validator = { path = "../test-validator", version = "=1.14.174" }
solana-core = { path = "../core", version = "=1.14.175" }
solana-local-cluster = { path = "../local-cluster", version = "=1.14.175" }
solana-test-validator = { path = "../test-validator", version = "=1.14.175" }

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
26 changes: 13 additions & 13 deletions banking-bench/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
authors = ["Solana Maintainers <[email protected]>"]
edition = "2021"
name = "solana-banking-bench"
version = "1.14.174"
version = "1.14.175"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
Expand All @@ -14,18 +14,18 @@ crossbeam-channel = "0.5"
log = "0.4.17"
rand = "0.7.0"
rayon = "1.5.3"
solana-client = { path = "../client", version = "=1.14.174" }
solana-core = { path = "../core", version = "=1.14.174" }
solana-gossip = { path = "../gossip", version = "=1.14.174" }
solana-ledger = { path = "../ledger", version = "=1.14.174" }
solana-logger = { path = "../logger", version = "=1.14.174" }
solana-measure = { path = "../measure", version = "=1.14.174" }
solana-perf = { path = "../perf", version = "=1.14.174" }
solana-poh = { path = "../poh", version = "=1.14.174" }
solana-runtime = { path = "../runtime", version = "=1.14.174" }
solana-sdk = { path = "../sdk", version = "=1.14.174" }
solana-streamer = { path = "../streamer", version = "=1.14.174" }
solana-version = { path = "../version", version = "=1.14.174" }
solana-client = { path = "../client", version = "=1.14.175" }
solana-core = { path = "../core", version = "=1.14.175" }
solana-gossip = { path = "../gossip", version = "=1.14.175" }
solana-ledger = { path = "../ledger", version = "=1.14.175" }
solana-logger = { path = "../logger", version = "=1.14.175" }
solana-measure = { path = "../measure", version = "=1.14.175" }
solana-perf = { path = "../perf", version = "=1.14.175" }
solana-poh = { path = "../poh", version = "=1.14.175" }
solana-runtime = { path = "../runtime", version = "=1.14.175" }
solana-sdk = { path = "../sdk", version = "=1.14.175" }
solana-streamer = { path = "../streamer", version = "=1.14.175" }
solana-version = { path = "../version", version = "=1.14.175" }

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
12 changes: 6 additions & 6 deletions banks-client/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "solana-banks-client"
version = "1.14.174"
version = "1.14.175"
description = "Solana banks client"
authors = ["Solana Maintainers <[email protected]>"]
repository = "https://github.com/solana-labs/solana"
Expand All @@ -12,17 +12,17 @@ edition = "2021"
[dependencies]
borsh = "0.9.3"
futures = "0.3"
solana-banks-interface = { path = "../banks-interface", version = "=1.14.174" }
solana-program = { path = "../sdk/program", version = "=1.14.174" }
solana-sdk = { path = "../sdk", version = "=1.14.174" }
solana-banks-interface = { path = "../banks-interface", version = "=1.14.175" }
solana-program = { path = "../sdk/program", version = "=1.14.175" }
solana-sdk = { path = "../sdk", version = "=1.14.175" }
tarpc = { version = "0.29.0", features = ["full"] }
thiserror = "1.0"
tokio = { version = "~1.14.1", features = ["full"] }
tokio-serde = { version = "0.8", features = ["bincode"] }

[dev-dependencies]
solana-banks-server = { path = "../banks-server", version = "=1.14.174" }
solana-runtime = { path = "../runtime", version = "=1.14.174" }
solana-banks-server = { path = "../banks-server", version = "=1.14.175" }
solana-runtime = { path = "../runtime", version = "=1.14.175" }

[lib]
crate-type = ["lib"]
Expand Down
4 changes: 2 additions & 2 deletions banks-interface/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "solana-banks-interface"
version = "1.14.174"
version = "1.14.175"
description = "Solana banks RPC interface"
authors = ["Solana Maintainers <[email protected]>"]
repository = "https://github.com/solana-labs/solana"
Expand All @@ -11,7 +11,7 @@ edition = "2021"

[dependencies]
serde = { version = "1.0.138", features = ["derive"] }
solana-sdk = { path = "../sdk", version = "=1.14.174" }
solana-sdk = { path = "../sdk", version = "=1.14.175" }
tarpc = { version = "0.29.0", features = ["full"] }

[lib]
Expand Down
12 changes: 6 additions & 6 deletions banks-server/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "solana-banks-server"
version = "1.14.174"
version = "1.14.175"
description = "Solana banks server"
authors = ["Solana Maintainers <[email protected]>"]
repository = "https://github.com/solana-labs/solana"
Expand All @@ -13,11 +13,11 @@ edition = "2021"
bincode = "1.3.3"
crossbeam-channel = "0.5"
futures = "0.3"
solana-banks-interface = { path = "../banks-interface", version = "=1.14.174" }
solana-client = { path = "../client", version = "=1.14.174" }
solana-runtime = { path = "../runtime", version = "=1.14.174" }
solana-sdk = { path = "../sdk", version = "=1.14.174" }
solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.14.174" }
solana-banks-interface = { path = "../banks-interface", version = "=1.14.175" }
solana-client = { path = "../client", version = "=1.14.175" }
solana-runtime = { path = "../runtime", version = "=1.14.175" }
solana-sdk = { path = "../sdk", version = "=1.14.175" }
solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.14.175" }
tarpc = { version = "0.29.0", features = ["full"] }
tokio = { version = "1", features = ["full"] }
tokio-serde = { version = "0.8", features = ["bincode"] }
Expand Down
8 changes: 4 additions & 4 deletions bench-streamer/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
authors = ["Solana Maintainers <[email protected]>"]
edition = "2021"
name = "solana-bench-streamer"
version = "1.14.174"
version = "1.14.175"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
Expand All @@ -11,9 +11,9 @@ publish = false
[dependencies]
clap = { version = "3.1.5", features = ["cargo"] }
crossbeam-channel = "0.5"
solana-net-utils = { path = "../net-utils", version = "=1.14.174" }
solana-streamer = { path = "../streamer", version = "=1.14.174" }
solana-version = { path = "../version", version = "=1.14.174" }
solana-net-utils = { path = "../net-utils", version = "=1.14.175" }
solana-streamer = { path = "../streamer", version = "=1.14.175" }
solana-version = { path = "../version", version = "=1.14.175" }

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
38 changes: 19 additions & 19 deletions bench-tps/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
authors = ["Solana Maintainers <[email protected]>"]
edition = "2021"
name = "solana-bench-tps"
version = "1.14.174"
version = "1.14.175"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
Expand All @@ -15,28 +15,28 @@ log = "0.4.17"
rayon = "1.5.3"
serde_json = "1.0.81"
serde_yaml = "0.8.26"
solana-clap-utils = { path = "../clap-utils", version = "=1.14.174" }
solana-cli-config = { path = "../cli-config", version = "=1.14.174" }
solana-client = { path = "../client", version = "=1.14.174" }
solana-core = { path = "../core", version = "=1.14.174" }
solana-faucet = { path = "../faucet", version = "=1.14.174" }
solana-genesis = { path = "../genesis", version = "=1.14.174" }
solana-gossip = { path = "../gossip", version = "=1.14.174" }
solana-logger = { path = "../logger", version = "=1.14.174" }
solana-measure = { path = "../measure", version = "=1.14.174" }
solana-metrics = { path = "../metrics", version = "=1.14.174" }
solana-net-utils = { path = "../net-utils", version = "=1.14.174" }
solana-rpc = { path = "../rpc", version = "=1.14.174" }
solana-runtime = { path = "../runtime", version = "=1.14.174" }
solana-sdk = { path = "../sdk", version = "=1.14.174" }
solana-streamer = { path = "../streamer", version = "=1.14.174" }
solana-version = { path = "../version", version = "=1.14.174" }
solana-clap-utils = { path = "../clap-utils", version = "=1.14.175" }
solana-cli-config = { path = "../cli-config", version = "=1.14.175" }
solana-client = { path = "../client", version = "=1.14.175" }
solana-core = { path = "../core", version = "=1.14.175" }
solana-faucet = { path = "../faucet", version = "=1.14.175" }
solana-genesis = { path = "../genesis", version = "=1.14.175" }
solana-gossip = { path = "../gossip", version = "=1.14.175" }
solana-logger = { path = "../logger", version = "=1.14.175" }
solana-measure = { path = "../measure", version = "=1.14.175" }
solana-metrics = { path = "../metrics", version = "=1.14.175" }
solana-net-utils = { path = "../net-utils", version = "=1.14.175" }
solana-rpc = { path = "../rpc", version = "=1.14.175" }
solana-runtime = { path = "../runtime", version = "=1.14.175" }
solana-sdk = { path = "../sdk", version = "=1.14.175" }
solana-streamer = { path = "../streamer", version = "=1.14.175" }
solana-version = { path = "../version", version = "=1.14.175" }
thiserror = "1.0"

[dev-dependencies]
serial_test = "0.8.0"
solana-local-cluster = { path = "../local-cluster", version = "=1.14.174" }
solana-test-validator = { path = "../test-validator", version = "=1.14.174" }
solana-local-cluster = { path = "../local-cluster", version = "=1.14.175" }
solana-test-validator = { path = "../test-validator", version = "=1.14.175" }

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
8 changes: 4 additions & 4 deletions bloom/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "solana-bloom"
version = "1.14.174"
version = "1.14.175"
description = "Solana bloom filter"
authors = ["Solana Maintainers <[email protected]>"]
repository = "https://github.com/solana-labs/solana"
Expand All @@ -17,9 +17,9 @@ rand = "0.7.0"
rayon = "1.5.3"
serde = { version = "1.0.138", features = ["rc"] }
serde_derive = "1.0.103"
solana-frozen-abi = { path = "../frozen-abi", version = "=1.14.174" }
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.14.174" }
solana-sdk = { path = "../sdk", version = "=1.14.174" }
solana-frozen-abi = { path = "../frozen-abi", version = "=1.14.175" }
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.14.175" }
solana-sdk = { path = "../sdk", version = "=1.14.175" }

[lib]
crate-type = ["lib"]
Expand Down
8 changes: 4 additions & 4 deletions bucket_map/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "solana-bucket-map"
version = "1.14.174"
version = "1.14.175"
description = "solana-bucket-map"
homepage = "https://solana.com/"
documentation = "https://docs.rs/solana-bucket-map"
Expand All @@ -15,14 +15,14 @@ log = { version = "0.4.17" }
memmap2 = "0.5.3"
modular-bitfield = "0.11.2"
rand = "0.7.0"
solana-measure = { path = "../measure", version = "=1.14.174" }
solana-sdk = { path = "../sdk", version = "=1.14.174" }
solana-measure = { path = "../measure", version = "=1.14.175" }
solana-sdk = { path = "../sdk", version = "=1.14.175" }
tempfile = "3.3.0"

[dev-dependencies]
fs_extra = "1.2.0"
rayon = "1.5.3"
solana-logger = { path = "../logger", version = "=1.14.174" }
solana-logger = { path = "../logger", version = "=1.14.175" }

[lib]
crate-type = ["lib"]
Expand Down
8 changes: 4 additions & 4 deletions clap-utils/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "solana-clap-utils"
version = "1.14.174"
version = "1.14.175"
description = "Solana utilities for the clap"
authors = ["Solana Maintainers <[email protected]>"]
repository = "https://github.com/solana-labs/solana"
Expand All @@ -13,9 +13,9 @@ edition = "2021"
chrono = "0.4"
clap = "2.33.0"
rpassword = "6.0"
solana-perf = { path = "../perf", version = "=1.14.174" }
solana-remote-wallet = { path = "../remote-wallet", version = "=1.14.174", default-features = false }
solana-sdk = { path = "../sdk", version = "=1.14.174" }
solana-perf = { path = "../perf", version = "=1.14.175" }
solana-remote-wallet = { path = "../remote-wallet", version = "=1.14.175", default-features = false }
solana-sdk = { path = "../sdk", version = "=1.14.175" }
thiserror = "1.0.31"
tiny-bip39 = "0.8.2"
uriparse = "0.6.4"
Expand Down
8 changes: 4 additions & 4 deletions clap-v3-utils/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "solana-clap-v3-utils"
version = "1.14.174"
version = "1.14.175"
description = "Solana utilities for the clap v3"
authors = ["Solana Maintainers <[email protected]>"]
repository = "https://github.com/solana-labs/solana"
Expand All @@ -13,9 +13,9 @@ edition = "2021"
chrono = "0.4"
clap = { version = "3.1.5", features = ["cargo"] }
rpassword = "6.0"
solana-perf = { path = "../perf", version = "=1.14.174" }
solana-remote-wallet = { path = "../remote-wallet", version = "=1.14.174", default-features = false }
solana-sdk = { path = "../sdk", version = "=1.14.174" }
solana-perf = { path = "../perf", version = "=1.14.175" }
solana-remote-wallet = { path = "../remote-wallet", version = "=1.14.175", default-features = false }
solana-sdk = { path = "../sdk", version = "=1.14.175" }
thiserror = "1.0.31"
tiny-bip39 = "0.8.2"
uriparse = "0.6.4"
Expand Down
6 changes: 3 additions & 3 deletions cli-config/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ authors = ["Solana Maintainers <[email protected]>"]
edition = "2021"
name = "solana-cli-config"
description = "Blockchain, Rebuilt for Scale"
version = "1.14.174"
version = "1.14.175"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
Expand All @@ -15,8 +15,8 @@ lazy_static = "1.4.0"
serde = "1.0.138"
serde_derive = "1.0.103"
serde_yaml = "0.8.26"
solana-clap-utils = { path = "../clap-utils", version = "=1.14.174" }
solana-sdk = { path = "../sdk", version = "=1.14.174" }
solana-clap-utils = { path = "../clap-utils", version = "=1.14.175" }
solana-sdk = { path = "../sdk", version = "=1.14.175" }
url = "2.2.2"

[dev-dependencies]
Expand Down
Loading

0 comments on commit a378583

Please sign in to comment.