@agoric/cosmos 0.35.0-upgrade-14-dev-0169c7e.0 → 0.35.0-upgrade-16-dev-07b0130.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 @@
-0169c7e
+07b0130

package/go.mod

@@ -3,163 +3,205 @@ 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.45.16
-	github.com/cosmos/ibc-go/v4 v4.5.1
+	github.com/cosmos/cosmos-sdk v0.46.16
+	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.2
+	github.com/golang/protobuf v1.5.3
 	github.com/gorilla/mux v1.8.0
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	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.1
-	github.com/tendermint/tendermint v0.34.27
+	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 v0.0.0-20230125152338-dcaf20b6aeaa
-	google.golang.org/grpc v1.52.3
+	google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98
+	google.golang.org/grpc v1.58.3
 	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
-	cosmossdk.io/api v0.2.6 // indirect
-	cosmossdk.io/core v0.5.1 // indirect
-	cosmossdk.io/depinject v1.0.0-alpha.3 // indirect
+	cloud.google.com/go v0.110.4 // indirect
+	cloud.google.com/go/compute v1.21.0 // indirect
+	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
 	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
-	github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect
-	github.com/DataDog/zstd v1.5.0 // indirect
-	github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
+	github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect
 	github.com/Workiva/go-datastructures v1.0.53 // indirect
+	github.com/aws/aws-sdk-go v1.44.122 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
 	github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect
 	github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
+	github.com/cenkalti/backoff/v4 v4.1.3 // indirect
 	github.com/cespare/xxhash v1.1.0 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
-	github.com/cockroachdb/errors v1.9.1 // indirect
-	github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
-	github.com/cockroachdb/pebble v0.0.0-20220817183557-09c6e030a677 // indirect
-	github.com/cockroachdb/redact v1.1.3 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
+	github.com/cockroachdb/apd/v2 v2.0.2 // indirect
 	github.com/coinbase/rosetta-sdk-go v0.7.9 // indirect
 	github.com/cometbft/cometbft-db v0.7.0 // indirect
 	github.com/confio/ics23/go v0.9.1 // indirect
-	github.com/cosmos/btcutil v1.0.4 // indirect
-	github.com/cosmos/cosmos-db v0.0.0-20221226095112-f3c38ecb5e32 // indirect
+	github.com/cosmos/btcutil v1.0.5 // indirect
 	github.com/cosmos/cosmos-proto v1.0.0-beta.1 // indirect
 	github.com/cosmos/go-bip39 v1.0.0 // indirect
 	github.com/cosmos/gorocksdb v1.2.0 // indirect
-	github.com/cosmos/iavl v0.19.5 // indirect
-	github.com/cosmos/ledger-cosmos-go v0.12.2 // indirect
+	github.com/cosmos/iavl v0.19.6 // indirect
+	github.com/cosmos/ledger-cosmos-go v0.12.4 // indirect
 	github.com/creachadair/taskgroup v0.3.2 // indirect
 	github.com/danieljoos/wincred v1.1.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
+	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
 	github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
 	github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
-	github.com/dgraph-io/ristretto v0.0.3 // indirect
+	github.com/dgraph-io/ristretto v0.1.0 // indirect
 	github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
 	github.com/dustin/go-humanize v1.0.0 // indirect
 	github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
 	github.com/felixge/httpsnoop v1.0.2 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/getsentry/sentry-go v0.17.0 // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
+	github.com/gin-gonic/gin v1.8.1 // indirect
 	github.com/go-kit/kit v0.12.0 // indirect
 	github.com/go-kit/log v0.2.1 // indirect
 	github.com/go-logfmt/logfmt v0.5.1 // indirect
 	github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
 	github.com/gogo/gateway v1.1.0 // indirect
-	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
+	github.com/golang/glog v1.1.0 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/btree v1.1.2 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/go-cmp v0.5.9 // 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
+	github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
+	github.com/googleapis/gax-go/v2 v2.11.0 // indirect
 	github.com/gorilla/handlers v1.5.1 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
 	github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
 	github.com/gtank/merlin v0.1.1 // indirect
 	github.com/gtank/ristretto255 v0.1.2 // indirect
+	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
+	github.com/hashicorp/go-getter v1.6.1 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
+	github.com/hashicorp/go-safetemp v1.0.0 // indirect
+	github.com/hashicorp/go-version v1.6.0 // indirect
 	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/improbable-eng/grpc-web v0.14.1 // indirect
-	github.com/inconshreveable/mousetrap v1.0.1 // indirect
+	github.com/iancoleman/orderedmap v0.2.0 // indirect
+	github.com/improbable-eng/grpc-web v0.15.0 // 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.15.11 // indirect
-	github.com/kr/pretty v0.3.1 // indirect
-	github.com/kr/text v0.2.0 // indirect
-	github.com/lib/pq v1.10.6 // indirect
+	github.com/klauspost/compress v1.16.0 // indirect
+	github.com/lib/pq v1.10.7 // indirect
 	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
