@agoric/cosmos 0.35.0-upgrade-14-dev-c8f9e7b.0 → 0.35.0-upgrade-16a-dev-fb592e4.0

package/x/vstorage/keeper/querier.go

@@ -3,6 +3,7 @@ package keeper
 import (
 	abci "github.com/tendermint/tendermint/abci/types"
 
+	sdkioerrors "cosmossdk.io/errors"
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
@@ -20,7 +21,7 @@ const (
 // entry path with no extra data, and returns the path of that vstorage entry.
 func getVstorageEntryPath(urlPathSegments []string) (string, error) {
 	if len(urlPathSegments) != 1 || types.ValidatePath(urlPathSegments[0]) != nil {
-		return "", sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "invalid vstorage entry path")
+		return "", sdkioerrors.Wrap(sdkerrors.ErrInvalidRequest, "invalid vstorage entry path")
 	}
 	return urlPathSegments[0], nil
 }
@@ -51,7 +52,7 @@ func NewQuerier(keeper Keeper, legacyQuerierCdc *codec.LegacyAmino) sdk.Querier
 			}
 			return queryChildren(ctx, entryPath, req, keeper, legacyQuerierCdc)
 		default:
-			return nil, sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, "unknown vstorage query path")
+			return nil, sdkioerrors.Wrap(sdkerrors.ErrUnknownRequest, "unknown vstorage query path")
 		}
 	}
 }
@@ -60,12 +61,12 @@ func NewQuerier(keeper Keeper, legacyQuerierCdc *codec.LegacyAmino) sdk.Querier
 func queryData(ctx sdk.Context, path string, req abci.RequestQuery, keeper Keeper, legacyQuerierCdc *codec.LegacyAmino) (res []byte, err error) {
 	entry := keeper.GetEntry(ctx, path)
 	if !entry.HasValue() {
-		return nil, sdkerrors.Wrap(sdkerrors.ErrNotFound, "no data for vstorage path")
+		return nil, sdkioerrors.Wrap(sdkerrors.ErrNotFound, "no data for vstorage path")
 	}
 
 	bz, marshalErr := codec.MarshalJSONIndent(legacyQuerierCdc, types.Data{Value: entry.StringValue()})
 	if marshalErr != nil {
-		return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, marshalErr.Error())
+		return nil, sdkioerrors.Wrap(sdkerrors.ErrJSONMarshal, marshalErr.Error())
 	}
 
 	return bz, nil
@@ -82,7 +83,7 @@ func queryChildren(ctx sdk.Context, path string, req abci.RequestQuery, keeper K
 
 	bz, err2 := codec.MarshalJSONIndent(legacyQuerierCdc, types.Children{Children: klist})
 	if err2 != nil {
-		return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err2.Error())
+		return nil, sdkioerrors.Wrap(sdkerrors.ErrJSONMarshal, err2.Error())
 	}
 
 	return bz, nil

package/x/vstorage/keeper/querier_test.go

@@ -8,6 +8,7 @@ import (
 
 	abci "github.com/tendermint/tendermint/abci/types"
 
+	sdkioerrors "cosmossdk.io/errors"
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
@@ -26,7 +27,7 @@ func TestQuerier(t *testing.T) {
 		label    string
 		path     []string
 		expected []byte
-		err      *sdkerrors.Error
+		err      *sdkioerrors.Error
 	}
 	testCases := []testCase{}
 
@@ -77,7 +78,7 @@ func TestQuerier(t *testing.T) {
 	}...)
 
 	// Ensure stability of cosmos-sdk error codes
