Skip to content

Commit

Permalink
Upgrade from template
Browse files Browse the repository at this point in the history
  • Loading branch information
lorisleiva committed Aug 5, 2024
1 parent 5c08e8b commit 5d61689
Show file tree
Hide file tree
Showing 6 changed files with 267 additions and 43 deletions.
221 changes: 212 additions & 9 deletions Cargo.lock

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

7 changes: 3 additions & 4 deletions clients/js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,13 @@
},
"license": "Apache-2.0",
"peerDependencies": {
"@solana/web3.js": "2.0.0-preview.4"
"@solana/web3.js": "2.0.0-rc.0"
},
"devDependencies": {
"@ava/typescript": "^4.1.0",
"@solana-program/system": "^0.4.0",
"@solana/eslint-config-solana": "^3.0.3",
"@solana/web3.js": "2.0.0-preview.4",
"@solana/webcrypto-ed25519-polyfill": "2.0.0-preview.4",
"@solana/web3.js": "2.0.0-rc.0",
"@solana/webcrypto-ed25519-polyfill": "2.0.0-rc.0",
"@types/node": "^20",
"@typescript-eslint/eslint-plugin": "^7.16.1",
"@typescript-eslint/parser": "^7.16.1",
Expand Down
2 changes: 2 additions & 0 deletions clients/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@ readme = "README.md"
license-file = "../../LICENSE"

[features]
anchor = ["dep:anchor-lang"]
test-sbf = []
serde = ["dep:serde", "dep:serde_with"]

[dependencies]
anchor-lang = { version = "0.30.0", optional = true }
borsh = "^0.10"
num-derive = "^0.3"
num-traits = "^0.2"
Expand Down
8 changes: 7 additions & 1 deletion scripts/check-solana-version.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@ import { getInstalledSolanaVersion, getSolanaVersion } from './utils.mjs';
const expectedVersion = getSolanaVersion();
const installedVersion = await getInstalledSolanaVersion();

if (installedVersion !== expectedVersion) {
if (!installedVersion) {
echo(
chalk.red('[ ERROR ]'),
`No Solana installation found. Please install Solana ${expectedVersion} before proceeding.`
);
process.exit(1);
} else if (installedVersion !== expectedVersion) {
echo(
chalk.yellow('[ WARNING ]'),
`The installed Solana version ${installedVersion} does not match the expected version ${expectedVersion}.`
Expand Down
Loading

0 comments on commit 5d61689

Please sign in to comment.