Add deployed programs to ci/client

ci/client/Cargo.toml

@@ -1,14 +1,19 @@
 [package]
 name = "test-client"
-version = "0.1.0"
-authors = ["Jack May <[email protected]>"]
+version = "1.0.0"
+publish = false
+authors = ["Solana Maintainers <[email protected]>"]
+repository = "https://github.com/solana-labs/solana-program-library"
+license = "Apache-2.0"
 edition = "2018"
 
+
 # Used to ensure that SPL programs are buildable by external clients
 
 [dependencies]
 solana-sdk = "1.2.19"
 spl-memo = { path = "../../memo" }
 spl-token = { path = "../../token" }
+spl-memo_1_0 = { path = "../../deployed/memo-1.0", package = "spl-memo" }
+spl-token_1_0 = { path = "../../deployed/token-1.0", package = "spl-token" }
 spl-token-swap = { path = "../../token-swap" }
-

ci/client/src/main.rs

@@ -1,10 +1,12 @@
 fn main() {
-    let sdk_dep = solana_sdk::signature::Signature::default();
-    println!("Yes have some sdk_dep {:?}", sdk_dep);
-    let memo_dep = spl_memo::id();
-    println!("Yes have some memo_dep {:?}", memo_dep);
-    let token_dep = spl_token::id();
-    println!("Yes have some token_dep {:?}", token_dep);
-    let token_swap_dep = spl_token_swap::id();
-    println!("Yes have some token_swap_dep {:?}", token_swap_dep);
+    println!("Yes have some sdk_dep {:?}", solana_sdk::signature::Signature::default());
+
+    // Under development
+    println!("Yes have some memo_dep 1.1 {:?}", spl_memo_1_1::id());
+    println!("Yes have some token_dep 1.1 {:?}", spl_token_1_1::id());
+    println!("Yes have some token_swap_dep 1.0 {:?}", spl_token_swap_1_0::id());
+
+    // Deployed
+    println!("Yes have some memo_dep 1.0 {:?}", spl_memo_1_0::id());
+    println!("Yes have some token_dep 1.0 {:?}", spl_token_1_0::id());
 }

deployed/memo-1.0/Cargo.toml

@@ -20,5 +20,5 @@ default = ["solana-sdk/default"]
 solana-sdk = { version = "1.2.17", default-features = false, optional = true }
 
 [lib]
-name = "spl_memo"
+name = "spl_memo_1_0"
 crate-type = ["cdylib", "lib"]

deployed/token-1.0/Cargo.toml

@@ -31,5 +31,5 @@ rand = { version = "0.7.0"}
 cbindgen = "=0.14.2"
 
 [lib]
-name = "spl_token"
+name = "spl_token_1_0"
 crate-type = ["cdylib", "lib"]

memo/Cargo.toml

@@ -20,5 +20,5 @@ default = ["solana-sdk/default"]
 solana-sdk = { version = "1.2.17", default-features = false, optional = true }
 
 [lib]
-name = "spl_memo"
+name = "spl_memo_1_1"
 crate-type = ["cdylib", "lib"]

token-swap/Cargo.toml

@@ -3,7 +3,7 @@
 
 [package]
 name = "spl-token-swap"
-version = "0.1.0"
+version = "1.0.0-pre1"
 description = "Solana Program Library Token Swap"
 authors = ["Solana Maintainers <[email protected]>"]
 repository = "https://github.com/solana-labs/solana-program-library"
@@ -22,7 +22,7 @@ num-derive = "0.3"
 num-traits = "0.2"
 remove_dir_all = "=0.5.0"
 solana-sdk = { version = "1.2.17", default-features = false, optional = true }
-spl-token = { path = "../token", default-features = false, optional = true }
+spl-token = { path = "../deployed/token-1.0", default-features = false, optional = true }
 thiserror = "1.0"
 
 [dev-dependencies]
@@ -32,5 +32,5 @@ rand = { version = "0.7.0"}
 cbindgen = "=0.14.2"
 
 [lib]
-name = "spl_token_swap"
+name = "spl_token_swap_1_0"
 crate-type = ["cdylib", "lib"]

token/Cargo.toml

@@ -31,5 +31,5 @@ rand = { version = "0.7.0"}
 cbindgen = "=0.14.2"
 
 [lib]
-name = "spl_token"
+name = "spl_token_1_1"
 crate-type = ["cdylib", "lib"]

token/inc/token.h

@@ -8,8 +8,8 @@
 #include <stdlib.h>
 
 #define TOKEN_MAJOR_VERSION 1
-#define TOKEN_MINOR_VERSION 0
-#define TOKEN_PATCH_VERSION 6
+#define TOKEN_MINOR_VERSION 1
+#define TOKEN_PATCH_VERSION 0
 
 /**
  * There are 10^9 lamports in one SOL