go.mod

@@ -34,9 +34,9 @@ require (
 	github.com/tendermint/tendermint v0.34.21
 	github.com/tendermint/tm-db v0.6.7
 	github.com/tyler-smith/go-bip39 v1.1.0
-	golang.org/x/net v0.0.0-20220726230323-06994584191e
+	golang.org/x/net v0.1.0
 	golang.org/x/text v0.4.0
-	google.golang.org/genproto v0.0.0-20220815135757-37a418bb8959
+	google.golang.org/genproto v0.0.0-20221018160656-63c7b68cfc55
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 	sigs.k8s.io/yaml v1.3.0
@@ -157,7 +157,7 @@ require (
 	github.com/rs/zerolog v1.27.0 // indirect
 	github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa // indirect
 	github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
-	github.com/spf13/afero v1.8.2 // 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/stretchr/objx v0.4.0 // indirect
@@ -172,13 +172,13 @@ require (
 	github.com/zondax/hid v0.9.1-0.20220302062450-5552068d2266 // indirect
 	go.etcd.io/bbolt v1.3.6 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
+	golang.org/x/crypto v0.1.0 // indirect
 	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
 	golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2 // indirect
 	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
-	golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
+	golang.org/x/sys v0.1.0 // indirect
-	golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect
+	golang.org/x/term v0.1.0 // indirect
-	golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
+	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	google.golang.org/api v0.93.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect

go.sum

@@ -967,8 +967,8 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO
 github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
 github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
-github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo=
+github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw=
-github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo=
+github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
 github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
@@ -1116,8 +1116,8 @@ golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d h1:sK3txAijHtOK88l68nt020reeT1ZdKLIYetKl95FzVY=
+golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=
-golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -1223,8 +1223,8 @@ golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su
 golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.0.0-20220726230323-06994584191e h1:wOQNKh1uuDGRnmgF0jDxh7ctgGy/3P4rYWQRVJD4/Yg=
+golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
-golang.org/x/net v0.0.0-20220726230323-06994584191e/go.mod h1:AaygXjzTFtRAg2ttMY5RMuhpJ3cNnI0XpyFJD1iQRSM=
+golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1365,13 +1365,14 @@ golang.org/x/sys v0.0.0-20220517195934-5e4e11fc645e/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab h1:2QkjZIsXupsJbJIdSjjUOgWK3aEtzyuh2mPt3l/CkeU=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
+golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 h1:Q5284mrmYTpACcm+eAKjKJH48BBwSyfJqmmGDTtT8Vc=
+golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw=
-golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1459,8 +1460,9 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
-golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f h1:uF6paiQQebLeSXkrTqHqz0MXhXXS1KgF41eUdBNvxK0=
 golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
+golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
+golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
 gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo=
 gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo=
 gonum.org/v1/gonum v0.6.0/go.mod h1:9mxDZsDKxgMAuccQkewq682L+0eCu4dCN2yonUJTCLU=
@@ -1607,8 +1609,8 @@ google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljW
 google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
 google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
 google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
-google.golang.org/genproto v0.0.0-20220815135757-37a418bb8959 h1:hw4Y42zL1VyVKxPgRHHh191fpVBGV8sNVmcow5Z8VXY=
+google.golang.org/genproto v0.0.0-20221018160656-63c7b68cfc55 h1:U1u4KB2kx6KR/aJDjQ97hZ15wQs8ZPvDcGcRynBhkvg=
-google.golang.org/genproto v0.0.0-20220815135757-37a418bb8959/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
+google.golang.org/genproto v0.0.0-20221018160656-63c7b68cfc55/go.mod h1:45EK0dUbEZ2NHjCeAd2LXmyjAgGUGrpGROgjhC3ADck=
 google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=

gomod2nix.toml

@@ -415,8 +415,8 @@ schema = 3
     version = "v3.21.4-0.20210419000835-c7a38de76ee5+incompatible"
     hash = "sha256-oqIqyFquWabIE6DID6uTEc8oFEmM1rVu2ATn3toiCEg="
   [mod."github.com/spf13/afero"]
-    version = "v1.8.2"
+    version = "v1.9.2"
-    hash = "sha256-ERuG4GK1LOn72DRbT9URpo1QoVIm2A3mPtlf+xSPgx8="
+    hash = "sha256-R1mir7Fu95QK+YL99U14RGbLJzxqWRH5rSFpssgJvzA="
   [mod."github.com/spf13/cast"]
     version = "v1.5.0"
     hash = "sha256-Pdp+wC5FWqyJKzyYHb7JCcV9BoJk/sxQw6nLyuLJvuQ="
@@ -484,14 +484,14 @@ schema = 3
     version = "v0.23.0"
     hash = "sha256-R3O9GyNtv6j0ic7s+2xkLLaLzbJEop0Otj1nJDFBjsg="
   [mod."golang.org/x/crypto"]
-    version = "v0.0.0-20220622213112-05595931fe9d"
+    version = "v0.1.0"
-    hash = "sha256-2c4wvwiQ0DJSJsApfmNoxCxx1siRCiJvW9hhrGlcvds="
+    hash = "sha256-0oZWBSiW5Pd/2a1p2beuoelDe0CpfXZhrg/qPduJlYs="
   [mod."golang.org/x/exp"]
     version = "v0.0.0-20220722155223-a9213eeb770e"
     hash = "sha256-kNgzydWRpjm0sZl4uXEs3LX5L0xjJtJRAFf/CTlYUN4="
   [mod."golang.org/x/net"]
-    version = "v0.0.0-20220726230323-06994584191e"
+    version = "v0.1.0"
-    hash = "sha256-VFJB2BjvFZnp0zoJLX4iinV/P6Cn7XUlsKwBGCdVjlU="
+    hash = "sha256-SrThFBg6sqGYpiN1E3d1SilJxbKkQhSZXPmAFoMAA/I="
   [mod."golang.org/x/oauth2"]
     version = "v0.0.0-20220622183110-fd043fe589d2"
     hash = "sha256-VLffpTpx3DlUzXB8mKiJfFzm4ZmgnLSUuLB5Ir0WQUg="
@@ -499,17 +499,17 @@ schema = 3
     version = "v0.0.0-20220722155255-886fb9371eb4"
     hash = "sha256-ZZyIlxh+nqsOiWHstW7eHXN7RhHnbSL2eDIzcve07Q0="
   [mod."golang.org/x/sys"]
-    version = "v0.0.0-20220811171246-fbc7d0a398ab"
+    version = "v0.1.0"
-    hash = "sha256-acnc9aKY/SyebObLasV+gowfB0S+6ehz3hnUgAmQmSU="
+    hash = "sha256-nZbEJ/2PuWrDLD4ujeVvcFGoIsfVoIH/Lcp4FjD7hpU="
   [mod."golang.org/x/term"]
-    version = "v0.0.0-20220722155259-a9ba230a4035"
+    version = "v0.1.0"
-    hash = "sha256-9uM1OONzbsa6bz2iKk767hAaCuafi58bdTF7at03fWY="
+    hash = "sha256-UWnNsJIj5nXsuzlPWQ1NyHQuHStaDacMVkFbJ4pnxXk="
   [mod."golang.org/x/text"]
     version = "v0.4.0"
     hash = "sha256-JvyMygdmTvWg7xhbnUB9MMk6WcYXJt8DAj4DYl82Pys="
   [mod."golang.org/x/xerrors"]
-    version = "v0.0.0-20220609144429-65e65417b02f"
+    version = "v0.0.0-20220907171357-04be3eba64a2"
-    hash = "sha256-tl8pv3oddbz2+KoIp7PFDKsxjQF8ocjPF8XPsY3sw38="
+    hash = "sha256-6+zueutgefIYmgXinOflz8qGDDDj0Zhv+2OkGhBTKno="
   [mod."google.golang.org/api"]
     version = "v0.93.0"
     hash = "sha256-W17B79osAhObMbrCHlgywEPg9yIPx0ZISDhp9JwFE5A="
@@ -517,8 +517,8 @@ schema = 3
     version = "v1.6.7"
     hash = "sha256-zIxGRHiq4QBvRqkrhMGMGCaVL4iM4TtlYpAi/hrivS4="
   [mod."google.golang.org/genproto"]
-    version = "v0.0.0-20220815135757-37a418bb8959"
+    version = "v0.0.0-20221018160656-63c7b68cfc55"
-    hash = "sha256-uS60VVZDdn6kNV24bmOmSTuwz4lBqVM+9XK176GGL2s="
+    hash = "sha256-Z4ynOw+3NkSkWVOrNaeuQC3G9Q6+joNbTLVoF2HegrU="
   [mod."google.golang.org/grpc"]
     version = "v1.50.1"
     hash = "sha256-38nk4qIme+fE57SsCqNxtCZnc8fyzzi4Sb60uDTT2KE="

proto/ethermint/crypto/v1/ethsecp256k1/keys.proto

@@ -16,4 +16,6 @@ message PubKey {
 
 // PrivKey defines a type alias for an ecdsa.PrivateKey that implements
 // Tendermint's PrivateKey interface.
-message PrivKey { bytes key = 1; }
+message PrivKey {
+  bytes key = 1;
+}

proto/ethermint/evm/v1/evm.proto

@@ -9,21 +9,15 @@ option go_package = "github.com/evmos/ethermint/x/evm/types";
 message Params {
   // evm denom represents the token denomination used to run the EVM state
   // transitions.
-  string evm_denom = 1 [ (gogoproto.moretags) = "yaml:\"evm_denom\"" ];
+  string evm_denom = 1 [(gogoproto.moretags) = "yaml:\"evm_denom\""];
   // enable create toggles state transitions that use the vm.Create function
-  bool enable_create = 2 [ (gogoproto.moretags) = "yaml:\"enable_create\"" ];
+  bool enable_create = 2 [(gogoproto.moretags) = "yaml:\"enable_create\""];
   // enable call toggles state transitions that use the vm.Call function
-  bool enable_call = 3 [ (gogoproto.moretags) = "yaml:\"enable_call\"" ];
+  bool enable_call = 3 [(gogoproto.moretags) = "yaml:\"enable_call\""];
   // extra eips defines the additional EIPs for the vm.Config
-  repeated int64 extra_eips = 4 [
+  repeated int64 extra_eips = 4 [(gogoproto.customname) = "ExtraEIPs", (gogoproto.moretags) = "yaml:\"extra_eips\""];
-    (gogoproto.customname) = "ExtraEIPs",
-    (gogoproto.moretags) = "yaml:\"extra_eips\""
-  ];
   // chain config defines the EVM chain configuration parameters
-  ChainConfig chain_config = 5 [
+  ChainConfig chain_config = 5 [(gogoproto.moretags) = "yaml:\"chain_config\"", (gogoproto.nullable) = false];
-    (gogoproto.moretags) = "yaml:\"chain_config\"",
-    (gogoproto.nullable) = false
-  ];
   // Allow unprotected transactions defines if replay-protected (i.e non EIP155
   // signed) transactions can be executed on the state machine.
   bool allow_unprotected_txs = 6;
@@ -44,10 +38,8 @@ message ChainConfig {
     (gogoproto.moretags)   = "yaml:\"dao_fork_block\""
   ];
   // Whether the nodes supports or opposes the DAO hard-fork
-  bool dao_fork_support = 3 [
+  bool dao_fork_support = 3
-    (gogoproto.customname) = "DAOForkSupport",
+      [(gogoproto.customname) = "DAOForkSupport", (gogoproto.moretags) = "yaml:\"dao_fork_support\""];
-    (gogoproto.moretags) = "yaml:\"dao_fork_support\""
-  ];
   // EIP150 implements the Gas price changes
   // (https://github.com/ethereum/EIPs/issues/150) EIP150 HF block (nil no fork)
   string eip150_block = 4 [
@@ -56,10 +48,7 @@ message ChainConfig {
     (gogoproto.moretags)   = "yaml:\"eip150_block\""
   ];
   // EIP150 HF hash (needed for header only clients as only gas pricing changed)
-  string eip150_hash = 5 [
+  string eip150_hash = 5 [(gogoproto.customname) = "EIP150Hash", (gogoproto.moretags) = "yaml:\"byzantium_block\""];
-    (gogoproto.customname) = "EIP150Hash",
-    (gogoproto.moretags) = "yaml:\"byzantium_block\""
-  ];
   // EIP155Block HF block
   string eip155_block = 6 [
     (gogoproto.customname) = "EIP155Block",
@@ -128,7 +117,6 @@ message ChainConfig {
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
     (gogoproto.moretags)   = "yaml:\"merge_netsplit_block\""
   ];
-
 }
 
 // State represents a single Storage key value pair item.
@@ -162,15 +150,15 @@ message Log {
   // but not secured by consensus.
 
   // block in which the transaction was included
-  uint64 block_number = 4 [ (gogoproto.jsontag) = "blockNumber" ];
+  uint64 block_number = 4 [(gogoproto.jsontag) = "blockNumber"];
   // hash of the transaction
-  string tx_hash = 5 [ (gogoproto.jsontag) = "transactionHash" ];
+  string tx_hash = 5 [(gogoproto.jsontag) = "transactionHash"];
   // index of the transaction in the block
-  uint64 tx_index = 6 [ (gogoproto.jsontag) = "transactionIndex" ];
+  uint64 tx_index = 6 [(gogoproto.jsontag) = "transactionIndex"];
   // hash of the block in which the transaction was included
-  string block_hash = 7 [ (gogoproto.jsontag) = "blockHash" ];
+  string block_hash = 7 [(gogoproto.jsontag) = "blockHash"];
   // index of the log in the block
-  uint64 index = 8 [ (gogoproto.jsontag) = "logIndex" ];
+  uint64 index = 8 [(gogoproto.jsontag) = "logIndex"];
 
   // The Removed field is true if this log was reverted due to a chain
   // reorganisation. You must pay attention to this field if you receive logs
@@ -185,16 +173,12 @@ message TxResult {
   // contract_address contains the ethereum address of the created contract (if
   // any). If the state transition is an evm.Call, the contract address will be
   // empty.
-  string contract_address = 1
+  string contract_address = 1 [(gogoproto.moretags) = "yaml:\"contract_address\""];
-      [ (gogoproto.moretags) = "yaml:\"contract_address\"" ];
   // bloom represents the bloom filter bytes
   bytes bloom = 2;
   // tx_logs contains the transaction hash and the proto-compatible ethereum
   // logs.
-  TransactionLogs tx_logs = 3 [
+  TransactionLogs tx_logs = 3 [(gogoproto.moretags) = "yaml:\"tx_logs\"", (gogoproto.nullable) = false];
-    (gogoproto.moretags) = "yaml:\"tx_logs\"",
-    (gogoproto.nullable) = false
-  ];
   // ret defines the bytes from the execution.
   bytes ret = 4;
   // reverted flag is set to true when the call has been reverted
@@ -210,7 +194,7 @@ message AccessTuple {
   // hex formatted ethereum address
   string address = 1;
   // hex formatted hashes of the storage keys
-  repeated string storage_keys = 2 [ (gogoproto.jsontag) = "storageKeys" ];
+  repeated string storage_keys = 2 [(gogoproto.jsontag) = "storageKeys"];
 }
 
 // TraceConfig holds extra parameters to trace functions.
@@ -228,9 +212,9 @@ message TraceConfig {
   // number of blocks the tracer is willing to go back
   uint64 reexec = 3;
   // disable stack capture
-  bool disable_stack = 5 [ (gogoproto.jsontag) = "disableStack" ];
+  bool disable_stack = 5 [(gogoproto.jsontag) = "disableStack"];
   // disable storage capture
-  bool disable_storage = 6 [ (gogoproto.jsontag) = "disableStorage" ];
+  bool disable_storage = 6 [(gogoproto.jsontag) = "disableStorage"];
   // print output during capture end
   bool debug = 8;
   // maximum length of output, but zero means unlimited
@@ -238,7 +222,7 @@ message TraceConfig {
   // Chain overrides, can be used to execute a trace using future fork rules
   ChainConfig overrides = 10;
   // enable memory capture
-  bool enable_memory = 11 [ (gogoproto.jsontag) = "enableMemory" ];
+  bool enable_memory = 11 [(gogoproto.jsontag) = "enableMemory"];
   // enable return data capture
-  bool enable_return_data = 12 [ (gogoproto.jsontag) = "enableReturnData" ];
+  bool enable_return_data = 12 [(gogoproto.jsontag) = "enableReturnData"];
 }

proto/ethermint/evm/v1/genesis.proto

@@ -9,9 +9,9 @@ option go_package = "github.com/evmos/ethermint/x/evm/types";
 // GenesisState defines the evm module's genesis state.
 message GenesisState {
   // accounts is an array containing the ethereum genesis accounts.
-  repeated GenesisAccount accounts = 1 [ (gogoproto.nullable) = false ];
+  repeated GenesisAccount accounts = 1 [(gogoproto.nullable) = false];
   // params defines all the parameters of the module.
-  Params params = 2 [ (gogoproto.nullable) = false ];
+  Params params = 2 [(gogoproto.nullable) = false];
 }
 
 // GenesisAccount defines an account to be initialized in the genesis state.
@@ -23,6 +23,5 @@ message GenesisAccount {
   // code defines the hex bytes of the account code.
   string code = 2;
   // storage defines the set of state key values for the account.
-  repeated State storage = 3
+  repeated State storage = 3 [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "Storage"];
-      [ (gogoproto.nullable) = false, (gogoproto.castrepeated) = "Storage" ];
 }

proto/ethermint/evm/v1/query.proto

@@ -18,17 +18,14 @@ service Query {
   }
 
   // CosmosAccount queries an Ethereum account's Cosmos Address.
-  rpc CosmosAccount(QueryCosmosAccountRequest)
+  rpc CosmosAccount(QueryCosmosAccountRequest) returns (QueryCosmosAccountResponse) {
-      returns (QueryCosmosAccountResponse) {
     option (google.api.http).get = "/ethermint/evm/v1/cosmos_account/{address}";
   }
 
   // ValidatorAccount queries an Ethereum account's from a validator consensus
   // Address.
-  rpc ValidatorAccount(QueryValidatorAccountRequest)
+  rpc ValidatorAccount(QueryValidatorAccountRequest) returns (QueryValidatorAccountResponse) {
-      returns (QueryValidatorAccountResponse) {
+    option (google.api.http).get = "/ethermint/evm/v1/validator_account/{cons_address}";
-    option (google.api.http).get =
-        "/ethermint/evm/v1/validator_account/{cons_address}";
   }
 
   // Balance queries the balance of a the EVM denomination for a single
@@ -77,7 +74,6 @@ service Query {
   rpc BaseFee(QueryBaseFeeRequest) returns (QueryBaseFeeResponse) {
     option (google.api.http).get = "/ethermint/evm/v1/base_fee";
   }
-
 }
 
 // QueryAccountRequest is the request type for the Query/Account RPC method.
@@ -216,7 +212,7 @@ message QueryParamsRequest {}
 // QueryParamsResponse defines the response type for querying x/evm parameters.
 message QueryParamsResponse {
   // params define the evm module parameters.
-  Params params = 1 [ (gogoproto.nullable) = false ];
+  Params params = 1 [(gogoproto.nullable) = false];
 }
 
 // EthCallRequest defines EthCall request
@@ -284,6 +280,5 @@ message QueryBaseFeeRequest {}
 
 // BaseFeeResponse returns the EIP1559 base fee.
 message QueryBaseFeeResponse {
-  string base_fee = 1
+  string base_fee = 1 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int"];
-      [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int" ];
 }

proto/ethermint/evm/v1/tx.proto

@@ -26,9 +26,9 @@ message MsgEthereumTx {
   // caches
 
   // DEPRECATED: encoded storage size of the transaction
-  double size = 2 [ (gogoproto.jsontag) = "-" ];
+  double size = 2 [(gogoproto.jsontag) = "-"];
   // transaction hash in hex format
-  string hash = 3 [ (gogoproto.moretags) = "rlp:\"-\"" ];
+  string hash = 3 [(gogoproto.moretags) = "rlp:\"-\""];
   // ethereum signer address in hex format. This address value is checked
   // against the address derived from the signature (V, R, S) using the
   // secp256k1 elliptic curve
@@ -45,17 +45,14 @@ message LegacyTx {
   // nonce corresponds to the account nonce (transaction sequence).
   uint64 nonce = 1;
   // gas price defines the value for each gas unit
-  string gas_price = 2
+  string gas_price = 2 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int"];
-      [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int" ];
   // gas defines the gas limit defined for the transaction.
-  uint64 gas = 3 [ (gogoproto.customname) = "GasLimit" ];
+  uint64 gas = 3 [(gogoproto.customname) = "GasLimit"];
   // hex formatted address of the recipient
   string to = 4;
   // value defines the unsigned integer value of the transaction amount.
-  string value = 5 [
+  string value = 5
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+      [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.customname) = "Amount"];
-    (gogoproto.customname) = "Amount"
-  ];
   // input defines the data payload bytes of the transaction.
   bytes data = 6;
   // v defines the signature value
@@ -80,24 +77,18 @@ message AccessListTx {
   // nonce corresponds to the account nonce (transaction sequence).
   uint64 nonce = 2;
   // gas price defines the value for each gas unit
-  string gas_price = 3
+  string gas_price = 3 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int"];
-      [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int" ];
   // gas defines the gas limit defined for the transaction.
-  uint64 gas = 4 [ (gogoproto.customname) = "GasLimit" ];
+  uint64 gas = 4 [(gogoproto.customname) = "GasLimit"];
   // hex formatted address of the recipient
   string to = 5;
   // value defines the unsigned integer value of the transaction amount.
-  string value = 6 [
+  string value = 6
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+      [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.customname) = "Amount"];
-    (gogoproto.customname) = "Amount"
-  ];
   // input defines the data payload bytes of the transaction.
   bytes                data     = 7;
-  repeated AccessTuple accesses = 8 [
+  repeated AccessTuple accesses = 8
-    (gogoproto.castrepeated) = "AccessList",
+      [(gogoproto.castrepeated) = "AccessList", (gogoproto.jsontag) = "accessList", (gogoproto.nullable) = false];
-    (gogoproto.jsontag) = "accessList",
-    (gogoproto.nullable) = false
-  ];
   // v defines the signature value
   bytes v = 9;
   // r defines the signature value
@@ -120,27 +111,20 @@ message DynamicFeeTx {
   // nonce corresponds to the account nonce (transaction sequence).
   uint64 nonce = 2;
   // gas tip cap defines the max value for the gas tip
-  string gas_tip_cap = 3
+  string gas_tip_cap = 3 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int"];
-      [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int" ];
   // gas fee cap defines the max value for the gas fee
-  string gas_fee_cap = 4
+  string gas_fee_cap = 4 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int"];
-      [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int" ];
   // gas defines the gas limit defined for the transaction.
-  uint64 gas = 5 [ (gogoproto.customname) = "GasLimit" ];
+  uint64 gas = 5 [(gogoproto.customname) = "GasLimit"];
   // hex formatted address of the recipient
   string to = 6;
   // value defines the the transaction amount.
-  string value = 7 [
+  string value = 7
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+      [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.customname) = "Amount"];
-    (gogoproto.customname) = "Amount"
-  ];
   // input defines the data payload bytes of the transaction.
   bytes                data     = 8;
-  repeated AccessTuple accesses = 9 [
+  repeated AccessTuple accesses = 9
-    (gogoproto.castrepeated) = "AccessList",
+      [(gogoproto.castrepeated) = "AccessList", (gogoproto.jsontag) = "accessList", (gogoproto.nullable) = false];
-    (gogoproto.jsontag) = "accessList",
-    (gogoproto.nullable) = false
-  ];
   // v defines the signature value
   bytes v = 10;
   // r defines the signature value

proto/ethermint/feemarket/v1/feemarket.proto

@@ -21,19 +21,12 @@ message Params {
   // height at which the base fee calculation is enabled.
   int64 enable_height = 5;
   // base fee for EIP-1559 blocks.
-  string base_fee = 6 [
+  string base_fee = 6 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false];
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
-    (gogoproto.nullable) = false
-  ];
   // min_gas_price defines the minimum gas price value for cosmos and eth transactions
-  string min_gas_price = 7 [
+  string min_gas_price = 7
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+      [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false];
-    (gogoproto.nullable) = false
-  ];
   // min gas denominator bounds the minimum gasUsed to be charged
   // to senders based on GasLimit
-  string min_gas_multiplier = 8 [
+  string min_gas_multiplier = 8
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+      [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false];
-    (gogoproto.nullable) = false
-  ];
 }

proto/ethermint/feemarket/v1/genesis.proto

@@ -9,7 +9,7 @@ option go_package = "github.com/evmos/ethermint/x/feemarket/types";
 // GenesisState defines the feemarket module's genesis state.
 message GenesisState {
   // params defines all the paramaters of the module.
-  Params params = 1 [ (gogoproto.nullable) = false ];
+  Params params = 1 [(gogoproto.nullable) = false];
   // DEPRECATED: base fee is the exported value from previous software version.
   // Zero by default.
   reserved 2;

proto/ethermint/feemarket/v1/query.proto

@@ -32,7 +32,7 @@ message QueryParamsRequest {}
 // QueryParamsResponse defines the response type for querying x/evm parameters.
 message QueryParamsResponse {
   // params define the evm module parameters.
-  Params params = 1 [ (gogoproto.nullable) = false ];
+  Params params = 1 [(gogoproto.nullable) = false];
 }
 
 // QueryBaseFeeRequest defines the request type for querying the EIP1559 base
@@ -41,8 +41,7 @@ message QueryBaseFeeRequest {}
 
 // BaseFeeResponse returns the EIP1559 base fee.
 message QueryBaseFeeResponse {
-  string base_fee = 1
+  string base_fee = 1 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int"];
-      [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int" ];
 }
 
 // QueryBlockGasRequest defines the request type for querying the EIP1559 base
@@ -50,4 +49,6 @@ message QueryBaseFeeResponse {
 message QueryBlockGasRequest {}
 
 // QueryBlockGasResponse returns block gas used for a given height.
-message QueryBlockGasResponse { int64 gas = 1; }
+message QueryBlockGasResponse {
+  int64 gas = 1;
+}

proto/ethermint/types/v1/account.proto

@@ -14,12 +14,9 @@ message EthAccount {
   option (gogoproto.goproto_stringer) = false;
   option (gogoproto.equal)            = false;
 
-  option (cosmos_proto.implements_interface) =
+  option (cosmos_proto.implements_interface) = "github.com/cosmos/cosmos-sdk/x/auth/types.AccountI";
-      "github.com/cosmos/cosmos-sdk/x/auth/types.AccountI";
 
-  cosmos.auth.v1beta1.BaseAccount base_account = 1 [
+  cosmos.auth.v1beta1.BaseAccount base_account = 1
-    (gogoproto.embed) = true,
+      [(gogoproto.embed) = true, (gogoproto.moretags) = "yaml:\"base_account\""];
-    (gogoproto.moretags) = "yaml:\"base_account\""
+  string code_hash = 2 [(gogoproto.moretags) = "yaml:\"code_hash\""];
-  ];
-  string code_hash = 2 [ (gogoproto.moretags) = "yaml:\"code_hash\"" ];
 }

proto/ethermint/types/v1/dynamic_fee.proto

@@ -8,8 +8,6 @@ option go_package = "github.com/evmos/ethermint/types";
 // ExtensionOptionDynamicFeeTx is an extension option that specify the maxPrioPrice for cosmos tx
 message ExtensionOptionDynamicFeeTx {
   // the same as `max_priority_fee_per_gas` in eip-1559 spec
-  string max_priority_price = 1 [
+  string max_priority_price = 1
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+      [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false];
-    (gogoproto.nullable) = false
-  ];
 }

proto/ethermint/types/v1/web3.proto

@@ -10,16 +10,14 @@ message ExtensionOptionsWeb3Tx {
 
   // typed data chain id used only in EIP712 Domain and should match
   // Ethereum network ID in a Web3 provider (e.g. Metamask).
-  uint64 typed_data_chain_id = 1 [
+  uint64 typed_data_chain_id = 1
-    (gogoproto.jsontag) = "typedDataChainID,omitempty",
+      [(gogoproto.jsontag) = "typedDataChainID,omitempty", (gogoproto.customname) = "TypedDataChainID"];
-    (gogoproto.customname) = "TypedDataChainID"
-  ];
 
   // fee payer is an account address for the fee payer. It will be validated
   // during EIP712 signature checking.
-  string fee_payer = 2 [ (gogoproto.jsontag) = "feePayer,omitempty" ];
+  string fee_payer = 2 [(gogoproto.jsontag) = "feePayer,omitempty"];
 
   // fee payer sig is a signature data from the fee paying account,
   // allows to perform fee delegation when using EIP712 Domain.
-  bytes fee_payer_sig = 3 [ (gogoproto.jsontag) = "feePayerSig,omitempty" ];
+  bytes fee_payer_sig = 3 [(gogoproto.jsontag) = "feePayerSig,omitempty"];
 }