Skip to content

program / interface / cli: Port everything from spl #1

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.

Sign up for GitHub

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

Jump to bottom
Merged
joncinque merged 154 commits into from
Dec 17, 2024
Merged

program / interface / cli: Port everything from spl #1

joncinque merged 154 commits into from
Dec 17, 2024

Conversation

@joncinque
Copy link
Contributor

@joncinque joncinque commented Dec 13, 2024

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 token-metadata program at solana-program/token-metadata#1, 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/transfer-hook/example \
  --path token/transfer-hook/interface \
  --path token/transfer-hook/cli \
  --path-rename token/transfer-hook/example:program \
  --path-rename token/transfer-hook/interface:interface \
  --path-rename token/transfer-hook/cli:clients/cli \
  --force
# re-add this repo
git remote add origin [email protected]:joncinque/transfer-hook.git
git fetch origin main
git switch main
git switch fromspl
git rebase main

joncinque and others added 30 commits December 14, 2024 00:36
@joncinque
transfer-hook: Move interface and example into subfolders (#5640)
f5702cf
@joncinque
transfer-hook-cli: Add a tool for creating account metas (#5659)
2c6be09 
* transfer-hook-cli: Create tool for creating account metas

* Add to token CI, remove from general CI

* Review feedback: change command name and check account
@joncinque
token-cli{,ent}: Bump version for release (#5689)
44d96bb
@joncinque
rustfmt: use entrypoint full path
af4d4ab 
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.
@joncinque
rustfmt: format comments
b8ed5ba 
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.
@joncinque
repo: Update to 1.17.6 (#5863)
63926dc 
* repo: Update to 1.17.6 with script

* Update lockfile

* Remove disabling feature in token-cli tests
@tonton-sol @joncinque
Token 22: Add functionality to update extra_account_metas after initi…
b7bc8e5 
…alizing. (#5894)

* Added update function for ExtraAccountMetaList

* Updated interface to handle new update instruction

* Updated Cli to handle update command

* updated example program to handle updating

* Rust fmt trailing whitespace fix

* Removed unused variable

* Added more explicit update instruction doc comment

* Allow for resizing to smaller account size

* Removed system program from update instruction

* Added helper fn to calculate transfer lamports

* Added unit tests for update function

* Added unit test for update instruction

* removed unnecessary  commented out code

* re-added checks on initialization

* turned of zero_init for realloc for performance

* Fixed update doc comments

* Used block-scoping rather than explicit drop()

* Removed unnecessary convert to vec

* refactored updated test into single test

* added additional off-chain test of update instruct

* made on-chain invoke update test to match original

* moved helper function up to others

* refactored create and update with helpers

* rustfmt: fix

* rustfmt: fix

* removed commented out system program in update

* renamed helpers and removed unnecessary helper

* moved test helper up

* fixed test attribute location

* removed multiple init extra account metas in test

* added instruction assert to update test

* renamed transfer address to extra account metas

* rustfmt: comment fix

* clippy: fix

* added update test with simple PDA

* made more changes to updated metas in test

* added check for if extra metas have be initialized

* spelling fix

* fixed initialized condition
@joncinque
token-2022: Bump to 1.0.0 for prod release (#5954)
782a1cd 
* token-2022: Bump to 1.0.0 for first prod release

* Update security.txt
@joncinque
transfer hook: bump (#5970)
73dae41
@joncinque
tlv account resolution: bump (#5985)
f72ba69
@joncinque
transfer hook: bump interface to 0.4.1 (#5986)
cc1ab43
@joncinque
transfer hook cli: bump (#5984)
a1054d8
@dependabot @joncinque
build(deps): bump futures-util from 0.3.29 to 0.3.30 (#6024)
cc9284e 
Bumps [futures-util](https://github.com/rust-lang/futures-rs) from 0.3.29 to 0.3.30.
- [Release notes](https://github.com/rust-lang/futures-rs/releases)
- [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md)
- [Commits](rust-lang/futures-rs@0.3.29...0.3.30)

---
updated-dependencies:
- dependency-name: futures-util
  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>
@joncinque
transfer hook cli: add support for PDAs as extra metas (#5997)
dd79409 
* transfer hook cli: refactor account meta parsing into new module

* transfer hook cli: refactor account meta parsing to deal directly with `ExtraAccountMeta`s

* tlv account resolution: add serde-traits to seeds

* transfer hook cli: add transfer hook config file support

* transfer hook cli: help docs

* address some nits

* refactor out raw discriminator use

* transfer hook cli: refactor transfer hook accounts with better use of serde

* remove snake case

* restrict role configs to `Role` object

* update documentation

* drop kebab case
@joncinque
psuedo-bump transfer hook CLI to 0.1.0 (#6069)
1791c62
@joncinque
tlv account resolution: bump to include serde (#6070)
1c03d24
@dependabot @joncinque
build(deps): bump serde_yaml from 0.9.27 to 0.9.30 (#6074)
3f22fef 
Bumps [serde_yaml](https://github.com/dtolnay/serde-yaml) from 0.9.27 to 0.9.30.
- [Release notes](https://github.com/dtolnay/serde-yaml/releases)
- [Commits](dtolnay/serde-yaml@0.9.27...0.9.30)

---
updated-dependencies:
- dependency-name: serde_yaml
  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>
@dependabot @joncinque
build(deps): bump serde from 1.0.194 to 1.0.195 (#6075)
a27f7db 
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.194 to 1.0.195.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](serde-rs/serde@v1.0.194...v1.0.195)

---
updated-dependencies:
- dependency-name: serde
  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>
@joncinque
transfer hook: add new offchain helper
0a46e44 
This PR adds a new offchain helper for adding the necessary account metas for an 
`ExecuteInstruction` to the SPL Transfer Hook interface, deprecating the old 
one.

As described in #6064, the offchain helper in Token2022 was using the original 
offchain helper from the SPL Transfer Hook interface incorrectly when resolving 
extra account metas for a transfer.

In order to provide a safer, more robust helper, this new function takes the 
instruction, fetch account data function, as well as the individual arguments 
for `instruction::execute(..)`. This will help to ensure Token2022 as well as 
anyone else using the helpers from the SPL Transfer Hook interface are properly 
resolving the necessary additional accounts.

Note: Although deprecated, the original helper in the SPL Transfer Hook 
interface is not broken. It's just less safe to use than this new helper, since 
it can easily be misused.
@joncinque
transfer hook: add new onchain helper
c68365d 
As another step for solving #6064, the onchain helpers now need to be
replaced. This PR makes that change in the SPL Transfer Hook interface.

Specifically, this commit adds a new `add_extra_accounts_for_execute_cpi(..)`
helper and deprecates the old one.

Like its offchain counterpart, this new helper requires the arguments for
`instruction::execute(..)` in order to validate that a proper
`ExecuteInstruction` is being resolved, thus ensuring proper account resolution.

This function, like its now-deprecated sibling, is designed specifically to add
extra accounts to an `ExecuteInstruction` CPI instruction. It's expected that
the instruction being provided is a CPI instruction for another program, and
that program will CPI to the transfer hook program in question. Details about
this have been added to the helper's documentation.
@0x0ece @joncinque
token 2022: upgrade sdk to 1.17.13 (#6147)
9ef4376 
* token 2022: upgrade sdk to 1.17.13

* Upgrade all remaining packages

---------

Co-authored-by: Jon C <[email protected]>
@joncinque
token 2022 & transfer hook: drop deprecated helpers (#6122)
8d4bef2 
* token 2022 & transfer hook: drop deprecated helpers

* token js: drop deprecated helper
@joncinque
Transfer hook: bump versions (#6119)
4ec0463 
* transfer hook: bump interface

* transfer hook: bump cli
@GabrielePicco @joncinque
Fix broken link in transfer-hook interface Readme.md (#6154)
f7d3551 
Fix typo
@joncinque
bump transfer hook example (#6155)
b294e78
@dependabot @joncinque
build(deps): bump bytemuck from 1.14.0 to 1.14.1 (#6179)
52a0595 
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>
@willhickey @joncinque
Update solana dependency version to allow 2.0.0 (#6182)
5b27daf 
* 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
@joncinque
token-2022: Bump to v2 (#6187)
e182ee1
@dependabot @joncinque
build(deps): bump serde from 1.0.195 to 1.0.196 (#6193)
bdd6f45 
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.195 to 1.0.196.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](serde-rs/serde@v1.0.195...v1.0.196)

---
updated-dependencies:
- dependency-name: serde
  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>
@dependabot @joncinque
build(deps): bump serde_yaml from 0.9.30 to 0.9.31 (#6194)
7956b27 
Bumps [serde_yaml](https://github.com/dtolnay/serde-yaml) from 0.9.30 to 0.9.31.
- [Release notes](https://github.com/dtolnay/serde-yaml/releases)
- [Commits](dtolnay/serde-yaml@0.9.30...0.9.31)

---
updated-dependencies:
- dependency-name: serde_yaml
  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>
dependabot bot and others added 26 commits December 14, 2024 00:36
@dependabot @joncinque
build(deps): bump futures-util from 0.3.30 to 0.3.31 (#7326)
11d971d 
Bumps [futures-util](https://github.com/rust-lang/futures-rs) from 0.3.30 to 0.3.31.
- [Release notes](https://github.com/rust-lang/futures-rs/releases)
- [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md)
- [Commits](rust-lang/futures-rs@0.3.30...0.3.31)

---
updated-dependencies:
- dependency-name: futures-util
  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>
@dependabot @joncinque
build(deps): bump bytemuck from 1.18.0 to 1.19.0 (#7345)
a9da511 
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>
@dependabot @joncinque
build(deps): bump serde_json from 1.0.128 to 1.0.129 (#7364)
32e4320 
Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.128 to 1.0.129.
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](serde-rs/json@1.0.128...1.0.129)

---
updated-dependencies:
- dependency-name: serde_json
  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>
@dependabot @joncinque
build(deps): bump serde_json from 1.0.129 to 1.0.132 (#7372)
2d89c95 
Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.129 to 1.0.132.
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](serde-rs/json@1.0.129...1.0.132)

---
updated-dependencies:
- dependency-name: serde_json
  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>
@dependabot @joncinque
build(deps): bump tokio from 1.40.0 to 1.41.0 (#7379)
9cccbcc 
Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.40.0 to 1.41.0.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](tokio-rs/tokio@tokio-1.40.0...tokio-1.41.0)

---
updated-dependencies:
- dependency-name: tokio
  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>
@dependabot @joncinque
build(deps): bump serde from 1.0.210 to 1.0.211 (#7380)
6c64d91 
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.210 to 1.0.211.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](serde-rs/serde@v1.0.210...v1.0.211)

---
updated-dependencies:
- dependency-name: serde
  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>
@dependabot @joncinque
build(deps): bump serde from 1.0.211 to 1.0.213 (#7388)
477fce2 
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.211 to 1.0.213.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](serde-rs/serde@v1.0.211...v1.0.213)

---
updated-dependencies:
- dependency-name: serde
  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>
@dependabot @joncinque
build(deps): bump serde from 1.0.213 to 1.0.214 (#7405)
8f2204e 
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.213 to 1.0.214.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](serde-rs/serde@v1.0.213...v1.0.214)

---
updated-dependencies:
- dependency-name: serde
  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>
@joncinque
CI: Update to Solana v2.1 crates (#7416)
6ede12a 
* 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
@github-actions @joncinque
Publish spl-pod v0.5.0
9507a5f
@github-actions @joncinque
Publish spl-program-error v0.6.0
5b102f1
@github-actions @joncinque
Publish spl-discriminator v0.4.0
435b9e7
@github-actions @joncinque
Publish spl-type-length-value v0.7.0
5b8f38f
@github-actions @joncinque
Publish spl-tlv-account-resolution v0.9.0
fc3b43e
@joncinque
transfer-hook-interface: Remove solana-program dependency (#7442)
5ac1759 
* transfer-hook-interface: Remove solana-program dependency

#### Problem

The transfer-hook-interface pulls in solana-program, but it doesn't need
to.

#### Summary of changes

Use the component crates. The only breaking change is the re-exports. It
still uses a dev-dependency on solana-program since the system program
id isn't available yet outside of solana-program.

* Add missing solana-pubkey feature

* Add all test programs

* Run cargo fmt

* Fixup imports
@github-actions @joncinque
Publish spl-transfer-hook-interface v0.9.0
40dec16
@github-actions @joncinque
Publish spl-token-2022 v6.0.0
2a684e3
@github-actions @joncinque
Publish spl-token-client v0.13.0
5957862
@dependabot @joncinque
build(deps): bump thiserror from 1.0.68 to 2.0.0 (#7462)
591f221 
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>
@dependabot @joncinque
build(deps): bump tokio from 1.41.0 to 1.41.1 (#7469)
b9c12c7 
Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.41.0 to 1.41.1.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](tokio-rs/tokio@tokio-1.41.0...tokio-1.41.1)

---
updated-dependencies:
- dependency-name: tokio
  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>
@dependabot @joncinque
build(deps): bump serde from 1.0.214 to 1.0.215 (#7485)
28a4191 
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.214 to 1.0.215.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](serde-rs/serde@v1.0.214...v1.0.215)

---
updated-dependencies:
- dependency-name: serde
  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>
@dependabot @joncinque
build(deps): bump serde_json from 1.0.132 to 1.0.133 (#7497)
8307b0d 
Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.132 to 1.0.133.
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](serde-rs/json@v1.0.132...v1.0.133)

---
updated-dependencies:
- dependency-name: serde_json
  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>
@joncinque
token: Fix typos for cargo-spellcheck (#7503)
a4f1fee 
* token: Fix typos

#### Problem

There are typos in the token code, and people sometimes fix them, but
mostly don't.

#### Summary of changes

Starting with the `token/*` directory, fix all typos or properly put
them between backticks if they're code.

These were all found using `cargo spellcheck` and a specialized
dictionary with programming / Solana / ZK terminology. Once all of the
typos are fixed, then we can add the spellchecking to CI.

* Update doctests
@dependabot @joncinque
build(deps): bump bytemuck from 1.19.0 to 1.20.0 (#7507)
c50e316 
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>
@dependabot @joncinque
build(deps): bump tokio from 1.41.1 to 1.42.0 (#7556)
0518c26 
Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.41.1 to 1.42.0.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](tokio-rs/tokio@tokio-1.41.1...tokio-1.42.0)

---
updated-dependencies:
- dependency-name: tokio
  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>
@dependabot @joncinque
build(deps): bump serde from 1.0.215 to 1.0.216 (#7576)
bb02ad3 
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.215 to 1.0.216.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](serde-rs/serde@v1.0.215...v1.0.216)

---
updated-dependencies:
- dependency-name: serde
  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>
@joncinque joncinque requested a review from febo December 13, 2024 23:37
febo
febo approved these changes Dec 17, 2024
View reviewed changes
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.

👌

@joncinque joncinque merged commit e00f3b5 into solana-program:main Dec 17, 2024
@joncinque joncinque deleted the fromspl branch December 17, 2024 16:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@febo febo febo approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@joncinque @febo @tonton-sol @0x0ece @GabrielePicco @willhickey @samkim-crypto @gcmutator