Skip to content

Commit

Permalink
Add solana-program-library as submodule #9 (#10)
Browse files Browse the repository at this point in the history
Co-authored-by: Semen Medvedev <[email protected]>
  • Loading branch information
s-medvedev and Semen Medvedev authored Mar 25, 2022
1 parent 96e766b commit 9b6abcb
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 18 deletions.
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule "solana-program-library"]
path = solana-program-library
url = https://github.com/solana-labs/solana-program-library.git
branch = master
9 changes: 9 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[workspace]
members = [
"addin-fixed-weights/program",
"addin-vesting/program",
# "addin-vesting/program/fuzz",
]
exclude = [
"solana-program-library",
]
6 changes: 3 additions & 3 deletions addin-fixed-weights/program/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ num-traits = "0.2"
serde = "1.0.127"
serde_derive = "1.0.103"
solana-program = "1.9.9"
spl-token = { version = "3.3", features = [ "no-entrypoint" ] }
spl-governance-addin-api= { version = "0.1.1" }
spl-governance-tools= { version = "0.1.2" }
spl-token = { path = "../../solana-program-library/token/program", version = "3.3", features = [ "no-entrypoint" ] }
spl-governance-addin-api= { path = "../../solana-program-library/governance/addin-api", version = "0.1.1" }
spl-governance-tools= { path = "../../solana-program-library/governance/tools", version = "0.1.2" }
thiserror = "1.0"
cfg-if = { version = "1.0" }

Expand Down
27 changes: 12 additions & 15 deletions addin-vesting/program/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
[package]
name = "token-vesting"
name = "spl-governance-addin-vesting"
version = "0.1.0"
authors = ["Elliott Benisty <[email protected]>", "Lucas Chaumeny <[email protected]>"]
edition = "2018"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[workspace]
members = [
"fuzz"
]
#[workspace]
#members = [
# "fuzz"
#]

[features]
no-entrypoint = []
Expand All @@ -22,20 +21,18 @@ 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"] }
solana-program = "1.9.9"
spl-token = { version = "3.2", 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" }
spl-governance-addin-api = { path="/mnt/working/solana/solana-program-library.git/governance/addin-api", version = "0.1.1" }
spl-governance = { path="../../solana-program-library/governance/program", features = ["no-entrypoint"] }
spl-governance-tools = { path="../../solana-program-library/governance/tools", version = "0.1.2" }
spl-governance-addin-api = { path="../../solana-program-library/governance/addin-api", version = "0.1.1" }
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"
solana-sdk = "1.9.9"
solana-program-test = "1.9.9"
tokio = { version = "1.0", features = ["macros"]}
hex = "0.4"

Expand Down
1 change: 1 addition & 0 deletions solana-program-library
Submodule solana-program-library added at 762c58

0 comments on commit 9b6abcb

Please sign in to comment.