From b03eb0b28a54ff43cdb73d8802e6ac527317a8cc Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Tue, 19 Mar 2024 16:26:47 -0400 Subject: [PATCH 1/3] chore: proto updates --- go.mod | 11 +++-------- go.sum | 25 ++++++------------------- internal/chain/transaction.go | 2 +- 3 files changed, 10 insertions(+), 28 deletions(-) diff --git a/go.mod b/go.mod index 368bc40..de48b47 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,9 @@ module github.com/astriaorg/seq-faucet go 1.21 require ( - buf.build/gen/go/astria/astria/protocolbuffers/go v1.31.0-20231130012811-2fd7e6d46ebd.2 + buf.build/gen/go/astria/astria/protocolbuffers/go v1.32.0-20240314225002-310b29d1ef86.1 github.com/LK4D4/trylock v0.0.0-20191027065348-ff7e133a5c54 - github.com/astriaorg/go-sequencer-client v0.0.0-20231201013457-0df599de8e74 + github.com/astriaorg/go-sequencer-client v0.2.0-alpha.2.0.20240319201724-8dfc0ed60f1b github.com/cometbft/cometbft v0.37.0 github.com/ethereum/go-ethereum v1.10.26 github.com/jellydator/ttlcache/v2 v2.11.1 @@ -14,11 +14,6 @@ require ( ) require ( - buf.build/gen/go/cosmos/cosmos-proto/protocolbuffers/go v1.31.0-20211202220400-1935555c206d.2 // indirect - buf.build/gen/go/cosmos/cosmos-sdk/protocolbuffers/go v1.31.0-20230719110346-aa25660f4ff7.2 // indirect - buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.31.0-20230509103710-5e5b9fdd0180.2 // indirect - buf.build/gen/go/cosmos/ibc/protocolbuffers/go v1.31.0-20230913112312-7ab44ae956a0.2 // indirect - buf.build/gen/go/penumbra-zone/penumbra/protocolbuffers/go v1.31.0-20231120132728-bc443669626d.2 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/btcsuite/btcd/btcec/v2 v2.2.1 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect @@ -48,5 +43,5 @@ require ( golang.org/x/text v0.7.0 // indirect google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6 // indirect google.golang.org/grpc v1.52.0 // indirect - google.golang.org/protobuf v1.31.0 // indirect + google.golang.org/protobuf v1.32.0 // indirect ) diff --git a/go.sum b/go.sum index 45d8dd4..2d02781 100644 --- a/go.sum +++ b/go.sum @@ -1,18 +1,5 @@ -buf.build/gen/go/astria/astria/protocolbuffers/go v1.31.0-20231130012811-2fd7e6d46ebd.2 h1:gq4dRHG9GJEh8tkTsFwgrHA+tPiZead6YKRgsaidQJg= -buf.build/gen/go/astria/astria/protocolbuffers/go v1.31.0-20231130012811-2fd7e6d46ebd.2/go.mod h1:OPKBvxqrsHTBen+bbkQT/beHK/aSznSulzR+JeDSUKw= -buf.build/gen/go/cosmos/cosmos-proto/protocolbuffers/go v1.31.0-20211202220400-1935555c206d.2 h1:O+V9Yq7KkauH1cMnUAHxsl5n+b7ZD/RZnHo9ZiJICGg= -buf.build/gen/go/cosmos/cosmos-proto/protocolbuffers/go v1.31.0-20211202220400-1935555c206d.2/go.mod h1:yHKMbegvhfMbDGsQp/q7tECJTfZf0wrgTRcH1glgEQk= -buf.build/gen/go/cosmos/cosmos-sdk/protocolbuffers/go v1.31.0-20230522115704-e7a85cef453e.2/go.mod h1:d16Ahcn3H831Oe+NnNOWuXkV3aTiPOBZvUAZaHYECkU= -buf.build/gen/go/cosmos/cosmos-sdk/protocolbuffers/go v1.31.0-20230719110346-aa25660f4ff7.2 h1:mDJdIdbHw10arzuVIpFoQr6h8cxKPcdT2r91Q2izQu0= -buf.build/gen/go/cosmos/cosmos-sdk/protocolbuffers/go v1.31.0-20230719110346-aa25660f4ff7.2/go.mod h1:vg3BLbBJ3Vl9Wu7GE6BmxYq1+VMU4Yg8cv9YG7qF2AQ= -buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.31.0-20221020125208-34d970b699f8.2/go.mod h1:rTzewyj2LANV2IIuGZnKMsvbIEVAguDwBvMdxD1pa3k= -buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.31.0-20230509103710-5e5b9fdd0180.2 h1:4JCzFq6Gwr5hx3BpGky420OsrZjdMI8rAB3T7zcsDrs= -buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.31.0-20230509103710-5e5b9fdd0180.2/go.mod h1:rTzewyj2LANV2IIuGZnKMsvbIEVAguDwBvMdxD1pa3k= -buf.build/gen/go/cosmos/ibc/protocolbuffers/go v1.31.0-20230913112312-7ab44ae956a0.2 h1:9LwQA/UwYerRClC/fNzeyynz+AfDenAmyZj5G8HPLmU= -buf.build/gen/go/cosmos/ibc/protocolbuffers/go v1.31.0-20230913112312-7ab44ae956a0.2/go.mod h1:piKWSxT4f990Ium90hWQnNwuqxhsoYxhPtZYcOz2vNs= -buf.build/gen/go/cosmos/ics23/protocolbuffers/go v1.31.0-20221207100654-55085f7c710a.2/go.mod h1:1V7tFOxP2P2x8G0oasO+VqSHN0Bhly5I/e+2vENGomQ= -buf.build/gen/go/penumbra-zone/penumbra/protocolbuffers/go v1.31.0-20231120132728-bc443669626d.2 h1:IOCmnR+xxYcOUdG2fRR6KRAkATFKMJYE1Z5zVV1Pphg= -buf.build/gen/go/penumbra-zone/penumbra/protocolbuffers/go v1.31.0-20231120132728-bc443669626d.2/go.mod h1:h82VMeit0Ae3VmGvS6QH6yJx9GPHM3y4y0x1JU3Vyyc= +buf.build/gen/go/astria/astria/protocolbuffers/go v1.32.0-20240314225002-310b29d1ef86.1 h1:tqubh9diC2bk6BzxO9Obs9KgxvsfTEa0hWKqG9kA45E= +buf.build/gen/go/astria/astria/protocolbuffers/go v1.32.0-20240314225002-310b29d1ef86.1/go.mod h1:Ma4TsfKTQby0r4gCkdb6D2ThBxTNu0mSVNZF1udF2ko= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -59,8 +46,8 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/astriaorg/go-sequencer-client v0.0.0-20231201013457-0df599de8e74 h1:nsv8JA8uNWYFmqS1udMMyi7klgebqY5UrEUvYwvNbcs= -github.com/astriaorg/go-sequencer-client v0.0.0-20231201013457-0df599de8e74/go.mod h1:OMBqrW+FuzFAYsLyVMnx7FPeonJnNTjIl06AzVd3Ngs= +github.com/astriaorg/go-sequencer-client v0.2.0-alpha.2.0.20240319201724-8dfc0ed60f1b h1:FR+WcUi43u1QvKlOTfNrofSf3sUA8JkCS1/CrRtoj20= +github.com/astriaorg/go-sequencer-client v0.2.0-alpha.2.0.20240319201724-8dfc0ed60f1b/go.mod h1:A+N9EeZ6nabBzSV4puQzte9ce4XGFX1UfgGSnFzzKeg= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -594,8 +581,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= +google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/internal/chain/transaction.go b/internal/chain/transaction.go index f852a0c..89e8ebe 100644 --- a/internal/chain/transaction.go +++ b/internal/chain/transaction.go @@ -7,7 +7,7 @@ import ( "math/big" primproto "buf.build/gen/go/astria/astria/protocolbuffers/go/astria/primitive/v1" - sqproto "buf.build/gen/go/astria/astria/protocolbuffers/go/astria/sequencer/v1alpha1" + sqproto "buf.build/gen/go/astria/astria/protocolbuffers/go/astria/sequencer/v1" client "github.com/astriaorg/go-sequencer-client/client" "github.com/cometbft/cometbft/libs/bytes" From 34c9d4981e4da4d1da382a74c3398fdf13170fc5 Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Tue, 19 Mar 2024 16:30:08 -0400 Subject: [PATCH 2/3] add fee asset id --- internal/chain/transaction.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/chain/transaction.go b/internal/chain/transaction.go index 89e8ebe..e03b7c8 100644 --- a/internal/chain/transaction.go +++ b/internal/chain/transaction.go @@ -71,6 +71,7 @@ func (b *TxBuild) Transfer(ctx context.Context, to string, value *big.Int) (byte Hi: mostSignificant64, }, AssetId: client.DefaultAstriaAssetID[:], + FeeAssetId: client.DefaultAstriaAssetID[:], }, }, }, From 244545b603028c640014d7743e311e521633a92b Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Tue, 19 Mar 2024 16:32:08 -0400 Subject: [PATCH 3/3] format --- internal/chain/transaction.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/chain/transaction.go b/internal/chain/transaction.go index e03b7c8..9a40da0 100644 --- a/internal/chain/transaction.go +++ b/internal/chain/transaction.go @@ -70,7 +70,7 @@ func (b *TxBuild) Transfer(ctx context.Context, to string, value *big.Int) (byte Lo: leastSignificant64, Hi: mostSignificant64, }, - AssetId: client.DefaultAstriaAssetID[:], + AssetId: client.DefaultAstriaAssetID[:], FeeAssetId: client.DefaultAstriaAssetID[:], }, },