penumbra - pclientd integration

Makefile

@@ -1,3 +1,8 @@
+DOCKER := $(shell which docker)
+protoVer=0.13.2
+protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
+protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)
+
 default: help
 
 .PHONY: help
@@ -23,4 +28,9 @@ docker-mac-nuke: ## macOS only. Try docker-reset first. Kills and restarts Docke
 
 .PHONY: gen
 gen: ## Run code generators
-	go generate ./...
+	go generate ./...
+
+.PHONY: proto-gen
+proto-gen: ## Generate code from protos
+	@echo "Generating Protobuf files"
+	@$(protoImage) sh ./scripts/protocgen.sh

chain/cosmos/chain_node.go

@@ -1199,7 +1199,7 @@ func (tn *ChainNode) CreateNodeContainer(ctx context.Context) error {
 		cmd = []string{chainCfg.Bin, "start", "--home", tn.HomeDir(), "--x-crisis-skip-assert-invariants"}
 	}
 
-	return tn.containerLifecycle.CreateContainer(ctx, tn.TestName, tn.NetworkID, tn.Image, sentryPorts, tn.Bind(), tn.HostName(), cmd)
+	return tn.containerLifecycle.CreateContainer(ctx, tn.TestName, tn.NetworkID, tn.Image, sentryPorts, tn.Bind(), tn.HostName(), cmd, nil)
 }
 
 func (tn *ChainNode) StartContainer(ctx context.Context) error {

chain/cosmos/sidecar.go

@@ -104,7 +104,7 @@ func (s *SidecarProcess) logger() *zap.Logger {
 }
 
 func (s *SidecarProcess) CreateContainer(ctx context.Context) error {
-	return s.containerLifecycle.CreateContainer(ctx, s.TestName, s.NetworkID, s.Image, s.ports, s.Bind(), s.HostName(), s.startCmd)
+	return s.containerLifecycle.CreateContainer(ctx, s.TestName, s.NetworkID, s.Image, s.ports, s.Bind(), s.HostName(), s.startCmd, nil)
 }
 
 func (s *SidecarProcess) StartContainer(ctx context.Context) error {

chain/internal/tendermint/tendermint_node.go

@@ -14,6 +14,7 @@ import (
 	rpcclient "github.com/cometbft/cometbft/rpc/client"
 	rpchttp "github.com/cometbft/cometbft/rpc/client/http"
 	libclient "github.com/cometbft/cometbft/rpc/jsonrpc/client"
+	volumetypes "github.com/docker/docker/api/types/volume"
 	dockerclient "github.com/docker/docker/client"
 	"github.com/docker/go-connections/nat"
 	"github.com/hashicorp/go-version"
@@ -39,13 +40,45 @@ type TendermintNode struct {
 	containerLifecycle *dockerutil.ContainerLifecycle
 }
 
-func NewTendermintNode(log *zap.Logger, i int, c ibc.Chain, dockerClient *dockerclient.Client, networkID string, testName string, image ibc.DockerImage) *TendermintNode {
+func NewTendermintNode(
+	ctx context.Context,
+	log *zap.Logger,
+	i int,
+	c ibc.Chain,
+	dockerClient *dockerclient.Client,
+	networkID string,
+	testName string,
+	image ibc.DockerImage,
+) (*TendermintNode, error) {
 	tn := &TendermintNode{Log: log, Index: i, Chain: c,
 		DockerClient: dockerClient, NetworkID: networkID, TestName: testName, Image: image}
 
 	tn.containerLifecycle = dockerutil.NewContainerLifecycle(log, dockerClient, tn.Name())
 
-	return tn
+	tv, err := dockerClient.VolumeCreate(ctx, volumetypes.CreateOptions{
+		Labels: map[string]string{
+			dockerutil.CleanupLabel:   testName,
+			dockerutil.NodeOwnerLabel: tn.Name(),
+		},
+	})
+	if err != nil {
+		return nil, fmt.Errorf("creating tendermint volume: %w", err)
+	}
+	tn.VolumeName = tv.Name
+	if err := dockerutil.SetVolumeOwner(ctx, dockerutil.VolumeOwnerOptions{
+		Log: log,
+
+		Client: dockerClient,
+
+		VolumeName: tn.VolumeName,
+		ImageRef:   tn.Image.Ref(),
+		TestName:   tn.TestName,
+		UidGid:     tn.Image.UidGid,
+	}); err != nil {
+		return nil, fmt.Errorf("set tendermint volume owner: %w", err)
+	}
+
+	return tn, nil
 }
 
 // TendermintNodes is a collection of TendermintNode
@@ -226,7 +259,7 @@ func (tn *TendermintNode) CreateNodeContainer(ctx context.Context, additionalFla
 	cmd := []string{chainCfg.Bin, "start", "--home", tn.HomeDir()}
 	cmd = append(cmd, additionalFlags...)
 
-	return tn.containerLifecycle.CreateContainer(ctx, tn.TestName, tn.NetworkID, tn.Image, sentryPorts, tn.Bind(), tn.HostName(), cmd)
+	return tn.containerLifecycle.CreateContainer(ctx, tn.TestName, tn.NetworkID, tn.Image, sentryPorts, tn.Bind(), tn.HostName(), cmd, nil)
 }
 
 func (tn *TendermintNode) StopContainer(ctx context.Context) error {