@agoric/cosmos 0.35.0-u19.2 → 0.35.0-u21.0

package/types/codec.go

@@ -0,0 +1,23 @@
+package types
+
+import (
+	"github.com/cosmos/cosmos-sdk/codec"
+	cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
+)
+
+var (
+	// packageCdc is the codec used for proto3 JSON serialization of proto.Message
+	// data structures that wouldn't otherwise survive round-tripping via a
+	// regular "encoding/json" Marshal->JSON.parse.
+	//
+	// The naïve json.Marshal output for an int64 (64-bit precision) is a JSON
+	// number, which is subject to rounding errors when parsed by JavaScript
+	// (whose numbers are IEEE 754 binary64 values with only 53-bit precision).
+	// The codec.ProtoCodec uses a custom JSON marshaller that converts each int64
+	// to and from a string with no loss of precision.
+	//
+	// The current package's IBCPacket was one such affected data structure, which
+	// now implements Marshaler and Unmarshaler interfaces for "encoding/json" to
+	// take advantage of the packageCdc.
+	packageCdc = codec.NewProtoCodec(cdctypes.NewInterfaceRegistry())
+)

package/types/ibc_packet.go

@@ -0,0 +1,64 @@
+package types
+
+import (
+	"encoding/json"
+
+	clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
+	channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
+	"github.com/cosmos/ibc-go/v7/modules/core/exported"
+)
+
+var _ json.Marshaler = IBCPacket{}
+var _ json.Unmarshaler = (*IBCPacket)(nil)
+var _ exported.PacketI = IBCPacket{}
+
+type IBCPacket struct {
+	channeltypes.Packet
+}
+
+func (p IBCPacket) MarshalJSON() ([]byte, error) {
+	return packageCdc.MarshalJSON(&p.Packet)
+}
+
+func (p *IBCPacket) UnmarshalJSON(bz []byte) error {
+	return packageCdc.UnmarshalJSON(bz, &p.Packet)
+}
+
+func MakeIBCPacket(
+	data []byte,
+	sequence uint64,
+	sourcePort string,
+	sourceChannel string,
+	destPort string,
+	destChannel string,
+	timeoutHeight clienttypes.Height,
+	timeoutTimestamp uint64,
+) IBCPacket {
+	cp := channeltypes.NewPacket(
+		data, sequence,
+		sourcePort, sourceChannel,
+		destPort, destChannel,
+		timeoutHeight, timeoutTimestamp,
+	)
+	return IBCPacket{Packet: cp}
+}
+
+func CopyToChannelPacket(packet exported.PacketI) channeltypes.Packet {
+	timeoutHeight := clienttypes.MustParseHeight(packet.GetTimeoutHeight().String())
+	return channeltypes.NewPacket(
+		packet.GetData(), packet.GetSequence(),
+		packet.GetSourcePort(), packet.GetSourceChannel(),
+		packet.GetDestPort(), packet.GetDestChannel(),
+		timeoutHeight, packet.GetTimeoutTimestamp(),
+	)
+}
+
+func CopyToIBCPacket(packet exported.PacketI) IBCPacket {
+	timeoutHeight := clienttypes.MustParseHeight(packet.GetTimeoutHeight().String())
+	return MakeIBCPacket(
+		packet.GetData(), packet.GetSequence(),
+		packet.GetSourcePort(), packet.GetSourceChannel(),
+		packet.GetDestPort(), packet.GetDestChannel(),
+		timeoutHeight, packet.GetTimeoutTimestamp(),
+	)
+}

package/types/ibc_packet_test.go

