From 882dd4e2e3664a6a9a04f16bb508becf35d9ecb5 Mon Sep 17 00:00:00 2001 From: Akash Khosla Date: Sat, 6 Nov 2021 15:01:58 -0700 Subject: [PATCH] fix: proto-gen broken env var (#723) * fix: proto-gen broken env var * add ethereumTx http option Co-authored-by: Freddy Caceres --- Makefile | 2 +- proto/ethermint/evm/v1/tx.proto | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ee820edd..6580ad6a 100755 --- a/Makefile +++ b/Makefile @@ -419,7 +419,7 @@ proto-all: proto-format proto-lint proto-gen proto-gen: @echo "Generating Protobuf files" - @if docker ps -a --format '{{.Names}}' | grep -Eq "^${containerProtoGen}$$"; then docker start -a $(containerProtoGen); else docker run --name $(containerProtoGen) -v $(CURDIR):/workspace --workdir /workspace $(protoImageName) \ + @if docker ps -a --format '{{.Names}}' | grep -Eq "^${containerProtoGen}$$"; then docker start -a $(containerProtoGen); else docker run --name $(containerProtoGen) -v $(CURDIR):/workspace --workdir /workspace $(containerProtoImage) \ sh ./scripts/protocgen.sh; fi proto-swagger-gen: diff --git a/proto/ethermint/evm/v1/tx.proto b/proto/ethermint/evm/v1/tx.proto index a6f0af9a..d9bb7961 100644 --- a/proto/ethermint/evm/v1/tx.proto +++ b/proto/ethermint/evm/v1/tx.proto @@ -2,6 +2,7 @@ syntax = "proto3"; package ethermint.evm.v1; import "gogoproto/gogo.proto"; +import "google/api/annotations.proto"; import "google/protobuf/any.proto"; import "cosmos_proto/cosmos.proto"; import "ethermint/evm/v1/evm.proto"; @@ -11,7 +12,9 @@ option go_package = "github.com/tharsis/ethermint/x/evm/types"; // Msg defines the evm Msg service. service Msg { // EthereumTx defines a method submitting Ethereum transactions. - rpc EthereumTx(MsgEthereumTx) returns (MsgEthereumTxResponse); + rpc EthereumTx(MsgEthereumTx) returns (MsgEthereumTxResponse) { + option (google.api.http).get = "/ethermint/evm/v1/ethereum_tx"; + }; } // MsgEthereumTx encapsulates an Ethereum transaction as an SDK message.