Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
b57b606
emmode init (WIP)
jgur-psyops Mar 28, 2025
dd2b182
More emode boilerplate
jgur-psyops Mar 31, 2025
85f2393
Emode setup and cargo tests
jgur-psyops Mar 31, 2025
4fe393c
Emode reconcilliation mechanism
jgur-psyops Apr 1, 2025
c6cb917
Refactor risk engine loading to remove wasteful bank multiple loads
jgur-psyops Apr 1, 2025
a8c7c36
Begin boilerplate test setup
jgur-psyops Apr 1, 2025
fc19c68
More emode boilerplate, admin config setup
jgur-psyops Apr 1, 2025
0e300f9
Happy path emode setup
jgur-psyops Apr 1, 2025
2e44b54
Minor doc update, use reduced weights in emode test suite
jgur-psyops Apr 2, 2025
3194f27
emode config testing and borrow test setup
jgur-psyops Apr 2, 2025
b2f3df2
Happy path testing for emode complete
jgur-psyops Apr 3, 2025
f6497ad
Minor doc update
jgur-psyops Apr 3, 2025
af8f677
More economic tests for emode enabled
jgur-psyops Apr 4, 2025
198de5c
Removed origination fees from emode test suite, liability math now ch…
jgur-psyops Apr 5, 2025
1864a7d
Test for second asset borrow when asset class is superior to existing…
jgur-psyops Apr 5, 2025
9de4899
Doc and lint fixes
jgur-psyops Apr 7, 2025
6ad4f9e
Liquidation test WIP
jgur-psyops Apr 9, 2025
d3a8f4a
Liquidation test complete
jgur-psyops Apr 10, 2025
d4bc5c3
Moar liquidation tests of rare footgun edge cases
jgur-psyops Apr 10, 2025
f0594ff
Minor doc update, fix lint
jgur-psyops Apr 11, 2025
1a16daa
Minor doc fixes
jgur-psyops Apr 11, 2025
3874f8b
README guide for emode admin
jgur-psyops Apr 15, 2025
1039681
Minor doc update
jgur-psyops Apr 15, 2025
66fae6c
Emode rust tests (#324)
IliaZyrin Apr 17, 2025
0a49436
attempt to fix CI
IliaZyrin Apr 17, 2025
f1405f5
ABSOLUTE INSANITY: ITS A START
jgur-psyops Apr 17, 2025
61f30c8
Probably fixed swb alignment issues, life is pain.
jgur-psyops Apr 18, 2025
c9e69ce
Swb stack overflow fix, compiler settings optimization to make tests …
jgur-psyops Apr 19, 2025
ab31920
minor doc update
jgur-psyops Apr 19, 2025
57ee506
Anchor tests now working as intended
jgur-psyops Apr 22, 2025
5bfd5f2
Now with anchor 0.31.1 proc macro fix enabled
jgur-psyops Apr 22, 2025
498b351
Fix CI pipeline attempt 1
jgur-psyops Apr 23, 2025
331a103
Fix CI pipeline attempt 2
jgur-psyops Apr 23, 2025
4371fc7
The triumphant return of test transfer hook and token22 fixtures to t…
jgur-psyops Apr 23, 2025
fe512ca
Update fuzz, update guide, lint fixes
jgur-psyops Apr 23, 2025
35e78bc
Fix fuzz attempt 1
jgur-psyops Apr 23, 2025
deb20ee
Fix lint, remove transmute in test utils
jgur-psyops Apr 23, 2025
67a17e7
Restore missing token exetensions test
jgur-psyops Apr 23, 2025
8feac4f
Merge branch '0.1.3-main' into anchor-update
jgur-psyops Apr 24, 2025
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
2 changes: 1 addition & 1 deletion .github/actions/setup-solana-cli/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ runs:
# ~/.cache/solana/
# ~/.local/share/solana/
# key: solana-${{ runner.os }}-v0000-${{ env.SOLANA_CLI_VERSION }}-${{ env.RUST_TOOLCHAIN }}
- run: sh -c "$(curl -sSfL https://release.solana.com/v${{ env.SOLANA_CLI_VERSION }}/install)"
- run: sh -c "$(curl -sSfL https://release.anza.xyz/v${{ env.SOLANA_CLI_VERSION }}/install)"
shell: bash
# if: steps.cache-solana.outputs.cache-hit != 'true'
- run: echo "/home/runner/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH
Expand Down
27 changes: 7 additions & 20 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ defaults:
working-directory: .

env:
RUST_TOOLCHAIN: 1.75.0
SOLANA_CLI_VERSION: 1.18.17
ANCHOR_CLI_VERSION: 0.30.1
RUST_TOOLCHAIN: 1.79.0
SOLANA_CLI_VERSION: 2.1.20
ANCHOR_CLI_VERSION: 0.31.1
ANCHOR_SHA: e6d7dafe12da661a36ad1b4f3b5970e8986e5321
CARGO_TERM_COLOR: always

Expand Down Expand Up @@ -125,14 +125,17 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: "20.10.0"
node-version: "23.0.0"

- uses: ./.github/actions/setup-common/
- uses: ./.github/actions/setup-anchor-cli/

- name: Install Node.js dependencies
run: yarn install

- name: Build transfer hook program
run: anchor build -p test_transfer_hook --no-idl

- name: Build marginfi program
run: anchor build -p marginfi --no-idl -- --no-default-features

Expand Down Expand Up @@ -191,19 +194,3 @@ jobs:
echo "Test run completed successfully without extraneous errors."
exit 0
fi

# - name: Start Solana Test Validator
# run: |
# solana-test-validator --reset --limit-ledger-size 1000 \

# - name: Wait for Validator to Start
# run: sleep 60

# - name: Deploy Liquidity Incentive Program
# run: solana program deploy --program-id Lip1111111111111111111111111111111111111111 target/deploy/liquidity_incentive_program.so

# - name: Deploy Marginfi Program
# run: solana program deploy --program-id 2jGhuVUuy3umdzByFx8sNWUAaf5vaeuDm78RDPEnhrMr target/deploy/marginfi.so

# - name: Deploy Mocks Program
# run: solana program deploy --program-id 5XaaR94jBubdbrRrNW7DtRvZeWvLhSHkEGU3jHTEXV3C target/deploy/mocks.so
14 changes: 11 additions & 3 deletions Anchor.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
[toolchain]
anchor_version = "0.30.1"
solana_version = "1.18.17"
anchor_version = "0.31.1"
solana_version = "2.1.20"
# Getting "thread 'main' panicked at cli/src/lib.rs:545:18:"? Check your toolchain matches the above.

[workspace]
members = ["programs/marginfi", "programs/mocks", "programs/test_transfer_hook"]
# exclude = [
# "programs/test_transfer_hook",
# "programs/liquidity-incentive-program",
# "programs/brick",
# ]

[features]
resolution = true
skip-lint = false
Expand All @@ -14,7 +22,7 @@ mocks = "5XaaR94jBubdbrRrNW7DtRvZeWvLhSHkEGU3jHTEXV3C"
spl_single_pool = "SVSPxpvHdN29nkVg9rPapPNDddN5DipNLRUFhyjFThE" # cloned from solana-labs repo (see below)

[programs.mainnet]
liquidity_incentive_program = "LipsxuAkFkwa4RKNzn51wAsW7Dedzt1RNHMkTkDEZUW"
# liquidity_incentive_program = "LipsxuAkFkwa4RKNzn51wAsW7Dedzt1RNHMkTkDEZUW"
marginfi = "MFv2hWf31Z9kbCa1snEPYctwafyhdvnV7FZnsebVacA"

[registry]
Expand Down
Loading
Loading