Skip to content

Commit

Permalink
Merge branch 'add-mev-claim' into lite-operator
Browse files Browse the repository at this point in the history
  • Loading branch information
ebatsell committed Feb 4, 2025
2 parents 070282a + 19fd468 commit 36059ab
Show file tree
Hide file tree
Showing 11 changed files with 730 additions and 7 deletions.
3 changes: 3 additions & 0 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ solana-transaction-status = { package = "solana-transaction-status", git = "http
solana-program-test = { package = "solana-program-test", git = "https://github.com/jito-foundation/jito-solana.git", rev = "0bbcbe476c0e728907ac01135115e661c16538e5" }
solana-rpc-client = { package = "solana-rpc-client", git = "https://github.com/jito-foundation/jito-solana.git", rev = "0bbcbe476c0e728907ac01135115e661c16538e5" }
solana-rpc = { git = "https://github.com/jito-foundation/jito-solana.git", rev = "0bbcbe476c0e728907ac01135115e661c16538e5" }
solana-rpc-client-api = { git = "https://github.com/jito-foundation/jito-solana.git", rev = "0bbcbe476c0e728907ac01135115e661c16538e5" }
solana-runtime = { package = "solana-runtime", git = "https://github.com/jito-foundation/jito-solana.git", rev = "0bbcbe476c0e728907ac01135115e661c16538e5" }
solana-streamer = { git = "https://github.com/jito-foundation/jito-solana.git", rev = "0bbcbe476c0e728907ac01135115e661c16538e5" }
solana-sdk = { package = "solana-sdk", git = "https://github.com/jito-foundation/jito-solana.git", rev = "0bbcbe476c0e728907ac01135115e661c16538e5" }
Expand Down
9 changes: 9 additions & 0 deletions meta_merkle_tree/src/generated_merkle_tree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,15 @@ impl GeneratedMerkleTreeCollection {
slot: stake_meta_collection.slot,
})
}

/// Load a serialized GeneratedMerkleTreeCollection from file path
pub fn new_from_file(path: &PathBuf) -> Result<Self, MerkleRootGeneratorError> {
let file = File::open(path)?;
let reader = BufReader::new(file);
let tree: Self = serde_json::from_reader(reader)?;

Ok(tree)
}
}

#[derive(Clone, Eq, Debug, Hash, PartialEq, Deserialize, Serialize)]
Expand Down
3 changes: 3 additions & 0 deletions tip-router-operator-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jito-tip-router-core = { workspace = true }
jito-tip-router-program = { workspace = true }
log = { workspace = true }
meta-merkle-tree = { workspace = true }
rand = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
solana-account-decoder = { workspace = true }
Expand All @@ -40,11 +41,13 @@ solana-metrics = { workspace = true }
solana-program = { workspace = true }
solana-rpc = { workspace = true }
solana-rpc-client = { workspace = true }
solana-rpc-client-api = { workspace = true }
solana-runtime = { workspace = true }
solana-sdk = { workspace = true }
solana-stake-program = { workspace = true }
solana-streamer = { workspace = true }
solana-unified-scheduler-pool = { workspace = true }
solana-transaction-status = { workspace = true }
solana-vote = { workspace = true }
spl-memo = { workspace = true }
thiserror = { workspace = true }
Expand Down
Loading

0 comments on commit 36059ab

Please sign in to comment.