Merge branch 'develop' into refactor/remove-deprecated-rest

Author: lumtis

localnet/spn/node1/data/priv_validator_state.json

@@ -2,4 +2,4 @@
   "height": "0",
   "round": 0,
   "step": 0
-}
+}

localnet/spn/node2/data/priv_validator_state.json

@@ -2,4 +2,4 @@
   "height": "0",
   "round": 0,
   "step": 0
-}
+}

localnet/spn/node3/data/priv_validator_state.json

@@ -2,4 +2,4 @@
   "height": "0",
   "round": 0,
   "step": 0
-}
+}

x/campaign/keeper/mainnet_account.go

@@ -11,7 +11,7 @@ import (
 func (k Keeper) SetMainnetAccount(ctx sdk.Context, mainnetAccount types.MainnetAccount) {
 	store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.MainnetAccountKeyPrefix))
 	b := k.cdc.MustMarshal(&mainnetAccount)
-	store.Set(types.MainnetAccountKey(
+	store.Set(types.AccountKeyPath(
 		mainnetAccount.CampaignID,
 		mainnetAccount.Address,
 	), b)
@@ -25,7 +25,7 @@ func (k Keeper) GetMainnetAccount(
 ) (val types.MainnetAccount, found bool) {
 	store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.MainnetAccountKeyPrefix))
 
-	b := store.Get(types.MainnetAccountKey(campaignID, address))
+	b := store.Get(types.AccountKeyPath(campaignID, address))
 	if b == nil {
 		return val, false
 	}
@@ -41,7 +41,7 @@ func (k Keeper) RemoveMainnetAccount(
 	address string,
 ) {
 	store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.MainnetAccountKeyPrefix))
-	store.Delete(types.MainnetAccountKey(
+	store.Delete(types.AccountKeyPath(
 		campaignID,
 		address,
 	))

x/campaign/keeper/msg_mint_vouchers.go

@@ -35,7 +35,11 @@ func (k msgServer) MintVouchers(goCtx context.Context, msg *types.MsgMintVoucher
 
 	// Increase the campaign shares
 	campaign.AllocatedShares = types.IncreaseShares(campaign.AllocatedShares, msg.Shares)
-	if types.IsTotalSharesReached(campaign.AllocatedShares, k.GetTotalShares(ctx)) {
+	reached, err := types.IsTotalSharesReached(campaign.AllocatedShares, k.GetTotalShares(ctx))
+	if err != nil {
+		return nil, spnerrors.Criticalf("verified shares are invalid %s", err.Error())
+	}
+	if reached {
 		return nil, sdkerrors.Wrapf(types.ErrTotalSharesLimit, "%d", msg.CampaignID)
 	}
 

x/campaign/keeper/msg_update_special_allocations.go

@@ -54,8 +54,12 @@ func (k msgServer) UpdateSpecialAllocations(goCtx context.Context, msg *types.Ms
 	// increase with new special allocations
 	campaign.AllocatedShares = types.IncreaseShares(campaign.AllocatedShares, msg.SpecialAllocations.TotalShares())
 
-	// check total is not reached
-	if types.IsTotalSharesReached(campaign.AllocatedShares, k.GetTotalShares(ctx)) {
+	// increase the campaign shares
+	reached, err := types.IsTotalSharesReached(campaign.AllocatedShares, k.GetTotalShares(ctx))
+	if err != nil {
+		return nil, spnerrors.Criticalf("verified shares are invalid %s", err.Error())
+	}
+	if reached {
 		return nil, sdkerrors.Wrapf(types.ErrTotalSharesLimit, "%d", msg.CampaignID)
 	}
 

x/campaign/types/campaign.go

@@ -42,11 +42,12 @@ func (m Campaign) Validate(totalShareNumber uint64) error {
 	if !m.TotalSupply.IsValid() {
 		return errors.New("invalid total supply")
 	}
-	if !sdk.Coins(m.AllocatedShares).IsValid() {
-		return errors.New("invalid allocated shares")
-	}
 
-	if IsTotalSharesReached(m.AllocatedShares, totalShareNumber) {
+	reached, err := IsTotalSharesReached(m.AllocatedShares, totalShareNumber)
+	if err != nil {
+		return errors.Wrap(err, "invalid allocated shares")
+	}
+	if reached {
 		return errors.New("more allocated shares than total shares")
 	}
 

x/campaign/types/campaign_test.go

@@ -52,7 +52,9 @@ func TestCampaign_Validate(t *testing.T) {
 	totalSharesReached.AllocatedShares = campaign.NewSharesFromCoins(sdk.NewCoins(
 		sdk.NewCoin("foo", sdk.NewInt(spntypes.TotalShareNumber+1)),
 	))
-	require.True(t, campaign.IsTotalSharesReached(totalSharesReached.AllocatedShares, spntypes.TotalShareNumber))
+	reached, err := campaign.IsTotalSharesReached(totalSharesReached.AllocatedShares, spntypes.TotalShareNumber)
+	require.NoError(t, err)
+	require.True(t, reached)
 
 	invalidSpecialAllocations := campaign.NewSpecialAllocations(
 		sample.Shares(r),

x/campaign/types/genesis.go

@@ -58,7 +58,7 @@ func (gs GenesisState) Validate() error {
 			return fmt.Errorf("campaign id %d doesn't exist for mainnet account %s",
 				elem.CampaignID, elem.Address)
 		}
-		index := string(MainnetAccountKey(elem.CampaignID, elem.Address))
+		index := string(AccountKeyPath(elem.CampaignID, elem.Address))
 		if _, ok := mainnetAccountIndexMap[index]; ok {
 			return fmt.Errorf("duplicated index for mainnetAccount")
 		}

x/campaign/types/keys.go

@@ -46,8 +46,8 @@ func CampaignChainsKey(campaignID uint64) []byte {
 	return append(spntypes.UintBytes(campaignID), byte('/'))
 }
 
-// MainnetAccountKey returns the store key to retrieve a MainnetAccount from the index fields
-func MainnetAccountKey(campaignID uint64, address string) []byte {
+// AccountKeyPath returns the store key path without prefix for an account defined by a campaign ID and an address
+func AccountKeyPath(campaignID uint64, address string) []byte {
 	campaignIDBytes := append(spntypes.UintBytes(campaignID), byte('/'))
 	addressBytes := append([]byte(address), byte('/'))
 	return append(campaignIDBytes, addressBytes...)
@@ -60,13 +60,6 @@ func MainnetAccountAllKey(campaignID uint64) []byte {
 	return append(prefixBytes, campaignIDBytes...)
 }
 
-// MainnetVestingAccountKey returns the store key to retrieve a MainnetVestingAccount from the index fields
-func MainnetVestingAccountKey(campaignID uint64, address string) []byte {
-	campaignIDBytes := append(spntypes.UintBytes(campaignID), byte('/'))
-	addressBytes := append([]byte(address), byte('/'))
-	return append(campaignIDBytes, addressBytes...)
-}
-
 // MainnetVestingAccountAllKey returns the store key to retrieve all MainnetVestingAccount by campaign id
 func MainnetVestingAccountAllKey(campaignID uint64) []byte {
 	prefixBytes := []byte(MainnetVestingAccountKeyPrefix)