Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Oct 29, 2024

Problem

solana_program::nonce imposes a solana_program dependency on solana_svm

Summary of Changes

  • Move to its own crate and re-export for backwards compatibility
  • Make serde optional in the new crate

This branches off #2969 so that needs to be merged first


This is an automatic backport of pull request #3082 done by [Mergify](https://mergify.com).

* extract solana-nonce crate

* activate solana-nonce/serde in solana-program

* update lock file

* post-rebase fixes

* add docsrs metadata

Co-authored-by: Jon C <[email protected]>

* add doc_auto_cfg

* reorganise modules

---------

Co-authored-by: Jon C <[email protected]>
(cherry picked from commit 1cde3d5)

# Conflicts:
#	Cargo.toml
@mergify
Copy link
Author

mergify bot commented Oct 29, 2024

Cherry-pick of 1cde3d5 has failed:

On branch mergify/bp/v2.1/pr-3082
Your branch is up to date with 'origin/v2.1'.

You are currently cherry-picking commit 1cde3d5a8c.
  (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:   programs/sbf/Cargo.lock
	new file:   sdk/nonce/Cargo.toml
	renamed:    sdk/program/src/nonce/mod.rs -> sdk/nonce/src/lib.rs
	renamed:    sdk/program/src/nonce/state/current.rs -> sdk/nonce/src/state.rs
	renamed:    sdk/program/src/nonce/state/mod.rs -> sdk/nonce/src/versions.rs
	modified:   sdk/program/Cargo.toml
	new file:   sdk/program/src/nonce.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cargo.toml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@joncinque joncinque requested review from febo and willhickey October 30, 2024 00:29
@willhickey willhickey requested a review from a team October 30, 2024 16:16
@t-nelson
Copy link

master pr appears to be missing deprecation warnings. commented there

Copy link

@febo febo left a comment

Choose a reason for hiding this comment

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

Looks good!

joncinque added a commit to joncinque/solana that referenced this pull request Nov 5, 2024
#### Problem

As pointed out at
anza-xyz#3370 (comment),
the solana-nonce crate re-export in solana-program does not have a
deprecated warning.

#### Summary of changes

Add the warning.
@joncinque
Copy link

Gonna close this one -- it'll just force us to move the sdk into a new repo faster

@joncinque joncinque closed this Nov 6, 2024
@steviez steviez deleted the mergify/bp/v2.1/pr-3082 branch June 5, 2025 03:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants