Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Return sysvars via syscalls (bp #16422) #16497

Merged
merged 4 commits into from
Apr 14, 2021
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 12, 2021

This is an automatic backport of pull request #16422 done by Mergify.

Cherry-pick of fa83f3b has failed:

On branch mergify/bp/v1.6/pr-16422
Your branch is up to date with 'origin/v1.6'.

You are currently cherry-picking commit fa83f3bd7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   Cargo.lock
	modified:   program-test/src/lib.rs
	new file:   program-test/tests/sysvar.rs
	modified:   programs/bpf_loader/src/syscalls.rs
	modified:   runtime/src/bank.rs
	modified:   runtime/src/message_processor.rs
	modified:   sdk/program/src/clock.rs
	modified:   sdk/program/src/program_stubs.rs
	modified:   sdk/program/src/sysvar/clock.rs
	modified:   sdk/program/src/sysvar/epoch_schedule.rs
	modified:   sdk/program/src/sysvar/fees.rs
	modified:   sdk/program/src/sysvar/mod.rs
	modified:   sdk/program/src/sysvar/rent.rs
	modified:   sdk/src/feature_set.rs
	modified:   sdk/src/process_instruction.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   program-test/Cargo.toml
	both modified:   programs/bpf/Cargo.lock
	both modified:   programs/bpf/rust/sysvar/src/lib.rs

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

@mergify mergify bot added the conflicts label Apr 12, 2021
@jackcmay jackcmay force-pushed the mergify/bp/v1.6/pr-16422 branch from 7c59b79 to 9b40075 Compare April 13, 2021 23:34
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Apr 13, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Apr 13, 2021

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Apr 13, 2021
(cherry picked from commit fa83f3b)
@jackcmay jackcmay force-pushed the mergify/bp/v1.6/pr-16422 branch from 9b40075 to 8cceeb3 Compare April 13, 2021 23:58
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Apr 13, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Apr 14, 2021

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Apr 14, 2021
@mvines
Copy link
Contributor

mvines commented Apr 14, 2021

Maybe a missing backport?


error[E0433]: failed to resolve: use of undeclared crate or module `rent`
--
  | --> rust/sysvar/src/lib.rs:92:9
  | \|
  | 92 \|         rent::DEFAULT_LAMPORTS_PER_BYTE_YEAR * rent::DEFAULT_EXEMPTION_THRESHOLD as u64,
  | \|         ^^^^ use of undeclared crate or module `rent`

@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Apr 14, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Apr 14, 2021

automerge label removed due to a CI failure

@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Apr 14, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Apr 14, 2021

automerge label removed due to a CI failure

@mvines
Copy link
Contributor

mvines commented Apr 14, 2021

Close, test_program_bpf_sanity is failing

@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Apr 14, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Apr 14, 2021

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Apr 14, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Apr 14, 2021

automerge label removed due to a CI failure

@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Apr 14, 2021
@codecov
Copy link

codecov bot commented Apr 14, 2021

Codecov Report

Merging #16497 (7ca41f4) into v1.6 (97ba3cb) will decrease coverage by 0.0%.
The diff coverage is 65.0%.

@@            Coverage Diff            @@
##             v1.6   #16497     +/-   ##
=========================================
- Coverage    80.0%    79.9%   -0.1%     
=========================================
  Files         413      413             
  Lines      110986   111228    +242     
=========================================
+ Hits        88824    88977    +153     
- Misses      22162    22251     +89     

@mergify mergify bot merged commit 6da4bec into v1.6 Apr 14, 2021
@mergify mergify bot deleted the mergify/bp/v1.6/pr-16422 branch April 14, 2021 05:33
@mvines
Copy link
Contributor

mvines commented Apr 14, 2021

@jackcmay - it looks like this PR wasn't rebased on #16515 and now the tip of v1.6 is broken. Check out https://buildkite.com/solana-labs/solana/builds/44116#job-d1519a2e-bbda-45fb-99c0-521bb41a8ee0

@jackcmay
Copy link
Contributor

@jackcmay - it looks like this PR wasn't rebased on #16515 and now the tip of v1.6 is broken. Check out https://buildkite.com/solana-labs/solana/builds/44116#job-d1519a2e-bbda-45fb-99c0-521bb41a8ee0

Hopefully fixed vis #16535

@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants