Skip to content

Commit

Permalink
Phoenix v1/crate boundaries (#8)
Browse files Browse the repository at this point in the history
Changes:
- Partition structs and functions into `pub(crate)` and `pub`
- Introduce a `WritableMarket` trait to create a logical separation
between read/write functionality in the market

Run clippy and add new instruction file
  • Loading branch information
jarry-xiao authored and eugene-chen committed Feb 14, 2023
1 parent 640bcdf commit 38a2129
Show file tree
Hide file tree
Showing 57 changed files with 503 additions and 464 deletions.
116 changes: 70 additions & 46 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

58 changes: 38 additions & 20 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,30 +1,48 @@
[workspace]
[package]
name = "phoenix-v1"
version = "0.1.0"
edition = "2021"
resolver = "2"
members = [
"program"
]
repository = "https://github.com/Ellipsis-Labs/phoenix-v1"
authors = ["Ellipsis Labs <[email protected]>"]
description = "On-chain order book that atomically settles trades"
license-file = "LICENSE"

[lib]
crate-type = ["cdylib", "lib"]
name = "phoenix"

[features]
no-entrypoint = []
no-idl = []
no-log-ix-name = []
cpi = ["no-entrypoint"]
default = []
test = []

[profile.release]
lto = "fat"
codegen-units = 1
overflow-checks = true

[workspace.dependencies]
spl-token = { version = "3.2.0", features = ["no-entrypoint"] }
spl-associated-token-account = { version = "1.1.1", features = [ "no-entrypoint" ] }
shank = "0.0.9"
[dependencies]
shank = "=0.0.12"
spl-token = { version = "=3.5.0", features = ["no-entrypoint"] }
spl-associated-token-account = { version = "=1.1.1", features = [ "no-entrypoint" ] }
solana-program = "=1.14.9"
solana-sdk = "=1.14.9"
borsh = "0.9.3"
bytemuck = "1.11.0"
lib-sokoban = "0.3.0"
borsh = "=0.9.3"
bytemuck = "=1.13.0"
lib-sokoban = "=0.3.0"
num_enum = "=0.5.9"
itertools = "=0.10.5"
thiserror = "=1.0.38"
ellipsis-macros = "=0.1.1"
solana-security-txt = "=1.1.0"
static_assertions = "=1.1.0"

[dev-dependencies]
rand = "0.7.3"
ellipsis-client = "=0.1.15"
ellipsis-client = "0.1.15"
tokio = { version = "1.8.4", features = ["full"] }
num_enum = "^0.5.1"
phoenix-sdk = { git = "https://github.com/Ellipsis-Labs/phoenix-sdk", rev = "bfa848b" }
itertools = "0.10.5"
thiserror = "^1.0.24"
ellipsis-macros = "0.1.1"
solana-security-txt = "1.1.0"
static_assertions = "0.1.1"
solana-sdk = "=1.14.9"
phoenix-sdk = { git = "https://github.com/Ellipsis-Labs/phoenix-sdk", rev = "adb01a3" }
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions idl/generateIdl.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
const path = require("path");
const fs = require("fs");
const programDir = path.join(__dirname, "..", "program");
const programDir = path.join(__dirname, "..");
const idlDir = __dirname;
const rootDir = path.join(__dirname, ".crates");
const cargoToml = path.join(programDir, "Cargo.toml");

const PROGRAM_NAME = "phoenix";
const PROGRAM_NAME = "phoenix_v1";

const {
rustbinMatch,
Expand Down
12 changes: 3 additions & 9 deletions idl/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
{
"name": "phoenix",
"version": "1.0.0",
"description": "SDK for phoenix",
"main": "index.ts",
"license": "MIT",
"dependencies": {
"@metaplex-foundation/rustbin": "^0.3.1"
}
"dependencies": {
"@metaplex-foundation/rustbin": "^0.3.1"
}
}
Loading

0 comments on commit 38a2129

Please sign in to comment.