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

Distribute reward of ecosystemincentive from nftmarket to the community pool #597

Merged
merged 54 commits into from
Jun 19, 2023
Merged
Changes from 10 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
a795073
compile specs
taiki1frsh Jun 7, 2023
16fd691
community pool label addition
taiki1frsh Jun 7, 2023
b9c1c51
change default params and add validation
taiki1frsh Jun 7, 2023
624a4d8
fix names
taiki1frsh Jun 7, 2023
53ef29f
modify type names and so on
taiki1frsh Jun 7, 2023
14b0319
distribute reward to community pool
taiki1frsh Jun 9, 2023
343e257
insert logic of distribution to community pool to distribution managi…
taiki1frsh Jun 9, 2023
cbf4c86
fix: docker
Senna46 Jun 7, 2023
b31c4d1
fix: readme
Senna46 Jun 7, 2023
9bf16c1
fix: typo
Senna46 Jun 1, 2023
98286cb
feat: activate iya
kimurayu45z Jun 11, 2023
6f8d3fe
feat: sort codes
kimurayu45z Jun 11, 2023
c05913a
Update guide.md
Senna46 Jun 1, 2023
98361cc
chore: sort codes
kimurayu45z Jun 11, 2023
2fa02b0
feat: sort codes
kimurayu45z Jun 11, 2023
590e05d
feat: min_deposit_rate too high
Senna46 Jun 8, 2023
2ee769d
Merge pull request #520 from UnUniFi/feature/reserve-type-in-proto
kimurayu45z Jun 8, 2023
450e8a8
feat: ica stack
kimurayu45z Jun 12, 2023
e0e9b8f
feat: icacontroller migration
kimurayu45z Jun 12, 2023
2a762a3
feat: mod
kimurayu45z Jun 11, 2023
54272f5
fix: negative margin (ReportLiq & Levy)
Senna46 Jun 8, 2023
b10b31f
Merge pull request #596 from UnUniFi/fix/min-deposit
kimurayu45z Jun 8, 2023
02ab88c
chore: stakeibc admin
kimurayu45z Jun 12, 2023
bff01d1
upgrade v3 fix
jununifi Jun 12, 2023
b9c8528
feat: group module
kimurayu45z Jun 11, 2023
69f4ef2
feat: ibc stack
kimurayu45z Jun 11, 2023
fb30a4f
Merge pull request #595 from UnUniFi/fix/negative-margin
kimurayu45z Jun 8, 2023
073f54d
fix: default param
Senna46 Jun 12, 2023
6bd5b44
fix: readme
Senna46 Jun 12, 2023
3b65bee
Merge branch 'iyamodule' of github.com:UnUniFi/chain into iyamodule
jununifi Jun 12, 2023
c96541c
fix: add run migration
Senna46 Jun 12, 2023
a8b1f3e
Revert "fix: default param"
Senna46 Jun 12, 2023
8118696
Merge pull request #600 from UnUniFi/iyamodule
Senna46 Jun 12, 2023
8eec5c6
feat: new bank module
Senna46 Jun 12, 2023
c9d9a5a
feat: add iya keeper
Senna46 Jun 12, 2023
64bc506
Merge pull request #599 from UnUniFi/groupmodule
Senna46 Jun 12, 2023
d144b93
fix: sdk version
Senna46 Jun 12, 2023
ec95968
feat: change param
Senna46 Jun 12, 2023
d61282e
Merge pull request #598 from UnUniFi/app-go
Senna46 Jun 12, 2023
715a2e7
upgrade handler fix
jununifi Jun 12, 2023
b42f775
fix: go version
Senna46 Jun 12, 2023
33a9357
Merge pull request #601 from UnUniFi/fix/iya-param
Senna46 Jun 12, 2023
1067b0d
Merge branch 'newDevelop' of https://github.com/UnUniFi/chain into fe…
Senna46 Jun 12, 2023
c0425a8
Merge pull request #603 from UnUniFi/feat/migration
Senna46 Jun 12, 2023
31cead7
Merge pull request #605 from UnUniFi/feat/upgrade_handler_fix
Senna46 Jun 12, 2023
868c49d
fix proto routing for native modules
jununifi Jun 13, 2023
9740155
epochs module proto warning
jununifi Jun 13, 2023
63388a8
ibcstaking modules audit fixes
jununifi Jun 13, 2023
b6cee5f
Merge pull request #608 from UnUniFi/fix/proto_warning_fixes
Senna46 Jun 13, 2023
c82e4c9
fix: config.json & swagger
Senna46 Jun 13, 2023
683c762
fix: binary build
Senna46 Jun 13, 2023
122c14c
fix: change param
Senna46 Jun 13, 2023
8358dc3
Merge branch 'newDevelop' into feature/distribute_to_treasury
taiki1frsh Jun 15, 2023
270a377
rename nftmarket to nftbackedloan
taiki1frsh Jun 19, 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
487 changes: 242 additions & 245 deletions app/app.go

