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

package/e2e_test/util.go

@@ -0,0 +1,271 @@
+package e2etest
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"strconv"
+	"strings"
+	"testing"
+
+	"github.com/agoric-labs/interchaintest/v6"
+	"github.com/agoric-labs/interchaintest/v6/chain/cosmos"
+	"github.com/agoric-labs/interchaintest/v6/ibc"
+	"github.com/agoric-labs/interchaintest/v6/relayer"
+	"github.com/agoric-labs/interchaintest/v6/testutil"
+
+	"go.uber.org/zap/zaptest"
+)
+
+const CHAIN_AGORIC = "agoric"
+const CHAIN_GAIA = "gaia"
+
+const RELAYER_COSMOS = "cosmos"
+const RELAYER_HERMES = "hermes"
+
+const DEFAULT_CHAINIMAGE_AGORIC = "agoric:heighliner-agoric"
+const DEFAULT_BLOCKS_TO_WAIT = 25
+
+const FMT_ENV_CHAINNAME = "E2ETEST_CHAINNAME%d"
+const ENV_CHAINIMAGE_AGORIC = "E2ETEST_CHAINIMAGE_AGORIC"
+const ENV_RELAYERNAME = "E2ETEST_RELAYERNAME"
+const ENV_BLOCKS_TO_WAIT = "E2ETEST_BLOCKS_TO_WAIT"
+
+// newHermesFactory creates a hermes relayer
+func newHermesFactory(t *testing.T) interchaintest.RelayerFactory {
+	return interchaintest.NewBuiltinRelayerFactory(
+		ibc.Hermes,
+		zaptest.NewLogger(t),
+	)
+}
+
+// newCosmosRlyFactory creates a cosmos relayer
+func newCosmosRlyFactory(t *testing.T) interchaintest.RelayerFactory {
+
+	// TODO: At one point was using latest docker image for relyaer but disabling
+	// to remove variables while debugging heighliner builds of agoric chain are failing
+	//
+	IBCRelayerImage := "ghcr.io/cosmos/relayer"
+	IBCRelayerVersion := "latest"
+	image := relayer.CustomDockerImage(IBCRelayerImage, IBCRelayerVersion, "100:1000")
+
+	return interchaintest.NewBuiltinRelayerFactory(
+		ibc.CosmosRly,
+		zaptest.NewLogger(t),
+		image,
+	)
+}
+
+// newCosmosHubChainSpec creates a chainspec for a gaia instance compatible with these tests
+// TODO: replacing the v13.0.01 version with latest has not been tested.
+func newCosmosHubChainSpec(chainUniqueName string, chainID string, numOfValidators int, numOfFullNodes int) *interchaintest.ChainSpec {
+	ret := &interchaintest.ChainSpec{
+		Name:          "gaia",
+		ChainName:     chainUniqueName,
+		Version:       "v13.0.1", // This version of gaiad has the interface interchaintestv6 needs
+		NumValidators: &numOfValidators,
+		NumFullNodes:  &numOfFullNodes,
+	}
+
+	ret.ChainConfig.ChainID = chainID
+	return ret
+}
+
+// newUnknownCosmosChainSpec creates any cosmos chain where interchaintest has a built in definition
+// NB: In many cases these images will not work due to issues outside the scope of Agoric's project
+func newUnknownCosmosChainSpec(chain string, chainUniqueName string, chainID string, numOfValidators int, numOfFullNodes int) *interchaintest.ChainSpec {
+	ret := &interchaintest.ChainSpec{
+		Name:          chain,
+		ChainName:     chainUniqueName,
+		Version:       "latest",
+		NumValidators: &numOfValidators,
+		NumFullNodes:  &numOfFullNodes,
+	}
+
+	ret.ChainConfig.ChainID = chainID
+	return ret
+}
+
+// newAgoricChainSpec fully specifies the details necessary to launch an Agoric chain image built from
+// - https://github.com/strangelove-ventures/heighliner/pull/211
+// - NoCrisisModule is a flag added in the agoric-labs fork of interchaintest
+func newAgoricChainSpec(chainUniqueName string, chainID string, chainImage ibc.DockerImage, numOfValidators int, numOfFullNodes int) *interchaintest.ChainSpec {
+	coinDecimals := int64(6)
+	gasAdjustment := 1.3
+	noHostMount := false
+
+	return &interchaintest.ChainSpec{
+		Name:          "agoric",
+		ChainName:     chainUniqueName,
+		Version:       chainImage.Version,
+		GasAdjustment: &gasAdjustment,
+		NoHostMount:   &noHostMount,
+		ChainConfig: ibc.ChainConfig{
+			Type:    "cosmos",
+			Name:    "agoric",
+			ChainID: chainID,
+			Images: []ibc.DockerImage{
+				chainImage,
+			},
+			Bin:          "agd",
+			Bech32Prefix: "agoric",
+			Denom:        "ubld",
+			CoinType:     "564",
+			// interchaintest is super flaky when gas is enabled
+			GasPrices:      "0.0ubld",
+			GasAdjustment:  1.3,
+			TrustingPeriod: "672h",
+			NoHostMount:    false,
+			NoCrisisModule: true,
+			SkipGenTx:      false,
+			CoinDecimals:   &coinDecimals,
+		},
+		NumValidators: &numOfValidators,
+		NumFullNodes:  &numOfFullNodes,
+	}
+}
+
+// getChainImage will build a docker image from the environment variable value
+// E2ETEST_CHAINIMAGE_AGORIC. The value of this env var
+// must be in the form "repo/image:version"
+func getChainImageAgoric(t *testing.T) ibc.DockerImage {
+	ret := ibc.DockerImage{
+		UidGid: "1025:1025",
+	}
+
+	chainImage, present := os.LookupEnv(ENV_CHAINIMAGE_AGORIC)
+	if !present {
+		chainImage = DEFAULT_CHAINIMAGE_AGORIC
+	}
+
+	parts := strings.Split(chainImage, ":")
+	if len(parts) == 2 {
+		ret.Repository = parts[0]
+		ret.Version = parts[1]
+	} else {
+		t.Fatalf("Invalid value for %s[%s]. Must be of the format 'repository:version'", ENV_CHAINIMAGE_AGORIC, chainImage)
+	}
+
+	t.Logf("ChainImages: %s[%s:%s]", ENV_CHAINIMAGE_AGORIC, ret.Repository, ret.Version)
+
+	return ret
+}
+
+// getChainNames reads the environment variables FMT_ENV_CHAINNAME0, FMT_ENV_CHAINNAME1, FMT_ENV_CHAINNAME2, FMT_ENV_CHAINNAME3
+func getChainNames(t *testing.T) [4]string {
+
+	ret := [4]string{
+		CHAIN_AGORIC, CHAIN_AGORIC, CHAIN_AGORIC, CHAIN_AGORIC,
+	}
+
+	for i := 0; i < 4; i++ {
+		envVar := fmt.Sprintf(FMT_ENV_CHAINNAME, i)
+		chainName, present := os.LookupEnv(envVar)
+		if present {
+			ret[i] = chainName
+		}
+	}
+
+	t.Logf("ChainNames: %s[%s] %s[%s] %s[%s] %s[%s]",
+		fmt.Sprintf(FMT_ENV_CHAINNAME, 0), ret[0],
+		fmt.Sprintf(FMT_ENV_CHAINNAME, 1), ret[1],
+		fmt.Sprintf(FMT_ENV_CHAINNAME, 2), ret[2],
+		fmt.Sprintf(FMT_ENV_CHAINNAME, 3), ret[3])
+
+	return ret
+}
+
+// getChainSpec reads environment variables and builds a full ChainSpec
+func getChainSpec(t *testing.T) []*interchaintest.ChainSpec {
+	nv := 1
+	nf := 0
+
+	chainNames := getChainNames(t)
+	chainImage := getChainImageAgoric(t)
+
+	ret := make([]*interchaintest.ChainSpec, 4)
+
+	for index, chainName := range chainNames {
+		chainId := fmt.Sprintf("%s%d", chainName, index)
+		chainUniqueName := chainId
+
+		switch chainName {
+		case CHAIN_AGORIC:
+			ret[index] = newAgoricChainSpec(chainUniqueName, chainId, chainImage, nv, nf)
+		case CHAIN_GAIA:
+			ret[index] = newCosmosHubChainSpec(chainUniqueName, chainId, nv, nf)
+		default:
+			ret[index] = newUnknownCosmosChainSpec(chainName, chainUniqueName, chainId, nv, nf)
+		}
+	}
+
+	return ret
+}
+
+// getRelayerFactory reads environment variables and builds the correct RelayerFactory
+func getRelayerFactory(t *testing.T) interchaintest.RelayerFactory {
+	relayerName, present := os.LookupEnv(ENV_RELAYERNAME)
+	if !present {
+		relayerName = RELAYER_COSMOS
+	}
+
+	var ret interchaintest.RelayerFactory
+
+	switch relayerName {
+	case RELAYER_COSMOS:
+		ret = newCosmosRlyFactory(t)
+	case RELAYER_HERMES:
+		ret = newHermesFactory(t)
+	default:
+		t.Fatalf("Invalid value for %s[%s]. Valid values are [%s] or [%s]", ENV_RELAYERNAME, relayerName, RELAYER_COSMOS, RELAYER_HERMES)
+	}
+
+	t.Logf("RelayerNmae: %s[%s]", ENV_RELAYERNAME, relayerName)
+
+	return ret
+}
+
+// sendIBCTransferWithWait performs cosmos.CosmosChain.SendIBCTransfer
+// - Automatically waits to confirm TX is ACK'd
+// - Automatically waits for results to settle
+// - The environment variable E2ETEST_BLOCKS_TO_WAIT controls how many blocks to wait for ACK and settlement
+func sendIBCTransferWithWait(
+	c *cosmos.CosmosChain,
+	ctx context.Context,
+	channelID string,
+	keyName string,
+	amount ibc.WalletAmount,
+	options ibc.TransferOptions,
+) (tx ibc.Tx, err error) {
+	blocksToWait := DEFAULT_BLOCKS_TO_WAIT
+
+	blocksAsStr, present := os.LookupEnv(ENV_BLOCKS_TO_WAIT)
+	if present {
+		blocksToWait, err = strconv.Atoi(blocksAsStr)
+		if err != nil {
+			return tx, err
+		}
+	}
+
+	chainAHeight, err := c.Height(ctx)
+	if err != nil {
+		return tx, err
+	}
+
+	tx, err = c.SendIBCTransfer(ctx, channelID, keyName, amount, options)
+	if err != nil {
+		return tx, err
+	}
+
+	_, err = testutil.PollForAck(ctx, c, chainAHeight, chainAHeight+30, tx.Packet)
+	if err != nil {
+		return tx, err
+	}
+
+	err = testutil.WaitForBlocks(ctx, blocksToWait, c)
+	if err != nil {
+		return tx, err
+	}
+
+	return tx, err
+}

