Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/rathe-tech/dlmm-sdk into fi…
Browse files Browse the repository at this point in the history
…x/refactor_get_bins
  • Loading branch information
shadeglare committed Dec 19, 2024
2 parents e26370d + 4d88939 commit 2291c7f
Show file tree
Hide file tree
Showing 13 changed files with 5 additions and 91 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci-pr-main-program.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jobs:
with:
files: |
programs/lb_clmm
artifacts
lb_clmm_anchor_build:
runs-on: ubuntu-latest
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci-pr-main-sdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jobs:
with:
files: |
ts-client
artifacts
sdk_test:
runs-on: ubuntu-latest
Expand Down
4 changes: 0 additions & 4 deletions Anchor.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,9 @@ program = "./artifacts/lb_clmm.so"

[scripts]
test = "yarn run ts-mocha --sort --type-check --bail -p ./tsconfig.json -t 1000000 tests/*.ts"
test-alpha-access = "anchor localnet -- --features alpha-access,localnet > /dev/null 2>&1 & sleep 2 && yarn run ts-mocha --type-check --bail -p ./tsconfig.json -t 1000000 tests/alpha_access/*.ts || kill $(pgrep solana-test-val)"
build-local = "anchor build"
deploy-local = "solana program deploy target/deploy/lb_clmm.so --keypair keys/localnet/admin-bossj3JvwiNK7pvjr149DqdtJxf2gdygbcmEPTkb2F1.json --program-id keys/localnet/program-LbVRzDTvBDEcrthxfZ4RL6yiq3uZw8bS6MwtdY6UhFQ.json"

[[test.validator.account_dir]]
directory = "./artifacts/alpha-access"

[test]
startup_wait = 50000

Expand Down
14 changes: 0 additions & 14 deletions artifacts/alpha-access/fox-federation-#3454-metadata.json

This file was deleted.

14 changes: 0 additions & 14 deletions artifacts/alpha-access/fox-federation-#3454.json

This file was deleted.

14 changes: 0 additions & 14 deletions artifacts/alpha-access/mad-lads-#1313-metadata.json

This file was deleted.

14 changes: 0 additions & 14 deletions artifacts/alpha-access/mad-lads-#1313.json

This file was deleted.

14 changes: 0 additions & 14 deletions artifacts/alpha-access/mad-lads-#5527-metadata.json

This file was deleted.

14 changes: 0 additions & 14 deletions artifacts/alpha-access/mad-lads-#5527.json

This file was deleted.

Binary file modified artifacts/lb_clmm.so
Binary file not shown.
4 changes: 2 additions & 2 deletions programs/lb_clmm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@ solana-sdk = "1.16.0"
async-trait = "0.1.52"
assert_matches = "1.5.0"
spl-associated-token-account = "1.0.3"
commons={path="../../commons"}
bincode = "1.3.3"
commons = { path = "../../commons" }
bincode = "1.3.3"
Binary file added programs/lb_clmm/tests/artifacts/lb_clmm_prod.so
Binary file not shown.
2 changes: 1 addition & 1 deletion programs/lb_clmm/tests/test_swap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use utils::*;
async fn test_swap() {
let mut test = ProgramTest::default();

test.add_program("../../artifacts/lb_clmm", lb_clmm::id(), None);
test.add_program("./tests/artifacts/lb_clmm_prod", lb_clmm::id(), None);

let lb_pair = Pubkey::from_str("EtAdVRLFH22rjWh3mcUasKFF27WtHhsaCvK27tPFFWig").unwrap();
let reserve_x = Pubkey::from_str("BmW4cCRpJwwL8maFB1AoAuEQf96t64Eq5gUvXikZardM").unwrap();
Expand Down

0 comments on commit 2291c7f

Please sign in to comment.