Large diffs are not rendered by default.

27 changes: 27 additions & 0 deletions app/upgrades/v3/constants.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package v3

import (
store "github.com/cosmos/cosmos-sdk/store/types"
"github.com/cosmos/cosmos-sdk/x/group"
icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types"

"github.com/UnUniFi/chain/app/upgrades"

epochstypes "github.com/UnUniFi/chain/x/epochs/types"
icacallbackstypes "github.com/UnUniFi/chain/x/yieldaggregator/ibcstaking/icacallbacks/types"
interchainquerytypes "github.com/UnUniFi/chain/x/yieldaggregator/ibcstaking/interchainquery/types"
recordstypes "github.com/UnUniFi/chain/x/yieldaggregator/ibcstaking/records/types"
stakeibctypes "github.com/UnUniFi/chain/x/yieldaggregator/ibcstaking/stakeibc/types"
yieldaggregatortypes "github.com/UnUniFi/chain/x/yieldaggregator/types"
)

const UpgradeName string = "v3"

var Upgrade = upgrades.Upgrade{
UpgradeName: UpgradeName,
CreateUpgradeHandler: CreateUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{
Added: []string{icacontrollertypes.SubModuleName, group.ModuleName, epochstypes.ModuleName, icacallbackstypes.ModuleName, interchainquerytypes.ModuleName, recordstypes.ModuleName, stakeibctypes.ModuleName, yieldaggregatortypes.ModuleName},
Deleted: []string{},
},
}
23 changes: 23 additions & 0 deletions app/upgrades/v3/upgrades.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package v3

import (
"fmt"

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

"github.com/UnUniFi/chain/app/keepers"
"github.com/UnUniFi/chain/app/upgrades"
)

func CreateUpgradeHandler(mm *module.Manager,
configurator module.Configurator,
_ upgrades.BaseAppParamManager,
keepers *keepers.AppKeepers) upgradetypes.UpgradeHandler {
return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
ctx.Logger().Info(fmt.Sprintf("update start:%s", UpgradeName))

return mm.RunMigrations(ctx, configurator, vm)
}
}
2 changes: 1 addition & 1 deletion utils/admins.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package utils

var Admins = map[string]bool{
"ununifi1a8jcsmla6heu99ldtazc27dna4qcd4jygsthx6": true,
"ununifi1r500cehqg5u6fhsaysmhu4cnw5pz3lxcqhgaq7": true,
}
2 changes: 1 addition & 1 deletion x/yieldaggregator/genesis.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package yield_aggregator
package yieldaggregator

import (
sdk "github.com/cosmos/cosmos-sdk/types"
2 changes: 1 addition & 1 deletion x/yieldaggregator/genesis_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package yield_aggregator_test
package yieldaggregator_test

// import (
// "testing"
2 changes: 1 addition & 1 deletion x/yieldaggregator/ibcstaking/interchainquery/module.go
Original file line number Diff line number Diff line change
@@ -64,7 +64,7 @@ func (a AppModuleBasic) RegisterInterfaces(reg cdctypes.InterfaceRegistry) {

// DefaultGenesis returns the capability module's default genesis state.
func (AppModuleBasic) DefaultGenesis(cdc codec.JSONCodec) json.RawMessage {
return nil
return cdc.MustMarshalJSON(types.DefaultGenesis())
}

// ValidateGenesis performs genesis state validation for the capability module.
2 changes: 1 addition & 1 deletion x/yieldaggregator/module.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package yield_aggregator
package yieldaggregator

import (
"context"
2 changes: 1 addition & 1 deletion x/yieldaggregator/module_simulation.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package yield_aggregator
package yieldaggregator

import (
"github.com/cosmos/cosmos-sdk/baseapp"
2 changes: 1 addition & 1 deletion x/yieldaggregator/proposal_handler.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package yield_aggregator
package yieldaggregator

import (
sdk "github.com/cosmos/cosmos-sdk/types"