@agoric/cosmos 0.34.2-dev-7ffae88.0 → 0.34.2-orchestration-dev-096c4e8.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 @@
-7ffae88
+096c4e8

package/go.mod

@@ -3,9 +3,11 @@ 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-apps/middleware/packet-forward-middleware/v6 v6.1.1
 	github.com/cosmos/ibc-go/v6 v6.2.1
 	github.com/gogo/protobuf v1.3.3
 	github.com/golang/protobuf v1.5.3
@@ -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,6 +99,7 @@ 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/jmespath/go-jmespath v0.4.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.1
-
 	// 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,23 @@ 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
+
+	// Async version negotiation
+	github.com/cosmos/ibc-go/v6 => github.com/agoric-labs/ibc-go/v6 v6.2.1-alpha.agoric.3
 
 	// 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.1 h1:TOSWh36rYtSjbImlfGuviakCeIlX9f8OROglct35z1Y=
-github.com/agoric-labs/cosmos-sdk v0.46.16-alpha.agoric.1/go.mod h1:zUe5lsg/X7SeSO1nGkzOh9EGKO295szfrxIxYmeLYic=
+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/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.2.1-alpha.agoric.3 h1:YqvVwK+Lg/ZsuwyVm9UbPs8K55fg00R3Y9KnmaTBdgc=
+github.com/agoric-labs/ibc-go/v6 v6.2.1-alpha.agoric.3/go.mod h1:V9NOCRS9RPkSJNJQIPRAjZn/lo2mCAAKOSv3/83ISDY=
 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=
@@ -378,8 +380,8 @@ github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4
 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/ibc-apps/middleware/packet-forward-middleware/v6 v6.1.1 h1:2geCtV4PoNPeRnVc0HMAcRcv+7W3Mvk2nmASkGkOdzE=
+github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v6 v6.1.1/go.mod h1:ovYRGX7P7Vq0D54JIVlIm/47STEKgWJfw9frvL0AWGQ=
 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,6 +726,8 @@ 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=

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@agoric/cosmos",
-  "version": "0.34.2-dev-7ffae88.0+7ffae88",
+  "version": "0.34.2-orchestration-dev-096c4e8.0+096c4e8",
   "description": "Connect JS to the Cosmos blockchain SDK",
   "parsers": {
     "js": "mjs"
   },
-  "main": "src/index.cjs",
+  "main": "index.cjs",
   "engines": {
     "node": ">=14.15.0"
   },
@@ -38,5 +38,5 @@
   "typeCoverage": {
     "atLeast": 0
   },
-  "gitHead": "7ffae88ae37df782d5ffe3cf92261a498b0f636c"
+  "gitHead": "096c4e8fce80e9a509b0e1a30fda11736c4570e1"
 }

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/vm/action.go

@@ -18,7 +18,7 @@ var (
 type Jsonable interface{}
 
 type Action interface {
-	GetActionHeader() ActionHeader
+	GetActionHeader() *ActionHeader
 }
 
 // ActionPusher enqueues data for later consumption by the controller.
@@ -27,14 +27,14 @@ type ActionPusher func(ctx sdk.Context, action Action) error
 // ActionHeader should be embedded in all actions.  It is populated by PopulateAction.
 type ActionHeader struct {
 	// Type defaults to the `actionType:"..."` tag of the embedder's ActionHeader field.
-	Type string `json:"type"`
+	Type string `json:"type,omitempty"`
 	// BlockHeight defaults to sdk.Context.BlockHeight().
 	BlockHeight int64 `json:"blockHeight,omitempty"`
 	// BlockTime defaults to sdk.Context.BlockTime().Unix().
 	BlockTime int64 `json:"blockTime,omitempty"`
 }
 
-func (ah ActionHeader) GetActionHeader() ActionHeader {
+func (ah *ActionHeader) GetActionHeader() *ActionHeader {
 	return ah
 }
 
@@ -129,5 +129,6 @@ func PopulateAction(ctx sdk.Context, action Action) Action {
 			}
 		}
 	}
-	return newActionDesc.Interface().(Action)
+
+	return newActionDescPtr.Interface().(Action)
 }

package/vm/action_test.go