@@ -0,0 +1,117 @@
+package types_test
+
+import (
+	"bytes"
+	"encoding/json"
+	fmt "fmt"
+	"reflect"
+	"testing"
+
+	agtypes "github.com/Agoric/agoric-sdk/golang/cosmos/types"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
+	channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
+	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
+)
+
+func CreateTestChannelPacket() channeltypes.Packet {
+	return channeltypes.NewPacket(
+		[]byte("data"),
+		987654321098765432,
+		"port-src", "channel-13",
+		"port-dst", "channel-42",
+		clienttypes.Height{},
+		123456789012345678,
+	)
+}
+
+func TestPacket(t *testing.T) {
+	testCases := []struct {
+		name   string
+		packet ibcexported.PacketI
+	}{
+		{
+			name:   "ibc-go channel Packet",
+			packet: CreateTestChannelPacket(),
+		},
+		{
+			name:   "agoric-sdk IBCPacket",
+			packet: agtypes.CopyToIBCPacket(CreateTestChannelPacket()),
+		},
+	}
+
+	// Check that the packets have the expected values
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			pi := tc.packet
+			assert.Equal(t, "port-src", pi.GetSourcePort())
+			assert.Equal(t, "channel-13", pi.GetSourceChannel())
+			assert.Equal(t, "port-dst", pi.GetDestPort())
+			assert.Equal(t, "channel-42", pi.GetDestChannel())
+			assert.Equal(t, uint64(987654321098765432), pi.GetSequence())
+			assert.Equal(t, uint64(123456789012345678), pi.GetTimeoutTimestamp())
+			assert.Equal(t, []byte("data"), pi.GetData())
+			assert.Equal(t, clienttypes.Height{}, pi.GetTimeoutHeight())
+		})
+	}
+}
+
+func TestPacketJSON(t *testing.T) {
+	testCases := []struct {
+		name   string
+		packet ibcexported.PacketI
+		quoted bool
+	}{
+		{
+			name:   "ibc-go channel Packet",
+			packet: CreateTestChannelPacket(),
+			quoted: false,
+		},
+		{
+			name:   "agoric-sdk IBCPacket",
+			packet: agtypes.CopyToIBCPacket(CreateTestChannelPacket()),
+			quoted: true,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			bz, err := json.Marshal(tc.packet)
+			require.NoError(t, err)
+
+			seqStr := fmt.Sprintf("%d", tc.packet.GetSequence())
+			if !bytes.Contains(bz, []byte(seqStr)) {
+				assert.Failf(t, "packet sequence should be present in JSON", "sequence %s, json %s", seqStr, string(bz))
+			}
+
+			if bytes.Contains(bz, []byte(`"`+seqStr+`"`)) != tc.quoted {
+				if tc.quoted {
+					assert.Failf(t, "packet sequence should be quoted in JSON", "sequence %s, json %s", seqStr, string(bz))
+				} else {
+					assert.Failf(t, "packet sequence should not be quoted in JSON", "sequence %s, json %s", seqStr, string(bz))
+				}
+			}
+
+			var packet2 ibcexported.PacketI
+			switch p := tc.packet.(type) {
+			case channeltypes.Packet:
+				var p2 channeltypes.Packet
+				err = json.Unmarshal(bz, &p2)
+				packet2 = p2
+			case agtypes.IBCPacket:
+				var p2 agtypes.IBCPacket
+				err = json.Unmarshal(bz, &p2)
+				packet2 = p2
+			default:
+				t.Fatalf("unexpected packet type %T", p)
+			}
+
+			require.NoError(t, err)
+			if !reflect.DeepEqual(tc.packet, packet2) {
+				assert.Failf(t, "nested packet not equal after JSON round trip", "src %q, dst %q", tc.packet, packet2)
+			}
+		})
+	}
+}

package/vm/client.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"net/rpc"
+	"sync"
 )
 
 // ReceiveMessageMethod is the name of the method we call in order to have the
@@ -34,12 +35,21 @@ var _ rpc.ClientCodec = (*ClientCodec)(nil)
 // having the WriteRequest() method fabricate a Receive() call to clear the rpc
 // state.
 type ClientCodec struct {
-	ctx         context.Context
-	send        func(port, rPort int, msg string)
-	outbound    map[int]rpc.Request
-	inbound     chan *rpc.Response
-	replies     map[uint64]string
+	ctx     context.Context
+	send    func(port, rPort int, msg string)
+	inbound chan *rpc.Response
+
+	// reqMutex protects outbound requests.
+	reqMutex sync.Mutex
+	outbound map[int]rpc.Request
+
+	// Scratch space to communicate between ReadResponseHeader and
+	// ReadResponseBody (protected by mutex in "net/rpc" implementation).
 	replyToRead uint64
+
+	// mutex protects replies map
+	mutex   sync.Mutex
+	replies map[uint64]string
 }
 
 // NewClientCodec creates a new ClientCodec.
@@ -64,7 +74,11 @@ func (cc *ClientCodec) WriteRequest(r *rpc.Request, body interface{}) error {
 		return fmt.Errorf("body %T is not a Message", body)
 	}
 	rPort := int(r.Seq + 1) // rPort is 1-indexed to indicate it's required
