Skip to content

Commit

Permalink
Merge branch 'master' of github.com:lijunwangs/solana
Browse files Browse the repository at this point in the history
  • Loading branch information
lijunwangs committed Apr 6, 2024
2 parents c1d9a55 + 0b9c637 commit d0cb618
Show file tree
Hide file tree
Showing 49 changed files with 4,003 additions and 1,524 deletions.
35 changes: 28 additions & 7 deletions Cargo.lock

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

4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ members = [
"tokens",
"tpu-client",
"transaction-dos",
"transaction-metrics-tracker",
"transaction-status",
"turbine",
"udp-client",
Expand Down Expand Up @@ -380,6 +381,7 @@ solana-test-validator = { path = "test-validator", version = "=2.0.0" }
solana-thin-client = { path = "thin-client", version = "=2.0.0" }
solana-tpu-client = { path = "tpu-client", version = "=2.0.0", default-features = false }
solana-transaction-status = { path = "transaction-status", version = "=2.0.0" }
solana-transaction-metrics-tracker = { path = "transaction-metrics-tracker", version = "=2.0.0" }
solana-turbine = { path = "turbine", version = "=2.0.0" }
solana-udp-client = { path = "udp-client", version = "=2.0.0" }
solana-version = { path = "version", version = "=2.0.0" }
Expand Down Expand Up @@ -412,7 +414,7 @@ tar = "0.4.40"
tarpc = "0.29.0"
tempfile = "3.10.1"
test-case = "3.3.1"
thiserror = "1.0.57"
thiserror = "1.0.58"
tiny-bip39 = "0.8.2"
# Update solana-tokio patch below when updating this version
tokio = "1.29.1"
Expand Down
Loading

0 comments on commit d0cb618

Please sign in to comment.