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.

Sign up for GitHub

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

semi-fungible token #349

Merged
merged 35 commits into from
Nov 19, 2021
Merged

semi-fungible token #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
931927c
stacked-poxl-pool added (#332)
fiftyeightandeight Nov 8, 2021
2683bf7
stacking-pool connected to alex-staking
fiftyeightandeight Nov 8, 2021
e128464
working
fiftyeightandeight Nov 12, 2021
39790a6
working
fiftyeightandeight Nov 12, 2021
971e980
initial coding done - test cases to be added
fiftyeightandeight Nov 12, 2021
de6418a
working
fiftyeightandeight Nov 13, 2021
90b8003
working
fiftyeightandeight Nov 13, 2021
b41b1d6
working
fiftyeightandeight Nov 14, 2021
9591e0e
working
fiftyeightandeight Nov 15, 2021
0cda6fc
yield-token-pool test passes
fiftyeightandeight Nov 15, 2021
b0ffac7
Added contract calls in models for minting.
SaadTahirTintash Nov 15, 2021
b5de0c3
Fixed the bugs in test files
SaadTahirTintash Nov 15, 2021
e021f22
Changed the error code to match gitbook
SaadTahirTintash Nov 15, 2021
74bc347
fixed-weight-pool test passes
fiftyeightandeight Nov 15, 2021
a12eb02
fixed-weight-pool test passes
fiftyeightandeight Nov 15, 2021
9b6d487
Fixed the error calls and refactored the names
SaadTahirTintash Nov 16, 2021
65aeeab
Merge branch 'feat/semi-fungible-token' of https://github.com/alexgo-…
SaadTahirTintash Nov 16, 2021
418056c
clarinet test passes
fiftyeightandeight Nov 16, 2021
f8f41a0
clarinet test passes
fiftyeightandeight Nov 16, 2021
ee4eb21
merged with dev
fiftyeightandeight Nov 16, 2021
85ec154
cmerged with dev
fiftyeightandeight Nov 17, 2021
2534570
merged with feat/semi-fungible-token
fiftyeightandeight Nov 17, 2021
758f3f5
Implements feature #352
SaadTahirTintash Nov 17, 2021
1fe128c
Fixes #351 of Remove unnecessary/unused error codes from contracts
SaadTahirTintash Nov 17, 2021
f84ac09
get-decimals now implements the trait with uint as parameter
SaadTahirTintash Nov 17, 2021
c6a4bc9
working
fiftyeightandeight Nov 17, 2021
cedbe74
initial coding of alex-futures-pool done. test cases to be added
fiftyeightandeight Nov 18, 2021
faf197c
minor updates
fiftyeightandeight Nov 18, 2021
b75b110
minor updates
fiftyeightandeight Nov 18, 2021
a25cb84
alex-futures-pool added
fiftyeightandeight Nov 18, 2021
4e3c89e
Merge branch 'feat/stacked-poxl-pool' into feat/semi-fungible-token
fiftyeightandeight Nov 18, 2021
fed0591
merged with feat/stacked-poxl-pool
fiftyeightandeight Nov 18, 2021
9ee5a9b
Removed unused code from contracts
SaadTahirTintash Nov 18, 2021
3aa1087
conflict fixed
fiftyeightandeight Nov 19, 2021
2cd346b
Merge branch 'feat/semi-fungible-token' of https://github.com/alexgo-…
fiftyeightandeight Nov 19, 2021
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
206 changes: 71 additions & 135 deletions clarity/Clarinet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,41 +2,45 @@
name = "alex-v1"
requirements = []

[contracts.trait-semi-fungible-token]
path = "contracts/traits/trait-semi-fungible-token.clar"
depends_on = []

[contracts.margin-helper]
path = "contracts/helpers/margin-helper.clar"
depends_on = ["trait-sip-010", "trait-yield-token", "trait-flash-loan-user"]
depends_on = ["trait-sip-010", "trait-flash-loan-user"]

[contracts.alex-staking-helper]
path = "contracts/helpers/alex-staking-helper.clar"
depends_on = ["alex-reserve-pool"]

[contracts.alex-reserve-pool]
path = "contracts/pool/alex-reserve-pool.clar"
depends_on = ["trait-ownable", "trait-pool-token", "alex-vault"]
depends_on = ["trait-ownable", "trait-sip-010", "alex-vault"]

[contracts.alex-futures-pool]
path = "contracts/pool/alex-futures-pool.clar"
depends_on = ["trait-ownable", "token-alex", "trait-semi-fungible-token", "trait-multisig-vote", "alex-reserve-pool"]

[contracts.alex-vault]
path = "contracts/alex-vault.clar"
depends_on = ["trait-vault", "trait-sip-010", "trait-flash-loan-user", "math-fixed-point", "trait-ownable", "trait-yield-token"]
depends_on = ["trait-vault", "trait-sip-010", "trait-flash-loan-user", "math-fixed-point", "trait-ownable", "trait-semi-fungible-token"]

[contracts.collateral-rebalancing-pool]
path = "contracts/pool/collateral-rebalancing-pool.clar"
depends_on = ["trait-sip-010", "trait-yield-token", "trait-vault", "math-fixed-point", "weighted-equation", "fixed-weight-pool", "token-usda", "token-alex", "alex-reserve-pool", "yield-token-pool"]
depends_on = ["trait-sip-010", "trait-vault", "math-fixed-point", "weighted-equation", "fixed-weight-pool", "token-usda", "token-alex", "alex-reserve-pool", "yield-token-pool"]

[contracts.faucet]
path = "contracts/faucet.clar"
depends_on = ["token-wbtc", "token-usda", "token-t-alex", "token-wstx"]

[contracts.fixed-weight-pool]
path = "contracts/pool/fixed-weight-pool.clar"
depends_on = ["trait-sip-010", "trait-pool-token", "trait-vault", "math-fixed-point", "weighted-equation", "token-alex", "alex-reserve-pool", "token-usda", "trait-multisig-vote"]

[contracts.fwp-wbtc-usda-50-50]
path = "contracts/pool-token/fwp-wbtc-usda-50-50.clar"
depends_on = ["trait-sip-010", "trait-pool-token", "trait-ownable"]
depends_on = ["trait-sip-010", "trait-vault", "math-fixed-point", "weighted-equation", "token-alex", "alex-reserve-pool", "token-usda", "trait-multisig-vote"]

[contracts.liquidity-bootstrapping-pool]
path = "contracts/pool/liquidity-bootstrapping-pool.clar"
depends_on = ["trait-sip-010", "trait-pool-token", "trait-vault", "math-fixed-point", "weighted-equation", "token-alex", "alex-reserve-pool", "token-usda", "fixed-weight-pool", "trait-multisig-vote"]
depends_on = ["trait-sip-010", "trait-vault", "math-fixed-point", "weighted-equation", "token-alex", "alex-reserve-pool", "token-usda", "fixed-weight-pool", "trait-multisig-vote"]

[contracts.math-fixed-point]
path = "contracts/lib/math-fixed-point.clar"
Expand All @@ -54,29 +58,25 @@ depends_on = ["math-new-log-exp"]
path = "contracts/new-lib/math-new-log-exp.clar"
depends_on = []

[contracts.multisig-fwp-wbtc-usda-50-50]
path = "contracts/multisig/multisig-fwp-wbtc-usda-50-50.clar"
depends_on = []

[contracts.token-alex]
path = "contracts/token/token-alex.clar"
depends_on = ["trait-pool-token", "trait-ownable"]
depends_on = ["trait-ownable", "trait-sip-010"]

[contracts.token-t-alex]
path = "contracts/token/token-t-alex.clar"
depends_on = ["trait-pool-token", "trait-ownable"]
depends_on = ["trait-ownable", "trait-sip-010"]

[contracts.token-usda]
path = "contracts/token/token-usda.clar"
depends_on = ["trait-pool-token", "trait-ownable"]
depends_on = ["trait-ownable", "trait-sip-010"]

[contracts.token-wbtc]
path = "contracts/token/token-wbtc.clar"
depends_on = ["trait-pool-token", "trait-ownable"]
depends_on = ["trait-ownable", "trait-sip-010"]

[contracts.token-wstx]
path = "contracts/token/token-wstx.clar"
depends_on = ["trait-pool-token", "trait-ownable", "alex-vault"]
depends_on = ["trait-ownable", "alex-vault", "trait-sip-010"]

[contracts.trait-flash-loan-user]
path = "contracts/traits/trait-flash-loan-user.clar"
Expand All @@ -94,10 +94,6 @@ depends_on = []
path = "contracts/traits/trait-ownable.clar"
depends_on = []

[contracts.trait-pool-token]
path = "contracts/traits/trait-pool-token.clar"
depends_on = []

[contracts.trait-sip-010]
path = "contracts/traits/trait-sip-010.clar"
depends_on = []
Expand All @@ -106,10 +102,6 @@ depends_on = []
path = "contracts/traits/trait-vault.clar"
depends_on = ["trait-sip-010", "trait-flash-loan-user"]

[contracts.trait-yield-token]
path = "contracts/traits/trait-yield-token.clar"
depends_on = []

[contracts.weighted-equation]
path = "contracts/equations/weighted-equation.clar"
depends_on = ["math-fixed-point"]
Expand All @@ -120,128 +112,72 @@ depends_on = ["math-fixed-point"]

[contracts.yield-token-pool]
path = "contracts/pool/yield-token-pool.clar"
depends_on = ["trait-sip-010", "trait-pool-token", "trait-vault", "trait-flash-loan-user", "math-fixed-point", "yield-token-equation", "trait-yield-token", "token-alex", "token-usda", "fixed-weight-pool", "alex-reserve-pool", "trait-multisig-vote"]

[contracts.yield-wbtc-59760]
path = "contracts/yield-token/yield-wbtc-59760.clar"
depends_on = ["trait-sip-010", "trait-yield-token", "token-wbtc", "trait-ownable"]

[contracts.yield-usda-59760]
path = "contracts/yield-token/yield-usda-59760.clar"
depends_on = ["trait-sip-010", "trait-yield-token", "token-usda", "trait-ownable"]

[contracts.multisig-ytp-yield-wbtc-59760-wbtc]
path = "contracts/multisig/multisig-ytp-yield-wbtc-59760-wbtc.clar"
depends_on = ["ytp-yield-wbtc-59760-wbtc", "trait-yield-token", "trait-sip-010", "yield-token-pool", "yield-wbtc-59760"]

[contracts.flash-loan-user-margin-usda-wbtc-59760]
path = "contracts/flash-loan-user-margin-usda-wbtc-59760.clar"
depends_on = ["token-usda", "token-wbtc", "yield-wbtc-59760", "key-wbtc-59760-usda", "trait-sip-010"]

[contracts.multisig-crp-wbtc-59760-usda]
path = "contracts/multisig/multisig-crp-wbtc-59760-usda.clar"
depends_on = ["yield-wbtc-59760", "key-wbtc-59760-usda", "token-wbtc", "token-usda", "trait-sip-010"]

[contracts.multisig-crp-wbtc-59760-wbtc]
path = "contracts/multisig/multisig-crp-wbtc-59760-wbtc.clar"
depends_on = ["yield-wbtc-59760", "key-wbtc-59760-wbtc", "token-wbtc", "trait-sip-010"]

[contracts.key-wbtc-59760-usda]
path = "contracts/key-token/key-wbtc-59760-usda.clar"
depends_on = ["trait-sip-010", "trait-yield-token", "token-wbtc", "trait-ownable"]
depends_on = ["trait-sip-010", "trait-vault", "trait-flash-loan-user", "math-fixed-point", "yield-token-equation", "trait-semi-fungible-token", "token-alex", "token-usda", "fixed-weight-pool", "alex-reserve-pool", "trait-multisig-vote"]

[contracts.key-wbtc-59760-wbtc]
path = "contracts/key-token/key-wbtc-59760-wbtc.clar"
depends_on = ["trait-sip-010", "trait-yield-token", "token-wbtc", "trait-ownable"]

[contracts.ytp-yield-wbtc-59760-wbtc]
path = "contracts/pool-token/ytp-yield-wbtc-59760-wbtc.clar"
depends_on = ["trait-sip-010", "trait-pool-token", "trait-ownable"]

[contracts.multisig-crp-wbtc-79760-usda]
path = "contracts/multisig/multisig-crp-wbtc-79760-usda.clar"
depends_on = ["yield-wbtc-79760", "key-wbtc-79760-usda", "token-wbtc", "token-usda", "trait-sip-010"]

[contracts.yield-wbtc-79760]
path = "contracts/yield-token/yield-wbtc-79760.clar"
depends_on = ["trait-sip-010", "trait-yield-token", "token-wbtc", "trait-ownable"]

[contracts.multisig-ytp-yield-wbtc-79760-wbtc]
path = "contracts/multisig/multisig-ytp-yield-wbtc-79760-wbtc.clar"
depends_on = ["ytp-yield-wbtc-79760-wbtc", "trait-yield-token", "trait-sip-010", "yield-token-pool", "yield-wbtc-79760"]

[contracts.key-wbtc-79760-usda]
path = "contracts/key-token/key-wbtc-79760-usda.clar"
depends_on = ["trait-sip-010", "trait-yield-token", "token-wbtc", "trait-ownable"]

[contracts.ytp-yield-wbtc-79760-wbtc]
path = "contracts/pool-token/ytp-yield-wbtc-79760-wbtc.clar"
depends_on = ["trait-sip-010", "trait-pool-token", "trait-ownable"]

[contracts.yield-usda-23040]
path = "contracts/yield-token/yield-usda-23040.clar"
depends_on = ["trait-sip-010", "trait-yield-token", "token-usda", "trait-ownable"]

[contracts.flash-loan-user-margin-wbtc-usda-23040]
path = "contracts/flash-loan-user-margin-wbtc-usda-23040.clar"
depends_on = ["token-usda", "token-wbtc", "yield-usda-23040", "key-usda-23040-wbtc", "trait-sip-010"]

[contracts.key-usda-23040-wbtc]
path = "contracts/key-token/key-usda-23040-wbtc.clar"
depends_on = ["trait-sip-010", "trait-yield-token", "token-wbtc", "trait-ownable"]

[contracts.ytp-yield-usda-23040-usda]
path = "contracts/pool-token/ytp-yield-usda-23040-usda.clar"
depends_on = ["trait-sip-010", "trait-pool-token", "trait-ownable"]

[contracts.multisig-ytp-yield-usda-23040-usda]
path = "contracts/multisig/multisig-ytp-yield-usda-23040-usda.clar"
depends_on = ["ytp-yield-usda-23040-usda", "trait-yield-token", "trait-sip-010", "yield-token-pool", "yield-usda-23040"]

[contracts.multisig-crp-usda-23040-wbtc]
path = "contracts/multisig/multisig-crp-usda-23040-wbtc.clar"
depends_on = ["yield-usda-23040", "key-usda-23040-wbtc", "token-wbtc", "token-usda", "trait-sip-010"]
[contracts.fwp-wbtc-usda-50-50]
path = "contracts/pool-token/fwp-wbtc-usda-50-50.clar"
depends_on = ["trait-sip-010", "trait-ownable"]

[contracts.lbp-alex-usda-90-10]
path = "contracts/pool-token/lbp-alex-usda-90-10.clar"
depends_on = ["trait-sip-010", "trait-pool-token", "trait-ownable"]
depends_on = ["trait-sip-010", "trait-ownable"]

[contracts.ytp-yield-usda]
path = "contracts/pool-token/ytp-yield-usda.clar"
depends_on = ["trait-ownable", "trait-semi-fungible-token"]

[contracts.multisig-fwp-wbtc-usda-50-50]
path = "contracts/multisig/multisig-fwp-wbtc-usda-50-50.clar"
depends_on = []

[contracts.multisig-lbp-alex-usda-90-10]
path = "contracts/multisig/multisig-lbp-alex-usda-90-10.clar"
depends_on = []

[contracts.yield-wbtc-80875]
path = "contracts/yield-token/yield-wbtc-80875.clar"
depends_on = ["trait-sip-010", "trait-yield-token", "token-wbtc", "trait-ownable"]
[contracts.multisig-crp-usda-wbtc]
path = "contracts/multisig/multisig-crp-usda-wbtc.clar"
depends_on = ["yield-usda", "key-usda-wbtc"]

[contracts.multisig-crp-wbtc-wbtc]
path = "contracts/multisig/multisig-crp-wbtc-wbtc.clar"
depends_on = ["yield-wbtc", "key-wbtc-wbtc"]

[contracts.multisig-crp-wbtc-usda]
path = "contracts/multisig/multisig-crp-wbtc-usda.clar"
depends_on = ["yield-wbtc", "key-wbtc-usda"]

[contracts.multisig-ytp-yield-usda]
path = "contracts/multisig/multisig-ytp-yield-usda.clar"
depends_on = ["ytp-yield-usda", "yield-usda"]

[contracts.multisig-ytp-yield-wbtc-80875-wbtc]
path = "contracts/multisig/multisig-ytp-yield-wbtc-80875-wbtc.clar"
depends_on = ["ytp-yield-wbtc-80875-wbtc", "trait-yield-token", "trait-sip-010", "yield-token-pool", "yield-wbtc-80875"]
[contracts.key-usda-wbtc]
path = "contracts/key-token/key-usda-wbtc.clar"
depends_on = ["trait-ownable", "trait-semi-fungible-token"]

[contracts.ytp-yield-wbtc-80875-wbtc]
path = "contracts/pool-token/ytp-yield-wbtc-80875-wbtc.clar"
depends_on = ["trait-sip-010", "trait-pool-token", "trait-ownable"]
[contracts.key-wbtc-usda]
path = "contracts/key-token/key-wbtc-usda.clar"
depends_on = ["trait-ownable", "trait-semi-fungible-token"]

[contracts.yield-usda-51840]
path = "contracts/yield-token/yield-usda-51840.clar"
depends_on = ["trait-sip-010", "trait-yield-token", "token-usda", "trait-ownable"]
[contracts.key-wbtc-wbtc]
path = "contracts/key-token/key-wbtc-wbtc.clar"
depends_on = ["trait-ownable", "trait-semi-fungible-token"]

[contracts.flash-loan-user-margin-wbtc-usda-51840]
path = "contracts/flash-loan-user-margin-wbtc-usda-51840.clar"
depends_on = ["token-usda", "token-wbtc", "yield-usda-51840", "key-usda-51840-wbtc", "trait-sip-010"]
[contracts.yield-usda]
path = "contracts/yield-token/yield-usda.clar"
depends_on = ["trait-ownable", "trait-semi-fungible-token"]

[contracts.key-usda-51840-wbtc]
path = "contracts/key-token/key-usda-51840-wbtc.clar"
depends_on = ["trait-sip-010", "trait-yield-token", "token-wbtc", "trait-ownable"]
[contracts.yield-wbtc]
path = "contracts/yield-token/yield-wbtc.clar"
depends_on = ["trait-ownable", "trait-semi-fungible-token"]

[contracts.ytp-yield-usda-51840-usda]
path = "contracts/pool-token/ytp-yield-usda-51840-usda.clar"
depends_on = ["trait-sip-010", "trait-pool-token", "trait-ownable"]
[contracts.multisig-ytp-yield-wbtc]
path = "contracts/multisig/multisig-ytp-yield-wbtc.clar"
depends_on = ["ytp-yield-wbtc", "yield-wbtc"]

[contracts.multisig-ytp-yield-usda-51840-usda]
path = "contracts/multisig/multisig-ytp-yield-usda-51840-usda.clar"
depends_on = ["ytp-yield-usda-51840-usda", "trait-yield-token", "trait-sip-010", "yield-token-pool", "yield-usda-51840"]
[contracts.ytp-yield-wbtc]
path = "contracts/pool-token/ytp-yield-wbtc.clar"
depends_on = ["trait-ownable", "trait-semi-fungible-token"]

[contracts.multisig-crp-usda-51840-wbtc]
path = "contracts/multisig/multisig-crp-usda-51840-wbtc.clar"
depends_on = ["yield-usda-51840", "key-usda-51840-wbtc", "token-wbtc", "token-usda", "trait-sip-010"]
[contracts.flash-loan-user-margin-usda-wbtc]
path = "contracts/flash-loan-user-margin-usda-wbtc.clar"
depends_on = ["trait-sip-010", "trait-flash-loan-user", "yield-usda", "key-usda-wbtc"]
Loading