Merge branch 'master' into ryan/820-basket-start-date

regen-network · Mar 11, 2022 · a54542a · a54542a
2 parents 98e5396 + e52f1da
commit a54542a
Show file tree

Hide file tree

Showing 18 changed files with 650 additions and 227 deletions.
diff --git a/api/regen/ecocredit/marketplace/v1/query.pulsar.go b/api/regen/ecocredit/marketplace/v1/query.pulsar.go
diff --git a/proto/regen/ecocredit/marketplace/v1/query.proto b/proto/regen/ecocredit/marketplace/v1/query.proto
@@ -13,42 +13,42 @@ service Query {
 
   // SellOrder queries a sell order by its ID
   rpc SellOrder(QuerySellOrderRequest) returns (QuerySellOrderResponse) {
-    option (google.api.http).get = "/regen/ecocredit/v1alpha1/sell-orders/id/{sell_order_id}";
+    option (google.api.http).get = "/regen/ecocredit/marketplace/v1/sell-orders/id/{sell_order_id}";
   }
 
   // SellOrders queries a paginated list of all sell orders
   rpc SellOrders(QuerySellOrdersRequest) returns (QuerySellOrdersResponse) {
-    option (google.api.http).get = "/regen/ecocredit/v1alpha1/sell-orders";
+    option (google.api.http).get = "/regen/ecocredit/marketplace/v1/sell-orders";
   }
 
   // SellOrdersByDenom queries a paginated list of all sell orders of a specific ecocredit denom
   rpc SellOrdersByBatchDenom(QuerySellOrdersByBatchDenomRequest) returns (QuerySellOrdersByBatchDenomResponse) {
-    option (google.api.http).get = "/regen/ecocredit/v1alpha1/sell-orders/batch-denom/{batch_denom}";
+    option (google.api.http).get = "/regen/ecocredit/marketplace/v1/sell-orders/batch-denom/{batch_denom}";
   }
 
   // SellOrdersByAddress queries a paginated list of all sell orders from a specific address
   rpc SellOrdersByAddress(QuerySellOrdersByAddressRequest) returns (QuerySellOrdersByAddressResponse) {
-    option (google.api.http).get = "/regen/ecocredit/v1alpha1/sell-orders/address/{address}";
+    option (google.api.http).get = "/regen/ecocredit/marketplace/v1/sell-orders/address/{address}";
   }
 
   // BuyOrder queries a buy order by its id
   rpc BuyOrder(QueryBuyOrderRequest) returns (QueryBuyOrderResponse) {
-    option (google.api.http).get = "/regen/ecocredit/v1alpha1/buy-orders/id/{buy_order_id}";
+    option (google.api.http).get = "/regen/ecocredit/marketplace/v1/buy-orders/id/{buy_order_id}";
   }
 
   // BuyOrders queries a paginated list of all buy orders
   rpc BuyOrders(QueryBuyOrdersRequest) returns (QueryBuyOrdersResponse) {
-    option (google.api.http).get = "/regen/ecocredit/v1alpha1/buy-orders";
+    option (google.api.http).get = "/regen/ecocredit/marketplace/v1/buy-orders";
   }
 
   // BuyOrdersByAddress queries a paginated list of buy orders by creator address
   rpc BuyOrdersByAddress(QueryBuyOrdersByAddressRequest) returns (QueryBuyOrdersByAddressResponse) {
-    option (google.api.http).get = "/regen/ecocredit/v1alpha1/buy-orders/address/{address}";
+    option (google.api.http).get = "/regen/ecocredit/marketplace/v1/buy-orders/address/{address}";
   }
 
   // AllowedDenoms queries all denoms allowed to be set in the AskPrice of a sell order
   rpc AllowedDenoms(QueryAllowedDenomsRequest) returns (QueryAllowedDenomsResponse) {
-    option (google.api.http).get = "/regen/ecocredit/v1alpha1/ask-denoms";
+    option (google.api.http).get = "/regen/ecocredit/marketplace/v1/ask-denoms";
   }
 }
 

diff --git a/x/ecocredit/marketplace/query.pb.go b/x/ecocredit/marketplace/query.pb.go
diff --git a/x/ecocredit/marketplace/query.pb.gw.go b/x/ecocredit/marketplace/query.pb.gw.go
diff --git a/x/ecocredit/server/core/cancel.go b/x/ecocredit/server/core/cancel.go
@@ -9,6 +9,7 @@ import (
 	"github.com/regen-network/regen-ledger/types"
 	"github.com/regen-network/regen-ledger/types/math"
 	"github.com/regen-network/regen-ledger/x/ecocredit/core"
+	"github.com/regen-network/regen-ledger/x/ecocredit/server"
 )
 
 // Cancel credits, removing them from the supply and balance of the holder
@@ -24,7 +25,7 @@ func (k Keeper) Cancel(ctx context.Context, req *core.MsgCancel) (*core.MsgCance
 		if err != nil {
 			return nil, err
 		}
-		creditType, err := k.getCreditTypeFromBatchDenom(ctx, batch.BatchDenom)
+		creditType, err := server.GetCreditTypeFromBatchDenom(ctx, k.stateStore, k.params, batch.BatchDenom)
 		if err != nil {
 			return nil, err
 		}
@@ -38,7 +39,7 @@ func (k Keeper) Cancel(ctx context.Context, req *core.MsgCancel) (*core.MsgCance
 		if err != nil {
 			return nil, err
 		}
-		decs, err := getNonNegativeFixedDecs(precision, credit.Amount, batchSupply.TradableAmount, userBalance.Tradable, batchSupply.CancelledAmount)
+		decs, err := server.GetNonNegativeFixedDecs(precision, credit.Amount, batchSupply.TradableAmount, userBalance.Tradable, batchSupply.CancelledAmount)
 		if err != nil {
 			return nil, err
 		}

diff --git a/x/ecocredit/server/core/create_batch.go b/x/ecocredit/server/core/create_batch.go
@@ -12,6 +12,7 @@ import (
 	"github.com/regen-network/regen-ledger/types/math"
 	"github.com/regen-network/regen-ledger/x/ecocredit"
 	"github.com/regen-network/regen-ledger/x/ecocredit/core"
+	"github.com/regen-network/regen-ledger/x/ecocredit/server"
 )
 
 // CreateBatch creates a new batch of credits.
@@ -57,17 +58,15 @@ func (k Keeper) CreateBatch(ctx context.Context, req *core.MsgCreateBatch) (*cor
 		return nil, err
 	}
 
-	var p ecocredit.Params
-	k.params.GetParamSet(sdkCtx, &p)
-	creditType, err := k.getCreditType(classInfo.CreditType, p.CreditTypes)
+	creditType, err := server.GetCreditTypeFromBatchDenom(ctx, k.stateStore, k.params, batchDenom)
 	if err != nil {
 		return nil, err
 	}
 	maxDecimalPlaces := creditType.Precision
 
 	tradableSupply, retiredSupply := math.NewDecFromInt64(0), math.NewDecFromInt64(0)
 	for _, issuance := range req.Issuance {
-		decs, err := getNonNegativeFixedDecs(maxDecimalPlaces, issuance.TradableAmount, issuance.RetiredAmount)
+		decs, err := server.GetNonNegativeFixedDecs(maxDecimalPlaces, issuance.TradableAmount, issuance.RetiredAmount)
 		if err != nil {
 			return nil, err
 		}