@@ -10,9 +10,11 @@ import (
 )
 
 var (
-	_ vm.Action = &Trivial{}
+	_ vm.Action = Defaults{}
 	_ vm.Action = &Defaults{}
+	_ vm.Action = dataAction{}
 	_ vm.Action = &dataAction{}
+	_ vm.Action = &Trivial{}
 )
 
 type Trivial struct {
@@ -29,8 +31,8 @@ type Defaults struct {
 	Any    interface{}
 }
 
-func (d Defaults) GetActionHeader() vm.ActionHeader {
-	return vm.ActionHeader{}
+func (d Defaults) GetActionHeader() *vm.ActionHeader {
+	return &vm.ActionHeader{}
 }
 
 type dataAction struct {
@@ -52,6 +54,10 @@ func TestActionContext(t *testing.T) {
 			&Trivial{Abc: 123, def: "zot"},
 			&Trivial{Abc: 123, def: "zot"},
 		},
+		{"not a pointer", emptyCtx,
+			&Trivial{Abc: 123, def: "zot"},
+			Trivial{Abc: 123, def: "zot"},
+		},
 		{"block height",
 			emptyCtx.WithBlockHeight(998),
 			&Trivial{Abc: 123, def: "zot"},
@@ -67,6 +73,20 @@ func TestActionContext(t *testing.T) {
 			&Defaults{},
 			&Defaults{"abc", 123, 4.56, true, nil},
 		},
+		{"data action no pointer",
+			emptyCtx,
+			dataAction{},
+			dataAction{
+				ActionHeader: &vm.ActionHeader{Type: "DATA_ACTION"},
+			},
+		},
+		{"data action pointer",
+			emptyCtx,
+			&dataAction{},
+			&dataAction{
+				ActionHeader: &vm.ActionHeader{Type: "DATA_ACTION"},
+			},
+		},
 		{"data action defaults",
 			emptyCtx.WithBlockHeight(998).WithBlockTime(time.UnixMicro(1_000_000)),
 			&dataAction{Data: []byte("hello")},
@@ -75,30 +95,30 @@ func TestActionContext(t *testing.T) {
 		},
 		{"data action override Type",
 			emptyCtx.WithBlockHeight(998).WithBlockTime(time.UnixMicro(1_000_000)),
-			&dataAction{Data: []byte("hello2"),
+			dataAction{Data: []byte("hello2"),
 				ActionHeader: &vm.ActionHeader{Type: "DATA_ACTION2"}},
-			&dataAction{Data: []byte("hello2"),
+			dataAction{Data: []byte("hello2"),
 				ActionHeader: &vm.ActionHeader{Type: "DATA_ACTION2", BlockHeight: 998, BlockTime: 1}},
 		},
 		{"data action override BlockHeight",
 			emptyCtx.WithBlockHeight(998).WithBlockTime(time.UnixMicro(1_000_000)),
-			&dataAction{Data: []byte("hello2"),
+			dataAction{Data: []byte("hello2"),
 				ActionHeader: &vm.ActionHeader{BlockHeight: 999}},
-			&dataAction{Data: []byte("hello2"),
+			dataAction{Data: []byte("hello2"),
 				ActionHeader: &vm.ActionHeader{Type: "DATA_ACTION", BlockHeight: 999, BlockTime: 1}},
 		},
 		{"data action override BlockTime",
 			emptyCtx.WithBlockHeight(998).WithBlockTime(time.UnixMicro(1_000_000)),
-			&dataAction{Data: []byte("hello2"),
+			dataAction{Data: []byte("hello2"),
 				ActionHeader: &vm.ActionHeader{BlockTime: 2}},
-			&dataAction{Data: []byte("hello2"),
+			dataAction{Data: []byte("hello2"),
 				ActionHeader: &vm.ActionHeader{Type: "DATA_ACTION", BlockHeight: 998, BlockTime: 2}},
 		},
 		{"data action override all defaults",
 			emptyCtx.WithBlockHeight(998).WithBlockTime(time.UnixMicro(1_000_000)),
-			&dataAction{Data: []byte("hello2"),
+			dataAction{Data: []byte("hello2"),
 				ActionHeader: &vm.ActionHeader{Type: "DATA_ACTION2", BlockHeight: 999, BlockTime: 2}},
-			&dataAction{Data: []byte("hello2"),
+			dataAction{Data: []byte("hello2"),
 				ActionHeader: &vm.ActionHeader{Type: "DATA_ACTION2", BlockHeight: 999, BlockTime: 2}},
 		},
 	}

package/vm/controller.go

@@ -2,6 +2,7 @@ package vm
 
 import (
 	"context"
+	"fmt"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
@@ -34,6 +35,26 @@ var portToName = make(map[int]string)
 var nameToPort = make(map[string]int)
 var lastPort = 0
 
+type protectedPortHandler struct {
+	inner PortHandler
+}
+
+func (h protectedPortHandler) Receive(ctx context.Context, str string) (ret string, err error) {
+	defer func() {
+		if r := recover(); r != nil {
+			// Propagate just the string, not the error stack or we will invite
+			// nondeterminism.
+			err = fmt.Errorf("panic: %s", r)
+		}
+	}()
+	ret, err = h.inner.Receive(ctx, str)
+	return
+}
+
+func NewProtectedPortHandler(inner PortHandler) PortHandler {
+	return protectedPortHandler{inner}
+}
+
 func SetControllerContext(ctx sdk.Context) func() {
 	// We are only called by the controller, so we assume that it is billing its
 	// own meter usage.
@@ -49,7 +70,7 @@ func GetPort(name string) int {
 
 func RegisterPortHandler(name string, portHandler PortHandler) int {
 	lastPort++
-	portToHandler[lastPort] = portHandler
+	portToHandler[lastPort] = NewProtectedPortHandler(portHandler)
 	portToName[lastPort] = name
 	nameToPort[name] = lastPort
 	return lastPort

package/vm/server.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 )
 
-type AgdServer struct {}
+type AgdServer struct{}
 
 func NewAgdServer() *AgdServer {
 	return &AgdServer{}