Skip to content

Commit

Permalink
Merge pull request #613 from KiraCore/release/v0.3.38
Browse files Browse the repository at this point in the history
release/v0.3.38 -> master
  • Loading branch information
asmodat authored Nov 22, 2023
2 parents e975e8f + 647361c commit 9afaca6
Show file tree
Hide file tree
Showing 13 changed files with 341 additions and 218 deletions.
4 changes: 2 additions & 2 deletions RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Features:

- Basket module enhancement for #441 #590 #591 #592 #594
- Spending module enhancement for #597
- Autocompound interval addition
- sekai utils script fix for CI
4 changes: 3 additions & 1 deletion proto/kira/gov/network_properties.proto
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ enum NetworkProperty {
DAPP_POOL_SLIPPAGE_DEFAULT = 56 [(gogoproto.enumvalue_customname) = "DappPoolSlippageDefault"];
MINTING_FT_FEE = 57 [ (gogoproto.enumvalue_customname) = "MintingFtFee" ];
MINTING_NFT_FEE = 58 [ (gogoproto.enumvalue_customname) = "MintingNftFee" ];
VETO_THRESHOLD = 59 [ (gogoproto.enumvalue_customname) = "VetoThreshold" ];
VETO_THRESHOLD = 59 [ (gogoproto.enumvalue_customname) = "VetoThreshold" ];
AUTOCOMPOUND_INTERVAL_NUM_BLOCKS = 60 [ (gogoproto.enumvalue_customname) = "AutocompoundIntervalNumBlocks" ];
}

message NetworkPropertyValue {
Expand Down Expand Up @@ -172,4 +173,5 @@ message NetworkProperties {
(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
(gogoproto.nullable) = false
];
uint64 autocompound_interval_num_blocks = 61; // default 17280 - once per day
}
3 changes: 2 additions & 1 deletion proto/kira/multistaking/multistaking.proto
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,5 @@ message CompoundInfo {
string delegator = 1;
bool all_denom = 2;
repeated string compound_denoms = 3;
}
uint64 last_exec_block = 4;
}
2 changes: 1 addition & 1 deletion scripts/sekai-utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ function verifyIdentityRecord() {
($(isNullOrEmpty $FINAL_IR_KEYS)) && echoErr "ERROR: No valid record keys were found" && return 1

echoInfo "INFO: Sending request to verify '$FINAL_IR_KEYS'"
sekaid tx customgov request-identity-record-verify --verifier="$KM_VER" --record-ids="$FINAL_IR_KEYS" --from=$KM_ACC --tip="$KM_TIP" --keyring-backend=test --home=$SEKAID_HOME --chain-id=$NETWORK_NAME --fees=100ukex --yes --broadcast-mode=async --log_format=json --output=json | txAwait $TIMEOUT
sekaid tx customgov request-identity-record-verify --verifier="$KM_VER" --record-ids="$FINAL_IR_KEYS" --from=$KM_ACC --verifier-tip="$KM_TIP" --keyring-backend=test --home=$SEKAID_HOME --chain-id=$NETWORK_NAME --fees=100ukex --yes --broadcast-mode=async --log_format=json --output=json | txAwait $TIMEOUT
}

# showIdentityVerificationRequests <verifier-account/address> <requester-address>
Expand Down
2 changes: 1 addition & 1 deletion types/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ package types
const (
// we set page iteration limit for safety
PageIterationLimit = 512
SekaiVersion = "v0.3.37"
SekaiVersion = "v0.3.38"
CosmosVersion = "v0.47.5"
)
1 change: 1 addition & 0 deletions x/genutil/client/cli/upgrade_genesis.go
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ $ %s new-genesis-from-exported exported-genesis.json new-genesis.json
MintingFtFee: 100_000_000_000_000,
MintingNftFee: 100_000_000_000_000,
VetoThreshold: sdk.NewDecWithPrec(3340, 2), //33.40%
AutocompoundIntervalNumBlocks: 17280,
},
ExecutionFees: govGenesisV01228.ExecutionFees,
PoorNetworkMessages: govGenesisV01228.PoorNetworkMessages,
Expand Down
7 changes: 5 additions & 2 deletions x/gov/genesis_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,8 @@ func TestSimappExportGenesis(t *testing.T) {
"dapp_pool_slippage_default": "0.100000000000000000",
"minting_ft_fee": "100000000000000",
"minting_nft_fee": "100000000000000",
"veto_threshold": "33.400000000000000000"
"veto_threshold": "33.400000000000000000",
"autocompound_interval_num_blocks": "17280"
},
"execution_fees": [
{
Expand Down Expand Up @@ -395,6 +396,7 @@ func TestExportInitGenesis(t *testing.T) {
MintingFtFee: 100_000_000_000_000,
MintingNftFee: 100_000_000_000_000,
VetoThreshold: sdk.NewDecWithPrec(3340, 2), // 33.40%
AutocompoundIntervalNumBlocks: 17280,
},
ExecutionFees: []types.ExecutionFee{
{
Expand Down Expand Up @@ -511,7 +513,8 @@ func TestExportInitGenesis(t *testing.T) {
"dapp_pool_slippage_default": "0.100000000000000000",
"minting_ft_fee": "100000000000000",
"minting_nft_fee": "100000000000000",
"veto_threshold": "33.400000000000000000"
"veto_threshold": "33.400000000000000000",
"autocompound_interval_num_blocks": "17280"
},
"execution_fees": [
{
Expand Down
6 changes: 5 additions & 1 deletion x/gov/keeper/keeper.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package keeper
import (
"errors"
"fmt"

"github.com/KiraCore/sekai/x/gov/types"
"github.com/cosmos/cosmos-sdk/codec"
"github.com/cosmos/cosmos-sdk/store/prefix"
Expand Down Expand Up @@ -248,7 +249,8 @@ func (k Keeper) GetNetworkProperty(ctx sdk.Context, property types.NetworkProper
return types.NetworkPropertyValue{Value: properties.MintingNftFee}, nil
case types.VetoThreshold:
return types.NetworkPropertyValue{StrValue: properties.VetoThreshold.String()}, nil

case types.AutocompoundIntervalNumBlocks:
return types.NetworkPropertyValue{Value: properties.AutocompoundIntervalNumBlocks}, nil
default:
return types.NetworkPropertyValue{}, errors.New("trying to fetch network property that does not exist")
}
Expand Down Expand Up @@ -402,6 +404,8 @@ func (k Keeper) SetNetworkProperty(ctx sdk.Context, property types.NetworkProper
}
properties.VetoThreshold = decValue

case types.AutocompoundIntervalNumBlocks:
properties.AutocompoundIntervalNumBlocks = value.Value
default:
return errors.New("trying to set network property that does not exist")
}
Expand Down
1 change: 1 addition & 0 deletions x/gov/types/genesis.go
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ func DefaultGenesis() *GenesisState {
MintingFtFee: 100_000_000_000_000,
MintingNftFee: 100_000_000_000_000,
VetoThreshold: sdk.NewDecWithPrec(3340, 2), // 33.40%
AutocompoundIntervalNumBlocks: 17280,
},
ExecutionFees: []ExecutionFee{
{
Expand Down
Loading

0 comments on commit 9afaca6

Please sign in to comment.