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

Simplify some patches #471

Closed
wants to merge 1 commit into from
Closed

Simplify some patches #471

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
2 changes: 1 addition & 1 deletion third-party/patches/agave.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ index 612300f..fbc8225 100644
@@ -4,4 +4,5 @@ use std::{cell::RefCell, rc::Rc};
const LOG_MESSAGES_BYTES_LIMIT: usize = 10 * 1000;

+#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
+#[derive(Clone, serde::Deserialize, serde::Serialize)]
pub struct LogCollector {
pub messages: Vec<String>,
diff --git a/measure/src/measure.rs b/measure/src/measure.rs
Expand Down
4 changes: 2 additions & 2 deletions third-party/patches/example-helloworld.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ index 88714a8..026b733 100644
@@ -19,8 +19,108 @@ pub struct GreetingAccount {
entrypoint!(process_instruction);

+#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
+#[derive(Clone, serde::Deserialize, serde::Serialize)]
+struct AccountInfoElem {
+ key: Pubkey,
+ is_signer: bool,
Expand Down Expand Up @@ -93,7 +93,7 @@ index 88714a8..026b733 100644
+ }
+}
+
+#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
+#[derive(Clone, serde::Deserialize, serde::Serialize)]
+struct AccountInfoVec(Vec<AccountInfoElem>);
+
+impl<'a> From<&[AccountInfo<'a>]> for AccountInfoVec {
Expand Down
2 changes: 1 addition & 1 deletion third-party/patches/solana.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ index 8c801b8..93bb50b 100644
@@ -4,4 +4,5 @@ use std::{cell::RefCell, rc::Rc};
const LOG_MESSAGES_BYTES_LIMIT: usize = 10 * 1000;

+#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
+#[derive(Clone, serde::Deserialize, serde::Serialize)]
pub struct LogCollector {
messages: Vec<String>,
diff --git a/program-runtime/src/sysvar_cache.rs b/program-runtime/src/sysvar_cache.rs
Expand Down
2 changes: 1 addition & 1 deletion third-party/patches/solana_rbpf.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ index dbd876f..ee28197 100644
@@ -67,4 +67,85 @@ pub struct MemoryRegion {
}

+#[derive(Debug, serde::Deserialize, serde::Serialize)]
+#[derive(serde::Deserialize, serde::Serialize)]
+struct SerializableMemoryRegion {
+ pub host_mem_seed: Option<u64>,
+ pub vm_addr: u64,
Expand Down
Loading