package/git-revision.txt

@@ -1 +1 @@
-c8f9e7b
+fb592e4

package/go.mod

@@ -3,10 +3,12 @@ module github.com/Agoric/agoric-sdk/golang/cosmos
 go 1.20
 
 require (
+	cosmossdk.io/errors v1.0.0-beta.7
 	cosmossdk.io/math v1.0.0-rc.0
 	github.com/armon/go-metrics v0.4.1
 	github.com/cosmos/cosmos-sdk v0.46.16
-	github.com/cosmos/ibc-go/v6 v6.2.1
+	github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v6 v6.1.2
+	github.com/cosmos/ibc-go/v6 v6.3.1
 	github.com/gogo/protobuf v1.3.3
 	github.com/golang/protobuf v1.5.3
 	github.com/gorilla/mux v1.8.0
@@ -14,9 +16,9 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/rakyll/statik v0.1.7
 	github.com/spf13/cast v1.5.0
-	github.com/spf13/cobra v1.6.1
+	github.com/spf13/cobra v1.7.0
 	github.com/spf13/viper v1.14.0
-	github.com/stretchr/testify v1.8.2
+	github.com/stretchr/testify v1.8.4
 	github.com/tendermint/tendermint v0.34.29
 	github.com/tendermint/tm-db v0.6.7
 	google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98
@@ -30,7 +32,6 @@ require (
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	cloud.google.com/go/iam v1.1.1 // indirect
 	cloud.google.com/go/storage v1.30.1 // indirect
-	cosmossdk.io/errors v1.0.0-beta.7 // indirect
 	filippo.io/edwards25519 v1.0.0-rc.1 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.1 // indirect
@@ -79,7 +80,6 @@ require (
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/btree v1.1.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/orderedcode v0.0.1 // indirect
 	github.com/google/s2a-go v0.1.4 // indirect
 	github.com/google/uuid v1.3.0 // indirect
@@ -99,8 +99,9 @@ require (
 	github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/hdevalence/ed25519consensus v0.0.0-20220222234857-c00d1f31bab3 // indirect
+	github.com/iancoleman/orderedmap v0.2.0 // indirect
 	github.com/improbable-eng/grpc-web v0.15.0 // indirect
-	github.com/inconshreveable/mousetrap v1.0.1 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/jmhodges/levigo v1.0.0 // indirect
 	github.com/klauspost/compress v1.16.0 // indirect
@@ -168,9 +169,6 @@ replace (
 
 	github.com/confio/ics23/go => github.com/agoric-labs/cosmos-sdk/ics23/go v0.8.0-alpha.agoric.1
 
-	// We need a fork of cosmos-sdk until all of the differences are merged.
-	github.com/cosmos/cosmos-sdk => github.com/agoric-labs/cosmos-sdk v0.46.16-alpha.agoric.2
-
 	// https://pkg.go.dev/vuln/GO-2023-2409
 	github.com/dvsekhvalnov/jose2go => github.com/dvsekhvalnov/jose2go v1.5.1-0.20231206184617-48ba0b76bc88
 
@@ -184,13 +182,26 @@ replace (
 
 	// replace broken goleveldb.
 	github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
+)
+
+// Agoric-specific replacements:
+replace (
+	// We need a fork of cosmos-sdk until all of the differences are merged.
+	github.com/cosmos/cosmos-sdk => github.com/agoric-labs/cosmos-sdk v0.46.16-alpha.agoric.2.4
+
+	// Pick up an IAVL race fix.
+	github.com/cosmos/iavl => github.com/cosmos/iavl v0.19.7
+
+	// Use a version of ibc-go that is compatible with the above forks.
+	github.com/cosmos/ibc-go/v6 => github.com/agoric-labs/ibc-go/v6 v6.3.1-alpha.agoric.2
 
 	// use cometbft
 	// Use our fork at least until post-v0.34.14 is released with
 	// https://github.com/tendermint/tendermint/issue/6899 resolved.
 	github.com/tendermint/tendermint => github.com/agoric-labs/cometbft v0.34.30-alpha.agoric.1
 
-// For testing against a local cosmos-sdk or tendermint
+// For testing against a local cosmos-sdk, ibc-go, or cometbft
 // github.com/cosmos/cosmos-sdk => ../../../forks/cosmos-sdk
-// github.com/tendermint/tendermint => ../../../forks/tendermint
+// github.com/cosmos/ibc-go/v6 => ../../../forks/ibc-go/v6
+// github.com/tendermint/tendermint => ../../../forks/cometbft
 )

package/go.sum

@@ -232,10 +232,12 @@ github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBA
 github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
 github.com/agoric-labs/cometbft v0.34.30-alpha.agoric.1 h1:tqCNL72pQXdUmBzgv1md5SN2U3K/PaYQ4qZ5pFv8v6w=
 github.com/agoric-labs/cometbft v0.34.30-alpha.agoric.1/go.mod h1:myvkihZD8eg9jKE3WFaugkNoL5nvEqlP7Jbjg98pCek=
-github.com/agoric-labs/cosmos-sdk v0.46.16-alpha.agoric.2 h1:iHHqpYC0JzMbH4UYnQrcwVjLyHJuQphB0ogHbuLz44c=
-github.com/agoric-labs/cosmos-sdk v0.46.16-alpha.agoric.2/go.mod h1:zUe5lsg/X7SeSO1nGkzOh9EGKO295szfrxIxYmeLYic=
+github.com/agoric-labs/cosmos-sdk v0.46.16-alpha.agoric.2.4 h1:i5IgChQjTyWulV/y5NpVBB5qBJETQ59hYglod6vhok0=
+github.com/agoric-labs/cosmos-sdk v0.46.16-alpha.agoric.2.4/go.mod h1:d7e4h+w7FNBNmE6ysp6duBVuQg67pqMtvsLwpT9ca3E=
 github.com/agoric-labs/cosmos-sdk/ics23/go v0.8.0-alpha.agoric.1 h1:2jvHI/2d+psWAZy6FQ0vXJCHUtfU3ZbbW+pQFL04arQ=
 github.com/agoric-labs/cosmos-sdk/ics23/go v0.8.0-alpha.agoric.1/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg=
+github.com/agoric-labs/ibc-go/v6 v6.3.1-alpha.agoric.2 h1:vEzy4JaExzlWNHV3ZSVXEVZcRE9loEFUjieE2TXwDdI=
+github.com/agoric-labs/ibc-go/v6 v6.3.1-alpha.agoric.2/go.mod h1:L1xcBjCLIHN7Wd9j6cAQvZertn56pq+eRGFZjRO5bsY=
 github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -376,10 +378,10 @@ github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY
 github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
 github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4Y=
 github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw=
-github.com/cosmos/iavl v0.19.6 h1:XY78yEeNPrEYyNCKlqr9chrwoeSDJ0bV2VjocTk//OU=
-github.com/cosmos/iavl v0.19.6/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw=
-github.com/cosmos/ibc-go/v6 v6.2.1 h1:NiaDXTRhKwf3n9kELD4VRIe5zby1yk1jBvaz9tXTQ6k=
-github.com/cosmos/ibc-go/v6 v6.2.1/go.mod h1:XLsARy4Y7+GtAqzMcxNdlQf6lx+ti1e8KcMGv5NIK7A=
+github.com/cosmos/iavl v0.19.7 h1:ij32FaEnwxfEurtK0QKDNhTWFnz6NUmrI5gky/WnoY0=
+github.com/cosmos/iavl v0.19.7/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw=
+github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v6 v6.1.2 h1:Hz4nkpStoXIHrC77CIEyu2mRiN2qysGEZPFRf0fpv7w=
+github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v6 v6.1.2/go.mod h1:Jo934o/sW7fNxuOa/TjCalSalz+1Fd649eLyANaJx8g=
 github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo=
 github.com/cosmos/keyring v1.2.0/go.mod h1:fc+wB5KTk9wQ9sDx0kFXB3A0MaeGHM9AwRStKOQ5vOA=
 github.com/cosmos/ledger-cosmos-go v0.12.4 h1:drvWt+GJP7Aiw550yeb3ON/zsrgW0jgh5saFCr7pDnw=
@@ -598,7 +600,6 @@ github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSN
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
-github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -725,13 +726,15 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO
 github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
 github.com/huin/goupnp v1.0.3-0.20220313090229-ca81a64b4204/go.mod h1:ZxNlw5WqJj6wSsRK5+YfflQGXYfccj5VgQsMNixHM7Y=
 github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o=
+github.com/iancoleman/orderedmap v0.2.0 h1:sq1N/TFpYH++aViPcaKjys3bDClUEU7s5B+z6jq8pNA=
+github.com/iancoleman/orderedmap v0.2.0/go.mod h1:N0Wam8K1arqPXNWjMo21EXnBPOPp36vB07FNRdD2geA=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/improbable-eng/grpc-web v0.15.0 h1:BN+7z6uNXZ1tQGcNAuaU1YjsLTApzkjt2tzCixLaUPQ=
 github.com/improbable-eng/grpc-web v0.15.0/go.mod h1:1sy9HKV4Jt9aEs9JSnkWlRJPuPtwNr0l57L4f878wP8=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc=
-github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
+github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/influxdata/flux v0.65.1/go.mod h1:J754/zds0vvpfwuq7Gc2wRdVwEodfpCFM7mYlOw2LqY=
 github.com/influxdata/influxdb v1.8.3/go.mod h1:JugdFhsvvI8gadxOI6noqNeeBHvWNTbfYGtiAn+2jhI=
 github.com/influxdata/influxdb-client-go/v2 v2.4.0/go.mod h1:vLNHdxTJkIf2mSLvGrpj8TCcISApPoXkaxP8g9uRlW8=
@@ -1057,8 +1060,8 @@ github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
 github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
-github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA=
-github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
+github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
+github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
@@ -1088,8 +1091,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
-github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs=
 github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
@@ -1165,6 +1168,7 @@ go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqe
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
+go.uber.org/mock v0.2.0 h1:TaP3xedm7JaAgScZO7tlvlKrqT0p7I6OsdGB5YNSMDU=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
 go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=

package/package.json

@@ -1,14 +1,15 @@
 {
   "name": "@agoric/cosmos",
-  "version": "0.35.0-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
+  "version": "0.35.0-upgrade-16a-dev-fb592e4.0+fb592e4",
   "description": "Connect JS to the Cosmos blockchain SDK",
   "parsers": {
     "js": "mjs"
   },
-  "main": "src/index.cjs",
+  "main": "index.cjs",
   "engines": {
-    "node": ">=14.15.0"
+    "node": "^18.12 || ^20.9"
   },
+  "packageManager": "yarn@1.22.19",
   "scripts": {
     "test": "exit 0",
     "build:all": "make",
@@ -19,7 +20,7 @@
     "postpack": "git clean -f git-revision.txt",
     "build": "exit 0",
     "lint-fix": "yarn lint:eslint --fix",
-    "lint": "eslint '**/*.{cjs,js}'"
+    "lint": "exit 0"
   },
   "dependencies": {
     "bindings": "^1.2.1",
@@ -35,5 +36,8 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c8f9e7be1645e0be23f47de197409a7d4874add5"
+  "typeCoverage": {
+    "atLeast": 0
+  },
+  "gitHead": "fb592e448de7252d92f7ed65b05f7d49a35403fd"
 }

package/proto/agoric/swingset/genesis.proto

@@ -17,6 +17,10 @@ message GenesisState {
     repeated SwingStoreExportDataEntry swing_store_export_data = 4 [
         (gogoproto.jsontag)    = "swingStoreExportData"
     ];
+
+    string swing_store_export_data_hash = 5 [
+        (gogoproto.jsontag)    = "swingStoreExportDataHash"
+    ];
 }
 
 // A SwingStore "export data" entry.

package/proto/agoric/swingset/swingset.proto

@@ -8,7 +8,7 @@ option go_package = "github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/types
 
 // 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.
 message CoreEvalProposal {
   option (gogoproto.goproto_getters) = false;
 

package/proto/agoric/vlocalchain/.clang-format

@@ -0,0 +1,7 @@
+---
+Language: Proto
+BasedOnStyle: Google
+AlignConsecutiveDeclarations: true
+AlignConsecutiveAssignments: true
+ColumnLimit: 0
+IndentWidth: 4

package/proto/agoric/vlocalchain/vlocalchain.proto

@@ -0,0 +1,31 @@
+syntax = "proto3";
+package agoric.vlocalchain;
+
+import "google/protobuf/any.proto";
+
+option go_package = "github.com/Agoric/agoric-sdk/golang/cosmos/x/vlocalchain/types";
+
+// CosmosTx contains a list of sdk.Msg's. It should be used when sending
+// transactions to a local chain.
+message CosmosTx {
+    repeated google.protobuf.Any messages = 1;
+}
+
+// QueryRequest is used internally to describe a query for the local chain.
+message QueryRequest {
+    string              full_method = 1;
+    google.protobuf.Any request     = 2;
+    string              reply_type  = 3;
+}
+
+// QueryResponse is used internally to describe a response from the local chain.
+message QueryResponse {
+    int64               height = 1;
+    google.protobuf.Any reply  = 2;
+    string              error  = 3;
+}
+
+// QueryResponses is used to group multiple QueryResponse messages.
+message QueryResponses {
+    repeated QueryResponse responses = 1;
+}

package/proto/agoric/vtransfer/genesis.proto

@@ -0,0 +1,18 @@
+syntax = "proto3";
+package agoric.vtransfer;
+
+import "gogoproto/gogo.proto";
+
+option go_package = "github.com/Agoric/agoric-sdk/golang/cosmos/x/vtransfer/types";
+
+// The initial and exported module state.
+message GenesisState {
+    option (gogoproto.equal) = false;
+
+    // The list of account addresses that are being watched by the VM.
+    repeated bytes watched_addresses = 1 [
+      (gogoproto.casttype)  = "github.com/cosmos/cosmos-sdk/types.AccAddress",
+      (gogoproto.jsontag)   = "watched_addresses",
+      (gogoproto.moretags)  = "yaml:\"watched_addresses\""
+    ];
+}

package/scripts/protocgen.sh

@@ -3,12 +3,12 @@
 set -eo pipefail
 
 protoc_gen_gocosmos() {
-  if ! grep "github.com/gogo/protobuf => github.com/regen-network/protobuf" go.mod &>/dev/null ; then
+  if ! grep "github.com/gogo/protobuf => github.com/regen-network/protobuf" go.mod &> /dev/null; then
     echo -e "\tPlease run this command from somewhere inside the ibc-go folder."
     return 1
   fi
 
-  go get github.com/regen-network/cosmos-proto/protoc-gen-gocosmos@latest 2>/dev/null
+  go get github.com/regen-network/cosmos-proto/protoc-gen-gocosmos@latest 2> /dev/null
 }
 
 protoc_gen_gocosmos
@@ -19,12 +19,11 @@ for dir in $proto_dirs; do
   # allow_colon_final_segments=true
   # as per https://grpc-ecosystem.github.io/grpc-gateway/docs/development/grpc-gateway_v2_migration_guide/#withlastmatchwins-and-allow_colon_final_segmentstrue-is-now-default-behaviour
   protoc \
-  -I proto \
-  -I third_party/proto \
-  --gocosmos_out=plugins=grpc,\
-Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types:. \
-  --grpc-gateway_out=logtostderr=true,allow_colon_final_segments=true:. \
-  $(find "${dir}" -maxdepth 1 -name '*.proto')
+    -I proto \
+    -I third_party/proto \
+    --gocosmos_out=plugins=grpc,Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types:. \
+    --grpc-gateway_out=logtostderr=true,allow_colon_final_segments=true:. \
+    $(find "${dir}" -maxdepth 1 -name '*.proto')
 done
 
 # move proto files to the right places

package/types/kv_entry_helpers.go

@@ -232,3 +232,45 @@ func EncodeKVEntryReaderToJsonl(reader KVEntryReader, bytesWriter io.Writer) (er
 		}
 	}
 }
+
+var _ KVEntryReader = &kvHookingReader{}
+
+// kvHookingReader is a KVEntryReader backed by another KVEntryReader which
+// provides callbacks for read and close
+type kvHookingReader struct {
+	reader  KVEntryReader
+	onRead  func(entry KVEntry) error
+	onClose func() error
+}
+
+// NewKVHookingReader returns a KVEntryReader backed by another KVEntryReader
+func NewKVHookingReader(reader KVEntryReader, onRead func(entry KVEntry) error, onClose func() error) KVEntryReader {
+	return &kvHookingReader{
+		reader,
+		onRead,
+		onClose,
+	}
+}
+
+// Read yields the next KVEntry from the source reader
+// Implements KVEntryReader
+func (hr kvHookingReader) Read() (next KVEntry, err error) {
+	next, err = hr.reader.Read()
+
+	if err == nil {
+		err = hr.onRead(next)
+	}
+
+	return next, err
+}
+
+// Close releases the underlying source reader
+// Implements KVEntryReader
+func (hr kvHookingReader) Close() error {
+	err := hr.reader.Close()
+	if err == nil {
+		err = hr.onClose()
+	}
+
+	return err
+}