Merge branch 'master' into ty/821-escrow

x/data/go.mod

@@ -18,7 +18,6 @@ require (
 	github.com/tendermint/tendermint v0.34.15
 	google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf
 	google.golang.org/grpc v1.44.0
-	google.golang.org/protobuf v1.27.1
 )
 
 require (
@@ -118,6 +117,7 @@ require (
 	golang.org/x/sys v0.0.0-20211004093028-2c5d950f24ef // indirect
 	golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
 	golang.org/x/text v0.3.7 // indirect
+	google.golang.org/protobuf v1.27.1 // indirect
 	gopkg.in/ini.v1 v1.63.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect

x/ecocredit/server/marketplace/prune.go

@@ -14,9 +14,9 @@ import (
 func (k Keeper) PruneSellOrders(ctx context.Context) error {
 	sdkCtx := sdk.UnwrapSDKContext(ctx)
 
-	min, blockTime := timestamppb.New(time.Now()), timestamppb.New(sdkCtx.BlockTime())
+	min, blockTime := timestamppb.New(time.Unix(0, 0)), timestamppb.New(sdkCtx.BlockTime())
 	fromKey, toKey := marketplacev1.SellOrderExpirationIndexKey{}.WithExpiration(min), marketplacev1.SellOrderExpirationIndexKey{}.WithExpiration(blockTime)
-	it, err := k.stateStore.SellOrderStore().ListRange(ctx, fromKey, toKey)
+	it, err := k.stateStore.SellOrderTable().ListRange(ctx, fromKey, toKey)
 	if err != nil {
 		return err
 	}
@@ -30,7 +30,7 @@ func (k Keeper) PruneSellOrders(ctx context.Context) error {
 			return err
 		}
 	}
-	return k.stateStore.SellOrderStore().DeleteRange(ctx, fromKey, toKey)
+	return k.stateStore.SellOrderTable().DeleteRange(ctx, fromKey, toKey)
 }
 
 // unescrowCredits moves `amount` of credits from the sellerAddr's escrowed balance, into their tradable balance
@@ -52,39 +52,36 @@ func (k Keeper) unescrowCredits(ctx context.Context, sellerAddr sdk.AccAddress,
 			return "", "", err
 		}
 
-		// subtract from escrow
 		escrowedDec, err = math.SafeSubBalance(escrowedDec, creditAmt)
 		if err != nil {
 			return "", "", err
 		}
-		// add to tradable
 		tradableDec, err = math.SafeAddBalance(tradableDec, creditAmt)
 		if err != nil {
 			return "", "", err
 		}
 		return escrowedDec.String(), tradableDec.String(), nil
 	}
 
-	bal, err := k.coreStore.BatchBalanceStore().Get(ctx, sellerAddr, batchId)
+	bal, err := k.coreStore.BatchBalanceTable().Get(ctx, sellerAddr, batchId)
 	if err != nil {
 		return err
 	}
 	bal.Escrowed, bal.Tradable, err = moveCredits(bal.Escrowed, bal.Tradable)
 	if err != nil {
 		return err
 	}
-	if err = k.coreStore.BatchBalanceStore().Update(ctx, bal); err != nil {
+	if err = k.coreStore.BatchBalanceTable().Update(ctx, bal); err != nil {
 		return err
 	}
 
-	// update supply
-	sup, err := k.coreStore.BatchSupplyStore().Get(ctx, batchId)
+	sup, err := k.coreStore.BatchSupplyTable().Get(ctx, batchId)
 	if err != nil {
 		return err
 	}
 	sup.EscrowedAmount, sup.TradableAmount, err = moveCredits(sup.EscrowedAmount, sup.TradableAmount)
 	if err != nil {
 		return err
 	}
-	return k.coreStore.BatchSupplyStore().Update(ctx, sup)
+	return k.coreStore.BatchSupplyTable().Update(ctx, sup)
 }

x/ecocredit/server/marketplace/sell.go

@@ -27,7 +27,7 @@ func (k Keeper) Sell(ctx context.Context, req *marketplacev1.MsgSell) (*marketpl
 	for i, order := range req.Orders {
 		batch, err := k.coreStore.BatchInfoTable().GetByBatchDenom(ctx, order.BatchDenom)
 		if err != nil {
-			return nil, sdkerrors.ErrInvalidRequest.Wrapf("batch denom %s: %w", order.BatchDenom, err)
+			return nil, sdkerrors.ErrInvalidRequest.Wrapf("batch denom %s: %s", order.BatchDenom, err.Error())
 		}
 		ct, err := server.GetCreditTypeFromBatchDenom(ctx, k.coreStore, k.params, batch.BatchDenom)
 		if err != nil {
@@ -101,7 +101,7 @@ func (k Keeper) getOrCreateMarketId(ctx context.Context, creditTypeAbbrev, bankD
 }
 
 func (k Keeper) escrowCredits(ctx context.Context, ownerAcc sdk.AccAddress, batchId uint64, sellQty math.Dec) error {
-	bal, err := k.coreStore.BatchBalanceStore().Get(ctx, ownerAcc, batchId)
+	bal, err := k.coreStore.BatchBalanceTable().Get(ctx, ownerAcc, batchId)
 	if err != nil {
 		return err
 	}
@@ -111,7 +111,7 @@ func (k Keeper) escrowCredits(ctx context.Context, ownerAcc sdk.AccAddress, batc
 	}
 	newTradable, err := math.SafeSubBalance(tradable, sellQty)
 	if err != nil {
-		return sdkerrors.ErrInvalidRequest.Wrapf("tradable balance: %v, sell order request: %v - %w", tradable, sellQty, err)
+		return sdkerrors.ErrInvalidRequest.Wrapf("tradable balance: %v, sell order request: %v - %s", tradable, sellQty, err.Error())
 	}
 
 	escrowed, err := math.NewDecFromString(bal.Escrowed)
@@ -120,16 +120,16 @@ func (k Keeper) escrowCredits(ctx context.Context, ownerAcc sdk.AccAddress, batc
 	}
 	newEscrowed, err := math.SafeAddBalance(escrowed, sellQty)
 	if err != nil {
-		return sdkerrors.ErrInvalidRequest.Wrapf("escrowed balance: %v, sell order request: %v - %w", escrowed, sellQty, err)
+		return sdkerrors.ErrInvalidRequest.Wrapf("escrowed balance: %v, sell order request: %v - %s", escrowed, sellQty, err.Error())
 	}
 	bal.Tradable = newTradable.String()
 	bal.Escrowed = newEscrowed.String()
 
-	if err = k.coreStore.BatchBalanceStore().Update(ctx, bal); err != nil {
+	if err = k.coreStore.BatchBalanceTable().Update(ctx, bal); err != nil {
 		return err
 	}
 
-	supply, err := k.coreStore.BatchSupplyStore().Get(ctx, batchId)
+	supply, err := k.coreStore.BatchSupplyTable().Get(ctx, batchId)
 	if err != nil {
 		return err
 	}
@@ -151,5 +151,5 @@ func (k Keeper) escrowCredits(ctx context.Context, ownerAcc sdk.AccAddress, batc
 	}
 	supply.EscrowedAmount = supEscrow.String()
 	supply.TradableAmount = supTradable.String()
-	return k.coreStore.BatchSupplyStore().Save(ctx, supply)
+	return k.coreStore.BatchSupplyTable().Save(ctx, supply)
 }