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

v3.2.2 + Query fix #697

Merged
merged 54 commits into from
Sep 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
9894e55
hook
Senna46 Aug 15, 2023
5bacdbc
nftbl frontend
Senna46 Aug 15, 2023
745509c
feat: enable ecosystem incentive
Senna46 Aug 15, 2023
dc02597
chore refactor
Senna46 Aug 15, 2023
7a50c55
event proto
Senna46 Aug 15, 2023
43899bf
delete hook test
Senna46 Aug 15, 2023
9d3526b
fix: event
Senna46 Aug 15, 2023
6e3cad3
swagger
Senna46 Aug 15, 2023
5579ef0
chore: unused import
Senna46 Aug 15, 2023
af354f4
delete validation
Senna46 Aug 16, 2023
61a97a9
error refactor
Senna46 Aug 16, 2023
0d05546
chore
Senna46 Aug 16, 2023
f251941
err refactor
Senna46 Aug 16, 2023
4922a4b
fix: recipient not exist case
Senna46 Aug 16, 2023
277a543
delete comment (verified by types test)
Senna46 Aug 16, 2023
a9f462b
enable test
Senna46 Aug 16, 2023
7feb5a2
fix: key
Senna46 Aug 16, 2023
7ea49f2
add registered event
Senna46 Aug 16, 2023
148c37b
fix: reward query
Senna46 Aug 17, 2023
c1c2960
ecosystem-incentive proto
Senna46 Aug 17, 2023
7e1bf5a
nftbackedloan token_id proto
Senna46 Aug 17, 2023
49b8862
feat: query proto
Senna46 Aug 17, 2023
7563343
add new query
Senna46 Aug 17, 2023
83d06b3
fix: tx memo proto
Senna46 Aug 17, 2023
f34974c
chore: json handling
Senna46 Aug 17, 2023
85ba742
integration test recipient nft
Senna46 Aug 17, 2023
b65c165
feat: update doc
Senna46 Aug 17, 2023
e864ad0
feat: integration test
Senna46 Aug 17, 2023
fc16a10
feat: swagger
Senna46 Aug 18, 2023
5cc0169
Merge branch 'develop' of https://github.com/UnUniFi/chain into ecosy…
Senna46 Aug 18, 2023
6ec463c
disable ecosystem-incentive
Senna46 Aug 18, 2023
6317cdf
disable hook
Senna46 Aug 18, 2023
ff94692
swagger
Senna46 Aug 18, 2023
20c009c
Merge pull request #681 from UnUniFi/ecosystem-incentive-test
Senna46 Aug 18, 2023
fc63a02
fix: nftbackedloan query
Senna46 Aug 21, 2023
6f0422a
fix: query name & proto
Senna46 Aug 21, 2023
a13ea2b
fix: ecosystem proto
Senna46 Aug 21, 2023
67f4acc
fix: ecosystem reward impl
Senna46 Aug 21, 2023
a47b7d8
feat: new swagger
Senna46 Aug 21, 2023
0683131
Merge pull request #689 from UnUniFi/fix-classid-query-param
Senna46 Aug 21, 2023
6e13e0c
fix: derivatives query
Senna46 Aug 22, 2023
ef60b08
feat: query proto
Senna46 Aug 23, 2023
f8aafc8
feat: all-bids
Senna46 Aug 23, 2023
13b97ed
feat: gen files
Senna46 Aug 23, 2023
ee31351
Merge pull request #692 from UnUniFi/query-all-bids
Senna46 Aug 23, 2023
41679a2
fix: listed-classes
Senna46 Aug 23, 2023
907b264
fix: redeem
Senna46 Aug 25, 2023
c568462
feat: total_amount proto
Senna46 Aug 25, 2023
3540738
fix: query logic
Senna46 Aug 25, 2023
6110442
swagger
Senna46 Aug 25, 2023
0e91496
Merge pull request #691 from UnUniFi/derivatives-query
kimurayu45z Aug 28, 2023
22fd22d
Merge pull request #693 from UnUniFi/fix/redeem
kimurayu45z Aug 28, 2023
2827cc6
fix: disable backedloan
Senna46 Sep 1, 2023
efc4210
fix: disable module
Senna46 Sep 1, 2023
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/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ jobs:
run: go build -v ./...

- name: Test
run: go test -v `go list ./... | grep -v -E 'x/nftbackedloan/|x/derivatives/|x/pricefeed/|x/ecosystemincentive/'`
run: go test -v `go list ./... | grep -v -E 'x/derivatives/|x/pricefeed/|x/ecosystemincentive/|x/nftbackedloan/'`
3 changes: 3 additions & 0 deletions app/keepers/keepers.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,15 @@ import (
yieldaggregatortypes "github.com/UnUniFi/chain/x/yieldaggregator/types"

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

derivativeskeeper "github.com/UnUniFi/chain/x/derivatives/keeper"
nftfactorykeeper "github.com/UnUniFi/chain/x/nftfactory/keeper"
nftfactorytypes "github.com/UnUniFi/chain/x/nftfactory/types"
pricefeedkeeper "github.com/UnUniFi/chain/x/pricefeed/keeper"

ecosystemincentivekeeper "github.com/UnUniFi/chain/x/ecosystemincentive/keeper"
// ecosystemincentivetypes "github.com/UnUniFi/chain/x/ecosystemincentive/types"
)

type AppKeepers struct {
Expand Down Expand Up @@ -486,6 +488,7 @@ func NewAppKeeper(
// )

// create Keeper objects which have Hooks
// appKeepers.NftbackedloanKeeper = nftbackedloanKeeper
// appKeepers.NftbackedloanKeeper = *nftbackedloanKeeper.SetHooks(nftbackedloantypes.NewMultiNftbackedloanHooks(appKeepers.EcosystemincentiveKeeper.Hooks()))

// appKeepers.PricefeedKeeper = pricefeedkeeper.NewKeeper(
Expand Down
2 changes: 2 additions & 0 deletions app/keepers/keys.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ import (

buildertypes "github.com/skip-mev/pob/x/builder/types"

// ecosystemincentivetypes "github.com/UnUniFi/chain/x/ecosystemincentive/types"
epochstypes "github.com/UnUniFi/chain/x/epochs/types"
// nftbackedloantypes "github.com/UnUniFi/chain/x/nftbackedloan/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
Loading