spl: change serum-dex to openbook-dex (#2308)
* Change serum-dex by openbook-dex * Change serum-dex by openbook-dex in tests * Fix swap * Fix cfo * Downgrade openbook * Disable cfo and update changelog * Revert lock file * minor grammar * update the pubkey to open dex * Remove @solana/web3.js from ts package.json Co-authored-by: Henry-E <henry.elder@adaptcentre.ie> Co-authored-by: henrye <henry@notanemail>
This commit is contained in:
parent
b662ff1460
commit
fad05805d8
|
@ -255,7 +255,7 @@ jobs:
|
|||
path: tests/interface
|
||||
- cmd: cd tests/lockup && anchor test --skip-lint
|
||||
path: tests/lockup
|
||||
- cmd: cd tests/swap/deps/serum-dex/dex && cargo build-bpf -- --locked && cd ../../../ && anchor test --skip-lint
|
||||
- cmd: cd tests/swap/deps/openbook-dex/dex && cargo build-bpf -- --locked && cd ../../../ && anchor test --skip-lint
|
||||
path: tests/swap
|
||||
- cmd: cd tests/escrow && anchor test --skip-lint && npx tsc --noEmit
|
||||
path: tests/escrow
|
||||
|
@ -279,8 +279,8 @@ jobs:
|
|||
path: tests/chat
|
||||
- cmd: cd tests/ido-pool && anchor test --skip-lint
|
||||
path: tests/ido-pool
|
||||
- cmd: cd tests/cfo && anchor run test-with-build && cd deps/stake && git checkout Cargo.lock && cd ../swap && git checkout Cargo.lock
|
||||
path: tests/cfo
|
||||
# - cmd: cd tests/cfo && anchor run test-with-build && cd deps/stake && git checkout Cargo.lock && cd ../swap && git checkout Cargo.lock
|
||||
# path: tests/cfo
|
||||
- cmd: cd tests/auction-house && yarn --frozen-lockfile && anchor test --skip-lint && git checkout Cargo.lock
|
||||
path: tests/auction-house
|
||||
- cmd: cd tests/floats && yarn --frozen-lockfile && anchor test --skip-lint && npx tsc --noEmit
|
||||
|
|
|
@ -365,7 +365,7 @@ jobs:
|
|||
path: tests/interface
|
||||
- cmd: cd tests/lockup && anchor test --skip-lint
|
||||
path: tests/lockup
|
||||
- cmd: cd tests/swap/deps/serum-dex/dex && cargo build-bpf -- --locked && cd ../../../ && anchor test --skip-lint
|
||||
- cmd: cd tests/swap/deps/openbook-dex/dex && cargo build-bpf -- --locked && cd ../../../ && anchor test --skip-lint
|
||||
path: tests/swap
|
||||
- cmd: cd tests/escrow && anchor test --skip-lint && npx tsc --noEmit
|
||||
path: tests/escrow
|
||||
|
@ -391,8 +391,8 @@ jobs:
|
|||
path: tests/chat
|
||||
- cmd: cd tests/ido-pool && anchor test --skip-lint
|
||||
path: tests/ido-pool
|
||||
- cmd: cd tests/cfo && anchor run test-with-build && cd deps/stake && git checkout Cargo.lock && cd ../swap && git checkout Cargo.lock
|
||||
path: tests/cfo
|
||||
# - cmd: cd tests/cfo && anchor run test-with-build && cd deps/stake && git checkout Cargo.lock && cd ../swap && git checkout Cargo.lock
|
||||
# path: tests/cfo
|
||||
- cmd: cd tests/auction-house && yarn --frozen-lockfile && anchor test --skip-lint && git checkout Cargo.lock
|
||||
path: tests/auction-house
|
||||
- cmd: cd tests/floats && yarn --frozen-lockfile && anchor test --skip-lint && npx tsc --noEmit
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
[submodule "examples/swap/deps/serum-dex"]
|
||||
path = tests/swap/deps/serum-dex
|
||||
url = https://github.com/project-serum/serum-dex
|
||||
[submodule "examples/cfo/deps/serum-dex"]
|
||||
path = tests/cfo/deps/serum-dex
|
||||
url = https://github.com/project-serum/serum-dex
|
||||
[submodule "examples/swap/deps/openbook-dex"]
|
||||
path = tests/swap/deps/openbook-dex
|
||||
url = https://github.com/openbook-dex/program
|
||||
[submodule "examples/cfo/deps/openbook-dex"]
|
||||
path = tests/cfo/deps/openbook-dex
|
||||
url = https://github.com/openbook-dex/program
|
||||
[submodule "examples/cfo/deps/swap"]
|
||||
path = tests/cfo/deps/swap
|
||||
url = https://github.com/project-serum/swap.git
|
||||
|
@ -12,9 +12,6 @@
|
|||
path = tests/cfo/deps/stake
|
||||
url = https://github.com/project-serum/stake.git
|
||||
branch = armani/cfo
|
||||
[submodule "examples/permissioned-markets/deps/serum-dex"]
|
||||
path = tests/permissioned-markets/deps/serum-dex
|
||||
url = https://github.com/project-serum/serum-dex
|
||||
[submodule "tests/auction-house"]
|
||||
path = tests/auction-house
|
||||
url = https://github.com/armaniferrante/auction-house
|
||||
|
|
|
@ -19,6 +19,7 @@ The minor version will be incremented upon a breaking change and the patch versi
|
|||
- spl: Add `update_primary_sale_happened_via_token` wrapper ([#2173](https://github.com/coral-xyz/anchor/pull/2173)).
|
||||
- spl: Add `sign_metadata` and `remove_creator_verification` wrappers ([#2175](https://github.com/coral-xyz/anchor/pull/2175)).
|
||||
- spl: Add `initialize_account3` and `initialize_mint2` ([#2265](https://github.com/coral-xyz/anchor/pull/2265)).
|
||||
- spl: Change `serum-dex` to `openbook-dex` ([#2308](https://github.com/coral-xyz/anchor/pull/2308)).
|
||||
- lang: Add parsing for consts from impl blocks for IDL PDA seeds generation ([#2128](https://github.com/coral-xyz/anchor/pull/2014)).
|
||||
- lang: Account closing reassigns to system program and reallocates ([#2169](https://github.com/coral-xyz/anchor/pull/2169)).
|
||||
- ts: Add coders for SPL programs ([#2143](https://github.com/coral-xyz/anchor/pull/2143)).
|
||||
|
|
|
@ -3095,7 +3095,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "serum_dex"
|
||||
version = "0.4.0"
|
||||
source = "git+https://github.com/project-serum/serum-dex?rev=1be91f2#1be91f2863d8ecede32daaae7e768034e24bbc79"
|
||||
source = "git+https://github.com/openbook-dex/program/?rev=1be91f2#1be91f2863d8ecede32daaae7e768034e24bbc79"
|
||||
dependencies = [
|
||||
"arrayref",
|
||||
"bincode",
|
||||
|
|
|
@ -15,7 +15,6 @@ members = [
|
|||
"spl",
|
||||
]
|
||||
exclude = [
|
||||
"tests/swap/deps/serum-dex",
|
||||
"tests/cfo/deps/serum-dex",
|
||||
"tests/permissioned-markets/deps/serum-dex",
|
||||
"tests/swap/deps/openbook-dex",
|
||||
"tests/cfo/deps/openbook-dex",
|
||||
]
|
||||
|
|
|
@ -116,7 +116,7 @@ Example
|
|||
|
||||
```toml
|
||||
[[test.genesis]]
|
||||
address = "9xQeWvG816bUx9EPjHmaT23yvVM2ZWbrrpZb9PusVFin"
|
||||
address = "srmqPvymJeFKQ4zGQed1GFppgkRHL9kaELCbyksJtPX"
|
||||
program = "dex.so"
|
||||
|
||||
[[test.genesis]]
|
||||
|
|
|
@ -22,7 +22,7 @@ dex = ["serum_dex"]
|
|||
[dependencies]
|
||||
anchor-lang = { path = "../lang", version = "0.25.0", features = ["derive"] }
|
||||
borsh = { version = "^0.9", optional = true }
|
||||
serum_dex = { git = "https://github.com/project-serum/serum-dex", rev = "1be91f2", version = "0.4.0", features = ["no-entrypoint"], optional = true }
|
||||
serum_dex = { git = "https://github.com/openbook-dex/program/", rev = "1be91f2", version = "0.4.0", features = ["no-entrypoint"], optional = true }
|
||||
solana-program = "1.13.5"
|
||||
spl-token = { version = "3.5.0", features = ["no-entrypoint"], optional = true }
|
||||
spl-associated-token-account = { version = "1.1.1", features = ["no-entrypoint"], optional = true }
|
||||
|
|
|
@ -9,10 +9,10 @@ use std::num::NonZeroU64;
|
|||
pub use serum_dex;
|
||||
|
||||
#[cfg(not(feature = "devnet"))]
|
||||
anchor_lang::solana_program::declare_id!("9xQeWvG816bUx9EPjHmaT23yvVM2ZWbrrpZb9PusVFin");
|
||||
anchor_lang::solana_program::declare_id!("srmqPvymJeFKQ4zGQed1GFppgkRHL9kaELCbyksJtPX");
|
||||
|
||||
#[cfg(feature = "devnet")]
|
||||
anchor_lang::solana_program::declare_id!("DESVgJVGajEgKGXhb6XmqDHGz3VjdgP7rEVESBgxmroY");
|
||||
anchor_lang::solana_program::declare_id!("EoTcMgcDRTJVZDMZWBoU6rhYHZfkNTVEAfz3uUJRcYGj");
|
||||
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
pub fn new_order_v3<'info>(
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
**/target/types/*.ts
|
||||
cfo/deps/
|
||||
swap/deps/
|
||||
auction-house/deps/
|
|
@ -18,7 +18,7 @@ test-with-build = "anchor run build && anchor test --skip-build --skip-lint"
|
|||
#
|
||||
build = "anchor run build-deps && anchor build --skip-lint"
|
||||
build-deps = "anchor run build-dex && anchor run build-swap && anchor run build-stake"
|
||||
build-dex = "pushd deps/serum-dex/dex/ && cargo build-bpf && popd"
|
||||
build-dex = "pushd deps/openbook-dex/dex/ && cargo build-bpf && popd"
|
||||
build-swap = "cd deps/swap && pwd && anchor build --skip-lint && cd ../../"
|
||||
build-stake = "pushd deps/stake && anchor build --skip-lint && popd"
|
||||
#
|
||||
|
@ -27,8 +27,8 @@ build-stake = "pushd deps/stake && anchor build --skip-lint && popd"
|
|||
localnet = "./scripts/localnet.sh"
|
||||
|
||||
[[test.genesis]]
|
||||
address = "9xQeWvG816bUx9EPjHmaT23yvVM2ZWbrrpZb9PusVFin"
|
||||
program = "./deps/serum-dex/dex/target/deploy/serum_dex.so"
|
||||
address = "srmqPvymJeFKQ4zGQed1GFppgkRHL9kaELCbyksJtPX"
|
||||
program = "./deps/openbook-dex/dex/target/deploy/serum_dex.so"
|
||||
|
||||
[[test.genesis]]
|
||||
address = "22Y43yTVxuUkoRKdm9thyRhQ3SdgQS7c7kB6UNCiaczD"
|
||||
|
|
|
@ -3,7 +3,7 @@ members = [
|
|||
"programs/*"
|
||||
]
|
||||
exclude = [
|
||||
"deps/serum-dex",
|
||||
"deps/openbook-dex",
|
||||
"deps/stake",
|
||||
"deps/swap"
|
||||
]
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 7d1d41538417aa8721aabea9503bf9d99eab7cc4
|
|
@ -1 +0,0 @@
|
|||
Subproject commit ed9d54a717bec01de2924f6e6ca465f942b072aa
|
|
@ -21,6 +21,6 @@ anchor-lang = { path = "../../../../lang" }
|
|||
anchor-spl = { path = "../../../../spl" }
|
||||
spl-token = { version = "3.5.0", features = ["no-entrypoint"] }
|
||||
swap = { path = "../../deps/swap/programs/swap", features = ["cpi"] }
|
||||
serum_dex = { path = "../../deps/serum-dex/dex", features = ["no-entrypoint"] }
|
||||
serum_dex = { path = "../../deps/openbook-dex/dex", features = ["no-entrypoint"] }
|
||||
registry = { path = "../../deps/stake/programs/registry", features = ["cpi"] }
|
||||
lockup = { path = "../../deps/stake/programs/lockup", features = ["cpi"] }
|
||||
|
|
|
@ -11,7 +11,7 @@ const secret = JSON.parse(fs.readFileSync("./scripts/market-maker.json"));
|
|||
const MARKET_MAKER = new Account(secret);
|
||||
const PublicKey = anchor.web3.PublicKey;
|
||||
|
||||
const DEX_PID = new PublicKey("9xQeWvG816bUx9EPjHmaT23yvVM2ZWbrrpZb9PusVFin");
|
||||
const DEX_PID = new PublicKey("srmqPvymJeFKQ4zGQed1GFppgkRHL9kaELCbyksJtPX");
|
||||
|
||||
async function main() {
|
||||
const market = new PublicKey(process.argv[2]);
|
||||
|
|
|
@ -4,7 +4,7 @@ set -euo pipefail
|
|||
|
||||
source scripts/common.sh
|
||||
|
||||
DEX_PID="9xQeWvG816bUx9EPjHmaT23yvVM2ZWbrrpZb9PusVFin"
|
||||
DEX_PID="srmqPvymJeFKQ4zGQed1GFppgkRHL9kaELCbyksJtPX"
|
||||
PAYER_FILEPATH="$HOME/.config/solana/id.json"
|
||||
CRANK="/home/armaniferrante/Documents/code/src/github.com/project-serum/serum-dex/target/debug/crank"
|
||||
VALIDATOR_OUT="./validator-stdout.txt"
|
||||
|
@ -23,7 +23,7 @@ main () {
|
|||
|
||||
echo "Starting local network..."
|
||||
solana-test-validator \
|
||||
--bpf-program 9xQeWvG816bUx9EPjHmaT23yvVM2ZWbrrpZb9PusVFin ./deps/serum-dex/dex/target/deploy/serum_dex.so \
|
||||
--bpf-program srmqPvymJeFKQ4zGQed1GFppgkRHL9kaELCbyksJtPX ./deps/openbook-dex/dex/target/deploy/serum_dex.so \
|
||||
--bpf-program 22Y43yTVxuUkoRKdm9thyRhQ3SdgQS7c7kB6UNCiaczD ./deps/swap/target/deploy/swap.so \
|
||||
--bpf-program GrAkKfEpTKQuVHG2Y97Y2FF4i7y7Q5AHLK94JBy7Y5yv ./deps/stake/target/deploy/registry.so \
|
||||
--bpf-program 6ebQNeTPZ1j7k3TtkCCtEPRvG7GQsucQrZ7sSEDQi9Ks ./deps/stake/target/deploy/lockup.so \
|
||||
|
|
|
@ -8,7 +8,7 @@ const { PublicKey, SystemProgram, Keypair, SYSVAR_RENT_PUBKEY } = anchor.web3;
|
|||
const utils = require("./utils");
|
||||
const { setupStakePool } = require("./utils/stake");
|
||||
|
||||
const DEX_PID = new PublicKey("9xQeWvG816bUx9EPjHmaT23yvVM2ZWbrrpZb9PusVFin");
|
||||
const DEX_PID = new PublicKey("srmqPvymJeFKQ4zGQed1GFppgkRHL9kaELCbyksJtPX");
|
||||
const SWAP_PID = new PublicKey("22Y43yTVxuUkoRKdm9thyRhQ3SdgQS7c7kB6UNCiaczD");
|
||||
const TOKEN_PID = new PublicKey("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA");
|
||||
const REGISTRY_PID = new PublicKey(
|
||||
|
|
|
@ -18,7 +18,7 @@ const Account = web3.Account;
|
|||
const Transaction = web3.Transaction;
|
||||
const PublicKey = web3.PublicKey;
|
||||
const SystemProgram = web3.SystemProgram;
|
||||
const DEX_PID = new PublicKey("9xQeWvG816bUx9EPjHmaT23yvVM2ZWbrrpZb9PusVFin");
|
||||
const DEX_PID = new PublicKey("srmqPvymJeFKQ4zGQed1GFppgkRHL9kaELCbyksJtPX");
|
||||
const secret = JSON.parse(
|
||||
require("fs").readFileSync("./scripts/market-maker.json")
|
||||
);
|
||||
|
|
|
@ -44,10 +44,10 @@
|
|||
],
|
||||
"dependencies": {
|
||||
"@project-serum/anchor": "file:../ts/packages/anchor",
|
||||
"@project-serum/spl-associated-token-account": "file:../ts/packages/spl-associated-token-account",
|
||||
"@project-serum/spl-token": "file:../ts/packages/spl-token",
|
||||
"@project-serum/common": "^0.0.1-beta.3",
|
||||
"@project-serum/serum": "^0.13.60",
|
||||
"@project-serum/spl-associated-token-account": "file:../ts/packages/spl-associated-token-account",
|
||||
"@project-serum/spl-token": "file:../ts/packages/spl-token",
|
||||
"@solana/spl-token": "^0.1.8",
|
||||
"@solana/web3.js": "^1.68.0"
|
||||
},
|
||||
|
|
|
@ -6,8 +6,8 @@ wallet = "~/.config/solana/id.json"
|
|||
swap = "Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS"
|
||||
|
||||
[[test.genesis]]
|
||||
address = "9xQeWvG816bUx9EPjHmaT23yvVM2ZWbrrpZb9PusVFin"
|
||||
program = "./deps/serum-dex/dex/target/deploy/serum_dex.so"
|
||||
address = "srmqPvymJeFKQ4zGQed1GFppgkRHL9kaELCbyksJtPX"
|
||||
program = "./deps/openbook-dex/dex/target/deploy/serum_dex.so"
|
||||
|
||||
[scripts]
|
||||
test = "yarn run mocha -t 1000000 tests/"
|
||||
|
|
|
@ -3,5 +3,5 @@ members = [
|
|||
"programs/*"
|
||||
]
|
||||
exclude = [
|
||||
"deps/serum-dex"
|
||||
"deps/openbook-dex"
|
||||
]
|
|
@ -18,4 +18,4 @@ default = []
|
|||
[dependencies]
|
||||
anchor-lang = { path = "../../../../lang" }
|
||||
anchor-spl = { path = "../../../../spl", features = ["dex"] }
|
||||
serum_dex = { git = "https://github.com/project-serum/serum-dex", rev = "1be91f2", version = "0.4.0", features = ["no-entrypoint"] }
|
||||
serum_dex = { git = "https://github.com/openbook-dex/program", rev = "1be91f2", version = "0.4.0", features = ["no-entrypoint"] }
|
||||
|
|
|
@ -17,7 +17,7 @@ const Account = web3.Account;
|
|||
const Transaction = web3.Transaction;
|
||||
const PublicKey = web3.PublicKey;
|
||||
const SystemProgram = web3.SystemProgram;
|
||||
const DEX_PID = new PublicKey("9xQeWvG816bUx9EPjHmaT23yvVM2ZWbrrpZb9PusVFin");
|
||||
const DEX_PID = new PublicKey("srmqPvymJeFKQ4zGQed1GFppgkRHL9kaELCbyksJtPX");
|
||||
|
||||
async function setupTwoMarkets({ provider }) {
|
||||
// Setup mints with initial tokens owned by the provider.
|
||||
|
|
|
@ -17,9 +17,9 @@ describe("ProgramErrorStack", () => {
|
|||
|
||||
it("basic multiple ix", () => {
|
||||
const logs = [
|
||||
"Program 9xQeWvG816bUx9EPjHmaT23yvVM2ZWbrrpZb9PusVFin invoke [1]",
|
||||
"Program 9xQeWvG816bUx9EPjHmaT23yvVM2ZWbrrpZb9PusVFin consumed 4308 of 200000 compute units",
|
||||
"Program 9xQeWvG816bUx9EPjHmaT23yvVM2ZWbrrpZb9PusVFin success",
|
||||
"Program srmqPvymJeFKQ4zGQed1GFppgkRHL9kaELCbyksJtPX invoke [1]",
|
||||
"Program srmqPvymJeFKQ4zGQed1GFppgkRHL9kaELCbyksJtPX consumed 4308 of 200000 compute units",
|
||||
"Program srmqPvymJeFKQ4zGQed1GFppgkRHL9kaELCbyksJtPX success",
|
||||
"Program ERRM6YCMsccM22TEaPuu35KVU4iCY3GLCz4qMsKLYReE invoke [1]",
|
||||
"Program ERRM6YCMsccM22TEaPuu35KVU4iCY3GLCz4qMsKLYReE consumed 3797 of 200000 compute units",
|
||||
"Program ERRM6YCMsccM22TEaPuu35KVU4iCY3GLCz4qMsKLYReE failed: custom program error: 0x29",
|
||||
|
|
Loading…
Reference in New Issue