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.

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

Bump solana_rbpf to v0.8.0 #33679

Merged
merged 2 commits into from
Oct 20, 2023
Merged

Conversation

Lichtso
Copy link
Contributor

@Lichtso Lichtso commented Oct 12, 2023

solana_rbpf v0.8.0 was released.

@Lichtso Lichtso force-pushed the solana_rbpf/v0.8.0 branch 11 times, most recently from 0b91224 to 7989aa6 Compare October 18, 2023 19:12
@Lichtso Lichtso added the v1.17 PRs that should be backported to v1.17 label Oct 18, 2023
@Lichtso Lichtso force-pushed the solana_rbpf/v0.8.0 branch 2 times, most recently from 4e57907 to 5aee45d Compare October 19, 2023 12:11
@codecov
Copy link

codecov bot commented Oct 19, 2023

Codecov Report

Merging #33679 (eaec288) into master (c1353e1) will increase coverage by 0.0%.
Report is 19 commits behind head on master.
The diff coverage is 90.7%.

@@           Coverage Diff            @@
##           master   #33679    +/-   ##
========================================
  Coverage    81.8%    81.8%            
========================================
  Files         806      806            
  Lines      217893   217065   -828     
========================================
- Hits       178285   177774   -511     
+ Misses      39608    39291   -317     

@@ -39,44 +40,46 @@ use {
},
};

pub type ProcessInstructionWithContext = BuiltinFunction<InvokeContext<'static>>;
pub type BuiltinFunctionWithContext = BuiltinFunction<InvokeContext<'static>>;

/// Adapter so we can unify the interfaces of built-in programs and syscalls
#[macro_export]
macro_rules! declare_process_instruction {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: I think this macro and its callers would look less weird if the macro had a pattern where the
the ident is optional and defaults to Entrypoint

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should rename a lot of things, but want to do that in different PRs.
"Entrypoint" is bad because in PRv2 every function can be an entrypoint.

MemoryMapping::new(Vec::new(), &mock_config, &SBPFVersion::V2).unwrap();
let mut result = ProgramResult::Ok(0);
process_instruction(
let mut vm = EbpfVm::new(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As discussed on slack please add a comment explaining why it's ok to hardcode
here, and hardcode v1 for now

Replaces declare_syscall!() with declare_builtin_function!().
Removes Config::encrypt_runtime_environment.
Simplifies error propagation.
@Lichtso Lichtso force-pushed the solana_rbpf/v0.8.0 branch from 7356fe4 to eaec288 Compare October 20, 2023 16:08
@Lichtso Lichtso merged commit a5c7c99 into solana-labs:master Oct 20, 2023
28 checks passed
@Lichtso Lichtso deleted the solana_rbpf/v0.8.0 branch October 20, 2023 19:39
mergify bot pushed a commit that referenced this pull request Oct 20, 2023
* Bumps solana_rbpf to v0.8.0

* Adjustments:
Replaces declare_syscall!() with declare_builtin_function!().
Removes Config::encrypt_runtime_environment.
Simplifies error propagation.

(cherry picked from commit a5c7c99)

# Conflicts:
#	Cargo.toml
#	programs/bpf_loader/src/syscalls/mod.rs
#	programs/sbf/Cargo.toml
#	runtime/src/bank/tests.rs
Lichtso added a commit that referenced this pull request Oct 20, 2023
* Bumps solana_rbpf to v0.8.0

* Adjustments:
Replaces declare_syscall!() with declare_builtin_function!().
Removes Config::encrypt_runtime_environment.
Simplifies error propagation.

(cherry picked from commit a5c7c99)
Lichtso added a commit that referenced this pull request Oct 20, 2023
* Bumps solana_rbpf to v0.8.0

* Adjustments:
Replaces declare_syscall!() with declare_builtin_function!().
Removes Config::encrypt_runtime_environment.
Simplifies error propagation.

(cherry picked from commit a5c7c99)
Lichtso added a commit that referenced this pull request Oct 21, 2023
* Bumps solana_rbpf to v0.8.0

* Adjustments:
Replaces declare_syscall!() with declare_builtin_function!().
Removes Config::encrypt_runtime_environment.
Simplifies error propagation.

(cherry picked from commit a5c7c99)
Lichtso added a commit that referenced this pull request Oct 21, 2023
* updated inner_call for hashing fn to follow generic approach (#33128)

* updated inner_call for hashing fn to follow generic approach

* different hash compute budget values for all digests

* fixed conflicts

* reverted changes to compute_budget.rs and added 3method to trait to get compute budget values

* updated type for result fn for HasherImpl

* using Hash directly in result fn, got rid of HASH_BYTES and removed comment form compute_budget

* updated import statement

* cargo fmt -all

* removed unused import and reference related warning

* oops forgot semicolon

* removed trailing white space

(cherry picked from commit a60d185)

* Bump solana_rbpf to v0.8.0 (#33679)

* Bumps solana_rbpf to v0.8.0

* Adjustments:
Replaces declare_syscall!() with declare_builtin_function!().
Removes Config::encrypt_runtime_environment.
Simplifies error propagation.

(cherry picked from commit a5c7c99)

---------

Co-authored-by: Alexander Meißner <AlexanderMeissner@gmx.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
v1.17 PRs that should be backported to v1.17
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants