From 5d571ee9fc925b36253348bcd2a5f42c29d34c80 Mon Sep 17 00:00:00 2001 From: Armani Ferrante Date: Thu, 14 Jan 2021 23:19:52 -0800 Subject: [PATCH] Set alpha and borsh versions --- .gitignore | 4 +++- Cargo.lock | 12 ++++++------ Cargo.toml | 12 ++++++------ attribute/access-control/Cargo.toml | 2 +- attribute/account/Cargo.toml | 2 +- attribute/program/Cargo.toml | 2 +- cli/src/template.rs | 4 ++-- derive/accounts/Cargo.toml | 2 +- examples/composite/programs/composite/Cargo.toml | 2 +- examples/sysvars/programs/sysvars/Cargo.toml | 2 +- .../tutorial/basic-0/programs/basic-0/Cargo.toml | 2 +- .../tutorial/basic-1/programs/basic-1/Cargo.toml | 2 +- .../tutorial/basic-2/programs/basic-2/Cargo.toml | 2 +- .../basic-3/programs/puppet-master/Cargo.toml | 2 +- examples/tutorial/basic-3/programs/puppet/Cargo.toml | 2 +- syn/Cargo.toml | 2 +- 16 files changed, 29 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index 1184ad67..76771973 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,6 @@ target/ *.swp *.swo .anchor -test-ledger \ No newline at end of file +test-ledger +examples/*/Cargo.lock +examples/**/Cargo.lock \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index f7b57b0f..bf9a778b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -45,7 +45,7 @@ dependencies = [ [[package]] name = "anchor-attribute-access-control" -version = "0.1.0" +version = "0.0.0-alpha.0" dependencies = [ "anchor-syn", "anyhow", @@ -56,7 +56,7 @@ dependencies = [ [[package]] name = "anchor-attribute-account" -version = "0.1.0" +version = "0.0.0-alpha.0" dependencies = [ "anchor-syn", "anyhow", @@ -67,7 +67,7 @@ dependencies = [ [[package]] name = "anchor-attribute-program" -version = "0.1.0" +version = "0.0.0-alpha.0" dependencies = [ "anchor-syn", "anyhow", @@ -98,7 +98,7 @@ dependencies = [ [[package]] name = "anchor-derive-accounts" -version = "0.1.0" +version = "0.0.0-alpha.0" dependencies = [ "anchor-syn", "anyhow", @@ -109,7 +109,7 @@ dependencies = [ [[package]] name = "anchor-lang" -version = "0.1.0" +version = "0.0.0-alpha.0" dependencies = [ "anchor-attribute-access-control", "anchor-attribute-account", @@ -123,7 +123,7 @@ dependencies = [ [[package]] name = "anchor-syn" -version = "0.1.0" +version = "0.0.0-alpha.0" dependencies = [ "anyhow", "heck", diff --git a/Cargo.toml b/Cargo.toml index 6ed4a565..36635836 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-lang" -version = "0.1.0" +version = "0.0.0-alpha.0" description = "" repository = "https://github.com/project-serum/serum-dex" edition = "2018" @@ -13,11 +13,11 @@ default = [] thiserror = "1.0.20" solana-program = "1.4.3" solana-sdk = { version = "1.3.14", default-features = false, features = ["program"] } -anchor-derive-accounts = { path = "./derive/accounts" } -anchor-attribute-program = { path = "./attribute/program" } -anchor-attribute-access-control = { path = "./attribute/access-control" } -anchor-attribute-account = { path = "./attribute/account" } -borsh = { git = "https://github.com/project-serum/borsh", branch = "serum", features = ["serum-program"] } +anchor-derive-accounts = { path = "./derive/accounts", version = "0.0.0-alpha.0" } +anchor-attribute-program = { path = "./attribute/program", version = "0.0.0-alpha.0" } +anchor-attribute-access-control = { path = "./attribute/access-control", version = "0.0.0-alpha.0" } +anchor-attribute-account = { path = "./attribute/account", version = "0.0.0-alpha.0" } +serum-borsh = { version = "0.7.2+serum.2", features = ["serum-program"] } [workspace] members = [ diff --git a/attribute/access-control/Cargo.toml b/attribute/access-control/Cargo.toml index 57b46fc9..4b2d7bb8 100644 --- a/attribute/access-control/Cargo.toml +++ b/attribute/access-control/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-access-control" -version = "0.1.0" +version = "0.0.0-alpha.0" authors = ["armaniferrante "] edition = "2018" diff --git a/attribute/account/Cargo.toml b/attribute/account/Cargo.toml index 925a7777..55398d5f 100644 --- a/attribute/account/Cargo.toml +++ b/attribute/account/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-account" -version = "0.1.0" +version = "0.0.0-alpha.0" authors = ["armaniferrante "] edition = "2018" diff --git a/attribute/program/Cargo.toml b/attribute/program/Cargo.toml index 8f6da5cc..fd0d6d7d 100644 --- a/attribute/program/Cargo.toml +++ b/attribute/program/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-program" -version = "0.1.0" +version = "0.0.0-alpha.0" authors = ["armaniferrante "] edition = "2018" diff --git a/cli/src/template.rs b/cli/src/template.rs index 24915839..5d5c11e3 100644 --- a/cli/src/template.rs +++ b/cli/src/template.rs @@ -27,10 +27,10 @@ no-entrypoint = [] cpi = ["no-entrypoint"] [dependencies] -borsh = {{ git = "https://github.com/project-serum/borsh", branch = "serum", features = ["serum-program"] }} +anchor-lang = {{ git = "https://github.com/project-serum/anchor", features = ["derive"] }} +serum-borsh = {{ version = "0.7.2+serum.1", features = ["serum-program"] }} solana-program = "1.4.3" solana-sdk = {{ version = "1.3.14", default-features = false, features = ["program"] }} -anchor-lang = {{ git = "https://github.com/project-serum/anchor", features = ["derive"] }} "#, name, name.to_snake_case(), diff --git a/derive/accounts/Cargo.toml b/derive/accounts/Cargo.toml index 82896800..cb0bdb6f 100644 --- a/derive/accounts/Cargo.toml +++ b/derive/accounts/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-derive-accounts" -version = "0.1.0" +version = "0.0.0-alpha.0" authors = ["armaniferrante "] edition = "2018" diff --git a/examples/composite/programs/composite/Cargo.toml b/examples/composite/programs/composite/Cargo.toml index 600ceb04..ff7859e2 100644 --- a/examples/composite/programs/composite/Cargo.toml +++ b/examples/composite/programs/composite/Cargo.toml @@ -13,7 +13,7 @@ no-entrypoint = [] cpi = ["no-entrypoint"] [dependencies] -borsh = { git = "https://github.com/project-serum/borsh", branch = "serum", features = ["serum-program"] } +serum-borsh = { version = "0.7.2+serum.1", features = ["serum-program"] } solana-program = "1.4.3" solana-sdk = { version = "1.3.14", default-features = false, features = ["program"] } anchor-lang = { git = "https://github.com/project-serum/anchor", features = ["derive"] } diff --git a/examples/sysvars/programs/sysvars/Cargo.toml b/examples/sysvars/programs/sysvars/Cargo.toml index 7dba0c30..af5c7c14 100644 --- a/examples/sysvars/programs/sysvars/Cargo.toml +++ b/examples/sysvars/programs/sysvars/Cargo.toml @@ -13,7 +13,7 @@ no-entrypoint = [] cpi = ["no-entrypoint"] [dependencies] -borsh = { git = "https://github.com/project-serum/borsh", branch = "serum", features = ["serum-program"] } +serum-borsh = { version = "0.7.2+serum.1", features = ["serum-program"] } solana-program = "1.4.3" solana-sdk = { version = "1.3.14", default-features = false, features = ["program"] } anchor-lang = { git = "https://github.com/project-serum/anchor", features = ["derive"] } diff --git a/examples/tutorial/basic-0/programs/basic-0/Cargo.toml b/examples/tutorial/basic-0/programs/basic-0/Cargo.toml index 420bedb1..ccbf811f 100644 --- a/examples/tutorial/basic-0/programs/basic-0/Cargo.toml +++ b/examples/tutorial/basic-0/programs/basic-0/Cargo.toml @@ -13,7 +13,7 @@ no-entrypoint = [] cpi = ["no-entrypoint"] [dependencies] -borsh = { git = "https://github.com/project-serum/borsh", branch = "serum", features = ["serum-program"] } +serum-borsh = { version = "0.7.2+serum.1", features = ["serum-program"] } solana-program = "1.4.3" solana-sdk = { version = "1.3.14", default-features = false, features = ["program"] } anchor-lang = { git = "https://github.com/project-serum/anchor", features = ["derive"] } diff --git a/examples/tutorial/basic-1/programs/basic-1/Cargo.toml b/examples/tutorial/basic-1/programs/basic-1/Cargo.toml index c71ad662..f01bcf42 100644 --- a/examples/tutorial/basic-1/programs/basic-1/Cargo.toml +++ b/examples/tutorial/basic-1/programs/basic-1/Cargo.toml @@ -13,7 +13,7 @@ no-entrypoint = [] cpi = ["no-entrypoint"] [dependencies] -borsh = { git = "https://github.com/project-serum/borsh", branch = "serum", features = ["serum-program"] } +serum-borsh = { version = "0.7.2+serum.1", features = ["serum-program"] } solana-program = "1.4.3" solana-sdk = { version = "1.3.14", default-features = false, features = ["program"] } anchor-lang = { git = "https://github.com/project-serum/anchor", features = ["derive"] } diff --git a/examples/tutorial/basic-2/programs/basic-2/Cargo.toml b/examples/tutorial/basic-2/programs/basic-2/Cargo.toml index ef08b405..24c9c092 100644 --- a/examples/tutorial/basic-2/programs/basic-2/Cargo.toml +++ b/examples/tutorial/basic-2/programs/basic-2/Cargo.toml @@ -13,7 +13,7 @@ no-entrypoint = [] cpi = ["no-entrypoint"] [dependencies] -borsh = { git = "https://github.com/project-serum/borsh", branch = "serum", features = ["serum-program"] } +serum-borsh = { version = "0.7.2+serum.1", features = ["serum-program"] } solana-program = "1.4.3" solana-sdk = { version = "1.3.14", default-features = false, features = ["program"] } anchor-lang = { git = "https://github.com/project-serum/anchor", features = ["derive"] } diff --git a/examples/tutorial/basic-3/programs/puppet-master/Cargo.toml b/examples/tutorial/basic-3/programs/puppet-master/Cargo.toml index 727dfb74..e08cc03a 100644 --- a/examples/tutorial/basic-3/programs/puppet-master/Cargo.toml +++ b/examples/tutorial/basic-3/programs/puppet-master/Cargo.toml @@ -13,7 +13,7 @@ no-entrypoint = [] cpi = ["no-entrypoint"] [dependencies] -borsh = { git = "https://github.com/project-serum/borsh", branch = "serum", features = ["serum-program"] } +serum-borsh = { version = "0.7.2+serum.1", features = ["serum-program"] } solana-program = "1.4.3" solana-sdk = { version = "1.3.14", default-features = false, features = ["program"] } anchor-lang = { git = "https://github.com/project-serum/anchor", features = ["derive"] } diff --git a/examples/tutorial/basic-3/programs/puppet/Cargo.toml b/examples/tutorial/basic-3/programs/puppet/Cargo.toml index 6ab1d3d2..d23e713f 100644 --- a/examples/tutorial/basic-3/programs/puppet/Cargo.toml +++ b/examples/tutorial/basic-3/programs/puppet/Cargo.toml @@ -13,7 +13,7 @@ no-entrypoint = [] cpi = ["no-entrypoint"] [dependencies] -borsh = { git = "https://github.com/project-serum/borsh", branch = "serum", features = ["serum-program"] } +serum-borsh = { version = "0.7.2+serum.1", features = ["serum-program"] } solana-program = "1.4.3" solana-sdk = { version = "1.3.14", default-features = false, features = ["program"] } anchor-lang = { git = "https://github.com/project-serum/anchor", features = ["derive"] } diff --git a/syn/Cargo.toml b/syn/Cargo.toml index 3b6f61b7..fbb5edf3 100644 --- a/syn/Cargo.toml +++ b/syn/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-syn" -version = "0.1.0" +version = "0.0.0-alpha.0" authors = ["armaniferrante "] edition = "2018"