Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f79756a
spike: PropAMM poc
jordy25519 Feb 26, 2026
e0aa921
wip
jordy25519 Mar 3, 2026
75318f9
hardening
jordy25519 Mar 4, 2026
ec7fc2d
fixes
jordy25519 Mar 4, 2026
a624fc2
updates
jordy25519 Mar 5, 2026
ceef2ec
fix
jordy25519 Mar 6, 2026
204442d
revert: remove large-liq-safety changes from prop-amm branch
jordy25519 Mar 9, 2026
b2f20c1
fix tests
jordy25519 Mar 9, 2026
85025cc
add unified matching (vAMM + DLOB + PropAMM) and comprehensive margin…
jordy25519 Mar 12, 2026
b52b342
add order versioning header, CU optimizations, and comprehensive test…
jordy25519 Mar 12, 2026
6650d88
fix bankrun tests and add mixed DLOB+vAMM fill tests
jordy25519 Mar 13, 2026
76bc01f
update bun.lock
jordy25519 Mar 13, 2026
9facfe0
add market/oracle order support for PropAMM matching and signed msg e…
jordy25519 Mar 13, 2026
b471727
add fee handling, order validation, and optional taker_order_id to Pr…
jordy25519 Mar 15, 2026
63c8a40
rename match_perp_order_via_prop_amm to fill_perp_order2
jordy25519 Mar 16, 2026
051b516
add correctness fixes to fill_perp_order2: margin simulation, preflig…
jordy25519 Mar 16, 2026
ba68b27
refactors + fixes
jordy25519 Mar 17, 2026
f20637e
add oracle paging system for propamm fill efficiency
jordy25519 Mar 18, 2026
a319110
use PropAMM fill event enum to distinguish
jordy25519 Mar 18, 2026
9606a4e
add propamm-sdk: Rust SDK + maker bot for PropAMM quoting
jordy25519 Mar 18, 2026
bb62fe7
oracle price cache: resizable entries, optional account, SDK admin me…
jordy25519 Mar 20, 2026
79269f6
PropAMM registry, oracle cache publish_ts, CI + SDK fixes
jordy25519 Mar 23, 2026
687bc8b
fix tests
jordy25519 Mar 23, 2026
aa566f8
Merge origin/devnet into spike/prop-amm
jordy25519 Mar 23, 2026
4be622b
fix: remove duplicate import and clean up unused deps in test files
jordy25519 Mar 23, 2026
ab2e60a
fmt
jordy25519 Mar 23, 2026
0b8e78d
fix error code order
0xahzam Mar 23, 2026
db18928
fix tests
jordy25519 Mar 24, 2026
2f63f8a
fix tests, optimize order layout
jordy25519 Mar 24, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 57 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,63 @@ jobs:
DEVNET_RPC_ENDPOINT: ${{ secrets.DEVNET_RPC_ENDPOINT }}
run: ts-mocha ./sdk/tests/ci/*

- name: Run oracle cache SDK tests
run: ts-mocha ./sdk/tests/oracles/*

propamm-tests:
name: PropAMM tests
runs-on: ubicloud
timeout-minutes: 45
steps:
- uses: actions/checkout@v2

# midprice_pino needs newer Rust than drift (solana-sdk 2.0, mollusk 0.10)
- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: stable
profile: minimal
override: true

- name: Cache build artefacts
uses: Swatinem/rust-cache@v1
with:
cache-on-failure: "true"

- uses: ./.github/actions/setup-solana/

- name: Cache Anchor CLI
id: cache-anchor
uses: actions/cache@v4
with:
path: ~/.cargo/bin/anchor
key: ${{ runner.os }}-anchor-cli-0.29.0

- name: Install Anchor CLI
if: steps.cache-anchor.outputs.cache-hit != 'true'
run: cargo install --git https://github.com/coral-xyz/anchor --tag v0.29.0 anchor-cli --locked

- name: Setup node
uses: actions/setup-node@v2
with:
node-version: "24.x.x"
registry-url: "https://registry.npmjs.org"

- name: Install dependencies
run: |
npm install -g yarn ts-mocha typescript mocha
yarn

- name: Build SDK
run: cd sdk/ && yarn && yarn build && cd ..

- name: Run midprice_pino unit tests
run: cd programs/midprice_pino && cargo test --lib && cd ../..

- name: Build midprice_pino + drift and run PropAMM bankrun tests
run: |
./test-scripts/build-midprice-pino-for-bankrun.sh --no-test
ANCHOR_WALLET=~/.config/solana/id.json ts-mocha --exit -t 120000 ./tests/propAmmCUs.ts

check-for-sdk-changes:
runs-on: ubicloud
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ sdk/src/**/*.js.map
migrations
/**/*.env
vendor
**/*/.claude
2 changes: 1 addition & 1 deletion Anchor.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cluster = "localnet"
wallet = "~/.config/solana/id.json"

[workspace]
exclude = ["programs/openbook_v2"]
exclude = ["programs/openbook_v2", "programs/midprice_pino"]

[scripts]
# to run local validator tests, use "./test-scripts/run-ts-mocha" in "test"
Expand Down
5 changes: 5 additions & 0 deletions Cargo.lock

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

4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
[workspace]
members = [
"programs/*",
"crates/*",
]
exclude = [
"deps/serum-dex"
"deps/serum-dex",
"programs/midprice_pino"
]
resolver = "2"

Expand Down
19 changes: 4 additions & 15 deletions bun.lock

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

11 changes: 11 additions & 0 deletions crates/midprice_book_view/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[package]
name = "midprice_book_view"
version = "0.1.0"
edition = "2021"

[features]
test-utils = []

[lib]
name = "midprice_book_view"
path = "src/lib.rs"
Loading
Loading