Skip to content

Commit

Permalink
jito patch
Browse files Browse the repository at this point in the history 
only reroute if relayer connected (jito-foundation#123)
feat: add client tls config (jito-foundation#121)
remove extra val (jito-foundation#129)
fix clippy (jito-foundation#130)
copy all binaries to docker-output (jito-foundation#131)
Ledger tool halts at slot passed to create-snapshot (jito-foundation#118)
update program submodule (jito-foundation#133)
quick fix for tips and clearing old bundles (jito-foundation#135)
update submodule to new program (jito-foundation#136)
Improve stake-meta-generator usability (jito-foundation#134)
pinning submodule head (jito-foundation#140)
Use BundleAccountLocker when handling tip txs (jito-foundation#147)
Add metrics for relayer + block engine proxy (jito-foundation#149)
Build claim-mev in docker (jito-foundation#141)
Rework bundle receiving and add metrics (jito-foundation#152) (jito-foundation#154)
update submodule + dev files (jito-foundation#158)
Deterministically find tip amounts, add meta to stake info, and cleanup pubkey/strings in MEV tips (jito-foundation#159)
update jito-programs submodule (jito-foundation#160)
Separate MEV tip related workflow (jito-foundation#161)
Add block builder fee protos (jito-foundation#162)
fix jito programs (jito-foundation#163)
update submodule so autosnapshot exits out of ledger tool early (jito-foundation#164)
Pipe through block builder fee (jito-foundation#167)
pull in new snapshot code (jito-foundation#171)
block builder bug (jito-foundation#172)

Pull in new slack autosnapshot submodule (jito-foundation#174)

sort stake meta json and use int math (jito-foundation#176)

add accountsdb conn submod (jito-foundation#169)

Update tip distribution parameters (jito-foundation#177)

new submodules (jito-foundation#180)

Add buildkite link for jito CI (jito-foundation#183)

Fixed broken links to repositories (jito-foundation#184)

Changed from ssh to https transfer for clone

Seg/update submods (jito-foundation#187)

fix tests (jito-foundation#190)

rm geyser submod (jito-foundation#192)

rm dangling geyser references (jito-foundation#193)

fix syntax err (jito-foundation#195)

use deterministic req ids in batch calls (jito-foundation#199)

update jito-programs

revert cargo

update Cargo lock

update with path fix

fix cargo

update autosnapshot with block lookback (jito-foundation#201)

[JIT-460] When claiming mev tips, skip accounts that won't have min rent exempt amount after claiming (jito-foundation#203)

Add logging for sol balance desired (jito-foundation#205)

* add logging

* add logging

* update msg

* tweak vars

update submodule (jito-foundation#204)

use efficient data structures when calling batch_simulate_bundles (jito-foundation#206)

[JIT-504] Add low balance check in uploading merkle roots (jito-foundation#209)

add config to simulate on top of working bank (jito-foundation#211)

rm frozen bank check

simulate_bundle rpc bugfixes (jito-foundation#214)

rm frozen bank check in simulate_bundle rpc method

[JIT-519] Store ClaimStatus address in merkle-root-json (jito-foundation#210)

* add files

* switch to include bump

update submodule (jito-foundation#217)

add amount filter (jito-foundation#218)

update autosnapshot (jito-foundation#222)

Print TX error in Bundles (jito-foundation#223)

add new args to support single relayer and block-engine endpoints (jito-foundation#224)

point to new jito-programs submod and invoke updated init tda instruction (jito-foundation#228)

fix clippy errors (jito-foundation#230)

fix validator start scripts (jito-foundation#232)

Point README to gitbook (jito-foundation#237)

use packaged cargo bin to build (jito-foundation#239)

Add validator identity pubkey to StakeMeta (jito-foundation#226)

The vote account associated with a validator is not a permanent link, so log the validator identity as well.

bugfix: conditionally compile with debug flags (jito-foundation#240)

Seg/tip distributor master (jito-foundation#242)

* validate tree nodes

* fix unit tests

* pr feedback

* bump jito-programs submod

Simplify bootstrapping (jito-foundation#241)

* startup without precompile

* update spacing

* use release mode

* spacing

fix validation

rm validation skip

Account for block builder fee when generating excess tip balance (jito-foundation#247)

Improve docker caching

delay constructing claim mev txs (jito-foundation#253)

fix stake meta tests from bb fee (jito-foundation#254)

fix tests

Buffer bundles that exceed cost model (jito-foundation#225)

* buffer bundles that exceed cost model

clear qos failed bundles buffer if not leader soon (jito-foundation#260)

update Cargo.lock to correct solana versions in jito-programs submodule (jito-foundation#265)

fix simulate_bundle client and better error handling (jito-foundation#267)

update submod (jito-foundation#272)

Preallocate Bundle Cost (jito-foundation#238)

fix Dockerfile (jito-foundation#278)

Fix Tests (jito-foundation#279)

Fix Tests (jito-foundation#281)

* fix tests

update jito-programs submod (jito-foundation#282)

add reclaim rent workflow (jito-foundation#283)

update jito-programs submod

fix clippy errs

rm wrong assertion and swap out file write fn call (jito-foundation#292)

Remove security.md (jito-foundation#293)

demote frequent relayer_stage-stream_error to warn (jito-foundation#275)

account for case where TDA exists but not allocated (jito-foundation#295)

implement better retries for tip-distributor workflows (jito-foundation#297)

limit number of concurrent rpc calls (jito-foundation#298)

Discard Empty Packet Batches (jito-foundation#299)

Identity Hotswap (jito-foundation#290)

small fixes (jito-foundation#305)

Set backend config from admin rpc (jito-foundation#304)

Admin Shred Receiver Change (jito-foundation#306)

Seg/rm bundle UUID (jito-foundation#309)

Fix github workflow to recursively clone (jito-foundation#327)

Add recursive checkout for downstream-project-spl.yaml (jito-foundation#341)

Use cluster info functions for tpu (jito-foundation#345)

Use git rev-parse for git sha

Remove blacklisted tx from message_hash_to_transaction (jito-foundation#374)

Updates bootstrap and start scripts needed for local dev. (jito-foundation#384)

Remove Deprecated Cli Args (jito-foundation#387)

Master Rebase

improve simulate_bundle errors and response (jito-foundation#404)

derive Clone on accountoverrides (jito-foundation#416)

Add upsert to AccountOverrides (jito-foundation#419)

update jito-programs (jito-foundation#430)

[JIT-1661] Faster Autosnapshot (jito-foundation#436)

Reverts simulate_transaction result calls to upstream (jito-foundation#446)

Don't unlock accounts in TransactionBatches used during simulation (jito-foundation#449)

first pass at wiring up jito-plugin (jito-foundation#428)

[JIT-1713] Fix bundle's blockspace preallocation (jito-foundation#489)

[JIT-1708] Fix TOC TOU condition for relayer and block engine config (jito-foundation#491)

[JIT-1710] - Optimize Bundle Consumer Checks (jito-foundation#490)

Add Blockhash Metrics to Bundle Committer (jito-foundation#500)

add priority fee ix to mev-claim (jito-foundation#520)

Update Autosnapshot (jito-foundation#548)

Run MEV claims + reclaiming rent-exempt amounts in parallel. (jito-foundation#582)

Update CI (jito-foundation#584)
- Add recursive submodule checkouts.
- Re-add solana-secondary step

Add more release fixes (jito-foundation#585)

Fix more release urls (jito-foundation#588)

[JIT-1812] Fix blocking mutexs (jito-foundation#495)

 [JIT-1711] Compare the unprocessed transaction storage BundleStorage against a constant instead of VecDeque::capacity() (jito-foundation#587)

Automatically rebase Jito-Solana on a periodic basis. Send message on slack during any failures or success.

Fix periodic rebase jito-foundation#594

Fixes the following bugs in the periodic rebase:
Sends multiple messages on failure instead of one
Cancels entire job if one branch fails

Ignore buildkite curl errors for rebasing and try to keep curling until job times out (jito-foundation#597)

Sleep longer waiting for buildkite to start (jito-foundation#598)

correctly initialize account overrides (jito-foundation#595)

Fix: Ensure set contact info to UDP port instead of QUIC (jito-foundation#603)

Add fast replay branch to daily rebase (jito-foundation#607)

take a snapshot of all bundle accounts before sim (jito-foundation#13) (jito-foundation#615)

update jito-programs submodule

Export agave binaries during docker build (BP jito-foundation#627) (jito-foundation#628)

Backport jito-foundation#611  (jito-foundation#631)

Publish releases to S3 and GCS (jito-foundation#633) (jito-foundation#634)

Add packet flag for from staked sender (jito-foundation#655)

Co-authored-by: Jed <[email protected]>

Add bundle storage to new unprocessed transaction storage method

Loosen tip requirement [v2.0] (jito-foundation#685)

Add comments around ignoring the slot returned from ImmutableDeserializedPacket::build_sanitized_transaction
  • Loading branch information
@buffalu @vovkman
buffalu authored and vovkman committed Nov 20, 2024
1 parent a23604b commit e4f9e63
Show file tree
Hide file tree
Showing 9 changed files with 102 additions and 180 deletions.
8 changes: 4 additions & 4 deletions Cargo.lock
View file

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

186 changes: 93 additions & 93 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ jemallocator = { package = "tikv-jemallocator", version = "0.4.1", features = [
"unprefixed_malloc_on_supported_platforms",
] }
js-sys = "0.3.69"
jito-protos = { path = "jito-protos", version = "=2.0.16" }
jito-protos = { path = "jito-protos", version = "=2.0.15" }
jito-tip-distribution = { path = "jito-programs/mev-programs/programs/tip-distribution", features = ["no-entrypoint"] }
jito-tip-payment = { path = "jito-programs/mev-programs/programs/tip-payment", features = ["no-entrypoint"] }
json5 = "0.4.1"
Expand Down Expand Up @@ -334,99 +334,99 @@ smallvec = "1.13.2"
smpl_jwt = "0.7.1"
socket2 = "0.5.7"
soketto = "0.7"
solana-account-decoder = { path = "account-decoder", version = "=2.0.16" }
solana-accounts-db = { path = "accounts-db", version = "=2.0.16" }
solana-address-lookup-table-program = { path = "programs/address-lookup-table", version = "=2.0.16" }
solana-banks-client = { path = "banks-client", version = "=2.0.16" }
solana-banks-interface = { path = "banks-interface", version = "=2.0.16" }
solana-banks-server = { path = "banks-server", version = "=2.0.16" }
solana-bench-tps = { path = "bench-tps", version = "=2.0.16" }
solana-bloom = { path = "bloom", version = "=2.0.16" }
solana-bpf-loader-program = { path = "programs/bpf_loader", version = "=2.0.16" }
solana-bucket-map = { path = "bucket_map", version = "=2.0.16" }
solana-bundle = { path = "bundle", version = "=2.0.16" }
agave-cargo-registry = { path = "cargo-registry", version = "=2.0.16" }
solana-clap-utils = { path = "clap-utils", version = "=2.0.16" }
solana-clap-v3-utils = { path = "clap-v3-utils", version = "=2.0.16" }
solana-cli = { path = "cli", version = "=2.0.16" }
solana-cli-config = { path = "cli-config", version = "=2.0.16" }
solana-cli-output = { path = "cli-output", version = "=2.0.16" }
solana-client = { path = "client", version = "=2.0.16" }
solana-compute-budget = { path = "compute-budget", version = "=2.0.16" }
solana-compute-budget-program = { path = "programs/compute-budget", version = "=2.0.16" }
solana-config-program = { path = "programs/config", version = "=2.0.16" }
solana-connection-cache = { path = "connection-cache", version = "=2.0.16", default-features = false }
solana-core = { path = "core", version = "=2.0.16" }
solana-cost-model = { path = "cost-model", version = "=2.0.16" }
solana-curve25519 = { path = "curves/curve25519", version = "=2.0.16" }
solana-download-utils = { path = "download-utils", version = "=2.0.16" }
solana-entry = { path = "entry", version = "=2.0.16" }
solana-faucet = { path = "faucet", version = "=2.0.16" }
solana-frozen-abi = { path = "frozen-abi", version = "=2.0.16" }
solana-frozen-abi-macro = { path = "frozen-abi/macro", version = "=2.0.16" }
solana-tps-client = { path = "tps-client", version = "=2.0.16" }
solana-genesis = { path = "genesis", version = "=2.0.16" }
solana-genesis-utils = { path = "genesis-utils", version = "=2.0.16" }
agave-geyser-plugin-interface = { path = "geyser-plugin-interface", version = "=2.0.16" }
solana-geyser-plugin-manager = { path = "geyser-plugin-manager", version = "=2.0.16" }
solana-gossip = { path = "gossip", version = "=2.0.16" }
solana-inline-spl = { path = "inline-spl", version = "=2.0.16" }
solana-ledger = { path = "ledger", version = "=2.0.16" }
solana-loader-v4-program = { path = "programs/loader-v4", version = "=2.0.16" }
solana-local-cluster = { path = "local-cluster", version = "=2.0.16" }
solana-logger = { path = "logger", version = "=2.0.16" }
solana-measure = { path = "measure", version = "=2.0.16" }
solana-merkle-tree = { path = "merkle-tree", version = "=2.0.16" }
solana-metrics = { path = "metrics", version = "=2.0.16" }
solana-net-utils = { path = "net-utils", version = "=2.0.16" }
solana-account-decoder = { path = "account-decoder", version = "=2.0.15" }
solana-accounts-db = { path = "accounts-db", version = "=2.0.15" }
solana-address-lookup-table-program = { path = "programs/address-lookup-table", version = "=2.0.15" }
solana-banks-client = { path = "banks-client", version = "=2.0.15" }
solana-banks-interface = { path = "banks-interface", version = "=2.0.15" }
solana-banks-server = { path = "banks-server", version = "=2.0.15" }
solana-bench-tps = { path = "bench-tps", version = "=2.0.15" }
solana-bloom = { path = "bloom", version = "=2.0.15" }
solana-bpf-loader-program = { path = "programs/bpf_loader", version = "=2.0.15" }
solana-bucket-map = { path = "bucket_map", version = "=2.0.15" }
solana-bundle = { path = "bundle", version = "=2.0.15" }
agave-cargo-registry = { path = "cargo-registry", version = "=2.0.15" }
solana-clap-utils = { path = "clap-utils", version = "=2.0.15" }
solana-clap-v3-utils = { path = "clap-v3-utils", version = "=2.0.15" }
solana-cli = { path = "cli", version = "=2.0.15" }
solana-cli-config = { path = "cli-config", version = "=2.0.15" }
solana-cli-output = { path = "cli-output", version = "=2.0.15" }
solana-client = { path = "client", version = "=2.0.15" }
solana-compute-budget = { path = "compute-budget", version = "=2.0.15" }
solana-compute-budget-program = { path = "programs/compute-budget", version = "=2.0.15" }
solana-config-program = { path = "programs/config", version = "=2.0.15" }
solana-connection-cache = { path = "connection-cache", version = "=2.0.15", default-features = false }
solana-core = { path = "core", version = "=2.0.15" }
solana-cost-model = { path = "cost-model", version = "=2.0.15" }
solana-curve25519 = { path = "curves/curve25519", version = "=2.0.15" }
solana-download-utils = { path = "download-utils", version = "=2.0.15" }
solana-entry = { path = "entry", version = "=2.0.15" }
solana-faucet = { path = "faucet", version = "=2.0.15" }
solana-frozen-abi = { path = "frozen-abi", version = "=2.0.15" }
solana-frozen-abi-macro = { path = "frozen-abi/macro", version = "=2.0.15" }
solana-tps-client = { path = "tps-client", version = "=2.0.15" }
solana-genesis = { path = "genesis", version = "=2.0.15" }
solana-genesis-utils = { path = "genesis-utils", version = "=2.0.15" }
agave-geyser-plugin-interface = { path = "geyser-plugin-interface", version = "=2.0.15" }
solana-geyser-plugin-manager = { path = "geyser-plugin-manager", version = "=2.0.15" }
solana-gossip = { path = "gossip", version = "=2.0.15" }
solana-inline-spl = { path = "inline-spl", version = "=2.0.15" }
solana-ledger = { path = "ledger", version = "=2.0.15" }
solana-loader-v4-program = { path = "programs/loader-v4", version = "=2.0.15" }
solana-local-cluster = { path = "local-cluster", version = "=2.0.15" }
solana-logger = { path = "logger", version = "=2.0.15" }
solana-measure = { path = "measure", version = "=2.0.15" }
solana-merkle-tree = { path = "merkle-tree", version = "=2.0.15" }
solana-metrics = { path = "metrics", version = "=2.0.15" }
solana-net-utils = { path = "net-utils", version = "=2.0.15" }
solana-nohash-hasher = "0.2.1"
solana-notifier = { path = "notifier", version = "=2.0.16" }
solana-package-metadata-macro = { path = "sdk/package-metadata-macro", version = "=2.0.16" }
solana-perf = { path = "perf", version = "=2.0.16" }
solana-poh = { path = "poh", version = "=2.0.16" }
solana-poseidon = { path = "poseidon", version = "=2.0.16" }
solana-program = { path = "sdk/program", version = "=2.0.16" }
solana-program-runtime = { path = "program-runtime", version = "=2.0.16" }
solana-program-test = { path = "program-test", version = "=2.0.16" }
solana-pubsub-client = { path = "pubsub-client", version = "=2.0.16" }
solana-quic-client = { path = "quic-client", version = "=2.0.16" }
solana-rayon-threadlimit = { path = "rayon-threadlimit", version = "=2.0.16" }
solana-remote-wallet = { path = "remote-wallet", version = "=2.0.16", default-features = false }
solana-unified-scheduler-logic = { path = "unified-scheduler-logic", version = "=2.0.16" }
solana-unified-scheduler-pool = { path = "unified-scheduler-pool", version = "=2.0.16" }
solana-rpc = { path = "rpc", version = "=2.0.16" }
solana-rpc-client = { path = "rpc-client", version = "=2.0.16", default-features = false }
solana-rpc-client-api = { path = "rpc-client-api", version = "=2.0.16" }
solana-rpc-client-nonce-utils = { path = "rpc-client-nonce-utils", version = "=2.0.16" }
solana-runtime = { path = "runtime", version = "=2.0.16" }
solana-runtime-plugin = { path = "runtime-plugin", version = "=2.0.16" }
solana-runtime-transaction = { path = "runtime-transaction", version = "=2.0.16" }
solana-sdk = { path = "sdk", version = "=2.0.16" }
solana-sdk-macro = { path = "sdk/macro", version = "=2.0.16" }
solana-send-transaction-service = { path = "send-transaction-service", version = "=2.0.16" }
solana-stake-program = { path = "programs/stake", version = "=2.0.16" }
solana-storage-bigtable = { path = "storage-bigtable", version = "=2.0.16" }
solana-storage-proto = { path = "storage-proto", version = "=2.0.16" }
solana-streamer = { path = "streamer", version = "=2.0.16" }
solana-svm = { path = "svm", version = "=2.0.16" }
solana-system-program = { path = "programs/system", version = "=2.0.16" }
solana-test-validator = { path = "test-validator", version = "=2.0.16" }
solana-thin-client = { path = "thin-client", version = "=2.0.16" }
solana-tpu-client = { path = "tpu-client", version = "=2.0.16", default-features = false }
solana-transaction-status = { path = "transaction-status", version = "=2.0.16" }
solana-transaction-metrics-tracker = { path = "transaction-metrics-tracker", version = "=2.0.16" }
solana-turbine = { path = "turbine", version = "=2.0.16" }
solana-type-overrides = { path = "type-overrides", version = "=2.0.16" }
solana-udp-client = { path = "udp-client", version = "=2.0.16" }
solana-version = { path = "version", version = "=2.0.16" }
solana-vote = { path = "vote", version = "=2.0.16" }
solana-vote-program = { path = "programs/vote", version = "=2.0.16" }
solana-wen-restart = { path = "wen-restart", version = "=2.0.16" }
solana-zk-elgamal-proof-program = { path = "programs/zk-elgamal-proof", version = "=2.0.16" }
solana-zk-keygen = { path = "zk-keygen", version = "=2.0.16" }
solana-zk-sdk = { path = "zk-sdk", version = "=2.0.16" }
solana-zk-token-proof-program = { path = "programs/zk-token-proof", version = "=2.0.16" }
solana-zk-token-sdk = { path = "zk-token-sdk", version = "=2.0.16" }
solana-notifier = { path = "notifier", version = "=2.0.15" }
solana-package-metadata-macro = { path = "sdk/package-metadata-macro", version = "=2.0.15" }
solana-perf = { path = "perf", version = "=2.0.15" }
solana-poh = { path = "poh", version = "=2.0.15" }
solana-poseidon = { path = "poseidon", version = "=2.0.15" }
solana-program = { path = "sdk/program", version = "=2.0.15" }
solana-program-runtime = { path = "program-runtime", version = "=2.0.15" }
solana-program-test = { path = "program-test", version = "=2.0.15" }
solana-pubsub-client = { path = "pubsub-client", version = "=2.0.15" }
solana-quic-client = { path = "quic-client", version = "=2.0.15" }
solana-rayon-threadlimit = { path = "rayon-threadlimit", version = "=2.0.15" }
solana-remote-wallet = { path = "remote-wallet", version = "=2.0.15", default-features = false }
solana-unified-scheduler-logic = { path = "unified-scheduler-logic", version = "=2.0.15" }
solana-unified-scheduler-pool = { path = "unified-scheduler-pool", version = "=2.0.15" }
solana-rpc = { path = "rpc", version = "=2.0.15" }
solana-rpc-client = { path = "rpc-client", version = "=2.0.15", default-features = false }
solana-rpc-client-api = { path = "rpc-client-api", version = "=2.0.15" }
solana-rpc-client-nonce-utils = { path = "rpc-client-nonce-utils", version = "=2.0.15" }
solana-runtime = { path = "runtime", version = "=2.0.15" }
solana-runtime-plugin = { path = "runtime-plugin", version = "=2.0.15" }
solana-runtime-transaction = { path = "runtime-transaction", version = "=2.0.15" }
solana-sdk = { path = "sdk", version = "=2.0.15" }
solana-sdk-macro = { path = "sdk/macro", version = "=2.0.15" }
solana-send-transaction-service = { path = "send-transaction-service", version = "=2.0.15" }
solana-stake-program = { path = "programs/stake", version = "=2.0.15" }
solana-storage-bigtable = { path = "storage-bigtable", version = "=2.0.15" }
solana-storage-proto = { path = "storage-proto", version = "=2.0.15" }
solana-streamer = { path = "streamer", version = "=2.0.15" }
solana-svm = { path = "svm", version = "=2.0.15" }
solana-system-program = { path = "programs/system", version = "=2.0.15" }
solana-test-validator = { path = "test-validator", version = "=2.0.15" }
solana-thin-client = { path = "thin-client", version = "=2.0.15" }
solana-tpu-client = { path = "tpu-client", version = "=2.0.15", default-features = false }
solana-transaction-status = { path = "transaction-status", version = "=2.0.15" }
solana-transaction-metrics-tracker = { path = "transaction-metrics-tracker", version = "=2.0.15" }
solana-turbine = { path = "turbine", version = "=2.0.15" }
solana-type-overrides = { path = "type-overrides", version = "=2.0.15" }
solana-udp-client = { path = "udp-client", version = "=2.0.15" }
solana-version = { path = "version", version = "=2.0.15" }
solana-vote = { path = "vote", version = "=2.0.15" }
solana-vote-program = { path = "programs/vote", version = "=2.0.15" }
solana-wen-restart = { path = "wen-restart", version = "=2.0.15" }
solana-zk-elgamal-proof-program = { path = "programs/zk-elgamal-proof", version = "=2.0.15" }
solana-zk-keygen = { path = "zk-keygen", version = "=2.0.15" }
solana-zk-sdk = { path = "zk-sdk", version = "=2.0.15" }
solana-zk-token-proof-program = { path = "programs/zk-token-proof", version = "=2.0.15" }
solana-zk-token-sdk = { path = "zk-token-sdk", version = "=2.0.15" }
solana_rbpf = "=0.8.4"
spl-associated-token-account = "=4.0.0"
spl-instruction-padding = "0.2"
Expand Down
1 change: 0 additions & 1 deletion core/src/admin_rpc_post_init.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,4 @@ pub struct AdminRpcRequestMetadataPostInit {
pub block_engine_config: Arc<Mutex<BlockEngineConfig>>,
pub relayer_config: Arc<Mutex<RelayerConfig>>,
pub shred_receiver_address: Arc<RwLock<Option<SocketAddr>>>,
pub shred_retransmit_receiver_address: Arc<RwLock<Option<SocketAddr>>>,
}
5 changes: 1 addition & 4 deletions core/src/validator.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,6 @@ pub struct ValidatorConfig {
pub block_engine_config: Arc<Mutex<BlockEngineConfig>>,
// Using Option inside RwLock is ugly, but only convenient way to allow toggle on/off
pub shred_receiver_address: Arc<RwLock<Option<SocketAddr>>>,
pub shred_retransmit_receiver_address: Arc<RwLock<Option<SocketAddr>>>,
pub tip_manager_config: TipManagerConfig,
pub preallocated_bundle_cost: u64,
}
Expand Down Expand Up @@ -368,7 +367,6 @@ impl Default for ValidatorConfig {
relayer_config: Arc::new(Mutex::new(RelayerConfig::default())),
block_engine_config: Arc::new(Mutex::new(BlockEngineConfig::default())),
shred_receiver_address: Arc::new(RwLock::new(None)),
shred_retransmit_receiver_address: Arc::new(RwLock::new(None)),
tip_manager_config: TipManagerConfig::default(),
preallocated_bundle_cost: u64::default(),
}
Expand Down Expand Up @@ -1410,7 +1408,7 @@ impl Validator {
outstanding_repair_requests.clone(),
cluster_slots.clone(),
wen_restart_repair_slots.clone(),
config.shred_retransmit_receiver_address.clone(),
config.shred_receiver_address.clone(),
)?;

if in_wen_restart {
Expand Down Expand Up @@ -1511,7 +1509,6 @@ impl Validator {
block_engine_config: config.block_engine_config.clone(),
relayer_config: config.relayer_config.clone(),
shred_receiver_address: config.shred_receiver_address.clone(),
shred_retransmit_receiver_address: config.shred_retransmit_receiver_address.clone(),
});

Ok(Self {
Expand Down
1 change: 0 additions & 1 deletion local-cluster/src/validator_configs.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ pub fn safe_clone_config(config: &ValidatorConfig) -> ValidatorConfig {
relayer_config: config.relayer_config.clone(),
block_engine_config: config.block_engine_config.clone(),
shred_receiver_address: config.shred_receiver_address.clone(),
shred_retransmit_receiver_address: config.shred_retransmit_receiver_address.clone(),
tip_manager_config: config.tip_manager_config.clone(),
preallocated_bundle_cost: config.preallocated_bundle_cost,
}
Expand Down
6 changes: 3 additions & 3 deletions programs/sbf/Cargo.lock
View file

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

31 changes: 0 additions & 31 deletions validator/src/admin_rpc_service.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,13 +269,6 @@ pub trait AdminRpc {

#[rpc(meta, name = "setShredReceiverAddress")]
fn set_shred_receiver_address(&self, meta: Self::Metadata, addr: String) -> Result<()>;

#[rpc(meta, name = "setShredRetransmitReceiverAddress")]
fn set_shred_retransmit_receiver_address(
&self,
meta: Self::Metadata,
addr: String,
) -> Result<()>;
}

pub struct AdminRpcImpl;
Expand Down Expand Up @@ -581,28 +574,6 @@ impl AdminRpc for AdminRpcImpl {
})
}

fn set_shred_retransmit_receiver_address(
&self,
meta: Self::Metadata,
addr: String,
) -> Result<()> {
let shred_receiver_address = if addr.is_empty() {
None
} else {
Some(SocketAddr::from_str(&addr).map_err(|_| {
jsonrpc_core::error::Error::invalid_params(format!(
"invalid shred receiver address: {}",
addr
))
})?)
};

meta.with_post_init(|post_init| {
*post_init.shred_retransmit_receiver_address.write().unwrap() = shred_receiver_address;
Ok(())
})
}

fn set_staked_nodes_overrides(&self, meta: Self::Metadata, path: String) -> Result<()> {
let loaded_config = load_staked_nodes_overrides(&path)
.map_err(|err| {
Expand Down Expand Up @@ -1052,7 +1023,6 @@ mod tests {
let block_engine_config = Arc::new(Mutex::new(BlockEngineConfig::default()));
let relayer_config = Arc::new(Mutex::new(RelayerConfig::default()));
let shred_receiver_address = Arc::new(RwLock::new(None));
let shred_retransmit_receiver_address = Arc::new(RwLock::new(None));
let meta = AdminRpcRequestMetadata {
rpc_addr: None,
start_time: SystemTime::now(),
Expand All @@ -1076,7 +1046,6 @@ mod tests {
block_engine_config,
relayer_config,
shred_receiver_address,
shred_retransmit_receiver_address,
}))),
staked_nodes_overrides: Arc::new(RwLock::new(HashMap::new())),
rpc_to_plugin_manager_sender: None,
Expand Down
Loading

0 comments on commit e4f9e63

Please sign in to comment.