-	github.com/linxGnu/grocksdb v1.7.10 // indirect
 	github.com/magiconair/properties v1.8.6 // indirect
+	github.com/manifoldco/promptui v0.9.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.16 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
+	github.com/mattn/go-isatty v0.0.18 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
 	github.com/minio/highwayhash v1.0.2 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mtibben/percent v0.2.1 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.5 // indirect
-	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.7 // indirect
+	github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_golang v1.14.0 // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.37.0 // indirect
-	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/prometheus/common v0.42.0 // indirect
+	github.com/prometheus/procfs v0.9.0 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
 	github.com/regen-network/cosmos-proto v0.3.1 // indirect
-	github.com/rogpeppe/go-internal v1.9.0 // indirect
 	github.com/rs/cors v1.8.2 // indirect
-	github.com/rs/zerolog v1.27.0 // indirect
+	github.com/rs/zerolog v1.29.1 // indirect
 	github.com/sasha-s/go-deadlock v0.3.1 // indirect
 	github.com/spf13/afero v1.9.2 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.4.1 // indirect
-	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
+	github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
 	github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
 	github.com/tendermint/go-amino v0.16.0 // indirect
 	github.com/tidwall/btree v1.5.0 // indirect
-	github.com/zondax/hid v0.9.1 // indirect
-	github.com/zondax/ledger-go v0.14.1 // indirect
+	github.com/ulikunitz/xz v0.5.10 // indirect
+	github.com/zondax/hid v0.9.2 // indirect
+	github.com/zondax/ledger-go v0.14.3 // indirect
 	go.etcd.io/bbolt v1.3.6 // indirect
-	golang.org/x/crypto v0.5.0 // indirect
-	golang.org/x/exp v0.0.0-20221019170559-20944726eadf // indirect
-	golang.org/x/net v0.7.0 // indirect
-	golang.org/x/sys v0.5.0 // indirect
-	golang.org/x/term v0.5.0 // indirect
-	golang.org/x/text v0.7.0 // indirect
-	google.golang.org/protobuf v1.28.2-0.20220831092852-f930b1dc76e8 // indirect
+	go.opencensus.io v0.24.0 // indirect
+	golang.org/x/crypto v0.15.0 // indirect
+	golang.org/x/exp v0.0.0-20230310171629-522b1b587ee0 // indirect
+	golang.org/x/net v0.18.0 // indirect
+	golang.org/x/oauth2 v0.10.0 // indirect
+	golang.org/x/sync v0.3.0 // indirect
+	golang.org/x/sys v0.14.0 // indirect
+	golang.org/x/term v0.14.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
+	google.golang.org/api v0.126.0 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	nhooyr.io/websocket v1.8.6 // indirect
+	sigs.k8s.io/yaml v1.3.0 // indirect
 )
 
-// At least until post-v0.9.0 is released with
-// https://github.com/Zondax/hid/issues/4 resolved.
-replace github.com/zondax/hid => github.com/zondax/hid v0.9.1-0.20220302062450-5552068d2266
+replace (
+	github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
 
-replace github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
+	github.com/confio/ics23/go => github.com/agoric-labs/cosmos-sdk/ics23/go v0.8.0-alpha.agoric.1
 
-replace github.com/confio/ics23/go => github.com/agoric-labs/cosmos-sdk/ics23/go v0.8.0-alpha.agoric.1
+	// https://pkg.go.dev/vuln/GO-2023-2409
+	github.com/dvsekhvalnov/jose2go => github.com/dvsekhvalnov/jose2go v1.5.1-0.20231206184617-48ba0b76bc88
 
-replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
+	// Fix upstream GHSA-3vp4-m3rf-835h vulnerability.
+	github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.0
 
-replace google.golang.org/grpc => google.golang.org/grpc v1.33.2
+	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 
-// At least until post-v0.34.14 is released with
-// https://github.com/tendermint/tendermint/issue/6899 resolved.
-replace github.com/tendermint/tendermint => github.com/agoric-labs/cometbft v0.34.27-alpha.agoric.3
+	// https://pkg.go.dev/vuln/GO-2023-1578
+	github.com/hashicorp/go-getter => github.com/hashicorp/go-getter v1.7.0
 
-// We need a fork of cosmos-sdk until all of the differences are merged.
-replace github.com/cosmos/cosmos-sdk => github.com/agoric-labs/cosmos-sdk v0.45.16-alpha.agoric.3
+	// 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
 
-// For testing against a local cosmos-sdk or tendermint
-// replace github.com/cosmos/cosmos-sdk => ../../../forks/cosmos-sdk
-// replace github.com/tendermint/tendermint => ../../../forks/tendermint
+	// 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, ibc-go, or cometbft
+// github.com/cosmos/cosmos-sdk => ../../../forks/cosmos-sdk
+// github.com/cosmos/ibc-go/v6 => ../../../forks/ibc-go/v6
+// github.com/tendermint/tendermint => ../../../forks/cometbft
+)