@agoric/cosmos 0.34.2-orchestration-dev-096c4e8.0 → 0.34.2-upgrade-16-fi-dev-8879538.0

package/vm/server.go

@@ -1,23 +1,124 @@
 package vm
 
 import (
+	"context"
 	"fmt"
+	"sync"
+
+	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
-type AgdServer struct{}
+// AgdServer manages communication from the VM to the ABCI app.  The structure
+// is mutable and the mutex must be held to read or write any field.
+type AgdServer struct {
+	currentCtx context.Context
+	mtx        sync.Mutex
+	// zero is an out-of-bounds port number
+	lastPort int
+	// portToHandler[i] is nonzero iff portToName[i] is nonempty
+	portToHandler map[int]PortHandler
+	// portToName[nameToPort[s]] == s && nameToPort[portToName[i]] == i for all i, s
+	portToName map[int]string
+	nameToPort map[string]int
+}
+
+var wrappedEmptySDKContext = sdk.WrapSDKContext(
+	sdk.Context{}.WithContext(context.Background()),
+)
 
+// NewAgdServer returns a pointer to a new AgdServer with empty context and port
+// mappings.
 func NewAgdServer() *AgdServer {
-	return &AgdServer{}
+	return &AgdServer{
+		currentCtx:    wrappedEmptySDKContext,
+		mtx:           sync.Mutex{},
+		portToHandler: make(map[int]PortHandler),
+		portToName:    make(map[int]string),
+		nameToPort:    make(map[string]int),
+	}
+}
+
+// SetControllerContext sets the context to the given argument and returns a function
+// which will reset the context to an empty context (not the old context).
+func (s *AgdServer) SetControllerContext(ctx sdk.Context) func() {
+	// We are only called by the controller, so we assume that it is billing its
+	// own meter usage.
+	s.mtx.Lock()
+	defer s.mtx.Unlock()
+	s.currentCtx = sdk.WrapSDKContext(ctx.WithGasMeter(sdk.NewInfiniteGasMeter()))
+	return func() {
+		s.mtx.Lock()
+		defer s.mtx.Unlock()
+		s.currentCtx = wrappedEmptySDKContext
+	}
+}
+
+// getContextAndHandler returns the current context and the handler for the
+// given port number.
+func (s *AgdServer) getContextAndHandler(port int) (context.Context, PortHandler) {
+	s.mtx.Lock()
+	defer s.mtx.Unlock()
+	ctx := s.currentCtx
+	handler := s.portToHandler[port]
+	return ctx, handler
 }
 
 // ReceiveMessage is the method the VM calls in order to have agd receive a
 // Message.
-func (s AgdServer) ReceiveMessage(msg *Message, reply *string) error {
-	handler := portToHandler[msg.Port]
+func (s *AgdServer) ReceiveMessage(msg *Message, reply *string) error {
+	ctx, handler := s.getContextAndHandler(msg.Port)
 	if handler == nil {
 		return fmt.Errorf("unregistered port %d", msg.Port)
 	}
-	resp, err := handler.Receive(controllerContext, msg.Data)
+	resp, err := handler.Receive(ctx, msg.Data)
 	*reply = resp
 	return err
 }
+
+// GetPort returns the port number for the given port name, or 0 if the name is
+// not registered.
+func (s *AgdServer) GetPort(name string) int {
+	s.mtx.Lock()
+	defer s.mtx.Unlock()
+	return s.nameToPort[name]
+}
+
+// MustRegisterPortHandler attempts to RegisterPortHandler, panicing on error.
+func (s *AgdServer) MustRegisterPortHandler(name string, portHandler PortHandler) int {
+	port, err := s.RegisterPortHandler(name, portHandler)
+	if err != nil {
+		panic(err)
+	}
+	return port
+}
+
+// RegisterPortHandler registers the handler to a new port number, then maps the name to it,
+// returning the port number. If the name was previously in use, an error is returned.
+func (s *AgdServer) RegisterPortHandler(name string, portHandler PortHandler) (int, error) {
+	s.mtx.Lock()
+	defer s.mtx.Unlock()
+	if _, ok := s.nameToPort[name]; ok {
+		return 0, fmt.Errorf("name %s already in use", name)
+	}
+	s.lastPort++
+	s.portToHandler[s.lastPort] = NewProtectedPortHandler(portHandler)
+	s.portToName[s.lastPort] = name
+	s.nameToPort[name] = s.lastPort
+	return s.lastPort, nil
+}
+
+// UnregisterPortHandler unregisters the handler and name mappings for this port
+// number, and the reverse mapping for its name, if any of these exist.  If
+// portNum is not registered, return an error.
+func (s *AgdServer) UnregisterPortHandler(portNum int) error {
+	s.mtx.Lock()
+	defer s.mtx.Unlock()
+	if s.portToHandler[portNum] == nil {
+		return fmt.Errorf("port %d not registered", portNum)
+	}
+	delete(s.portToHandler, portNum)
+	name := s.portToName[portNum]
+	delete(s.portToName, portNum)
+	delete(s.nameToPort, name)
+	return nil
+}

package/x/swingset/genesis.go

@@ -64,7 +64,7 @@ func InitGenesis(ctx sdk.Context, k Keeper, swingStoreExportsHandler *SwingStore
 			ReadNextArtifact:    artifactProvider.ReadNextArtifact,
 		},
 		keeper.SwingStoreRestoreOptions{
-			ArtifactMode:   keeper.SwingStoreArtifactModeReplay,
+			ArtifactMode:   keeper.SwingStoreArtifactModeOperational,
 			ExportDataMode: keeper.SwingStoreExportDataModeAll,
 		},
 	)
@@ -98,9 +98,8 @@ func ExportGenesis(ctx sdk.Context, k Keeper, swingStoreExportsHandler *SwingSto
 		// The export will fail if the export of a historical height was requested
 		snapshotHeight,
 		swingStoreGenesisEventHandler{exportDir: swingStoreExportDir, snapshotHeight: snapshotHeight},
-		// The export will fail if the swing-store does not contain all replay artifacts
 		keeper.SwingStoreExportOptions{
-			ArtifactMode:   keeper.SwingStoreArtifactModeReplay,
+			ArtifactMode:   keeper.SwingStoreArtifactModeOperational,
 			ExportDataMode: keeper.SwingStoreExportDataModeSkip,
 		},
 	)

package/x/swingset/keeper/extension_snapshotter.go

@@ -125,7 +125,7 @@ func (snapshotter *ExtensionSnapshotter) InitiateSnapshot(height int64) error {
 	blockHeight := uint64(height)
 
 	return snapshotter.swingStoreExportsHandler.InitiateExport(blockHeight, snapshotter, SwingStoreExportOptions{
-		ArtifactMode:   SwingStoreArtifactModeReplay,
+		ArtifactMode:   SwingStoreArtifactModeOperational,
 		ExportDataMode: SwingStoreExportDataModeSkip,
 	})
 }
@@ -304,6 +304,6 @@ func (snapshotter *ExtensionSnapshotter) RestoreExtension(blockHeight uint64, fo
 
 	return snapshotter.swingStoreExportsHandler.RestoreExport(
 		SwingStoreExportProvider{BlockHeight: blockHeight, GetExportDataReader: getExportDataReader, ReadNextArtifact: readNextArtifact},
-		SwingStoreRestoreOptions{ArtifactMode: SwingStoreArtifactModeReplay, ExportDataMode: SwingStoreExportDataModeAll},
+		SwingStoreRestoreOptions{ArtifactMode: SwingStoreArtifactModeOperational, ExportDataMode: SwingStoreExportDataModeAll},
 	)
 }

package/x/swingset/module.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/gorilla/mux"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/spf13/cobra"
 
@@ -60,10 +59,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/swingset/types/swingset.pb.go

@@ -27,7 +27,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
 // CoreEvalProposal is a gov Content type for evaluating code in the SwingSet
 // core.
-// See `agoric-sdk/packages/vats/src/core/eval.js`.
+// See `bridgeCoreEval` in agoric-sdk packages/vats/src/core/chain-behaviors.js.
 type CoreEvalProposal struct {
 	Title       string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"`
 	Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`

package/x/vbank/module.go

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

package/x/vibc/module.go

@@ -3,7 +3,6 @@ package vibc
 import (
 	"encoding/json"
 
-	"github.com/gorilla/mux"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/spf13/cobra"
 
@@ -51,10 +50,6 @@ func (AppModuleBasic) ValidateGenesis(cdc codec.JSONCodec, config client.TxEncod
 	return nil
 }
 
-// Register rest routes
-func (AppModuleBasic) RegisterRESTRoutes(ctx client.Context, rtr *mux.Router) {
-}
-
 func (AppModuleBasic) RegisterGRPCGatewayRoutes(_ client.Context, _ *runtime.ServeMux) {
 }
 
@@ -70,7 +65,7 @@ func (AppModuleBasic) GetQueryCmd() *cobra.Command {
 
 type AppModule struct {
 	AppModuleBasic
-	keeper Keeper
+	keeper     Keeper
 	bankKeeper types.BankKeeper
 }
 
@@ -79,7 +74,7 @@ func NewAppModule(k Keeper, bankKeeper types.BankKeeper) AppModule {
 	am := AppModule{
 		AppModuleBasic: AppModuleBasic{},
 		keeper:         k,
-		bankKeeper:		 bankKeeper,
+		bankKeeper:     bankKeeper,
 	}
 	return am
 }

package/x/vibc/types/ibc_module.go

@@ -7,7 +7,6 @@ import (
 	channeltypes "github.com/cosmos/ibc-go/v6/modules/core/04-channel/types"
 	porttypes "github.com/cosmos/ibc-go/v6/modules/core/05-port/types"
 	host "github.com/cosmos/ibc-go/v6/modules/core/24-host"
-	ibckeeper "github.com/cosmos/ibc-go/v6/modules/core/keeper"
 
 	"github.com/cosmos/ibc-go/v6/modules/core/exported"
 
@@ -19,7 +18,9 @@ const (
 	// asynchronous versions.  If it does, then the VM must supply an empty
 	// version string to indicate that the VM explicitly (possibly async)
 	// performs the Write* method.
-	AsyncVersions = ibckeeper.AsyncVersionNegotiation
+	// This flag is created in anticipation of ibc-go implementing async versions,
+	// see https://github.com/Agoric/agoric-sdk/issues/9358 for more details.
+	AsyncVersions = false
 )
 
 var (

package/x/vlocalchain/vlocalchain.go

@@ -45,7 +45,7 @@ func (h portHandler) Receive(cctx context.Context, str string) (ret string, err
 		}
 		ret = string(bz)
 
-	case "VLOCALCHAIN_QUERY":
+	case "VLOCALCHAIN_QUERY_MANY":
 		// Copy the JSON messages string into a CosmosTx object so we can
 		// deserialize it with just proto3 JSON.
 		cosmosTxBz := []byte(`{"messages":` + string(msg.Messages) + `}`)

package/x/vlocalchain/vlocalchain_test.go

@@ -180,7 +180,7 @@ func TestQuery(t *testing.T) {
 		tc := tc
 		ctx := sdk.UnwrapSDKContext(cctx)
 		t.Run(tc.name, func(t *testing.T) {
-			msgGetBalances := `{"type":"VLOCALCHAIN_QUERY","messages":[{"@type":"/cosmos.bank.v1beta1.QueryAllBalancesRequest","address":"` + tc.addr + `"}]}`
+			msgGetBalances := `{"type":"VLOCALCHAIN_QUERY_MANY","messages":[{"@type":"/cosmos.bank.v1beta1.QueryAllBalancesRequest","address":"` + tc.addr + `"}]}`
 			t.Logf("query request: %v", msgGetBalances)
 			ret, err := handler.Receive(cctx, msgGetBalances)
 			t.Logf("query response: %v", ret)

package/x/vstorage/keeper/grpc_query.go

@@ -94,7 +94,6 @@ var capDataRemotableValueFormats = map[string]string{
 //	}
 //
 // ```
-// cf. https://github.com/Agoric/agoric-sdk/blob/6e5b422b80e47c4dac151404f43faea5ab41e9b0/scripts/get-flattened-publication.sh
 func flatten(input interface{}, output map[string]interface{}, key string, top bool) error {
 	// Act on the raw representation of a Remotable.
 	if remotable, ok := input.(*capdata.CapdataRemotable); ok {

package/x/vstorage/keeper/keeper.go

@@ -22,8 +22,8 @@ import (
 // StreamCell is an envelope representing a sequence of values written at a path in a single block.
 // It is persisted to storage as a { "blockHeight": "<digits>", "values": ["...", ...] } JSON text
 // that off-chain consumers rely upon.
-// Many of those consumers *also* rely upon the strings of "values" being valid JSON text
-// (cf. scripts/get-flattened-publication.sh), but we do not enforce that in this package.
+// Many of those consumers *also* rely upon the strings of "values" being valid JSON text,
+// but we do not enforce that in this package.
 type StreamCell struct {
 	BlockHeight string   `json:"blockHeight"`
 	Values      []string `json:"values"`
@@ -52,14 +52,6 @@ var _ ChangeManager = (*BatchingChangeManager)(nil)
 // 2 ** 256 - 1
 var MaxSDKInt = sdk.NewIntFromBigInt(new(big.Int).Sub(new(big.Int).Exp(big.NewInt(2), big.NewInt(256), nil), big.NewInt(1)))
 
-// TODO: Use bytes.CutPrefix once we can rely upon go >= 1.20.
-func cutPrefix(s, prefix []byte) (after []byte, found bool) {
-	if !bytes.HasPrefix(s, prefix) {
-		return s, false
-	}
-	return s[len(prefix):], true
-}
-
 // Keeper maintains the link to data storage and exposes getter/setter methods
 // for the various parts of the state machine
 type Keeper struct {
@@ -164,7 +156,7 @@ func (k Keeper) ExportStorageFromPrefix(ctx sdk.Context, pathPrefix string) []*t
 		if !strings.HasPrefix(path, pathPrefix) {
 			continue
 		}
-		value, hasPrefix := cutPrefix(rawValue, types.EncodedDataPrefix)
+		value, hasPrefix := bytes.CutPrefix(rawValue, types.EncodedDataPrefix)
 		if !hasPrefix {
 			panic(fmt.Errorf("value at path %q starts with unexpected prefix", path))
 		}
@@ -266,7 +258,7 @@ func (k Keeper) GetEntry(ctx sdk.Context, path string) agoric.KVEntry {
 	if bytes.Equal(rawValue, types.EncodedNoDataValue) {
 		return agoric.NewKVEntryWithNoValue(path)
 	}
-	value, hasPrefix := cutPrefix(rawValue, types.EncodedDataPrefix)
+	value, hasPrefix := bytes.CutPrefix(rawValue, types.EncodedDataPrefix)
 	if !hasPrefix {
 		panic(fmt.Errorf("value at path %q starts with unexpected prefix", path))
 	}

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/ante/fee.go

@@ -1,97 +0,0 @@
-package ante
-
-import (
-	"fmt"
-
-	sdkioerrors "cosmossdk.io/errors"
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
-	"github.com/cosmos/cosmos-sdk/x/auth/types"
-)
-
-// DeductFeeDecorator deducts fees from the first signer of the tx
-// If the first signer does not have the funds to pay for the fees, return with InsufficientFunds error
-// Call next AnteHandler if fees successfully deducted
-// CONTRACT: Tx must implement FeeTx interface to use DeductFeeDecorator
-type DeductFeeDecorator struct {
-	ak               AccountKeeper
-	bankKeeper       types.BankKeeper
-	feegrantKeeper   FeegrantKeeper
-	feeCollectorName string
-}
-
-func NewDeductFeeDecorator(ak AccountKeeper, bk types.BankKeeper, fk FeegrantKeeper, feeCollectorName string) DeductFeeDecorator {
-	return DeductFeeDecorator{
-		ak:               ak,
-		bankKeeper:       bk,
-		feegrantKeeper:   fk,
-		feeCollectorName: feeCollectorName,
-	}
-}
-
-func (dfd DeductFeeDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (newCtx sdk.Context, err error) {
-	feeTx, ok := tx.(sdk.FeeTx)
-	if !ok {
-		return ctx, sdkioerrors.Wrap(sdkerrors.ErrTxDecode, "Tx must be a FeeTx")
-	}
-
-	if addr := dfd.ak.GetModuleAddress(dfd.feeCollectorName); addr == nil {
-		return ctx, fmt.Errorf("fee collector module account (%s) has not been set", dfd.feeCollectorName)
-	}
-
-	fee := feeTx.GetFee()
-	feePayer := feeTx.FeePayer()
-	feeGranter := feeTx.FeeGranter()
-
-	deductFeesFrom := feePayer
-
-	// if feegranter set deduct fee from feegranter account.
-	// this works with only when feegrant enabled.
-	if feeGranter != nil {
-		if dfd.feegrantKeeper == nil {
-			return ctx, sdkioerrors.Wrap(sdkerrors.ErrInvalidRequest, "fee grants are not enabled")
-		} else if !feeGranter.Equals(feePayer) {
-			err := dfd.feegrantKeeper.UseGrantedFees(ctx, feeGranter, feePayer, fee, tx.GetMsgs())
-
-			if err != nil {
-				return ctx, sdkioerrors.Wrapf(err, "%s not allowed to pay fees from %s", feeGranter, feePayer)
-			}
-		}
-
-		deductFeesFrom = feeGranter
-	}
-
-	deductFeesFromAcc := dfd.ak.GetAccount(ctx, deductFeesFrom)
-	if deductFeesFromAcc == nil {
-		return ctx, sdkioerrors.Wrapf(sdkerrors.ErrUnknownAddress, "fee payer address: %s does not exist", deductFeesFrom)
-	}
-
-	// deduct the fees
-	if !feeTx.GetFee().IsZero() {
-		err = DeductFees(dfd.bankKeeper, ctx, deductFeesFromAcc, feeTx.GetFee(), dfd.feeCollectorName)
-		if err != nil {
-			return ctx, err
-		}
-	}
-
-	events := sdk.Events{sdk.NewEvent(sdk.EventTypeTx,
-		sdk.NewAttribute(sdk.AttributeKeyFee, feeTx.GetFee().String()),
-	)}
-	ctx.EventManager().EmitEvents(events)
-
-	return next(ctx, tx, simulate)
-}
-
-// DeductFees deducts fees from the given account.
-func DeductFees(bankKeeper types.BankKeeper, ctx sdk.Context, acc types.AccountI, fees sdk.Coins, feeCollectorName string) error {
-	if !fees.IsValid() {
-		return sdkioerrors.Wrapf(sdkerrors.ErrInsufficientFee, "invalid fee amount: %s", fees)
-	}
-
-	err := bankKeeper.SendCoinsFromAccountToModule(ctx, acc.GetAddress(), feeCollectorName, fees)
-	if err != nil {
-		return sdkioerrors.Wrapf(sdkerrors.ErrInsufficientFunds, err.Error())
-	}
-
-	return nil
-}