Rewrite data mode and interface according to requirements for integra…

…te with spl-governance #3 (#4)

Co-authored-by: Semen Medvedev <[email protected]>

addin-vesting/cli/Cargo.toml

@@ -5,13 +5,13 @@ authors = ["Bonfida <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-solana-program = "1.5.0"
-solana-client = "1.5.0"
-solana-sdk = "1.5.0"
-solana-clap-utils = "1.5.0"
+solana-program = "=1.9.13"
+solana-client = "=1.9.13"
+solana-sdk = "=1.9.13"
+solana-clap-utils = "=1.9.13"
 token-vesting =  { version = "0.1.0", path="../program", features=["no-entrypoint"] }
-spl-token = {version = "3.0.1", features = ["no-entrypoint"]}
+spl-token = {version = "3.2.0", features = ["no-entrypoint"]}
 spl-associated-token-account = {version = "1.0.2", features = ["no-entrypoint"]}
 clap = "2.33.3"
 chrono = "0.4.19"
-iso8601-duration = { git = "https://github.com/rrichardson/iso8601-duration.git", rev = "9e01f51ea253e95e0fba5e4d7ad0c537922931e7"}
+iso8601-duration = { git = "https://github.com/rrichardson/iso8601-duration.git", rev = "9e01f51ea253e95e0fba5e4d7ad0c537922931e7"}

addin-vesting/program/Cargo.toml

@@ -21,16 +21,22 @@ thiserror = "1.0.23"
 num-traits = "0.2"
 num-derive = "0.3"
 arrayref = "0.3.6"
+borsh = "0.9.1"
 solana-program = "1.5.6"
 spl-token = { version = "3.0.1", features = ["no-entrypoint"] }
 spl-associated-token-account = { version = "1.0.2", features = ["no-entrypoint"] }
+#spl-governance = { version = "2.2.2", features = ["no-entrypoint"] }
+#spl-governance-tools = { version = "0.1.2" }
+spl-governance = { path="/mnt/working/solana/solana-program-library.git/governance/program", features = ["no-entrypoint"] }
+spl-governance-tools = { path="/mnt/working/solana/solana-program-library.git/governance/tools", version = "0.1.2" }
 arbitrary = { version = "0.4", features = ["derive"], optional = true }
 honggfuzz = { version = "0.5", optional = true }
 
 [dev-dependencies]
 solana-sdk = "1.5.6"
 solana-program-test = "1.5.6"
 tokio = { version = "1.0", features = ["macros"]}
+hex = "0.4"
 
 [lib]
 crate-type = ["cdylib", "lib"]

addin-vesting/program/src/entrypoint.rs

@@ -1,5 +1,5 @@
 use solana_program::{
-    account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, msg,
+    account_info::AccountInfo, entrypoint, entrypoint::ProgramResult,
     program_error::PrintProgramError, pubkey::Pubkey,
 };
 
@@ -12,7 +12,6 @@ pub fn process_instruction(
     accounts: &[AccountInfo],
     instruction_data: &[u8],
 ) -> ProgramResult {
-    msg!("Entrypoint");
     if let Err(error) = Processor::process_instruction(program_id, accounts, instruction_data) {
         // catch the error so we can print it
         error.print::<VestingError>();