-	if codespace, code, _ := sdkerrors.ABCIInfo(sdkerrors.ErrNotFound, true); codespace != "sdk" || code != 38 {
+	if codespace, code, _ := sdkioerrors.ABCIInfo(sdkerrors.ErrNotFound, true); codespace != "sdk" || code != 38 {
 		t.Errorf("cosmos-sdk ErrNotFound has codespace %s, code %d, expected sdk/38", codespace, code)
 	}
 
@@ -102,7 +103,7 @@ func TestQuerier(t *testing.T) {
 		if desc.err != nil {
 			if err == nil {
 				t.Errorf("%s: got no error, want error %q", desc.label, *desc.err)
-			} else if codespace, code, _ := sdkerrors.ABCIInfo(err, true); codespace != desc.err.Codespace() || code != desc.err.ABCICode() {
+			} else if codespace, code, _ := sdkioerrors.ABCIInfo(err, true); codespace != desc.err.Codespace() || code != desc.err.ABCICode() {
 				t.Errorf("%s: got error %v, want error %q", desc.label, err, *desc.err)
 			}
 		} else if !bytes.Equal(res, desc.expected) {

package/x/vstorage/module.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 
-	"github.com/gorilla/mux"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/spf13/cobra"
 
@@ -57,10 +56,6 @@ func (AppModuleBasic) ValidateGenesis(cdc codec.JSONCodec, config client.TxEncod
 	return ValidateGenesis(&data)
 }
 
-// Register rest routes
-func (AppModuleBasic) RegisterRESTRoutes(ctx client.Context, rtr *mux.Router) {
-}
-
 func (AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *runtime.ServeMux) {
 	_ = types.RegisterQueryHandlerClient(context.Background(), mux, types.NewQueryClient(clientCtx))
 }

package/x/vstorage/testing/queue.go

@@ -0,0 +1,27 @@
+package testing
+
+import (
+	"fmt"
+
+	keeper "github.com/Agoric/agoric-sdk/golang/cosmos/x/vstorage/keeper"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+)
+
+func GetQueueItems(ctx sdk.Context, vstorageKeeper keeper.Keeper, queuePath string) ([]string, error) {
+	head, err := vstorageKeeper.GetIntValue(ctx, queuePath+".head")
+	if err != nil {
+		return nil, err
+	}
+	tail, err := vstorageKeeper.GetIntValue(ctx, queuePath+".tail")
+	if err != nil {
+		return nil, err
+	}
+	length := tail.Sub(head).Int64()
+	values := make([]string, length)
+	var i int64
+	for i = 0; i < length; i++ {
+		path := fmt.Sprintf("%s.%s", queuePath, head.Add(sdk.NewInt(i)).String())
+		values[i] = vstorageKeeper.GetEntry(ctx, path).StringValue()
+	}
+	return values, nil
+}

package/x/vtransfer/alias.go

@@ -0,0 +1,13 @@
+package vtransfer
+
+import (
+	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vtransfer/keeper"
+	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vtransfer/types"
+)
+
+const (
+	ModuleName = types.ModuleName
+	StoreKey   = types.StoreKey
+)
+
+type Keeper = keeper.Keeper

package/x/vtransfer/genesis.go

@@ -0,0 +1,39 @@
+package vtransfer
+
+import (
+	"fmt"
+
+	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vtransfer/types"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	abci "github.com/tendermint/tendermint/abci/types"
+)
+
+func NewGenesisState() *types.GenesisState {
+	return &types.GenesisState{}
+}
+
+func ValidateGenesis(data *types.GenesisState) error {
+	if data == nil {
+		return fmt.Errorf("vtransfer genesis data cannot be nil")
+	}
+	return nil
+}
+
+func DefaultGenesisState() *types.GenesisState {
+	return &types.GenesisState{}
+}
+
+func InitGenesis(ctx sdk.Context, keeper Keeper, data *types.GenesisState) []abci.ValidatorUpdate {
+	keeper.SetWatchedAddresses(ctx, data.GetWatchedAddresses())
+	return []abci.ValidatorUpdate{}
+}
+
+func ExportGenesis(ctx sdk.Context, k Keeper) *types.GenesisState {
+	var gs types.GenesisState
+	addresses, err := k.GetWatchedAddresses(ctx)
+	if err != nil {
+		panic(err)
+	}
+	gs.WatchedAddresses = addresses
+	return &gs
+}

package/x/vtransfer/genesis_test.go

@@ -0,0 +1,12 @@
+package vtransfer
+
+import (
+	"testing"
+)
+
+func TestDefaultGenesis(t *testing.T) {
+	defaultGenesisState := DefaultGenesisState()
+	if err := ValidateGenesis(defaultGenesisState); err != nil {
+		t.Errorf("DefaultGenesisState did not validate %v: %e", defaultGenesisState, err)
+	}
+}

package/x/vtransfer/handler.go

@@ -0,0 +1,20 @@
+package vtransfer
+
+import (
+	"fmt"
+
+	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vtransfer/keeper"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+)
+
+// NewHandler returns a handler for "vtransfer" type messages.
+func NewHandler(keeper keeper.Keeper) sdk.Handler {
+	return func(ctx sdk.Context, msg sdk.Msg) (*sdk.Result, error) {
+		switch msg := msg.(type) {
+		default:
+			errMsg := fmt.Sprintf("Unrecognized vtransfer Msg type: %T", msg)
+			return nil, sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, errMsg)
+		}
+	}
+}

package/x/vtransfer/ibc_middleware.go

@@ -0,0 +1,186 @@
+package vtransfer
+
+import (
+	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vtransfer/keeper"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
+	clienttypes "github.com/cosmos/ibc-go/v6/modules/core/02-client/types"
+	channeltypes "github.com/cosmos/ibc-go/v6/modules/core/04-channel/types"
+	porttypes "github.com/cosmos/ibc-go/v6/modules/core/05-port/types"
+	"github.com/cosmos/ibc-go/v6/modules/core/exported"
+)
+
+// IBCMiddleware (https://ibc.cosmos.network/main/ibc/apps/ibcmodule) forwards
+// most of its methods to the next layer in the stack (which may be the ibc-go
+// transfer application or another middleware), but hooks the packet-related
+// methods and sends them to vtransferKeeper for async interception by the
+// associated VM:
+//
+// 1. IBCModule channel handshake callbacks (OnChanOpenInit, OnChanOpenTry,
+// OnChanOpenAck, and OnChanOpenConfirm)—handled by the wrapped IBCModule.
+//
+// 2. IBCModule channel closing callbacks (OnChanCloseInit and
+// OnChanCloseConfirm)—handled by the wrapped IBCModule.
+//
+// 3. IBCModule packet callbacks (OnRecvPacket, OnAcknowledgementPacket, and
+// OnTimeoutPacket)—intercepted by vtransfer.
+//
+// 4. ICS4Wrapper packet initiation methods (SendPacket, WriteAcknowledgement
+// and GetAppVersion)—delegated by vtransfer to vibc.
+
+var _ porttypes.Middleware = (*IBCMiddleware)(nil)
+
+// IBCMiddleware implements the ICS26 callbacks for the middleware given the
+// underlying IBCModule and the keeper.
+type IBCMiddleware struct {
+	ibcModule       porttypes.IBCModule
+	vtransferKeeper keeper.Keeper
+}
+
+// NewIBCMiddleware creates a new IBCMiddleware given the underlying IBCModule and keeper.
+func NewIBCMiddleware(ibcModule porttypes.IBCModule, vtransferKeeper keeper.Keeper) IBCMiddleware {
+	return IBCMiddleware{
+		ibcModule:       ibcModule,
+		vtransferKeeper: vtransferKeeper,
+	}
+}
+
+///////////////////////////////////
+// The following channel handshake events are all directly forwarded to the
+// wrapped IBCModule.  They are not performed in the context of a packet, and so
+// do not need to be intercepted.
+
+// OnChanCloseInit implements the IBCModule interface.
+func (im IBCMiddleware) OnChanOpenInit(
+	ctx sdk.Context,
+	order channeltypes.Order,
+	connectionHops []string,
+	portID string,
+	channelID string,
+	chanCap *capabilitytypes.Capability,
+	counterparty channeltypes.Counterparty,
+	version string,
+) (string, error) {
+	return im.ibcModule.OnChanOpenInit(ctx, order, connectionHops, portID, channelID, chanCap, counterparty, version)
+}
+
+// OnChanOpenTry implements the IBCModule interface.
+func (im IBCMiddleware) OnChanOpenTry(
+	ctx sdk.Context,
+	order channeltypes.Order,
+	connectionHops []string,
+	portID,
+	channelID string,
+	chanCap *capabilitytypes.Capability,
+	counterparty channeltypes.Counterparty,
+	counterpartyVersion string,
+) (string, error) {
+	return im.ibcModule.OnChanOpenTry(ctx, order, connectionHops, portID, channelID, chanCap, counterparty, counterpartyVersion)
+}
+
+// OnChanOpenAck implements the IBCModule interface.
+func (im IBCMiddleware) OnChanOpenAck(
+	ctx sdk.Context,
+	portID,
+	channelID string,
+	counterpartyChannelID string,
+	counterpartyVersion string,
+) error {
+	return im.ibcModule.OnChanOpenAck(ctx, portID, channelID, counterpartyChannelID, counterpartyVersion)
+}
+
+// OnChanOpenConfirm implements the IBCModule interface.
+func (im IBCMiddleware) OnChanOpenConfirm(
+	ctx sdk.Context,
+	portID,
+	channelID string,
+) error {
+	return im.ibcModule.OnChanOpenConfirm(ctx, portID, channelID)
+}
+
+// OnChanCloseInit implements the IBCModule interface.
+func (im IBCMiddleware) OnChanCloseInit(
+	ctx sdk.Context,
+	portID,
+	channelID string,
+) error {
+	return im.ibcModule.OnChanCloseInit(ctx, portID, channelID)
+}
+
+// OnChanCloseConfirm implements the IBCModule interface.
+func (im IBCMiddleware) OnChanCloseConfirm(
+	ctx sdk.Context,
+	portID,
+	channelID string,
+) error {
+	return im.ibcModule.OnChanCloseConfirm(ctx, portID, channelID)
+}
+
+///////////////////////////////////
+// The following packet methods are all implemented by
+// im.vtransferKeeper.Intercept*, so named because those methods are "tee"s
+// combining the middleware stack with an interception of the packet event
+// (On*Packet) or packet method (WriteAcknowledgment) by the async VM.
+
+// OnRecvPacket implements the IBCModule interface.
+func (im IBCMiddleware) OnRecvPacket(
+	ctx sdk.Context,
+	packet channeltypes.Packet,
+	relayer sdk.AccAddress,
+) exported.Acknowledgement {
+	return im.vtransferKeeper.InterceptOnRecvPacket(ctx, im.ibcModule, packet, relayer)
+}
+
+// OnAcknowledgementPacket implements the IBCModule interface.
+func (im IBCMiddleware) OnAcknowledgementPacket(
+	ctx sdk.Context,
+	packet channeltypes.Packet,
+	acknowledgement []byte,
+	relayer sdk.AccAddress,
+) error {
+	return im.vtransferKeeper.InterceptOnAcknowledgementPacket(ctx, im.ibcModule, packet, acknowledgement, relayer)
+}
+
+// OnTimeoutPacket implements the IBCModule interface.
+func (im IBCMiddleware) OnTimeoutPacket(
+	ctx sdk.Context,
+	packet channeltypes.Packet,
+	relayer sdk.AccAddress,
+) error {
+	return im.vtransferKeeper.InterceptOnTimeoutPacket(ctx, im.ibcModule, packet, relayer)
+}
+
+// WriteAcknowledgement implements the ICS4 Wrapper interface.
+// Unlike implementations of IBCModule interface methods, implementations of
+// ICS4 Wrapper interface methods do not pass along the wrapped IBC module
+// because they support packet initiation.
+func (im IBCMiddleware) WriteAcknowledgement(
+	ctx sdk.Context,
+	chanCap *capabilitytypes.Capability,
+	packet exported.PacketI,
+	ack exported.Acknowledgement,
+) error {
+	return im.vtransferKeeper.InterceptWriteAcknowledgement(ctx, chanCap, packet, ack)
+}
+
+///////////////////////////////////
+// The following methods are directly implemented by the ICS4Wrapper outside of
+// us, whether the ibc-go stack or another middleware.
+
+// SendPacket implements the ICS4 Wrapper interface.
+func (im IBCMiddleware) SendPacket(
+	ctx sdk.Context,
+	chanCap *capabilitytypes.Capability,
+	sourcePort string,
+	sourceChannel string,
+	timeoutHeight clienttypes.Height,
+	timeoutTimestamp uint64,
+	data []byte,
+) (uint64, error) {
+	return im.vtransferKeeper.SendPacket(ctx, chanCap, sourcePort, sourceChannel, timeoutHeight, timeoutTimestamp, data)
+}
+
+// GetAppVersion implements the ICS4 Wrapper interface.
+func (im IBCMiddleware) GetAppVersion(ctx sdk.Context, portID, channelID string) (string, bool) {
+	return im.vtransferKeeper.GetAppVersion(ctx, portID, channelID)
+}