Skip to content

Conversation

@joncinque
Copy link
Contributor

Problem

It's time to move over the SPL program implementations to their specific repos, but it hasn't been done.

Summary of changes

Following the PR for the stake interface at solana-program/stake#12, but for SPL. I ran:

# add the remote for the source repo
git remote add spl https://github.com/solana-labs/solana-program-library.git
# fetch the master from spl under a different local branch
git fetch spl master:fromspl
git switch fromspl
# be safe, remove the remote
git remote rm spl
# filter the stake related files
python3 ../../git-filter-repo \
  --path feature-proposal/program/src/entrypoint.rs \
  --path feature-proposal/program/src/lib.rs \
  --path feature-proposal/program/src/processor.rs \
  --path feature-proposal/program/src/instruction.rs \
  --path feature-proposal/program/src/state.rs \
  --path feature-proposal/program/tests/functional.rs \
  --path feature-proposal/program/Cargo.toml \
  --path feature-proposal/cli/src/main.rs \
  --path feature-proposal/cli/Cargo.toml \
  --path-rename feature-proposal/program/src/instruction.rs:program/src/instruction.rs \
  --path-rename feature-proposal/program/src/state.rs:program/src/state.rs \
  --path-rename feature-proposal/program/src/entrypoint.rs:program/src/entrypoint.rs \
  --path-rename feature-proposal/program/src/processor.rs:program/src/processor.rs \
  --path-rename feature-proposal/program/src/lib.rs:program/src/lib.rs \
  --path-rename feature-proposal/program/Cargo.toml:program/Cargo.toml \
  --path-rename feature-proposal/program/tests/functional.rs:program/tests/functional.rs \
  --path-rename feature-proposal/cli/src/main.rs:clients/cli/src/main.rs \
  --path-rename feature-proposal/cli/Cargo.toml:clients/cli/Cargo.toml \
  --force
# re-add this repo
git remote add origin [email protected]:joncinque/feature-proposal.git
git fetch origin main
git switch main
git switch fromspl
git rebase main

mvines and others added 30 commits December 6, 2024 23:07
* Output raw spl-token amounts in csv

