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

Support token-2022 in RPC instruction parsing (backport #24537) #26953

Merged
merged 2 commits into from
Aug 5, 2022
Merged

Support token-2022 in RPC instruction parsing (backport #24537) #26953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0105147
Support token-2022 in RPC instruction parsing (#24537)
Apr 27, 2022
22bd49e
Fix merge conflicts
joncinque Aug 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 53 additions & 5 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion account-decoder/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ solana-config-program = { path = "../programs/config", version = "=1.10.35" }
solana-sdk = { path = "../sdk", version = "=1.10.35" }
solana-vote-program = { path = "../programs/vote", version = "=1.10.35" }
spl-token = { version = "=3.3.1", features = ["no-entrypoint"] }
spl-token-2022 = { version = "=0.2.0", features = ["no-entrypoint"] }
spl-token-2022 = { version = "=0.3.0", features = ["no-entrypoint"] }
thiserror = "1.0"
zstd = "0.11.1"

Expand Down
2 changes: 1 addition & 1 deletion client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ solana-streamer = { path = "../streamer", version = "=1.10.35" }
solana-transaction-status = { path = "../transaction-status", version = "=1.10.35" }
solana-version = { path = "../version", version = "=1.10.35" }
solana-vote-program = { path = "../programs/vote", version = "=1.10.35" }
spl-token-2022 = { version = "=0.2.0", features = ["no-entrypoint"] }
spl-token-2022 = { version = "=0.3.0", features = ["no-entrypoint"] }
thiserror = "1.0"
tokio = { version = "~1.14.1", features = ["full"] }
tokio-stream = "0.1.8"
Expand Down
58 changes: 53 additions & 5 deletions programs/bpf/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ solana-transaction-status = { path = "../transaction-status", version = "=1.10.3
solana-version = { path = "../version", version = "=1.10.35" }
solana-vote-program = { path = "../programs/vote", version = "=1.10.35" }
spl-token = { version = "=3.3.1", features = ["no-entrypoint"] }
spl-token-2022 = { version = "=0.2.0", features = ["no-entrypoint"] }
spl-token-2022 = { version = "=0.3.0", features = ["no-entrypoint"] }
stream-cancel = "0.8.1"
thiserror = "1.0"
tokio = { version = "~1.14.1", features = ["full"] }
Expand Down
3 changes: 3 additions & 0 deletions scripts/patch-crates.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ update_solana_dependencies() {
sed -i -e "s#\(solana-account-decoder = { version = \"\)[^\"]*\(\"\)#\1=$solana_ver\2#g" "${tomls[@]}" || return $?
sed -i -e "s#\(solana-faucet = \"\)[^\"]*\(\"\)#\1=$solana_ver\2#g" "${tomls[@]}" || return $?
sed -i -e "s#\(solana-faucet = { version = \"\)[^\"]*\(\"\)#\1=$solana_ver\2#g" "${tomls[@]}" || return $?
sed -i -e "s#\(solana-zk-token-sdk = \"\)[^\"]*\(\"\)#\1=$solana_ver\2#g" "${tomls[@]}" || return $?
sed -i -e "s#\(solana-zk-token-sdk = { version = \"\)[^\"]*\(\"\)#\1=$solana_ver\2#g" "${tomls[@]}" || return $?
}

patch_crates_io_solana() {
Expand All @@ -32,5 +34,6 @@ solana-program = { path = "$solana_dir/sdk/program" }
solana-program-test = { path = "$solana_dir/program-test" }
solana-sdk = { path = "$solana_dir/sdk" }
solana-faucet = { path = "$solana_dir/faucet" }
solana-zk-token-sdk = { path = "$solana_dir/zk-token-sdk" }
EOF
}
2 changes: 1 addition & 1 deletion transaction-status/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ solana-vote-program = { path = "../programs/vote", version = "=1.10.35" }
spl-associated-token-account = { version = "=1.0.5", features = ["no-entrypoint"] }
spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
spl-token = { version = "=3.3.1", features = ["no-entrypoint"] }
spl-token-2022 = { version = "=0.2.0", features = ["no-entrypoint"] }
spl-token-2022 = { version = "=0.3.0", features = ["no-entrypoint"] }
thiserror = "1.0"

[package.metadata.docs.rs]
Expand Down
Loading