Skip to content

Commit a6ad368

Browse files
authored
chore: revert to symlink for basic_solana Ninja deployment (#222)
([XC-456](https://dfinity.atlassian.net/browse/XC-456)) Due to the breaking changes in #197, the symlink for the `basic_solana` ICP Ninja deployment source code was removed. Since `sol_rpc_client` and `sol_rpc_types` v3.0.0 were released without the patched `solana-*` dependencies, this PR adds back the symlink and removes the duplicated code for the `basic_solana` ICP Ninja deployment. [XC-456]: https://dfinity.atlassian.net/browse/XC-456?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
1 parent b8dd250 commit a6ad368

File tree

10 files changed

+491
-2118
lines changed

10 files changed

+491
-2118
lines changed

examples/basic_solana/ninja/Cargo.lock

Lines changed: 478 additions & 1267 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/basic_solana/ninja/Cargo.toml

Lines changed: 12 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
name = "basic_solana"
33
version = "1.0.0"
44
edition = "2021"
5+
56
[workspace]
67

78
[[bin]]
@@ -18,41 +19,16 @@ ic-cdk = "0.17.2"
1819
ic-ed25519 = "0.2.0"
1920
num = "0.4.3"
2021
serde = { version = "1.0.219", features = ["derive"] }
21-
sol_rpc_client = { version = "2.0.0", features = ["ed25519"] }
22-
sol_rpc_types = "2.0.0"
23-
solana-hash = "=2.3.0"
24-
solana-instruction = "=2.3.0"
25-
solana-message = "=2.4.0"
26-
solana-pubkey = "=2.4.0"
27-
solana-signature = "=2.3.0"
28-
solana-system-interface = "1.0.0"
29-
solana-transaction = { version = "=2.2.3", features = ["bincode"] }
22+
sol_rpc_client = { version = "3.0.0", features = ["ed25519"] }
23+
sol_rpc_types = "3.0.0"
24+
solana-hash = "3.0.0"
25+
solana-instruction = "3.0.0"
26+
solana-message = "3.0.0"
27+
solana-pubkey = { version = "3.0.0", features = ["curve25519"] }
28+
solana-signature = "3.0.0"
29+
solana-system-interface = { version = "2.0.0", features = ["bincode"] }
30+
solana-transaction = { version = "3.0.0", features = ["bincode"] }
31+
spl-associated-token-account-interface = "2.0.0"
3032

3133
[dev-dependencies]
32-
candid_parser = "0.1.4"
33-
34-
# TODO XC-297: Currently, the solana-* crates have a dependency on wasm-bindgen
35-
# when they are built for wasm32-unknown-unknown target. For this reason, we
36-
# are using forked version of the relevant repositories.
37-
# see [solana-sdk#117](https://github.com/anza-xyz/solana-sdk/issues/117)
38-
[patch.crates-io]
39-
solana-account = { git = "https://github.com/dfinity/solana-sdk", tag = "46ca4e2-js-feature-flag" }
40-
solana-clock = { git = "https://github.com/dfinity/solana-sdk", tag = "46ca4e2-js-feature-flag" }
41-
solana-commitment-config = { git = "https://github.com/dfinity/solana-sdk", tag = "46ca4e2-js-feature-flag" }
42-
solana-compute-budget-interface = { git = "https://github.com/dfinity/solana-sdk", tag = "46ca4e2-js-feature-flag" }
43-
solana-hash = { git = "https://github.com/dfinity/solana-sdk", tag = "46ca4e2-js-feature-flag" }
44-
solana-instruction = { git = "https://github.com/dfinity/solana-sdk", tag = "46ca4e2-js-feature-flag" }
45-
solana-keypair = { git = "https://github.com/dfinity/solana-sdk", tag = "46ca4e2-js-feature-flag" }
46-
solana-message = { git = "https://github.com/dfinity/solana-sdk", tag = "46ca4e2-js-feature-flag" }
47-
solana-nonce = { git = "https://github.com/dfinity/solana-sdk", tag = "46ca4e2-js-feature-flag" }
48-
solana-program = { git = "https://github.com/dfinity/solana-sdk", tag = "46ca4e2-js-feature-flag" }
49-
solana-pubkey = { git = "https://github.com/dfinity/solana-sdk", tag = "46ca4e2-js-feature-flag" }
50-
solana-reward-info = { git = "https://github.com/dfinity/solana-sdk", tag = "46ca4e2-js-feature-flag" }
51-
solana-signer = { git = "https://github.com/dfinity/solana-sdk", tag = "46ca4e2-js-feature-flag" }
52-
solana-signature = { git = "https://github.com/dfinity/solana-sdk", tag = "46ca4e2-js-feature-flag" }
53-
solana-transaction = { git = "https://github.com/dfinity/solana-sdk", tag = "46ca4e2-js-feature-flag" }
54-
solana-transaction-error = { git = "https://github.com/dfinity/solana-sdk", tag = "46ca4e2-js-feature-flag" }
55-
solana-sdk-ids = { git = "https://github.com/dfinity/solana-sdk", tag = "46ca4e2-js-feature-flag" }
56-
solana-system-interface = { git = "https://github.com/dfinity/solana-system-program", tag = "6185b40-js-feature-flag" }
57-
solana-sysvar = { git = "https://github.com/dfinity/solana-sdk", tag = "46ca4e2-js-feature-flag" }
58-
solana-sysvar-id = { git = "https://github.com/dfinity/solana-sdk", tag = "46ca4e2-js-feature-flag" }
34+
candid_parser = "0.1.4"

examples/basic_solana/ninja/src

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../src/

examples/basic_solana/ninja/src/ed25519.rs

Lines changed: 0 additions & 45 deletions
This file was deleted.

examples/basic_solana/ninja/src/lib.rs

Lines changed: 0 additions & 82 deletions
This file was deleted.

0 commit comments

Comments
 (0)