diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ad4aa02..6db9ad2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: '1.22.1' + go-version: '1.22.4' cache: false - name: golangci-lint uses: golangci/golangci-lint-action@v3 diff --git a/build/api/Dockerfile b/build/api/Dockerfile index d696f0b..18c7f23 100644 --- a/build/api/Dockerfile +++ b/build/api/Dockerfile @@ -1,7 +1,7 @@ # --------------------------------------------------------------------- # The first stage container, for building the application # --------------------------------------------------------------------- -FROM golang:1.22.1-alpine as builder +FROM golang:1.22.4-alpine as builder ENV CGO_ENABLED=0 ENV GO111MODULE=on diff --git a/build/indexer/Dockerfile b/build/indexer/Dockerfile index 848f16a..bc655b5 100644 --- a/build/indexer/Dockerfile +++ b/build/indexer/Dockerfile @@ -1,7 +1,7 @@ # --------------------------------------------------------------------- # The first stage container, for building the application # --------------------------------------------------------------------- -FROM golang:1.22.1-alpine as builder +FROM golang:1.22.4-alpine as builder ENV CGO_ENABLED=0 ENV GO111MODULE=on diff --git a/cmd/api/handler/address.go b/cmd/api/handler/address.go index 8ccb5a6..26cb7f7 100644 --- a/cmd/api/handler/address.go +++ b/cmd/api/handler/address.go @@ -4,7 +4,6 @@ package handler import ( - "encoding/hex" "net/http" "time" @@ -64,12 +63,7 @@ func (handler *AddressHandler) Get(c echo.Context) error { return badRequestError(c, err) } - hash, err := hex.DecodeString(req.Hash) - if err != nil { - return badRequestError(c, err) - } - - address, err := handler.address.ByHash(c.Request().Context(), hash) + address, err := handler.address.ByHash(c.Request().Context(), req.Hash) if err != nil { return handleError(c, err, handler.address) } @@ -171,12 +165,7 @@ func (handler *AddressHandler) Transactions(c echo.Context) error { } req.SetDefault() - hash, err := hex.DecodeString(req.Hash) - if err != nil { - return badRequestError(c, err) - } - - address, err := handler.address.ByHash(c.Request().Context(), hash) + address, err := handler.address.ByHash(c.Request().Context(), req.Hash) if err != nil { return handleError(c, err, handler.address) } @@ -269,12 +258,7 @@ func (handler *AddressHandler) Actions(c echo.Context) error { req.SetDefault() - hash, err := hex.DecodeString(req.Hash) - if err != nil { - return badRequestError(c, err) - } - - address, err := handler.address.ByHash(c.Request().Context(), hash) + address, err := handler.address.ByHash(c.Request().Context(), req.Hash) if err != nil { return handleError(c, err, handler.address) } @@ -350,12 +334,7 @@ func (handler *AddressHandler) Rollups(c echo.Context) error { req.SetDefault() - hash, err := hex.DecodeString(req.Hash) - if err != nil { - return badRequestError(c, err) - } - - address, err := handler.address.ByHash(c.Request().Context(), hash) + address, err := handler.address.ByHash(c.Request().Context(), req.Hash) if err != nil { return handleError(c, err, handler.address) } diff --git a/cmd/api/handler/block_test.go b/cmd/api/handler/block_test.go index 283db21..33dceb8 100644 --- a/cmd/api/handler/block_test.go +++ b/cmd/api/handler/block_test.go @@ -30,7 +30,7 @@ import ( var ( testAddress = storage.Address{ - Hash: testsuite.RandomHash(20), + Hash: testsuite.RandomAddress(), Id: 1, Nonce: 10, ActionsCount: 1, @@ -41,7 +41,7 @@ var ( Id: 1, }, } - testAddressHash = hex.EncodeToString(testAddress.Hash) + testAddressHash = testAddress.Hash testBlock = storage.Block{ Id: 1, Hash: []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}, @@ -519,7 +519,7 @@ func (s *BlockTestSuite) TestGetTransactions() { s.Require().EqualValues(8, tx.GasUsed) s.Require().EqualValues(1, tx.ActionsCount) s.Require().EqualValues(10, tx.Nonce) - s.Require().EqualValues(hex.EncodeToString(testAddress.Hash), tx.Signer) + s.Require().EqualValues(testAddress.Hash, tx.Signer) s.Require().Equal("codespace", tx.Codespace) s.Require().Equal(types.StatusSuccess, tx.Status) } diff --git a/cmd/api/handler/tx_test.go b/cmd/api/handler/tx_test.go index b950d46..3b024ef 100644 --- a/cmd/api/handler/tx_test.go +++ b/cmd/api/handler/tx_test.go @@ -5,7 +5,6 @@ package handler import ( "context" - "encoding/hex" "encoding/json" "net/http" "net/http/httptest" @@ -83,7 +82,7 @@ func (s *TxTestSuite) TestGet() { s.Require().EqualValues(8, tx.GasUsed) s.Require().EqualValues(1, tx.ActionsCount) s.Require().EqualValues(10, tx.Nonce) - s.Require().EqualValues(hex.EncodeToString(testAddress.Hash), tx.Signer) + s.Require().EqualValues(testAddress.Hash, tx.Signer) s.Require().Equal("codespace", tx.Codespace) s.Require().Equal(types.StatusSuccess, tx.Status) } @@ -149,7 +148,7 @@ func (s *TxTestSuite) TestList() { s.Require().EqualValues(8, tx.GasUsed) s.Require().EqualValues(1, tx.ActionsCount) s.Require().EqualValues(10, tx.Nonce) - s.Require().EqualValues(hex.EncodeToString(testAddress.Hash), tx.Signer) + s.Require().EqualValues(testAddress.Hash, tx.Signer) s.Require().Equal("codespace", tx.Codespace) s.Require().Equal(types.StatusSuccess, tx.Status) } @@ -246,7 +245,7 @@ func (s *TxTestSuite) TestListTime() { s.Require().EqualValues(8, tx.GasUsed) s.Require().EqualValues(1, tx.ActionsCount) s.Require().EqualValues(10, tx.Nonce) - s.Require().EqualValues(hex.EncodeToString(testAddress.Hash), tx.Signer) + s.Require().EqualValues(testAddress.Hash, tx.Signer) s.Require().Equal("codespace", tx.Codespace) s.Require().Equal(types.StatusSuccess, tx.Status) } @@ -299,7 +298,7 @@ func (s *TxTestSuite) TestListWithActions() { s.Require().EqualValues(8, tx.GasUsed) s.Require().EqualValues(1, tx.ActionsCount) s.Require().EqualValues(10, tx.Nonce) - s.Require().EqualValues(hex.EncodeToString(testAddress.Hash), tx.Signer) + s.Require().EqualValues(testAddress.Hash, tx.Signer) s.Require().Equal("codespace", tx.Codespace) s.Require().Equal(types.StatusSuccess, tx.Status) } diff --git a/go.mod b/go.mod index 36709b6..16fcc26 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,11 @@ module github.com/celenium-io/astria-indexer -go 1.22.1 +go 1.22.4 require ( - buf.build/gen/go/astria/primitives/protocolbuffers/go v1.34.1-20240522191247-b00a6d16e1dc.1 - buf.build/gen/go/astria/protocol-apis/protocolbuffers/go v1.34.1-20240522191249-03d524dae8d2.1 - github.com/cometbft/cometbft v0.38.6 + buf.build/gen/go/astria/primitives/protocolbuffers/go v1.34.2-20240626163506-691883836b9e.2 + buf.build/gen/go/astria/protocol-apis/protocolbuffers/go v1.34.2-20240627184145-2eaea785eb7d.2 + github.com/cometbft/cometbft v0.38.7 github.com/dipdup-io/workerpool v0.0.4 github.com/dipdup-net/go-lib v0.3.6 github.com/dipdup-net/indexer-sdk v0.0.5 @@ -14,26 +14,27 @@ require ( github.com/go-playground/validator/v10 v10.15.0 github.com/go-testfixtures/testfixtures/v3 v3.9.0 github.com/goccy/go-json v0.10.2 - github.com/gorilla/websocket v1.5.0 + github.com/gorilla/websocket v1.5.1 github.com/grafana/pyroscope-go v1.1.1 github.com/json-iterator/go v1.1.12 github.com/labstack/echo-contrib v0.15.0 github.com/labstack/echo/v4 v4.11.4 github.com/lib/pq v1.10.9 + github.com/pactus-project/pactus v1.3.0 github.com/pkg/errors v0.9.1 - github.com/rs/zerolog v1.31.0 + github.com/rs/zerolog v1.33.0 github.com/shopspring/decimal v1.3.1 github.com/spf13/cobra v1.8.0 - github.com/stretchr/testify v1.8.4 + github.com/stretchr/testify v1.9.0 github.com/swaggo/echo-swagger v1.4.1 github.com/swaggo/swag v1.16.1 github.com/uptrace/bun v1.1.14 - go.opentelemetry.io/otel v1.19.0 - go.opentelemetry.io/otel/sdk v1.19.0 - go.opentelemetry.io/otel/trace v1.19.0 + go.opentelemetry.io/otel v1.27.0 + go.opentelemetry.io/otel/sdk v1.27.0 + go.opentelemetry.io/otel/trace v1.27.0 go.uber.org/mock v0.4.0 golang.org/x/time v0.5.0 - google.golang.org/protobuf v1.34.1 + google.golang.org/protobuf v1.34.2 ) require ( @@ -42,7 +43,7 @@ require ( github.com/ClickHouse/ch-go v0.58.0 // indirect github.com/ClickHouse/clickhouse-go/v2 v2.13.0 // indirect github.com/KyleBanks/depth v1.2.1 // indirect - github.com/Microsoft/go-winio v0.6.1 // indirect + github.com/Microsoft/go-winio v0.6.2 // indirect github.com/Microsoft/hcsshim v0.11.4 // indirect github.com/PuerkitoBio/purell v1.1.1 // indirect github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect @@ -50,13 +51,13 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect github.com/cenkalti/backoff/v4 v4.2.1 // indirect - github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/containerd/containerd v1.7.11 // indirect github.com/containerd/log v0.1.0 // indirect - github.com/cosmos/gogoproto v1.4.11 // indirect + github.com/cosmos/gogoproto v1.4.12 // indirect github.com/cpuguy83/dockercfg v0.3.1 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect + github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect github.com/docker/distribution v2.8.2+incompatible // indirect github.com/docker/docker v24.0.9+incompatible // indirect github.com/docker/go-connections v0.4.0 // indirect @@ -67,7 +68,7 @@ require ( github.com/go-faster/errors v0.6.1 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.6.0 // indirect - github.com/go-logr/logr v1.2.4 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-openapi/jsonpointer v0.19.5 // indirect github.com/go-openapi/jsonreference v0.19.6 // indirect @@ -80,9 +81,9 @@ require ( github.com/go-sql-driver/mysql v1.7.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt v3.2.2+incompatible // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/google/go-cmp v0.6.0 // indirect - github.com/google/uuid v1.4.0 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/grafana/pyroscope-go/godeltaprof v0.1.6 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect @@ -92,7 +93,7 @@ require ( github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect github.com/josharian/intern v1.0.0 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.8 // indirect github.com/labstack/gommon v0.4.2 // indirect github.com/leodido/go-urn v1.2.4 // indirect github.com/magiconair/properties v1.8.7 // indirect @@ -100,7 +101,6 @@ require ( github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-sqlite3 v1.14.17 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/moby/patternmatcher v0.5.0 // indirect github.com/moby/sys/sequential v0.5.0 // indirect github.com/moby/sys/user v0.1.0 // indirect @@ -115,14 +115,14 @@ require ( github.com/opencontainers/image-spec v1.1.0-rc4 // indirect github.com/opencontainers/runc v1.2.0-rc.1 // indirect github.com/paulmach/orb v0.10.0 // indirect - github.com/petermattis/goid v0.0.0-20230904192822-1876fd5063bc // indirect + github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 // indirect github.com/pierrec/lz4/v4 v4.1.18 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/prometheus/client_golang v1.16.0 // indirect - github.com/prometheus/client_model v0.3.0 // indirect - github.com/prometheus/common v0.42.0 // indirect - github.com/prometheus/procfs v0.12.0 // indirect - github.com/rogpeppe/go-internal v1.11.0 // indirect + github.com/prometheus/client_golang v1.19.1 // indirect + github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/common v0.53.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect + github.com/rogpeppe/go-internal v1.12.0 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect github.com/segmentio/asm v1.2.0 // indirect github.com/sirupsen/logrus v1.9.3 // indirect @@ -138,17 +138,16 @@ require ( github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect github.com/vmihailenco/tagparser v0.1.2 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect - go.opentelemetry.io/otel/metric v1.19.0 // indirect - golang.org/x/crypto v0.21.0 // indirect - golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect - golang.org/x/mod v0.14.0 // indirect - golang.org/x/net v0.23.0 // indirect - golang.org/x/sync v0.5.0 // indirect - golang.org/x/sys v0.18.0 // indirect - golang.org/x/text v0.14.0 // indirect - golang.org/x/tools v0.15.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect - google.golang.org/grpc v1.60.0 // indirect + go.opentelemetry.io/otel/metric v1.27.0 // indirect + golang.org/x/crypto v0.24.0 // indirect + golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/sync v0.7.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect + golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect + google.golang.org/grpc v1.64.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gorm.io/driver/mysql v1.5.1 // indirect diff --git a/go.sum b/go.sum index 56e6fe5..741bf78 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ -buf.build/gen/go/astria/primitives/protocolbuffers/go v1.34.1-20240522191247-b00a6d16e1dc.1 h1:vmHzj49LUNbvRCPetcdi7+IHTVLizu9tKPyFhs4nVv8= -buf.build/gen/go/astria/primitives/protocolbuffers/go v1.34.1-20240522191247-b00a6d16e1dc.1/go.mod h1:pkz/GfhAgZSnDxyZ5bmGUzk6iQNAvyW72pYPkqb7Pbk= -buf.build/gen/go/astria/protocol-apis/protocolbuffers/go v1.34.1-20240522191249-03d524dae8d2.1 h1:XwamqW35Qkqe+zampl3AKlcj1VcthGyRjiCqY0ft8Yg= -buf.build/gen/go/astria/protocol-apis/protocolbuffers/go v1.34.1-20240522191249-03d524dae8d2.1/go.mod h1:0N64o57scZadNmpi638nQdZtNgTUaP9XEasDNIDmpjo= +buf.build/gen/go/astria/primitives/protocolbuffers/go v1.34.2-20240626163506-691883836b9e.2 h1:bCHvCYyvhCPWGc3tpl164ONADbH+nKPSc6KhOWb9tfk= +buf.build/gen/go/astria/primitives/protocolbuffers/go v1.34.2-20240626163506-691883836b9e.2/go.mod h1:J0Tk7JAHcrhzWNEf1lbePSfFZ1Kp78eAlnO8Cs2ELKg= +buf.build/gen/go/astria/protocol-apis/protocolbuffers/go v1.34.2-20240627184145-2eaea785eb7d.2 h1:+ihOgxxuevFtaVi7C86TVHg8Nusp1J6ARLqR0pEnR04= +buf.build/gen/go/astria/protocol-apis/protocolbuffers/go v1.34.2-20240627184145-2eaea785eb7d.2/go.mod h1:Ko8az8QN6eXRnIJUUTjTLJUw4htfXfhGxBONXyJPy60= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= @@ -16,8 +16,8 @@ github.com/ClickHouse/clickhouse-go/v2 v2.13.0 h1:oP1OlTQIbQKKLnqLzyDhiyNFvN3pbO github.com/ClickHouse/clickhouse-go/v2 v2.13.0/go.mod h1:xyL0De2K54/n+HGsdtPuyYJq76wefafaHfGUXTDEq/0= github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc= github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE= -github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= -github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= +github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= +github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/Microsoft/hcsshim v0.11.4 h1:68vKo2VN8DE9AdN4tnkWnmdhqdbpUFM8OF3Airm7fz8= github.com/Microsoft/hcsshim v0.11.4/go.mod h1:smjE4dvqPX9Zldna+t5FG3rnoHhaB7QYxPRqGcpAD9w= github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI= @@ -37,18 +37,18 @@ github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtyd github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= -github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cometbft/cometbft v0.38.6 h1:QSgpCzrGWJ2KUq1qpw+FCfASRpE27T6LQbfEHscdyOk= -github.com/cometbft/cometbft v0.38.6/go.mod h1:8rSPxzUJYquCN8uuBgbUHOMg2KAwvr7CyUw+6ukO4nw= +github.com/cometbft/cometbft v0.38.7 h1:ULhIOJ9+LgSy6nLekhq9ae3juX3NnQUMMPyVdhZV6Hk= +github.com/cometbft/cometbft v0.38.7/go.mod h1:HIyf811dFMI73IE0F7RrnY/Fr+d1+HuJAgtkEpQjCMY= github.com/containerd/containerd v1.7.11 h1:lfGKw3eU35sjV0aG2eYZTiwFEY1pCzxdzicHP3SZILw= github.com/containerd/containerd v1.7.11/go.mod h1:5UluHxHTX2rdvYuZ5OJTC5m/KJNs0Zs9wVoJm9zf5ZE= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/cosmos/gogoproto v1.4.11 h1:LZcMHrx4FjUgrqQSWeaGC1v/TeuVFqSLa43CC6aWR2g= -github.com/cosmos/gogoproto v1.4.11/go.mod h1:/g39Mh8m17X8Q/GDEs5zYTSNaNnInBSohtaxzQnYq1Y= +github.com/cosmos/gogoproto v1.4.12 h1:vB6Lbe/rtnYGjQuFxkPiPYiCybqFT8QvLipDZP8JpFE= +github.com/cosmos/gogoproto v1.4.12/go.mod h1:LnZob1bXRdUoqMMtwYlcR3wjiElmlC+FkjaZRv1/eLY= github.com/cpuguy83/dockercfg v0.3.1 h1:/FpZ+JaygUR/lZP2NlFI2DVfrOEMAIKP5wWEJdoYe9E= github.com/cpuguy83/dockercfg v0.3.1/go.mod h1:sugsbF4//dDlL/i+S+rtpIWp+5h0BHJHfjj5/jFyUJc= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= @@ -61,8 +61,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y= github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 h1:rpfIENRNNilwHwZeG5+P150SMrnNEcHYvcCuK6dPZSg= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0= github.com/denisenkom/go-mssqldb v0.12.3 h1:pBSGx9Tq67pBOTLmxNuirNTeB8Vjmf886Kx+8Y+8shw= github.com/denisenkom/go-mssqldb v0.12.3/go.mod h1:k0mtMFOnU+AihqFxPMiF05rtiDrorD1Vrm1KEz5hxDo= github.com/dipdup-io/workerpool v0.0.4 h1:m58fuFY3VIPRc+trWpjw2Lsm4FvIgtjP/4VRe79r+/s= @@ -104,8 +104,8 @@ github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBj github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= -github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= @@ -153,7 +153,6 @@ github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= @@ -163,8 +162,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -176,10 +175,10 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= -github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grafana/pyroscope-go v1.1.1 h1:PQoUU9oWtO3ve/fgIiklYuGilvsm8qaGhlY4Vw6MAcQ= github.com/grafana/pyroscope-go v1.1.1/go.mod h1:Mw26jU7jsL/KStNSGGuuVYdUq7Qghem5P8aXYXSXG88= github.com/grafana/pyroscope-go/godeltaprof v0.1.6 h1:nEdZ8louGAplSvIJi1HVp7kWvFvdiiYg3COLlTwJiFo= @@ -221,8 +220,8 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= +github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= @@ -255,8 +254,6 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM= github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= -github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= -github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/moby/patternmatcher v0.5.0 h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M7DBo= github.com/moby/patternmatcher v0.5.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc= github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc= @@ -295,12 +292,14 @@ github.com/opencontainers/image-spec v1.1.0-rc4 h1:oOxKUJWnFC4YGHCCMNql1x4YaDfYB github.com/opencontainers/image-spec v1.1.0-rc4/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8= github.com/opencontainers/runc v1.2.0-rc.1 h1:SMjop2pxxYRTfKdsigna/8xRoaoCfIQfD2cVuOb64/o= github.com/opencontainers/runc v1.2.0-rc.1/go.mod h1:m9JwxfHzXz5YTTXBQr7EY9KTuazFAGPyMQx2nRR3vTw= +github.com/pactus-project/pactus v1.3.0 h1:XsmME/q2KJOec5fXIz3oZFT7oIwHo8D5KJDc2+gd8e0= +github.com/pactus-project/pactus v1.3.0/go.mod h1:ZOudkajUDT6Sheh/iRCv8fJB+DCSuPaBF4zu8tYA0qM= github.com/paulmach/orb v0.10.0 h1:guVYVqzxHE/CQ1KpfGO077TR0ATHSNjp4s6XGLn3W9s= github.com/paulmach/orb v0.10.0/go.mod h1:5mULz1xQfs3bmQm63QEJA6lNGujuRafwA5S/EnuLaLU= github.com/paulmach/protoscan v0.2.1/go.mod h1:SpcSwydNLrxUGSDvXvO0P7g7AuhJ7lcKfDlhJCDw2gY= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= -github.com/petermattis/goid v0.0.0-20230904192822-1876fd5063bc h1:8bQZVK1X6BJR/6nYUPxQEP+ReTsceJTKizeuwjWOPUA= -github.com/petermattis/goid v0.0.0-20230904192822-1876fd5063bc/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= +github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 h1:jik8PHtAIsPlCRJjJzl4udgEf7hawInF9texMeO2jrU= +github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ= github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= @@ -310,20 +309,20 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8= -github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc= +github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= +github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= -github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= -github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM= -github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= -github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= -github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= -github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= -github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= +github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= +github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= +github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= +github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A= -github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= +github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8= +github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0= github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= @@ -347,8 +346,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/swaggo/echo-swagger v1.4.1 h1:Yf0uPaJWp1uRtDloZALyLnvdBeoEL5Kc7DtnjzO/TUk= github.com/swaggo/echo-swagger v1.4.1/go.mod h1:C8bSi+9yH2FLZsnhqMZLIZddpUxZdBYuNHbtaS1Hljc= github.com/swaggo/files/v2 v2.0.0 h1:hmAt8Dkynw7Ssz46F6pn8ok6YmGZqHSVLZ+HQM7i0kw= @@ -387,14 +386,14 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.mongodb.org/mongo-driver v1.11.4/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g= -go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs= -go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY= -go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE= -go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8= -go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o= -go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A= -go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg= -go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo= +go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= +go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= +go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= +go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= +go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= +go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= +go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= +go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -404,19 +403,19 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= 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/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= -golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= +golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= +golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= -golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= +golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc h1:O9NuF4s+E/PvMIy+9IUZB9znFwUIXEWSstNjek6VpVg= +golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= -golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -433,19 +432,18 @@ golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= -golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= -golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -469,8 +467,8 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 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.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -480,8 +478,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -494,8 +492,8 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8= -golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -505,13 +503,13 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f h1:ultW7fxlIvee4HYrtnaRPon9HpEgFk5zYpmfMgtKB5I= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f/go.mod h1:L9KNLi232K1/xB6f7AlSX692koaRnKaWSR0stBki0Yc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 h1:1GBuWVLM/KMVUv1t1En5Gs+gFZCNd360GGb4sSxtrhU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.60.0 h1:6FQAR0kM31P6MRdeluor2w2gPaS4SVNrD/DNTxrQ15k= -google.golang.org/grpc v1.60.0/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM= +google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= +google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -522,10 +520,9 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= 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.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/internal/astria/address.go b/internal/astria/address.go new file mode 100644 index 0000000..51c3924 --- /dev/null +++ b/internal/astria/address.go @@ -0,0 +1,29 @@ +package astria + +import ( + "github.com/pactus-project/pactus/util/bech32m" +) + +const ( + prefix = "astria" +) + +func IsAddress(s string) bool { + if len(s) != 45 { + return false + } + p, _, err := bech32m.Decode(s) + if err != nil { + return false + } + return p == prefix +} + +func EncodeAddress(b []byte) (string, error) { + return bech32m.EncodeFromBase256(prefix, b) +} + +func DecodeAddress(s string) ([]byte, error) { + _, b, err := bech32m.DecodeToBase256(s) + return b, err +} diff --git a/internal/astria/address_test.go b/internal/astria/address_test.go new file mode 100644 index 0000000..5872583 --- /dev/null +++ b/internal/astria/address_test.go @@ -0,0 +1,47 @@ +package astria + +import ( + "testing" + + "github.com/stretchr/testify/require" +) + +func TestIsAddress(t *testing.T) { + tests := []struct { + name string + s string + want bool + }{ + { + name: "astria1lhpxecq5ffhq68dgu9s8y2g5h53jqw5cvudrkk", + s: "astria1lhpxecq5ffhq68dgu9s8y2g5h53jqw5cvudrkk", + want: true, + }, { + name: "astria1lm45urgugesyhaymn68xww0m6g49zreqa32w7p", + s: "astria1lm45urgugesyhaymn68xww0m6g49zreqa32w7p", + want: true, + }, { + name: "astria1475jkpuvznd44szgfz8wwdf9w6xh5dx9jwqgvz", + s: "astria1475jkpuvznd44szgfz8wwdf9w6xh5dx9jwqgvz", + want: true, + }, { + name: "astria16rgmx2s86kk2r69rhjnvs9y44ujfhadc7yav9a", + s: "astria16rgmx2s86kk2r69rhjnvs9y44ujfhadc7yav9a", + want: true, + }, { + name: "prefix16rgmx2s86kk2r69rhjnvs9y44ujfhadc7yav9a", + s: "prefix16rgmx2s86kk2r69rhjnvs9y44ujfhadc7yav9a", + want: false, + }, { + name: "invalid", + s: "invalid", + want: false, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + got := IsAddress(tt.s) + require.Equal(t, tt.want, got) + }) + } +} diff --git a/internal/storage/address.go b/internal/storage/address.go index 1c93df7..4c4e315 100644 --- a/internal/storage/address.go +++ b/internal/storage/address.go @@ -5,7 +5,6 @@ package storage import ( "context" - "encoding/hex" "github.com/celenium-io/astria-indexer/pkg/types" @@ -23,7 +22,7 @@ type AddressListFilter struct { type IAddress interface { storage.Table[*Address] - ByHash(ctx context.Context, hash []byte) (Address, error) + ByHash(ctx context.Context, hash string) (Address, error) ListWithBalance(ctx context.Context, fltrs AddressListFilter) ([]Address, error) } @@ -33,7 +32,7 @@ type Address struct { Id uint64 `bun:"id,pk,notnull,autoincrement" comment:"Unique internal identity"` Height types.Level `bun:"height" comment:"Block number of the first address occurrence."` - Hash []byte `bun:"hash,unique:address_hash" comment:"Address hash."` + Hash string `bun:"hash,unique:address_hash" comment:"Address hash"` Nonce uint32 `bun:"nonce" comment:"Nonce"` ActionsCount int64 `bun:"actions_count" comment:"Count of actions in which the address was involved"` SignedTxCount int64 `bun:"signed_tx_count" comment:"Count of signed transactions"` @@ -47,5 +46,5 @@ func (Address) TableName() string { } func (address Address) String() string { - return hex.EncodeToString(address.Hash) + return address.Hash } diff --git a/internal/storage/mock/action.go b/internal/storage/mock/action.go index fc104b6..f9eb807 100644 --- a/internal/storage/mock/action.go +++ b/internal/storage/mock/action.go @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2024 PK Lab AG -// SPDX-License-Identifier: MIT - // Code generated by MockGen. DO NOT EDIT. // Source: action.go // diff --git a/internal/storage/mock/address.go b/internal/storage/mock/address.go index 482044d..5fd29c8 100644 --- a/internal/storage/mock/address.go +++ b/internal/storage/mock/address.go @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2024 PK Lab AG -// SPDX-License-Identifier: MIT - // Code generated by MockGen. DO NOT EDIT. // Source: address.go // @@ -44,7 +41,7 @@ func (m *MockIAddress) EXPECT() *MockIAddressMockRecorder { } // ByHash mocks base method. -func (m *MockIAddress) ByHash(ctx context.Context, hash []byte) (storage.Address, error) { +func (m *MockIAddress) ByHash(ctx context.Context, hash string) (storage.Address, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ByHash", ctx, hash) ret0, _ := ret[0].(storage.Address) @@ -71,13 +68,13 @@ func (c *IAddressByHashCall) Return(arg0 storage.Address, arg1 error) *IAddressB } // Do rewrite *gomock.Call.Do -func (c *IAddressByHashCall) Do(f func(context.Context, []byte) (storage.Address, error)) *IAddressByHashCall { +func (c *IAddressByHashCall) Do(f func(context.Context, string) (storage.Address, error)) *IAddressByHashCall { c.Call = c.Call.Do(f) return c } // DoAndReturn rewrite *gomock.Call.DoAndReturn -func (c *IAddressByHashCall) DoAndReturn(f func(context.Context, []byte) (storage.Address, error)) *IAddressByHashCall { +func (c *IAddressByHashCall) DoAndReturn(f func(context.Context, string) (storage.Address, error)) *IAddressByHashCall { c.Call = c.Call.DoAndReturn(f) return c } diff --git a/internal/storage/mock/balance.go b/internal/storage/mock/balance.go index 7476455..0b9f79e 100644 --- a/internal/storage/mock/balance.go +++ b/internal/storage/mock/balance.go @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2024 PK Lab AG -// SPDX-License-Identifier: MIT - // Code generated by MockGen. DO NOT EDIT. // Source: balance.go // diff --git a/internal/storage/mock/balance_update.go b/internal/storage/mock/balance_update.go index a1a23d0..1410a2f 100644 --- a/internal/storage/mock/balance_update.go +++ b/internal/storage/mock/balance_update.go @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2024 PK Lab AG -// SPDX-License-Identifier: MIT - // Code generated by MockGen. DO NOT EDIT. // Source: balance_update.go // diff --git a/internal/storage/mock/block.go b/internal/storage/mock/block.go index 032cc20..3920ab2 100644 --- a/internal/storage/mock/block.go +++ b/internal/storage/mock/block.go @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2024 PK Lab AG -// SPDX-License-Identifier: MIT - // Code generated by MockGen. DO NOT EDIT. // Source: block.go // diff --git a/internal/storage/mock/block_signature.go b/internal/storage/mock/block_signature.go index dfd557e..3453ec6 100644 --- a/internal/storage/mock/block_signature.go +++ b/internal/storage/mock/block_signature.go @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2024 PK Lab AG -// SPDX-License-Identifier: MIT - // Code generated by MockGen. DO NOT EDIT. // Source: block_signature.go // diff --git a/internal/storage/mock/block_stats.go b/internal/storage/mock/block_stats.go index 17cebf8..9cc3de6 100644 --- a/internal/storage/mock/block_stats.go +++ b/internal/storage/mock/block_stats.go @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2024 PK Lab AG -// SPDX-License-Identifier: MIT - // Code generated by MockGen. DO NOT EDIT. // Source: block_stats.go // diff --git a/internal/storage/mock/constant.go b/internal/storage/mock/constant.go index c3525dc..37cca30 100644 --- a/internal/storage/mock/constant.go +++ b/internal/storage/mock/constant.go @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2024 PK Lab AG -// SPDX-License-Identifier: MIT - // Code generated by MockGen. DO NOT EDIT. // Source: constant.go // diff --git a/internal/storage/mock/generic.go b/internal/storage/mock/generic.go index 9f72b37..c73941b 100644 --- a/internal/storage/mock/generic.go +++ b/internal/storage/mock/generic.go @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2024 PK Lab AG -// SPDX-License-Identifier: MIT - // Code generated by MockGen. DO NOT EDIT. // Source: generic.go // diff --git a/internal/storage/mock/rollup.go b/internal/storage/mock/rollup.go index 6a54681..cf40f54 100644 --- a/internal/storage/mock/rollup.go +++ b/internal/storage/mock/rollup.go @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2024 PK Lab AG -// SPDX-License-Identifier: MIT - // Code generated by MockGen. DO NOT EDIT. // Source: rollup.go // diff --git a/internal/storage/mock/state.go b/internal/storage/mock/state.go index 21be0f8..8e4ff83 100644 --- a/internal/storage/mock/state.go +++ b/internal/storage/mock/state.go @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2024 PK Lab AG -// SPDX-License-Identifier: MIT - // Code generated by MockGen. DO NOT EDIT. // Source: state.go // diff --git a/internal/storage/mock/stats.go b/internal/storage/mock/stats.go index ccaa10d..5fc1940 100644 --- a/internal/storage/mock/stats.go +++ b/internal/storage/mock/stats.go @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2024 PK Lab AG -// SPDX-License-Identifier: MIT - // Code generated by MockGen. DO NOT EDIT. // Source: stats.go // diff --git a/internal/storage/mock/tx.go b/internal/storage/mock/tx.go index faf5d92..4d65f0c 100644 --- a/internal/storage/mock/tx.go +++ b/internal/storage/mock/tx.go @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2024 PK Lab AG -// SPDX-License-Identifier: MIT - // Code generated by MockGen. DO NOT EDIT. // Source: tx.go // diff --git a/internal/storage/mock/validator.go b/internal/storage/mock/validator.go index 4b13c68..3bb0fc0 100644 --- a/internal/storage/mock/validator.go +++ b/internal/storage/mock/validator.go @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2024 PK Lab AG -// SPDX-License-Identifier: MIT - // Code generated by MockGen. DO NOT EDIT. // Source: validator.go // diff --git a/internal/storage/postgres/address.go b/internal/storage/postgres/address.go index 5dc0f4f..89ac332 100644 --- a/internal/storage/postgres/address.go +++ b/internal/storage/postgres/address.go @@ -24,7 +24,7 @@ func NewAddress(db *database.Bun) *Address { } // ByHash - -func (a *Address) ByHash(ctx context.Context, hash []byte) (address storage.Address, err error) { +func (a *Address) ByHash(ctx context.Context, hash string) (address storage.Address, err error) { err = a.DB().NewSelect().Model(&address). Where("hash = ?", hash). Relation("Balance"). diff --git a/internal/storage/postgres/address_test.go b/internal/storage/postgres/address_test.go index fd1a474..2ee4976 100644 --- a/internal/storage/postgres/address_test.go +++ b/internal/storage/postgres/address_test.go @@ -5,7 +5,6 @@ package postgres import ( "context" - "encoding/hex" "time" "github.com/celenium-io/astria-indexer/internal/storage" @@ -16,8 +15,7 @@ func (s *StorageTestSuite) TestAddressByHash() { ctx, ctxCancel := context.WithTimeout(context.Background(), 5*time.Second) defer ctxCancel() - hash, err := hex.DecodeString("3fff1c39b9d163bfb9bcbf9dfea78675f1b4bc2c") - s.Require().NoError(err) + hash := "3fff1c39b9d163bfb9bcbf9dfea78675f1b4bc2c" address, err := s.storage.Address.ByHash(ctx, hash) s.Require().NoError(err) @@ -48,7 +46,5 @@ func (s *StorageTestSuite) TestAddressListWithBalances() { s.Require().EqualValues(1, address.ActionsCount) s.Require().EqualValues(2, address.SignedTxCount) - hash, err := hex.DecodeString("3fff1c39b9d163bfb9bcbf9dfea78675f1b4bc2c") - s.Require().NoError(err) - s.Require().EqualValues(hash, address.Hash) + s.Require().EqualValues("3fff1c39b9d163bfb9bcbf9dfea78675f1b4bc2c", address.Hash) } diff --git a/internal/storage/postgres/transaction_test.go b/internal/storage/postgres/transaction_test.go index b474ce2..6cabae9 100644 --- a/internal/storage/postgres/transaction_test.go +++ b/internal/storage/postgres/transaction_test.go @@ -99,7 +99,7 @@ func (s *TransactionTestSuite) TestSaveAddresses() { for i := 0; i < 5; i++ { addresses = append(addresses, &storage.Address{ Height: pkgTypes.Level(10000 + i), - Hash: testsuite.RandomHash(20), + Hash: testsuite.RandomAddress(), Id: uint64(i), }) diff --git a/internal/storage/postgres/tx_test.go b/internal/storage/postgres/tx_test.go index effb330..81d4d8c 100644 --- a/internal/storage/postgres/tx_test.go +++ b/internal/storage/postgres/tx_test.go @@ -32,7 +32,7 @@ func (s *StorageTestSuite) TestTxByHash() { s.Require().EqualValues(types.StatusSuccess, tx.Status) s.Require().EqualValues(hash, tx.Hash) s.Require().NotNil(tx.Signer) - s.Require().Equal("3fff1c39b9d163bfb9bcbf9dfea78675f1b4bc2c", hex.EncodeToString(tx.Signer.Hash)) + s.Require().Equal("3fff1c39b9d163bfb9bcbf9dfea78675f1b4bc2c", tx.Signer.Hash) } func (s *StorageTestSuite) TestTxByHeight() { @@ -57,7 +57,7 @@ func (s *StorageTestSuite) TestTxByHeight() { s.Require().EqualValues(hash, tx.Hash) s.Require().NotNil(tx.Signer) - s.Require().Equal("3fff1c39b9d163bfb9bcbf9dfea78675f1b4bc2c", hex.EncodeToString(tx.Signer.Hash)) + s.Require().Equal("3fff1c39b9d163bfb9bcbf9dfea78675f1b4bc2c", tx.Signer.Hash) } func (s *StorageTestSuite) TestTxFilter() { @@ -88,7 +88,7 @@ func (s *StorageTestSuite) TestTxFilter() { s.Require().EqualValues(hash, tx.Hash) s.Require().NotNil(tx.Signer) - s.Require().Equal("3fff1c39b9d163bfb9bcbf9dfea78675f1b4bc2c", hex.EncodeToString(tx.Signer.Hash)) + s.Require().Equal("3fff1c39b9d163bfb9bcbf9dfea78675f1b4bc2c", tx.Signer.Hash) s.Require().Len(tx.Actions, 1) } diff --git a/internal/storage/types/action_type.go b/internal/storage/types/action_type.go index 3aa49f0..f93a867 100644 --- a/internal/storage/types/action_type.go +++ b/internal/storage/types/action_type.go @@ -10,13 +10,15 @@ package types sequence, validator_update, sudo_address_change, - mint, ibc_relay, ics20_withdrawal, ibc_relayer_change, fee_asset_change, init_bridge_account, - bridge_lock + bridge_lock, + bridge_unlock, + bridge_sudo_change_action, + fee_change ) */ //go:generate go-enum --marshal --sql --values --names diff --git a/internal/storage/types/action_type_enum.go b/internal/storage/types/action_type_enum.go index 6914ffc..2b6d74a 100644 --- a/internal/storage/types/action_type_enum.go +++ b/internal/storage/types/action_type_enum.go @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2024 PK Lab AG -// SPDX-License-Identifier: MIT - // Code generated by go-enum DO NOT EDIT. // Version: 0.5.7 // Revision: bf63e108589bbd2327b13ec2c5da532aad234029 @@ -25,8 +22,6 @@ const ( ActionTypeValidatorUpdate ActionType = "validator_update" // ActionTypeSudoAddressChange is a ActionType of type sudo_address_change. ActionTypeSudoAddressChange ActionType = "sudo_address_change" - // ActionTypeMint is a ActionType of type mint. - ActionTypeMint ActionType = "mint" // ActionTypeIbcRelay is a ActionType of type ibc_relay. ActionTypeIbcRelay ActionType = "ibc_relay" // ActionTypeIcs20Withdrawal is a ActionType of type ics20_withdrawal. @@ -39,6 +34,12 @@ const ( ActionTypeInitBridgeAccount ActionType = "init_bridge_account" // ActionTypeBridgeLock is a ActionType of type bridge_lock. ActionTypeBridgeLock ActionType = "bridge_lock" + // ActionTypeBridgeUnlock is a ActionType of type bridge_unlock. + ActionTypeBridgeUnlock ActionType = "bridge_unlock" + // ActionTypeBridgeSudoChangeAction is a ActionType of type bridge_sudo_change_action. + ActionTypeBridgeSudoChangeAction ActionType = "bridge_sudo_change_action" + // ActionTypeFeeChange is a ActionType of type fee_change. + ActionTypeFeeChange ActionType = "fee_change" ) var ErrInvalidActionType = fmt.Errorf("not a valid ActionType, try [%s]", strings.Join(_ActionTypeNames, ", ")) @@ -48,13 +49,15 @@ var _ActionTypeNames = []string{ string(ActionTypeSequence), string(ActionTypeValidatorUpdate), string(ActionTypeSudoAddressChange), - string(ActionTypeMint), string(ActionTypeIbcRelay), string(ActionTypeIcs20Withdrawal), string(ActionTypeIbcRelayerChange), string(ActionTypeFeeAssetChange), string(ActionTypeInitBridgeAccount), string(ActionTypeBridgeLock), + string(ActionTypeBridgeUnlock), + string(ActionTypeBridgeSudoChangeAction), + string(ActionTypeFeeChange), } // ActionTypeNames returns a list of possible string values of ActionType. @@ -71,13 +74,15 @@ func ActionTypeValues() []ActionType { ActionTypeSequence, ActionTypeValidatorUpdate, ActionTypeSudoAddressChange, - ActionTypeMint, ActionTypeIbcRelay, ActionTypeIcs20Withdrawal, ActionTypeIbcRelayerChange, ActionTypeFeeAssetChange, ActionTypeInitBridgeAccount, ActionTypeBridgeLock, + ActionTypeBridgeUnlock, + ActionTypeBridgeSudoChangeAction, + ActionTypeFeeChange, } } @@ -94,17 +99,19 @@ func (x ActionType) IsValid() bool { } var _ActionTypeValue = map[string]ActionType{ - "transfer": ActionTypeTransfer, - "sequence": ActionTypeSequence, - "validator_update": ActionTypeValidatorUpdate, - "sudo_address_change": ActionTypeSudoAddressChange, - "mint": ActionTypeMint, - "ibc_relay": ActionTypeIbcRelay, - "ics20_withdrawal": ActionTypeIcs20Withdrawal, - "ibc_relayer_change": ActionTypeIbcRelayerChange, - "fee_asset_change": ActionTypeFeeAssetChange, - "init_bridge_account": ActionTypeInitBridgeAccount, - "bridge_lock": ActionTypeBridgeLock, + "transfer": ActionTypeTransfer, + "sequence": ActionTypeSequence, + "validator_update": ActionTypeValidatorUpdate, + "sudo_address_change": ActionTypeSudoAddressChange, + "ibc_relay": ActionTypeIbcRelay, + "ics20_withdrawal": ActionTypeIcs20Withdrawal, + "ibc_relayer_change": ActionTypeIbcRelayerChange, + "fee_asset_change": ActionTypeFeeAssetChange, + "init_bridge_account": ActionTypeInitBridgeAccount, + "bridge_lock": ActionTypeBridgeLock, + "bridge_unlock": ActionTypeBridgeUnlock, + "bridge_sudo_change_action": ActionTypeBridgeSudoChangeAction, + "fee_change": ActionTypeFeeChange, } // ParseActionType attempts to convert a string to a ActionType. diff --git a/internal/storage/types/action_type_mask.go b/internal/storage/types/action_type_mask.go index 19be284..e5722b5 100644 --- a/internal/storage/types/action_type_mask.go +++ b/internal/storage/types/action_type_mask.go @@ -8,28 +8,32 @@ const ( ActionTypeSequenceBits ActionTypeValidatorUpdateBits ActionTypeSudoAddressChangeBits - ActionTypeMintBits ActionTypeIbcRelayBits ActionTypeIcs20WithdrawalBits ActionTypeIbcRelayerChangeBits ActionTypeFeeAssetChangeBits ActionTypeInitBridgeAccountBits ActionTypeBridgeLockBits + ActionTypeBridgeUnlockBits + ActionTypeBridgeSudoChangeBits + ActionTypeFeeChangeBits ) var ( actionTypesMap = map[ActionType]Bits{ - ActionTypeIbcRelay: ActionTypeIbcRelayBits, - ActionTypeIcs20Withdrawal: ActionTypeIcs20WithdrawalBits, - ActionTypeMint: ActionTypeMintBits, - ActionTypeSequence: ActionTypeSequenceBits, - ActionTypeSudoAddressChange: ActionTypeSudoAddressChangeBits, - ActionTypeTransfer: ActionTypeTransferBits, - ActionTypeValidatorUpdate: ActionTypeValidatorUpdateBits, - ActionTypeBridgeLock: ActionTypeBridgeLockBits, - ActionTypeFeeAssetChange: ActionTypeFeeAssetChangeBits, - ActionTypeInitBridgeAccount: ActionTypeInitBridgeAccountBits, - ActionTypeIbcRelayerChange: ActionTypeIbcRelayerChangeBits, + ActionTypeIbcRelay: ActionTypeIbcRelayBits, + ActionTypeIcs20Withdrawal: ActionTypeIcs20WithdrawalBits, + ActionTypeSequence: ActionTypeSequenceBits, + ActionTypeSudoAddressChange: ActionTypeSudoAddressChangeBits, + ActionTypeTransfer: ActionTypeTransferBits, + ActionTypeValidatorUpdate: ActionTypeValidatorUpdateBits, + ActionTypeBridgeLock: ActionTypeBridgeLockBits, + ActionTypeFeeAssetChange: ActionTypeFeeAssetChangeBits, + ActionTypeInitBridgeAccount: ActionTypeInitBridgeAccountBits, + ActionTypeIbcRelayerChange: ActionTypeIbcRelayerChangeBits, + ActionTypeBridgeUnlock: ActionTypeBridgeUnlockBits, + ActionTypeBridgeSudoChangeAction: ActionTypeBridgeSudoChangeBits, + ActionTypeFeeChange: ActionTypeFeeChangeBits, } ) @@ -45,8 +49,6 @@ func NewActionTypeMask(vals ...string) ActionTypeMask { mask.Set(ActionTypeIbcRelayBits) case string(ActionTypeIcs20Withdrawal): mask.Set(ActionTypeIcs20WithdrawalBits) - case string(ActionTypeMint): - mask.Set(ActionTypeMintBits) case string(ActionTypeSequence): mask.Set(ActionTypeSequenceBits) case string(ActionTypeSudoAddressChange): @@ -63,6 +65,12 @@ func NewActionTypeMask(vals ...string) ActionTypeMask { mask.Set(ActionTypeIbcRelayerChangeBits) case string(ActionTypeInitBridgeAccount): mask.Set(ActionTypeInitBridgeAccountBits) + case string(ActionTypeBridgeUnlock): + mask.Set(ActionTypeBridgeUnlockBits) + case string(ActionTypeBridgeSudoChangeAction): + mask.Set(ActionTypeBridgeSudoChangeBits) + case string(ActionTypeFeeChange): + mask.Set(ActionTypeFeeChangeBits) } } @@ -79,7 +87,7 @@ func (mask ActionTypeMask) Strings() []string { } vals := make([]string, 0) - for val := ActionTypeTransferBits; val <= ActionTypeBridgeLockBits; val <<= 1 { + for val := ActionTypeTransferBits; val <= ActionTypeFeeChangeBits; val <<= 1 { if !mask.Has(val) { continue } @@ -88,8 +96,6 @@ func (mask ActionTypeMask) Strings() []string { vals = append(vals, string(ActionTypeIbcRelay)) case ActionTypeIcs20WithdrawalBits: vals = append(vals, string(ActionTypeIcs20Withdrawal)) - case ActionTypeMintBits: - vals = append(vals, string(ActionTypeMint)) case ActionTypeSequenceBits: vals = append(vals, string(ActionTypeSequence)) case ActionTypeSudoAddressChangeBits: @@ -106,6 +112,12 @@ func (mask ActionTypeMask) Strings() []string { vals = append(vals, string(ActionTypeIbcRelayerChange)) case ActionTypeInitBridgeAccountBits: vals = append(vals, string(ActionTypeInitBridgeAccount)) + case ActionTypeBridgeSudoChangeBits: + vals = append(vals, string(ActionTypeBridgeSudoChangeAction)) + case ActionTypeBridgeUnlockBits: + vals = append(vals, string(ActionTypeBridgeUnlock)) + case ActionTypeFeeChangeBits: + vals = append(vals, string(ActionTypeFeeChange)) } } diff --git a/internal/storage/types/action_type_mask_test.go b/internal/storage/types/action_type_mask_test.go index 55e8672..5c948f2 100644 --- a/internal/storage/types/action_type_mask_test.go +++ b/internal/storage/types/action_type_mask_test.go @@ -37,13 +37,6 @@ func TestActionTypeMask(t *testing.T) { require.Equal(t, arr, mask.Strings()) }) - t.Run("mint", func(t *testing.T) { - arr := []string{string(ActionTypeMint)} - - mask := NewActionTypeMask(arr...) - require.Equal(t, arr, mask.Strings()) - }) - t.Run("sequence", func(t *testing.T) { arr := []string{string(ActionTypeSequence)} @@ -65,6 +58,48 @@ func TestActionTypeMask(t *testing.T) { require.Equal(t, arr, mask.Strings()) }) + t.Run("bridge unlock", func(t *testing.T) { + arr := []string{string(ActionTypeBridgeUnlock)} + + mask := NewActionTypeMask(arr...) + require.Equal(t, arr, mask.Strings()) + }) + + t.Run("bridge lock", func(t *testing.T) { + arr := []string{string(ActionTypeBridgeLock)} + + mask := NewActionTypeMask(arr...) + require.Equal(t, arr, mask.Strings()) + }) + + t.Run("bridge sudo change action", func(t *testing.T) { + arr := []string{string(ActionTypeBridgeSudoChangeAction)} + + mask := NewActionTypeMask(arr...) + require.Equal(t, arr, mask.Strings()) + }) + + t.Run("fee change", func(t *testing.T) { + arr := []string{string(ActionTypeFeeChange)} + + mask := NewActionTypeMask(arr...) + require.Equal(t, arr, mask.Strings()) + }) + + t.Run("init bridge account", func(t *testing.T) { + arr := []string{string(ActionTypeInitBridgeAccount)} + + mask := NewActionTypeMask(arr...) + require.Equal(t, arr, mask.Strings()) + }) + + t.Run("ibc relayer change", func(t *testing.T) { + arr := []string{string(ActionTypeIbcRelayerChange)} + + mask := NewActionTypeMask(arr...) + require.Equal(t, arr, mask.Strings()) + }) + t.Run("unknown", func(t *testing.T) { arr := []string{"unknown"} diff --git a/internal/storage/types/module_enum.go b/internal/storage/types/module_enum.go index f1574fb..7f790ad 100644 --- a/internal/storage/types/module_enum.go +++ b/internal/storage/types/module_enum.go @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2024 PK Lab AG -// SPDX-License-Identifier: MIT - // Code generated by go-enum DO NOT EDIT. // Version: 0.5.7 // Revision: bf63e108589bbd2327b13ec2c5da532aad234029 diff --git a/internal/storage/types/status_enum.go b/internal/storage/types/status_enum.go index fe296df..9520183 100644 --- a/internal/storage/types/status_enum.go +++ b/internal/storage/types/status_enum.go @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2024 PK Lab AG -// SPDX-License-Identifier: MIT - // Code generated by go-enum DO NOT EDIT. // Version: 0.5.7 // Revision: bf63e108589bbd2327b13ec2c5da532aad234029 diff --git a/internal/test_suite/helpers.go b/internal/test_suite/helpers.go index 9c4b3c2..cf38327 100644 --- a/internal/test_suite/helpers.go +++ b/internal/test_suite/helpers.go @@ -6,6 +6,8 @@ package testsuite import ( "crypto/rand" "encoding/hex" + + "github.com/celenium-io/astria-indexer/internal/astria" ) // Ptr - returns pointer of value for testing purpose @@ -32,3 +34,11 @@ func RandomHash(length int) []byte { _, _ = rand.Read(hash) return hash } + +// RandomAddress - returns random address +func RandomAddress() string { + hash := make([]byte, 20) + _, _ = rand.Read(hash) + val, _ := astria.EncodeAddress(hash) + return val +} diff --git a/pkg/indexer/decode/actions.go b/pkg/indexer/decode/actions.go index 6b52e5f..f793032 100644 --- a/pkg/indexer/decode/actions.go +++ b/pkg/indexer/decode/actions.go @@ -4,21 +4,18 @@ package decode import ( - stdBytes "bytes" "encoding/base64" - "encoding/hex" "time" astria "buf.build/gen/go/astria/protocol-apis/protocolbuffers/go/astria/protocol/transactions/v1alpha1" "github.com/celenium-io/astria-indexer/internal/storage" storageTypes "github.com/celenium-io/astria-indexer/internal/storage/types" "github.com/celenium-io/astria-indexer/pkg/types" - "github.com/cometbft/cometbft/libs/bytes" "github.com/pkg/errors" "github.com/shopspring/decimal" ) -func parseActions(height types.Level, blockTime time.Time, from bytes.HexBytes, tx *DecodedTx, ctx *Context) ([]storage.Action, error) { +func parseActions(height types.Level, blockTime time.Time, from string, tx *DecodedTx, ctx *Context) ([]storage.Action, error) { rawActions := tx.UnsignedTx.GetActions() actions := make([]storage.Action, len(rawActions)) for i := range rawActions { @@ -40,9 +37,6 @@ func parseActions(height types.Level, blockTime time.Time, from bytes.HexBytes, case *astria.Action_Ics20Withdrawal: tx.ActionTypes.Set(storageTypes.ActionTypeIcs20WithdrawalBits) err = parseIcs20Withdrawal(val, height, ctx, &actions[i]) - case *astria.Action_MintAction: - tx.ActionTypes.Set(storageTypes.ActionTypeMintBits) - err = parseMintAction(val, height, ctx, &actions[i]) case *astria.Action_SequenceAction: tx.ActionTypes.Set(storageTypes.ActionTypeSequenceBits) err = parseSequenceAction(val, from, height, ctx, &actions[i]) @@ -67,6 +61,16 @@ func parseActions(height types.Level, blockTime time.Time, from bytes.HexBytes, case *astria.Action_InitBridgeAccountAction: tx.ActionTypes.Set(storageTypes.ActionTypeInitBridgeAccountBits) err = parseInitBridgeAccount(val, from, height, ctx, &actions[i]) + case *astria.Action_BridgeSudoChangeAction: + tx.ActionTypes.Set(storageTypes.ActionTypeBridgeSudoChangeBits) + err = parseBridgeSudoChange(val, height, ctx, &actions[i]) + case *astria.Action_BridgeUnlockAction: + tx.ActionTypes.Set(storageTypes.ActionTypeBridgeUnlockBits) + err = parseBridgeUnlock(val, from, height, ctx, &actions[i]) + case *astria.Action_FeeChangeAction: + tx.ActionTypes.Set(storageTypes.ActionTypeFeeChangeBits) + err = parseFeeChange(val, &actions[i]) + default: return nil, errors.Errorf( "unknown action type | position = %d | block = %d: %##v", @@ -98,8 +102,9 @@ func parseIcs20Withdrawal(body *astria.Action_Ics20Withdrawal, height types.Leve amount := uint128ToString(body.Ics20Withdrawal.GetAmount()) action.Data["amount"] = amount action.Data["denom"] = body.Ics20Withdrawal.GetDenom() + action.Data["fee_asset"] = body.Ics20Withdrawal.GetFeeAsset() action.Data["destination_address"] = body.Ics20Withdrawal.GetDestinationChainAddress() - action.Data["return_address"] = hex.EncodeToString(body.Ics20Withdrawal.GetReturnAddress()) + action.Data["return_address"] = body.Ics20Withdrawal.GetReturnAddress().GetBech32M() action.Data["source_channel"] = body.Ics20Withdrawal.GetSourceChannel() if memo := body.Ics20Withdrawal.GetMemo(); memo != "" { action.Data["memo"] = memo @@ -114,9 +119,20 @@ func parseIcs20Withdrawal(body *astria.Action_Ics20Withdrawal, height types.Leve if body.Ics20Withdrawal.GetTimeoutTime() > 0 { action.Data["timeout_time"] = body.Ics20Withdrawal.GetTimeoutTime() } + if bridge := body.Ics20Withdrawal.GetBridgeAddress().GetBech32M(); bridge != "" { + action.Data["bridge"] = bridge + addr := ctx.Addresses.Set(bridge, height, decimal.Zero, 1, 0) + action.Addresses = append(action.Addresses, &storage.AddressAction{ + Address: addr, + Action: action, + Time: action.Time, + Height: action.Height, + ActionType: action.Type, + }) + } decAmount := decimal.RequireFromString(amount) - returnAddress := bytes.HexBytes(body.Ics20Withdrawal.GetReturnAddress()) + returnAddress := body.Ics20Withdrawal.GetReturnAddress().GetBech32M() addr := ctx.Addresses.Set(returnAddress, height, decAmount, 1, 0) action.Addresses = append(action.Addresses, &storage.AddressAction{ Address: addr, @@ -136,45 +152,14 @@ func parseIcs20Withdrawal(body *astria.Action_Ics20Withdrawal, height types.Leve return nil } -func parseMintAction(body *astria.Action_MintAction, height types.Level, ctx *Context, action *storage.Action) error { - action.Type = storageTypes.ActionTypeMint - action.Data = make(map[string]any) - if body.MintAction != nil { - to := body.MintAction.GetTo().GetInner() - amount := uint128ToString(body.MintAction.GetAmount()) - action.Data["amount"] = amount - action.Data["to"] = hex.EncodeToString(to) - - toAddress := bytes.HexBytes(to) - decAmount := decimal.RequireFromString(amount) - addr := ctx.Addresses.Set(toAddress, height, decAmount, 1, 0) - action.Addresses = append(action.Addresses, &storage.AddressAction{ - Address: addr, - Action: action, - Time: action.Time, - Height: action.Height, - ActionType: action.Type, - }) - - ctx.SupplyChange = ctx.SupplyChange.Add(decAmount) - - action.BalanceUpdates = append(action.BalanceUpdates, storage.BalanceUpdate{ - Address: addr, - Height: action.Height, - Currency: addr.Balance.Currency, - Update: decAmount, - }) - } - return nil -} - -func parseSequenceAction(body *astria.Action_SequenceAction, from bytes.HexBytes, height types.Level, ctx *Context, action *storage.Action) error { +func parseSequenceAction(body *astria.Action_SequenceAction, from string, height types.Level, ctx *Context, action *storage.Action) error { action.Type = storageTypes.ActionTypeSequence action.Data = make(map[string]any) if body.SequenceAction != nil { rollupId := body.SequenceAction.GetRollupId().GetInner() action.Data["rollup_id"] = rollupId action.Data["data"] = body.SequenceAction.GetData() + action.Data["fee_asset"] = body.SequenceAction.GetFeeAsset() dataSize := len(body.SequenceAction.GetData()) rollup := ctx.Rollups.Set(rollupId, height, dataSize) @@ -217,11 +202,10 @@ func parseSudoAddressChangeAction(body *astria.Action_SudoAddressChangeAction, h action.Type = storageTypes.ActionTypeSudoAddressChange action.Data = make(map[string]any) if body.SudoAddressChangeAction != nil { - address := body.SudoAddressChangeAction.GetNewAddress().GetInner() - action.Data["address"] = hex.EncodeToString(address) + address := body.SudoAddressChangeAction.GetNewAddress().GetBech32M() + action.Data["address"] = address - newAddress := bytes.HexBytes(address) - addr := ctx.Addresses.Set(newAddress, height, decimal.Zero, 1, 0) + addr := ctx.Addresses.Set(address, height, decimal.Zero, 1, 0) action.Addresses = append(action.Addresses, &storage.AddressAction{ Address: addr, Action: action, @@ -233,20 +217,22 @@ func parseSudoAddressChangeAction(body *astria.Action_SudoAddressChangeAction, h return nil } -func parseTransferAction(body *astria.Action_TransferAction, from bytes.HexBytes, height types.Level, ctx *Context, action *storage.Action) error { +func parseTransferAction(body *astria.Action_TransferAction, from string, height types.Level, ctx *Context, action *storage.Action) error { action.Type = storageTypes.ActionTypeTransfer action.Data = make(map[string]any) if body.TransferAction != nil { amount := uint128ToString(body.TransferAction.GetAmount()) - to := body.TransferAction.GetTo().GetInner() + to := body.TransferAction.GetTo().GetBech32M() + asset := body.TransferAction.GetAsset() + action.Data["amount"] = amount - action.Data["asset_id"] = body.TransferAction.GetAssetId() - action.Data["to"] = hex.EncodeToString(to) + action.Data["asset"] = asset + action.Data["fee_asset"] = body.TransferAction.GetFeeAsset() + action.Data["to"] = to - toAddress := bytes.HexBytes(to) decAmount := decimal.RequireFromString(amount) - if stdBytes.Equal(from, toAddress) { + if from == to { addr := ctx.Addresses.Set(from, height, decimal.Zero, 1, 0) action.Addresses = append(action.Addresses, &storage.AddressAction{ Address: addr, @@ -256,7 +242,7 @@ func parseTransferAction(body *astria.Action_TransferAction, from bytes.HexBytes ActionType: action.Type, }) } else { - toAddr := ctx.Addresses.Set(toAddress, height, decAmount, 1, 0) + toAddr := ctx.Addresses.Set(to, height, decAmount, 1, 0) fromAddr := ctx.Addresses.Set(from, height, decAmount.Neg(), 1, 0) action.Addresses = append(action.Addresses, &storage.AddressAction{ @@ -278,13 +264,13 @@ func parseTransferAction(body *astria.Action_TransferAction, from bytes.HexBytes storage.BalanceUpdate{ Address: toAddr, Height: action.Height, - Currency: toAddr.Balance.Currency, + Currency: asset, Update: decAmount, }, storage.BalanceUpdate{ Address: fromAddr, Height: action.Height, - Currency: fromAddr.Balance.Currency, + Currency: asset, Update: decAmount.Copy().Neg(), }) } @@ -301,7 +287,10 @@ func parseValidatorUpdateAction(body *astria.Action_ValidatorUpdateAction, heigh pubKey := body.ValidatorUpdateAction.GetPubKey().GetEd25519() action.Data["pubkey"] = pubKey - address := AddressFromPubKey(body.ValidatorUpdateAction.GetPubKey().GetEd25519()) + address, err := AddressFromPubKey(body.ValidatorUpdateAction.GetPubKey().GetEd25519()) + if err != nil { + return err + } addr := ctx.Addresses.Set(address, height, decimal.Zero, 1, 0) action.Addresses = append(action.Addresses, &storage.AddressAction{ Address: addr, @@ -319,11 +308,10 @@ func parseIbcRelayerChange(body *astria.Action_IbcRelayerChangeAction, height ty action.Type = storageTypes.ActionTypeIbcRelayerChange action.Data = make(map[string]any) if body.IbcRelayerChangeAction != nil { - if addition := body.IbcRelayerChangeAction.GetAddition(); len(addition.GetInner()) > 0 { - action.Data["addition"] = hex.EncodeToString(addition.GetInner()) + if addition := body.IbcRelayerChangeAction.GetAddition(); len(addition.GetBech32M()) > 0 { + action.Data["addition"] = addition.GetBech32M() - addrBytes := bytes.HexBytes(addition.GetInner()) - addr := ctx.Addresses.Set(addrBytes, height, decimal.Zero, 1, 0) + addr := ctx.Addresses.Set(addition.GetBech32M(), height, decimal.Zero, 1, 0) action.Addresses = append(action.Addresses, &storage.AddressAction{ Address: addr, Action: action, @@ -333,11 +321,10 @@ func parseIbcRelayerChange(body *astria.Action_IbcRelayerChangeAction, height ty }) } - if removal := body.IbcRelayerChangeAction.GetRemoval(); len(removal.GetInner()) > 0 { - action.Data["removal"] = hex.EncodeToString(removal.GetInner()) + if removal := body.IbcRelayerChangeAction.GetRemoval(); len(removal.GetBech32M()) > 0 { + action.Data["removal"] = removal.GetBech32M() - addrBytes := bytes.HexBytes(removal.GetInner()) - addr := ctx.Addresses.Set(addrBytes, height, decimal.Zero, 1, 0) + addr := ctx.Addresses.Set(removal.GetBech32M(), height, decimal.Zero, 1, 0) action.Addresses = append(action.Addresses, &storage.AddressAction{ Address: addr, Action: action, @@ -350,13 +337,41 @@ func parseIbcRelayerChange(body *astria.Action_IbcRelayerChangeAction, height ty return nil } -func parseInitBridgeAccount(body *astria.Action_InitBridgeAccountAction, from bytes.HexBytes, height types.Level, ctx *Context, action *storage.Action) error { +func parseInitBridgeAccount(body *astria.Action_InitBridgeAccountAction, from string, height types.Level, ctx *Context, action *storage.Action) error { action.Type = storageTypes.ActionTypeInitBridgeAccount action.Data = make(map[string]any) if body.InitBridgeAccountAction != nil { action.Data["rollup_id"] = body.InitBridgeAccountAction.GetRollupId().GetInner() - action.Data["fee_asset_id"] = body.InitBridgeAccountAction.GetFeeAssetId() - action.Data["asset_id"] = body.InitBridgeAccountAction.GetAssetId() + action.Data["fee_asset"] = body.InitBridgeAccountAction.GetFeeAsset() + action.Data["asset"] = body.InitBridgeAccountAction.GetAsset() + + if sudo := body.InitBridgeAccountAction.GetSudoAddress().GetBech32M(); sudo != "" { + action.Data["sudo"] = sudo + if sudo != from { + addr := ctx.Addresses.Set(sudo, height, decimal.Zero, 1, 0) + action.Addresses = append(action.Addresses, &storage.AddressAction{ + Address: addr, + Action: action, + Time: action.Time, + Height: action.Height, + ActionType: action.Type, + }) + } + } + + if withdrawer := body.InitBridgeAccountAction.GetWithdrawerAddress().GetBech32M(); withdrawer != "" { + action.Data["withdrawer"] = withdrawer + if withdrawer != from { + addr := ctx.Addresses.Set(withdrawer, height, decimal.Zero, 1, 0) + action.Addresses = append(action.Addresses, &storage.AddressAction{ + Address: addr, + Action: action, + Time: action.Time, + Height: action.Height, + ActionType: action.Type, + }) + } + } rollup := ctx.Rollups.Set(body.InitBridgeAccountAction.GetRollupId().GetInner(), height, 0) action.RollupAction = &storage.RollupAction{ @@ -372,23 +387,70 @@ func parseInitBridgeAccount(body *astria.Action_InitBridgeAccountAction, from by return nil } -func parseBridgeLock(body *astria.Action_BridgeLockAction, from bytes.HexBytes, height types.Level, ctx *Context, action *storage.Action) error { +func parseBridgeSudoChange(body *astria.Action_BridgeSudoChangeAction, height types.Level, ctx *Context, action *storage.Action) error { + action.Type = storageTypes.ActionTypeBridgeSudoChangeAction + action.Data = make(map[string]any) + if body.BridgeSudoChangeAction != nil { + bridge := body.BridgeSudoChangeAction.GetBridgeAddress().GetBech32M() + sudo := body.BridgeSudoChangeAction.GetNewSudoAddress().GetBech32M() + withdrawer := body.BridgeSudoChangeAction.GetNewWithdrawerAddress().GetBech32M() + + action.Data["bridge"] = bridge + bridgeAddr := ctx.Addresses.Set(bridge, height, decimal.Zero, 1, 0) + action.Addresses = append(action.Addresses, &storage.AddressAction{ + Address: bridgeAddr, + Action: action, + Time: action.Time, + Height: action.Height, + ActionType: action.Type, + }) + + if sudo != "" { + action.Data["sudo"] = sudo + addr := ctx.Addresses.Set(sudo, height, decimal.Zero, 1, 0) + action.Addresses = append(action.Addresses, &storage.AddressAction{ + Address: addr, + Action: action, + Time: action.Time, + Height: action.Height, + ActionType: action.Type, + }) + } + if withdrawer != "" { + action.Data["withdrawer"] = withdrawer + addr := ctx.Addresses.Set(withdrawer, height, decimal.Zero, 1, 0) + action.Addresses = append(action.Addresses, &storage.AddressAction{ + Address: addr, + Action: action, + Time: action.Time, + Height: action.Height, + ActionType: action.Type, + }) + } + action.Data["fee_asset"] = body.BridgeSudoChangeAction.GetFeeAsset() + + } + return nil +} + +func parseBridgeLock(body *astria.Action_BridgeLockAction, from string, height types.Level, ctx *Context, action *storage.Action) error { action.Type = storageTypes.ActionTypeBridgeLock action.Data = make(map[string]any) if body.BridgeLockAction != nil { amount := uint128ToString(body.BridgeLockAction.GetAmount()) + asset := body.BridgeLockAction.GetAsset() - action.Data["to"] = hex.EncodeToString(body.BridgeLockAction.GetTo().GetInner()) + action.Data["to"] = body.BridgeLockAction.GetTo().GetBech32M() action.Data["destination_chain_address"] = body.BridgeLockAction.GetDestinationChainAddress() - action.Data["asset_id"] = body.BridgeLockAction.GetAssetId() - action.Data["fee_asset_id"] = body.BridgeLockAction.GetFeeAssetId() + action.Data["asset"] = asset + action.Data["fee_asset"] = body.BridgeLockAction.GetFeeAsset() action.Data["amount"] = amount - toAddress := bytes.HexBytes(body.BridgeLockAction.GetTo().GetInner()) + toAddress := body.BridgeLockAction.GetTo().GetBech32M() decAmount := decimal.RequireFromString(amount) toAddr := ctx.Addresses.Set(toAddress, height, decAmount, 1, 0) - if stdBytes.Equal(from, toAddress) { + if from == toAddress { action.Addresses = append(action.Addresses, &storage.AddressAction{ Address: toAddr, @@ -422,13 +484,13 @@ func parseBridgeLock(body *astria.Action_BridgeLockAction, from bytes.HexBytes, storage.BalanceUpdate{ Address: toAddr, Height: action.Height, - Currency: toAddr.Balance.Currency, + Currency: asset, Update: decAmount, }, storage.BalanceUpdate{ Address: fromAddr, Height: action.Height, - Currency: fromAddr.Balance.Currency, + Currency: asset, Update: decAmount.Neg(), }, ) @@ -438,6 +500,70 @@ func parseBridgeLock(body *astria.Action_BridgeLockAction, from bytes.HexBytes, return nil } +func parseBridgeUnlock(body *astria.Action_BridgeUnlockAction, from string, height types.Level, ctx *Context, action *storage.Action) error { + action.Type = storageTypes.ActionTypeBridgeUnlock + action.Data = make(map[string]any) + if body.BridgeUnlockAction != nil { + amount := uint128ToString(body.BridgeUnlockAction.GetAmount()) + toAddress := body.BridgeUnlockAction.GetTo().GetBech32M() + bridge := body.BridgeUnlockAction.GetBridgeAddress().GetBech32M() + + action.Data["to"] = toAddress + action.Data["fee_asset"] = body.BridgeUnlockAction.GetFeeAsset() + action.Data["amount"] = amount + if memo := body.BridgeUnlockAction.GetMemo(); len(memo) > 0 { + action.Data["memo"] = string(memo) + } + if bridge != "" { + action.Data["bridge"] = bridge + } + + decAmount := decimal.RequireFromString(amount) + toAddr := ctx.Addresses.Set(toAddress, height, decAmount, 1, 0) + + var fromAddr *storage.Address + switch bridge { + case "", from: + fromAddr = ctx.Addresses.Set(from, height, decAmount.Neg(), 1, 0) + default: + fromAddr = ctx.Addresses.Set(bridge, height, decAmount.Neg(), 1, 0) + } + + action.Addresses = append(action.Addresses, + &storage.AddressAction{ + Address: toAddr, + Action: action, + Time: action.Time, + Height: action.Height, + ActionType: action.Type, + }, + &storage.AddressAction{ + Address: fromAddr, + Action: action, + Time: action.Time, + Height: action.Height, + ActionType: action.Type, + }, + ) + + action.BalanceUpdates = append(action.BalanceUpdates, + storage.BalanceUpdate{ + Address: toAddr, + Height: action.Height, + Currency: toAddr.Balance.Currency, + Update: decAmount, + }, + storage.BalanceUpdate{ + Address: fromAddr, + Height: action.Height, + Currency: fromAddr.Balance.Currency, + Update: decAmount.Neg(), + }, + ) + } + return nil +} + func parseFeeAssetChange(body *astria.Action_FeeAssetChangeAction, action *storage.Action) error { action.Type = storageTypes.ActionTypeFeeAssetChange action.Data = make(map[string]any) @@ -452,3 +578,34 @@ func parseFeeAssetChange(body *astria.Action_FeeAssetChangeAction, action *stora } return nil } + +func parseFeeChange(body *astria.Action_FeeChangeAction, action *storage.Action) error { + action.Type = storageTypes.ActionTypeFeeChange + action.Data = make(map[string]any) + if body.FeeChangeAction != nil { + switch t := body.FeeChangeAction.GetValue().(type) { + case *astria.FeeChangeAction_BridgeLockByteCostMultiplier: + action.Data["bridge_lock_byte_cost_multiplier"] = uint128ToString(t.BridgeLockByteCostMultiplier) + + case *astria.FeeChangeAction_BridgeSudoChangeBaseFee: + action.Data["bridge_sudo_change_base_fee"] = uint128ToString(t.BridgeSudoChangeBaseFee) + + case *astria.FeeChangeAction_Ics20WithdrawalBaseFee: + action.Data["ics20_withdrawal_base_fee"] = uint128ToString(t.Ics20WithdrawalBaseFee) + + case *astria.FeeChangeAction_InitBridgeAccountBaseFee: + action.Data["init_bridge_account_base_fee"] = uint128ToString(t.InitBridgeAccountBaseFee) + + case *astria.FeeChangeAction_SequenceBaseFee: + action.Data["sequence_base_fee"] = uint128ToString(t.SequenceBaseFee) + + case *astria.FeeChangeAction_SequenceByteCostMultiplier: + action.Data["sequence_byte_cost_multiplier"] = uint128ToString(t.SequenceByteCostMultiplier) + + case *astria.FeeChangeAction_TransferBaseFee: + action.Data["transfer_base_fee"] = uint128ToString(t.TransferBaseFee) + } + } + // TODO: update constants + return nil +} diff --git a/pkg/indexer/decode/actions_test.go b/pkg/indexer/decode/actions_test.go index 9c42fbd..ee0e5be 100644 --- a/pkg/indexer/decode/actions_test.go +++ b/pkg/indexer/decode/actions_test.go @@ -21,6 +21,11 @@ import ( "google.golang.org/protobuf/types/known/anypb" ) +const ( + assetId = "nria" + feeAssetId = "fee_asset" +) + func TestDecodeActions(t *testing.T) { t.Run("ibc action", func(t *testing.T) { @@ -48,10 +53,10 @@ func TestDecodeActions(t *testing.T) { require.Equal(t, wantAction, action) }) - t.Run("ibc 20 withdrawal", func(t *testing.T) { + t.Run("ics 20 withdrawal", func(t *testing.T) { decodeContext := NewContext() - address := testsuite.RandomHash(20) + address := testsuite.RandomAddress() message := &astria.Action_Ics20Withdrawal{ Ics20Withdrawal: &astria.Ics20Withdrawal{ @@ -61,13 +66,17 @@ func TestDecodeActions(t *testing.T) { }, Denom: currency.DefaultCurrency, DestinationChainAddress: "celestia1lx7dfjp20shd6y5f4tauvy8cv4pjhvszfrh9ah", - ReturnAddress: address, - SourceChannel: "channel-12", + ReturnAddress: &primitivev1.Address{ + Bech32M: address, + }, + SourceChannel: "channel-12", TimeoutHeight: &astria.IbcHeight{ RevisionNumber: 1000, RevisionHeight: 1001, }, TimeoutTime: 1000, + FeeAsset: feeAssetId, + Memo: "memo", }, } @@ -78,13 +87,15 @@ func TestDecodeActions(t *testing.T) { "amount": "1", "denom": currency.DefaultCurrency, "destination_address": "celestia1lx7dfjp20shd6y5f4tauvy8cv4pjhvszfrh9ah", - "return_address": hex.EncodeToString(address), + "return_address": address, "source_channel": "channel-12", "timeout_height": map[string]any{ "revision_number": uint64(1000), "revision_height": uint64(1001), }, "timeout_time": uint64(1000), + "fee_asset": feeAssetId, + "memo": "memo", }, Addresses: []*storage.AddressAction{}, BalanceUpdates: []storage.BalanceUpdate{ @@ -128,66 +139,10 @@ func TestDecodeActions(t *testing.T) { require.Equal(t, wantAction, action) }) - t.Run("mint", func(t *testing.T) { - decodeContext := NewContext() - - address := testsuite.RandomHash(20) - addressModel := &storage.Address{ - Height: 1000, - Hash: address, - ActionsCount: 1, - Balance: &storage.Balance{ - Currency: currency.DefaultCurrency, - Total: decimal.RequireFromString("10"), - }, - } - - message := &astria.Action_MintAction{ - MintAction: &astria.MintAction{ - Amount: &primitivev1.Uint128{ - Lo: 10, - }, - To: &primitivev1.Address{Inner: address}, - }, - } - - wantAction := storage.Action{ - Height: 1000, - Type: types.ActionTypeMint, - Data: map[string]any{ - "amount": "10", - "to": hex.EncodeToString(address), - }, - Addresses: make([]*storage.AddressAction, 0), - BalanceUpdates: []storage.BalanceUpdate{ - { - Address: addressModel, - Currency: currency.DefaultCurrency, - Update: addressModel.Balance.Total, - Height: 1000, - }, - }, - } - addressAction := storage.AddressAction{ - Height: 1000, - Address: addressModel, - ActionType: types.ActionTypeMint, - Action: &wantAction, - } - wantAction.Addresses = append(wantAction.Addresses, &addressAction) - - action := storage.Action{ - Height: 1000, - } - err := parseMintAction(message, 1000, &decodeContext, &action) - require.NoError(t, err) - require.Equal(t, wantAction, action) - }) - t.Run("sequence", func(t *testing.T) { decodeContext := NewContext() - from := testsuite.RandomHash(20) + from := testsuite.RandomAddress() decodeContext.Addresses.Set(from, 1000, decimal.Zero, 0, 1) addressModel := &storage.Address{ @@ -205,6 +160,7 @@ func TestDecodeActions(t *testing.T) { SequenceAction: &astria.SequenceAction{ RollupId: &primitivev1.RollupId{Inner: testsuite.RandomHash(10)}, Data: testsuite.RandomHash(10), + FeeAsset: feeAssetId, }, } @@ -214,6 +170,7 @@ func TestDecodeActions(t *testing.T) { Data: map[string]any{ "rollup_id": message.SequenceAction.GetRollupId().GetInner(), "data": message.SequenceAction.GetData(), + "fee_asset": feeAssetId, }, Addresses: make([]*storage.AddressAction, 0), RollupAction: &storage.RollupAction{ @@ -247,10 +204,10 @@ func TestDecodeActions(t *testing.T) { t.Run("sudo address change", func(t *testing.T) { decodeContext := NewContext() - newAddress := testsuite.RandomHash(20) + newAddress := testsuite.RandomAddress() message := &astria.Action_SudoAddressChangeAction{ SudoAddressChangeAction: &astria.SudoAddressChangeAction{ - NewAddress: &primitivev1.Address{Inner: newAddress}, + NewAddress: &primitivev1.Address{Bech32M: newAddress}, }, } @@ -258,7 +215,7 @@ func TestDecodeActions(t *testing.T) { Height: 1000, Type: types.ActionTypeSudoAddressChange, Data: map[string]any{ - "address": hex.EncodeToString(newAddress), + "address": newAddress, }, Addresses: make([]*storage.AddressAction, 0), } @@ -287,7 +244,7 @@ func TestDecodeActions(t *testing.T) { t.Run("transfer", func(t *testing.T) { decodeContext := NewContext() - from := testsuite.RandomHash(20) + from := testsuite.RandomAddress() fromModel := &storage.Address{ Height: 1000, Hash: from, @@ -299,7 +256,7 @@ func TestDecodeActions(t *testing.T) { }, } - to := testsuite.RandomHash(20) + to := testsuite.RandomAddress() toModel := &storage.Address{ Height: 1000, Hash: to, @@ -313,11 +270,12 @@ func TestDecodeActions(t *testing.T) { message := &astria.Action_TransferAction{ TransferAction: &astria.TransferAction{ - To: &primitivev1.Address{Inner: to}, + To: &primitivev1.Address{Bech32M: to}, Amount: &primitivev1.Uint128{ Lo: 10, }, - AssetId: testsuite.RandomHash(20), + Asset: assetId, + FeeAsset: feeAssetId, }, } @@ -325,9 +283,10 @@ func TestDecodeActions(t *testing.T) { Height: 1000, Type: types.ActionTypeTransfer, Data: map[string]any{ - "to": hex.EncodeToString(to), - "amount": "10", - "asset_id": message.TransferAction.GetAssetId(), + "to": to, + "amount": "10", + "asset": message.TransferAction.GetAsset(), + "fee_asset": message.TransferAction.GetFeeAsset(), }, Addresses: make([]*storage.AddressAction, 0), BalanceUpdates: []storage.BalanceUpdate{ @@ -368,7 +327,7 @@ func TestDecodeActions(t *testing.T) { t.Run("transfer to myself", func(t *testing.T) { decodeContext := NewContext() - from := testsuite.RandomHash(20) + from := testsuite.RandomAddress() fromModel := &storage.Address{ Height: 1000, Hash: from, @@ -382,11 +341,12 @@ func TestDecodeActions(t *testing.T) { message := &astria.Action_TransferAction{ TransferAction: &astria.TransferAction{ - To: &primitivev1.Address{Inner: from}, + To: &primitivev1.Address{Bech32M: from}, Amount: &primitivev1.Uint128{ Lo: 10, }, - AssetId: testsuite.RandomHash(20), + Asset: assetId, + FeeAsset: feeAssetId, }, } @@ -394,9 +354,10 @@ func TestDecodeActions(t *testing.T) { Height: 1000, Type: types.ActionTypeTransfer, Data: map[string]any{ - "to": hex.EncodeToString(from), - "amount": "10", - "asset_id": message.TransferAction.GetAssetId(), + "to": from, + "amount": "10", + "asset": message.TransferAction.GetAsset(), + "fee_asset": message.TransferAction.GetFeeAsset(), }, Addresses: make([]*storage.AddressAction, 0), } @@ -438,7 +399,9 @@ func TestDecodeActions(t *testing.T) { }, Addresses: make([]*storage.AddressAction, 0), } - address := AddressFromPubKey(message.ValidatorUpdateAction.GetPubKey().GetEd25519()) + address, err := AddressFromPubKey(message.ValidatorUpdateAction.GetPubKey().GetEd25519()) + require.NoError(t, err) + balance := storage.EmptyBalance() addressAction := storage.AddressAction{ Height: 1000, @@ -456,7 +419,7 @@ func TestDecodeActions(t *testing.T) { action := storage.Action{ Height: 1000, } - err := parseValidatorUpdateAction(message, 1000, &decodeContext, &action) + err = parseValidatorUpdateAction(message, 1000, &decodeContext, &action) require.NoError(t, err) require.Equal(t, wantAction, action) @@ -468,7 +431,6 @@ func TestDecodeActions(t *testing.T) { }) t.Run("fee asset change: addition", func(t *testing.T) { - assetId := testsuite.RandomHash(32) message := &astria.Action_FeeAssetChangeAction{ FeeAssetChangeAction: &astria.FeeAssetChangeAction{ Value: &astria.FeeAssetChangeAction_Addition{ @@ -494,7 +456,6 @@ func TestDecodeActions(t *testing.T) { }) t.Run("fee asset change: removal", func(t *testing.T) { - assetId := testsuite.RandomHash(32) message := &astria.Action_FeeAssetChangeAction{ FeeAssetChangeAction: &astria.FeeAssetChangeAction{ Value: &astria.FeeAssetChangeAction_Removal{ @@ -522,16 +483,14 @@ func TestDecodeActions(t *testing.T) { t.Run("bridge lock", func(t *testing.T) { decodeContext := NewContext() - assetId := testsuite.RandomHash(32) - feeAssetId := testsuite.RandomHash(32) - to := testsuite.RandomHash(20) - dest := "random_address" + to := testsuite.RandomAddress() + dest := testsuite.RandomAddress() message := &astria.Action_BridgeLockAction{ BridgeLockAction: &astria.BridgeLockAction{ - FeeAssetId: feeAssetId, - AssetId: assetId, - To: &primitivev1.Address{Inner: to}, + FeeAsset: feeAssetId, + Asset: assetId, + To: &primitivev1.Address{Bech32M: to}, DestinationChainAddress: dest, Amount: &primitivev1.Uint128{ Lo: 10, @@ -551,7 +510,7 @@ func TestDecodeActions(t *testing.T) { }, } - from := testsuite.RandomHash(20) + from := testsuite.RandomAddress() fromModel := &storage.Address{ Height: 1000, Hash: from, @@ -567,9 +526,9 @@ func TestDecodeActions(t *testing.T) { Height: 1000, Type: types.ActionTypeBridgeLock, Data: map[string]any{ - "asset_id": assetId, - "fee_asset_id": feeAssetId, - "to": hex.EncodeToString(to), + "asset": assetId, + "fee_asset": feeAssetId, + "to": to, "destination_chain_address": dest, "amount": "10", }, @@ -615,16 +574,14 @@ func TestDecodeActions(t *testing.T) { t.Run("bridge lock the same address", func(t *testing.T) { decodeContext := NewContext() - assetId := testsuite.RandomHash(32) - feeAssetId := testsuite.RandomHash(32) - to := testsuite.RandomHash(20) - dest := "random_address" + to := testsuite.RandomAddress() + dest := testsuite.RandomAddress() message := &astria.Action_BridgeLockAction{ BridgeLockAction: &astria.BridgeLockAction{ - FeeAssetId: feeAssetId, - AssetId: assetId, - To: &primitivev1.Address{Inner: to}, + FeeAsset: feeAssetId, + Asset: assetId, + To: &primitivev1.Address{Bech32M: to}, DestinationChainAddress: dest, Amount: &primitivev1.Uint128{ Lo: 10, @@ -648,9 +605,9 @@ func TestDecodeActions(t *testing.T) { Height: 1000, Type: types.ActionTypeBridgeLock, Data: map[string]any{ - "asset_id": assetId, - "fee_asset_id": feeAssetId, - "to": hex.EncodeToString(to), + "asset": assetId, + "fee_asset": feeAssetId, + "to": to, "destination_chain_address": dest, "amount": "10", }, @@ -673,20 +630,114 @@ func TestDecodeActions(t *testing.T) { require.Equal(t, wantAction, action) }) + t.Run("bridge unlock", func(t *testing.T) { + decodeContext := NewContext() + + to := testsuite.RandomAddress() + bridge := testsuite.RandomAddress() + + message := &astria.Action_BridgeUnlockAction{ + BridgeUnlockAction: &astria.BridgeUnlockAction{ + FeeAsset: feeAssetId, + To: &primitivev1.Address{Bech32M: to}, + BridgeAddress: &primitivev1.Address{Bech32M: bridge}, + Memo: []byte("memo"), + Amount: &primitivev1.Uint128{ + Lo: 10, + Hi: 0, + }, + }, + } + + toModel := &storage.Address{ + Height: 1000, + Hash: to, + ActionsCount: 1, + SignedTxCount: 0, + Balance: &storage.Balance{ + Currency: currency.DefaultCurrency, + Total: decimal.RequireFromString("10"), + }, + } + fromModel := &storage.Address{ + Height: 1000, + Hash: bridge, + ActionsCount: 1, + SignedTxCount: 0, + Balance: &storage.Balance{ + Currency: currency.DefaultCurrency, + Total: decimal.RequireFromString("-10"), + }, + } + + wantAction := storage.Action{ + Height: 1000, + Type: types.ActionTypeBridgeUnlock, + Data: map[string]any{ + "fee_asset": feeAssetId, + "to": to, + "bridge": bridge, + "amount": "10", + "memo": "memo", + }, + Addresses: make([]*storage.AddressAction, 0), + BalanceUpdates: []storage.BalanceUpdate{ + { + Address: toModel, + Update: toModel.Balance.Total, + Currency: toModel.Balance.Currency, + Height: 1000, + }, + { + Address: fromModel, + Update: fromModel.Balance.Total, + Currency: fromModel.Balance.Currency, + Height: 1000, + }, + }, + } + wantAction.Addresses = append(wantAction.Addresses, + &storage.AddressAction{ + Height: 1000, + Address: toModel, + ActionType: types.ActionTypeBridgeUnlock, + Action: &wantAction, + }, + &storage.AddressAction{ + Height: 1000, + Address: fromModel, + ActionType: types.ActionTypeBridgeUnlock, + Action: &wantAction, + }, + ) + + action := storage.Action{ + Height: 1000, + } + err := parseBridgeUnlock(message, to, 1000, &decodeContext, &action) + require.NoError(t, err) + require.Equal(t, wantAction, action) + }) + t.Run("init bridge account", func(t *testing.T) { decodeContext := NewContext() - assetId := testsuite.RandomHash(32) rollupId := testsuite.RandomHash(10) - feAssetId := testsuite.RandomHash(32) - from := testsuite.RandomHash(20) + from := testsuite.RandomAddress() + sudo := testsuite.RandomAddress() + withdrawer := testsuite.RandomAddress() + fromAddr := decodeContext.Addresses.Set(from, 1000, decimal.Zero, 0, 1) + sudoAddr := decodeContext.Addresses.Set(sudo, 1000, decimal.Zero, 1, 0) + wdwAddr := decodeContext.Addresses.Set(withdrawer, 1000, decimal.Zero, 1, 0) message := &astria.Action_InitBridgeAccountAction{ InitBridgeAccountAction: &astria.InitBridgeAccountAction{ - RollupId: &primitivev1.RollupId{Inner: rollupId}, - FeeAssetId: feAssetId, - AssetId: assetId, + RollupId: &primitivev1.RollupId{Inner: rollupId}, + FeeAsset: feeAssetId, + Asset: assetId, + SudoAddress: &primitivev1.Address{Bech32M: sudo}, + WithdrawerAddress: &primitivev1.Address{Bech32M: withdrawer}, }, } @@ -694,9 +745,11 @@ func TestDecodeActions(t *testing.T) { Height: 1000, Type: types.ActionTypeInitBridgeAccount, Data: map[string]any{ - "rollup_id": rollupId, - "asset_id": assetId, - "fee_asset_id": feAssetId, + "rollup_id": rollupId, + "asset": assetId, + "fee_asset": feeAssetId, + "sudo": sudo, + "withdrawer": withdrawer, }, RollupAction: &storage.RollupAction{ Height: 1000, @@ -707,8 +760,22 @@ func TestDecodeActions(t *testing.T) { BridgeAddress: fromAddr, }, }, + Addresses: make([]*storage.AddressAction, 0), } wantAction.RollupAction.Action = &wantAction + wantAction.Addresses = append(wantAction.Addresses, &storage.AddressAction{ + Address: sudoAddr, + Height: 1000, + Time: wantAction.Time, + Action: &wantAction, + ActionType: types.ActionTypeInitBridgeAccount, + }, &storage.AddressAction{ + Address: wdwAddr, + Height: 1000, + Time: wantAction.Time, + Action: &wantAction, + ActionType: types.ActionTypeInitBridgeAccount, + }) action := storage.Action{ Height: 1000, @@ -721,11 +788,11 @@ func TestDecodeActions(t *testing.T) { t.Run("ibc relayer change: addition", func(t *testing.T) { decodeContext := NewContext() - address := testsuite.RandomHash(32) + address := testsuite.RandomAddress() message := &astria.Action_IbcRelayerChangeAction{ IbcRelayerChangeAction: &astria.IbcRelayerChangeAction{ Value: &astria.IbcRelayerChangeAction_Addition{ - Addition: &primitivev1.Address{Inner: address}, + Addition: &primitivev1.Address{Bech32M: address}, }, }, } @@ -745,7 +812,7 @@ func TestDecodeActions(t *testing.T) { Height: 1000, Type: types.ActionTypeIbcRelayerChange, Data: map[string]any{ - "addition": hex.EncodeToString(address), + "addition": address, }, Addresses: make([]*storage.AddressAction, 0), } @@ -767,11 +834,11 @@ func TestDecodeActions(t *testing.T) { t.Run("ibc relayer change: removal", func(t *testing.T) { decodeContext := NewContext() - address := testsuite.RandomHash(20) + address := testsuite.RandomAddress() message := &astria.Action_IbcRelayerChangeAction{ IbcRelayerChangeAction: &astria.IbcRelayerChangeAction{ Value: &astria.IbcRelayerChangeAction_Removal{ - Removal: &primitivev1.Address{Inner: address}, + Removal: &primitivev1.Address{Bech32M: address}, }, }, } @@ -791,7 +858,7 @@ func TestDecodeActions(t *testing.T) { Height: 1000, Type: types.ActionTypeIbcRelayerChange, Data: map[string]any{ - "removal": hex.EncodeToString(address), + "removal": address, }, Addresses: make([]*storage.AddressAction, 0), } @@ -809,4 +876,255 @@ func TestDecodeActions(t *testing.T) { require.NoError(t, err) require.Equal(t, wantAction, action) }) + + t.Run("fee change: sequence_base_fee", func(t *testing.T) { + message := &astria.Action_FeeChangeAction{ + FeeChangeAction: &astria.FeeChangeAction{ + Value: &astria.FeeChangeAction_SequenceBaseFee{ + SequenceBaseFee: &primitivev1.Uint128{ + Hi: 0, + Lo: 10, + }, + }, + }, + } + + wantAction := storage.Action{ + Type: types.ActionTypeFeeChange, + Data: map[string]any{ + "sequence_base_fee": "10", + }, + } + + action := storage.Action{} + err := parseFeeChange(message, &action) + require.NoError(t, err) + require.Equal(t, wantAction, action) + }) + + t.Run("fee change: bridge_lock_byte_cost_multiplier", func(t *testing.T) { + message := &astria.Action_FeeChangeAction{ + FeeChangeAction: &astria.FeeChangeAction{ + Value: &astria.FeeChangeAction_BridgeLockByteCostMultiplier{ + BridgeLockByteCostMultiplier: &primitivev1.Uint128{ + Hi: 0, + Lo: 10, + }, + }, + }, + } + + wantAction := storage.Action{ + Type: types.ActionTypeFeeChange, + Data: map[string]any{ + "bridge_lock_byte_cost_multiplier": "10", + }, + } + + action := storage.Action{} + err := parseFeeChange(message, &action) + require.NoError(t, err) + require.Equal(t, wantAction, action) + }) + + t.Run("fee change: bridge_sudo_change_base_fee", func(t *testing.T) { + message := &astria.Action_FeeChangeAction{ + FeeChangeAction: &astria.FeeChangeAction{ + Value: &astria.FeeChangeAction_BridgeSudoChangeBaseFee{ + BridgeSudoChangeBaseFee: &primitivev1.Uint128{ + Hi: 0, + Lo: 10, + }, + }, + }, + } + + wantAction := storage.Action{ + Type: types.ActionTypeFeeChange, + Data: map[string]any{ + "bridge_sudo_change_base_fee": "10", + }, + } + + action := storage.Action{} + err := parseFeeChange(message, &action) + require.NoError(t, err) + require.Equal(t, wantAction, action) + }) + + t.Run("fee change: ics20_withdrawal_base_fee", func(t *testing.T) { + message := &astria.Action_FeeChangeAction{ + FeeChangeAction: &astria.FeeChangeAction{ + Value: &astria.FeeChangeAction_Ics20WithdrawalBaseFee{ + Ics20WithdrawalBaseFee: &primitivev1.Uint128{ + Hi: 0, + Lo: 10, + }, + }, + }, + } + + wantAction := storage.Action{ + Type: types.ActionTypeFeeChange, + Data: map[string]any{ + "ics20_withdrawal_base_fee": "10", + }, + } + + action := storage.Action{} + err := parseFeeChange(message, &action) + require.NoError(t, err) + require.Equal(t, wantAction, action) + }) + + t.Run("fee change: init_bridge_account_base_fee", func(t *testing.T) { + message := &astria.Action_FeeChangeAction{ + FeeChangeAction: &astria.FeeChangeAction{ + Value: &astria.FeeChangeAction_InitBridgeAccountBaseFee{ + InitBridgeAccountBaseFee: &primitivev1.Uint128{ + Hi: 0, + Lo: 10, + }, + }, + }, + } + + wantAction := storage.Action{ + Type: types.ActionTypeFeeChange, + Data: map[string]any{ + "init_bridge_account_base_fee": "10", + }, + } + + action := storage.Action{} + err := parseFeeChange(message, &action) + require.NoError(t, err) + require.Equal(t, wantAction, action) + }) + + t.Run("fee change: sequence_byte_cost_multiplier", func(t *testing.T) { + message := &astria.Action_FeeChangeAction{ + FeeChangeAction: &astria.FeeChangeAction{ + Value: &astria.FeeChangeAction_SequenceByteCostMultiplier{ + SequenceByteCostMultiplier: &primitivev1.Uint128{ + Hi: 0, + Lo: 10, + }, + }, + }, + } + + wantAction := storage.Action{ + Type: types.ActionTypeFeeChange, + Data: map[string]any{ + "sequence_byte_cost_multiplier": "10", + }, + } + + action := storage.Action{} + err := parseFeeChange(message, &action) + require.NoError(t, err) + require.Equal(t, wantAction, action) + }) + + t.Run("fee change: transfer_base_fee", func(t *testing.T) { + message := &astria.Action_FeeChangeAction{ + FeeChangeAction: &astria.FeeChangeAction{ + Value: &astria.FeeChangeAction_TransferBaseFee{ + TransferBaseFee: &primitivev1.Uint128{ + Hi: 0, + Lo: 10, + }, + }, + }, + } + + wantAction := storage.Action{ + Type: types.ActionTypeFeeChange, + Data: map[string]any{ + "transfer_base_fee": "10", + }, + } + + action := storage.Action{} + err := parseFeeChange(message, &action) + require.NoError(t, err) + require.Equal(t, wantAction, action) + }) + + t.Run("bridge sudo change", func(t *testing.T) { + decodeContext := NewContext() + bridge := testsuite.RandomAddress() + sudo := testsuite.RandomAddress() + withdrawer := testsuite.RandomAddress() + + message := &astria.Action_BridgeSudoChangeAction{ + BridgeSudoChangeAction: &astria.BridgeSudoChangeAction{ + FeeAsset: feeAssetId, + BridgeAddress: &primitivev1.Address{Bech32M: bridge}, + NewWithdrawerAddress: &primitivev1.Address{Bech32M: withdrawer}, + NewSudoAddress: &primitivev1.Address{Bech32M: sudo}, + }, + } + + wantAction := storage.Action{ + Type: types.ActionTypeBridgeSudoChangeAction, + Data: map[string]any{ + "fee_asset": feeAssetId, + "withdrawer": withdrawer, + "sudo": sudo, + "bridge": bridge, + }, + Height: 1000, + Addresses: make([]*storage.AddressAction, 0), + } + + wantAction.Addresses = append(wantAction.Addresses, &storage.AddressAction{ + Height: 1000, + Address: &storage.Address{ + Height: 1000, + Hash: bridge, + ActionsCount: 1, + Balance: &storage.Balance{ + Currency: currency.DefaultCurrency, + Total: decimal.Zero, + }, + }, + ActionType: types.ActionTypeBridgeSudoChangeAction, + Action: &wantAction, + }, &storage.AddressAction{ + Height: 1000, + Address: &storage.Address{ + Height: 1000, + Hash: sudo, + ActionsCount: 1, + Balance: &storage.Balance{ + Currency: currency.DefaultCurrency, + Total: decimal.Zero, + }, + }, + ActionType: types.ActionTypeBridgeSudoChangeAction, + Action: &wantAction, + }, &storage.AddressAction{ + Height: 1000, + Address: &storage.Address{ + Height: 1000, + Hash: withdrawer, + ActionsCount: 1, + Balance: &storage.Balance{ + Currency: currency.DefaultCurrency, + Total: decimal.Zero, + }, + }, + ActionType: types.ActionTypeBridgeSudoChangeAction, + Action: &wantAction, + }) + + action := storage.Action{ + Height: 1000, + } + err := parseBridgeSudoChange(message, 1000, &decodeContext, &action) + require.NoError(t, err) + require.Equal(t, wantAction, action) + }) } diff --git a/pkg/indexer/decode/address.go b/pkg/indexer/decode/address.go index e677482..e9560c2 100644 --- a/pkg/indexer/decode/address.go +++ b/pkg/indexer/decode/address.go @@ -7,7 +7,6 @@ import ( "github.com/celenium-io/astria-indexer/internal/currency" "github.com/celenium-io/astria-indexer/internal/storage" "github.com/celenium-io/astria-indexer/pkg/types" - "github.com/cometbft/cometbft/libs/bytes" "github.com/shopspring/decimal" ) @@ -17,8 +16,8 @@ func NewAddress() Addresses { return make(map[string]*storage.Address) } -func (a Addresses) Set(address bytes.HexBytes, height types.Level, change decimal.Decimal, actionCount int, signedTxCount int) *storage.Address { - if addr, ok := a[address.String()]; ok { +func (a Addresses) Set(address string, height types.Level, change decimal.Decimal, actionCount int, signedTxCount int) *storage.Address { + if addr, ok := a[address]; ok { addr.Balance.Total = addr.Balance.Total.Add(change) addr.ActionsCount += int64(actionCount) addr.SignedTxCount += int64(signedTxCount) @@ -34,17 +33,17 @@ func (a Addresses) Set(address bytes.HexBytes, height types.Level, change decima Currency: currency.DefaultCurrency, }, } - a[address.String()] = addr + a[address] = addr return addr } -func (a Addresses) UpdateNonce(address bytes.HexBytes, nonce uint32) { - if address, ok := a[address.String()]; ok { +func (a Addresses) UpdateNonce(address string, nonce uint32) { + if address, ok := a[address]; ok { address.Nonce = nonce } } -func (a Addresses) Get(address bytes.HexBytes) (*storage.Address, bool) { - addr, ok := a[address.String()] +func (a Addresses) Get(address string) (*storage.Address, bool) { + addr, ok := a[address] return addr, ok } diff --git a/pkg/indexer/decode/functions.go b/pkg/indexer/decode/functions.go index 52ef03b..78b15fd 100644 --- a/pkg/indexer/decode/functions.go +++ b/pkg/indexer/decode/functions.go @@ -7,8 +7,8 @@ import ( "math/big" v1 "buf.build/gen/go/astria/primitives/protocolbuffers/go/astria/primitive/v1" + "github.com/celenium-io/astria-indexer/internal/astria" "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/libs/bytes" ) func uint128ToString(u *v1.Uint128) string { @@ -21,6 +21,6 @@ func uint128ToString(u *v1.Uint128) string { return val.Text(10) } -func AddressFromPubKey(pk []byte) bytes.HexBytes { - return ed25519.PubKey(pk).Address() +func AddressFromPubKey(pk []byte) (string, error) { + return astria.EncodeAddress(ed25519.PubKey(pk).Address()) } diff --git a/pkg/indexer/decode/functions_test.go b/pkg/indexer/decode/functions_test.go index 7fd38dc..0594f33 100644 --- a/pkg/indexer/decode/functions_test.go +++ b/pkg/indexer/decode/functions_test.go @@ -65,15 +65,15 @@ func TestAddressFromPubKey(t *testing.T) { { name: "test 1", pk: "32415F09DBEE4297CC9A841C2C2312BF903FC53C48860D788AE66097355A585F", - want: "230592632006DB2733444BB6DE11DB3F4B2F9AE4", + want: "astria1yvzeyceqqmdjwv6yfwmduywm8a9jlxhyj5tlx2", }, { name: "test 2", pk: "09E29331B2FAD4CBD367986803484A2F544441485E8E736112D2AD49B83656CA", - want: "6F35496BCC8CF0EF9E2AC090FAEF578152549518", + want: "astria1du65j67v3ncwl832czg04m6hs9f9f9gchacdam", }, { name: "test 3", pk: "96F43A8448928F1E580864D69FE44E093C5A82A1D4A80C59086D7E67976CDA45", - want: "115F94D8C98FFD73FE65182611140F0EDC7C3C94", + want: "astria1z90efkxf3l7h8ln9rqnpz9q0pmw8c0y5dvfdhe", }, } for _, tt := range tests { @@ -81,8 +81,9 @@ func TestAddressFromPubKey(t *testing.T) { pk, err := hex.DecodeString(tt.pk) require.NoError(t, err) - got := AddressFromPubKey(pk) - require.Equal(t, tt.want, got.String()) + got, err := AddressFromPubKey(pk) + require.NoError(t, err) + require.Equal(t, tt.want, got) }) } } diff --git a/pkg/indexer/decode/tx.go b/pkg/indexer/decode/tx.go index 935edcc..82ea5f4 100644 --- a/pkg/indexer/decode/tx.go +++ b/pkg/indexer/decode/tx.go @@ -64,7 +64,10 @@ func Tx(b types.BlockData, index int, ctx *Context) (d DecodedTx, err error) { return d, errors.Wrap(err, "tx decoding") } - address := AddressFromPubKey(d.Tx.GetPublicKey()) + address, err := AddressFromPubKey(d.Tx.GetPublicKey()) + if err != nil { + return d, errors.Wrapf(err, "decode publick key: %x", d.Tx.GetPublicKey()) + } d.Signer = ctx.Addresses.Set(address, b.Height, decimal.Zero, 0, 1) ctx.Addresses.UpdateNonce(address, d.UnsignedTx.GetParams().GetNonce()) diff --git a/pkg/indexer/genesis/constant.go b/pkg/indexer/genesis/constant.go index eb0c799..ab4a96d 100644 --- a/pkg/indexer/genesis/constant.go +++ b/pkg/indexer/genesis/constant.go @@ -61,7 +61,7 @@ func (module *Module) parseConstants(appState nodeTypes.AppState, consensus pkgT data.constants = append(data.constants, storage.Constant{ Module: storageTypes.ModuleNameGeneric, Name: "authority_sudo_address", - Value: appState.AuthoritySudoAddress, + Value: appState.AuthoritySudoAddress.Value, }) data.constants = append(data.constants, storage.Constant{ Module: storageTypes.ModuleNameGeneric, @@ -71,7 +71,7 @@ func (module *Module) parseConstants(appState nodeTypes.AppState, consensus pkgT data.constants = append(data.constants, storage.Constant{ Module: storageTypes.ModuleNameGeneric, Name: "ibc_sudo_address", - Value: appState.IbcSudoAddress, + Value: appState.IbcSudoAddress.Value, }) data.constants = append(data.constants, storage.Constant{ Module: storageTypes.ModuleNameGeneric, @@ -103,4 +103,9 @@ func (module *Module) parseConstants(appState nodeTypes.AppState, consensus pkgT Name: "transfer_base_fee", Value: strconv.FormatInt(appState.Fees.TransferBaseFee, 10), }) + data.constants = append(data.constants, storage.Constant{ + Module: storageTypes.ModuleNameGeneric, + Name: "bridge_sudo_change_fee", + Value: strconv.FormatInt(appState.Fees.BridgeSudoChangeFee, 10), + }) } diff --git a/pkg/indexer/genesis/genesis_test.go b/pkg/indexer/genesis/genesis_test.go index 0f2503e..b594316 100644 --- a/pkg/indexer/genesis/genesis_test.go +++ b/pkg/indexer/genesis/genesis_test.go @@ -33,21 +33,48 @@ func TestParseAccounts(t *testing.T) { require.NoError(t, err) want := map[string]*storage.Address{ - "3fff1c39b9d163bfb9bcbf9dfea78675f1b4bc2c": { + "astria1lhpxecq5ffhq68dgu9s8y2g5h53jqw5cvudrkk": { Height: 1, - Hash: []byte{0x3f, 0xff, 0x1c, 0x39, 0xb9, 0xd1, 0x63, 0xbf, 0xb9, 0xbc, 0xbf, 0x9d, 0xfe, 0xa7, 0x86, 0x75, 0xf1, 0xb4, 0xbc, 0x2c}, + Hash: "astria1lhpxecq5ffhq68dgu9s8y2g5h53jqw5cvudrkk", Balance: &storage.Balance{ Id: 0, - Total: decimal.RequireFromString("500000000000000000000"), + Total: decimal.RequireFromString("333333333333333333"), Currency: "nria", }, }, - "2e046327a2ccac7c8f8018ed44e43184b502eb3e": { + "astria1lm45urgugesyhaymn68xww0m6g49zreqa32w7p": { Height: 1, - Hash: []byte{0x2e, 0x04, 0x63, 0x27, 0xa2, 0xcc, 0xac, 0x7c, 0x8f, 0x80, 0x18, 0xed, 0x44, 0xe4, 0x31, 0x84, 0xb5, 0x02, 0xeb, 0x3e}, + Hash: "astria1lm45urgugesyhaymn68xww0m6g49zreqa32w7p", Balance: &storage.Balance{ Id: 0, - Total: decimal.RequireFromString("500000000000000000000"), + Total: decimal.RequireFromString("60"), + Currency: "nria", + }, + }, + "astria1c220qfmjrwqlk939ca5a5z2rjxryyr9m3ah8gl": { + Height: 1, + Hash: "astria1c220qfmjrwqlk939ca5a5z2rjxryyr9m3ah8gl", + Balance: &storage.Balance{ + Id: 0, + Total: decimal.RequireFromString("333333333333333333"), + Currency: "nria", + }, + }, + "astria1475jkpuvznd44szgfz8wwdf9w6xh5dx9jwqgvz": { + Height: 1, + Hash: "astria1475jkpuvznd44szgfz8wwdf9w6xh5dx9jwqgvz", + Balance: &storage.Balance{ + Id: 0, + Total: decimal.RequireFromString("333333333333333333"), + Currency: "nria", + }, + }, + "astria16rgmx2s86kk2r69rhjnvs9y44ujfhadc7yav9a": { + Height: 1, + Hash: "astria16rgmx2s86kk2r69rhjnvs9y44ujfhadc7yav9a", + Balance: &storage.Balance{ + Id: 0, + Total: decimal.RequireFromString("340282366920938463463374607431768211455"), Currency: "nria", }, }, diff --git a/pkg/indexer/genesis/parse.go b/pkg/indexer/genesis/parse.go index 8a72b9c..e35253b 100644 --- a/pkg/indexer/genesis/parse.go +++ b/pkg/indexer/genesis/parse.go @@ -4,6 +4,7 @@ package genesis import ( + "github.com/celenium-io/astria-indexer/internal/astria" "github.com/celenium-io/astria-indexer/internal/currency" "github.com/celenium-io/astria-indexer/internal/storage" "github.com/celenium-io/astria-indexer/pkg/node/types" @@ -71,11 +72,7 @@ func (module *Module) parseAccounts(accounts []types.Account, height pkgTypes.Le }, } - hash, err := pkgTypes.HexFromString(accounts[i].Address) - if err != nil { - return err - } - address.Hash = hash + address.Hash = accounts[i].Address.Value data.addresses[address.String()] = &address data.supply = data.supply.Add(address.Balance.Total) @@ -113,7 +110,10 @@ func (module *Module) parseValidators(validators []types.Validator, height pkgTy if err != nil { return err } - address.Hash = hash + address.Hash, err = astria.EncodeAddress(hash) + if err != nil { + return err + } data.addresses[address.String()] = &address } } diff --git a/pkg/indexer/storage/address_test.go b/pkg/indexer/storage/address_test.go index 7570229..a6a9919 100644 --- a/pkg/indexer/storage/address_test.go +++ b/pkg/indexer/storage/address_test.go @@ -9,7 +9,6 @@ import ( "github.com/celenium-io/astria-indexer/internal/storage" "github.com/celenium-io/astria-indexer/internal/storage/mock" - testsuite "github.com/celenium-io/astria-indexer/internal/test_suite" "github.com/shopspring/decimal" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" @@ -33,7 +32,7 @@ func Test_saveAddresses(t *testing.T) { name: "test 2", addresses: map[string]*storage.Address{ "deadbeaf": { - Hash: testsuite.MustHexDecode("deadbeaf"), + Hash: "deadbeaf", Height: 100, Balance: &storage.Balance{ Currency: "nria", @@ -50,7 +49,7 @@ func Test_saveAddresses(t *testing.T) { name: "test 3", addresses: map[string]*storage.Address{ "deadbeaf": { - Hash: testsuite.MustHexDecode("deadbeaf"), + Hash: "deadbeaf", Height: 100, Balance: &storage.Balance{ Currency: "nria", diff --git a/pkg/node/mock/api.go b/pkg/node/mock/api.go index 2ac0b6e..f211cc2 100644 --- a/pkg/node/mock/api.go +++ b/pkg/node/mock/api.go @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2024 PK Lab AG -// SPDX-License-Identifier: MIT - // Code generated by MockGen. DO NOT EDIT. // Source: api.go // diff --git a/pkg/node/types/genesis.go b/pkg/node/types/genesis.go index 5966995..49cc134 100644 --- a/pkg/node/types/genesis.go +++ b/pkg/node/types/genesis.go @@ -29,17 +29,28 @@ type Validator struct { type AppState struct { Accounts []Account `json:"accounts"` - AuthoritySudoAddress string `json:"authority_sudo_address"` + AddressesPrefixes Prefixes `json:"address_prefixes"` + AuthoritySudoAddress Bech32m `json:"authority_sudo_address"` + IbcSudoAddress Bech32m `json:"ibc_sudo_address"` + IbcRelayerAddresses []Bech32m `json:"ibc_relayer_addresses"` NativeAssetBaseDenomination string `json:"native_asset_base_denomination"` - IbcSudoAddress string `json:"ibc_sudo_address"` Fees Fees `json:"fees"` + AllowedFeeAssets []string `json:"allowed_fee_assets"` } type Account struct { - Address string `json:"address"` + Address Bech32m `json:"address"` Balance json.Number `json:"balance"` } +type Bech32m struct { + Value string `json:"bech32m"` +} + +type Prefixes struct { + Base string `json:"base"` +} + type Fees struct { TransferBaseFee int64 `json:"transfer_base_fee"` SequenceBaseFee int64 `json:"sequence_base_fee"` @@ -47,4 +58,5 @@ type Fees struct { InitBridgeAccountBaseFee int64 `json:"init_bridge_account_base_fee"` BridgeLockByteCostMultiplier int64 `json:"bridge_lock_byte_cost_multiplier"` Ics20WithdrawalBaseFee int64 `json:"ics20_withdrawal_base_fee"` + BridgeSudoChangeFee int64 `json:"bridge_sudo_change_fee"` } diff --git a/test/json/genesis.json b/test/json/genesis.json index c792419..56c37bb 100644 --- a/test/json/genesis.json +++ b/test/json/genesis.json @@ -1,15 +1,15 @@ { - "genesis_time": "2023-09-22T17:22:35.092832Z", - "chain_id": "astria-dusk-2-final", + "genesis_time": "2024-05-20T00:49:11.964127Z", + "chain_id": "astria-dusk-8", "initial_height": "1", "consensus_params": { "block": { - "max_bytes": "22020096", + "max_bytes": "1048576", "max_gas": "-1" }, "evidence": { - "max_age_num_blocks": "100000", - "max_age_duration": "172800000000000", + "max_age_num_blocks": "4000000", + "max_age_duration": "1209600000000000", "max_bytes": "1048576" }, "validator": { @@ -19,50 +19,108 @@ }, "version": { "app": "0" + }, + "abci": { + "vote_extensions_enable_height": "0" } }, "validators": [ { - "address": "230592632006DB2733444BB6DE11DB3F4B2F9AE4", + "address": "FDDBAF2EFB176DD25A3EDDE9106E78D329A38562", "pub_key": { "type": "tendermint/PubKeyEd25519", - "value": "MkFfCdvuQpfMmoQcLCMSv5A/xTxIhg14iuZglzVaWF8=" + "value": "U46eweNkf5swUyu45cK0qABsaxFoPL7OK+Hqqahr8fg=" }, "power": "1", "name": "node0" }, { - "address": "6F35496BCC8CF0EF9E2AC090FAEF578152549518", + "address": "2F5AEE50975F56F59C4C5248277CB1E4A8320593", "pub_key": { "type": "tendermint/PubKeyEd25519", - "value": "CeKTMbL61MvTZ5hoA0hKL1REQUhejnNhEtKtSbg2Vso=" + "value": "pJeqSiLKgjKHYIKSCxEGeJiMhhlLDC4SoE3Pb1Noi7I=" }, "power": "1", "name": "node1" }, { - "address": "115F94D8C98FFD73FE65182611140F0EDC7C3C94", + "address": "C8FAD5B264F7D5B5446978E96AEC3549E41F1353", "pub_key": { "type": "tendermint/PubKeyEd25519", - "value": "lvQ6hEiSjx5YCGTWn+ROCTxagqHUqAxZCG1+Z5ds2kU=" + "value": "/zck8pXQM9AzdBaDsfaoTkRxQgQQyGoCC3q1Ohirlbc=" }, "power": "1", "name": "node2" + }, + { + "address": "0DC9BAF2CB94F4897F2A569EF2A33EE1D4E7B50B", + "pub_key": { + "type": "tendermint/PubKeyEd25519", + "value": "E6gYdFSWp8SQYd60JSZBhADZgB8lV8FAbqsmAvX6RPY=" + }, + "power": "1", + "name": "node3" } ], "app_hash": "", "app_state": { + "native_asset_base_denomination": "nria", + "fees": { + "transfer_base_fee": 12, + "sequence_base_fee": 32, + "sequence_byte_cost_multiplier": 1, + "init_bridge_account_base_fee": 48, + "bridge_lock_byte_cost_multiplier": 1, + "bridge_sudo_change_fee": 24, + "ics20_withdrawal_base_fee": 24 + }, + "allowed_fee_assets": [], + "ibc_params": { + "ibc_enabled": true, + "inbound_ics20_transfers_enabled": true, + "outbound_ics20_transfers_enabled": true + }, + "address_prefixes": { + "base": "astria" + }, "accounts": [ { - "address": "3fff1c39b9d163bfb9bcbf9dfea78675f1b4bc2c", - "balance": 500000000000000000000 + "address": { + "bech32m": "astria1c220qfmjrwqlk939ca5a5z2rjxryyr9m3ah8gl" + }, + "balance": 333333333333333333 + }, + { + "address": { + "bech32m": "astria16rgmx2s86kk2r69rhjnvs9y44ujfhadc7yav9a" + }, + "balance": 340282366920938463463374607431768211455 + }, + { + "address": { + "bech32m": "astria1475jkpuvznd44szgfz8wwdf9w6xh5dx9jwqgvz" + }, + "balance": 333333333333333333 }, { - "address": "2e046327a2ccac7c8f8018ed44e43184b502eb3e", - "balance": 500000000000000000000 + "address": { + "bech32m": "astria1lhpxecq5ffhq68dgu9s8y2g5h53jqw5cvudrkk" + }, + "balance": 333333333333333333 + }, + { + "address": { + "bech32m": "astria1lm45urgugesyhaymn68xww0m6g49zreqa32w7p" + }, + "balance": 60 } ], - "authority_sudo_key": "1c0c490f1b5528d8173c5de46d131160e4b2c0c3", - "native_asset_base_denomination": "nria" + "authority_sudo_address": { + "bech32m": "astria1e9q7egqgz8rz6aej8nr57swqgaeujhz04vd9q5" + }, + "ibc_sudo_address": { + "bech32m": "astria1y2250n7jwv9ejfuqflt53v0p7skq6hhvvrcrey" + }, + "ibc_relayer_addresses": [] } } \ No newline at end of file