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 feature proposal program at solana-program/feature-proposal#1, but for token-wrap. 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 token-wrap/program \
  --path-rename token-wrap/program:program \
  --force
# re-add this repo
git remote add origin [email protected]:joncinque/token-wrap.git
git fetch origin main
git switch main
git switch fromspl
git rebase main

joncinque and others added 30 commits January 25, 2025 00:54
…o mints and/or token programs (#3595)

* token-wrap: Add interface description for wrapping program

* Cleanup for CI
Bumps [num_enum](https://github.com/illicitonion/num_enum) from 0.5.11 to 0.6.1.
- [Commits](illicitonion/num_enum@0.5.11...0.6.1)

---
updated-dependencies:
- dependency-name: num_enum
  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>
* upgrade to solana 1.16.3

* bring down hashbrown dependency to 0.12.3
Bumps [num_enum](https://github.com/illicitonion/num_enum) from 0.6.1 to 0.7.0.
- [Commits](https://github.com/illicitonion/num_enum/commits)

---
updated-dependencies:
- dependency-name: num_enum
  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>
* release: Bump token-2022 and all dependencies

In order to release a new token-2022, we need to bump its version and
every local crate that it depends on. That means the following:

* spl-token-2022
* spl-program-error
* spl-tlv-account-resolution
* spl-type-length-value
* spl-token-metadata-interface
* spl-token-metadata-example
* spl-transfer-hook-interface
* spl-transfer-hook-example
* spl-token-client (this one's not needed, but it's cleaner)

* Also bump spl-token-cli

* Also bump associated-token-account
Bumps [bytemuck](https://github.com/Lokathor/bytemuck) from 1.13.1 to 1.14.0.
- [Changelog](https://github.com/Lokathor/bytemuck/blob/main/changelog.md)
- [Commits](Lokathor/bytemuck@v1.13.1...v1.14.0)

---
updated-dependencies:
- dependency-name: bytemuck
  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>
* Run update script

* Update everything to use non-deprecated functions
* Update workspace for new cargo resolver, remove ntapi patch

* Update Rust versions

* Update dependencies with `./update-solana-dependencies.sh 1.17.2`

* Update lockfile

* Fix build errors

* Run clippy with `--fix`

* concurrent-merkle-tree: Fix function to not use mutable ref

* Replace StakeState with StakeStateV2

* governance: Fix clippy lint

* governance: Fix unnecessary mut

* Allow `clippy::items_after_module`

* token: Make error tests clearer

* token-2022: Fix private glob re-export

* token-upgrade-cli: Replace validator with parser

* single-pool-cli: Fix parsers

* ci: Update clippy command

* Update anchor version

* token-metadata: Use `no-entrypoint` feature in token-2022

* ci: Add protobuf-compiler to build deps

* discriminator-syn: *Don't* specify type of lib to build

* ci: Blast directories in cargo-build-test

* account-compression: Update build and lockfile

* Update token-group and feature-gate

* single-pool: revert WrongStakeStateV2

* stake-pool: revert WrongStakeStateV2

* stake-pool-py: revert StakeStateV2

---------

Co-authored-by: hanako mumei <[email protected]>
This PR swaps any calls to the `entrypoint!` macro with the full path, ie: `solana_program::entrypoint!`.

This will play a role in the effort to introduce a linting standard to SPL.
This PR adds comment formatting configurations to the repository's `rustfmt.toml` file, and the associated changes from `cargo +nightly fmt --all`.

Comment width 80.
* repo: Update to 1.17.6 with script

* Update lockfile

* Remove disabling feature in token-cli tests
* token-2022: Bump to 1.0.0 for first prod release

* Update security.txt
* token 2022: upgrade sdk to 1.17.13

* Upgrade all remaining packages

---------

Co-authored-by: Jon C <[email protected]>
Bumps [bytemuck](https://github.com/Lokathor/bytemuck) from 1.14.0 to 1.14.1.
- [Changelog](https://github.com/Lokathor/bytemuck/blob/main/changelog.md)
- [Commits](Lokathor/bytemuck@v1.14.0...v1.14.1)

---
updated-dependencies:
- dependency-name: bytemuck
  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>
* Update solana dependency version to allow 2.0.0

* Fix version number in solana-version.sh

* Fix version numbers

* Revert solana-version.sh with note

* Revert Anchor version change

* Relax dependency version upper bound to 2
* upgrade to solana version 1.17.17

* add display for the group extensions

* upgrade to solana version 1.17.17

* update cargo lock
Bumps [bytemuck](https://github.com/Lokathor/bytemuck) from 1.14.1 to 1.14.2.
- [Changelog](https://github.com/Lokathor/bytemuck/blob/main/changelog.md)
- [Commits](Lokathor/bytemuck@v1.14.1...v1.14.2)

---
updated-dependencies:
- dependency-name: bytemuck
  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 [bytemuck](https://github.com/Lokathor/bytemuck) from 1.14.2 to 1.14.3.
- [Changelog](https://github.com/Lokathor/bytemuck/blob/main/changelog.md)
- [Commits](Lokathor/bytemuck@v1.14.2...v1.14.3)

---
updated-dependencies:
- dependency-name: bytemuck
  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 to solana 1.18.2

* upgrade rust version to 1.76.0

* update borsh to 1.2.1

* replace deprecated `try_to_vec` with `borsh::to_vec`

* temporarily allow deprecated functions in cli that uses clap-v3

* use `repr(u32)` for enums in token lending
Bumps [bytemuck](https://github.com/Lokathor/bytemuck) from 1.14.3 to 1.15.0.
- [Changelog](https://github.com/Lokathor/bytemuck/blob/main/changelog.md)
- [Commits](Lokathor/bytemuck@v1.14.3...v1.15.0)

---
updated-dependencies:
- dependency-name: bytemuck
  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>
* Bump pod to 0.2.2

* Bump program-error and derive to 0.4.0

* Bump type-length-value to 0.4.3

* Bump tlv-account-resolution to 0.6.3

* Bump token-group-interface to 0.2.3

* Bump token-metadata-interface to 0.3.3

* Bump token-2022 to 3.0.2

* Bump transfer-hook-interface to 0.6.3

* Bump token-client to 0.9.2

* Bump associated-token-account to 3.0.2

* Bump discriminator, derive, and syn to 0.2.x
upgrade solana version to 1.18.11
Bumps [bytemuck](https://github.com/Lokathor/bytemuck) from 1.15.0 to 1.16.0.
- [Changelog](https://github.com/Lokathor/bytemuck/blob/main/changelog.md)
- [Commits](Lokathor/bytemuck@v1.15.0...v1.16.0)

---
updated-dependencies:
- dependency-name: bytemuck
  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 [bytemuck](https://github.com/Lokathor/bytemuck) from 1.16.0 to 1.16.1.
- [Changelog](https://github.com/Lokathor/bytemuck/blob/main/changelog.md)
- [Commits](Lokathor/bytemuck@v1.16.0...v1.16.1)

---
updated-dependencies:
- dependency-name: bytemuck
  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
joncinque and others added 22 commits January 25, 2025 00:54
* Run script

* Update lockfile

* Use "processed" instead of deprecated "recent"

* Fixup account compression tests

* account-compression: Remove `only` in test
Bumps [bytemuck](https://github.com/Lokathor/bytemuck) from 1.16.1 to 1.16.3.
- [Changelog](https://github.com/Lokathor/bytemuck/blob/main/changelog.md)
- [Commits](Lokathor/bytemuck@v1.16.1...v1.16.3)

---
updated-dependencies:
- dependency-name: bytemuck
  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 [bytemuck](https://github.com/Lokathor/bytemuck) from 1.16.3 to 1.17.0.
- [Changelog](https://github.com/Lokathor/bytemuck/blob/main/changelog.md)
- [Commits](Lokathor/bytemuck@v1.16.3...v1.17.0)

---
updated-dependencies:
- dependency-name: bytemuck
  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 [bytemuck](https://github.com/Lokathor/bytemuck) from 1.17.0 to 1.17.1.
- [Changelog](https://github.com/Lokathor/bytemuck/blob/main/changelog.md)
- [Commits](Lokathor/bytemuck@v1.17.0...v1.17.1)

---
updated-dependencies:
- dependency-name: bytemuck
  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 [bytemuck](https://github.com/Lokathor/bytemuck) from 1.17.1 to 1.18.0.
- [Changelog](https://github.com/Lokathor/bytemuck/blob/main/changelog.md)
- [Commits](Lokathor/bytemuck@v1.17.1...v1.18.0)

---
updated-dependencies:
- dependency-name: bytemuck
  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 [bytemuck](https://github.com/Lokathor/bytemuck) from 1.18.0 to 1.19.0.
- [Changelog](https://github.com/Lokathor/bytemuck/blob/main/changelog.md)
- [Commits](Lokathor/bytemuck@v1.18.0...v1.19.0)

---
updated-dependencies:
- dependency-name: bytemuck
  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>
* 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 [thiserror](https://github.com/dtolnay/thiserror) from 1.0.68 to 2.0.0.
- [Release notes](https://github.com/dtolnay/thiserror/releases)
- [Commits](dtolnay/thiserror@1.0.68...2.0.0)

---
updated-dependencies:
- dependency-name: thiserror
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [bytemuck](https://github.com/Lokathor/bytemuck) from 1.19.0 to 1.20.0.
- [Changelog](https://github.com/Lokathor/bytemuck/blob/main/changelog.md)
- [Commits](Lokathor/bytemuck@v1.19.0...v1.20.0)

---
updated-dependencies:
- dependency-name: bytemuck
  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 [bytemuck](https://github.com/Lokathor/bytemuck) from 1.20.0 to 1.21.0.
- [Changelog](https://github.com/Lokathor/bytemuck/blob/main/changelog.md)
- [Commits](Lokathor/bytemuck@v1.20.0...v1.21.0)

---
updated-dependencies:
- dependency-name: bytemuck
  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>
@joncinque joncinque merged commit 865b50d into solana-program:main Jan 24, 2025
@joncinque joncinque deleted the fromspl branch January 24, 2025 23:56
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.

4 participants