* Bump version
Bumps [solana-program](https://github.com/solana-labs/solana) from 1.4.9 to 1.4.13.
- [Release notes](https://github.com/solana-labs/solana/releases)
- [Changelog](https://github.com/solana-labs/solana/blob/master/RELEASE.md)
- [Commits](solana-labs/solana@v1.4.9...v1.4.13)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [solana-cli-config](https://github.com/solana-labs/solana) from 1.5.0 to 1.5.1.
- [Release notes](https://github.com/solana-labs/solana/releases)
- [Changelog](https://github.com/solana-labs/solana/blob/master/RELEASE.md)
- [Commits](solana-labs/solana@v1.5.0...v1.5.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [solana-program](https://github.com/solana-labs/solana) from 1.5.0 to 1.5.1.
- [Release notes](https://github.com/solana-labs/solana/releases)
- [Changelog](https://github.com/solana-labs/solana/blob/master/RELEASE.md)
- [Commits](solana-labs/solana@v1.5.0...v1.5.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [solana-cli-config](https://github.com/solana-labs/solana) from 1.5.1 to 1.5.2.
- [Release notes](https://github.com/solana-labs/solana/releases)
- [Changelog](https://github.com/solana-labs/solana/blob/master/RELEASE.md)
- [Commits](solana-labs/solana@v1.5.1...v1.5.2)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [solana-logger](https://github.com/solana-labs/solana) from 1.5.1 to 1.5.3.
- [Release notes](https://github.com/solana-labs/solana/releases)
- [Changelog](https://github.com/solana-labs/solana/blob/master/RELEASE.md)
- [Commits](solana-labs/solana@v1.5.1...v1.5.3)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [solana-cli-config](https://github.com/solana-labs/solana) from 1.5.6 to 1.5.8.
- [Release notes](https://github.com/solana-labs/solana/releases)
- [Changelog](https://github.com/solana-labs/solana/blob/master/RELEASE.md)
- [Commits](solana-labs/solana@v1.5.6...v1.5.8)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [solana-program](https://github.com/solana-labs/solana) from 1.5.6 to 1.5.8.
- [Release notes](https://github.com/solana-labs/solana/releases)
- [Changelog](https://github.com/solana-labs/solana/blob/master/RELEASE.md)
- [Commits](solana-labs/solana@v1.5.6...v1.5.8)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [borsh-derive](https://github.com/nearprotocol/borsh) from 0.7.2 to 0.8.1.
- [Release notes](https://github.com/nearprotocol/borsh/releases)
- [Commits](https://github.com/nearprotocol/borsh/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Update solana-program to 1.5.11

* Update all programs
dependabot bot and others added 14 commits December 6, 2024 23:07
Bumps [chrono](https://github.com/chronotope/chrono) from 0.4.35 to 0.4.37.
- [Release notes](https://github.com/chronotope/chrono/releases)
- [Changelog](https://github.com/chronotope/chrono/blob/main/CHANGELOG.md)
- [Commits](chronotope/chrono@v0.4.35...v0.4.37)

---
updated-dependencies:
- dependency-name: chrono
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [borsh](https://github.com/near/borsh-rs) from 1.2.1 to 1.4.0.
- [Release notes](https://github.com/near/borsh-rs/releases)
- [Changelog](https://github.com/near/borsh-rs/blob/master/CHANGELOG.md)
- [Commits](near/borsh-rs@borsh-v1.2.1...borsh-v1.4.0)

---
updated-dependencies:
- dependency-name: borsh
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [chrono](https://github.com/chronotope/chrono) from 0.4.37 to 0.4.38.
- [Release notes](https://github.com/chronotope/chrono/releases)
- [Changelog](https://github.com/chronotope/chrono/blob/main/CHANGELOG.md)
- [Commits](chronotope/chrono@v0.4.37...v0.4.38)

---
updated-dependencies:
- dependency-name: chrono
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
upgrade solana version to 1.18.11
Bumps [borsh](https://github.com/near/borsh-rs) from 1.4.0 to 1.5.0.
- [Release notes](https://github.com/near/borsh-rs/releases)
- [Changelog](https://github.com/near/borsh-rs/blob/master/CHANGELOG.md)
- [Commits](near/borsh-rs@borsh-v1.4.0...borsh-v1.5.0)

---
updated-dependencies:
- dependency-name: borsh
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [borsh](https://github.com/near/borsh-rs) from 1.5.0 to 1.5.1.
- [Release notes](https://github.com/near/borsh-rs/releases)
- [Changelog](https://github.com/near/borsh-rs/blob/master/CHANGELOG.md)
- [Commits](near/borsh-rs@borsh-v1.5.0...borsh-v1.5.1)

---
updated-dependencies:
- dependency-name: borsh
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Updating to allow for version <= 2.0 of the solana crates can appear as
a breaking change for new projects, since cargo pulls in the latest
version of all dependencies, and once there's an attempt to mix v1 and
v2, downstream users will see errors.

This is made worse that the patch versions will quietly pick up the v2
dependency, so if someone doesn't know how to manipulate a cargo
lockfile, they will get build errors and won't know how to resolve them.

All other SPL crates contain a new breaking version (new major for
crates on v1 or more, new minor for crates on v0.X), except for
spl-token.

Bump spl-token to v5.
* solana: Update deps to 2.0.0

* Update lockfile

* Update toolchain version

* Update nightly version

* Fix check issues

* Fix clippy

* Revert upgrade for account compression libs

* Install build deps for serde test

* Fixup versions

* Fixup twoxtx build

* Revert solana install version

* Actually, get version 2.0.0 from the correct place
* Run script

* Update lockfile

* Use "processed" instead of deprecated "recent"

* Fixup account compression tests

* account-compression: Remove `only` in test
* Run update script, update curve25519-dalek dep, rust

* Run clippy + fmt

* Add workspace lints, start fixing doc comments

* Update doc comments for clippy

* Re-run cargo fmt after doc comment update

* Update solana-version

* Update CI jobs
Bumps [borsh](https://github.com/near/borsh-rs) from 1.5.1 to 1.5.2.
- [Release notes](https://github.com/near/borsh-rs/releases)
- [Changelog](https://github.com/near/borsh-rs/blob/master/CHANGELOG.md)
- [Commits](near/borsh-rs@borsh-v1.5.1...borsh-v1.5.2)

---
updated-dependencies:
- dependency-name: borsh
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [borsh](https://github.com/near/borsh-rs) from 1.5.2 to 1.5.3.
- [Release notes](https://github.com/near/borsh-rs/releases)
- [Changelog](https://github.com/near/borsh-rs/blob/master/CHANGELOG.md)
- [Commits](near/borsh-rs@borsh-v1.5.2...borsh-v1.5.3)

---
updated-dependencies:
- dependency-name: borsh
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
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!

@febo
Copy link

febo commented Dec 11, 2024

Are the Xargo.toml, program-id.md and run-tests.sh not being moved on purpose? I noticed that for the stake-pool, all files are being moved.

@joncinque
Copy link
Contributor Author

Correct, they're not being moved on purpose since they aren't needed. For stake-pool, I did it by directory rather than individual files, which is why it got included

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.