Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update patches #281

Merged
merged 1 commit into from
Sep 14, 2023
Merged

Update patches #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions cargo-test-fuzz/patches/solana.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ index 3e0553d..5136a8b 100644
pub struct AccountsDataMeter {
/// The initial amount of accounts data space used (in bytes)
diff --git a/program-runtime/src/compute_budget.rs b/program-runtime/src/compute_budget.rs
index 02983f9..da311b8 100644
index 44fb070..547d338 100644
--- a/program-runtime/src/compute_budget.rs
+++ b/program-runtime/src/compute_budget.rs
@@ -33,5 +33,5 @@ impl ::solana_frozen_abi::abi_example::AbiExample for ComputeBudget {
Expand Down Expand Up @@ -188,10 +188,10 @@ index 16a52c0..e2683ac 100644
[dev-dependencies]
assert_matches = { workspace = true }
diff --git a/programs/bpf_loader/src/lib.rs b/programs/bpf_loader/src/lib.rs
index 342d383..d48c3bc 100644
index 9a91286..c68abaf 100644
--- a/programs/bpf_loader/src/lib.rs
+++ b/programs/bpf_loader/src/lib.rs
@@ -353,6 +353,7 @@ pub fn process_instruction(
@@ -371,6 +371,7 @@ pub fn process_instruction(
}

-fn process_instruction_inner(
Expand Down Expand Up @@ -220,10 +220,10 @@ index 061b16c..3d02d73 100644
[target.'cfg(target_arch = "wasm32")'.dependencies]
js-sys = { workspace = true }
diff --git a/sdk/src/feature_set.rs b/sdk/src/feature_set.rs
index 386a696..8f73f70 100644
index 418d328..345ffc9 100644
--- a/sdk/src/feature_set.rs
+++ b/sdk/src/feature_set.rs
@@ -890,5 +890,5 @@ lazy_static! {
@@ -900,5 +900,5 @@ lazy_static! {

/// `FeatureSet` holds the set of currently active/inactive runtime features
-#[derive(AbiExample, Debug, Clone, Eq, PartialEq)]
Expand Down
2 changes: 1 addition & 1 deletion cargo-test-fuzz/third_party.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
{
"flags": ["EXPENSIVE", "SKIP"],
"url": "https://github.com/solana-labs/solana",
"rev": "a145ade564c5181b264247adb4a3347eb883aed6",
"rev": "1e1e29641499e08ea1516ba2d81344e7875abc52",
"patch": "solana.patch",
"subdir": ".",
"package": "solana-bpf-loader-program",
Expand Down