Update solana tooling to v1.6.3 (#139)

This commit is contained in:
Armani Ferrante 2021-04-04 00:55:56 -07:00 committed by GitHub
parent d6d41eee59
commit 8289e47513
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
37 changed files with 248 additions and 307 deletions

View File

@ -22,7 +22,7 @@ _examples: &examples
- npm install -g @project-serum/common - npm install -g @project-serum/common
- npm install -g @solana/spl-token - npm install -g @solana/spl-token
- sudo apt-get install -y pkg-config build-essential libudev-dev - sudo apt-get install -y pkg-config build-essential libudev-dev
- sh -c "$(curl -sSfL https://release.solana.com/v1.5.5/install)" - sh -c "$(curl -sSfL https://release.solana.com/v1.6.3/install)"
- export PATH="/home/travis/.local/share/solana/install/active_release/bin:$PATH" - export PATH="/home/travis/.local/share/solana/install/active_release/bin:$PATH"
- export NODE_PATH="/home/travis/.nvm/versions/node/v$NODE_VERSION/lib/node_modules/:$NODE_PATH" - export NODE_PATH="/home/travis/.nvm/versions/node/v$NODE_VERSION/lib/node_modules/:$NODE_PATH"
- yes | solana-keygen new - yes | solana-keygen new

View File

@ -24,6 +24,7 @@ incremented for features.
* client: Replace url str with `Cluster` struct when constructing clients ([#89](https://github.com/project-serum/anchor/pull/89)). * client: Replace url str with `Cluster` struct when constructing clients ([#89](https://github.com/project-serum/anchor/pull/89)).
* lang: Changes the account discriminator of `IdlAccount` to be namespaced by `"internal"` ([#128](https://github.com/project-serum/anchor/pull/128)). * lang: Changes the account discriminator of `IdlAccount` to be namespaced by `"internal"` ([#128](https://github.com/project-serum/anchor/pull/128)).
* lang, spl, cli: Upgrade solana toolchain to 1.6.3, a major version upgrade even though only the minor version is incremented. This allows for the removal of `-#![feature(proc_macro_hygiene)]`. ([#139](https://github.com/project-serum/anchor/pull/139)).
## [0.3.0] - 2021-03-12 ## [0.3.0] - 2021-03-12

471
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -15,17 +15,17 @@ default = []
[dependencies] [dependencies]
clap = "3.0.0-beta.1" clap = "3.0.0-beta.1"
anyhow = "1.0.32" anyhow = "1.0.32"
syn = { version = "1.0.54", features = ["full", "extra-traits"] } syn = { version = "1.0.60", features = ["full", "extra-traits"] }
anchor-lang = { path = "../lang" } anchor-lang = { path = "../lang" }
anchor-syn = { path = "../lang/syn", features = ["idl"] } anchor-syn = { path = "../lang/syn", features = ["idl"] }
serde_json = "1.0" serde_json = "1.0"
shellexpand = "2.1.0" shellexpand = "2.1.0"
serde_yaml = "0.8" serde_yaml = "0.8"
toml = "0.5.8" toml = "0.5.8"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0.122", features = ["derive"] }
solana-sdk = "1.5.8" solana-sdk = "1.5.8"
solana-program = "=1.5.15" solana-program = "1.6.3"
solana-client = "=1.5.15" solana-client = "1.6.3"
serum-common = { git = "https://github.com/project-serum/serum-dex", features = ["client"] } serum-common = { git = "https://github.com/project-serum/serum-dex", features = ["client"] }
dirs = "3.0" dirs = "3.0"
heck = "0.3.1" heck = "0.3.1"

View File

@ -104,9 +104,7 @@ features = []"#
pub fn lib_rs(name: &str) -> String { pub fn lib_rs(name: &str) -> String {
format!( format!(
r#"#![feature(proc_macro_hygiene)] r#"use anchor_lang::prelude::*;
use anchor_lang::prelude::*;
#[program] #[program]
pub mod {} {{ pub mod {} {{

View File

@ -10,6 +10,6 @@ description = "Rust client for Anchor programs"
anchor-lang = { path = "../lang", version = "0.3.0" } anchor-lang = { path = "../lang", version = "0.3.0" }
anyhow = "1.0.32" anyhow = "1.0.32"
regex = "1.4.5" regex = "1.4.5"
solana-client = "=1.5.15" solana-client = "1.6.3"
solana-sdk = "=1.5.15" solana-sdk = "1.6.3"
thiserror = "1.0.20" thiserror = "1.0.20"

View File

@ -18,7 +18,7 @@ rustup component add rustfmt
See the solana [docs](https://docs.solana.com/cli/install-solana-cli-tools) for installation instructions. Version 1.5.5 is required. On macOS and Linux, See the solana [docs](https://docs.solana.com/cli/install-solana-cli-tools) for installation instructions. Version 1.5.5 is required. On macOS and Linux,
```bash ```bash
sh -c "$(curl -sSfL https://release.solana.com/v1.5.5/install)" sh -c "$(curl -sSfL https://release.solana.com/v1.6.3/install)"
``` ```
## Install Mocha ## Install Mocha

View File

@ -3,8 +3,6 @@
//! reside until they are "cashed" by the intended recipient. The creator of //! reside until they are "cashed" by the intended recipient. The creator of
//! the check can cancel the check at any time to get back the funds. //! the check can cancel the check at any time to get back the funds.
#![feature(proc_macro_hygiene)]
use anchor_lang::prelude::*; use anchor_lang::prelude::*;
use anchor_spl::token::{self, TokenAccount, Transfer}; use anchor_spl::token::{self, TokenAccount, Transfer};
use std::convert::Into; use std::convert::Into;

View File

@ -1,8 +1,6 @@
//! This example demonstrates the ability to compose together multiple //! This example demonstrates the ability to compose together multiple
//! structs deriving `Accounts`. See `CompositeUpdate`, below. //! structs deriving `Accounts`. See `CompositeUpdate`, below.
#![feature(proc_macro_hygiene)]
use anchor_lang::prelude::*; use anchor_lang::prelude::*;
#[program] #[program]

View File

@ -1,8 +1,6 @@
//! This example demonstrates how custom errors and associated error messsages //! This example demonstrates how custom errors and associated error messsages
//! can be defined and transparently propagated to clients. //! can be defined and transparently propagated to clients.
#![feature(proc_macro_hygiene)]
use anchor_lang::prelude::*; use anchor_lang::prelude::*;
#[program] #[program]

View File

@ -1,4 +1,5 @@
#![feature(proc_macro_hygiene)] //! This example demonstrates how to emit an event, which can be
//! subscribed to by a client.
use anchor_lang::prelude::*; use anchor_lang::prelude::*;

View File

@ -3,8 +3,6 @@
//! to be incremented if it changes the counter from odd -> even or even -> odd. //! to be incremented if it changes the counter from odd -> even or even -> odd.
//! Creative, I know. :P. //! Creative, I know. :P.
#![feature(proc_macro_hygiene)]
use anchor_lang::prelude::*; use anchor_lang::prelude::*;
use counter::Auth; use counter::Auth;

View File

@ -6,8 +6,6 @@
//! Here, we have a counter, where, in order to set the count, the `Auth` //! Here, we have a counter, where, in order to set the count, the `Auth`
//! program must first approve the transaction. //! program must first approve the transaction.
#![feature(proc_macro_hygiene)]
use anchor_lang::prelude::*; use anchor_lang::prelude::*;
#[program] #[program]

View File

@ -1,8 +1,6 @@
//! A relatively advanced example of a lockup program. If you're new to Anchor, //! A relatively advanced example of a lockup program. If you're new to Anchor,
//! it's suggested to start with the other examples. //! it's suggested to start with the other examples.
#![feature(proc_macro_hygiene)]
use anchor_lang::prelude::*; use anchor_lang::prelude::*;
use anchor_lang::solana_program::instruction::Instruction; use anchor_lang::solana_program::instruction::Instruction;
use anchor_lang::solana_program::program; use anchor_lang::solana_program::program;

View File

@ -1,8 +1,6 @@
//! A relatively advanced example of a staking program. If you're new to Anchor, //! A relatively advanced example of a staking program. If you're new to Anchor,
//! it's suggested to start with the other examples. //! it's suggested to start with the other examples.
#![feature(proc_macro_hygiene)]
use anchor_lang::prelude::*; use anchor_lang::prelude::*;
use anchor_lang::solana_program::program_option::COption; use anchor_lang::solana_program::program_option::COption;
use anchor_spl::token::{self, Mint, TokenAccount, Transfer}; use anchor_spl::token::{self, Mint, TokenAccount, Transfer};

View File

@ -1,8 +1,6 @@
//! Misc example is a catchall program for testing unrelated features. //! Misc example is a catchall program for testing unrelated features.
//! It's not too instructive/coherent by itself, so please see other examples. //! It's not too instructive/coherent by itself, so please see other examples.
#![feature(proc_macro_hygiene)]
use anchor_lang::prelude::*; use anchor_lang::prelude::*;
#[program] #[program]

View File

@ -17,8 +17,6 @@
//! the `execute_transaction`, once enough (i.e. `threhsold`) of the owners have //! the `execute_transaction`, once enough (i.e. `threhsold`) of the owners have
//! signed. //! signed.
#![feature(proc_macro_hygiene)]
use anchor_lang::prelude::*; use anchor_lang::prelude::*;
use anchor_lang::solana_program; use anchor_lang::solana_program;
use anchor_lang::solana_program::instruction::Instruction; use anchor_lang::solana_program::instruction::Instruction;

View File

@ -1,7 +1,5 @@
//! This example demonstrates the use of the `anchor_spl::token` CPI client. //! This example demonstrates the use of the `anchor_spl::token` CPI client.
#![feature(proc_macro_hygiene)]
use anchor_lang::prelude::*; use anchor_lang::prelude::*;
use anchor_spl::token::{self, Burn, MintTo, Transfer}; use anchor_spl::token::{self, Burn, MintTo, Transfer};

View File

@ -1,5 +1,3 @@
#![feature(proc_macro_hygiene)]
use anchor_lang::prelude::*; use anchor_lang::prelude::*;
#[program] #[program]

View File

@ -1,5 +1,3 @@
#![feature(proc_macro_hygiene)]
use anchor_lang::prelude::*; use anchor_lang::prelude::*;
#[program] #[program]

View File

@ -1,5 +1,3 @@
#![feature(proc_macro_hygiene)]
use anchor_lang::prelude::*; use anchor_lang::prelude::*;
#[program] #[program]

View File

@ -1,5 +1,3 @@
#![feature(proc_macro_hygiene)]
use anchor_lang::prelude::*; use anchor_lang::prelude::*;
// Define the program's instruction handlers. // Define the program's instruction handlers.

View File

@ -1,5 +1,3 @@
#![feature(proc_macro_hygiene)]
// #region core // #region core
use anchor_lang::prelude::*; use anchor_lang::prelude::*;
use puppet::{Puppet, SetData}; use puppet::{Puppet, SetData};

View File

@ -1,5 +1,3 @@
#![feature(proc_macro_hygiene)]
use anchor_lang::prelude::*; use anchor_lang::prelude::*;
#[program] #[program]

View File

@ -1,5 +1,3 @@
#![feature(proc_macro_hygiene)]
// #region code // #region code
use anchor_lang::prelude::*; use anchor_lang::prelude::*;

View File

@ -1,8 +1,6 @@
//! The typescript example serves to show how one would setup an Anchor //! The typescript example serves to show how one would setup an Anchor
//! workspace with TypeScript tests and migrations. //! workspace with TypeScript tests and migrations.
#![feature(proc_macro_hygiene)]
use anchor_lang::prelude::*; use anchor_lang::prelude::*;
#[program] #[program]

View File

@ -21,6 +21,6 @@ anchor-attribute-interface = { path = "./attribute/interface", version = "0.3.0"
anchor-derive-accounts = { path = "./derive/accounts", version = "0.3.0" } anchor-derive-accounts = { path = "./derive/accounts", version = "0.3.0" }
anchor-attribute-event = { path = "./attribute/event", version = "0.3.0" } anchor-attribute-event = { path = "./attribute/event", version = "0.3.0" }
borsh = "0.8.2" borsh = "0.8.2"
solana-program = "=1.5.15" solana-program = "1.6.3"
thiserror = "1.0.20" thiserror = "1.0.20"
base64 = "0.13.0" base64 = "0.13.0"

View File

@ -13,7 +13,7 @@ proc-macro = true
[dependencies] [dependencies]
proc-macro2 = "1.0" proc-macro2 = "1.0"
quote = "1.0" quote = "1.0"
syn = { version = "=1.0.57", features = ["full"] } syn = { version = "1.0.60", features = ["full"] }
anyhow = "1.0.32" anyhow = "1.0.32"
anchor-syn = { path = "../../syn", version = "0.3.0" } anchor-syn = { path = "../../syn", version = "0.3.0" }
regex = "1.0" regex = "1.0"

View File

@ -13,6 +13,6 @@ proc-macro = true
[dependencies] [dependencies]
proc-macro2 = "1.0" proc-macro2 = "1.0"
quote = "1.0" quote = "1.0"
syn = { version = "=1.0.57", features = ["full"] } syn = { version = "1.0.60", features = ["full"] }
anyhow = "1.0.32" anyhow = "1.0.32"
anchor-syn = { path = "../../syn", version = "0.3.0", features = ["hash"] } anchor-syn = { path = "../../syn", version = "0.3.0", features = ["hash"] }

View File

@ -13,5 +13,5 @@ proc-macro = true
[dependencies] [dependencies]
proc-macro2 = "1.0" proc-macro2 = "1.0"
quote = "1.0" quote = "1.0"
syn = { version = "=1.0.57", features = ["full"] } syn = { version = "1.0.60", features = ["full"] }
anchor-syn = { path = "../../syn", version = "0.3.0" } anchor-syn = { path = "../../syn", version = "0.3.0" }

View File

@ -13,6 +13,6 @@ proc-macro = true
[dependencies] [dependencies]
proc-macro2 = "1.0" proc-macro2 = "1.0"
quote = "1.0" quote = "1.0"
syn = { version = "=1.0.57", features = ["full"] } syn = { version = "1.0.60", features = ["full"] }
anyhow = "1.0.32" anyhow = "1.0.32"
anchor-syn = { path = "../../syn", version = "0.3.0", features = ["hash"] } anchor-syn = { path = "../../syn", version = "0.3.0", features = ["hash"] }

View File

@ -13,7 +13,7 @@ proc-macro = true
[dependencies] [dependencies]
proc-macro2 = "1.0" proc-macro2 = "1.0"
quote = "1.0" quote = "1.0"
syn = { version = "=1.0.57", features = ["full"] } syn = { version = "1.0.60", features = ["full"] }
anyhow = "1.0.32" anyhow = "1.0.32"
anchor-syn = { path = "../../syn", version = "0.3.0" } anchor-syn = { path = "../../syn", version = "0.3.0" }
heck = "0.3.2" heck = "0.3.2"

View File

@ -13,6 +13,6 @@ proc-macro = true
[dependencies] [dependencies]
proc-macro2 = "1.0" proc-macro2 = "1.0"
quote = "1.0" quote = "1.0"
syn = { version = "=1.0.57", features = ["full"] } syn = { version = "1.0.60", features = ["full"] }
anyhow = "1.0.32" anyhow = "1.0.32"
anchor-syn = { path = "../../syn", version = "0.3.0" } anchor-syn = { path = "../../syn", version = "0.3.0" }

View File

@ -13,6 +13,6 @@ proc-macro = true
[dependencies] [dependencies]
proc-macro2 = "1.0" proc-macro2 = "1.0"
quote = "1.0" quote = "1.0"
syn = { version = "=1.0.57", features = ["full"] } syn = { version = "1.0.60", features = ["full"] }
anyhow = "1.0.32" anyhow = "1.0.32"
anchor-syn = { path = "../../syn", version = "0.3.0" } anchor-syn = { path = "../../syn", version = "0.3.0" }

View File

@ -13,6 +13,6 @@ proc-macro = true
[dependencies] [dependencies]
proc-macro2 = "1.0" proc-macro2 = "1.0"
quote = "1.0" quote = "1.0"
syn = { version = "=1.0.57", features = ["full"] } syn = { version = "1.0.60", features = ["full"] }
anyhow = "1.0.32" anyhow = "1.0.32"
anchor-syn = { path = "../../syn", version = "0.3.0" } anchor-syn = { path = "../../syn", version = "0.3.0" }

View File

@ -15,10 +15,10 @@ default = []
[dependencies] [dependencies]
proc-macro2 = "1.0" proc-macro2 = "1.0"
quote = "1.0" quote = "1.0"
syn = { version = "=1.0.57", features = ["full", "extra-traits", "parsing"] } syn = { version = "1.0.60", features = ["full", "extra-traits", "parsing"] }
anyhow = "1.0.32" anyhow = "1.0.32"
heck = "0.3.1" heck = "0.3.1"
serde = { version = "1.0.118", features = ["derive"] } serde = { version = "1.0.122", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"
sha2 = "0.9.2" sha2 = "0.9.2"
thiserror = "1.0" thiserror = "1.0"

View File

@ -9,4 +9,4 @@ description = "CPI clients for SPL programs"
[dependencies] [dependencies]
anchor-lang = { path = "../lang", version = "0.3.0", features = ["derive"] } anchor-lang = { path = "../lang", version = "0.3.0", features = ["derive"] }
spl-token = { version = "3.0.1", features = ["no-entrypoint"] } spl-token = { version = "3.0.1", features = ["no-entrypoint"] }
solana-program = "=1.5.15" solana-program = "1.6.3"