+
+	cc.reqMutex.Lock()
 	cc.outbound[rPort] = *r
+	cc.reqMutex.Unlock()
+
 	var senderReplyPort int
 	if msg.NeedsReply {
 		senderReplyPort = rPort
@@ -85,18 +99,27 @@ func (cc *ClientCodec) ReadResponseHeader(r *rpc.Response) error {
 }
 
 // ReadResponseBody decodes a response body (currently just string) from the VM.
+// and will always be called immediately after ReadResponseHeader (cf.
+// https://pkg.go.dev/net/rpc#ClientCodec ).
 func (cc *ClientCodec) ReadResponseBody(body interface{}) error {
+	cc.mutex.Lock()
+	reply := cc.replies[cc.replyToRead]
+	delete(cc.replies, cc.replyToRead)
+	cc.mutex.Unlock()
+
 	if body != nil {
-		*body.(*string) = cc.replies[cc.replyToRead]
+		*body.(*string) = reply
 	}
-	delete(cc.replies, cc.replyToRead)
 	return nil
 }
 
 // Receive is called by the VM to send a response to the client.
 func (cc *ClientCodec) Receive(rPort int, isError bool, data string) error {
+	cc.reqMutex.Lock()
 	outb := cc.outbound[rPort]
 	delete(cc.outbound, rPort)
+	cc.reqMutex.Unlock()
+
 	resp := &rpc.Response{
 		ServiceMethod: outb.ServiceMethod,
 		Seq:           outb.Seq,
@@ -104,7 +127,9 @@ func (cc *ClientCodec) Receive(rPort int, isError bool, data string) error {
 	if isError {
 		resp.Error = data
 	} else {
+		cc.mutex.Lock()
 		cc.replies[resp.Seq] = data
+		cc.mutex.Unlock()
 	}
 	cc.inbound <- resp
 	return nil

package/vm/proto_json.go

@@ -3,8 +3,8 @@ package vm
 import (
 	"encoding/json"
 
-	"github.com/gogo/protobuf/jsonpb"
-	"github.com/gogo/protobuf/proto"
+	"github.com/cosmos/gogoproto/jsonpb"
+	"github.com/cosmos/gogoproto/proto"
 )
 
 // We need jsonpb for its access to the global registry.

package/x/swingset/abci.go

@@ -6,9 +6,9 @@ import (
 	"fmt"
 	"time"
 
+	abci "github.com/cometbft/cometbft/abci/types"
 	"github.com/cosmos/cosmos-sdk/telemetry"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	abci "github.com/tendermint/tendermint/abci/types"
 
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/types"

package/x/swingset/alias.go

@@ -13,7 +13,6 @@ const (
 
 var (
 	NewKeeper            = keeper.NewKeeper
-	NewQuerier           = keeper.NewQuerier
 	NewMsgDeliverInbound = types.NewMsgDeliverInbound
 	NewMsgProvision      = types.NewMsgProvision
 	NewMailbox           = types.NewMailbox

package/x/swingset/config.go

@@ -7,9 +7,9 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/cosmos/cosmos-sdk/client/flags"
-	pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types"
 	serverconfig "github.com/cosmos/cosmos-sdk/server/config"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
+	pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types"
 
 	"github.com/Agoric/agoric-sdk/golang/cosmos/util"
 )

package/x/swingset/keeper/extension_snapshotter.go

@@ -9,9 +9,9 @@ import (
 
 	agoric "github.com/Agoric/agoric-sdk/golang/cosmos/types"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/types"
+	"github.com/cometbft/cometbft/libs/log"
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	snapshots "github.com/cosmos/cosmos-sdk/snapshots/types"
-	"github.com/tendermint/tendermint/libs/log"
 )
 
 // This module implements a Cosmos ExtensionSnapshotter to capture and restore

package/x/swingset/keeper/extension_snapshotter_test.go

@@ -4,7 +4,7 @@ import (
 	"io"
 	"testing"
 
-	"github.com/tendermint/tendermint/libs/log"
+	"github.com/cometbft/cometbft/libs/log"
 )
 
 func newTestExtensionSnapshotter() *ExtensionSnapshotter {

package/x/swingset/keeper/keeper.go

@@ -9,7 +9,7 @@ import (
 
 	sdkmath "cosmossdk.io/math"
 
-	"github.com/tendermint/tendermint/libs/log"
+	"github.com/cometbft/cometbft/libs/log"
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/codec"

package/x/swingset/keeper/keeper_test.go

@@ -11,7 +11,7 @@ import (
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	dbm "github.com/tendermint/tm-db"
+	dbm "github.com/cometbft/cometbft-db"
 )
 
 func mkcoin(denom string) func(amt int64) sdk.Coin {

package/x/swingset/keeper/querier.go

@@ -2,9 +2,8 @@ package keeper
 
 import (
 	"fmt"
-	"strings"
 
-	abci "github.com/tendermint/tendermint/abci/types"
+	abci "github.com/cometbft/cometbft/abci/types"
 
 	sdkioerrors "cosmossdk.io/errors"
 	"github.com/cosmos/cosmos-sdk/codec"
@@ -22,34 +21,6 @@ const (
 	LegacyQueryKeys    = "keys"
 )
 
-// NewQuerier is the module level router for state queries
-func NewQuerier(keeper Keeper, legacyQuerierCdc *codec.LegacyAmino) sdk.Querier {
-	return func(ctx sdk.Context, path []string, req abci.RequestQuery) (res []byte, err error) {
-		var queryType string
-		if len(path) > 0 {
-			queryType = path[0]
-		}
-		switch queryType {
-		case QueryEgress:
-			if len(path) < 2 || path[1] == "" {
-				return nil, sdkioerrors.Wrap(sdkerrors.ErrInvalidRequest, "missing egress address")
-			}
-			return queryEgress(ctx, path[1], req, keeper, legacyQuerierCdc)
-		case QueryMailbox:
-			if len(path) < 2 || path[1] == "" {
-				return nil, sdkioerrors.Wrap(sdkerrors.ErrInvalidRequest, "missing mailbox peer")
-			}
-			return queryMailbox(ctx, path[1], req, keeper, legacyQuerierCdc)
-		case LegacyQueryStorage:
-			return legacyQueryStorage(ctx, strings.Join(path[1:], "/"), req, keeper, legacyQuerierCdc)
-		case LegacyQueryKeys:
-			return legacyQueryKeys(ctx, strings.Join(path[1:], "/"), req, keeper, legacyQuerierCdc)
-		default:
-			return nil, sdkioerrors.Wrap(sdkerrors.ErrUnknownRequest, "unknown swingset query path")
-		}
-	}
-}
-
 // nolint: unparam
 func queryEgress(ctx sdk.Context, bech32 string, req abci.RequestQuery, keeper Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) {
 	acc, err := sdk.AccAddressFromBech32(bech32)

package/x/swingset/keeper/swing_store_exports_handler.go

@@ -13,7 +13,7 @@ import (
 	agoric "github.com/Agoric/agoric-sdk/golang/cosmos/types"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/types"
-	"github.com/tendermint/tendermint/libs/log"
+	"github.com/cometbft/cometbft/libs/log"
 )
 
 // This module abstracts the generation and handling of swing-store exports,

package/x/swingset/keeper/swing_store_exports_handler_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
-	"github.com/tendermint/tendermint/libs/log"
+	"github.com/cometbft/cometbft/libs/log"
 )
 
 func newTestSwingStoreExportsHandler() *SwingStoreExportsHandler {

package/x/swingset/module.go

@@ -16,8 +16,8 @@ import (
 	cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 
+	abci "github.com/cometbft/cometbft/abci/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	abci "github.com/tendermint/tendermint/abci/types"
 )
 
 // type check to ensure the interface is properly implemented
@@ -115,19 +115,6 @@ func (am *AppModule) SetSwingStoreExportDir(dir string) {
 
 func (am AppModule) RegisterInvariants(ir sdk.InvariantRegistry) {}
 
-func (am AppModule) Route() sdk.Route {
-	return sdk.NewRoute(types.RouterKey, NewHandler(am.keeper))
-}
-
-func (am AppModule) QuerierRoute() string {
-	return ModuleName
-}
-
-// LegacyQuerierHandler returns the sdk.Querier for deployment module
-func (am AppModule) LegacyQuerierHandler(legacyQuerierCdc *codec.LegacyAmino) sdk.Querier {
-	return keeper.NewQuerier(am.keeper, legacyQuerierCdc)
-}
-
 func (am AppModule) RegisterServices(cfg module.Configurator) {
 	types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper))
 	querier := keeper.Querier{Keeper: am.keeper}

package/x/swingset/types/default-params.go

@@ -11,15 +11,16 @@ import (
 // experience if they don't.
 
 const (
+	BeansPerBlockComputeLimit = "blockComputeLimit"
+	BeansPerVatCreation       = "vatCreation"
+	BeansPerXsnapComputron    = "xsnapComputron"
+
 	BeansPerFeeUnit              = "feeUnit"
 	BeansPerInboundTx            = "inboundTx"
-	BeansPerBlockComputeLimit    = "blockComputeLimit"
 	BeansPerMessage              = "message"
 	BeansPerMessageByte          = "messageByte"
 	BeansPerMinFeeDebit          = "minFeeDebit"
 	BeansPerStorageByte          = "storageByte"
-	BeansPerVatCreation          = "vatCreation"
-	BeansPerXsnapComputron       = "xsnapComputron"
 	BeansPerSmartWalletProvision = "smartWalletProvision"
 
 	// PowerFlags.
@@ -52,18 +53,24 @@ var (
 	// observed: 0.385 sec
 	DefaultBeansPerVatCreation = sdk.NewUint(300000).Mul(DefaultBeansPerXsnapComputron)
 
-	// Fees are denominated in this unit.
-	DefaultFeeUnitPrice = sdk.NewCoins(sdk.NewInt64Coin("uist", 1_000_000)) // $1
-
+	// Fees are represented as integer "beans", where each bean is a uniform
+	// fraction of this `fee_unit_price` as controlled by the below
+	// `beans_per_unit` "feeUnit".
 	// TODO: create the cost model we want, and update these to be more principled.
-	// These defaults currently make deploying an ag-solo cost less than $1.00.
-	DefaultBeansPerFeeUnit              = sdk.NewUint(1_000_000_000_000)                  // $1
-	DefaultBeansPerInboundTx            = DefaultBeansPerFeeUnit.Quo(sdk.NewUint(100))    // $0.01
-	DefaultBeansPerMessage              = DefaultBeansPerFeeUnit.Quo(sdk.NewUint(1_000))  // $0.001
-	DefaultBeansPerMessageByte          = DefaultBeansPerFeeUnit.Quo(sdk.NewUint(50_000)) // $0.00002
-	DefaultBeansPerMinFeeDebit          = DefaultBeansPerFeeUnit.Quo(sdk.NewUint(5))      // $0.2
-	DefaultBeansPerStorageByte          = DefaultBeansPerFeeUnit.Quo(sdk.NewUint(500))    // $0.002
-	DefaultBeansPerSmartWalletProvision = DefaultBeansPerFeeUnit                          // $1
+	DefaultFeeUnitPrice = sdk.NewCoins(sdk.NewInt64Coin("ubld", 1_000_000)) // 1 BLD
+
+	// The count of "beans" into which `fee_unit_price` is divided.
+	// Larger numbers make for smaller beans, and we expect values to be rather
+	// large for representing fees precisely in beans that each approximate
+	// a "picoUSD"--one trillionth of a USD.
+	DefaultBeansPerFeeUnit = sdk.NewUint(1_000_000_000_000) // 1e12 (assumes $1 per BLD)
+
+	DefaultBeansPerInboundTx            = DefaultBeansPerFeeUnit.Quo(sdk.NewUint(100))    //  10e09, ~$0.01
+	DefaultBeansPerMessage              = DefaultBeansPerFeeUnit.Quo(sdk.NewUint(1_000))  //   1e09, ~$0.001
+	DefaultBeansPerMessageByte          = DefaultBeansPerFeeUnit.Quo(sdk.NewUint(50_000)) //  20e06, ~$0.00002
+	DefaultBeansPerMinFeeDebit          = DefaultBeansPerFeeUnit.Quo(sdk.NewUint(5))      // 200e09, ~$0.2
+	DefaultBeansPerStorageByte          = DefaultBeansPerFeeUnit.Quo(sdk.NewUint(500))    //   2e09, ~$0.002
+	DefaultBeansPerSmartWalletProvision = DefaultBeansPerFeeUnit                          //   1e12, ~$1
 
 	DefaultBootstrapVatConfig = "@agoric/vm-config/decentral-core-config.json"
 
@@ -97,15 +104,16 @@ var (
 // move DefaultBeansPerUnit to a function to allow for boot overriding of the Default params
 func DefaultBeansPerUnit() []StringBeans {
 	return []StringBeans{
+		NewStringBeans(BeansPerXsnapComputron, DefaultBeansPerXsnapComputron),
 		NewStringBeans(BeansPerBlockComputeLimit, DefaultBeansPerBlockComputeLimit),
+		NewStringBeans(BeansPerVatCreation, DefaultBeansPerVatCreation),
+
 		NewStringBeans(BeansPerFeeUnit, DefaultBeansPerFeeUnit),
 		NewStringBeans(BeansPerInboundTx, DefaultBeansPerInboundTx),
 		NewStringBeans(BeansPerMessage, DefaultBeansPerMessage),
 		NewStringBeans(BeansPerMessageByte, DefaultBeansPerMessageByte),
 		NewStringBeans(BeansPerMinFeeDebit, DefaultBeansPerMinFeeDebit),
 		NewStringBeans(BeansPerStorageByte, DefaultBeansPerStorageByte),
-		NewStringBeans(BeansPerVatCreation, DefaultBeansPerVatCreation),
-		NewStringBeans(BeansPerXsnapComputron, DefaultBeansPerXsnapComputron),
 		NewStringBeans(BeansPerSmartWalletProvision, DefaultBeansPerSmartWalletProvision),
 	}
 }

package/x/swingset/types/genesis.pb.go

@@ -5,8 +5,8 @@ package types
 
 import (
 	fmt "fmt"
-	_ "github.com/gogo/protobuf/gogoproto"
-	proto "github.com/gogo/protobuf/proto"
+	_ "github.com/cosmos/gogoproto/gogoproto"
+	proto "github.com/cosmos/gogoproto/proto"
 	io "io"
 	math "math"
 	math_bits "math/bits"

package/x/swingset/types/msgs.pb.go

@@ -7,9 +7,9 @@ import (
 	context "context"
 	fmt "fmt"
 	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
-	_ "github.com/gogo/protobuf/gogoproto"
-	grpc1 "github.com/gogo/protobuf/grpc"
-	proto "github.com/gogo/protobuf/proto"
+	_ "github.com/cosmos/gogoproto/gogoproto"
+	grpc1 "github.com/cosmos/gogoproto/grpc"
+	proto "github.com/cosmos/gogoproto/proto"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -811,6 +811,7 @@ func _Msg_Provision_Handler(srv interface{}, ctx context.Context, dec func(inter
 	return interceptor(ctx, in, info, handler)
 }
 
+var Msg_serviceDesc = _Msg_serviceDesc
 var _Msg_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "agoric.swingset.Msg",
 	HandlerType: (*MsgServer)(nil),

package/x/swingset/types/msgs_test.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/gogo/protobuf/proto"
+	"github.com/cosmos/gogoproto/proto"
 )
 
 var (

package/x/swingset/types/query.pb.go

@@ -7,9 +7,9 @@ import (
 	context "context"
 	fmt "fmt"
 	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
-	_ "github.com/gogo/protobuf/gogoproto"
-	grpc1 "github.com/gogo/protobuf/grpc"
-	proto "github.com/gogo/protobuf/proto"
+	_ "github.com/cosmos/gogoproto/gogoproto"
+	grpc1 "github.com/cosmos/gogoproto/grpc"
+	proto "github.com/cosmos/gogoproto/proto"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
@@ -476,6 +476,7 @@ func _Query_Mailbox_Handler(srv interface{}, ctx context.Context, dec func(inter
 	return interceptor(ctx, in, info, handler)
 }
 
+var Query_serviceDesc = _Query_serviceDesc
 var _Query_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "agoric.swingset.Query",
 	HandlerType: (*QueryServer)(nil),

package/x/swingset/types/swingset.pb.go

@@ -7,8 +7,8 @@ import (
 	fmt "fmt"
 	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	types "github.com/cosmos/cosmos-sdk/types"
-	_ "github.com/gogo/protobuf/gogoproto"
-	proto "github.com/gogo/protobuf/proto"
+	_ "github.com/cosmos/gogoproto/gogoproto"
+	proto "github.com/cosmos/gogoproto/proto"
 	io "io"
 	math "math"
 	math_bits "math/bits"

package/x/vbank/genesis.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vbank/types"
+	abci "github.com/cometbft/cometbft/abci/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	abci "github.com/tendermint/tendermint/abci/types"
 )
 
 func NewGenesisState() *types.GenesisState {