From 1700bd521b77f5db1d7d66f097c07338776c96ed Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sat, 2 Sep 2023 01:11:19 +0800 Subject: [PATCH] update dockerfile and rebuild protos --- Makefile | 2 +- local.Dockerfile | 2 +- .../penumbra/core/ibc/v1alpha1/ibc.pb.go | 38 +++++++++---------- .../v1alpha1/transparent_proofs.pb.go | 2 +- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile index 475d4e11b..b47e3160e 100644 --- a/Makefile +++ b/Makefile @@ -165,7 +165,7 @@ release: goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \ release --rm-dist -protoVer=0.14.0 +protoVer=0.13.5 protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer) protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName) diff --git a/local.Dockerfile b/local.Dockerfile index 6cd45dd2c..7c355675e 100644 --- a/local.Dockerfile +++ b/local.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1-alpine3.17 AS build-env +FROM golang:1.21-alpine3.17 AS build-env RUN apk add --update --no-cache curl make git libc-dev bash gcc linux-headers eudev-dev diff --git a/relayer/chains/penumbra/core/ibc/v1alpha1/ibc.pb.go b/relayer/chains/penumbra/core/ibc/v1alpha1/ibc.pb.go index e893fbd7c..8bf6ff767 100644 --- a/relayer/chains/penumbra/core/ibc/v1alpha1/ibc.pb.go +++ b/relayer/chains/penumbra/core/ibc/v1alpha1/ibc.pb.go @@ -27,28 +27,28 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type IbcAction struct { // - //oneof action { - //.ibc.core.connection.v1.MsgConnectionOpenInit connection_open_init = 1; - //.ibc.core.connection.v1.MsgConnectionOpenTry connection_open_try = 2; - //.ibc.core.connection.v1.MsgConnectionOpenAck connection_open_ack = 3; - //.ibc.core.connection.v1.MsgConnectionOpenConfirm connection_open_confirm = 4; + // oneof action { + // .ibc.core.connection.v1.MsgConnectionOpenInit connection_open_init = 1; + // .ibc.core.connection.v1.MsgConnectionOpenTry connection_open_try = 2; + // .ibc.core.connection.v1.MsgConnectionOpenAck connection_open_ack = 3; + // .ibc.core.connection.v1.MsgConnectionOpenConfirm connection_open_confirm = 4; // - //.ibc.core.channel.v1.MsgChannelOpenInit channel_open_init = 5; - //.ibc.core.channel.v1.MsgChannelOpenTry channel_open_try = 6; - //.ibc.core.channel.v1.MsgChannelOpenAck channel_open_ack = 7; - //.ibc.core.channel.v1.MsgChannelOpenConfirm channel_open_confirm = 8; - //.ibc.core.channel.v1.MsgChannelCloseInit channel_close_init = 9; - //.ibc.core.channel.v1.MsgChannelCloseConfirm channel_close_confirm = 10; + // .ibc.core.channel.v1.MsgChannelOpenInit channel_open_init = 5; + // .ibc.core.channel.v1.MsgChannelOpenTry channel_open_try = 6; + // .ibc.core.channel.v1.MsgChannelOpenAck channel_open_ack = 7; + // .ibc.core.channel.v1.MsgChannelOpenConfirm channel_open_confirm = 8; + // .ibc.core.channel.v1.MsgChannelCloseInit channel_close_init = 9; + // .ibc.core.channel.v1.MsgChannelCloseConfirm channel_close_confirm = 10; // - //.ibc.core.channel.v1.MsgRecvPacket recv_packet = 11; - //.ibc.core.channel.v1.MsgTimeout timeout = 12; - //.ibc.core.channel.v1.MsgAcknowledgement acknowledgement = 13; + // .ibc.core.channel.v1.MsgRecvPacket recv_packet = 11; + // .ibc.core.channel.v1.MsgTimeout timeout = 12; + // .ibc.core.channel.v1.MsgAcknowledgement acknowledgement = 13; // - //.ibc.core.client.v1.MsgCreateClient create_client = 14; - //.ibc.core.client.v1.MsgUpdateClient update_client = 15; - //.ibc.core.client.v1.MsgUpgradeClient upgrade_client = 16; - //.ibc.core.client.v1.MsgSubmitMisbehaviour submit_misbehaviour = 17; - //} + // .ibc.core.client.v1.MsgCreateClient create_client = 14; + // .ibc.core.client.v1.MsgUpdateClient update_client = 15; + // .ibc.core.client.v1.MsgUpgradeClient upgrade_client = 16; + // .ibc.core.client.v1.MsgSubmitMisbehaviour submit_misbehaviour = 17; + // } RawAction *types.Any `protobuf:"bytes,1,opt,name=raw_action,json=rawAction,proto3" json:"raw_action,omitempty"` } diff --git a/relayer/chains/penumbra/core/transparent_proofs/v1alpha1/transparent_proofs.pb.go b/relayer/chains/penumbra/core/transparent_proofs/v1alpha1/transparent_proofs.pb.go index fdd6e0bb0..61dc0d957 100644 --- a/relayer/chains/penumbra/core/transparent_proofs/v1alpha1/transparent_proofs.pb.go +++ b/relayer/chains/penumbra/core/transparent_proofs/v1alpha1/transparent_proofs.pb.go @@ -32,7 +32,7 @@ type SwapClaimProof struct { SwapCommitmentProof *v1alpha11.StateCommitmentProof `protobuf:"bytes,4,opt,name=swap_commitment_proof,json=swapCommitmentProof,proto3" json:"swap_commitment_proof,omitempty"` // The nullifier key used to derive the swap nullifier Nk []byte `protobuf:"bytes,6,opt,name=nk,proto3" json:"nk,omitempty"` - //* + // // @exclude // Describes output amounts Lambda_1I *v1alpha11.Amount `protobuf:"bytes,20,opt,name=lambda_1_i,json=lambda1I,proto3" json:"lambda_1_i,omitempty"`