Custom queries #2 (#6)

* Update reflect contract to v0.3.0 * Adapt to bindings v0.3.0 * Add full denom query * Add happy path full denom integ test * Update to v0.3.0 proper (release)
osmosis-labs · Mar 17, 2022 · d1a0399 · d1a0399
1 parent 20d4c7f
commit d1a0399
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 6 deletions.
diff --git a/app/wasm/bindings/query.go b/app/wasm/bindings/query.go
@@ -36,9 +36,10 @@ type SpotPrice struct {
 }
 
 type EstimatePrice struct {
-	First  Swap       `json:"first"`
-	Route  []Step     `json:"route"`
-	Amount SwapAmount `json:"amount"`
+	Contract string     `json:"contract"`
+	First    Swap       `json:"first"`
+	Route    []Step     `json:"route"`
+	Amount   SwapAmount `json:"amount"`
 }
 
 type FullDenomResponse struct {

diff --git a/app/wasm/queries.go b/app/wasm/queries.go
@@ -1,6 +1,7 @@
 package wasm
 
 import (
+	"fmt"
 	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
 	"math"
 
@@ -26,6 +27,26 @@ func NewQueryPlugin(
 	}
 }
 
+func (qp QueryPlugin) GetFullDenom(ctx sdk.Context, contract string, subDenom string) (*string, error) {
+	// Address validation
+	contractAddress, err := sdk.AccAddressFromBech32(contract)
+	if err != nil {
+		return nil, sdkerrors.Wrap(err, "address from bech32")
+	}
+	err = sdk.VerifyAddressFormat(contractAddress)
+	if err != nil {
+		return nil, sdkerrors.Wrap(err, "verify address format")
+	}
+	// TODO: sub-denom validations
+	// - sub denom length (min/max) checks
+	// - sub denom chars
+	// -
+	// TODO: Confirm "cw" prefix
+	fullDenom := fmt.Sprintf("cw/%s/%s", contract, subDenom)
+
+	return &fullDenom, nil
+}
+
 func (qp QueryPlugin) GetPoolState(ctx sdk.Context, poolId uint64) (*types.PoolState, error) {
 	poolData, err := qp.gammKeeper.GetPool(ctx, poolId)
 	if err != nil {
@@ -60,7 +81,7 @@ func (qp QueryPlugin) GetSpotPrice(ctx sdk.Context, spotPrice *bindings.SpotPric
 }
 
 func (qp QueryPlugin) EstimatePrice(ctx sdk.Context, estimatePrice *bindings.EstimatePrice) (*bindings.SwapAmount, error) {
-	sender := "" // FIXME: https://github.com/confio/osmosis-bindings/pull/14
+	sender := estimatePrice.Contract
 	poolId := estimatePrice.First.PoolId
 	denomIn := estimatePrice.First.DenomIn
 	denomOut := estimatePrice.First.DenomOut

diff --git a/app/wasm/query_plugin.go b/app/wasm/query_plugin.go
@@ -18,7 +18,25 @@ func CustomQuerier(osmoKeeper *QueryPlugin) func(ctx sdk.Context, request json.R
 			return nil, sdkerrors.Wrap(err, "osmosis query")
 		}
 
-		if contractQuery.PoolState != nil {
+		if contractQuery.FullDenom != nil {
+			contract := contractQuery.FullDenom.Contract
+			subDenom := contractQuery.FullDenom.SubDenom
+
+			fullDenom, err := osmoKeeper.GetFullDenom(ctx, contract, subDenom)
+			if err != nil {
+				return nil, sdkerrors.Wrap(err, "osmo full denom query")
+			}
+
+			res := bindings.FullDenomResponse{
+				Denom: *fullDenom,
+			}
+			bz, err := json.Marshal(res)
+			if err != nil {
+				return nil, sdkerrors.Wrap(err, "osmo full denom query response")
+			}
+			return bz, nil
+
+		} else if contractQuery.PoolState != nil {
 			poolId := contractQuery.PoolState.PoolId
 
 			state, err := osmoKeeper.GetPoolState(ctx, poolId)

diff --git a/app/wasm/test/custom_query_test.go b/app/wasm/test/custom_query_test.go
@@ -43,6 +43,27 @@ func SetupCustomApp(t *testing.T, addr sdk.AccAddress) (*app.OsmosisApp, sdk.Con
 	return osmosis, ctx
 }
 
+func TestQueryFullDenom(t *testing.T) {
+	actor := RandomAccountAddress()
+	osmosis, ctx := SetupCustomApp(t, actor)
+
+	reflect := instantiateReflectContract(t, ctx, osmosis, actor)
+	require.NotEmpty(t, reflect)
+
+	// query full denom
+	query := wasmbindings.OsmosisQuery{
+		FullDenom: &wasmbindings.FullDenom{
+			Contract: actor.String(),
+			SubDenom: "ustart",
+		},
+	}
+	resp := wasmbindings.FullDenomResponse{}
+	queryCustom(t, ctx, osmosis, reflect, query, &resp)
+
+	expected := fmt.Sprintf("cw/%s/ustart", actor.String())
+	require.EqualValues(t, expected, resp.Denom)
+}
+
 func TestQueryPool(t *testing.T) {
 	actor := RandomAccountAddress()
 	osmosis, ctx := SetupCustomApp(t, actor)

diff --git a/app/wasm/testdata/osmo_reflect.wasm b/app/wasm/testdata/osmo_reflect.wasm
diff --git a/app/wasm/testdata/version.txt b/app/wasm/testdata/version.txt
@@ -1 +1 @@
-v0.2.0
+v0.3.0