Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
157 commits
Select commit Hold shift + click to select a range
745508c
bootstrap irs module
jununifi Nov 14, 2023
3bb5b5c
Add CLI commands argument parser for the queries and txs
jununifi Nov 14, 2023
8b998f7
update for irs implementation
jununifi Nov 20, 2023
9d77921
MintPtYtPair addition & followings
jununifi Nov 21, 2023
caf51ac
update on irs module
jununifi Nov 27, 2023
9ee1b11
RegisterInterestRateSwapVault update
jununifi Nov 28, 2023
c8d4891
update for RedeemPtYtPair
jununifi Nov 29, 2023
b607834
feat: query vault
Senna46 Nov 29, 2023
79266ac
update on swap logic & prototype lp unit test
jununifi Dec 1, 2023
562e67a
feat: irs test (#711)
kimurayu45z Dec 1, 2023
c0ff5e0
Add more cases and configuration on deposit liquidity unit test
jununifi Dec 1, 2023
668765f
add template for swap unit test
jununifi Dec 1, 2023
bd2dce9
fix: invalid authrity
Senna46 Dec 1, 2023
4ab521d
fix: separate logic
Senna46 Dec 1, 2023
8ec0b5b
fix: invalid else
Senna46 Dec 1, 2023
ffd4856
feat: deputyDeposit
Senna46 Dec 1, 2023
808751c
Merge pull request #712 from UnUniFi/irs-ibc
Senna46 Dec 1, 2023
7d6d11b
Add test for WithdrawFromLiquidityPool & resolve issues in add/remove…
jununifi Dec 4, 2023
cb4ea99
Merge branch 'irs_module' of github.com:UnUniFi/chain into irs_module
jununifi Dec 4, 2023
6908c3f
Add basic unit test for SwapExactAmountIn
jununifi Dec 4, 2023
e68fdee
feat: test init
Senna46 Dec 5, 2023
9a65df1
feat: joinpool noswap
Senna46 Dec 5, 2023
13c41b8
feat: maxExactRatioJoin
Senna46 Dec 5, 2023
918463a
feat: calcExitPool
Senna46 Dec 5, 2023
7785527
fix: typo
Senna46 Dec 5, 2023
3e3fff2
feat: swapout amt
Senna46 Dec 5, 2023
457bfe7
chore: bug comment
Senna46 Dec 5, 2023
fc902e5
fix: pool solveConstantFunctionInvariant
Senna46 Dec 6, 2023
dc47c9b
fix: issue amount
Senna46 Dec 6, 2023
860b79d
fix: error AmountOf invalid denom
Senna46 Dec 6, 2023
ce570e3
chore: delete scalingFactors
Senna46 Dec 6, 2023
1f18c98
feat: test apply swap
Senna46 Dec 6, 2023
67c548b
Merge pull request #713 from UnUniFi/types_test
Senna46 Dec 6, 2023
897fb64
feat: getMaximalNoSwapLPAmount
Senna46 Dec 8, 2023
af4e94b
fix: pool swap & impl test
Senna46 Dec 8, 2023
b2b38d3
fix: err msg
Senna46 Dec 11, 2023
e7d99f6
feat: swap_test complete
Senna46 Dec 11, 2023
072e8ac
fix: swap err handling order
Senna46 Dec 11, 2023
3e42270
chore: check err
Senna46 Dec 11, 2023
9db0974
feat: refactor & add simulate function
Senna46 Dec 11, 2023
4625c89
chore: change func name
Senna46 Dec 11, 2023
ba254cc
chore: unused variables
Senna46 Dec 11, 2023
a76cb1d
chore: func name
Senna46 Dec 11, 2023
ef70ccf
feat: new error
Senna46 Dec 11, 2023
f2e73c9
feat: calc pt amount
Senna46 Dec 11, 2023
9c64ff8
feat: swap UT to YT impl
Senna46 Dec 11, 2023
78dfd37
chore: fix ci
Senna46 Dec 11, 2023
637f9cf
Merge pull request #714 from UnUniFi/types_test
Senna46 Dec 11, 2023
dcd27cc
feat: ut to yt test
Senna46 Dec 12, 2023
8c6dd1f
fix: refactor func & disable test
Senna46 Dec 12, 2023
42b96d0
feat: swap YT to UT
Senna46 Dec 12, 2023
5d332b6
feat: separate RedeemYtAmount func
Senna46 Dec 12, 2023
154b0ef
chore: test
Senna46 Dec 12, 2023
0bb8e40
Merge branch 'irs_module' of https://github.com/UnUniFi/chain into ir…
Senna46 Dec 13, 2023
e4e6ca2
feat: estimate swap query
Senna46 Dec 13, 2023
8bc22b5
feat: estimate mint
Senna46 Dec 13, 2023
0761128
Merge branch 'types_test' of https://github.com/UnUniFi/chain into ir…
Senna46 Dec 13, 2023
d271dc6
feat: all tranche query
Senna46 Dec 13, 2023
37b7a4d
feat: redeem YT query
Senna46 Dec 13, 2023
a8300e4
fix: query contract
Senna46 Dec 13, 2023
565ab0e
feat: update swagger
Senna46 Dec 13, 2023
d7a5659
fix: query var
Senna46 Dec 13, 2023
118f36d
feat: deposit pool query
Senna46 Dec 14, 2023
a6c6f70
feat: pool redeem query
Senna46 Dec 14, 2023
107cc71
fix: mint liq query
Senna46 Dec 18, 2023
77b7451
fix: query name
Senna46 Dec 19, 2023
e34b6ea
Merge pull request #716 from UnUniFi/irs_query
Senna46 Dec 19, 2023
18f2276
Merge pull request #715 from UnUniFi/types_test
Senna46 Dec 19, 2023
5d3e01e
fix: yt amount redeem
Senna46 Dec 19, 2023
13998f7
feat: new query
Senna46 Dec 19, 2023
6b9f7d4
Merge pull request #717 from UnUniFi/fix/redeem-yt
Senna46 Dec 19, 2023
e702ca3
feat: query YT swap
Senna46 Dec 19, 2023
5d4ea7f
feat: delete old query
Senna46 Dec 19, 2023
eeb7957
fix: swap YT to UT logic
Senna46 Dec 20, 2023
e0d7cb9
feat: refactor swap
Senna46 Dec 20, 2023
02728c9
fix: redeem query
Senna46 Dec 20, 2023
b514596
fix: redeem YT amount
Senna46 Dec 20, 2023
e157d0c
chore: err msg
Senna46 Dec 20, 2023
0e8179e
fix: support YT & Pt at once
Senna46 Dec 20, 2023
376a0d6
fix: func name
Senna46 Dec 20, 2023
aa6ef68
Merge pull request #718 from UnUniFi/feat/yt-swap-query
Senna46 Dec 20, 2023
77be576
feat: tranche APY
Senna46 Dec 20, 2023
63a12b4
Add IRS CLI command for listing all tranches
jununifi Dec 21, 2023
273d02a
feat: wip pool apy
Senna46 Dec 21, 2023
ff59f8d
Merge branch 'irs_module' of https://github.com/UnUniFi/chain into fi…
Senna46 Dec 21, 2023
fabff6d
fix: query
Senna46 Dec 21, 2023
f8cf2fc
feat: cli support
Senna46 Dec 21, 2023
e32c15a
Merge pull request #719 from UnUniFi/fix/swap-yt-to-ut
Senna46 Dec 21, 2023
2804f71
feat: pool apy
Senna46 Dec 22, 2023
8d55935
feat; lp rate
Senna46 Dec 22, 2023
8e4ef30
feat: mint_pt_yt_pair err
Senna46 Dec 25, 2023
79c2862
feat: swap pool err
Senna46 Dec 25, 2023
305f385
fix: initial PT YT mint
Senna46 Dec 28, 2023
91be2d9
Merge branch 'irs_module' of https://github.com/UnUniFi/chain into ir…
Senna46 Dec 28, 2023
9434180
Merge pull request #720 from UnUniFi/fix/swap-yt-to-ut
Senna46 Jan 4, 2024
f6da664
Merge pull request #721 from UnUniFi/irs_err_handle
Senna46 Jan 4, 2024
af4478f
feat: new swagger
Senna46 Jan 4, 2024
cfbe418
Merge branch 'develop' of https://github.com/UnUniFi/chain into irs_m…
Senna46 Jan 4, 2024
a279294
add fixes from irs cli test
jununifi Jan 8, 2024
71dd00a
fix token send sources for swap functionality
jununifi Jan 9, 2024
72edec0
Resolve pool asset does not change issue after swap
jununifi Jan 10, 2024
54038cc
Update usage of legacy sdk.Int to math.Int for IRS module
jununifi Jan 10, 2024
7ffacf5
Add denom checker on IRS when adding liquidity
jununifi Jan 15, 2024
3e0394f
feat: proto
Senna46 Jan 16, 2024
b7a116e
feat: estimate redeem pair
Senna46 Jan 16, 2024
1c68851
Merge branch 'irs_module' of https://github.com/UnUniFi/chain into ir…
Senna46 Jan 16, 2024
d6546d7
fix: error
Senna46 Jan 16, 2024
92d2aa8
feat: mint LP
Senna46 Jan 16, 2024
56a6874
fix: proto
Senna46 Jan 16, 2024
5153230
feat: swap ut to yt
Senna46 Jan 16, 2024
4098a1d
feat: cli support
Senna46 Jan 16, 2024
7238155
fix: endpoint
Senna46 Jan 16, 2024
1f80c27
feat: add denom ors proto
Senna46 Jan 23, 2024
269b8ce
feat: pb
Senna46 Jan 23, 2024
6b29c16
feat: denom impl
Senna46 Jan 23, 2024
a1d265c
fix: get denom
Senna46 Jan 23, 2024
cf09b06
feat: pool asset err
Senna46 Jan 23, 2024
dca0360
fix: get ut denom
Senna46 Jan 23, 2024
9536bb3
fix: initial share
Senna46 Jan 24, 2024
e535f9b
fix: pow integer exponent
Senna46 Jan 24, 2024
95f316d
fix: initial amount 1000000denom
Senna46 Jan 24, 2024
1e2825c
fix: del not matured err
Senna46 Jan 24, 2024
13e0cfa
fix: edge case
Senna46 Jan 26, 2024
1df0b7b
Revert "fix: initial amount 1000000denom"
Senna46 Jan 26, 2024
b66dd6c
Merge pull request #725 from UnUniFi/irs_new_query
Senna46 Feb 2, 2024
dae938f
Merge pull request #728 from UnUniFi/fix-calc
Senna46 Feb 2, 2024
bfeb274
feat: IRS deposit denom (#730)
Senna46 Feb 7, 2024
20b67b7
chore: proto comments
Senna46 Feb 7, 2024
c40010c
feat: add zero deposit_denom rate error
Senna46 Feb 7, 2024
45799cb
Merge pull request #722 from UnUniFi/irs_module_merge_dev
Senna46 Feb 7, 2024
dc4b239
feat: swagger-gen
Senna46 Feb 7, 2024
11d977a
Merge branch 'irs_module' of https://github.com/UnUniFi/chain into ir…
Senna46 Feb 7, 2024
8dc0a2a
fix: denom
Senna46 Feb 16, 2024
c2f3032
fix: hotfix maturity per year
Senna46 Feb 27, 2024
72ae230
fix: estimate swap yt func
Senna46 Feb 28, 2024
a755206
fix: delete inf loop
Senna46 Feb 28, 2024
b066ca0
fix: maturity per year
Senna46 Feb 28, 2024
453e30c
Add DepositDenomApy parser on IRS module and update ytAPY calculation…
jununifi Feb 29, 2024
718cc6c
Merge branch 'irs_module' of github.com:UnUniFi/chain into irs_module
jununifi Feb 29, 2024
2324ef1
feat: add LsAPY
Senna46 Feb 29, 2024
7a63fe0
feat: swagger proto
Senna46 Mar 1, 2024
5f14814
fix: pt mint conflict
Senna46 Mar 1, 2024
cd67ab7
fix: revert changes
Senna46 Mar 1, 2024
4673013
fix: ptAmount
Senna46 Mar 4, 2024
0134dcf
fix: utAmountFromStrategy
Senna46 Mar 4, 2024
d93ce48
feat: redeem amount
Senna46 Mar 4, 2024
3de3227
feat: yt apy based 10YT
Senna46 Mar 4, 2024
ddb8013
feat: query proto update
Senna46 Mar 4, 2024
136885e
feat: query amount input option
Senna46 Mar 4, 2024
6060f01
fix: yt apy formula
Senna46 Mar 4, 2024
683109e
add query to show vault address
jununifi Mar 4, 2024
85a5b8a
Merge pull request #732 from UnUniFi/fix/pt-mint-conflict
Senna46 Mar 5, 2024
476e384
feat: new swagger
Senna46 Mar 6, 2024
c5b2a0c
fix: stATOM/ATOM rate
Senna46 Mar 12, 2024
675b9af
feat: pt amount after maturity
Senna46 Mar 12, 2024
063857a
fix: int & add comment
Senna46 Mar 12, 2024
884c573
Merge pull request #733 from UnUniFi/reverse-rate
Senna46 Mar 22, 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
15 changes: 15 additions & 0 deletions app/keepers/keepers.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ import (

epochskeeper "github.com/UnUniFi/chain/x/epochs/keeper"
epochstypes "github.com/UnUniFi/chain/x/epochs/types"
irskeeper "github.com/UnUniFi/chain/x/irs/keeper"
irstypes "github.com/UnUniFi/chain/x/irs/types"
yieldaggregatorkeeper "github.com/UnUniFi/chain/x/yieldaggregator/keeper"
icacallbackskeeper "github.com/UnUniFi/chain/x/yieldaggregator/submodules/icacallbacks/keeper"
icacallbackstypes "github.com/UnUniFi/chain/x/yieldaggregator/submodules/icacallbacks/types"
Expand Down Expand Up @@ -151,6 +153,7 @@ type AppKeepers struct {
NftfactoryKeeper nftfactorykeeper.Keeper

YieldaggregatorKeeper yieldaggregatorkeeper.Keeper
IrsKeeper irskeeper.Keeper
StakeibcKeeper stakeibckeeper.Keeper
ScopedStakeibcKeeper capabilitykeeper.ScopedKeeper
EpochsKeeper epochskeeper.Keeper
Expand Down Expand Up @@ -616,6 +619,17 @@ func NewAppKeeper(
authtypes.NewModuleAddress(govtypes.ModuleName).String(),
)

appKeepers.IrsKeeper = irskeeper.NewKeeper(
appCodec,
appKeepers.keys[irstypes.StoreKey],
appKeepers.BankKeeper,
wasmkeeper.NewDefaultPermissionKeeper(appKeepers.WasmKeeper),
appKeepers.WasmKeeper,
appKeepers.RecordsKeeper,
appKeepers.YieldaggregatorKeeper,
authtypes.NewModuleAddress(govtypes.ModuleName).String(),
)

epochsKeeper := epochskeeper.NewKeeper(appCodec, appKeepers.keys[epochstypes.StoreKey])
appKeepers.EpochsKeeper = *epochsKeeper.SetHooks(
epochstypes.NewMultiEpochHooks(
Expand Down Expand Up @@ -737,6 +751,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino

// Deprecated: Just for migration
paramsKeeper.Subspace(yieldaggregatortypes.ModuleName)
paramsKeeper.Subspace(irstypes.ModuleName)

return paramsKeeper
}
2 changes: 2 additions & 0 deletions app/keepers/keys.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import (
// ecosystemincentivetypes "github.com/UnUniFi/chain/x/ecosystemincentive/types"
epochstypes "github.com/UnUniFi/chain/x/epochs/types"
// nftbackedloantypes "github.com/UnUniFi/chain/x/nftbackedloan/types"
irstypes "github.com/UnUniFi/chain/x/irs/types"
icacallbackstypes "github.com/UnUniFi/chain/x/yieldaggregator/submodules/icacallbacks/types"
interchainquerytypes "github.com/UnUniFi/chain/x/yieldaggregator/submodules/interchainquery/types"
recordstypes "github.com/UnUniFi/chain/x/yieldaggregator/submodules/records/types"
Expand Down Expand Up @@ -66,6 +67,7 @@ func (appKeepers *AppKeepers) GenerateKeys() {
// pricefeedtypes.StoreKey,

yieldaggregatortypes.StoreKey,
irstypes.StoreKey,
stakeibctypes.StoreKey,
epochstypes.StoreKey,
interchainquerytypes.StoreKey,
Expand Down
9 changes: 9 additions & 0 deletions app/modules.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ import (
stakeibctypes "github.com/UnUniFi/chain/x/yieldaggregator/submodules/stakeibc/types"
yieldaggregatortypes "github.com/UnUniFi/chain/x/yieldaggregator/types"

irs "github.com/UnUniFi/chain/x/irs"
irstypes "github.com/UnUniFi/chain/x/irs/types"

nftbackedloan "github.com/UnUniFi/chain/x/nftbackedloan"
nftbackedloantypes "github.com/UnUniFi/chain/x/nftbackedloan/types"

Expand Down Expand Up @@ -121,6 +124,7 @@ var maccPerms = map[string][]string{
nftfactorytypes.ModuleName: nil,

yieldaggregatortypes.ModuleName: {authtypes.Minter, authtypes.Burner},
irstypes.ModuleName: {authtypes.Minter, authtypes.Burner},
stakeibctypes.ModuleName: {authtypes.Minter, authtypes.Burner, authtypes.Staking},
interchainquerytypes.ModuleName: nil,

Expand Down Expand Up @@ -182,6 +186,7 @@ var ModuleBasics = module.NewBasicManager(
ecosystemincentive.AppModuleBasic{},

yieldaggregator.AppModuleBasic{},
irs.AppModuleBasic{},
stakeibc.AppModuleBasic{},
epochs.AppModuleBasic{},
interchainquery.AppModuleBasic{},
Expand Down Expand Up @@ -239,6 +244,7 @@ func appModules(
// derivatives.NewAppModule(appCodec, app.AppKeepers.DerivativesKeeper, app.AppKeepers.BankKeeper),

yieldaggregator.NewAppModule(appCodec, app.AppKeepers.YieldaggregatorKeeper, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper),
irs.NewAppModule(appCodec, app.AppKeepers.IrsKeeper, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper),
stakeibc.NewAppModule(appCodec, app.AppKeepers.StakeibcKeeper, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper),
epochs.NewAppModule(appCodec, app.AppKeepers.EpochsKeeper),
interchainquery.NewAppModule(appCodec, app.AppKeepers.InterchainqueryKeeper),
Expand Down Expand Up @@ -308,6 +314,7 @@ func orderBeginBlockers() []string {
icacallbackstypes.ModuleName,

yieldaggregatortypes.ModuleName,
irstypes.ModuleName,

// additional non simd modules
ibctransfertypes.ModuleName,
Expand Down Expand Up @@ -363,6 +370,7 @@ func orderEndBlockers() []string {
icacallbackstypes.ModuleName,

yieldaggregatortypes.ModuleName,
irstypes.ModuleName,

// additional non simd modules
ibctransfertypes.ModuleName,
Expand Down Expand Up @@ -421,6 +429,7 @@ func orderInitGenesis() []string {
icacallbackstypes.ModuleName,

yieldaggregatortypes.ModuleName,
irstypes.ModuleName,

// additional non simd modules
ibctransfertypes.ModuleName,
Expand Down
8 changes: 8 additions & 0 deletions docs/client/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,14 @@
"Params": "YieldAggregatorParams"
}
}
},
{
"url": "./tmp-swagger-gen/ununifi/irs/query.swagger.json",
"operationIds": {
"rename": {
"Params": "IrsParams"
}
}
}
]
}
Loading