Merge pull request #202 from InjectiveLabs/feat/add_chain_values_conv…

…erters

feat/add chain values converters

Makefile

@@ -2,27 +2,31 @@ all:
 
 copy-exchange-client:
 	rm -rf exchange/*
-	mkdir -p exchange/meta_rpc
-	mkdir -p exchange/exchange_rpc
 	mkdir -p exchange/accounts_rpc
 	mkdir -p exchange/auction_rpc
-	mkdir -p exchange/oracle_rpc
-	mkdir -p exchange/insurance_rpc
-	mkdir -p exchange/explorer_rpc
-	mkdir -p exchange/spot_exchange_rpc
+	mkdir -p exchange/campaign_rpc
 	mkdir -p exchange/derivative_exchange_rpc
+	mkdir -p exchange/exchange_rpc
+	mkdir -p exchange/explorer_rpc
+	mkdir -p exchange/insurance_rpc
+	mkdir -p exchange/meta_rpc
+	mkdir -p exchange/oracle_rpc
 	mkdir -p exchange/portfolio_rpc
+	mkdir -p exchange/spot_exchange_rpc
+	mkdir -p exchange/trading_rpc
 
-	cp -r ../injective-indexer/api/gen/grpc/injective_meta_rpc/pb exchange/meta_rpc/pb
-	cp -r ../injective-indexer/api/gen/grpc/injective_exchange_rpc/pb exchange/exchange_rpc/pb
 	cp -r ../injective-indexer/api/gen/grpc/injective_accounts_rpc/pb exchange/accounts_rpc/pb
 	cp -r ../injective-indexer/api/gen/grpc/injective_auction_rpc/pb exchange/auction_rpc/pb
-	cp -r ../injective-indexer/api/gen/grpc/injective_oracle_rpc/pb exchange/oracle_rpc/pb
-	cp -r ../injective-indexer/api/gen/grpc/injective_insurance_rpc/pb exchange/insurance_rpc/pb
-	cp -r ../injective-indexer/api/gen/grpc/injective_explorer_rpc/pb exchange/explorer_rpc/pb
-	cp -r ../injective-indexer/api/gen/grpc/injective_spot_exchange_rpc/pb exchange/spot_exchange_rpc/pb
+	cp -r ../injective-indexer/api/gen/grpc/injective_campaign_rpc/pb exchange/campaign_rpc/pb
 	cp -r ../injective-indexer/api/gen/grpc/injective_derivative_exchange_rpc/pb exchange/derivative_exchange_rpc/pb
+	cp -r ../injective-indexer/api/gen/grpc/injective_exchange_rpc/pb exchange/exchange_rpc/pb
+	cp -r ../injective-indexer/api/gen/grpc/injective_explorer_rpc/pb exchange/explorer_rpc/pb
+	cp -r ../injective-indexer/api/gen/grpc/injective_insurance_rpc/pb exchange/insurance_rpc/pb
+	cp -r ../injective-indexer/api/gen/grpc/injective_meta_rpc/pb exchange/meta_rpc/pb
+	cp -r ../injective-indexer/api/gen/grpc/injective_oracle_rpc/pb exchange/oracle_rpc/pb
 	cp -r ../injective-indexer/api/gen/grpc/injective_portfolio_rpc/pb exchange/portfolio_rpc/pb
+	cp -r ../injective-indexer/api/gen/grpc/injective_spot_exchange_rpc/pb exchange/spot_exchange_rpc/pb
+	cp -r ../injective-indexer/api/gen/grpc/injective_trading_rpc/pb exchange/trading_rpc/pb
 
 .PHONY: copy-exchange-client tests coverage
 

client/common/util.go

@@ -8,6 +8,8 @@ import (
 	"os"
 	"strings"
 
+	"github.com/shopspring/decimal"
+
 	chaintypes "github.com/InjectiveLabs/sdk-go/chain/types"
 	"google.golang.org/grpc/credentials"
 )
@@ -56,3 +58,7 @@ func MsgResponse(data []byte) []*chaintypes.TxResponseGenericMessage {
 	}
 	return response.Messages
 }
+
+func RemoveExtraDecimals(value decimal.Decimal, decimalsToRemove int32) decimal.Decimal {
+	return value.Div(decimal.New(1, decimalsToRemove))
+}

client/core/market.go

@@ -1,6 +1,7 @@
 package core
 
 import (
+	"github.com/InjectiveLabs/sdk-go/client/common"
 	cosmtypes "github.com/cosmos/cosmos-sdk/types"
 	"github.com/shopspring/decimal"
 )
@@ -46,6 +47,14 @@ func (spotMarket SpotMarket) PriceFromChainFormat(chainValue cosmtypes.Dec) deci
 	return decimal.RequireFromString(chainValue.String()).Mul(decimal.New(1, decimals))
 }
 
+func (spotMarket SpotMarket) QuantityFromExtendedChainFormat(chainValue cosmtypes.Dec) decimal.Decimal {
+	return common.RemoveExtraDecimals(spotMarket.QuantityFromChainFormat(chainValue), AdditionalChainFormatDecimals)
+}
+
+func (spotMarket SpotMarket) PriceFromExtendedChainFormat(chainValue cosmtypes.Dec) decimal.Decimal {
+	return common.RemoveExtraDecimals(spotMarket.PriceFromChainFormat(chainValue), AdditionalChainFormatDecimals)
+}
+
 type DerivativeMarket struct {
 	Id                     string
 	Status                 string
@@ -116,3 +125,15 @@ func (derivativeMarket DerivativeMarket) MarginFromChainFormat(chainValue cosmty
 	decimals := -derivativeMarket.QuoteToken.Decimals
 	return decimal.RequireFromString(chainValue.String()).Mul(decimal.New(1, decimals))
 }
+
+func (derivativeMarket DerivativeMarket) QuantityFromExtendedChainFormat(chainValue cosmtypes.Dec) decimal.Decimal {
+	return common.RemoveExtraDecimals(derivativeMarket.QuantityFromChainFormat(chainValue), AdditionalChainFormatDecimals)
+}
+
+func (derivativeMarket DerivativeMarket) PriceFromExtendedChainFormat(chainValue cosmtypes.Dec) decimal.Decimal {
+	return common.RemoveExtraDecimals(derivativeMarket.PriceFromChainFormat(chainValue), AdditionalChainFormatDecimals)
+}
+
+func (derivativeMarket DerivativeMarket) MarginFromExtendedChainFormat(chainValue cosmtypes.Dec) decimal.Decimal {
+	return common.RemoveExtraDecimals(derivativeMarket.MarginFromChainFormat(chainValue), AdditionalChainFormatDecimals)
+}

client/core/market_test.go

@@ -112,6 +112,27 @@ func TestConvertPriceFromChainFormatForSpotMarket(t *testing.T) {
 	assert.Assert(t, expectedPrice.Equal(humanReadablePrice))
 }
 
+func TestConvertQuantityFromExtendedChainFormatForSpotMarket(t *testing.T) {
+	spotMarket := createINJUSDTSpotMarket()
+	expectedQuantity := decimal.RequireFromString("123.456")
+
+	chainFormatQuantity := expectedQuantity.Mul(decimal.New(1, spotMarket.BaseToken.Decimals)).Mul(decimal.New(1, AdditionalChainFormatDecimals))
+	humanReadableQuantity := spotMarket.QuantityFromExtendedChainFormat(types.MustNewDecFromStr(chainFormatQuantity.String()))
+
+	assert.Assert(t, expectedQuantity.Equal(humanReadableQuantity))
+}
+
+func TestConvertPriceFromExtendedChainFormatForSpotMarket(t *testing.T) {
+	spotMarket := createINJUSDTSpotMarket()
+	expectedPrice := decimal.RequireFromString("123.456")
+
+	priceDecimals := spotMarket.QuoteToken.Decimals - spotMarket.BaseToken.Decimals
+	chainFormatPrice := expectedPrice.Mul(decimal.New(1, priceDecimals)).Mul(decimal.New(1, AdditionalChainFormatDecimals))
+	humanReadablePrice := spotMarket.PriceFromExtendedChainFormat(types.MustNewDecFromStr(chainFormatPrice.String()))
+
+	assert.Assert(t, expectedPrice.Equal(humanReadablePrice))
+}
+
 //Derivative markets tests
 
 func TestConvertQuantityToChainFormatForDerivativeMarket(t *testing.T) {
@@ -197,3 +218,35 @@ func TestConvertMarginFromChainFormatForDerivativeMarket(t *testing.T) {
 
 	assert.Assert(t, expectedMargin.Equal(humanReadablePrice))
 }
+
+func TestConvertQuantityFromExtendedChainFormatForDerivativeMarket(t *testing.T) {
+	derivativeMarket := createBTCUSDTPerpMarket()
+	expectedQuantity := decimal.RequireFromString("123.456")
+
+	chainFormatQuantity := expectedQuantity.Mul(decimal.New(1, AdditionalChainFormatDecimals))
+	humanReadableQuantity := derivativeMarket.QuantityFromExtendedChainFormat(types.MustNewDecFromStr(chainFormatQuantity.String()))
+
+	assert.Assert(t, expectedQuantity.Equal(humanReadableQuantity))
+}
+
+func TestConvertPriceFromExtendedChainFormatForDerivativeMarket(t *testing.T) {
+	derivativeMarket := createBTCUSDTPerpMarket()
+	expectedPrice := decimal.RequireFromString("123.456")
+
+	priceDecimals := derivativeMarket.QuoteToken.Decimals
+	chainFormatPrice := expectedPrice.Mul(decimal.New(1, priceDecimals)).Mul(decimal.New(1, AdditionalChainFormatDecimals))
+	humanReadablePrice := derivativeMarket.PriceFromExtendedChainFormat(types.MustNewDecFromStr(chainFormatPrice.String()))
+
+	assert.Assert(t, expectedPrice.Equal(humanReadablePrice))
+}
+
+func TestConvertMarginFromExtendedChainFormatForDerivativeMarket(t *testing.T) {
+	derivativeMarket := createBTCUSDTPerpMarket()
+	expectedMargin := decimal.RequireFromString("123.456")
+
+	marginDecimals := derivativeMarket.QuoteToken.Decimals
+	chainFormatMargin := expectedMargin.Mul(decimal.New(1, marginDecimals)).Mul(decimal.New(1, AdditionalChainFormatDecimals))
+	humanReadablePrice := derivativeMarket.MarginFromExtendedChainFormat(types.MustNewDecFromStr(chainFormatMargin.String()))
+
+	assert.Assert(t, expectedMargin.Equal(humanReadablePrice))
+}