Merge PR #3352: Reenable simulation tests

Makefile

@@ -156,15 +156,15 @@ test_sim_gaia_fast:
 
 test_sim_gaia_import_export:
 	@echo "Running Gaia import/export simulation. This may take several minutes..."
-	@bash scripts/multisim.sh 50 TestGaiaImportExport
+	@bash scripts/multisim.sh 50 5 TestGaiaImportExport
 
 test_sim_gaia_simulation_after_import:
 	@echo "Running Gaia simulation-after-import. This may take several minutes..."
-	@bash scripts/multisim.sh 50 TestGaiaSimulationAfterImport
+	@bash scripts/multisim.sh 50 5 TestGaiaSimulationAfterImport
 
 test_sim_gaia_multi_seed:
 	@echo "Running multi-seed Gaia simulation. This may take awhile!"
-	@bash scripts/multisim.sh 400 TestFullGaiaSimulation
+	@bash scripts/multisim.sh 400 5 TestFullGaiaSimulation
 
 SIM_NUM_BLOCKS ?= 500
 SIM_BLOCK_SIZE ?= 200

PENDING.md

@@ -31,6 +31,7 @@ BREAKING CHANGES
   * [\#3249\(https://github.com/cosmos/cosmos-sdk/issues/3249) `tendermint`'s `show-validator` and `show-address` `--json` flags removed in favor of `--output-format=json`.
 
 * SDK
+  * [distribution] \#3359 Always round down when calculating rewards-to-be-withdrawn in F1 fee distribution
   * [staking] \#2513 Validator power type from Dec -> Int
   * [staking] \#3233 key and value now contain duplicate fields to simplify code
   * [\#3064](https://github.com/cosmos/cosmos-sdk/issues/3064) Sanitize `sdk.Coin` denom. Coins denoms are now case insensitive, i.e. 100fooToken equals to 100FOOTOKEN.

cmd/gaia/app/genesis.go

@@ -64,9 +64,13 @@ type GenesisAccount struct {
 	Coins         sdk.Coins      `json:"coins"`
 	Sequence      uint64         `json:"sequence_number"`
 	AccountNumber uint64         `json:"account_number"`
-	Vesting       bool           `json:"vesting"`
-	StartTime     int64          `json:"start_time"`
-	EndTime       int64          `json:"end_time"`
+
+	// vesting account fields
+	OriginalVesting  sdk.Coins `json:"original_vesting"`  // total vesting coins upon initialization
+	DelegatedFree    sdk.Coins `json:"delegated_free"`    // delegated vested coins at time of delegation
+	DelegatedVesting sdk.Coins `json:"delegated_vesting"` // delegated vesting coins at time of delegation
+	StartTime        int64     `json:"start_time"`        // vesting start time
+	EndTime          int64     `json:"end_time"`          // vesting end time
 }
 
 func NewGenesisAccount(acc *auth.BaseAccount) GenesisAccount {
@@ -88,7 +92,9 @@ func NewGenesisAccountI(acc auth.Account) GenesisAccount {
 
 	vacc, ok := acc.(auth.VestingAccount)
 	if ok {
-		gacc.Vesting = true
+		gacc.OriginalVesting = vacc.GetOriginalVesting()
+		gacc.DelegatedFree = vacc.GetDelegatedFree()
+		gacc.DelegatedVesting = vacc.GetDelegatedVesting()
 		gacc.StartTime = vacc.GetStartTime()
 		gacc.EndTime = vacc.GetEndTime()
 	}
@@ -105,11 +111,24 @@ func (ga *GenesisAccount) ToAccount() auth.Account {
 		Sequence:      ga.Sequence,
 	}
 
-	if ga.Vesting {
+	if !ga.OriginalVesting.IsZero() {
+		baseVestingAcc := &auth.BaseVestingAccount{
+			BaseAccount:      bacc,
+			OriginalVesting:  ga.OriginalVesting,
+			DelegatedFree:    ga.DelegatedFree,
+			DelegatedVesting: ga.DelegatedVesting,
+			EndTime:          ga.EndTime,
+		}
+
 		if ga.StartTime != 0 && ga.EndTime != 0 {
-			return auth.NewContinuousVestingAccount(bacc, ga.StartTime, ga.EndTime)
+			return &auth.ContinuousVestingAccount{
+				BaseVestingAccount: baseVestingAcc,
+				StartTime:          ga.StartTime,
+			}
 		} else if ga.EndTime != 0 {
-			return auth.NewDelayedVestingAccount(bacc, ga.EndTime)
+			return &auth.DelayedVestingAccount{
+				BaseVestingAccount: baseVestingAcc,
+			}
 		} else {
 			panic(fmt.Sprintf("invalid genesis vesting account: %+v", ga))
 		}

cmd/gaia/app/genesis_test.go

@@ -56,6 +56,7 @@ func TestToAccount(t *testing.T) {
 	priv := ed25519.GenPrivKey()
 	addr := sdk.AccAddress(priv.PubKey().Address())
 	authAcc := auth.NewBaseAccountWithAddress(addr)
+	authAcc.SetCoins(sdk.Coins{sdk.NewInt64Coin(bondDenom, 150)})
 	genAcc := NewGenesisAccount(&authAcc)
 	acc := genAcc.ToAccount()
 	require.IsType(t, &auth.BaseAccount{}, acc)

cmd/gaia/app/sim_test.go

@@ -425,8 +425,10 @@ func TestGaiaImportExport(t *testing.T) {
 		storeB := ctxB.KVStore(storeKeyB)
 		kvA, kvB, count, equal := sdk.DiffKVStores(storeA, storeB, prefixes)
 		fmt.Printf("Compared %d key/value pairs between %s and %s\n", count, storeKeyA, storeKeyB)
-		require.True(t, equal, "unequal stores: %s / %s:\nstore A %s (%X) => %s (%X)\nstore B %s (%X) => %s (%X)",
-			storeKeyA, storeKeyB, kvA.Key, kvA.Key, kvA.Value, kvA.Value, kvB.Key, kvB.Key, kvB.Value, kvB.Value)
+		require.True(t, equal,
+			"unequal stores: %s / %s:\nstore A %X => %X\nstore B %X => %X",
+			storeKeyA, storeKeyB, kvA.Key, kvA.Value, kvB.Key, kvB.Value,
+		)
 	}
 
 }

docs/spec/auth/vesting.md

@@ -316,19 +316,22 @@ and return the correct accounts accordingly based off of these new fields.
 type GenesisAccount struct {
     // ...
 
-    Vesting    bool
-    EndTime    int64
-    StartTime  int64
+    // vesting account fields
+    OriginalVesting  sdk.Coins `json:"original_vesting"`
+    DelegatedFree    sdk.Coins `json:"delegated_free"`
+    DelegatedVesting sdk.Coins `json:"delegated_vesting"`
+    StartTime        int64     `json:"start_time"`
+    EndTime          int64     `json:"end_time"`
 }
 
 func ToAccount(gacc GenesisAccount) Account {
     bacc := NewBaseAccount(gacc)
 
-    if gacc.Vesting {
+    if gacc.OriginalVesting > 0 {
         if ga.StartTime != 0 && ga.EndTime != 0 {
-            return NewContinuousVestingAccount(bacc, gacc.StartTime, gacc.EndTime)
+            // return a continuous vesting account
         } else if ga.EndTime != 0 {
-            return NewDelayedVestingAccount(bacc, gacc.EndTime)
+            // return a delayed vesting account
         } else {
             // invalid genesis vesting account provided
             panic()

scripts/multisim.sh

@@ -23,7 +23,7 @@ sim() {
   file="$tmpdir/gaia-simulation-seed-$seed-date-$(date -u +"%Y-%m-%dT%H:%M:%S+00:00").stdout"
   echo "Writing stdout to $file..."
 	go test ./cmd/gaia/app -run $testname -SimulationEnabled=true -SimulationNumBlocks=$blocks \
-    -SimulationVerbose=true -SimulationCommit=true -SimulationSeed=$seed -SimulationPeriod=$period -v -timeout 24h | tee $file
+    -SimulationVerbose=true -SimulationCommit=true -SimulationSeed=$seed -SimulationPeriod=$period -v -timeout 24h > $file
 }
 
 i=0

types/dec_coin.go

@@ -201,6 +201,19 @@ func (coins DecCoins) MulDec(d Dec) DecCoins {
 	return res
 }
 
+// multiply all the coins by a decimal, truncating
+func (coins DecCoins) MulDecTruncate(d Dec) DecCoins {
+	res := make([]DecCoin, len(coins))
+	for i, coin := range coins {
+		product := DecCoin{
+			Denom:  coin.Denom,
+			Amount: coin.Amount.MulTruncate(d),
+		}
+		res[i] = product
+	}
+	return res
+}
+
 // divide all the coins by a decimal
 func (coins DecCoins) QuoDec(d Dec) DecCoins {
 	res := make([]DecCoin, len(coins))
@@ -214,6 +227,19 @@ func (coins DecCoins) QuoDec(d Dec) DecCoins {
 	return res
 }
 
+// divide all the coins by a decimal, truncating
+func (coins DecCoins) QuoDecTruncate(d Dec) DecCoins {
+	res := make([]DecCoin, len(coins))
+	for i, coin := range coins {
+		quotient := DecCoin{
+			Denom:  coin.Denom,
+			Amount: coin.Amount.QuoTruncate(d),
+		}
+		res[i] = quotient
+	}
+	return res
+}
+
 // returns the amount of a denom from deccoins
 func (coins DecCoins) AmountOf(denom string) Dec {
 	switch len(coins) {

types/decimal.go

@@ -228,6 +228,17 @@ func (d Dec) Mul(d2 Dec) Dec {
 	return Dec{chopped}
 }
 
+// multiplication truncate
+func (d Dec) MulTruncate(d2 Dec) Dec {
+	mul := new(big.Int).Mul(d.Int, d2.Int)
+	chopped := chopPrecisionAndTruncate(mul)
+
+	if chopped.BitLen() > 255+DecimalPrecisionBits {
+		panic("Int overflow")
+	}
+	return Dec{chopped}
+}
+
 // multiplication
 func (d Dec) MulInt(i Int) Dec {
 	mul := new(big.Int).Mul(d.Int, i.i)
@@ -254,6 +265,22 @@ func (d Dec) Quo(d2 Dec) Dec {
 	return Dec{chopped}
 }
 
+// quotient truncate
+func (d Dec) QuoTruncate(d2 Dec) Dec {
+
+	// multiply precision twice
+	mul := new(big.Int).Mul(d.Int, precisionReuse)
+	mul.Mul(mul, precisionReuse)
+
+	quo := new(big.Int).Quo(mul, d2.Int)
+	chopped := chopPrecisionAndTruncate(quo)
+
+	if chopped.BitLen() > 255+DecimalPrecisionBits {
+		panic("Int overflow")
+	}
+	return Dec{chopped}
+}
+
 // quotient
 func (d Dec) QuoInt(i Int) Dec {
 	mul := new(big.Int).Quo(d.Int, i.i)

x/auth/account.go

@@ -55,6 +55,10 @@ type VestingAccount interface {
 
 	GetStartTime() int64
 	GetEndTime() int64
+
+	GetOriginalVesting() sdk.Coins
+	GetDelegatedFree() sdk.Coins
+	GetDelegatedVesting() sdk.Coins
 }
 
 // AccountDecoder unmarshals account bytes
@@ -179,18 +183,20 @@ type BaseVestingAccount struct {
 
 // String implements fmt.Stringer
 func (bva BaseVestingAccount) String() string {
-	return fmt.Sprintf(`Vesting Account %s:
+	return fmt.Sprintf(`Vesting Account:
+  Address:          %s
   Coins:            %s
-  PubKey:           %s
   AccountNumber:    %d
   Sequence:         %d
   OriginalVesting:  %s
   DelegatedFree:    %s
   DelegatedVesting: %s
-  EndTime:          %d `, bva.Address, bva.Coins,
-		bva.PubKey.Address(), bva.AccountNumber, bva.Sequence,
+  EndTime:          %d `,
+		bva.Address, bva.Coins,
+		bva.AccountNumber, bva.Sequence,
 		bva.OriginalVesting, bva.DelegatedFree,
-		bva.DelegatedVesting, bva.EndTime)
+		bva.DelegatedVesting, bva.EndTime,
+	)
 }
 
 // spendableCoins returns all the spendable coins for a vesting account given a
@@ -342,6 +348,23 @@ func (bva *BaseVestingAccount) TrackUndelegation(amount sdk.Coins) {
 	}
 }
 
+// GetOriginalVesting returns a vesting account's original vesting amount
+func (bva BaseVestingAccount) GetOriginalVesting() sdk.Coins {
+	return bva.OriginalVesting
+}
+
+// GetDelegatedFree returns a vesting account's delegation amount that is not
+// vesting.
+func (bva BaseVestingAccount) GetDelegatedFree() sdk.Coins {
+	return bva.DelegatedFree
+}
+
+// GetDelegatedVesting returns a vesting account's delegation amount that is
+// still vesting.
+func (bva BaseVestingAccount) GetDelegatedVesting() sdk.Coins {
+	return bva.DelegatedVesting
+}
+
 //-----------------------------------------------------------------------------
 // Continuous Vesting Account
 
@@ -372,19 +395,21 @@ func NewContinuousVestingAccount(
 }
 
 func (cva ContinuousVestingAccount) String() string {
-	return fmt.Sprintf(`Vesting Account %s:
+	return fmt.Sprintf(`Continuous Vesting Account:
+  Address:          %s
   Coins:            %s
-  PubKey:           %s
   AccountNumber:    %d
   Sequence:         %d
   OriginalVesting:  %s
   DelegatedFree:    %s
   DelegatedVesting: %s
   StartTime:        %d
-  EndTime:          %d `, cva.Address, cva.Coins,
-		cva.PubKey.Address(), cva.AccountNumber, cva.Sequence,
+  EndTime:          %d `,
+		cva.Address, cva.Coins,
+		cva.AccountNumber, cva.Sequence,
 		cva.OriginalVesting, cva.DelegatedFree,
-		cva.DelegatedVesting, cva.StartTime, cva.EndTime)
+		cva.DelegatedVesting, cva.StartTime, cva.EndTime,
+	)
 }
 
 // GetVestedCoins returns the total number of vested coins. If no coins are vested,

x/auth/simulation/fake.go

@@ -28,24 +28,36 @@ func SimulateDeductFee(m auth.AccountKeeper, f auth.FeeCollectionKeeper) simulat
 		}
 
 		denomIndex := r.Intn(len(initCoins))
-		amt, err := randPositiveInt(r, initCoins[denomIndex].Amount)
+		randCoin := initCoins[denomIndex]
+
+		amt, err := randPositiveInt(r, randCoin.Amount)
 		if err != nil {
 			event(fmt.Sprintf("auth/SimulateDeductFee/false"))
 			return action, nil, nil
 		}
 
-		coins := sdk.Coins{sdk.NewCoin(initCoins[denomIndex].Denom, amt)}
-		err = stored.SetCoins(initCoins.Minus(coins))
-		if err != nil {
-			panic(err)
+		// Create a random fee and verify the fees are within the account's spendable
+		// balance.
+		fees := sdk.Coins{sdk.NewCoin(randCoin.Denom, amt)}
+		spendableCoins := stored.SpendableCoins(ctx.BlockHeader().Time)
+		if _, hasNeg := spendableCoins.SafeMinus(fees); hasNeg {
+			event(fmt.Sprintf("auth/SimulateDeductFee/false"))
+			return action, nil, nil
 		}
-		m.SetAccount(ctx, stored)
-		if !coins.IsNotNegative() {
-			panic("setting negative fees")
+
+		// get the new account balance
+		newCoins, hasNeg := initCoins.SafeMinus(fees)
+		if hasNeg {
+			event(fmt.Sprintf("auth/SimulateDeductFee/false"))
+			return action, nil, nil
 		}
 
-		f.AddCollectedFees(ctx, coins)
+		if err := stored.SetCoins(newCoins); err != nil {
+			panic(err)
+		}
 
+		m.SetAccount(ctx, stored)
+		f.AddCollectedFees(ctx, fees)
 		event(fmt.Sprintf("auth/SimulateDeductFee/true"))
 
 		action = "TestDeductFee"