Skip to content

Commit

Permalink
Fix the solana deps to a specific revision
Browse files Browse the repository at this point in the history
  • Loading branch information
dmakarov committed Aug 18, 2023
1 parent 4e42894 commit 6d90ebb
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 110 deletions.
125 changes: 23 additions & 102 deletions Cargo.lock

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

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ publish = false
regex = "1.4.5"
structopt = { version = "0.3", default-features = false }
anyhow = "1.0"
solana-bpf-loader-program = { git = "https://github.com/solana-labs/solana" }
solana-logger = { git = "https://github.com/solana-labs/solana" }
solana-program-runtime = { git = "https://github.com/solana-labs/solana" }
solana-sdk = { git = "https://github.com/solana-labs/solana" }
solana-bpf-loader-program = { git = "https://github.com/solana-labs/solana", rev = "9731331be4dd4bfccf85b0443e3d652aec30a1f8" }
solana-logger = { git = "https://github.com/solana-labs/solana", rev = "9731331be4dd4bfccf85b0443e3d652aec30a1f8" }
solana-program-runtime = { git = "https://github.com/solana-labs/solana", rev = "9731331be4dd4bfccf85b0443e3d652aec30a1f8" }
solana-sdk = { git = "https://github.com/solana-labs/solana", rev = "9731331be4dd4bfccf85b0443e3d652aec30a1f8" }
solana_rbpf = "=0.6.0"

[package.metadata.docs.rs]
Expand Down
8 changes: 4 additions & 4 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use {
regex::Regex,
solana_bpf_loader_program::{
create_vm, load_program_from_bytes, serialization::serialize_parameters,
syscalls::create_program_runtime_environment_v1,
syscalls::create_program_runtime_environment,
},
solana_program_runtime::{
compute_budget::ComputeBudget, invoke_context::InvokeContext,
Expand Down Expand Up @@ -102,7 +102,7 @@ fn llvm_home() -> Result<PathBuf, anyhow::Error> {
Ok(home_dir
.join(".cache")
.join("solana")
.join("v1.36")
.join("v1.37")
.join("platform-tools")
.join("llvm"))
}
Expand Down Expand Up @@ -147,11 +147,11 @@ fn load_program<'a>(
..LoadProgramMetrics::default()
};
let account_size = contents.len();
let program_runtime_environment = create_program_runtime_environment_v1(
let program_runtime_environment = create_program_runtime_environment(
&invoke_context.feature_set,
invoke_context.get_compute_budget(),
false, /* deployment */
true, /* debugging_features */
false, /* debugging_features */
)
.unwrap();
// Allowing mut here, since it may be needed for jit compile, which is under a config flag
Expand Down

0 comments on commit 6d90ebb

Please sign in to comment.