Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Arbitrary conditional vault #244

Merged
Show file tree
Hide file tree
Changes from 51 commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
65b549c
Add `Question` and `NewConditionalVault` structs
metaproph3t Aug 18, 2024
6c66cec
Get the vault test working
metaproph3t Aug 19, 2024
d43b26d
Add `initialize_question`
metaproph3t Aug 19, 2024
6be4f2f
Initialize a new conditional vault
metaproph3t Aug 20, 2024
d0f928e
Add `resolve_question`
metaproph3t Aug 20, 2024
667c7c6
Clean up tests and start `split_tokens`
metaproph3t Aug 21, 2024
59ed2b5
Add multiple test cases for initializing conditional vault
metaproph3t Aug 21, 2024
30cc743
Add `split_tokens`
metaproph3t Aug 21, 2024
c8a377f
Add `merge_tokens`
metaproph3t Aug 22, 2024
5956628
Add `redeem_tokens`
metaproph3t Aug 22, 2024
2a37a0a
Add redeem tests
metaproph3t Aug 22, 2024
402fff8
v0.3.0-alpha.12
metaproph3t Aug 23, 2024
0b8b2cc
Use updated versions of packages
metaproph3t Aug 23, 2024
96d5858
Remove `metadata` folder
metaproph3t Aug 23, 2024
1a87fb5
Clean up `tests`
metaproph3t Aug 23, 2024
b54ab6f
Restructure existing tests into `programs` folder
metaproph3t Aug 23, 2024
67dd51f
Structure the tests under program folders
metaproph3t Aug 23, 2024
1d9db47
Structure tests in a new way
metaproph3t Aug 23, 2024
d049365
Migrate all conditional vault unit tests over
metaproph3t Aug 23, 2024
70bb8c8
Start on conditional vault integration test
metaproph3t Aug 23, 2024
2eae261
Get start of integration test working
metaproph3t Aug 23, 2024
ab7838f
Add merging to the integration test
metaproph3t Aug 23, 2024
79b60e6
Complete integration tests for conditional vault
metaproph3t Aug 23, 2024
180bd07
Put `Question` in its own file
metaproph3t Aug 23, 2024
da260de
Add conditional mint checks
metaproph3t Aug 23, 2024
94112f4
Add back invariant checks to `split_tokens`
metaproph3t Aug 24, 2024
4d8c36e
Add invariants to `redeem_tokens`
metaproph3t Aug 24, 2024
63a53dd
Add asserts to `merge_tokens`
metaproph3t Aug 24, 2024
c6d9707
Add an assets >= liabilities invariant
metaproph3t Aug 24, 2024
c70b2dc
Add amm unit tests
metaproph3t Aug 24, 2024
ba95a6d
v0.3.0-alpha.13
metaproph3t Aug 24, 2024
c63468a
Update SDK version
metaproph3t Aug 24, 2024
5a7909f
Remove some old deps
metaproph3t Aug 24, 2024
dc6c57a
Add autocrat tests
metaproph3t Aug 24, 2024
9c50fc3
Migrate autocrat to new version of conditional vault
metaproph3t Aug 24, 2024
0d00c82
v0.3.0-alpha.14
metaproph3t Aug 24, 2024
aee2663
Update to 0.3.0-14 SDK
metaproph3t Aug 24, 2024
3c8bf6d
Final removes & lints
metaproph3t Aug 25, 2024
6966861
v0.3.0-alpha.15
metaproph3t Aug 24, 2024
daf9404
Update to v15 SDK
metaproph3t Aug 24, 2024
0640a13
Start with metadata
metaproph3t Aug 26, 2024
d0bf35f
Complete the adding of metadata
metaproph3t Aug 26, 2024
5eaa0a9
v0.3.0-alpha.16
metaproph3t Aug 26, 2024
64f1e78
Update sdk version in deps
metaproph3t Aug 26, 2024
4304a04
Test all conditional vault failure cases
metaproph3t Aug 26, 2024
6a49ff7
First stab at separating the SDK into verions
metaproph3t Aug 28, 2024
ef7d094
Use new sdk version
metaproph3t Aug 28, 2024
8e839f7
Add v0.3
metaproph3t Aug 28, 2024
a0d5942
Fix metadata URI
metaproph3t Aug 28, 2024
569b04d
v0.4.0-alpha.1
metaproph3t Aug 28, 2024
7d376cf
Use new version of SDK
metaproph3t Aug 28, 2024
cdd9812
Use `require!` over `assert!`
metaproph3t Aug 29, 2024
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
23 changes: 12 additions & 11 deletions Anchor.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
[scripts]
test = "npx mocha --import=tsx tests/main.test.ts"
propose = "yarn run ts-node scripts/initializeProposal.ts"
initialize-dao = "yarn run ts-node scripts/initializeDao.ts"
finalize = "yarn run ts-node scripts/finalizeProposal.ts"
metadata = "yarn run ts-node scripts/uploadMetadata.ts"
send-tokens = "yarn run ts-node scripts/sendTokens.ts"
crank = "yarn run ts-node scripts/crankTwap.ts"
attach-metadata = "yarn run ts-node scripts/attachMetadata.ts"
reclaim-tokens = "yarn run ts-node scripts/reclaimTokens.ts"
merge-tokens = "yarn run ts-node scripts/mergeTokens.ts"

[toolchain]

[features]
Expand All @@ -18,17 +30,6 @@ url = "https://api.apr.dev"
cluster = "Localnet"
wallet = "~/.config/solana/id.json"

[scripts]
propose = "yarn run ts-node scripts/initializeProposal.ts"
initialize-dao = "yarn run ts-node scripts/initializeDao.ts"
finalize = "yarn run ts-node scripts/finalizeProposal.ts"
metadata = "yarn run ts-node scripts/uploadMetadata.ts"
send-tokens = "yarn run ts-node scripts/sendTokens.ts"
crank = "yarn run ts-node scripts/crankTwap.ts"
attach-metadata = "yarn run ts-node scripts/attachMetadata.ts"
reclaim-tokens = "yarn run ts-node scripts/reclaimTokens.ts"
merge-tokens = "yarn run ts-node scripts/mergeTokens.ts"
test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/*.ts"

[test]
startup_wait = 5000
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

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

Loading
Loading