diff --git a/.golangci.yml b/.golangci.yml index f0674989..3da1aa7a 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -130,6 +130,7 @@ linters: - ineffassign - staticcheck - typecheck + - dupl - unused - asasalint - asciicheck @@ -203,16 +204,16 @@ issues: - funlen - forbidigo - gochecknoinits - - path: "ent" + - path: ".generated.go" linters: - - gomnd - - forbidigo - - path: "config" + - typecheck + - path: "_mock.go" linters: - - gomnd + - staticcheck - path: "_test\\.go" linters: - bodyclose + - exhaustive - funlen - goconst - gocognit diff --git a/cmd/handler/broker.go b/cmd/handler/broker.go index 75cfd845..dc05b765 100644 --- a/cmd/handler/broker.go +++ b/cmd/handler/broker.go @@ -3,7 +3,7 @@ package handler import ( "github.com/TimeleapLabs/unchained/internal/app" "github.com/TimeleapLabs/unchained/internal/config" - "github.com/TimeleapLabs/unchained/internal/log" + "github.com/TimeleapLabs/unchained/internal/utils" "github.com/spf13/cobra" ) @@ -18,7 +18,7 @@ var broker = &cobra.Command{ panic(err) } - log.Start(config.App.System.Log) + utils.SetupLogger(config.App.System.Log) app.Broker() }, } diff --git a/cmd/handler/consumer.go b/cmd/handler/consumer.go index 1f2e5050..e8066f24 100644 --- a/cmd/handler/consumer.go +++ b/cmd/handler/consumer.go @@ -3,7 +3,7 @@ package handler import ( "github.com/TimeleapLabs/unchained/internal/app" "github.com/TimeleapLabs/unchained/internal/config" - "github.com/TimeleapLabs/unchained/internal/log" + "github.com/TimeleapLabs/unchained/internal/utils" "github.com/spf13/cobra" ) @@ -24,7 +24,7 @@ var consumer = &cobra.Command{ panic(err) } - log.Start(config.App.System.Log) + utils.SetupLogger(config.App.System.Log) app.Consumer() }, } diff --git a/cmd/handler/worker.go b/cmd/handler/worker.go index 24ab146d..c4f12148 100644 --- a/cmd/handler/worker.go +++ b/cmd/handler/worker.go @@ -3,7 +3,7 @@ package handler import ( "github.com/TimeleapLabs/unchained/internal/app" "github.com/TimeleapLabs/unchained/internal/config" - "github.com/TimeleapLabs/unchained/internal/log" + "github.com/TimeleapLabs/unchained/internal/utils" "github.com/spf13/cobra" ) @@ -23,7 +23,7 @@ var worker = &cobra.Command{ panic(err) } - log.Start(config.App.System.Log) + utils.SetupLogger(config.App.System.Log) app.Worker() }, } diff --git a/cmd/main.go b/cmd/main.go index 6b0dbd4a..2182159f 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -6,7 +6,7 @@ import ( "github.com/TimeleapLabs/unchained/cmd/handler" "github.com/TimeleapLabs/unchained/internal/config" - "github.com/TimeleapLabs/unchained/internal/constants" + "github.com/TimeleapLabs/unchained/internal/consts" "github.com/spf13/cobra" ) @@ -17,7 +17,7 @@ var root = &cobra.Command{ Long: `Unchained is the universal data validation and processing protocol`, Run: func(_ *cobra.Command, _ []string) { if config.App.System.PrintVersion { - fmt.Println(constants.Version) + fmt.Println(consts.Version) } else { os.Exit(1) } diff --git a/go.mod b/go.mod index 894ab4df..a5b70934 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,8 @@ require ( github.com/lib/pq v1.10.9 github.com/lmittmann/tint v1.0.4 github.com/mattn/go-colorable v0.1.13 - github.com/pouya-eghbali/go-sia/v2 v2.0.0 + github.com/peterldowns/pgtestdb v0.0.14 + github.com/pouya-eghbali/go-sia/v2 v2.1.0 github.com/puzpuzpuz/xsync/v3 v3.1.0 github.com/spf13/cobra v1.8.0 github.com/stretchr/testify v1.9.0 @@ -33,15 +34,26 @@ require ( require ( ariga.io/atlas v0.20.0 // indirect github.com/BurntSushi/toml v1.3.2 // indirect + github.com/DataDog/zstd v1.4.5 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect + github.com/VictoriaMetrics/fastcache v1.12.1 // indirect github.com/agext/levenshtein v1.2.3 // indirect github.com/agnivade/levenshtein v1.1.1 // indirect github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect + github.com/beorn7/perks v1.0.1 // indirect github.com/bits-and-blooms/bitset v1.13.0 // indirect github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/cockroachdb/errors v1.8.1 // indirect + github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f // indirect + github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593 // indirect + github.com/cockroachdb/redact v1.0.8 // indirect + github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 // indirect + github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect github.com/consensys/bavard v0.1.13 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect + github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233 // indirect github.com/crate-crypto/go-kzg-4844 v0.7.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/deckarep/golang-set/v2 v2.6.0 // indirect @@ -49,10 +61,15 @@ require ( github.com/dgraph-io/ristretto v0.1.1 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/ethereum/c-kzg-4844 v1.0.0 // indirect + github.com/fjl/memsize v0.0.2 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff // indirect + github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46 // indirect github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-openapi/inflect v0.21.0 // indirect + github.com/gofrs/flock v0.8.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang-jwt/jwt/v4 v4.5.0 // indirect github.com/golang/glog v1.2.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.4 // indirect @@ -61,30 +78,55 @@ require ( github.com/google/go-cmp v0.6.0 // indirect github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/go-bexpr v0.1.10 // indirect github.com/hashicorp/hcl/v2 v2.20.0 // indirect + github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 // indirect + github.com/holiman/bloomfilter/v2 v2.0.3 // indirect github.com/holiman/uint256 v1.2.4 // indirect + github.com/huin/goupnp v1.3.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect github.com/jackc/puddle/v2 v2.2.1 // indirect + github.com/jackpal/go-nat-pmp v1.0.2 // indirect github.com/joho/godotenv v1.5.1 // indirect github.com/jonboulle/clockwork v0.4.0 // indirect github.com/klauspost/compress v1.17.7 // indirect + github.com/kr/pretty v0.3.1 // indirect + github.com/kr/text v0.2.0 // indirect github.com/mattn/go-isatty v0.0.20 // indirect + github.com/mattn/go-runewidth v0.0.13 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect github.com/mitchellh/go-wordwrap v1.0.1 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect + github.com/mitchellh/pointerstructure v1.2.0 // indirect github.com/mmcloughlin/addchain v0.4.0 // indirect + github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/prometheus/client_golang v1.12.0 // indirect + github.com/prometheus/client_model v0.2.1-0.20210607210712-147c58e9608a // indirect + github.com/prometheus/common v0.32.1 // indirect + github.com/prometheus/procfs v0.7.3 // indirect + github.com/rivo/uniseg v0.2.0 // indirect github.com/robfig/cron/v3 v3.0.1 // indirect + github.com/rogpeppe/go-internal v1.9.0 // indirect + github.com/rs/cors v1.7.0 // indirect + github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/shirou/gopsutil v3.21.11+incompatible // indirect github.com/sosodev/duration v1.2.0 // indirect github.com/spf13/pflag v1.0.5 // indirect + github.com/status-im/keycard-go v0.2.0 // indirect + github.com/stretchr/objx v0.5.2 // indirect github.com/supranational/blst v0.3.11 // indirect + github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect github.com/tklauser/go-sysconf v0.3.13 // indirect github.com/tklauser/numcpus v0.7.0 // indirect + github.com/tyler-smith/go-bip39 v1.1.0 // indirect + github.com/urfave/cli/v2 v2.27.1 // indirect github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect + github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect github.com/zclconf/go-cty v1.14.4 // indirect go.opencensus.io v0.24.0 // indirect @@ -95,6 +137,7 @@ require ( golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.19.0 // indirect google.golang.org/protobuf v1.33.0 // indirect + gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect olympos.io/encoding/edn v0.0.0-20201019073823-d3554ca0b0a3 // indirect rsc.io/tmplfunc v0.0.3 // indirect ) diff --git a/go.sum b/go.sum index 30891c2b..2ea0c99e 100644 --- a/go.sum +++ b/go.sum @@ -1,24 +1,63 @@ ariga.io/atlas v0.20.0 h1:b2dL/OIubrCDKDUUXtudS+lJjoTzzKsTamfEg0VkcPI= ariga.io/atlas v0.20.0/go.mod h1:VPlcXdd4w2KqKnH54yEZcry79UAhpaWaxEsmn5JRNoE= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= +cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= +cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= +cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= +cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= +cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= +cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= +cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= +cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= +cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= +cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= +cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= +cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= +cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= +cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= +cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= +cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= +cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= entgo.io/contrib v0.4.6-0.20240215171353-eff33e4dca0b h1:jJwnBBJavk5NfJNyg8fvEVp+BUHewhFOlWe4C8IXvh4= entgo.io/contrib v0.4.6-0.20240215171353-eff33e4dca0b/go.mod h1:q8dXQCmzqpSlVdT2bWDydjgznGcy3y4zmsYmVFC9V/U= entgo.io/ent v0.13.1 h1:uD8QwN1h6SNphdCCzmkMN3feSUzNnVvV/WIkHKMbzOE= entgo.io/ent v0.13.1/go.mod h1:qCEmo+biw3ccBn9OyL4ZK5dfpwg++l1Gxwac5B1206A= github.com/99designs/gqlgen v0.17.45 h1:bH0AH67vIJo8JKNKPJP+pOPpQhZeuVRQLf53dKIpDik= github.com/99designs/gqlgen v0.17.45/go.mod h1:Bas0XQ+Jiu/Xm5E33jC8sES3G+iC2esHBMXcq0fUPs0= +github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/CloudyKit/fastprinter v0.0.0-20170127035650-74b38d55f37a/go.mod h1:EFZQ978U7x8IRnstaskI3IysnWY5Ao3QgZUKOXlsAdw= +github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible/go.mod h1:HPYO+50pSWkPoj9Q/eq0aRGByCL6ScRlUmiEX5Zgm+w= github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ= github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= +github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY= +github.com/Joker/jade v1.0.1-0.20190614124447-d475f43051e7/go.mod h1:6E6s8o2AE4KhCrqr6GRJjdC/gNfTdxkIXvuGZZda2VM= 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/PuerkitoBio/goquery v1.9.1 h1:mTL6XjbJTZdpfL+Gwl5U2h1l9yEkJjhmlTeV9VPW7UI= github.com/PuerkitoBio/goquery v1.9.1/go.mod h1:cW1n6TmIMDoORQU5IU/P1T3tGFunOeXEpGP2WHRwkbY= +github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0= github.com/VictoriaMetrics/fastcache v1.12.1 h1:i0mICQuojGDL3KblA7wUNlY5lOK6a4bwt3uRKnkZU40= github.com/VictoriaMetrics/fastcache v1.12.1/go.mod h1:tX04vaqcNoQeGLD+ra5pU5sWkuxnzWhEzLwhP9w653o= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= @@ -26,6 +65,14 @@ github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7l github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/agnivade/levenshtein v1.1.1 h1:QY8M92nrzkmr798gCo3kmMyqXFzdQVpxLlGPRBij0P8= github.com/agnivade/levenshtein v1.1.1/go.mod h1:veldBMzWxcCG2ZvUTKD2kJNRdCk5hVbJomOvKkmgYbo= +github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= +github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8= +github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/andybalholm/cascadia v1.3.2 h1:3Xi6Dw5lHF15JtdcmAHD3i1+T8plmv7BQ/nsViSLyss= @@ -34,6 +81,10 @@ github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4= github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0 h1:jfIu9sQUG6Ig+0+Ap1h4unLjW6YQJpKZVmUzxsD4E/Q= github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0/go.mod h1:t2tdKJDJF9BV14lnkjHmOQgcvEKgtqs5a1N3LNdJhGE= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bits-and-blooms/bitset v1.13.0 h1:bAQ9OPNFYbGHV6Nez0tmNI0RiEu7/hxlYJRUA0wFAVE= @@ -56,10 +107,18 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk= github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= 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/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cockroachdb/datadriven v1.0.0/go.mod h1:5Ib8Meh+jk1RlHIXej6Pzevx/NLlNvQB9pmSBZErGA4= +github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f h1:otljaYPt5hWxV3MUfO5dFPFiOXg9CyG5/kCfayTqsJ4= +github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= +github.com/cockroachdb/errors v1.6.1/go.mod h1:tm6FTP5G81vwJ5lC0SizQo374JNCOPrHyXGitRJoDqM= github.com/cockroachdb/errors v1.8.1 h1:A5+txlVZfOqFBDa4mGz2bUWSp0aHElvHX2bKkdbQu+Y= github.com/cockroachdb/errors v1.8.1/go.mod h1:qGwQn6JmZ+oMjuLwjWzUNqblqk0xl4CVV3SQbGwK7Ac= github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f h1:o/kfcElHqOiXqcou5a3rIlMc7oJbMQkeLk0VQJ7zgqY= @@ -72,16 +131,22 @@ github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 h1:IKgmqgMQlVJIZj19CdocBeS github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2/go.mod h1:8BT+cPK6xvFOcRlk0R8eg+OTkcqI6baNH4xAkpiYVvQ= github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= +github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= github.com/consensys/bavard v0.1.13 h1:oLhMLOFGTLdlda/kma4VOJazblc7IM5y5QPd2A/YjhQ= github.com/consensys/bavard v0.1.13/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI= github.com/consensys/gnark-crypto v0.12.1 h1:lHH39WuuFgVHONRl3J0LRBtuYdQTumFSDtJF7HpyG8M= github.com/consensys/gnark-crypto v0.12.1/go.mod h1:v2Gy7L/4ZRosZ7Ivs+9SfUDr0f5UlG+EM5t7MPHiLuY= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.3 h1:qMCsGGgs+MAzDFyp9LpAe1Lqy/fY/qCovCm0qnXZOBM= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233 h1:d28BXYi+wUpz1KBmiF9bWrjEMacUEREV6MBi2ODnrfQ= github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233/go.mod h1:geZJZH3SzKCqnz5VT0q/DyIG/tvu/dZk+VIfXicupJs= github.com/crate-crypto/go-kzg-4844 v0.7.0 h1:C0vgZRk4q4EZ/JgPfzuSoxdCq3C3mOZMBShovmncxvA= github.com/crate-crypto/go-kzg-4844 v0.7.0/go.mod h1:1kMhvPgI0Ky3yIa+9lFySEBUBXkYxeOi8ZF1sYioxhc= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -93,10 +158,12 @@ github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5il 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/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4= github.com/dgraph-io/badger/v4 v4.2.0 h1:kJrlajbXXL9DFTNuhhu9yCx7JJa4qpYWxtE8BzuWsEs= github.com/dgraph-io/badger/v4 v4.2.0/go.mod h1:qfCqhPoWDFJRx1gp5QwwyGo8xk1lbHUxvK9nK0OGAak= github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8= github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48 h1:fRzb/w+pyskVMQ+UbP35JkH8yB7MYb4q/qhBarqZE6g= @@ -104,74 +171,144 @@ github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48/go.mod h1:if7Fbed8 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= +github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw= github.com/ethereum/c-kzg-4844 v1.0.0 h1:0X1LBXxaEtYD9xsyj9B9ctQEZIpnvVDeoBx8aHEwTNA= github.com/ethereum/c-kzg-4844 v1.0.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0= github.com/ethereum/go-ethereum v1.13.14 h1:EwiY3FZP94derMCIam1iW4HFVrSgIcpsu0HwTQtm6CQ= github.com/ethereum/go-ethereum v1.13.14/go.mod h1:TN8ZiHrdJwSe8Cb6x+p0hs5CxhJZPbqB7hHkaUXcmIU= +github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8= +github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/fjl/memsize v0.0.2 h1:27txuSD9or+NZlnOWdKUxeBzTAUkWCVh+4Gf2dWFOzA= github.com/fjl/memsize v0.0.2/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= +github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4/go.mod h1:T9YF2M40nIgbVgp3rreNmTged+9HrbNTIQf1PsaIiTA= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc= github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff h1:tY80oXqGNY4FhTFhk+o9oFHGINQ/+vhlm8HFzi6znCI= github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46 h1:BAIP2GihuqhwdILrV+7GJel5lyPV3u1+PgzrWLc0TkE= github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46/go.mod h1:QNpY22eby74jVhqH4WhDLDwxc/vqsern6pW+u2kbkpc= +github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s= +github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM= +github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98= github.com/go-co-op/gocron/v2 v2.2.6 h1:sKRt4kemEzY9HnBx9BBnFDPXoOxBy77V4WVtoouhJgg= github.com/go-co-op/gocron/v2 v2.2.6/go.mod h1:mZx3gMSlFnb97k3hRqX3+GdlG3+DUwTh6B8fnsTScXg= +github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w= +github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= github.com/go-openapi/inflect v0.21.0 h1:FoBjBTQEcbg2cJUWX6uwL9OyIW8eqc9k4KhN4lfbeYk= github.com/go-openapi/inflect v0.21.0/go.mod h1:INezMuUu7SJQc2AyR3WO0DqqYUJSj8Kb4hBd7WtjlAw= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= +github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= +github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= +github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= +github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/gogo/status v1.1.0/go.mod h1:BFv9nrluPLmrS0EmGVvLaPNmRosr9KapBYd5/hpY1WM= github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.2.0 h1:uCdmnmatrKCgMBlM4rMuJZWOkPDqdbZPnrMXDY4gI68= github.com/golang/glog v1.2.0/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/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.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +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= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +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.2/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.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb h1:PBC98N2aIaM3XXiurYmW7fx4GZkL8feAMVq7nEjURHk= github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/flatbuffers v24.3.7+incompatible h1:BxGUkIQnOciBu33bd5BdvqY8Qvo0O/GR4SPhh7x9Ed0= github.com/google/flatbuffers v24.3.7+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= 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= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 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/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -181,8 +318,12 @@ github.com/hashicorp/go-bexpr v0.1.10 h1:9kuI5PFotCboP3dkDYFr/wi0gg0QVbSNz5oFRpx github.com/hashicorp/go-bexpr v0.1.10/go.mod h1:oxlubA2vC/gFVfX1A6JGp7ls7uCDlfJn732ehYYg+g0= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= +github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/hcl/v2 v2.20.0 h1:l++cRs/5jQOiKVvqXZm/P1ZEfVXJmvLS9WSVxkaeTb4= github.com/hashicorp/hcl/v2 v2.20.0/go.mod h1:WmcD/Ym72MDOOx5F62Ly+leloeu6H7m0pG7VBiU6pQk= github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 h1:X4egAf/gcS1zATw6wn4Ej8vjuVGxeHdan+bRb2ebyv4= @@ -194,10 +335,18 @@ github.com/holiman/uint256 v1.2.4/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXei github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc= github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= +github.com/hydrogen18/memlistener v0.0.0-20141126152155-54553eb933fb/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE= +github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ilyakaznacheev/cleanenv v1.5.0 h1:0VNZXggJE2OYdXE87bfSSwGxeiGt9moSR2lOrsHHvr4= github.com/ilyakaznacheev/cleanenv v1.5.0/go.mod h1:a5aDzaJrLCQZsazHol1w8InnDcOX0OColm64SlIi6gk= +github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI= +github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0= +github.com/iris-contrib/i18n v0.0.0-20171121225848-987a633949d0/go.mod h1:pMCz62A0xJL6I+umB2YTlFRwWXaDFA0jy+5HzGiJjqI= +github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk= @@ -213,37 +362,81 @@ github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST4RZ4= github.com/jonboulle/clockwork v0.4.0/go.mod h1:xgRqUGwRcjKCO1vbZUEtSLrqKoPSsUpK7fnezOII0kc= +github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/juju/errors v0.0.0-20181118221551-089d3ea4e4d5/go.mod h1:W54LbzXuIE0boCoNJfwqpmkKJ1O4TCTZMetAt6jGk7Q= +github.com/juju/loggo v0.0.0-20180524022052-584905176618/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U= +github.com/juju/testing v0.0.0-20180920084828-472a3e8b2073/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= +github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= +github.com/kataras/golog v0.0.9/go.mod h1:12HJgwBIZFNGL0EJnMRhmvGA0PQGx8VFwrZtM4CqbAk= +github.com/kataras/iris/v12 v12.0.1/go.mod h1:udK4vLQKkdDqMGJJVd/msuMtN6hpYJhg/lSzuxjhO+U= +github.com/kataras/neffos v0.0.10/go.mod h1:ZYmJC07hQPW67eKuzlfY7SO3bC0mw83A3j6im82hfqw= +github.com/kataras/pio v0.0.0-20190103105442-ea782b38602d/go.mod h1:NV88laa9UiiDuX9AhMbDPkGYSPugBOV6yTZB1l2K9Z0= +github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= +github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= +github.com/klauspost/compress v1.9.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg= github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +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= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/labstack/echo/v4 v4.1.11/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvfxNnFqi74g= +github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c= github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lmittmann/tint v1.0.4 h1:LeYihpJ9hyGvE0w+K2okPTGUdVLfng1+nDNVR4vWISc= github.com/lmittmann/tint v1.0.4/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU= github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y= github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= +github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/mediocregopher/mediocre-go-lib v0.0.0-20181029021733-cb65787f37ed/go.mod h1:dSsfyI2zABAdhcbvkXqgxOxrCsbYeHCPgrZkku60dSg= +github.com/mediocregopher/radix/v3 v3.3.0/go.mod h1:EmfVyvspXz1uZEyPBMyGK+kjWiKQGvsUt6O3Pj+LDCQ= +github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0= github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/pointerstructure v1.2.0 h1:O+i9nHnXS3l/9Wu7r4NrEdwA2VFTicjUEN1uBnDo34A= @@ -251,25 +444,69 @@ github.com/mitchellh/pointerstructure v1.2.0/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8oh github.com/mmcloughlin/addchain v0.4.0 h1:SobOdjm2xLj1KkXN5/n0xTIWyZA2+s99UCY1iPfkHRY= github.com/mmcloughlin/addchain v0.4.0/go.mod h1:A86O+tHqZLMNO4w6ZZ4FlVQEadcoqkyU72HC5wJ4RlU= github.com/mmcloughlin/profile v0.1.1/go.mod h1:IhHD7q1ooxgwTgjxQYkACGA77oFTDdFVejUS1/tS/qU= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/nats-io/nats.go v1.8.1/go.mod h1:BrFz9vVn0fU3AcH9Vn4Kd7W0NpJ651tD5omQ3M8LwxM= +github.com/nats-io/nkeys v0.0.2/go.mod h1:dab7URMsZm6Z/jp9Z5UGa87Uutgc2mVpXLC4B7TDb/4= +github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= +github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= +github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0= +github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA= +github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/peterldowns/pgtestdb v0.0.14 h1:myVNL8ethaPZG7CQIjZxZCXwOG428THYRbSm0mIelpU= +github.com/peterldowns/pgtestdb v0.0.14/go.mod h1:aG99+zgvWKOdGH+vtEFTDNVmaPOJD8ldIleuwJOgacA= +github.com/peterldowns/testy v0.0.1 h1:9a6LzvnKcL52Crzud1z7jbsAojTntCh89ho6mgsr4KU= +github.com/peterldowns/testy v0.0.1/go.mod h1:J4sm75UEzbfBIcq0zbrshWWjsJQiJ5RrhTPYKVY2Ww8= +github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= +github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= 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/pouya-eghbali/go-sia/v2 v2.0.0 h1:pks5GJlrEJSBc1gmfTQ7bM9jKpfSrwjR0jQYozilf64= -github.com/pouya-eghbali/go-sia/v2 v2.0.0/go.mod h1:Dfq83SuDGfQOmbwaA9/yKqFOwtzr30gySYO+f+7WjH0= +github.com/pouya-eghbali/go-sia/v2 v2.1.0 h1:LdATSKXsEIhdZAoXRqfHJba+iIPjb8dhmRz3a11QFCA= +github.com/pouya-eghbali/go-sia/v2 v2.1.0/go.mod h1:E+hUvytS6uLa+HSBY+oi19zPvVGZdVzWSVW9zwzZnr8= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= +github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.0 h1:C+UIj/QWtmqY13Arb8kwMt5j34/0Z2iKamrJ+ryC0Gg= github.com/prometheus/client_golang v1.12.0/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.1-0.20210607210712-147c58e9608a h1:CmF68hwI0XsOQ5UwlBopMi2Ow4Pbg32akc4KIVCOm+Y= github.com/prometheus/client_model v0.2.1-0.20210607210712-147c58e9608a/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= +github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/puzpuzpuz/xsync/v3 v3.1.0 h1:EewKT7/LNac5SLiEblJeUu8z5eERHrmRLnMQL2d7qX4= @@ -278,29 +515,48 @@ github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= +github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= +github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I= github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI= github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/sosodev/duration v1.2.0 h1:pqK/FLSjsAADWY74SyWDCjOcd5l7H8GSnnOGEB9A1Us= github.com/sosodev/duration v1.2.0/go.mod h1:RQIBBX0+fMLc/D9+Jb/fwvVmo0eZvDDEERAikUR6SDg= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/status-im/keycard-go v0.2.0 h1:QDLFswOQu1r5jsycloeQh3bVU8n/NatHHaZobtDnDzA= github.com/status-im/keycard-go v0.2.0/go.mod h1:wlp8ZLbsmrF6g6WjugPAx+IzoLrkdf9+mHxBEeo3Hbg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -319,39 +575,90 @@ github.com/tklauser/numcpus v0.7.0 h1:yjuerZP127QG9m5Zh/mSO4wqurYil27tHrqwRoRjpr github.com/tklauser/numcpus v0.7.0/go.mod h1:bb6dMVcj8A42tSE7i32fsIUCbQNllK5iDguyOZRUzAY= github.com/tyler-smith/go-bip39 v1.1.0 h1:5eUemwrMargf3BSLRRCalXT93Ns6pQJIjYQN2nyfOP8= github.com/tyler-smith/go-bip39 v1.1.0/go.mod h1:gUYDtqQw1JS3ZJ8UWVcGTGqqr6YIN3CWg+kkNaLt55U= +github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/urfave/cli/v2 v2.27.1 h1:8xSQ6szndafKVRmfyeUMxkNUJQMjL1F2zmsZ+qHpfho= github.com/urfave/cli/v2 v2.27.1/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ= +github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w= +github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= +github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= github.com/vektah/gqlparser/v2 v2.5.11 h1:JJxLtXIoN7+3x6MBdtIP59TP1RANnY7pXOaDnADQSf8= github.com/vektah/gqlparser/v2 v2.5.11/go.mod h1:1rCcfwB2ekJofmluGWXMSEnPMZgbxzwj6FaZ/4OT8Cc= github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IUPn0Bjt8= github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok= github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g= github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= +github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= +github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI= +github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= +github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= +github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= github.com/zclconf/go-cty v1.14.4 h1:uXXczd9QDGsgu0i/QFR/hzI5NYCHLf6NQw/atrbnhq8= github.com/zclconf/go-cty v1.14.4/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= 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/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= +golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20240318143956-a85f2c67cd81 h1:6R2FC06FonbXQ8pK11/PDFY6N6LWlf9KlzibaCapmqc= golang.org/x/exp v0.0.0-20240318143956-a85f2c67cd81/go.mod h1:CQ1k9gNrJ50XIzaKCRR2hssIjF07kZFEiieALBM/ARQ= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= 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-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= +golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= 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.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic= @@ -359,64 +666,248 @@ golang.org/x/mod v0.16.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= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= 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-20190227155943-e225da77a7e6/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-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/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-20201207232520-09787c993a3a/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.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= golang.org/x/sync v0.6.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-20180905080454-ebe1bf3edb33/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-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.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/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= 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.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= 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= +golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190327201419-c70d86f8b7cf/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw= golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc= 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= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= +google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= +google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= +google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= +google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= +google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= 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= @@ -426,26 +917,48 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= +gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y= +gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= olympos.io/encoding/edn v0.0.0-20201019073823-d3554ca0b0a3 h1:slmdOY3vp8a7KQbHkL+FLbvbkgMqmXojpFUO/jENuqQ= olympos.io/encoding/edn v0.0.0-20201019073823-d3554ca0b0a3/go.mod h1:oVgVk4OWVDi43qWBEyGhXgYxt7+ED4iYNpTngSLX2Iw= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= +rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= rsc.io/tmplfunc v0.0.3 h1:53XFQh69AfOa8Tw0Jm7t+GV7KZhOi6jzsCzTtKbMvzU= rsc.io/tmplfunc v0.0.3/go.mod h1:AG3sTPzElb1Io3Yg4voV9AGZJuleGAwaVRxL9M49PhA= diff --git a/internal/app/broker.go b/internal/app/broker.go index 16f40832..cff0fa36 100644 --- a/internal/app/broker.go +++ b/internal/app/broker.go @@ -1,21 +1,21 @@ package app import ( - "github.com/TimeleapLabs/unchained/internal/constants" + "github.com/TimeleapLabs/unchained/internal/consts" "github.com/TimeleapLabs/unchained/internal/crypto" "github.com/TimeleapLabs/unchained/internal/crypto/ethereum" - "github.com/TimeleapLabs/unchained/internal/log" - "github.com/TimeleapLabs/unchained/internal/pos" + "github.com/TimeleapLabs/unchained/internal/service/pos" "github.com/TimeleapLabs/unchained/internal/transport/server" "github.com/TimeleapLabs/unchained/internal/transport/server/websocket" + "github.com/TimeleapLabs/unchained/internal/utils" ) // Broker starts the Unchained broker and contains its DI. func Broker() { - log.Logger. + utils.Logger. With("Mode", "Broker"). - With("Version", constants.Version). - With("Protocol", constants.ProtocolVersion). + With("Version", consts.Version). + With("Protocol", consts.ProtocolVersion). Info("Running Unchained") crypto.InitMachineIdentity( diff --git a/internal/app/consumer.go b/internal/app/consumer.go index e18cbcee..726a798d 100644 --- a/internal/app/consumer.go +++ b/internal/app/consumer.go @@ -1,28 +1,29 @@ package app import ( - "github.com/TimeleapLabs/unchained/internal/constants" + "github.com/TimeleapLabs/unchained/internal/consts" "github.com/TimeleapLabs/unchained/internal/crypto" "github.com/TimeleapLabs/unchained/internal/crypto/ethereum" - "github.com/TimeleapLabs/unchained/internal/db" - "github.com/TimeleapLabs/unchained/internal/log" - "github.com/TimeleapLabs/unchained/internal/pos" + postgresRepo "github.com/TimeleapLabs/unchained/internal/repository/postgres" correctnessService "github.com/TimeleapLabs/unchained/internal/service/correctness" evmlogService "github.com/TimeleapLabs/unchained/internal/service/evmlog" + "github.com/TimeleapLabs/unchained/internal/service/pos" uniswapService "github.com/TimeleapLabs/unchained/internal/service/uniswap" "github.com/TimeleapLabs/unchained/internal/transport/client" "github.com/TimeleapLabs/unchained/internal/transport/client/conn" "github.com/TimeleapLabs/unchained/internal/transport/client/handler" + "github.com/TimeleapLabs/unchained/internal/transport/database/postgres" "github.com/TimeleapLabs/unchained/internal/transport/server" "github.com/TimeleapLabs/unchained/internal/transport/server/gql" + "github.com/TimeleapLabs/unchained/internal/utils" ) // Consumer starts the Unchained consumer and contains its DI. func Consumer() { - log.Logger. + utils.Logger. With("Mode", "Consumer"). - With("Version", constants.Version). - With("Protocol", constants.ProtocolVersion). + With("Version", consts.Version). + With("Protocol", consts.ProtocolVersion). Info("Running Unchained") crypto.InitMachineIdentity( @@ -32,11 +33,16 @@ func Consumer() { ethRPC := ethereum.New() pos := pos.New(ethRPC) - db.Start() + db := postgres.New() - correctnessService := correctnessService.New(ethRPC, pos) - evmLogService := evmlogService.New(ethRPC, pos) - uniswapService := uniswapService.New(ethRPC, pos) + eventLogRepo := postgresRepo.NewEventLog(db) + signerRepo := postgresRepo.NewSigner(db) + assetPrice := postgresRepo.NewAssetPrice(db) + correctnessRepo := postgresRepo.NewCorrectness(db) + + correctnessService := correctnessService.New(pos, signerRepo, correctnessRepo) + evmLogService := evmlogService.New(ethRPC, pos, eventLogRepo, signerRepo, nil) + uniswapService := uniswapService.New(ethRPC, pos, signerRepo, assetPrice) conn.Start() @@ -44,6 +50,6 @@ func Consumer() { client.NewRPC(handler) server.New( - gql.WithGraphQL(), + gql.WithGraphQL(db), ) } diff --git a/internal/app/worker.go b/internal/app/worker.go index db50de66..d89cc579 100644 --- a/internal/app/worker.go +++ b/internal/app/worker.go @@ -2,26 +2,26 @@ package app import ( "github.com/TimeleapLabs/unchained/internal/config" - "github.com/TimeleapLabs/unchained/internal/constants" + "github.com/TimeleapLabs/unchained/internal/consts" "github.com/TimeleapLabs/unchained/internal/crypto" "github.com/TimeleapLabs/unchained/internal/crypto/ethereum" - "github.com/TimeleapLabs/unchained/internal/log" - "github.com/TimeleapLabs/unchained/internal/persistence" - "github.com/TimeleapLabs/unchained/internal/pos" + "github.com/TimeleapLabs/unchained/internal/repository/postgres" "github.com/TimeleapLabs/unchained/internal/scheduler" evmlogService "github.com/TimeleapLabs/unchained/internal/service/evmlog" + "github.com/TimeleapLabs/unchained/internal/service/pos" uniswapService "github.com/TimeleapLabs/unchained/internal/service/uniswap" "github.com/TimeleapLabs/unchained/internal/transport/client" "github.com/TimeleapLabs/unchained/internal/transport/client/conn" "github.com/TimeleapLabs/unchained/internal/transport/client/handler" + "github.com/TimeleapLabs/unchained/internal/utils" ) // Worker starts the Unchained worker and contains its DI. func Worker() { - log.Logger. + utils.Logger. With("Mode", "Worker"). - With("Version", constants.Version). - With("Protocol", constants.ProtocolVersion). + With("Version", consts.Version). + With("Protocol", consts.ProtocolVersion). Info("Running Unchained") crypto.InitMachineIdentity( @@ -31,14 +31,18 @@ func Worker() { ethRPC := ethereum.New() pos := pos.New(ethRPC) - badger := persistence.New(config.App.System.ContextPath) - evmLogService := evmlogService.New(ethRPC, pos) - uniswapService := uniswapService.New(ethRPC, pos) + eventLogRepo := postgres.NewEventLog(nil) + signerRepo := postgres.NewSigner(nil) + assetPrice := postgres.NewAssetPrice(nil) + + badger := evmlogService.NewBadger(config.App.System.ContextPath) + evmLogService := evmlogService.New(ethRPC, pos, eventLogRepo, signerRepo, badger) + uniswapService := uniswapService.New(ethRPC, pos, signerRepo, assetPrice) scheduler := scheduler.New( - scheduler.WithEthLogs(evmLogService, ethRPC, badger), - scheduler.WithUniswapEvents(uniswapService, ethRPC), + scheduler.WithEthLogs(evmLogService), + scheduler.WithUniswapEvents(uniswapService), ) conn.Start() diff --git a/internal/config/config.go b/internal/config/config.go index 375a8f27..0533a983 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -3,11 +3,11 @@ package config import ( "os" - pureLog "log" + "github.com/TimeleapLabs/unchained/internal/consts" + "github.com/TimeleapLabs/unchained/internal/utils" - "github.com/TimeleapLabs/unchained/internal/log" + pureLog "log" - "github.com/TimeleapLabs/unchained/internal/constants" "gopkg.in/yaml.v3" "github.com/ilyakaznacheev/cleanenv" @@ -34,7 +34,7 @@ func Load(configPath, secretPath string) error { err = cleanenv.ReadConfig(configPath, &App) if err != nil { - return constants.ErrCantLoadConfig + return consts.ErrCantLoadConfig } err = cleanenv.ReadEnv(&App) @@ -48,19 +48,18 @@ func Load(configPath, secretPath string) error { func (s *Secret) Save() error { yamlData, err := yaml.Marshal(&s) if err != nil { - log.Logger.With("Error", err).Error("Can't marshal secrets to yaml") - return constants.ErrCantWriteSecret + utils.Logger.With("Error", err).Error("Can't marshal secrets to yaml") + return consts.ErrCantWriteSecret } if SecretFilePath == "" { - log.Logger.With("Error", err).Error("SecretFilePath is not defined") - return constants.ErrCantWriteSecret + SecretFilePath = "./secrets.yaml" // #nosec G101 } err = os.WriteFile(SecretFilePath, yamlData, 0600) if err != nil { - log.Logger.With("Error", err).Error("Can't write secret file") - return constants.ErrCantWriteSecret + utils.Logger.With("Error", err).Error("Can't write secret file") + return consts.ErrCantWriteSecret } return nil diff --git a/internal/config/config_test.go b/internal/config/config_test.go index 1b4a9d3f..249ce3e2 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -4,8 +4,9 @@ import ( "os" "testing" + "github.com/TimeleapLabs/unchained/internal/consts" + "github.com/TimeleapLabs/unchained/internal/config" - "github.com/TimeleapLabs/unchained/internal/constants" "github.com/stretchr/testify/assert" ) @@ -18,7 +19,7 @@ var s = config.Secret{ func TestSaveSecret(t *testing.T) { err := s.Save() - assert.Equal(t, constants.ErrCantWriteSecret, err, "Should return error because path of secret is not defined") + assert.Equal(t, consts.ErrCantWriteSecret, err, "Should return error because path of secret is not defined") config.SecretFilePath = "./secret.yaml" err = s.Save() diff --git a/internal/config/model.go b/internal/config/model.go index 111d21a5..b6b13941 100644 --- a/internal/config/model.go +++ b/internal/config/model.go @@ -67,9 +67,10 @@ type ProofOfStake struct { } type Network struct { - Bind string `env:"BIND" env-default:"0.0.0.0:9123" yaml:"bind"` - BrokerURI string `env:"BROKER_URI" env-default:"wss://shinobi.brokers.kenshi.io" yaml:"brokerUri"` - BrokerTimeout time.Duration `env:"BROKER_TIMEOUT" env-default:"3s" yaml:"brokerTimeout"` + Bind string `env:"BIND" env-default:"0.0.0.0:9123" yaml:"bind"` + BrokerURI string `env:"BROKER_URI" env-default:"wss://shinobi.brokers.kenshi.io" yaml:"brokerUri"` + SubscribedChannel string `env:"SUBSCRIBED_CHANNEL" env-default:"unchained:" yaml:"subscribedChannel"` + BrokerTimeout time.Duration `env:"BROKER_TIMEOUT" env-default:"3s" yaml:"brokerTimeout"` } type Postgres struct { diff --git a/internal/constants/opcodes/opcodes.go b/internal/constants/opcodes/opcodes.go deleted file mode 100644 index b64a16da..00000000 --- a/internal/constants/opcodes/opcodes.go +++ /dev/null @@ -1,25 +0,0 @@ -package opcodes - -// TODO: Should we have a Data opcode instead of PriceReport & EventLog? - -type OpCode byte - -const ( - Hello OpCode = iota - KoskChallenge OpCode = 1 - KoskResult OpCode = 2 - - RegisterConsumer OpCode = 3 - - Feedback OpCode = 4 - Error OpCode = 5 - - PriceReport OpCode = 6 - PriceReportBroadcast OpCode = 7 - - EventLog OpCode = 8 - EventLogBroadcast OpCode = 9 - - CorrectnessReport OpCode = 10 - CorrectnessReportBroadcast OpCode = 11 -) diff --git a/internal/consts/channels.go b/internal/consts/channels.go new file mode 100644 index 00000000..178cff37 --- /dev/null +++ b/internal/consts/channels.go @@ -0,0 +1,9 @@ +package consts + +type Channels string + +const ( + ChannelPriceReport Channels = "unchained:price_report" + ChannelEventLog Channels = "unchained:event_log" + ChannelCorrectnessReport Channels = "unchained:correctness_report" +) diff --git a/internal/constants/errors.go b/internal/consts/errors.go similarity index 50% rename from internal/constants/errors.go rename to internal/consts/errors.go index fe717e16..55b0ced9 100644 --- a/internal/constants/errors.go +++ b/internal/consts/errors.go @@ -1,9 +1,8 @@ -package constants +package consts import "errors" var ( - ErrCantSendPacket = errors.New("socket.unreachable") ErrInvalidKosk = errors.New("kosk.invalid") ErrInvalidConfig = errors.New("conf.invalid") ErrKosk = errors.New("kosk.error") @@ -17,4 +16,16 @@ var ( ErrCantLoadSecret = errors.New("can't load secrets") ErrCantLoadConfig = errors.New("can't load config") ErrCantWriteSecret = errors.New("can't write secrets") + ErrTokenNotSupported = errors.New("token not supported") + ErrEventNotSupported = errors.New("event not supported") + ErrTopicNotSupported = errors.New("topic not supported") + ErrDataTooOld = errors.New("data too old") + ErrCantAggregateSignatures = errors.New("can't aggregate signatures") + ErrCantRecoverSignature = errors.New("can't recover signature") + ErrClientNotFound = errors.New("client not found") + ErrSignatureNotfound = errors.New("signature not found") + ErrCantLoadLastBlock = errors.New("can't load last block") + ErrDuplicateSignature = errors.New("duplicate signature") + ErrCrossPriceIsNotZero = errors.New("cross price is not zero") + ErrAlreadySynced = errors.New("already synced") ) diff --git a/internal/constants/constants.go b/internal/consts/meta.go similarity index 75% rename from internal/constants/constants.go rename to internal/consts/meta.go index 11de192d..528747dc 100644 --- a/internal/constants/constants.go +++ b/internal/consts/meta.go @@ -1,4 +1,4 @@ -package constants +package consts var Version = "0.12.0" var ProtocolVersion = "0.12.0" diff --git a/internal/consts/opcodes.go b/internal/consts/opcodes.go new file mode 100644 index 00000000..f0a1c4c0 --- /dev/null +++ b/internal/consts/opcodes.go @@ -0,0 +1,25 @@ +package consts + +// TODO: Should we have a Data opcode instead of PriceReport & EventLog? + +type OpCode byte + +const ( + OpCodeHello OpCode = iota + OpCodeKoskChallenge OpCode = 1 + OpCodeKoskResult OpCode = 2 + + OpCodeRegisterConsumer OpCode = 3 + + OpCodeFeedback OpCode = 4 + OpCodeError OpCode = 5 + + OpCodePriceReport OpCode = 6 + OpCodePriceReportBroadcast OpCode = 7 + + OpCodeEventLog OpCode = 8 + OpCodeEventLogBroadcast OpCode = 9 + + OpCodeCorrectnessReport OpCode = 10 + OpCodeCorrectnessReportBroadcast OpCode = 11 +) diff --git a/internal/crypto/bls/bls.go b/internal/crypto/bls/bls.go index 59223f5f..7b1460db 100644 --- a/internal/crypto/bls/bls.go +++ b/internal/crypto/bls/bls.go @@ -6,18 +6,6 @@ import ( bls12381 "github.com/consensys/gnark-crypto/ecc/bls12-381" ) -func FastVerify( - signature bls12381.G1Affine, - g2Gen bls12381.G2Affine, - invertedHashedMessage bls12381.G1Affine, - publicKey bls12381.G2Affine) (bool, error) { - ok, pairingError := bls12381.PairingCheck( - []bls12381.G1Affine{signature, invertedHashedMessage}, - []bls12381.G2Affine{g2Gen, publicKey}) - - return ok, pairingError -} - func Hash(message []byte) (bls12381.G1Affine, error) { dst := []byte("UNCHAINED") return bls12381.HashToG1(message, dst) diff --git a/internal/crypto/bls/identity.go b/internal/crypto/bls/identity.go index fb3d7ffa..5412f32f 100644 --- a/internal/crypto/bls/identity.go +++ b/internal/crypto/bls/identity.go @@ -72,10 +72,10 @@ func (b *Signer) generateKeyPair() { b.PublicKey = pk } +// Verify verifies the signature of a message belongs to the public key. func (b *Signer) Verify( - signature bls12381.G1Affine, - hashedMessage bls12381.G1Affine, - publicKey bls12381.G2Affine) (bool, error) { + signature bls12381.G1Affine, hashedMessage bls12381.G1Affine, publicKey bls12381.G2Affine, +) (bool, error) { pairingSigG2, err := bls12381.Pair( []bls12381.G1Affine{signature}, []bls12381.G2Affine{b.g2Aff}) diff --git a/internal/crypto/ethereum/rpc.go b/internal/crypto/ethereum/rpc.go index ba1fd065..a3bdf516 100644 --- a/internal/crypto/ethereum/rpc.go +++ b/internal/crypto/ethereum/rpc.go @@ -2,41 +2,54 @@ package ethereum import ( "context" - "fmt" "sync" + "github.com/TimeleapLabs/unchained/internal/consts" + "github.com/TimeleapLabs/unchained/internal/utils" + "github.com/TimeleapLabs/unchained/internal/crypto/ethereum/contracts" "github.com/TimeleapLabs/unchained/internal/config" - "github.com/TimeleapLabs/unchained/internal/log" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/ethclient" ) -type Repository struct { - rpcList map[string][]string - rpcIndex map[string]int - Clients map[string]*ethclient.Client - rpcMutex *sync.Mutex +type RPC interface { + RefreshRPC(network string) + GetClient(network string) *ethclient.Client + GetNewStakingContract(network string, address string, refresh bool) (*contracts.UnchainedStaking, error) + GetNewUniV3Contract(network string, address string, refresh bool) (*contracts.UniV3, error) + GetBlockNumber(ctx context.Context, network string) (uint64, error) +} + +type repository struct { + list map[string][]string + index map[string]int + clients map[string]*ethclient.Client + mutex *sync.Mutex +} + +func (r *repository) GetClient(chain string) *ethclient.Client { + return r.clients[chain] } -func (r *Repository) refreshRPCWithRetries(network string, retries int) bool { +func (r *repository) refreshRPCWithRetries(network string, retries int) bool { if retries == 0 { panic("Cannot connect to any of the provided RPCs") } - if r.rpcIndex[network] == len(r.rpcList[network])-1 { - r.rpcIndex[network] = 0 + if r.index[network] == len(r.list[network])-1 { + r.index[network] = 0 } else { - r.rpcIndex[network]++ + r.index[network]++ } var err error - index := r.rpcIndex[network] - r.Clients[network], err = ethclient.Dial(r.rpcList[network][index]) + index := r.index[network] + r.clients[network], err = ethclient.Dial(r.list[network][index]) if err != nil { return r.refreshRPCWithRetries(network, retries-1) @@ -45,56 +58,53 @@ func (r *Repository) refreshRPCWithRetries(network string, retries int) bool { return true } -func (r *Repository) RefreshRPC(network string) { - r.rpcMutex.Lock() - defer r.rpcMutex.Unlock() - r.refreshRPCWithRetries(network, len(r.rpcList)) +func (r *repository) RefreshRPC(network string) { + r.mutex.Lock() + defer r.mutex.Unlock() + + utils.Logger.With("Network", network).Info("Connecting to RPC") + r.refreshRPCWithRetries(network, len(r.list)) } -func (r *Repository) GetNewStakingContract( - network string, - address string, - refresh bool) (*contracts.UnchainedStaking, error) { +func (r *repository) GetNewStakingContract(network string, address string, refresh bool) (*contracts.UnchainedStaking, error) { if refresh { r.RefreshRPC(network) } - return contracts.NewUnchainedStaking(common.HexToAddress(address), r.Clients[network]) + return contracts.NewUnchainedStaking(common.HexToAddress(address), r.clients[network]) } -func (r *Repository) GetNewUniV3Contract(network string, address string, refresh bool) (*contracts.UniV3, error) { +func (r *repository) GetNewUniV3Contract(network string, address string, refresh bool) (*contracts.UniV3, error) { if refresh { r.RefreshRPC(network) } - return contracts.NewUniV3(common.HexToAddress(address), r.Clients[network]) + return contracts.NewUniV3(common.HexToAddress(address), r.clients[network]) } -func (r *Repository) GetBlockNumber(network string) (uint64, error) { - client, ok := r.Clients[network] +// GetBlockNumber returns the most recent block number. +func (r *repository) GetBlockNumber(ctx context.Context, network string) (uint64, error) { + client, ok := r.clients[network] if !ok { - log.Logger.With("Network", network).Error("Client not found") - return 0, fmt.Errorf("client not found") + utils.Logger.With("Network", network).Error("Client not found") + return 0, consts.ErrClientNotFound } - return client.BlockNumber(context.Background()) -} - -func (r *Repository) init() { - r.rpcList = make(map[string][]string) - r.rpcIndex = make(map[string]int) - r.Clients = make(map[string]*ethclient.Client) - r.rpcMutex = new(sync.Mutex) + return client.BlockNumber(ctx) } -func New() *Repository { - r := &Repository{} - r.init() +func New() RPC { + r := &repository{ + list: map[string][]string{}, + index: map[string]int{}, + clients: map[string]*ethclient.Client{}, + mutex: new(sync.Mutex), + } for _, rpc := range config.App.RPC { - r.rpcIndex[rpc.Name] = 0 - r.rpcList[rpc.Name] = append(r.rpcList[rpc.Name], rpc.Nodes...) + r.index[rpc.Name] = 0 + r.list[rpc.Name] = append(r.list[rpc.Name], rpc.Nodes...) r.RefreshRPC(rpc.Name) } diff --git a/internal/crypto/ethereum/rpc_mock.go b/internal/crypto/ethereum/rpc_mock.go new file mode 100644 index 00000000..36df1b39 --- /dev/null +++ b/internal/crypto/ethereum/rpc_mock.go @@ -0,0 +1,51 @@ +package ethereum + +import ( + "context" + + "github.com/TimeleapLabs/unchained/internal/crypto/ethereum/contracts" + + "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core" + "github.com/ethereum/go-ethereum/ethclient" +) + +type mockRPC struct { + backend *backends.SimulatedBackend +} + +func (m mockRPC) GetClient(_ string) *ethclient.Client { + // TODO implement me + panic("implement me") +} + +func (m mockRPC) RefreshRPC(_ string) {} + +func (m mockRPC) GetNewStakingContract(_ string, address string, _ bool) (*contracts.UnchainedStaking, error) { + return contracts.NewUnchainedStaking( + common.HexToAddress(address), + m.backend, + ) +} + +func (m mockRPC) GetNewUniV3Contract(_ string, address string, _ bool) (*contracts.UniV3, error) { + return contracts.NewUniV3( + common.HexToAddress(address), + m.backend, + ) +} + +func (m mockRPC) GetBlockNumber(_ context.Context, _ string) (uint64, error) { + var blockNumber uint64 = 1000 + return blockNumber, nil +} + +func NewMock() RPC { + return &mockRPC{ + backend: backends.NewSimulatedBackend( + core.DefaultGenesisBlock().Alloc, + 9000000, + ), + } +} diff --git a/internal/crypto/identity.go b/internal/crypto/identity.go index 35f3b6e7..c79bc267 100644 --- a/internal/crypto/identity.go +++ b/internal/crypto/identity.go @@ -4,12 +4,13 @@ import ( "crypto/ecdsa" "encoding/hex" - "github.com/TimeleapLabs/unchained/internal/address" + "github.com/TimeleapLabs/unchained/internal/model" + "github.com/TimeleapLabs/unchained/internal/utils" + "github.com/TimeleapLabs/unchained/internal/utils/address" + "github.com/TimeleapLabs/unchained/internal/config" "github.com/TimeleapLabs/unchained/internal/crypto/bls" "github.com/TimeleapLabs/unchained/internal/crypto/ethereum" - "github.com/TimeleapLabs/unchained/internal/datasets" - "github.com/TimeleapLabs/unchained/internal/log" "github.com/ethereum/go-ethereum/common/hexutil" ethCrypto "github.com/ethereum/go-ethereum/crypto" ) @@ -20,8 +21,10 @@ type MachineIdentity struct { Eth *ethereum.EvmSigner } +// Identity is a global variable that holds machine identity. var Identity = &MachineIdentity{} +// Option represents a function that can add new identity to machine identity. type Option func(identity *MachineIdentity) error // InitMachineIdentity loads all provided identities and save them to secret file. @@ -39,8 +42,9 @@ func InitMachineIdentity(options ...Option) { } } -func (i *MachineIdentity) ExportBlsSigner() *datasets.Signer { - return &datasets.Signer{ +// ExportEvmSigner returns EVM signer from machine identity. +func (i *MachineIdentity) ExportEvmSigner() *model.Signer { + return &model.Signer{ Name: config.App.System.Name, EvmAddress: Identity.Eth.Address, PublicKey: Identity.Bls.PublicKey.Bytes(), @@ -59,7 +63,7 @@ func WithEvmSigner() func(machineIdentity *MachineIdentity) error { privateKey, err = ethCrypto.HexToECDSA(config.App.Secret.EvmPrivateKey) if err != nil { - log.Logger. + utils.Logger. With("Error", err). Error("Can't decode EVM private key") @@ -69,7 +73,7 @@ func WithEvmSigner() func(machineIdentity *MachineIdentity) error { privateKey, err = ethCrypto.GenerateKey() if err != nil { - log.Logger. + utils.Logger. With("Error", err). Error("Can't generate EVM private key") @@ -81,9 +85,8 @@ func WithEvmSigner() func(machineIdentity *MachineIdentity) error { publicKey := privateKey.Public() publicKeyECDSA, ok := publicKey.(*ecdsa.PublicKey) - if !ok { - log.Logger.Error("Can't assert type: publicKey is not of type *ecdsa.PublicKey") + utils.Logger.Error("Can't assert type: publicKey is not of type *ecdsa.PublicKey") return err } @@ -102,7 +105,7 @@ func WithEvmSigner() func(machineIdentity *MachineIdentity) error { config.App.Secret.EvmAddress = machineIdentity.Eth.Address } - log.Logger. + utils.Logger. With("Address", machineIdentity.Eth.Address). Info("EVM identity initialized") @@ -120,7 +123,7 @@ func WithBlsIdentity() func(machineIdentity *MachineIdentity) error { config.App.Secret.PublicKey = hex.EncodeToString(pkBytes[:]) config.App.Secret.Address = address.Calculate(pkBytes[:]) - log.Logger. + utils.Logger. With("Address", config.App.Secret.Address). Info("Unchained identity initialized") diff --git a/internal/crypto/identity_test.go b/internal/crypto/identity_test.go new file mode 100644 index 00000000..b0fa65b6 --- /dev/null +++ b/internal/crypto/identity_test.go @@ -0,0 +1,32 @@ +package crypto + +import ( + "testing" + + "github.com/TimeleapLabs/unchained/internal/config" + "github.com/TimeleapLabs/unchained/internal/utils" + "github.com/stretchr/testify/assert" +) + +const SamplePrivateKey = "3b885a8a8f043724abfa865eccd38f536887d9ea1c08a742720e810f38a86872" + +func TestEvmSignerWithoutGeneratePrivateKey(t *testing.T) { + utils.SetupLogger("info") + config.App.Secret.EvmPrivateKey = SamplePrivateKey + + InitMachineIdentity( + WithEvmSigner(), + ) + + assert.Equal(t, config.App.Secret.EvmPrivateKey, SamplePrivateKey) +} + +func TestEvmSignerWithGeneratePrivateKey(t *testing.T) { + utils.SetupLogger("info") + config.App.Secret.EvmPrivateKey = "" + + InitMachineIdentity( + WithEvmSigner(), + ) + assert.NotEmpty(t, config.App.Secret.EvmPrivateKey) +} diff --git a/internal/crypto/kosk/kosk.go b/internal/crypto/kosk/kosk.go deleted file mode 100644 index b7f11603..00000000 --- a/internal/crypto/kosk/kosk.go +++ /dev/null @@ -1,70 +0,0 @@ -package kosk - -import ( - "crypto/rand" - - "github.com/TimeleapLabs/unchained/internal/crypto" - - "github.com/TimeleapLabs/unchained/internal/crypto/bls" - - sia "github.com/pouya-eghbali/go-sia/v2/pkg" -) - -const ( - LenOfChallenge = 128 - LenOfSignature = 48 - LenOfPublicKey = 96 -) - -type Challenge struct { - Passed bool - Random [LenOfChallenge]byte - Signature [LenOfSignature]byte -} - -func (c *Challenge) Sia() *sia.Sia { - return new(sia.Sia). - AddBool(c.Passed). - AddByteArray8(c.Random[:]). - AddByteArray8(c.Signature[:]) -} - -func (c *Challenge) DeSia(sia *sia.Sia) *Challenge { - c.Passed = sia.ReadBool() - copy(c.Random[:], sia.ReadByteArray8()) - copy(c.Signature[:], sia.ReadByteArray8()) - - return c -} - -func NewChallenge() [LenOfChallenge]byte { - challenge := make([]byte, LenOfChallenge) - _, err := rand.Read(challenge) - if err != nil { - panic(err) - } - - return [LenOfChallenge]byte(challenge) -} - -// TODO: We should use small signatures -func VerifyChallenge(challenge [LenOfChallenge]byte, - publicKeyBytes [LenOfPublicKey]byte, - signatureBytes [LenOfSignature]byte) (bool, error) { - signature, err := bls.RecoverSignature(signatureBytes) - if err != nil { - return false, err - } - - hash, err := bls.Hash(challenge[:]) - if err != nil { - return false, err - } - - publicKey, err := bls.RecoverPublicKey(publicKeyBytes) - if err != nil { - return false, err - } - - return crypto.Identity.Bls.Verify(signature, hash, publicKey) -} diff --git a/internal/crypto/shake/shake.go b/internal/crypto/shake/shake.go deleted file mode 100644 index 7d68266e..00000000 --- a/internal/crypto/shake/shake.go +++ /dev/null @@ -1,10 +0,0 @@ -package shake - -import "golang.org/x/crypto/sha3" - -func Shake(input []byte) []byte { - shake := sha3.NewShake256() - shake.Write(input) - hash := shake.Sum(nil) - return hash -} diff --git a/internal/datasets/correctness.go b/internal/datasets/correctness.go deleted file mode 100644 index 59b0c41e..00000000 --- a/internal/datasets/correctness.go +++ /dev/null @@ -1,68 +0,0 @@ -package datasets - -import ( - sia "github.com/pouya-eghbali/go-sia/v2/pkg" -) - -type Correctness struct { - Timestamp uint64 - Hash [64]byte - Topic [64]byte - Correct bool -} - -type CorrectnessReport struct { - Correctness - Signature [48]byte -} - -type BroadcastCorrectnessPacket struct { - Info Correctness - Signature [48]byte - Signer Signer -} - -func (c *Correctness) Sia() *sia.Sia { - return new(sia.Sia). - AddUInt64(c.Timestamp). - AddByteArray8(c.Hash[:]). - AddByteArray8(c.Topic[:]). - AddBool(c.Correct) -} - -func (c *Correctness) DeSia(sia *sia.Sia) *Correctness { - c.Timestamp = sia.ReadUInt64() - copy(c.Hash[:], sia.ReadByteArray8()) - copy(c.Topic[:], sia.ReadByteArray8()) - c.Correct = sia.ReadBool() - - return c -} - -func (c *CorrectnessReport) Sia() *sia.Sia { - return new(sia.Sia). - EmbedSia(c.Correctness.Sia()). - AddByteArray8(c.Signature[:]) -} - -func (c *CorrectnessReport) DeSia(sia *sia.Sia) *CorrectnessReport { - c.Correctness.DeSia(sia) - copy(c.Signature[:], sia.ReadByteArray8()) - - return c -} - -func (b *BroadcastCorrectnessPacket) Sia() *sia.Sia { - return new(sia.Sia). - EmbedSia(b.Info.Sia()). - AddByteArray8(b.Signature[:]). - EmbedSia(b.Signer.Sia()) -} - -func (b *BroadcastCorrectnessPacket) DeSia(sia *sia.Sia) *BroadcastCorrectnessPacket { - b.Info.DeSia(sia) - copy(b.Signature[:], sia.ReadByteArray8()) - b.Signer.DeSia(sia) - - return b -} diff --git a/internal/datasets/logs.go b/internal/datasets/logs.go deleted file mode 100644 index 2372d8de..00000000 --- a/internal/datasets/logs.go +++ /dev/null @@ -1,99 +0,0 @@ -package datasets - -import ( - "encoding/json" - - sia "github.com/pouya-eghbali/go-sia/v2/pkg" -) - -type EventLogArg struct { - Name string `json:"Name"` - Type string `json:"Type"` - Value any `json:"Value"` -} - -type EventLog struct { - LogIndex uint64 - Block uint64 - Address string - Event string - Chain string - TxHash [32]byte - Args []EventLogArg -} - -type EventLogReport struct { - EventLog - Signature [48]byte -} - -type BroadcastEventPacket struct { - Info EventLog - Signature [48]byte - Signer Signer -} - -func (e *EventLog) Sia() *sia.Sia { - argsEncoded, err := json.Marshal(e.Args) - - if err != nil { - panic(err) - } - - logSia := new(sia.Sia). - AddUInt64(e.LogIndex). - AddUInt64(e.Block). - AddString8(e.Address). - AddString8(e.Event). - AddString8(e.Chain). - AddByteArray8(e.TxHash[:]). - AddByteArray16(argsEncoded) - - return logSia -} - -func (e *EventLog) DeSia(sia *sia.Sia) *EventLog { - e.LogIndex = sia.ReadUInt64() - e.Block = sia.ReadUInt64() - e.Address = sia.ReadString8() - e.Event = sia.ReadString8() - e.Chain = sia.ReadString8() - copy(e.TxHash[:], sia.ReadByteArray8()) - - argsEncoded := sia.ReadByteArray16() - err := json.Unmarshal(argsEncoded, &e.Args) - - if err != nil { - panic(err) - } - - return e -} - -func (e *EventLogReport) Sia() *sia.Sia { - return new(sia.Sia). - EmbedSia(e.EventLog.Sia()). - AddByteArray8(e.Signature[:]) -} - -func (e *EventLogReport) DeSia(sia *sia.Sia) *EventLogReport { - e.EventLog.DeSia(sia) - copy(e.Signature[:], sia.ReadByteArray8()) - - return e -} - -func (b *BroadcastEventPacket) Sia() *sia.Sia { - return new(sia.Sia). - EmbedSia(b.Info.Sia()). - AddByteArray8(b.Signature[:]). - EmbedSia(b.Signer.Sia()) -} - -func (b *BroadcastEventPacket) DeSia(sia *sia.Sia) *BroadcastEventPacket { - b.Info.DeSia(sia) - copy(b.Signature[:], sia.ReadByteArray8()) - b.Signer.DeSia(sia) - - return b -} diff --git a/internal/datasets/uniswap.go b/internal/datasets/uniswap.go deleted file mode 100644 index e1206f5b..00000000 --- a/internal/datasets/uniswap.go +++ /dev/null @@ -1,112 +0,0 @@ -package datasets - -import ( - "math/big" - - sia "github.com/pouya-eghbali/go-sia/v2/pkg" -) - -type TokenKey struct { - Name string - Pair string - Chain string - Delta int64 - Invert bool - Cross string -} - -type AssetKey struct { - Token TokenKey - Block uint64 -} - -type PriceInfo struct { - Asset AssetKey - Price big.Int -} - -type PriceReport struct { - PriceInfo PriceInfo - Signature [48]byte -} - -type BroadcastPricePacket struct { - Info PriceInfo - Signature [48]byte - Signer Signer -} - -func (t *TokenKey) Sia() *sia.Sia { - return new(sia.Sia). - AddString8(t.Name). - AddString8(t.Pair). - AddString8(t.Chain). - AddInt64(t.Delta). - AddBool(t.Invert). - AddString8(t.Cross) -} - -func (t *TokenKey) DeSia(sia *sia.Sia) *TokenKey { - t.Name = sia.ReadString8() - t.Pair = sia.ReadString8() - t.Chain = sia.ReadString8() - t.Delta = sia.ReadInt64() - t.Invert = sia.ReadBool() - t.Cross = sia.ReadString8() - - return t -} - -func (a *AssetKey) Sia() *sia.Sia { - return new(sia.Sia). - EmbedSia(a.Token.Sia()). - AddUInt64(a.Block) -} - -func (a *AssetKey) DeSia(sia *sia.Sia) *AssetKey { - a.Token.DeSia(sia) - a.Block = sia.ReadUInt64() - - return a -} - -func (p *PriceInfo) Sia() *sia.Sia { - return new(sia.Sia). - EmbedSia(p.Asset.Sia()). - AddBigInt(&p.Price) -} - -func (p *PriceInfo) DeSia(sia *sia.Sia) *PriceInfo { - p.Asset.DeSia(sia) - p.Price = *sia.ReadBigInt() - - return p -} - -func (p *PriceReport) Sia() *sia.Sia { - return new(sia.Sia). - EmbedSia(p.PriceInfo.Sia()). - AddByteArray8(p.Signature[:]) -} - -func (p *PriceReport) DeSia(sia *sia.Sia) *PriceReport { - p.PriceInfo.DeSia(sia) - copy(p.Signature[:], sia.ReadByteArray8()) - - return p -} - -func (b *BroadcastPricePacket) Sia() *sia.Sia { - return new(sia.Sia). - EmbedSia(b.Info.Sia()). - AddByteArray8(b.Signature[:]). - EmbedSia(b.Signer.Sia()) -} - -func (b *BroadcastPricePacket) DeSia(sia *sia.Sia) *BroadcastPricePacket { - b.Info.DeSia(sia) - copy(b.Signature[:], sia.ReadByteArray8()) - b.Signer.DeSia(sia) - - return b -} diff --git a/internal/db/db.go b/internal/db/db.go deleted file mode 100644 index ae879a32..00000000 --- a/internal/db/db.go +++ /dev/null @@ -1,55 +0,0 @@ -package db - -import ( - "context" - "database/sql" - - "github.com/TimeleapLabs/unchained/internal/log" - - "github.com/TimeleapLabs/unchained/internal/config" - "github.com/TimeleapLabs/unchained/internal/ent" - - "entgo.io/ent/dialect" - entsql "entgo.io/ent/dialect/sql" - - // these imports are required for ent to work with postgres. - _ "github.com/jackc/pgx/v5/stdlib" - _ "github.com/lib/pq" -) - -var dbClient *ent.Client - -// Open new connection. -func Open(databaseURL string) (*ent.Client, error) { - db, err := sql.Open("pgx", databaseURL) - if err != nil { - return nil, err - } - - drv := entsql.OpenDB(dialect.Postgres, db) - return ent.NewClient(ent.Driver(drv)), nil -} - -func Start() { - if config.App.Postgres.URL == "" { - return - } - - var err error - - log.Logger.Info("Connecting to DB") - - dbClient, err = ent.Open("postgres", config.App.Postgres.URL) - - if err != nil { - log.Logger.Error("failed opening connection to postgres: %v", err) - } - - if err = dbClient.Schema.Create(context.Background()); err != nil { - log.Logger.Error("failed creating schema resources: %v", err) - } -} - -func GetClient() *ent.Client { - return dbClient -} diff --git a/internal/ent/eventlog.go b/internal/ent/eventlog.go index 7211d444..5e8af9ed 100644 --- a/internal/ent/eventlog.go +++ b/internal/ent/eventlog.go @@ -5,11 +5,11 @@ package ent import ( "encoding/json" "fmt" + "github.com/TimeleapLabs/unchained/internal/model" "strings" "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/TimeleapLabs/unchained/internal/datasets" "github.com/TimeleapLabs/unchained/internal/ent/eventlog" "github.com/TimeleapLabs/unchained/internal/ent/helpers" ) @@ -36,7 +36,7 @@ type EventLog struct { // Transaction holds the value of the "transaction" field. Transaction []byte `json:"transaction,omitempty"` // Args holds the value of the "args" field. - Args []datasets.EventLogArg `json:"args,omitempty"` + Args []model.EventLogArg `json:"args,omitempty"` // Consensus holds the value of the "consensus" field. Consensus bool `json:"consensus,omitempty"` // Voted holds the value of the "voted" field. diff --git a/internal/ent/eventlog_create.go b/internal/ent/eventlog_create.go index ce86603b..f6dde3f7 100644 --- a/internal/ent/eventlog_create.go +++ b/internal/ent/eventlog_create.go @@ -6,11 +6,11 @@ import ( "context" "errors" "fmt" + "github.com/TimeleapLabs/unchained/internal/model" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/TimeleapLabs/unchained/internal/datasets" "github.com/TimeleapLabs/unchained/internal/ent/eventlog" "github.com/TimeleapLabs/unchained/internal/ent/helpers" "github.com/TimeleapLabs/unchained/internal/ent/signer" @@ -73,7 +73,7 @@ func (elc *EventLogCreate) SetTransaction(b []byte) *EventLogCreate { } // SetArgs sets the "args" field. -func (elc *EventLogCreate) SetArgs(dla []datasets.EventLogArg) *EventLogCreate { +func (elc *EventLogCreate) SetArgs(dla []model.EventLogArg) *EventLogCreate { elc.mutation.SetArgs(dla) return elc } @@ -456,7 +456,7 @@ func (u *EventLogUpsert) UpdateTransaction() *EventLogUpsert { } // SetArgs sets the "args" field. -func (u *EventLogUpsert) SetArgs(v []datasets.EventLogArg) *EventLogUpsert { +func (u *EventLogUpsert) SetArgs(v []model.EventLogArg) *EventLogUpsert { u.Set(eventlog.FieldArgs, v) return u } @@ -665,7 +665,7 @@ func (u *EventLogUpsertOne) UpdateTransaction() *EventLogUpsertOne { } // SetArgs sets the "args" field. -func (u *EventLogUpsertOne) SetArgs(v []datasets.EventLogArg) *EventLogUpsertOne { +func (u *EventLogUpsertOne) SetArgs(v []model.EventLogArg) *EventLogUpsertOne { return u.Update(func(s *EventLogUpsert) { s.SetArgs(v) }) @@ -1044,7 +1044,7 @@ func (u *EventLogUpsertBulk) UpdateTransaction() *EventLogUpsertBulk { } // SetArgs sets the "args" field. -func (u *EventLogUpsertBulk) SetArgs(v []datasets.EventLogArg) *EventLogUpsertBulk { +func (u *EventLogUpsertBulk) SetArgs(v []model.EventLogArg) *EventLogUpsertBulk { return u.Update(func(s *EventLogUpsert) { s.SetArgs(v) }) diff --git a/internal/ent/eventlog_update.go b/internal/ent/eventlog_update.go index ab44a35f..00120a19 100644 --- a/internal/ent/eventlog_update.go +++ b/internal/ent/eventlog_update.go @@ -6,12 +6,12 @@ import ( "context" "errors" "fmt" + "github.com/TimeleapLabs/unchained/internal/model" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/dialect/sql/sqljson" "entgo.io/ent/schema/field" - "github.com/TimeleapLabs/unchained/internal/datasets" "github.com/TimeleapLabs/unchained/internal/ent/eventlog" "github.com/TimeleapLabs/unchained/internal/ent/helpers" "github.com/TimeleapLabs/unchained/internal/ent/predicate" @@ -149,13 +149,13 @@ func (elu *EventLogUpdate) SetTransaction(b []byte) *EventLogUpdate { } // SetArgs sets the "args" field. -func (elu *EventLogUpdate) SetArgs(dla []datasets.EventLogArg) *EventLogUpdate { +func (elu *EventLogUpdate) SetArgs(dla []model.EventLogArg) *EventLogUpdate { elu.mutation.SetArgs(dla) return elu } // AppendArgs appends dla to the "args" field. -func (elu *EventLogUpdate) AppendArgs(dla []datasets.EventLogArg) *EventLogUpdate { +func (elu *EventLogUpdate) AppendArgs(dla []model.EventLogArg) *EventLogUpdate { elu.mutation.AppendArgs(dla) return elu } @@ -505,13 +505,13 @@ func (eluo *EventLogUpdateOne) SetTransaction(b []byte) *EventLogUpdateOne { } // SetArgs sets the "args" field. -func (eluo *EventLogUpdateOne) SetArgs(dla []datasets.EventLogArg) *EventLogUpdateOne { +func (eluo *EventLogUpdateOne) SetArgs(dla []model.EventLogArg) *EventLogUpdateOne { eluo.mutation.SetArgs(dla) return eluo } // AppendArgs appends dla to the "args" field. -func (eluo *EventLogUpdateOne) AppendArgs(dla []datasets.EventLogArg) *EventLogUpdateOne { +func (eluo *EventLogUpdateOne) AppendArgs(dla []model.EventLogArg) *EventLogUpdateOne { eluo.mutation.AppendArgs(dla) return eluo } diff --git a/internal/ent/mutation.go b/internal/ent/mutation.go index cfc42ba5..ddcde87d 100644 --- a/internal/ent/mutation.go +++ b/internal/ent/mutation.go @@ -6,11 +6,11 @@ import ( "context" "errors" "fmt" + "github.com/TimeleapLabs/unchained/internal/model" "sync" "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/TimeleapLabs/unchained/internal/datasets" "github.com/TimeleapLabs/unchained/internal/ent/assetprice" "github.com/TimeleapLabs/unchained/internal/ent/correctnessreport" "github.com/TimeleapLabs/unchained/internal/ent/eventlog" @@ -1917,8 +1917,8 @@ type EventLogMutation struct { addindex *int64 event *string transaction *[]byte - args *[]datasets.EventLogArg - appendargs []datasets.EventLogArg + args *[]model.EventLogArg + appendargs []model.EventLogArg consensus *bool voted **helpers.BigInt clearedFields map[string]struct{} @@ -2377,13 +2377,13 @@ func (m *EventLogMutation) ResetTransaction() { } // SetArgs sets the "args" field. -func (m *EventLogMutation) SetArgs(dla []datasets.EventLogArg) { +func (m *EventLogMutation) SetArgs(dla []model.EventLogArg) { m.args = &dla m.appendargs = nil } // Args returns the value of the "args" field in the mutation. -func (m *EventLogMutation) Args() (r []datasets.EventLogArg, exists bool) { +func (m *EventLogMutation) Args() (r []model.EventLogArg, exists bool) { v := m.args if v == nil { return @@ -2394,7 +2394,7 @@ func (m *EventLogMutation) Args() (r []datasets.EventLogArg, exists bool) { // OldArgs returns the old "args" field's value of the EventLog entity. // If the EventLog object wasn't provided to the builder, the object is fetched from the database. // An error is returned if the mutation operation is not UpdateOne, or the database query fails. -func (m *EventLogMutation) OldArgs(ctx context.Context) (v []datasets.EventLogArg, err error) { +func (m *EventLogMutation) OldArgs(ctx context.Context) (v []model.EventLogArg, err error) { if !m.op.Is(OpUpdateOne) { return v, errors.New("OldArgs is only allowed on UpdateOne operations") } @@ -2409,12 +2409,12 @@ func (m *EventLogMutation) OldArgs(ctx context.Context) (v []datasets.EventLogAr } // AppendArgs adds dla to the "args" field. -func (m *EventLogMutation) AppendArgs(dla []datasets.EventLogArg) { +func (m *EventLogMutation) AppendArgs(dla []model.EventLogArg) { m.appendargs = append(m.appendargs, dla...) } // AppendedArgs returns the list of values that were appended to the "args" field in this mutation. -func (m *EventLogMutation) AppendedArgs() ([]datasets.EventLogArg, bool) { +func (m *EventLogMutation) AppendedArgs() ([]model.EventLogArg, bool) { if len(m.appendargs) == 0 { return nil, false } @@ -2748,7 +2748,7 @@ func (m *EventLogMutation) SetField(name string, value ent.Value) error { m.SetTransaction(v) return nil case eventlog.FieldArgs: - v, ok := value.([]datasets.EventLogArg) + v, ok := value.([]model.EventLogArg) if !ok { return fmt.Errorf("unexpected type %T for field %s", value, name) } diff --git a/internal/ent/schema/eventlog.go b/internal/ent/schema/eventlog.go index b892c179..cb1d7f4f 100644 --- a/internal/ent/schema/eventlog.go +++ b/internal/ent/schema/eventlog.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/schema/edge" "entgo.io/ent/schema/field" "entgo.io/ent/schema/index" - "github.com/TimeleapLabs/unchained/internal/datasets" "github.com/TimeleapLabs/unchained/internal/ent/helpers" + "github.com/TimeleapLabs/unchained/internal/model" ) // DataSet holds the schema definition for the DataSet entity. @@ -42,7 +42,7 @@ func (EventLog) Fields() []ent.Field { field.Bytes("transaction"). MaxLen(TransactionMaxLen). Annotations(entgql.Type("Bytes")), - field.JSON("args", []datasets.EventLogArg{}), + field.JSON("args", []model.EventLogArg{}), field.Bool("consensus").Default(false). Annotations(entgql.Type("Boolean")), field.Uint("voted"). diff --git a/internal/model/assetprice.go b/internal/model/assetprice.go new file mode 100644 index 00000000..b609566d --- /dev/null +++ b/internal/model/assetprice.go @@ -0,0 +1,16 @@ +package model + +import "math/big" + +type AssetPrice struct { + Pair string + Name string + Chain string + Block uint64 + Price big.Int + SignersCount uint64 + Signature []byte + Consensus bool + Voted big.Int + SignerIDs []int +} diff --git a/internal/datasets/bls.go b/internal/model/bls.go similarity index 58% rename from internal/datasets/bls.go rename to internal/model/bls.go index 417ce0c1..ebbf554a 100644 --- a/internal/datasets/bls.go +++ b/internal/model/bls.go @@ -1,4 +1,4 @@ -package datasets +package model import ( bls12381 "github.com/consensys/gnark-crypto/ecc/bls12-381" @@ -17,33 +17,43 @@ type Signature struct { Signer Signer } -func (s *Signature) Sia() *sia.Sia { - return new(sia.Sia). +func (s *Signature) Sia() sia.Sia { + return sia.New(). AddByteArray8(s.Signature.Marshal()). - EmbedSia(s.Signer.Sia()) + EmbedBytes(s.Signer.Sia().Bytes()) } -func (s *Signature) DeSia(sia *sia.Sia) *Signature { +func (s *Signature) FromBytes(payload []byte) *Signature { + siaMessage := sia.NewFromBytes(payload) + return s.FromSia(siaMessage) +} + +func (s *Signature) FromSia(sia sia.Sia) *Signature { err := s.Signature.Unmarshal(sia.ReadByteArray8()) if err != nil { s.Signature = bls12381.G1Affine{} } - s.Signer.DeSia(sia) + s.Signer.FromSia(sia) return s } -func (s *Signer) Sia() *sia.Sia { - return new(sia.Sia). +func (s *Signer) Sia() sia.Sia { + return sia.New(). AddString8(s.Name). AddString8(s.EvmAddress). AddByteArray8(s.PublicKey[:]). AddByteArray8(s.ShortPublicKey[:]) } -func (s *Signer) DeSia(sia *sia.Sia) *Signer { +func (s *Signer) FromBytes(payload []byte) *Signer { + siaMessage := sia.NewFromBytes(payload) + return s.FromSia(siaMessage) +} + +func (s *Signer) FromSia(sia sia.Sia) *Signer { s.Name = sia.ReadString8() s.EvmAddress = sia.ReadString8() copy(s.PublicKey[:], sia.ReadByteArray8()) diff --git a/internal/model/correctness.go b/internal/model/correctness.go new file mode 100644 index 00000000..e119f97b --- /dev/null +++ b/internal/model/correctness.go @@ -0,0 +1,101 @@ +package model + +import ( + "math/big" + + "github.com/TimeleapLabs/unchained/internal/crypto/bls" + "github.com/TimeleapLabs/unchained/internal/utils" + + bls12381 "github.com/consensys/gnark-crypto/ecc/bls12-381" + + sia "github.com/pouya-eghbali/go-sia/v2/pkg" +) + +type CorrectnessReportPacket struct { + Correctness + Signature [48]byte +} + +func (c *CorrectnessReportPacket) Sia() sia.Sia { + return sia.New(). + EmbedBytes(c.Correctness.Sia().Bytes()). + AddByteArray8(c.Signature[:]) +} + +func (c *CorrectnessReportPacket) FromBytes(payload []byte) *CorrectnessReportPacket { + siaMessage := sia.NewFromBytes(payload) + + c.Correctness.FromSia(siaMessage) + copy(c.Signature[:], siaMessage.ReadByteArray8()) + + return c +} + +////// + +type BroadcastCorrectnessPacket struct { + Info Correctness + Signature [48]byte + Signer Signer +} + +func (b *BroadcastCorrectnessPacket) Sia() sia.Sia { + return sia.New(). + EmbedBytes(b.Info.Sia().Bytes()). + AddByteArray8(b.Signature[:]). + EmbedBytes(b.Signer.Sia().Bytes()) +} + +func (b *BroadcastCorrectnessPacket) FromBytes(payload []byte) *BroadcastCorrectnessPacket { + siaMessage := sia.NewFromBytes(payload) + + b.Info.FromSia(siaMessage) + copy(b.Signature[:], siaMessage.ReadByteArray8()) + b.Signer.FromSia(siaMessage) + + return b +} + +type Correctness struct { + SignersCount uint64 + Signature []byte + Consensus bool + Voted big.Int + SignerIDs []int + Timestamp uint64 + Hash []byte + Topic [64]byte + Correct bool +} + +func (c *Correctness) Sia() sia.Sia { + return sia.New(). + AddUInt64(c.Timestamp). + AddByteArray8(c.Hash). + AddByteArray8(c.Topic[:]). + AddBool(c.Correct) +} + +func (c *Correctness) FromBytes(payload []byte) *Correctness { + siaMessage := sia.NewFromBytes(payload) + return c.FromSia(siaMessage) +} + +func (c *Correctness) FromSia(sia sia.Sia) *Correctness { + c.Timestamp = sia.ReadUInt64() + copy(c.Hash, sia.ReadByteArray8()) + copy(c.Topic[:], sia.ReadByteArray8()) + c.Correct = sia.ReadBool() + + return c +} + +func (c *Correctness) Bls() (bls12381.G1Affine, error) { + hash, err := bls.Hash(c.Sia().Bytes()) + if err != nil { + utils.Logger.Error("Can't hash bls: %v", err) + return bls12381.G1Affine{}, err + } + + return hash, err +} diff --git a/internal/model/kosk.go b/internal/model/kosk.go new file mode 100644 index 00000000..0a9fe4c6 --- /dev/null +++ b/internal/model/kosk.go @@ -0,0 +1,30 @@ +package model + +import sia "github.com/pouya-eghbali/go-sia/v2/pkg" + +const ( + LenOfChallenge = 128 + LenOfSignature = 48 +) + +type ChallengePacket struct { + Passed bool + Random [LenOfChallenge]byte + Signature [LenOfSignature]byte +} + +func (c *ChallengePacket) Sia() sia.Sia { + return sia.New(). + AddBool(c.Passed). + AddByteArray8(c.Random[:]). + AddByteArray8(c.Signature[:]) +} + +func (c *ChallengePacket) FromBytes(payload []byte) *ChallengePacket { + siaMessage := sia.NewFromBytes(payload) + c.Passed = siaMessage.ReadBool() + copy(c.Random[:], siaMessage.ReadByteArray8()) + copy(c.Signature[:], siaMessage.ReadByteArray8()) + + return c +} diff --git a/internal/model/logs.go b/internal/model/logs.go new file mode 100644 index 00000000..2d845702 --- /dev/null +++ b/internal/model/logs.go @@ -0,0 +1,127 @@ +package model + +import ( + "encoding/json" + + "github.com/TimeleapLabs/unchained/internal/crypto/bls" + "github.com/TimeleapLabs/unchained/internal/ent/helpers" + "github.com/TimeleapLabs/unchained/internal/utils" + + bls12381 "github.com/consensys/gnark-crypto/ecc/bls12-381" + + sia "github.com/pouya-eghbali/go-sia/v2/pkg" +) + +type EventLogReportPacket struct { + EventLog + Signature [48]byte +} + +func (e *EventLogReportPacket) Sia() sia.Sia { + return sia.New(). + EmbedBytes(e.EventLog.Sia().Bytes()). + AddByteArray8(e.Signature[:]) +} + +func (e *EventLogReportPacket) FromBytes(payload []byte) *EventLogReportPacket { + siaMessage := sia.NewFromBytes(payload) + e.EventLog.FromSia(siaMessage) + copy(e.Signature[:], siaMessage.ReadByteArray8()) + + return e +} + +type BroadcastEventPacket struct { + Info EventLog + Signature [48]byte + Signer Signer +} + +func (b *BroadcastEventPacket) Sia() sia.Sia { + return sia.New(). + EmbedBytes(b.Info.Sia().Bytes()). + AddByteArray8(b.Signature[:]). + EmbedBytes(b.Signer.Sia().Bytes()) +} + +func (b *BroadcastEventPacket) FromBytes(payload []byte) *BroadcastEventPacket { + siaMessage := sia.NewFromBytes(payload) + + b.Info.FromSia(siaMessage) + copy(b.Signature[:], siaMessage.ReadByteArray8()) + b.Signer.FromSia(siaMessage) + + return b +} + +type EventLogArg struct { + Name string `json:"Name"` + Type string `json:"Type"` + Value any `json:"Value"` +} + +type EventLog struct { + LogIndex uint64 + Block uint64 + Address string + Event string + Chain string + TxHash [32]byte + Args []EventLogArg + + Consensus bool + SignersCount uint64 + SignerIDs []int + Signature []byte + Voted *helpers.BigInt +} + +func (e *EventLog) Sia() sia.Sia { + argsEncoded, err := json.Marshal(e.Args) + + if err != nil { + panic(err) + } + + return sia.New(). + AddUInt64(e.LogIndex). + AddUInt64(e.Block). + AddString8(e.Address). + AddString8(e.Event). + AddString8(e.Chain). + AddByteArray8(e.TxHash[:]). + AddByteArray16(argsEncoded) +} + +func (e *EventLog) FromBytes(payload []byte) *EventLog { + siaMessage := sia.NewFromBytes(payload) + return e.FromSia(siaMessage) +} + +func (e *EventLog) FromSia(sia sia.Sia) *EventLog { + e.LogIndex = sia.ReadUInt64() + e.Block = sia.ReadUInt64() + e.Address = sia.ReadString8() + e.Event = sia.ReadString8() + e.Chain = sia.ReadString8() + copy(e.TxHash[:], sia.ReadByteArray8()) + + argsEncoded := sia.ReadByteArray16() + err := json.Unmarshal(argsEncoded, &e.Args) + + if err != nil { + panic(err) + } + + return e +} + +func (e *EventLog) Bls() (bls12381.G1Affine, error) { + hash, err := bls.Hash(e.Sia().Bytes()) + if err != nil { + utils.Logger.Error("Can't hash bls: %v", err) + return bls12381.G1Affine{}, err + } + + return hash, err +} diff --git a/internal/model/price.go b/internal/model/price.go new file mode 100644 index 00000000..2422daf2 --- /dev/null +++ b/internal/model/price.go @@ -0,0 +1,28 @@ +package model + +import ( + sia "github.com/pouya-eghbali/go-sia/v2/pkg" +) + +type PriceReportPacket struct { + PriceInfo PriceInfo + Signature [48]byte +} + +func (p *PriceReportPacket) Sia() sia.Sia { + return sia.New(). + EmbedBytes(p.PriceInfo.Sia().Bytes()). + AddByteArray8(p.Signature[:]) +} + +func (p *PriceReportPacket) FromBytes(payload []byte) *PriceReportPacket { + siaMessage := sia.NewFromBytes(payload) + return p.FromSia(siaMessage) +} + +func (p *PriceReportPacket) FromSia(sia sia.Sia) *PriceReportPacket { + p.PriceInfo.FromSia(sia) + copy(p.Signature[:], sia.ReadByteArray8()) + + return p +} diff --git a/internal/datasets/token.go b/internal/model/token.go similarity index 98% rename from internal/datasets/token.go rename to internal/model/token.go index c093fb58..d1300119 100644 --- a/internal/datasets/token.go +++ b/internal/model/token.go @@ -1,4 +1,4 @@ -package datasets +package model import "github.com/TimeleapLabs/unchained/internal/config" diff --git a/internal/model/uniswap.go b/internal/model/uniswap.go new file mode 100644 index 00000000..9b37c6e8 --- /dev/null +++ b/internal/model/uniswap.go @@ -0,0 +1,115 @@ +package model + +import ( + "math/big" + + "github.com/TimeleapLabs/unchained/internal/crypto/bls" + "github.com/TimeleapLabs/unchained/internal/utils" + + bls12381 "github.com/consensys/gnark-crypto/ecc/bls12-381" + + sia "github.com/pouya-eghbali/go-sia/v2/pkg" +) + +type TokenKey struct { + Name string + Pair string + Chain string + Delta int64 + Invert bool + Cross string +} + +func (t *TokenKey) Sia() sia.Sia { + return sia.New(). + AddString8(t.Name). + AddString8(t.Pair). + AddString8(t.Chain). + AddInt64(t.Delta). + AddBool(t.Invert). + AddString8(t.Cross) +} + +func (t *TokenKey) FromSia(sia sia.Sia) *TokenKey { + t.Name = sia.ReadString8() + t.Pair = sia.ReadString8() + t.Chain = sia.ReadString8() + t.Delta = sia.ReadInt64() + t.Invert = sia.ReadBool() + t.Cross = sia.ReadString8() + + return t +} + +type AssetKey struct { + Token TokenKey + Block uint64 +} + +func (a *AssetKey) Sia() sia.Sia { + return sia.New(). + EmbedBytes(a.Token.Sia().Bytes()). + AddUInt64(a.Block) +} + +func (a *AssetKey) FromSia(sia sia.Sia) *AssetKey { + a.Token.FromSia(sia) + a.Block = sia.ReadUInt64() + + return a +} + +type PriceInfo struct { + Asset AssetKey + Price big.Int +} + +func (p *PriceInfo) Sia() sia.Sia { + return sia.New(). + EmbedBytes(p.Asset.Sia().Bytes()). + AddBigInt(&p.Price) +} + +func (p *PriceInfo) FromBytes(payload []byte) *PriceInfo { + siaMessage := sia.NewFromBytes(payload) + return p.FromSia(siaMessage) +} + +func (p *PriceInfo) FromSia(sia sia.Sia) *PriceInfo { + p.Asset.FromSia(sia) + p.Price = *sia.ReadBigInt() + + return p +} + +func (p *PriceInfo) Bls() (bls12381.G1Affine, error) { + hash, err := bls.Hash(p.Sia().Bytes()) + if err != nil { + utils.Logger.With("err", err).Error("Can't hash bls") + return bls12381.G1Affine{}, err + } + + return hash, err +} + +type BroadcastPricePacket struct { + Info PriceInfo + Signature [48]byte + Signer Signer +} + +func (b *BroadcastPricePacket) Sia() sia.Sia { + return sia.New(). + EmbedBytes(b.Info.Sia().Bytes()). + AddByteArray8(b.Signature[:]). + EmbedBytes(b.Signer.Sia().Bytes()) +} + +func (b *BroadcastPricePacket) FromBytes(payload []byte) *BroadcastPricePacket { + siaMessage := sia.NewFromBytes(payload) + b.Info.FromSia(siaMessage) + copy(b.Signature[:], siaMessage.ReadByteArray8()) + b.Signer.FromSia(siaMessage) + + return b +} diff --git a/internal/repository/postgres/assetprice.go b/internal/repository/postgres/assetprice.go new file mode 100644 index 00000000..441a898d --- /dev/null +++ b/internal/repository/postgres/assetprice.go @@ -0,0 +1,73 @@ +package postgres + +import ( + "context" + + "github.com/TimeleapLabs/unchained/internal/consts" + "github.com/TimeleapLabs/unchained/internal/ent" + "github.com/TimeleapLabs/unchained/internal/ent/assetprice" + "github.com/TimeleapLabs/unchained/internal/ent/helpers" + "github.com/TimeleapLabs/unchained/internal/model" + "github.com/TimeleapLabs/unchained/internal/repository" + "github.com/TimeleapLabs/unchained/internal/transport/database" + "github.com/TimeleapLabs/unchained/internal/utils" +) + +type AssetPriceRepo struct { + client database.Database +} + +func (a AssetPriceRepo) Upsert(ctx context.Context, data model.AssetPrice) error { + err := a.client. + GetConnection(). + AssetPrice. + Create(). + SetPair(data.Pair). + SetAsset(data.Name). + SetChain(data.Chain). + SetBlock(data.Block). + SetPrice(&helpers.BigInt{Int: data.Price}). + SetSignersCount(data.SignersCount). + SetSignature(data.Signature). + SetConsensus(data.Consensus). + SetVoted(&helpers.BigInt{Int: data.Voted}). + AddSignerIDs(data.SignerIDs...). + OnConflictColumns("block", "chain", "asset", "pair"). + UpdateNewValues(). + Exec(ctx) + + if err != nil { + utils.Logger.With("err", err).Error("Cant upsert asset price record in database") + return consts.ErrInternalError + } + + return nil +} + +func (a AssetPriceRepo) Find(ctx context.Context, block uint64, chain string, name string, pair string) ([]*ent.AssetPrice, error) { + currentRecords, err := a.client. + GetConnection(). + AssetPrice. + Query(). + Where( + assetprice.Block(block), + assetprice.Chain(chain), + assetprice.Asset(name), + assetprice.Pair(pair), + ). + WithSigners(). + All(ctx) + + if err != nil { + utils.Logger.With("err", err).Error("Cant fetch asset price records from database") + return nil, consts.ErrInternalError + } + + return currentRecords, nil +} + +func NewAssetPrice(client database.Database) repository.AssetPrice { + return &AssetPriceRepo{ + client: client, + } +} diff --git a/internal/repository/postgres/correctness.go b/internal/repository/postgres/correctness.go new file mode 100644 index 00000000..c4095362 --- /dev/null +++ b/internal/repository/postgres/correctness.go @@ -0,0 +1,70 @@ +package postgres + +import ( + "context" + + "github.com/TimeleapLabs/unchained/internal/consts" + "github.com/TimeleapLabs/unchained/internal/ent" + "github.com/TimeleapLabs/unchained/internal/ent/correctnessreport" + "github.com/TimeleapLabs/unchained/internal/ent/helpers" + "github.com/TimeleapLabs/unchained/internal/model" + "github.com/TimeleapLabs/unchained/internal/repository" + "github.com/TimeleapLabs/unchained/internal/transport/database" + "github.com/TimeleapLabs/unchained/internal/utils" +) + +type CorrectnessRepo struct { + client database.Database +} + +func (c CorrectnessRepo) Find(ctx context.Context, hash []byte, topic []byte, timestamp uint64) ([]*ent.CorrectnessReport, error) { + currentRecords, err := c.client. + GetConnection(). + CorrectnessReport. + Query(). + Where(correctnessreport.And( + correctnessreport.Hash(hash), + correctnessreport.Topic(topic), + correctnessreport.Timestamp(timestamp), + )). + All(ctx) + + if err != nil { + utils.Logger.With("err", err).Error("Cant fetch correctness reports from database") + return nil, consts.ErrInternalError + } + + return currentRecords, nil +} + +func (c CorrectnessRepo) Upsert(ctx context.Context, data model.Correctness) error { + err := c.client. + GetConnection(). + CorrectnessReport. + Create(). + SetCorrect(data.Correct). + SetSignersCount(data.SignersCount). + SetSignature(data.Signature). + SetHash(data.Hash). + SetTimestamp(data.Timestamp). + SetTopic(data.Topic[:]). + SetConsensus(data.Consensus). + SetVoted(&helpers.BigInt{Int: data.Voted}). + AddSignerIDs(data.SignerIDs...). + OnConflictColumns("topic", "hash"). + UpdateNewValues(). + Exec(ctx) + + if err != nil { + utils.Logger.With("err", err).Error("Cant upsert correctness report in database") + return consts.ErrInternalError + } + + return nil +} + +func NewCorrectness(client database.Database) repository.CorrectnessReport { + return &CorrectnessRepo{ + client: client, + } +} diff --git a/internal/repository/postgres/eventlog.go b/internal/repository/postgres/eventlog.go new file mode 100644 index 00000000..74477c91 --- /dev/null +++ b/internal/repository/postgres/eventlog.go @@ -0,0 +1,73 @@ +package postgres + +import ( + "context" + + "github.com/TimeleapLabs/unchained/internal/consts" + "github.com/TimeleapLabs/unchained/internal/ent" + "github.com/TimeleapLabs/unchained/internal/ent/eventlog" + "github.com/TimeleapLabs/unchained/internal/model" + "github.com/TimeleapLabs/unchained/internal/repository" + "github.com/TimeleapLabs/unchained/internal/transport/database" + "github.com/TimeleapLabs/unchained/internal/utils" +) + +type EventLogRepo struct { + client database.Database +} + +func (r EventLogRepo) Find(ctx context.Context, block uint64, hash []byte, index uint64) ([]*ent.EventLog, error) { + currentRecords, err := r.client. + GetConnection(). + EventLog. + Query(). + Where( + eventlog.Block(block), + eventlog.TransactionEQ(hash), + eventlog.IndexEQ(index), + ). + WithSigners(). + All(ctx) + + if err != nil { + utils.Logger.With("err", err).Error("Cant fetch event log records from database") + return nil, consts.ErrInternalError + } + + return currentRecords, nil +} + +func (r EventLogRepo) Upsert(ctx context.Context, data model.EventLog) error { + err := r.client. + GetConnection(). + EventLog. + Create(). + SetBlock(data.Block). + SetChain(data.Chain). + SetAddress(data.Address). + SetEvent(data.Event). + SetIndex(data.LogIndex). + SetTransaction(data.TxHash[:]). + SetSignersCount(data.SignersCount). + SetSignature(data.Signature). + SetArgs(data.Args). + SetConsensus(data.Consensus). + SetVoted(data.Voted). + AddSignerIDs(data.SignerIDs...). + OnConflictColumns("block", "transaction", "index"). + UpdateNewValues(). + Exec(ctx) + + if err != nil { + utils.Logger.With("err", err).Error("Cant upsert event log record to database") + return consts.ErrInternalError + } + + return nil +} + +func NewEventLog(client database.Database) repository.EventLog { + return &EventLogRepo{ + client: client, + } +} diff --git a/internal/repository/postgres/signer.go b/internal/repository/postgres/signer.go new file mode 100644 index 00000000..3ba2b270 --- /dev/null +++ b/internal/repository/postgres/signer.go @@ -0,0 +1,67 @@ +package postgres + +import ( + "context" + + "github.com/TimeleapLabs/unchained/internal/consts" + "github.com/TimeleapLabs/unchained/internal/ent" + "github.com/TimeleapLabs/unchained/internal/ent/signer" + "github.com/TimeleapLabs/unchained/internal/model" + "github.com/TimeleapLabs/unchained/internal/repository" + "github.com/TimeleapLabs/unchained/internal/transport/database" + "github.com/TimeleapLabs/unchained/internal/utils" +) + +type signerRepo struct { + client database.Database +} + +func (s signerRepo) CreateSigners(ctx context.Context, signers []model.Signer) error { + err := s.client. + GetConnection(). + Signer.MapCreateBulk(signers, func(sc *ent.SignerCreate, i int) { + signer := signers[i] + sc.SetName(signer.Name). + SetEvm(signer.EvmAddress). + SetKey(signer.PublicKey[:]). + SetShortkey(signer.ShortPublicKey[:]). + SetPoints(0) + }). + OnConflictColumns("shortkey"). + UpdateName(). + UpdateEvm(). + UpdateKey(). + Update(func(su *ent.SignerUpsert) { + su.AddPoints(1) + }). + Exec(ctx) + + if err != nil { + utils.Logger.With("err", err).Error("Cant create signers in database") + return consts.ErrInternalError + } + + return nil +} + +func (s signerRepo) GetSingerIDsByKeys(ctx context.Context, keys [][]byte) ([]int, error) { + signerIDs, err := s.client. + GetConnection(). + Signer. + Query(). + Where(signer.KeyIn(keys...)). + IDs(ctx) + + if err != nil { + utils.Logger.With("err", err).Error("Cant fetch signer IDs from database") + return []int{}, consts.ErrInternalError + } + + return signerIDs, nil +} + +func NewSigner(client database.Database) repository.Signer { + return &signerRepo{ + client: client, + } +} diff --git a/internal/repository/repository.go b/internal/repository/repository.go new file mode 100644 index 00000000..0948dc57 --- /dev/null +++ b/internal/repository/repository.go @@ -0,0 +1,38 @@ +package repository + +import ( + "context" + + "github.com/TimeleapLabs/unchained/internal/ent" + "github.com/TimeleapLabs/unchained/internal/model" +) + +// EvenetLog interface represents the methods that can be used to interact with the EventLog table in the database. +type EventLog interface { + Find(ctx context.Context, block uint64, hash []byte, index uint64) ([]*ent.EventLog, error) + Upsert(ctx context.Context, data model.EventLog) error +} + +// Signer interface represents the methods that can be used to interact with the Signer table in the database. +type Signer interface { + CreateSigners(ctx context.Context, signers []model.Signer) error + GetSingerIDsByKeys(ctx context.Context, keys [][]byte) ([]int, error) +} + +// AssetPrice interface represents the methods that can be used to interact with the AssetPrice table in the database. +type AssetPrice interface { + Find(ctx context.Context, block uint64, chain string, name string, pair string) ([]*ent.AssetPrice, error) + Upsert(ctx context.Context, data model.AssetPrice) error +} + +// CorrectnessReport interface represents the methods that can be used to interact with the CorrectnessReport table in the database. +type CorrectnessReport interface { + Find(ctx context.Context, hash []byte, topic []byte, timestamp uint64) ([]*ent.CorrectnessReport, error) + Upsert(ctx context.Context, data model.Correctness) error +} + +// MessagingRepository interface represents the methods that can be used to interact with the messaging service. +type MessagingRepository interface { + Send(ctx context.Context, channel string, payload []byte) error + Listen(ctx context.Context, channel string) (chan []byte, error) +} diff --git a/internal/scheduler/evmlog.go b/internal/scheduler/evmlog.go new file mode 100644 index 00000000..979f1dd5 --- /dev/null +++ b/internal/scheduler/evmlog.go @@ -0,0 +1,34 @@ +package scheduler + +import ( + "context" + + "github.com/TimeleapLabs/unchained/internal/service/evmlog" +) + +// EvmLog is a scheduler for EvmLog and keep task's dependencies. +type EvmLog struct { + chain string + evmLogService evmlog.Service +} + +// Run will trigger by the scheduler and process the EvmLog blocks. +func (e *EvmLog) Run() { + err := e.evmLogService.ProcessBlocks(context.TODO(), e.chain) + if err != nil { + panic(err) + } +} + +// NewEvmLog will create a new EvmLog task. +func NewEvmLog( + chanName string, + evmLogService evmlog.Service, +) *EvmLog { + e := EvmLog{ + chain: chanName, + evmLogService: evmLogService, + } + + return &e +} diff --git a/internal/scheduler/scheduler.go b/internal/scheduler/scheduler.go index 07aa70f9..f76a464f 100644 --- a/internal/scheduler/scheduler.go +++ b/internal/scheduler/scheduler.go @@ -4,16 +4,11 @@ import ( "os" "time" - "github.com/TimeleapLabs/unchained/internal/crypto/ethereum" + "github.com/TimeleapLabs/unchained/internal/utils" - "github.com/TimeleapLabs/unchained/internal/persistence" - "github.com/TimeleapLabs/unchained/internal/scheduler/uniswap" + "github.com/TimeleapLabs/unchained/internal/config" evmLogService "github.com/TimeleapLabs/unchained/internal/service/evmlog" uniswapService "github.com/TimeleapLabs/unchained/internal/service/uniswap" - - "github.com/TimeleapLabs/unchained/internal/config" - "github.com/TimeleapLabs/unchained/internal/log" - "github.com/TimeleapLabs/unchained/internal/scheduler/logs" "github.com/go-co-op/gocron/v2" ) @@ -34,7 +29,7 @@ func New(options ...func(s *Scheduler)) *Scheduler { var err error s.scheduler, err = gocron.NewScheduler() if err != nil { - log.Logger.Error("Failed to create token scheduler.") + utils.Logger.Error("Failed to create token scheduler.") os.Exit(1) } @@ -45,45 +40,35 @@ func New(options ...func(s *Scheduler)) *Scheduler { return s } -func WithEthLogs( - evmLogService *evmLogService.Service, - ethRPC *ethereum.Repository, - persistence *persistence.BadgerRepository, -) func(s *Scheduler) { +// WithEthLogs adds eth logs tasks to the scheduler. +func WithEthLogs(evmLogService evmLogService.Service) func(s *Scheduler) { return func(s *Scheduler) { if config.App.Plugins.EthLog == nil { return } for name, duration := range config.App.Plugins.EthLog.Schedule { - s.AddTask(duration, logs.New( - name, config.App.Plugins.EthLog.Events, - evmLogService, ethRPC, persistence, - )) + s.AddTask(duration, NewEvmLog(name, evmLogService)) } } } -func WithUniswapEvents( - uniswapService *uniswapService.Service, - ethRPC *ethereum.Repository, -) func(s *Scheduler) { +// WithUniswapEvents adds uniswap events tasks to the scheduler. +func WithUniswapEvents(uniswapService uniswapService.Service) func(s *Scheduler) { return func(s *Scheduler) { if config.App.Plugins.Uniswap == nil { return } for name, duration := range config.App.Plugins.Uniswap.Schedule { - s.AddTask(duration, uniswap.New( - name, config.App.Plugins.Uniswap.Tokens, - uniswapService, ethRPC, - )) + s.AddTask(duration, NewUniswap(name, uniswapService)) } } } +// AddTask adds a new task to the scheduler. func (s *Scheduler) AddTask(duration time.Duration, task Task) { - log.Logger. + utils.Logger. With("duration", duration). Info("New UniSwap task scheduled") @@ -93,11 +78,12 @@ func (s *Scheduler) AddTask(duration time.Duration, task Task) { gocron.WithSingletonMode(gocron.LimitModeReschedule), ) if err != nil { - log.Logger.Error("Failed to schedule task") + utils.Logger.Error("Failed to schedule task") os.Exit(1) } } +// Start starts the scheduler. func (s *Scheduler) Start() { s.scheduler.Start() diff --git a/internal/scheduler/uniswap.go b/internal/scheduler/uniswap.go new file mode 100644 index 00000000..5512c8ba --- /dev/null +++ b/internal/scheduler/uniswap.go @@ -0,0 +1,34 @@ +package scheduler + +import ( + "context" + + "github.com/TimeleapLabs/unchained/internal/service/uniswap" +) + +// Uniswap is a scheduler for Uniswap and keep task's dependencies. +type Uniswap struct { + chain string + uniswapService uniswap.Service +} + +// Run will trigger by the scheduler and process the Uniswap blocks. +func (u *Uniswap) Run() { + err := u.uniswapService.ProcessBlocks(context.TODO(), u.chain) + if err != nil { + panic(err) + } +} + +// NewUniswap will create a new Uniswap task. +func NewUniswap( + chanName string, + uniswapService uniswap.Service, +) *Uniswap { + u := Uniswap{ + chain: chanName, + uniswapService: uniswapService, + } + + return &u +} diff --git a/internal/scheduler/uniswap/uniswap.go b/internal/scheduler/uniswap/uniswap.go deleted file mode 100644 index d5db0ee8..00000000 --- a/internal/scheduler/uniswap/uniswap.go +++ /dev/null @@ -1,84 +0,0 @@ -package uniswap - -import ( - "fmt" - "math/big" - "os" - "strings" - - "github.com/TimeleapLabs/unchained/internal/crypto/ethereum" - - "github.com/TimeleapLabs/unchained/internal/datasets" - - "github.com/TimeleapLabs/unchained/internal/config" - "github.com/TimeleapLabs/unchained/internal/log" - "github.com/TimeleapLabs/unchained/internal/service/uniswap" - lru "github.com/hashicorp/golang-lru/v2" -) - -const ( - SizeOfPriceCacheLru = 128 -) - -type Uniswap struct { - chain string - uniswapService *uniswap.Service - ethRPC *ethereum.Repository -} - -func (u *Uniswap) Run() { - if config.App.Plugins.Uniswap == nil { - return - } - - currBlockNumber, err := u.uniswapService.GetBlockNumber(u.chain) - if err != nil { - log.Logger.Error( - fmt.Sprintf("Couldn't get latest block from %s RPC.", u.chain)) - u.ethRPC.RefreshRPC(u.chain) - return - } - - for _, token := range datasets.NewTokensFromCfg(config.App.Plugins.Uniswap.Tokens) { - if token.Chain != u.chain { - continue - } - - // TODO: this can be cached - key := u.uniswapService.TokenKey(token) - tokenLastBlock, exists := u.uniswapService.LastBlock.Load(*key) - - if !exists { - u.uniswapService.LastBlock.Store(*key, *currBlockNumber-1) - } else if tokenLastBlock == *currBlockNumber { - return - } - - u.uniswapService.SyncBlocks(token, *key, *currBlockNumber) - } -} - -func New( - chanName string, tokens []config.Token, - uniswapService *uniswap.Service, - ethRPC *ethereum.Repository, -) *Uniswap { - u := Uniswap{ - chain: chanName, - uniswapService: uniswapService, - ethRPC: ethRPC, - } - - for _, t := range tokens { - token := datasets.NewTokenFromCfg(t) - var err error - u.uniswapService.PriceCache[strings.ToLower(token.Pair)], err = lru.New[uint64, big.Int](SizeOfPriceCacheLru) - - if err != nil { - log.Logger.Error("Failed to initialize token map.") - os.Exit(1) - } - } - - return &u -} diff --git a/internal/service/correctness/correctness.go b/internal/service/correctness/correctness.go index d4eb6b1c..ad4524d1 100644 --- a/internal/service/correctness/correctness.go +++ b/internal/service/correctness/correctness.go @@ -8,22 +8,18 @@ import ( "sync" "time" - "github.com/TimeleapLabs/unchained/internal/address" - "github.com/TimeleapLabs/unchained/internal/crypto/ethereum" - "github.com/TimeleapLabs/unchained/internal/log" - "github.com/TimeleapLabs/unchained/internal/pos" + "github.com/TimeleapLabs/unchained/internal/consts" + "github.com/TimeleapLabs/unchained/internal/model" + "github.com/TimeleapLabs/unchained/internal/repository" + "github.com/TimeleapLabs/unchained/internal/service/pos" + "github.com/TimeleapLabs/unchained/internal/utils/address" + "github.com/TimeleapLabs/unchained/internal/service/evmlog" "github.com/puzpuzpuz/xsync/v3" "github.com/TimeleapLabs/unchained/internal/config" "github.com/TimeleapLabs/unchained/internal/crypto/bls" - "github.com/TimeleapLabs/unchained/internal/crypto/shake" - "github.com/TimeleapLabs/unchained/internal/datasets" - "github.com/TimeleapLabs/unchained/internal/db" "github.com/TimeleapLabs/unchained/internal/ent" - "github.com/TimeleapLabs/unchained/internal/ent/correctnessreport" - "github.com/TimeleapLabs/unchained/internal/ent/helpers" - "github.com/TimeleapLabs/unchained/internal/ent/signer" "github.com/TimeleapLabs/unchained/internal/utils" bls12381 "github.com/consensys/gnark-crypto/ecc/bls12-381" lru "github.com/hashicorp/golang-lru/v2" @@ -33,21 +29,27 @@ const ( LruSize = 128 ) -type Conf struct { - Topic string `mapstructure:"name"` -} - type SaveSignatureArgs struct { - Info datasets.Correctness + Info model.Correctness Hash bls12381.G1Affine Consensus bool Voted *big.Int } -type Service struct { - ethRPC *ethereum.Repository - pos *pos.Repository - signatureCache *lru.Cache[bls12381.G1Affine, []datasets.Signature] +type Service interface { + IsNewSigner(signature model.Signature, records []*ent.CorrectnessReport) bool + RecordSignature( + ctx context.Context, signature bls12381.G1Affine, signer model.Signer, hash bls12381.G1Affine, info model.Correctness, debounce bool, + ) error + SaveSignatures(ctx context.Context, args SaveSignatureArgs) error +} + +type service struct { + pos pos.Service + signerRepo repository.Signer + correctnessRepo repository.CorrectnessReport + + signatureCache *lru.Cache[bls12381.G1Affine, []model.Signature] consensus *lru.Cache[Key, xsync.MapOf[bls12381.G1Affine, big.Int]] DebouncedSaveSignatures func(key bls12381.G1Affine, arg SaveSignatureArgs) @@ -55,19 +57,8 @@ type Service struct { supportedTopics map[[64]byte]bool } -// TODO: This code should be moved to a shared library -func (s *Service) GetBlockNumber(network string) (*uint64, error) { - blockNumber, err := s.ethRPC.GetBlockNumber(network) - - if err != nil { - s.ethRPC.RefreshRPC(network) - return nil, err - } - - return &blockNumber, nil -} - -func (s *Service) IsNewSigner(signature datasets.Signature, records []*ent.CorrectnessReport) bool { +// IsNewSigner checks if the signer's pub key is in the records signers or not. +func (s *service) IsNewSigner(signature model.Signature, records []*ent.CorrectnessReport) bool { // TODO: This isn't efficient, we should use a map for _, record := range records { for _, signer := range record.Edges.Signers { @@ -82,33 +73,32 @@ func (s *Service) IsNewSigner(signature datasets.Signature, records []*ent.Corre // TODO: How should we handle older records? // Possible Solution: Add a not after timestamp to the document. -func (s *Service) RecordSignature( - signature bls12381.G1Affine, - signer datasets.Signer, - hash bls12381.G1Affine, - info datasets.Correctness, - debounce bool) { +func (s *service) RecordSignature( + ctx context.Context, signature bls12381.G1Affine, signer model.Signer, hash bls12381.G1Affine, info model.Correctness, debounce bool, +) error { if supported := s.supportedTopics[info.Topic]; !supported { - return + utils.Logger. + With("Topic", info.Topic). + Debug("Token not supported") + return consts.ErrTopicNotSupported } s.signatureMutex.Lock() defer s.signatureMutex.Unlock() signatures, ok := s.signatureCache.Get(hash) - if !ok { - signatures = make([]datasets.Signature, 0) + signatures = make([]model.Signature, 0) } // Check for duplicates for _, sig := range signatures { if sig.Signer.PublicKey == signer.PublicKey { - return + return consts.ErrDuplicateSignature } } - packed := datasets.Signature{ + packed := model.Signature{ Signature: signature, Signer: signer, } @@ -130,13 +120,13 @@ func (s *Service) RecordSignature( voted = *big.NewInt(0) } - votingPower, err := s.pos.GetVotingPowerOfPublicKey(signer.PublicKey) + votingPower, err := s.pos.GetVotingPowerOfPublicKey(ctx, signer.PublicKey) if err != nil { - log.Logger. + utils.Logger. With("Address", address.Calculate(signer.PublicKey[:])). With("Error", err). Error("Failed to get voting power") - return + return err } totalVoted := new(big.Int).Add(votingPower, &voted) @@ -161,22 +151,24 @@ func (s *Service) RecordSignature( if debounce { s.DebouncedSaveSignatures(hash, saveArgs) - } else { - s.SaveSignatures(saveArgs) + return nil + } + + err = s.SaveSignatures(ctx, saveArgs) + if err != nil { + return err } + + return nil } -func (s *Service) SaveSignatures(args SaveSignatureArgs) { - dbClient := db.GetClient() +func (s *service) SaveSignatures(ctx context.Context, args SaveSignatureArgs) error { signatures, ok := s.signatureCache.Get(args.Hash) - if !ok { - return + return consts.ErrSignatureNotfound } - ctx := context.Background() - - var newSigners []datasets.Signer + var newSigners []model.Signer var newSignatures []bls12381.G1Affine var keys [][]byte @@ -185,17 +177,9 @@ func (s *Service) SaveSignatures(args SaveSignatureArgs) { keys = append(keys, signature.Signer.PublicKey[:]) } - currentRecords, err := dbClient.CorrectnessReport. - Query(). - Where(correctnessreport.And( - correctnessreport.Hash(args.Info.Hash[:]), - correctnessreport.Topic(args.Info.Topic[:]), - correctnessreport.Timestamp(args.Info.Timestamp), - )). - All(ctx) - + currentRecords, err := s.correctnessRepo.Find(ctx, args.Info.Hash, args.Info.Topic[:], args.Info.Timestamp) if err != nil && !ent.IsNotFound(err) { - panic(err) + return err } // Select the new signers and signatures @@ -212,34 +196,15 @@ func (s *Service) SaveSignatures(args SaveSignatureArgs) { } // TODO: This part can be a shared library - err = dbClient.Signer.MapCreateBulk(newSigners, func(sc *ent.SignerCreate, i int) { - signer := newSigners[i] - sc.SetName(signer.Name). - SetEvm(signer.EvmAddress). - SetKey(signer.PublicKey[:]). - SetShortkey(signer.ShortPublicKey[:]). - SetPoints(0) - }). - OnConflictColumns("shortkey"). - UpdateName(). - UpdateEvm(). - UpdateKey(). - Update(func(su *ent.SignerUpsert) { - su.AddPoints(1) - }). - Exec(ctx) + err = s.signerRepo.CreateSigners(ctx, newSigners) if err != nil { - panic(err) + return err } - signerIDs, err := dbClient.Signer. - Query(). - Where(signer.KeyIn(keys...)). - IDs(ctx) - + signerIDs, err := s.signerRepo.GetSingerIDsByKeys(ctx, keys) if err != nil { - return + return err } var aggregate bls12381.G1Affine @@ -249,7 +214,7 @@ func (s *Service) SaveSignatures(args SaveSignatureArgs) { currentSignature, err := bls.RecoverSignature([48]byte(record.Signature)) if err != nil { - panic(err) + return err } newSignatures = append(newSignatures, currentSignature) @@ -258,63 +223,65 @@ func (s *Service) SaveSignatures(args SaveSignatureArgs) { } aggregate, err = bls.AggregateSignatures(newSignatures) - if err != nil { - return + return consts.ErrCantAggregateSignatures } signatureBytes := aggregate.Bytes() - err = dbClient.CorrectnessReport. - Create(). - SetCorrect(args.Info.Correct). - SetSignersCount(uint64(len(signatures))). - SetSignature(signatureBytes[:]). - SetHash(args.Info.Hash[:]). - SetTimestamp(args.Info.Timestamp). - SetTopic(args.Info.Topic[:]). - SetConsensus(args.Consensus). - SetVoted(&helpers.BigInt{Int: *args.Voted}). - AddSignerIDs(signerIDs...). - OnConflictColumns("topic", "hash"). - UpdateNewValues(). - Exec(ctx) - + err = s.correctnessRepo.Upsert(ctx, model.Correctness{ + SignersCount: uint64(len(signatures)), + Signature: signatureBytes[:], + Consensus: args.Consensus, + Voted: *args.Voted, + SignerIDs: signerIDs, + Timestamp: args.Info.Timestamp, + Hash: args.Info.Hash, + Topic: args.Info.Topic, + Correct: args.Info.Correct, + }) if err != nil { - panic(err) + return err } s.signatureCache.Remove(args.Hash) + + return nil } -func (s *Service) init() { +func (s *service) init() { var err error s.DebouncedSaveSignatures = utils.Debounce[bls12381.G1Affine, SaveSignatureArgs](5*time.Second, s.SaveSignatures) s.signatureMutex = new(sync.Mutex) s.supportedTopics = make(map[[64]byte]bool) - s.signatureCache, err = lru.New[bls12381.G1Affine, []datasets.Signature](LruSize) + s.signatureCache, err = lru.New[bls12381.G1Affine, []model.Signature](LruSize) if err != nil { panic(err) } } -func New(ethRPC *ethereum.Repository, pos *pos.Repository) *Service { - c := Service{ - ethRPC: ethRPC, - pos: pos, +func New( + pos pos.Service, + signerRepo repository.Signer, + correctnessRepo repository.CorrectnessReport, +) Service { + c := service{ + pos: pos, + signerRepo: signerRepo, + correctnessRepo: correctnessRepo, } c.init() for _, conf := range config.App.Plugins.Correctness { - c.supportedTopics[[64]byte(shake.Shake([]byte(conf)))] = true + c.supportedTopics[[64]byte(utils.Shake([]byte(conf)))] = true } var err error c.consensus, err = lru.New[Key, xsync.MapOf[bls12381.G1Affine, big.Int]](evmlog.LruSize) if err != nil { - log.Logger. + utils.Logger. Error("Failed to create correctness consensus cache.") os.Exit(1) } diff --git a/internal/service/correctness/correctness_test.go b/internal/service/correctness/correctness_test.go new file mode 100644 index 00000000..ca5462ba --- /dev/null +++ b/internal/service/correctness/correctness_test.go @@ -0,0 +1,99 @@ +package correctness + +import ( + "testing" + + "github.com/TimeleapLabs/unchained/internal/ent" + "github.com/TimeleapLabs/unchained/internal/model" + postgresRepo "github.com/TimeleapLabs/unchained/internal/repository/postgres" + "github.com/TimeleapLabs/unchained/internal/service/pos" + "github.com/TimeleapLabs/unchained/internal/transport/database/mock" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/suite" +) + +var ( + SignerOne = model.Signature{ + Signer: model.Signer{ + PublicKey: [96]byte{1, 2, 3}, + }, + } + SignerTwo = model.Signature{ + Signer: model.Signer{ + PublicKey: [96]byte{3, 2, 1}, + }, + } +) + +type CorrectnessTestSuite struct { + suite.Suite + service Service +} + +func (s *CorrectnessTestSuite) SetupTest() { + db := mock.New(s.T()) + + posService := new(pos.MockService) + + signerRepo := postgresRepo.NewSigner(db) + correctnessRepo := postgresRepo.NewCorrectness(db) + + s.service = New(posService, signerRepo, correctnessRepo) +} + +func (s *CorrectnessTestSuite) TestIsNewSigner() { + s.Run("Check if new signer with empty values", func() { + isSigner := s.service.IsNewSigner(model.Signature{}, []*ent.CorrectnessReport{}) + assert.False(s.T(), isSigner) + }) + + s.Run("Check when sign is new signer", func() { + signers := make([]byte, 96) + for i := 1; i < 4; i++ { + signers[i] = byte(i) + } + + isSigner := s.service.IsNewSigner( + SignerOne, + []*ent.CorrectnessReport{ + { + Edges: ent.CorrectnessReportEdges{ + Signers: []*ent.Signer{ + { + Key: signers, + }, + }, + }, + }, + }, + ) + assert.True(s.T(), isSigner) + }) + + s.Run("Check when sign is not new signer", func() { + signers := make([]byte, 96) + for i := 2; i < 4; i++ { + signers[i] = byte(i) + } + + isSigner := s.service.IsNewSigner( + SignerTwo, + []*ent.CorrectnessReport{ + { + Edges: ent.CorrectnessReportEdges{ + Signers: []*ent.Signer{ + { + Key: signers, + }, + }, + }, + }, + }, + ) + assert.True(s.T(), isSigner) + }) +} + +func TestCorrectnessSuite(t *testing.T) { + suite.Run(t, new(CorrectnessTestSuite)) +} diff --git a/internal/service/evmlog/evmlog.go b/internal/service/evmlog/evmlog.go index 08f0b352..b96d1bfb 100644 --- a/internal/service/evmlog/evmlog.go +++ b/internal/service/evmlog/evmlog.go @@ -4,28 +4,26 @@ import ( "context" "fmt" "math/big" + "os" "slices" "sync" "time" + "github.com/TimeleapLabs/unchained/internal/consts" + "github.com/TimeleapLabs/unchained/internal/model" + "github.com/TimeleapLabs/unchained/internal/repository" + "github.com/TimeleapLabs/unchained/internal/service/pos" + "github.com/ethereum/go-ethereum/accounts/abi" + "github.com/TimeleapLabs/unchained/internal/crypto/ethereum" - "github.com/TimeleapLabs/unchained/internal/address" "github.com/TimeleapLabs/unchained/internal/config" - "github.com/TimeleapLabs/unchained/internal/constants/opcodes" "github.com/TimeleapLabs/unchained/internal/crypto/bls" - "github.com/TimeleapLabs/unchained/internal/datasets" - "github.com/TimeleapLabs/unchained/internal/db" "github.com/TimeleapLabs/unchained/internal/ent" - "github.com/TimeleapLabs/unchained/internal/ent/eventlog" "github.com/TimeleapLabs/unchained/internal/ent/helpers" - "github.com/TimeleapLabs/unchained/internal/ent/signer" - "github.com/TimeleapLabs/unchained/internal/log" - "github.com/TimeleapLabs/unchained/internal/pos" "github.com/TimeleapLabs/unchained/internal/transport/client/conn" "github.com/TimeleapLabs/unchained/internal/utils" bls12381 "github.com/consensys/gnark-crypto/ecc/bls12-381" - "github.com/ethereum/go-ethereum/accounts/abi" lru "github.com/hashicorp/golang-lru/v2" ) @@ -35,185 +33,69 @@ const ( ) type SaveSignatureArgs struct { - Info datasets.EventLog + Info model.EventLog Hash bls12381.G1Affine Consensus bool Voted *big.Int } -type Service struct { - ethRPC *ethereum.Repository - pos *pos.Repository +type Service interface { + GetBlockNumber(ctx context.Context, network string) (*uint64, error) + SaveSignatures(ctx context.Context, args SaveSignatureArgs) error + SendPriceReport(signature bls12381.G1Affine, event model.EventLog) + ProcessBlocks(ctx context.Context, chain string) error + RecordSignature( + ctx context.Context, signature bls12381.G1Affine, signer model.Signer, hash bls12381.G1Affine, info model.EventLog, debounce bool, historical bool, + ) error +} + +type service struct { + ethRPC ethereum.RPC + pos pos.Service + eventLogRepo repository.EventLog + signerRepo repository.Signer + persistence *Badger consensus *lru.Cache[EventKey, map[bls12381.G1Affine]big.Int] - signatureCache *lru.Cache[bls12381.G1Affine, []datasets.Signature] + signatureCache *lru.Cache[bls12381.G1Affine, []model.Signature] DebouncedSaveSignatures func(key bls12381.G1Affine, arg SaveSignatureArgs) signatureMutex *sync.Mutex supportedEvents map[SupportKey]bool - abiMap map[string]abi.ABI lastSyncedBlock map[config.Event]uint64 + abiMap map[string]abi.ABI } -func (e *Service) GetBlockNumber(network string) (*uint64, error) { - blockNumber, err := e.ethRPC.GetBlockNumber(network) +func (s *service) GetBlockNumber(ctx context.Context, network string) (*uint64, error) { + blockNumber, err := s.ethRPC.GetBlockNumber(ctx, network) if err != nil { - e.ethRPC.RefreshRPC(network) + s.ethRPC.RefreshRPC(network) return nil, err } return &blockNumber, nil } -func (e *Service) RecordSignature( - signature bls12381.G1Affine, signer datasets.Signer, hash bls12381.G1Affine, info datasets.EventLog, debounce bool, historical bool, -) { - supportKey := SupportKey{ - Chain: info.Chain, - Address: info.Address, - Event: info.Event, - } - - if supported := e.supportedEvents[supportKey]; !supported { - return - } - - // TODO: Standalone mode shouldn't call this or check consensus - blockNumber, err := e.GetBlockNumber(info.Chain) - - if err != nil { - panic(err) - } - - if !historical { - // TODO: this won't work for Arbitrum - // TODO: we disallow syncing historical events here - if *blockNumber-info.Block > BlockOutOfRange { - log.Logger. - With("Packet", info.Block). - With("Current", *blockNumber). - Debug("Data too old") - return // Data too old - } - } - - e.signatureMutex.Lock() - defer e.signatureMutex.Unlock() - - key := EventKey{ - Chain: info.Chain, - TxHash: info.TxHash, - LogIndex: info.LogIndex, - } - - if !e.consensus.Contains(key) { - e.consensus.Add(key, make(map[bls12381.G1Affine]big.Int)) - } - - votingPower, err := e.pos.GetVotingPowerOfPublicKey(signer.PublicKey) - if err != nil { - log.Logger. - With("Address", address.Calculate(signer.PublicKey[:])). - With("Error", err). - Error("Failed to get voting power") - return - } - - reportedValues, _ := e.consensus.Get(key) - voted := reportedValues[hash] - totalVoted := new(big.Int).Add(votingPower, &voted) - isMajority := true - - for _, reportCount := range reportedValues { - if reportCount.Cmp(totalVoted) == 1 { - isMajority = false - break - } - } - - cached, _ := e.signatureCache.Get(hash) - - packed := datasets.Signature{ - Signature: signature, - Signer: signer, - } - - for _, item := range cached { - if item.Signer.PublicKey == signer.PublicKey { - return - } - } - - reportedValues[hash] = *totalVoted - cached = append(cached, packed) - e.signatureCache.Add(hash, cached) - - saveArgs := SaveSignatureArgs{ - Hash: hash, - Info: info, - Consensus: isMajority, - Voted: totalVoted, - } - - if debounce { - e.DebouncedSaveSignatures(hash, saveArgs) - } else { - e.SaveSignatures(saveArgs) - } -} - -func IsNewSigner(signature datasets.Signature, records []*ent.EventLog) bool { - for _, record := range records { - for _, signer := range record.Edges.Signers { - if signature.Signer.PublicKey == [96]byte(signer.Key) { - return false - } - } - } - - return true -} - -func sortEventArgs(lhs datasets.EventLogArg, rhs datasets.EventLogArg) int { - if lhs.Name < rhs.Name { - return -1 - } - return 1 -} - -func (e *Service) SaveSignatures(args SaveSignatureArgs) { - dbClient := db.GetClient() - signatures, ok := e.signatureCache.Get(args.Hash) - +func (s *service) SaveSignatures(ctx context.Context, args SaveSignatureArgs) error { + signatures, ok := s.signatureCache.Get(args.Hash) if !ok { - return + return consts.ErrInvalidSignature } - ctx := context.Background() - - var newSigners []datasets.Signer + var newSigners []model.Signer var newSignatures []bls12381.G1Affine var keys [][]byte - currentRecords, err := dbClient.EventLog. - Query(). - Where( - eventlog.Block(args.Info.Block), - eventlog.TransactionEQ(args.Info.TxHash[:]), - eventlog.IndexEQ(args.Info.LogIndex), - ). - WithSigners(). - All(ctx) - + currentRecords, err := s.eventLogRepo.Find(ctx, args.Info.Block, args.Info.TxHash[:], args.Info.LogIndex) if err != nil && !ent.IsNotFound(err) { - panic(err) + return err } for i := range signatures { signature := signatures[i] keys = append(keys, signature.Signer.PublicKey[:]) - if !IsNewSigner(signature, currentRecords) { + if !isNewSigner(signature, currentRecords) { continue } @@ -221,45 +103,26 @@ func (e *Service) SaveSignatures(args SaveSignatureArgs) { newSigners = append(newSigners, signature.Signer) } - // TODO: This part can be a shared library - err = dbClient.Signer.MapCreateBulk(newSigners, func(sc *ent.SignerCreate, i int) { - signer := newSigners[i] - sc.SetName(signer.Name). - SetEvm(signer.EvmAddress). - SetKey(signer.PublicKey[:]). - SetShortkey(signer.ShortPublicKey[:]). - SetPoints(0) - }). - OnConflictColumns("shortkey"). - UpdateName(). - UpdateEvm(). - UpdateKey(). - Update(func(su *ent.SignerUpsert) { - su.AddPoints(1) - }). - Exec(ctx) + err = s.signerRepo.CreateSigners(ctx, newSigners) if err != nil { - panic(err) + return err } - signerIDs, err := dbClient.Signer. - Query(). - Where(signer.KeyIn(keys...)). - IDs(ctx) + signerIDs, err := s.signerRepo.GetSingerIDsByKeys(ctx, keys) if err != nil { - return + return err } var aggregate bls12381.G1Affine - sortedCurrentArgs := make([]datasets.EventLogArg, len(args.Info.Args)) + sortedCurrentArgs := make([]model.EventLogArg, len(args.Info.Args)) copy(sortedCurrentArgs, args.Info.Args) slices.SortFunc(sortedCurrentArgs, sortEventArgs) for _, record := range currentRecords { - sortedRecordArgs := make([]datasets.EventLogArg, len(args.Info.Args)) + sortedRecordArgs := make([]model.EventLogArg, len(args.Info.Args)) copy(sortedRecordArgs, record.Args) slices.SortFunc(sortedRecordArgs, sortEventArgs) @@ -285,7 +148,7 @@ func (e *Service) SaveSignatures(args SaveSignatureArgs) { currentAggregate, err := bls.RecoverSignature([48]byte(record.Signature)) if err != nil { - log.Logger. + utils.Logger. With("Block", args.Info.Block). With("Transaction", fmt.Sprintf("%x", args.Info.TxHash)). With("Index", args.Info.LogIndex). @@ -293,7 +156,7 @@ func (e *Service) SaveSignatures(args SaveSignatureArgs) { With("Hash", fmt.Sprintf("%x", args.Hash.Bytes())[:8]). With("Error", err). Debug("Failed to recover signature") - return + return consts.ErrCantRecoverSignature } newSignatures = append(newSignatures, currentAggregate) @@ -303,64 +166,60 @@ func (e *Service) SaveSignatures(args SaveSignatureArgs) { aggregate, err = bls.AggregateSignatures(newSignatures) if err != nil { - return + return consts.ErrCantAggregateSignatures } signatureBytes := aggregate.Bytes() - err = dbClient.EventLog. - Create(). - SetBlock(args.Info.Block). - SetChain(args.Info.Chain). - SetAddress(args.Info.Address). - SetEvent(args.Info.Event). - SetIndex(args.Info.LogIndex). - SetTransaction(args.Info.TxHash[:]). - SetSignersCount(uint64(len(signatures))). - SetSignature(signatureBytes[:]). - SetArgs(args.Info.Args). - SetConsensus(args.Consensus). - SetVoted(&helpers.BigInt{Int: *args.Voted}). - AddSignerIDs(signerIDs...). - OnConflictColumns("block", "transaction", "index"). - UpdateNewValues(). - Exec(ctx) + args.Info.SignersCount = uint64(len(signatures)) + args.Info.SignerIDs = signerIDs + args.Info.Consensus = args.Consensus + args.Info.Signature = signatureBytes[:] + args.Info.Voted = &helpers.BigInt{Int: *args.Voted} + err = s.eventLogRepo.Upsert(ctx, args.Info) if err != nil { - panic(err) + return err } + + return nil } -func (e *Service) SendPriceReport(signature bls12381.G1Affine, event datasets.EventLog) { +func (s *service) SendPriceReport(signature bls12381.G1Affine, event model.EventLog) { compressedSignature := signature.Bytes() - priceReport := datasets.EventLogReport{ + priceReport := model.EventLogReportPacket{ EventLog: event, Signature: compressedSignature, } - payload := priceReport.Sia().Content - conn.Send(opcodes.EventLog, payload) + conn.Send(consts.OpCodeEventLog, priceReport.Sia().Bytes()) } func New( - ethRPC *ethereum.Repository, - pos *pos.Repository, -) *Service { - s := Service{ - ethRPC: ethRPC, - pos: pos, + ethRPC ethereum.RPC, + pos pos.Service, + eventLogRepo repository.EventLog, + signerRepo repository.Signer, + persistence *Badger, +) Service { + s := service{ + ethRPC: ethRPC, + pos: pos, + eventLogRepo: eventLogRepo, + signerRepo: signerRepo, + persistence: persistence, + + signatureMutex: new(sync.Mutex), + lastSyncedBlock: map[config.Event]uint64{}, + supportedEvents: make(map[SupportKey]bool), + abiMap: map[string]abi.ABI{}, } s.DebouncedSaveSignatures = utils.Debounce[bls12381.G1Affine, SaveSignatureArgs](5*time.Second, s.SaveSignatures) - s.signatureMutex = new(sync.Mutex) - - s.abiMap = make(map[string]abi.ABI) - s.lastSyncedBlock = make(map[config.Event]uint64) - s.supportedEvents = make(map[SupportKey]bool) var err error - s.signatureCache, err = lru.New[bls12381.G1Affine, []datasets.Signature](LruSize) + s.signatureCache, err = lru.New[bls12381.G1Affine, []model.Signature](LruSize) if err != nil { panic(err) } @@ -370,5 +229,36 @@ func New( panic(err) } + if config.App.Plugins.EthLog != nil { + for _, conf := range config.App.Plugins.EthLog.Events { + key := SupportKey{ + Chain: conf.Chain, + Address: conf.Address, + Event: conf.Event, + } + s.supportedEvents[key] = true + + if _, exists := s.abiMap[conf.Abi]; exists { + continue + } + + file, err := os.Open(conf.Abi) + if err != nil { + panic(err) + } + + contractAbi, err := abi.JSON(file) + if err != nil { + panic(err) + } + + s.abiMap[conf.Abi] = contractAbi + err = file.Close() + if err != nil { + panic(err) + } + } + } + return &s } diff --git a/internal/service/evmlog/helper.go b/internal/service/evmlog/helper.go new file mode 100644 index 00000000..3d9b18d0 --- /dev/null +++ b/internal/service/evmlog/helper.go @@ -0,0 +1,25 @@ +package evmlog + +import ( + "github.com/TimeleapLabs/unchained/internal/ent" + "github.com/TimeleapLabs/unchained/internal/model" +) + +func isNewSigner(signature model.Signature, records []*ent.EventLog) bool { + for _, record := range records { + for _, signer := range record.Edges.Signers { + if signature.Signer.PublicKey == [96]byte(signer.Key) { + return false + } + } + } + + return true +} + +func sortEventArgs(lhs model.EventLogArg, rhs model.EventLogArg) int { + if lhs.Name < rhs.Name { + return -1 + } + return 1 +} diff --git a/internal/persistence/persistence.go b/internal/service/evmlog/persistence.go similarity index 75% rename from internal/persistence/persistence.go rename to internal/service/evmlog/persistence.go index 2086ec45..223f0eae 100644 --- a/internal/persistence/persistence.go +++ b/internal/service/evmlog/persistence.go @@ -1,4 +1,4 @@ -package persistence +package evmlog import ( "encoding/binary" @@ -10,12 +10,12 @@ const ( SizeOfLogFile = 64 * 1024 * 1024 ) -type BadgerRepository struct { +type Badger struct { db *badger.DB } -func New(contextPath string) *BadgerRepository { - r := BadgerRepository{} +func NewBadger(contextPath string) *Badger { + r := Badger{} var err error options := badger. @@ -30,7 +30,7 @@ func New(contextPath string) *BadgerRepository { return &r } -func (r *BadgerRepository) ReadUInt64(key string) (uint64, error) { +func (r *Badger) ReadUInt64(key string) (uint64, error) { var value uint64 err := r.db.View(func(txn *badger.Txn) error { @@ -49,7 +49,7 @@ func (r *BadgerRepository) ReadUInt64(key string) (uint64, error) { return value, err } -func (r *BadgerRepository) WriteUint64(key string, value uint64) error { +func (r *Badger) WriteUint64(key string, value uint64) error { err := r.db.Update(func(txn *badger.Txn) error { bytes := binary.LittleEndian.AppendUint64([]byte{}, value) entry := badger.NewEntry([]byte(key), bytes) diff --git a/internal/service/evmlog/persistence_test.go b/internal/service/evmlog/persistence_test.go new file mode 100644 index 00000000..ed9a6c87 --- /dev/null +++ b/internal/service/evmlog/persistence_test.go @@ -0,0 +1,41 @@ +package evmlog + +import ( + "os" + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/suite" +) + +const ( + TestKey = "KEY" + TestValue uint64 = 100 +) + +type PersistenceTestSuite struct { + suite.Suite + badgerRepository *Badger +} + +func (s *PersistenceTestSuite) SetupTest() { + s.badgerRepository = NewBadger("./context") +} + +func (s *PersistenceTestSuite) TearDownSuite() { + err := os.RemoveAll("./context") + assert.NoError(s.T(), err) +} + +func (s *PersistenceTestSuite) TestWriteUint64() { + err := s.badgerRepository.WriteUint64(TestKey, TestValue) + assert.NoError(s.T(), err) + + gotValue, err := s.badgerRepository.ReadUInt64(TestKey) + assert.NoError(s.T(), err) + assert.Equal(s.T(), TestValue, gotValue) +} + +func TestPersistenceSuite(t *testing.T) { + suite.Run(t, new(PersistenceTestSuite)) +} diff --git a/internal/scheduler/logs/logs.go b/internal/service/evmlog/process.go similarity index 54% rename from internal/scheduler/logs/logs.go rename to internal/service/evmlog/process.go index a63b2d36..d07759df 100644 --- a/internal/scheduler/logs/logs.go +++ b/internal/service/evmlog/process.go @@ -1,23 +1,20 @@ -package logs +package evmlog import ( "context" "errors" "fmt" "math/big" - "os" "sort" "strings" - "github.com/TimeleapLabs/unchained/internal/crypto" - "github.com/TimeleapLabs/unchained/internal/crypto/ethereum" + "github.com/TimeleapLabs/unchained/internal/consts" + "github.com/TimeleapLabs/unchained/internal/model" + "github.com/TimeleapLabs/unchained/internal/utils" "github.com/TimeleapLabs/unchained/internal/config" + "github.com/TimeleapLabs/unchained/internal/crypto" "github.com/TimeleapLabs/unchained/internal/crypto/bls" - "github.com/TimeleapLabs/unchained/internal/datasets" - "github.com/TimeleapLabs/unchained/internal/log" - "github.com/TimeleapLabs/unchained/internal/persistence" - "github.com/TimeleapLabs/unchained/internal/service/evmlog" "github.com/dgraph-io/badger/v4" goEthereum "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/accounts/abi" @@ -26,47 +23,34 @@ import ( "golang.org/x/text/language" ) -type EvmLog struct { - chain string - evmLogService *evmlog.Service - ethRPC *ethereum.Repository - persistence *persistence.BadgerRepository - - supportedEvents map[evmlog.SupportKey]bool - abiMap map[string]abi.ABI - lastSyncedBlock map[config.Event]uint64 -} - -func (e *EvmLog) Run() { - if config.App.Plugins.EthLog == nil { - return - } - +func (s *service) ProcessBlocks(ctx context.Context, chain string) error { for _, conf := range config.App.Plugins.EthLog.Events { - if conf.Chain != e.chain { + if conf.Chain != chain { continue } - blockNumber, err := e.evmLogService.GetBlockNumber(e.chain) - allowedBlock := *blockNumber - conf.Confirmations - + // check if processing is needed + blockNumber, err := s.ethRPC.GetBlockNumber(ctx, chain) if err != nil { - return + s.ethRPC.RefreshRPC(chain) + return err } - if e.lastSyncedBlock[conf]+1 >= allowedBlock { - return + allowedBlock := blockNumber - conf.Confirmations + + if s.lastSyncedBlock[conf]+1 >= allowedBlock { + return consts.ErrAlreadySynced } contractAddress := common.HexToAddress(conf.Address) contextKey := fmt.Sprintf("plugins.logs.events.%s", conf.Name) - fromBlock := e.lastSyncedBlock[conf] + 1 + fromBlock := s.lastSyncedBlock[conf] + 1 - if e.lastSyncedBlock[conf] == 0 { - contextBlock, err := e.persistence.ReadUInt64(contextKey) + if s.lastSyncedBlock[conf] == 0 { + contextBlock, err := s.persistence.ReadUInt64(contextKey) if err != nil && !errors.Is(err, badger.ErrKeyNotFound) { - panic(err) + return err } fromBlock = allowedBlock - conf.Step @@ -89,14 +73,14 @@ func (e *EvmLog) Run() { Addresses: []common.Address{contractAddress}, } - rpcClient := e.ethRPC.Clients[conf.Chain] - logs, err := rpcClient.FilterLogs(context.Background(), query) + rpcClient := s.ethRPC.GetClient(conf.Chain) + logs, err := rpcClient.FilterLogs(ctx, query) if err != nil { - panic(err) + return err } - contractAbi := e.abiMap[conf.Abi] + contractAbi := s.abiMap[conf.Abi] caser := cases.Title(language.English, cases.NoLower) for _, vLog := range logs { @@ -108,13 +92,13 @@ func (e *EvmLog) Run() { } if err != nil { - panic(err) + return err } eventData := make(map[string]interface{}) err = contractAbi.UnpackIntoMap(eventData, eventAbi.Name, vLog.Data) if err != nil { - panic(err) + return err } indexedParams := make([]abi.Argument, 0) @@ -126,7 +110,7 @@ func (e *EvmLog) Run() { err = abi.ParseTopicsIntoMap(eventData, indexedParams, vLog.Topics[1:]) if err != nil { - panic(err) + return err } var keys []string @@ -134,7 +118,7 @@ func (e *EvmLog) Run() { keys = append(keys, k) } - message := log.Logger. + message := utils.Logger. With("Event", conf.Event). With("Block", vLog.BlockNumber) @@ -151,7 +135,7 @@ func (e *EvmLog) Run() { argTypes[input.Name] = input.Type.String() } - args := []datasets.EventLogArg{} + args := []model.EventLogArg{} for _, key := range keys { value := eventData[key] @@ -161,7 +145,7 @@ func (e *EvmLog) Run() { args = append( args, - datasets.EventLogArg{ + model.EventLogArg{ Name: key, Value: value, Type: argTypes[key], @@ -169,7 +153,7 @@ func (e *EvmLog) Run() { ) } - event := datasets.EventLog{ + event := model.EventLog{ LogIndex: uint64(vLog.Index), Block: vLog.BlockNumber, Address: vLog.Address.Hex(), @@ -179,78 +163,35 @@ func (e *EvmLog) Run() { Args: args, } - toHash := event.Sia().Content + toHash := event.Sia().Bytes() signature, hash := bls.Sign(*crypto.Identity.Bls.SecretKey, toHash) if conf.Send { - e.evmLogService.SendPriceReport(signature, event) + s.SendPriceReport(signature, event) } if conf.Store { - e.evmLogService.RecordSignature( + err = s.RecordSignature( + ctx, signature, - *crypto.Identity.ExportBlsSigner(), + *crypto.Identity.ExportEvmSigner(), hash, event, false, true, ) + if err != nil { + return err + } } } - e.lastSyncedBlock[conf] = toBlock - err = e.persistence.WriteUint64(contextKey, toBlock) - if err != nil { - panic(err) - } - } -} - -func New( - chanName string, events []config.Event, - evmLogService *evmlog.Service, - ethRPC *ethereum.Repository, - persistence *persistence.BadgerRepository, -) *EvmLog { - e := EvmLog{ - chain: chanName, - evmLogService: evmLogService, - ethRPC: ethRPC, - persistence: persistence, - - supportedEvents: map[evmlog.SupportKey]bool{}, - abiMap: map[string]abi.ABI{}, - lastSyncedBlock: map[config.Event]uint64{}, - } - - for _, conf := range events { - key := evmlog.SupportKey{ - Chain: conf.Chain, - Address: conf.Address, - Event: conf.Event, - } - e.supportedEvents[key] = true - - if _, exists := e.abiMap[conf.Abi]; exists { - continue - } - - file, err := os.Open(conf.Abi) - if err != nil { - panic(err) - } - - contractAbi, err := abi.JSON(file) - if err != nil { - panic(err) - } - - e.abiMap[conf.Abi] = contractAbi - err = file.Close() + s.lastSyncedBlock[conf] = toBlock + err = s.persistence.WriteUint64(contextKey, toBlock) if err != nil { - panic(err) + return err } } - return &e + return nil } diff --git a/internal/service/evmlog/record.go b/internal/service/evmlog/record.go new file mode 100644 index 00000000..706876df --- /dev/null +++ b/internal/service/evmlog/record.go @@ -0,0 +1,124 @@ +package evmlog + +import ( + "context" + "math/big" + + "github.com/TimeleapLabs/unchained/internal/consts" + "github.com/TimeleapLabs/unchained/internal/model" + "github.com/TimeleapLabs/unchained/internal/utils" + "github.com/TimeleapLabs/unchained/internal/utils/address" + + bls12381 "github.com/consensys/gnark-crypto/ecc/bls12-381" +) + +func (s *service) RecordSignature( + ctx context.Context, signature bls12381.G1Affine, signer model.Signer, hash bls12381.G1Affine, info model.EventLog, debounce bool, historical bool, +) error { + supportKey := SupportKey{ + Chain: info.Chain, + Address: info.Address, + Event: info.Event, + } + if supported := s.supportedEvents[supportKey]; !supported { + utils.Logger. + With("Chain", info.Chain). + With("Address", info.Address). + With("Event", info.Event). + Debug("Event not supported") + return consts.ErrEventNotSupported + } + + // TODO: Standalone mode shouldn't call this or check consensus + blockNumber, err := s.ethRPC.GetBlockNumber(ctx, info.Chain) + if err != nil { + s.ethRPC.RefreshRPC(info.Chain) + utils.Logger. + With("Network", info.Chain). + With("Error", err). + Error("Failed to get the latest block number") + return err + } + + if !historical { + // TODO: this won't work for Arbitrum + // TODO: we disallow syncing historical events here + if blockNumber-info.Block > BlockOutOfRange { + utils.Logger. + With("Packet", info.Block). + With("Current", blockNumber). + Debug("Data too old") + return consts.ErrDataTooOld + } + } + + s.signatureMutex.Lock() + defer s.signatureMutex.Unlock() + + key := EventKey{ + Chain: info.Chain, + TxHash: info.TxHash, + LogIndex: info.LogIndex, + } + + if !s.consensus.Contains(key) { + s.consensus.Add(key, make(map[bls12381.G1Affine]big.Int)) + } + + votingPower, err := s.pos.GetVotingPowerOfPublicKey(ctx, signer.PublicKey) + if err != nil { + utils.Logger. + With("Address", address.Calculate(signer.PublicKey[:])). + With("Error", err). + Error("Failed to get voting power") + return err + } + + reportedValues, _ := s.consensus.Get(key) + voted := reportedValues[hash] + totalVoted := new(big.Int).Add(votingPower, &voted) + isMajority := true + + for _, reportCount := range reportedValues { + if reportCount.Cmp(totalVoted) == 1 { + isMajority = false + break + } + } + + cached, _ := s.signatureCache.Get(hash) + + packed := model.Signature{ + Signature: signature, + Signer: signer, + } + + for _, item := range cached { + if item.Signer.PublicKey == signer.PublicKey { + return consts.ErrDuplicateSignature + } + } + + reportedValues[hash] = *totalVoted + cached = append(cached, packed) + s.signatureCache.Add(hash, cached) + + saveArgs := SaveSignatureArgs{ + Hash: hash, + Info: info, + Consensus: isMajority, + Voted: totalVoted, + } + + if debounce { + s.DebouncedSaveSignatures(hash, saveArgs) + return nil + } + + err = s.SaveSignatures(ctx, saveArgs) + if err != nil { + return err + } + + return nil +} diff --git a/internal/pos/eip712.go b/internal/service/pos/eip712.go similarity index 82% rename from internal/pos/eip712.go rename to internal/service/pos/eip712.go index 5498a085..fc18c7ba 100644 --- a/internal/pos/eip712.go +++ b/internal/service/pos/eip712.go @@ -4,22 +4,22 @@ import ( "context" "math/big" + "github.com/TimeleapLabs/unchained/internal/utils" + "github.com/TimeleapLabs/unchained/internal/crypto" "github.com/TimeleapLabs/unchained/internal/crypto/ethereum/contracts" "github.com/TimeleapLabs/unchained/internal/config" - "github.com/TimeleapLabs/unchained/internal/log" - "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" ) -func (s *Repository) Slash(address [20]byte, to common.Address, amount *big.Int, nftIDs []*big.Int) error { +func (s *service) Slash(ctx context.Context, address [20]byte, to common.Address, amount *big.Int, nftIDs []*big.Int) error { evmAddress, err := s.posContract.EvmAddressOf(nil, address) if err != nil { - log.Logger. + utils.Logger. With("Error", err). Error("Failed to get EVM address of the staker") return err @@ -35,7 +35,7 @@ func (s *Repository) Slash(address [20]byte, to common.Address, amount *big.Int, signature, err := s.eip712Signer.SignTransferRequest(crypto.Identity.Eth, &transfer) if err != nil { - log.Logger. + utils.Logger. With("Error", err). Error("Failed to sign transfer request") return err @@ -48,33 +48,33 @@ func (s *Repository) Slash(address [20]byte, to common.Address, amount *big.Int, ) if err != nil { - log.Logger. + utils.Logger. With("Error", err). Error("Failed to transfer") return err } receipt, err := bind.WaitMined( - context.Background(), - s.ethRPC.Clients[config.App.ProofOfStake.Chain], + ctx, + s.ethRPC.GetClient(config.App.ProofOfStake.Chain), tx, ) if err != nil { - log.Logger. + utils.Logger. With("Error", err). Error("Failed to wait for transaction to be mined") return err } if receipt.Status != types.ReceiptStatusSuccessful { - log.Logger. + utils.Logger. With("Error", err). Error("Transaction failed") return err } - log.Logger. + utils.Logger. With("Address", evmAddress.Hex()). With("To", to.Hex()). With("Amount", amount.String()). diff --git a/internal/pos/eip712/sign.go b/internal/service/pos/eip712/sign.go similarity index 100% rename from internal/pos/eip712/sign.go rename to internal/service/pos/eip712/sign.go diff --git a/internal/pos/eip712/types.go b/internal/service/pos/eip712/types.go similarity index 100% rename from internal/pos/eip712/types.go rename to internal/service/pos/eip712/types.go diff --git a/internal/pos/pos.go b/internal/service/pos/pos.go similarity index 54% rename from internal/pos/pos.go rename to internal/service/pos/pos.go index 9086c083..32c9e232 100644 --- a/internal/pos/pos.go +++ b/internal/service/pos/pos.go @@ -1,47 +1,52 @@ package pos import ( + "context" "math/big" - "os" + "github.com/TimeleapLabs/unchained/internal/config" "github.com/TimeleapLabs/unchained/internal/crypto" "github.com/TimeleapLabs/unchained/internal/crypto/ethereum" "github.com/TimeleapLabs/unchained/internal/crypto/ethereum/contracts" - - "github.com/TimeleapLabs/unchained/internal/address" - "github.com/TimeleapLabs/unchained/internal/config" - "github.com/TimeleapLabs/unchained/internal/log" - "github.com/TimeleapLabs/unchained/internal/pos/eip712" - + "github.com/TimeleapLabs/unchained/internal/service/pos/eip712" + "github.com/TimeleapLabs/unchained/internal/utils" + "github.com/TimeleapLabs/unchained/internal/utils/address" "github.com/puzpuzpuz/xsync/v3" ) -type Repository struct { - ethRPC *ethereum.Repository +type Service interface { + GetTotalVotingPower() (*big.Int, error) + GetVotingPowerFromContract(address [20]byte, block *big.Int) (*big.Int, error) + GetVotingPower(address [20]byte, block *big.Int) (*big.Int, error) + GetVotingPowerOfPublicKey(ctx context.Context, pkBytes [96]byte) (*big.Int, error) +} + +type service struct { + ethRPC ethereum.RPC posContract *contracts.UnchainedStaking - posChain string votingPowers *xsync.MapOf[[20]byte, *big.Int] lastUpdated *xsync.MapOf[[20]byte, *big.Int] base *big.Int eip712Signer *eip712.Signer } -func (s *Repository) GetTotalVotingPower() (*big.Int, error) { +func (s *service) GetTotalVotingPower() (*big.Int, error) { return s.posContract.GetTotalVotingPower(nil) } -func (s *Repository) GetVotingPowerFromContract(address [20]byte, block *big.Int) (*big.Int, error) { +func (s *service) GetVotingPowerFromContract(address [20]byte, block *big.Int) (*big.Int, error) { votingPower, err := s.posContract.GetVotingPower(nil, address) - - if err == nil { - s.votingPowers.Store(address, votingPower) - s.lastUpdated.Store(address, block) + if err != nil { + return votingPower, err } - return votingPower, err + s.votingPowers.Store(address, votingPower) + s.lastUpdated.Store(address, block) + + return votingPower, nil } -func (s *Repository) minBase(power *big.Int) *big.Int { +func (s *service) minBase(power *big.Int) *big.Int { if power == nil || power.Cmp(s.base) < 0 { return s.base } @@ -49,9 +54,8 @@ func (s *Repository) minBase(power *big.Int) *big.Int { return power } -func (s *Repository) GetVotingPower(address [20]byte, block *big.Int) (*big.Int, error) { +func (s *service) GetVotingPower(address [20]byte, block *big.Int) (*big.Int, error) { powerLastUpdated, ok := s.lastUpdated.Load(address) - if !ok { powerLastUpdated = big.NewInt(0) } @@ -70,40 +74,27 @@ func (s *Repository) GetVotingPower(address [20]byte, block *big.Int) (*big.Int, return s.base, nil } -func (s *Repository) GetVotingPowerOfPublicKeyAtBlock(pkBytes [96]byte, block *big.Int) (*big.Int, error) { +func (s *service) GetVotingPowerOfPublicKey(ctx context.Context, pkBytes [96]byte) (*big.Int, error) { _, addrHex := address.CalculateHex(pkBytes[:]) - return s.GetVotingPower(addrHex, block) -} - -func (s *Repository) GetVotingPowerOfPublicKey(pkBytes [96]byte) (*big.Int, error) { - _, addrHex := address.CalculateHex(pkBytes[:]) - block, err := s.ethRPC.GetBlockNumber(s.posChain) + block, err := s.ethRPC.GetBlockNumber(ctx, config.App.ProofOfStake.Chain) if err != nil { return nil, err } return s.GetVotingPower(addrHex, big.NewInt(int64(block))) } -func (s *Repository) VotingPowerToFloat(power *big.Int) *big.Float { - decimalPlaces := big.NewInt(1e18) - powerFloat := new(big.Float).SetInt(power) - powerFloat.Quo(powerFloat, new(big.Float).SetInt(decimalPlaces)) - return powerFloat -} - -func New(ethRPC *ethereum.Repository) *Repository { - s := &Repository{ - ethRPC: ethRPC, +func New(ethRPC ethereum.RPC) Service { + s := &service{ + ethRPC: ethRPC, + base: big.NewInt(config.App.ProofOfStake.Base), + votingPowers: xsync.NewMapOf[[20]byte, *big.Int](), + lastUpdated: xsync.NewMapOf[[20]byte, *big.Int](), } - s.init() - - s.base = big.NewInt(config.App.ProofOfStake.Base) - pkBytes := crypto.Identity.Bls.PublicKey.Bytes() addrHexStr, addrHex := address.CalculateHex(pkBytes[:]) - log.Logger. + utils.Logger. With("Address", addrHexStr). Info("PoS identity initialized") @@ -114,57 +105,47 @@ func New(ethRPC *ethereum.Repository) *Repository { config.App.ProofOfStake.Address, false, ) - if err != nil { - log.Logger. + utils.Logger. With("Error", err). Error("Failed to connect to the staking contract") - os.Exit(1) + panic(err) } power, err := s.GetVotingPower(addrHex, big.NewInt(0)) - if err != nil { - log.Logger. + utils.Logger. With("Error", err). Error("Failed to get voting power") - return s + panic(err) } total, err := s.GetTotalVotingPower() - if err != nil { - log.Logger. + utils.Logger. With("Error", err). Error("Failed to get total voting power") - return s + panic(err) } - log.Logger. - With("Power", s.VotingPowerToFloat(power)). - With("Network", s.VotingPowerToFloat(total)). + utils.Logger. + With("Power", utils.BigIntToFloat(power)). + With("Network", utils.BigIntToFloat(total)). Info("PoS") chainID, err := s.posContract.GetChainId(nil) - if err != nil { - log.Logger. + utils.Logger. With("Error", err). Error("Failed to get chain ID") - return s + panic(err) } s.eip712Signer = eip712.New(chainID, config.App.ProofOfStake.Address) - s.posChain = config.App.ProofOfStake.Chain return s } - -func (s *Repository) init() { - s.votingPowers = xsync.NewMapOf[[20]byte, *big.Int]() - s.lastUpdated = xsync.NewMapOf[[20]byte, *big.Int]() -} diff --git a/internal/service/pos/pos_mock.go b/internal/service/pos/pos_mock.go new file mode 100644 index 00000000..b72480b7 --- /dev/null +++ b/internal/service/pos/pos_mock.go @@ -0,0 +1,32 @@ +package pos + +import ( + "context" + "math/big" + + "github.com/stretchr/testify/mock" +) + +type MockService struct { + mock.Mock +} + +func (m *MockService) GetTotalVotingPower() (*big.Int, error) { + args := m.Called() + return big.NewInt(int64(args.Int(0))), args.Error(1) +} + +func (m *MockService) GetVotingPowerFromContract(address [20]byte, block *big.Int) (*big.Int, error) { + args := m.Called(address, block) + return big.NewInt(int64(args.Int(0))), args.Error(1) +} + +func (m *MockService) GetVotingPower(address [20]byte, block *big.Int) (*big.Int, error) { + args := m.Called(address, block) + return big.NewInt(int64(args.Int(0))), args.Error(1) +} + +func (m *MockService) GetVotingPowerOfPublicKey(_ context.Context, pkBytes [96]byte) (*big.Int, error) { + args := m.Called(pkBytes) + return big.NewInt(int64(args.Int(0))), args.Error(1) +} diff --git a/internal/service/pos/pos_test.go b/internal/service/pos/pos_test.go new file mode 100644 index 00000000..2918c13c --- /dev/null +++ b/internal/service/pos/pos_test.go @@ -0,0 +1,51 @@ +package pos + +import ( + "context" + "testing" + + "github.com/TimeleapLabs/unchained/internal/crypto" + "github.com/TimeleapLabs/unchained/internal/crypto/ethereum" + "github.com/TimeleapLabs/unchained/internal/utils" + "github.com/stretchr/testify/suite" +) + +type PosTestSuite struct { + suite.Suite + service Service +} + +func (s *PosTestSuite) SetupTest() { + utils.SetupLogger("info") + crypto.InitMachineIdentity( + crypto.WithBlsIdentity(), + crypto.WithEvmSigner(), + ) + + ethRPC := ethereum.NewMock() + s.service = New(ethRPC) +} + +func (s *PosTestSuite) TestGetTotalVotingPower() { + _, err := s.service.GetTotalVotingPower() + s.NoError(err) +} + +func (s *PosTestSuite) TestGetVotingPower() { + _, err := s.service.GetVotingPower([20]byte{}, nil) + s.NoError(err) +} + +func (s *PosTestSuite) TestGetVotingPowerFromContract() { + _, err := s.service.GetVotingPowerFromContract([20]byte{}, nil) + s.NoError(err) +} + +func (s *PosTestSuite) TestGetVotingPowerOfPublicKey() { + _, err := s.service.GetVotingPowerOfPublicKey(context.TODO(), [96]byte{}) + s.NoError(err) +} + +func TestPosSuite(t *testing.T) { + suite.Run(t, new(PosTestSuite)) +} diff --git a/internal/service/uniswap/helper.go b/internal/service/uniswap/helper.go new file mode 100644 index 00000000..ce63a731 --- /dev/null +++ b/internal/service/uniswap/helper.go @@ -0,0 +1,18 @@ +package uniswap + +import ( + "github.com/TimeleapLabs/unchained/internal/ent" + "github.com/TimeleapLabs/unchained/internal/model" +) + +func IsNewSigner(signature model.Signature, records []*ent.AssetPrice) bool { + for _, record := range records { + for _, signer := range record.Edges.Signers { + if signature.Signer.PublicKey == [96]byte(signer.Key) { + return false + } + } + } + + return true +} diff --git a/internal/service/uniswap/process.go b/internal/service/uniswap/process.go new file mode 100644 index 00000000..0e2a3af9 --- /dev/null +++ b/internal/service/uniswap/process.go @@ -0,0 +1,39 @@ +package uniswap + +import ( + "context" + + "github.com/TimeleapLabs/unchained/internal/config" + "github.com/TimeleapLabs/unchained/internal/model" +) + +func (s *service) ProcessBlocks(ctx context.Context, chain string) error { + currBlockNumber, err := s.ethRPC.GetBlockNumber(ctx, chain) + if err != nil { + s.ethRPC.RefreshRPC(chain) + return err + } + + for _, token := range model.NewTokensFromCfg(config.App.Plugins.Uniswap.Tokens) { + if token.Chain != chain { + continue + } + + // TODO: this can be cached + key := s.TokenKey(token) + tokenLastBlock, exists := s.LastBlock.Load(*key) + + if !exists { + s.LastBlock.Store(*key, currBlockNumber-1) + } else if tokenLastBlock == currBlockNumber { + return nil + } + + err = s.SyncBlocks(ctx, token, *key, currBlockNumber) + if err != nil { + return err + } + } + + return nil +} diff --git a/internal/service/uniswap/record.go b/internal/service/uniswap/record.go new file mode 100644 index 00000000..070c01b3 --- /dev/null +++ b/internal/service/uniswap/record.go @@ -0,0 +1,127 @@ +package uniswap + +import ( + "context" + "fmt" + "math/big" + + "github.com/TimeleapLabs/unchained/internal/consts" + "github.com/TimeleapLabs/unchained/internal/model" + "github.com/TimeleapLabs/unchained/internal/utils" + "github.com/TimeleapLabs/unchained/internal/utils/address" + + bls12381 "github.com/consensys/gnark-crypto/ecc/bls12-381" + "github.com/puzpuzpuz/xsync/v3" +) + +// TODO: This needs to work with different datasets +// TODO: Can we turn this into a library func? +func (s *service) RecordSignature( + ctx context.Context, signature bls12381.G1Affine, signer model.Signer, hash bls12381.G1Affine, info model.PriceInfo, debounce bool, historical bool, +) error { + if supported := s.SupportedTokens[info.Asset.Token]; !supported { + utils.Logger. + With("Name", info.Asset.Token.Name). + With("Chain", info.Asset.Token.Chain). + With("Pair", info.Asset.Token.Pair). + Debug("Token not supported") + return consts.ErrTokenNotSupported + } + + // TODO: Standalone mode shouldn't call this or check consensus + blockNumber, err := s.ethRPC.GetBlockNumber(ctx, info.Asset.Token.Chain) + if err != nil { + s.ethRPC.RefreshRPC(info.Asset.Token.Chain) + utils.Logger. + With("Network", info.Asset.Token.Chain). + With("Error", err). + Error("Failed to get the latest block number") + return err + } + + if !historical && blockNumber-info.Asset.Block > MaxBlockNumberDelta { + utils.Logger. + With("Packet", info.Asset.Block). + With("Current", blockNumber). + Debug("Data too old") + return consts.ErrDataTooOld + } + + if !s.consensus.Contains(info.Asset) { + s.consensus.Add(info.Asset, *xsync.NewMapOf[bls12381.G1Affine, big.Int]()) + } + + reportedValues, _ := s.consensus.Get(info.Asset) + isMajority := true + voted, ok := reportedValues.Load(hash) + if !ok { + voted = *big.NewInt(0) + } + + votingPower, err := s.pos.GetVotingPowerOfPublicKey(ctx, signer.PublicKey) + if err != nil { + utils.Logger. + With("Address", address.Calculate(signer.PublicKey[:])). + With("Error", err). + Error("Failed to get voting power") + return err + } + + totalVoted := new(big.Int).Add(votingPower, &voted) + + reportedValues.Range(func(_ bls12381.G1Affine, value big.Int) bool { + if value.Cmp(totalVoted) == 1 { + isMajority = false + } + return isMajority + }) + + err = s.checkAndCacheSignature(&reportedValues, signature, signer, hash, totalVoted) + if err != nil { + return err + } + + saveArgs := SaveSignatureArgs{ + Hash: hash, + Info: info, + Voted: totalVoted, + Consensus: isMajority, + } + + if !debounce { + err = s.saveSignatures(ctx, saveArgs) + if err != nil { + return err + } + return nil + } + + reportLog := utils.Logger. + With("Block", info.Asset.Block). + With("Price", info.Price.String()). + With("Token", info.Asset.Token.Name) + + reportedValues.Range(func(hash bls12381.G1Affine, value big.Int) bool { + reportLog = reportLog.With( + fmt.Sprintf("%x", hash.Bytes())[:8], + value.String(), + ) + return true + }) + + reportedValues.Range(func(hash bls12381.G1Affine, value big.Int) bool { + reportLog = reportLog.With( + fmt.Sprintf("%x", hash.Bytes())[:8], + value.String(), + ) + return true + }) + + reportLog. + With("Majority", fmt.Sprintf("%x", hash.Bytes())[:8]). + Debug("Values") + + DebouncedSaveSignatures(info.Asset, saveArgs) + + return nil +} diff --git a/internal/service/uniswap/uniswap.go b/internal/service/uniswap/uniswap.go index b8a74168..411b1d90 100644 --- a/internal/service/uniswap/uniswap.go +++ b/internal/service/uniswap/uniswap.go @@ -9,27 +9,20 @@ import ( "sync" "time" - "github.com/TimeleapLabs/unchained/internal/crypto" - "github.com/TimeleapLabs/unchained/internal/crypto/ethereum" - - "github.com/TimeleapLabs/unchained/internal/utils" + "github.com/TimeleapLabs/unchained/internal/consts" + "github.com/TimeleapLabs/unchained/internal/model" + "github.com/TimeleapLabs/unchained/internal/repository" + "github.com/TimeleapLabs/unchained/internal/service/pos" + "github.com/TimeleapLabs/unchained/internal/utils/address" "github.com/TimeleapLabs/unchained/internal/config" - - "github.com/TimeleapLabs/unchained/internal/address" - "github.com/TimeleapLabs/unchained/internal/constants/opcodes" + "github.com/TimeleapLabs/unchained/internal/crypto" "github.com/TimeleapLabs/unchained/internal/crypto/bls" - "github.com/TimeleapLabs/unchained/internal/crypto/shake" - "github.com/TimeleapLabs/unchained/internal/datasets" - "github.com/TimeleapLabs/unchained/internal/db" + "github.com/TimeleapLabs/unchained/internal/crypto/ethereum" "github.com/TimeleapLabs/unchained/internal/ent" - "github.com/TimeleapLabs/unchained/internal/ent/assetprice" - "github.com/TimeleapLabs/unchained/internal/ent/helpers" - "github.com/TimeleapLabs/unchained/internal/ent/signer" - "github.com/TimeleapLabs/unchained/internal/log" - "github.com/TimeleapLabs/unchained/internal/pos" "github.com/TimeleapLabs/unchained/internal/service/evmlog" "github.com/TimeleapLabs/unchained/internal/transport/client/conn" + "github.com/TimeleapLabs/unchained/internal/utils" bls12381 "github.com/consensys/gnark-crypto/ecc/bls12-381" "github.com/ethereum/go-ethereum/accounts/abi/bind" lru "github.com/hashicorp/golang-lru/v2" @@ -41,46 +34,65 @@ import ( const ( MaxBlockNumberDelta = 96 + SizeOfPriceCacheLru = 128 ) -var DebouncedSaveSignatures func(key datasets.AssetKey, arg SaveSignatureArgs) +var DebouncedSaveSignatures func(key model.AssetKey, arg SaveSignatureArgs) + +type Service interface { + checkAndCacheSignature( + reportedValues *xsync.MapOf[bls12381.G1Affine, big.Int], signature bls12381.G1Affine, signer model.Signer, + hash bls12381.G1Affine, totalVoted *big.Int, + ) error + saveSignatures(ctx context.Context, args SaveSignatureArgs) error + GetBlockNumber(ctx context.Context, network string) (*uint64, error) + GetPriceAtBlockFromPair(network string, blockNumber uint64, pairAddr string, decimalDif int64, inverse bool) (*big.Int, error) + SyncBlocks(ctx context.Context, token model.Token, key model.TokenKey, latest uint64) error + TokenKey(token model.Token) *model.TokenKey + RecordSignature( + ctx context.Context, signature bls12381.G1Affine, signer model.Signer, hash bls12381.G1Affine, info model.PriceInfo, debounce bool, historical bool, + ) error + ProcessBlocks(ctx context.Context, chain string) error +} -type Service struct { - ethRPC *ethereum.Repository - pos *pos.Repository +type service struct { + ethRPC ethereum.RPC + pos pos.Service + signerRepo repository.Signer + assetPriceRepo repository.AssetPrice - consensus *lru.Cache[datasets.AssetKey, xsync.MapOf[bls12381.G1Affine, big.Int]] - signatureCache *lru.Cache[bls12381.G1Affine, []datasets.Signature] - SupportedTokens map[datasets.TokenKey]bool + consensus *lru.Cache[model.AssetKey, xsync.MapOf[bls12381.G1Affine, big.Int]] + signatureCache *lru.Cache[bls12381.G1Affine, []model.Signature] + SupportedTokens map[model.TokenKey]bool signatureMutex sync.Mutex twoOneNineTwo big.Int tenEighteen big.Int tenEighteenF big.Float - LastBlock xsync.MapOf[datasets.TokenKey, uint64] + LastBlock xsync.MapOf[model.TokenKey, uint64] PriceCache map[string]*lru.Cache[uint64, big.Int] crossPrices map[string]big.Int - crossTokens map[string]datasets.TokenKey + crossTokens map[string]model.TokenKey LastPrice big.Int } -func (u *Service) CheckAndCacheSignature( - reportedValues *xsync.MapOf[bls12381.G1Affine, big.Int], signature bls12381.G1Affine, signer datasets.Signer, +func (s *service) checkAndCacheSignature( + reportedValues *xsync.MapOf[bls12381.G1Affine, big.Int], signature bls12381.G1Affine, signer model.Signer, hash bls12381.G1Affine, totalVoted *big.Int, ) error { - u.signatureMutex.Lock() - defer u.signatureMutex.Unlock() + s.signatureMutex.Lock() + defer s.signatureMutex.Unlock() - cached, _ := u.signatureCache.Get(hash) + cached, _ := s.signatureCache.Get(hash) - packed := datasets.Signature{ + packed := model.Signature{ Signature: signature, Signer: signer, } for _, item := range cached { if item.Signer.PublicKey == signer.PublicKey { - log.Logger. + utils.Logger. With("Address", address.Calculate(signer.PublicKey[:])). Debug("Duplicated signature") return fmt.Errorf("duplicated signature") @@ -89,174 +101,44 @@ func (u *Service) CheckAndCacheSignature( reportedValues.Store(hash, *totalVoted) cached = append(cached, packed) - u.signatureCache.Add(hash, cached) + s.signatureCache.Add(hash, cached) return nil } -// TODO: This needs to work with different datasets -// TODO: Can we turn this into a library func? -func (u *Service) RecordSignature( - signature bls12381.G1Affine, signer datasets.Signer, hash bls12381.G1Affine, info datasets.PriceInfo, debounce bool, historical bool, -) { - if supported := u.SupportedTokens[info.Asset.Token]; !supported { - log.Logger. - With("Name", info.Asset.Token.Name). - With("Chain", info.Asset.Token.Chain). - With("Pair", info.Asset.Token.Pair). - Debug("Token not supported") - return - } - - // TODO: Standalone mode shouldn't call this or check consensus - blockNumber, err := u.GetBlockNumber(info.Asset.Token.Chain) - if err != nil { - log.Logger. - With("Network", info.Asset.Token.Chain). - With("Error", err). - Error("Failed to get the latest block number") - u.ethRPC.RefreshRPC(info.Asset.Token.Chain) - // TODO: we should retry - return - } - - if !historical { - // TODO: this won't work for Arbitrum - if *blockNumber-info.Asset.Block > MaxBlockNumberDelta { - log.Logger. - With("Packet", info.Asset.Block). - With("Current", *blockNumber). - Debug("Data too old") - return // Data too old - } - } - - if !u.consensus.Contains(info.Asset) { - u.consensus.Add(info.Asset, *xsync.NewMapOf[bls12381.G1Affine, big.Int]()) - } - - reportedValues, _ := u.consensus.Get(info.Asset) - isMajority := true - voted, ok := reportedValues.Load(hash) - if !ok { - voted = *big.NewInt(0) - } - - votingPower, err := u.pos.GetVotingPowerOfPublicKey(signer.PublicKey) - if err != nil { - log.Logger. - With("Address", address.Calculate(signer.PublicKey[:])). - With("Error", err). - Error("Failed to get voting power") - return - } - - totalVoted := new(big.Int).Add(votingPower, &voted) - - reportedValues.Range(func(_ bls12381.G1Affine, value big.Int) bool { - if value.Cmp(totalVoted) == 1 { - isMajority = false - } - return isMajority - }) - - err = u.CheckAndCacheSignature(&reportedValues, signature, signer, hash, totalVoted) - if err != nil { - return - } - - saveArgs := SaveSignatureArgs{ - Hash: hash, - Info: info, - Voted: totalVoted, - Consensus: isMajority, - } - - if !debounce { - u.saveSignatures(saveArgs) - return - } - - reportLog := log.Logger. - With("Block", info.Asset.Block). - With("Price", info.Price.String()). - With("Token", info.Asset.Token.Name) - - reportedValues.Range(func(hash bls12381.G1Affine, value big.Int) bool { - reportLog = reportLog.With( - fmt.Sprintf("%x", hash.Bytes())[:8], - value.String(), - ) - return true - }) - - reportedValues.Range(func(hash bls12381.G1Affine, value big.Int) bool { - reportLog = reportLog.With( - fmt.Sprintf("%x", hash.Bytes())[:8], - value.String(), - ) - return true - }) - - reportLog. - With("Majority", fmt.Sprintf("%x", hash.Bytes())[:8]). - Debug("Values") - - DebouncedSaveSignatures(info.Asset, saveArgs) -} - type SaveSignatureArgs struct { - Info datasets.PriceInfo + Info model.PriceInfo Hash bls12381.G1Affine Consensus bool Voted *big.Int } -func IsNewSigner(signature datasets.Signature, records []*ent.AssetPrice) bool { - for _, record := range records { - for _, signer := range record.Edges.Signers { - if signature.Signer.PublicKey == [96]byte(signer.Key) { - return false - } - } - } - - return true -} - -func (u *Service) saveSignatures(args SaveSignatureArgs) { - dbClient := db.GetClient() - log.Logger. +func (s *service) saveSignatures(ctx context.Context, args SaveSignatureArgs) error { + utils.Logger. With("Block", args.Info.Asset.Block). With("Hash", fmt.Sprintf("%x", args.Hash.Bytes())[:8]). Debug("Saving into DB") - signatures, ok := u.signatureCache.Get(args.Hash) + signatures, ok := s.signatureCache.Get(args.Hash) if !ok { - log.Logger. + utils.Logger. With("Block", args.Info.Asset.Block). With("Hash", fmt.Sprintf("%x", args.Hash.Bytes())[:8]). Debug("Cache not found") - return + return consts.ErrSignatureNotfound } - ctx := context.Background() - - var newSigners []datasets.Signer + var newSigners []model.Signer var newSignatures []bls12381.G1Affine var keys [][]byte - currentRecords, err := dbClient.AssetPrice. - Query(). - Where(assetprice.Block(args.Info.Asset.Block), - assetprice.Chain(args.Info.Asset.Token.Chain), - assetprice.Asset(args.Info.Asset.Token.Name), - assetprice.Pair(args.Info.Asset.Token.Pair)). - WithSigners(). - All(ctx) + currentRecords, err := s.assetPriceRepo.Find( + ctx, + args.Info.Asset.Block, args.Info.Asset.Token.Chain, args.Info.Asset.Token.Name, args.Info.Asset.Token.Pair, + ) if err != nil && !ent.IsNotFound(err) { - panic(err) + return err } for i := range signatures { @@ -271,42 +153,23 @@ func (u *Service) saveSignatures(args SaveSignatureArgs) { newSigners = append(newSigners, signature.Signer) } - err = dbClient.Signer.MapCreateBulk(newSigners, func(sc *ent.SignerCreate, i int) { - newSigner := newSigners[i] - sc.SetName(newSigner.Name). - SetEvm(newSigner.EvmAddress). - SetKey(newSigner.PublicKey[:]). - SetShortkey(newSigner.ShortPublicKey[:]). - SetPoints(0) - }). - OnConflictColumns("shortkey"). - UpdateName(). - UpdateEvm(). - UpdateKey(). - Update(func(su *ent.SignerUpsert) { - su.AddPoints(1) - }). - Exec(ctx) - + err = s.signerRepo.CreateSigners(ctx, newSigners) if err != nil { - log.Logger. + utils.Logger. With("Block", args.Info.Asset.Block). With("Hash", fmt.Sprintf("%x", args.Hash.Bytes())[:8]). Debug("Failed to upsert token signers.") - panic(err) + return err } - signerIDs, err := dbClient.Signer. - Query(). - Where(signer.KeyIn(keys...)). - IDs(ctx) + signerIDs, err := s.signerRepo.GetSingerIDsByKeys(ctx, keys) if err != nil { - log.Logger. + utils.Logger. With("Block", args.Info.Asset.Block). With("Hash", fmt.Sprintf("%x", args.Hash.Bytes())[:8]). Debug("Filed to upsert signers") - return + return err } var aggregate bls12381.G1Affine @@ -316,12 +179,12 @@ func (u *Service) saveSignatures(args SaveSignatureArgs) { currentAggregate, err := bls.RecoverSignature([48]byte(record.Signature)) if err != nil { - log.Logger. + utils.Logger. With("Block", args.Info.Asset.Block). With("Hash", fmt.Sprintf("%x", args.Hash.Bytes())[:8]). With("Error", err). Debug("Failed to recover signature") - return + return consts.ErrCantRecoverSignature } newSignatures = append(newSignatures, currentAggregate) @@ -332,59 +195,58 @@ func (u *Service) saveSignatures(args SaveSignatureArgs) { aggregate, err = bls.AggregateSignatures(newSignatures) if err != nil { - log.Logger. + utils.Logger. With("Block", args.Info.Asset.Block). With("Hash", fmt.Sprintf("%x", args.Hash.Bytes())[:8]). Debug("Filed to aggregate signatures") - return + return consts.ErrCantAggregateSignatures } signatureBytes := aggregate.Bytes() // TODO: Handle cases where signerIDs need to be removed - err = dbClient.AssetPrice. - Create(). - SetPair(strings.ToLower(args.Info.Asset.Token.Pair)). - SetAsset(args.Info.Asset.Token.Name). - SetChain(args.Info.Asset.Token.Chain). - SetBlock(args.Info.Asset.Block). - SetPrice(&helpers.BigInt{Int: args.Info.Price}). - SetSignersCount(uint64(len(signatures))). - SetSignature(signatureBytes[:]). - SetConsensus(args.Consensus). - SetVoted(&helpers.BigInt{Int: *args.Voted}). - AddSignerIDs(signerIDs...). - OnConflictColumns("block", "chain", "asset", "pair"). - UpdateNewValues(). - Exec(ctx) + err = s.assetPriceRepo.Upsert(ctx, model.AssetPrice{ + Pair: strings.ToLower(args.Info.Asset.Token.Pair), + Name: args.Info.Asset.Token.Name, + Chain: args.Info.Asset.Token.Chain, + Block: args.Info.Asset.Block, + Price: args.Info.Price, + SignersCount: uint64(len(signatures)), + Signature: signatureBytes[:], + Consensus: args.Consensus, + Voted: *args.Voted, + SignerIDs: signerIDs, + }) if err != nil { - log.Logger. + utils.Logger. With("Block", args.Info.Asset.Block). With("Hash", fmt.Sprintf("%x", args.Hash.Bytes())[:8]). Debug("Failed to upsert asset price") - panic(err) + return err } + + return nil } -func (u *Service) GetBlockNumber(network string) (*uint64, error) { - blockNumber, err := u.ethRPC.GetBlockNumber(network) +func (s *service) GetBlockNumber(ctx context.Context, network string) (*uint64, error) { + blockNumber, err := s.ethRPC.GetBlockNumber(ctx, network) if err != nil { - u.ethRPC.RefreshRPC(network) + s.ethRPC.RefreshRPC(network) return nil, err } return &blockNumber, nil } -func (u *Service) GetPriceAtBlockFromPair( +func (s *service) GetPriceAtBlockFromPair( network string, blockNumber uint64, pairAddr string, decimalDif int64, inverse bool, ) (*big.Int, error) { - pair, err := u.ethRPC.GetNewUniV3Contract(network, pairAddr, false) + pair, err := s.ethRPC.GetNewUniV3Contract(network, pairAddr, false) if err != nil { - u.ethRPC.RefreshRPC(network) + s.ethRPC.RefreshRPC(network) return nil, err } @@ -394,27 +256,27 @@ func (u *Service) GetPriceAtBlockFromPair( }) if err != nil { - u.ethRPC.RefreshRPC(network) + s.ethRPC.RefreshRPC(network) return nil, err } - u.LastPrice = *u.priceFromSqrtX96(data.SqrtPriceX96, decimalDif, inverse) - lruCache := u.PriceCache[strings.ToLower(pairAddr)] - lruCache.Add(blockNumber, u.LastPrice) + s.LastPrice = *s.priceFromSqrtX96(data.SqrtPriceX96, decimalDif, inverse) + lruCache := s.PriceCache[strings.ToLower(pairAddr)] + lruCache.Add(blockNumber, s.LastPrice) - return &u.LastPrice, nil + return &s.LastPrice, nil } -func (u *Service) priceFromSqrtX96(sqrtPriceX96 *big.Int, decimalDif int64, inverse bool) *big.Int { +func (s *service) priceFromSqrtX96(sqrtPriceX96 *big.Int, decimalDif int64, inverse bool) *big.Int { var decimalFix big.Int var powerUp big.Int var rawPrice big.Int var price big.Int var factor big.Int - decimalFix.Mul(sqrtPriceX96, &u.tenEighteen) + decimalFix.Mul(sqrtPriceX96, &s.tenEighteen) powerUp.Exp(&decimalFix, big.NewInt(2), nil) - rawPrice.Div(&powerUp, &u.twoOneNineTwo) + rawPrice.Div(&powerUp, &s.twoOneNineTwo) if inverse { factor.Exp(big.NewInt(10), big.NewInt(54+decimalDif), nil) @@ -428,14 +290,14 @@ func (u *Service) priceFromSqrtX96(sqrtPriceX96 *big.Int, decimalDif int64, inve return &price } -func (u *Service) syncBlock(token datasets.Token, caser cases.Caser, key *datasets.TokenKey, blockInx uint64) { - lastSynced, ok := u.LastBlock.Load(*key) +func (s *service) syncBlock(ctx context.Context, token model.Token, caser cases.Caser, key *model.TokenKey, blockInx uint64) error { + lastSynced, ok := s.LastBlock.Load(*key) if ok && blockInx <= lastSynced { - return + return consts.ErrDataTooOld } - price, err := u.GetPriceAtBlockFromPair( + price, err := s.GetPriceAtBlockFromPair( token.Chain, blockInx, token.Pair, @@ -444,112 +306,121 @@ func (u *Service) syncBlock(token datasets.Token, caser cases.Caser, key *datase ) if err != nil { - log.Logger.Error( + utils.Logger.Error( fmt.Sprintf("Failed to get token price from %s RPC.", token.Chain)) - u.ethRPC.RefreshRPC(token.Chain) - return + s.ethRPC.RefreshRPC(token.Chain) + return err } for _, cross := range token.Cross { - stored := u.crossPrices[cross] + stored := s.crossPrices[cross] if stored.Cmp(big.NewInt(0)) == 0 { - return + return consts.ErrCrossPriceIsNotZero } price.Mul(price, &stored) } for range token.Cross { - price.Div(price, &u.tenEighteen) + price.Div(price, &s.tenEighteen) } if token.ID != nil { - u.crossPrices[*token.ID] = *price + s.crossPrices[*token.ID] = *price } var priceF big.Float - priceF.Quo(new(big.Float).SetInt(price), &u.tenEighteenF) + priceF.Quo(new(big.Float).SetInt(price), &s.tenEighteenF) priceStr := fmt.Sprintf("%.18f %s", &priceF, token.Unit) - lastSynced, ok = u.LastBlock.Load(*key) + lastSynced, ok = s.LastBlock.Load(*key) if ok && blockInx <= lastSynced { - return + return consts.ErrDataTooOld } - log.Logger. + utils.Logger. With("Block", blockInx). With("Price", priceStr). Info(caser.String(token.Name)) - key = u.TokenKey(token) + key = s.TokenKey(token) - priceInfo := datasets.PriceInfo{ + priceInfo := model.PriceInfo{ Price: *price, - Asset: datasets.AssetKey{ + Asset: model.AssetKey{ Block: blockInx, Token: *key, }, } - toHash := priceInfo.Sia().Content - signature, hash := bls.Sign(*crypto.Identity.Bls.SecretKey, toHash) + signature, hash := bls.Sign(*crypto.Identity.Bls.SecretKey, priceInfo.Sia().Bytes()) if token.Send && !conn.IsClosed { compressedSignature := signature.Bytes() - - priceReport := datasets.PriceReport{ + priceReport := model.PriceReportPacket{ PriceInfo: priceInfo, Signature: compressedSignature, } - payload := priceReport.Sia().Content - conn.Send(opcodes.PriceReport, payload) + conn.Send(consts.OpCodePriceReport, priceReport.Sia().Bytes()) } if token.Store { - u.RecordSignature( + err = s.RecordSignature( + ctx, signature, - *crypto.Identity.ExportBlsSigner(), + *crypto.Identity.ExportEvmSigner(), hash, priceInfo, false, true, ) + + if err != nil { + return err + } } - u.LastBlock.Store(*key, blockInx) + s.LastBlock.Store(*key, blockInx) + + return nil } -func (u *Service) SyncBlocks(token datasets.Token, key datasets.TokenKey, latest uint64) { - block, ok := u.LastBlock.Load(key) +func (s *service) SyncBlocks(ctx context.Context, token model.Token, key model.TokenKey, latest uint64) error { + block, ok := s.LastBlock.Load(key) if !ok { - return + return consts.ErrCantLoadLastBlock } caser := cases.Title(language.English, cases.NoLower) for blockInx := block + 1; blockInx < latest; blockInx++ { - u.syncBlock(token, caser, &key, blockInx) + err := s.syncBlock(ctx, token, caser, &key, blockInx) + if err != nil { + return err + } } + + return nil } -func (u *Service) TokenKey(token datasets.Token) *datasets.TokenKey { - var cross []datasets.TokenKey +func (s *service) TokenKey(token model.Token) *model.TokenKey { + var cross []model.TokenKey for _, id := range token.Cross { - cross = append(cross, u.crossTokens[id]) + cross = append(cross, s.crossTokens[id]) } - toHash := new(sia.ArraySia[datasets.TokenKey]). - AddArray8(cross, func(s *sia.ArraySia[datasets.TokenKey], item datasets.TokenKey) { - s.EmbedSia(item.Sia()) - }).Content + toHash := new(sia.ArraySia[model.TokenKey]). + AddArray8(cross, func(s *sia.ArraySia[model.TokenKey], item model.TokenKey) { + s.EmbedBytes(item.Sia().Bytes()) + }).Bytes() - hash := shake.Shake(toHash) + hash := utils.Shake(toHash) - key := datasets.TokenKey{ + key := model.TokenKey{ Name: strings.ToLower(token.Name), Pair: strings.ToLower(token.Pair), Chain: strings.ToLower(token.Chain), @@ -561,47 +432,67 @@ func (u *Service) TokenKey(token datasets.Token) *datasets.TokenKey { return &key } -func New(ethRPC *ethereum.Repository, pos *pos.Repository) *Service { - u := Service{ - ethRPC: ethRPC, - pos: pos, +func New( + ethRPC ethereum.RPC, + pos pos.Service, + signerRepo repository.Signer, + assetPriceRepo repository.AssetPrice, +) Service { + s := service{ + ethRPC: ethRPC, + pos: pos, + signerRepo: signerRepo, + assetPriceRepo: assetPriceRepo, consensus: nil, signatureCache: nil, + SupportedTokens: map[model.TokenKey]bool{}, signatureMutex: sync.Mutex{}, - LastBlock: *xsync.NewMapOf[datasets.TokenKey, uint64](), - SupportedTokens: map[datasets.TokenKey]bool{}, + LastBlock: *xsync.NewMapOf[model.TokenKey, uint64](), PriceCache: map[string]*lru.Cache[uint64, big.Int]{}, crossPrices: map[string]big.Int{}, - crossTokens: map[string]datasets.TokenKey{}, + crossTokens: map[string]model.TokenKey{}, } - DebouncedSaveSignatures = utils.Debounce[datasets.AssetKey, SaveSignatureArgs](5*time.Second, u.saveSignatures) - u.twoOneNineTwo.Exp(big.NewInt(2), big.NewInt(192), nil) - u.tenEighteen.Exp(big.NewInt(10), big.NewInt(18), nil) - u.tenEighteenF.SetInt(&u.tenEighteen) + + DebouncedSaveSignatures = utils.Debounce[model.AssetKey, SaveSignatureArgs](5*time.Second, s.saveSignatures) + + s.twoOneNineTwo.Exp(big.NewInt(2), big.NewInt(192), nil) + s.tenEighteen.Exp(big.NewInt(10), big.NewInt(18), nil) + s.tenEighteenF.SetInt(&s.tenEighteen) if config.App.Plugins.Uniswap != nil { for _, t := range config.App.Plugins.Uniswap.Tokens { - token := datasets.NewTokenFromCfg(t) + token := model.NewTokenFromCfg(t) + + key := s.TokenKey(token) + s.SupportedTokens[*key] = true + } + } + + for _, t := range config.App.Plugins.Uniswap.Tokens { + token := model.NewTokenFromCfg(t) + var err error + s.PriceCache[strings.ToLower(token.Pair)], err = lru.New[uint64, big.Int](SizeOfPriceCacheLru) - key := u.TokenKey(token) - u.SupportedTokens[*key] = true + if err != nil { + utils.Logger.Error("Failed to initialize token map.") + os.Exit(1) } } var err error - u.signatureCache, err = lru.New[bls12381.G1Affine, []datasets.Signature](evmlog.LruSize) + s.signatureCache, err = lru.New[bls12381.G1Affine, []model.Signature](evmlog.LruSize) if err != nil { - log.Logger.Error("Failed to create token price signature cache.") + utils.Logger.Error("Failed to create token price signature cache.") os.Exit(1) } // TODO: This is vulnerable to flood attacks - u.consensus, err = lru.New[datasets.AssetKey, xsync.MapOf[bls12381.G1Affine, big.Int]](evmlog.LruSize) + s.consensus, err = lru.New[model.AssetKey, xsync.MapOf[bls12381.G1Affine, big.Int]](evmlog.LruSize) if err != nil { - log.Logger.Error("Failed to create token price consensus cache.") + utils.Logger.Error("Failed to create token price consensus cache.") os.Exit(1) } - return &u + return &s } diff --git a/internal/transport/client/client.go b/internal/transport/client/client.go index ff4f4065..5470b5fe 100644 --- a/internal/transport/client/client.go +++ b/internal/transport/client/client.go @@ -1,48 +1,55 @@ package client import ( - "github.com/TimeleapLabs/unchained/internal/constants/opcodes" - "github.com/TimeleapLabs/unchained/internal/log" + "context" + "time" + + "github.com/TimeleapLabs/unchained/internal/consts" "github.com/TimeleapLabs/unchained/internal/transport/client/conn" "github.com/TimeleapLabs/unchained/internal/transport/client/handler" + "github.com/TimeleapLabs/unchained/internal/utils" ) func NewRPC(handler handler.Handler) { incoming := conn.Read() go func() { - log.Logger.Info("Starting consumer from broker") + utils.Logger.Info("Starting consumer from broker") for payload := range incoming { - switch opcodes.OpCode(payload[0]) { - case opcodes.Error: - log.Logger. - With("Error", string(payload[1:])). - Error("Broker") - - case opcodes.Feedback: - log.Logger. - With("Feedback", string(payload[1:])). - Info("Broker") - - case opcodes.KoskChallenge: - challenge := handler.Challenge(payload[1:]) - conn.Send(opcodes.KoskResult, challenge.Sia().Content) - - case opcodes.PriceReportBroadcast: - go handler.PriceReport(payload[1:]) - - case opcodes.EventLogBroadcast: - go handler.EventLog(payload[1:]) - - case opcodes.CorrectnessReportBroadcast: - go handler.CorrectnessReport(payload[1:]) - - default: - log.Logger. - With("Code", payload[0]). - Error("Unknown call code") - } + go func(payload []byte) { + ctx, cancel := context.WithTimeout(context.TODO(), time.Second*10) + defer cancel() + + switch consts.OpCode(payload[0]) { + case consts.OpCodeError: + utils.Logger. + With("Error", string(payload[1:])). + Error("Broker") + + case consts.OpCodeFeedback: + utils.Logger. + With("Feedback", string(payload[1:])). + Info("Broker") + + case consts.OpCodeKoskChallenge: + challenge := handler.Challenge(payload[1:]) + conn.Send(consts.OpCodeKoskResult, challenge) + case consts.OpCodePriceReportBroadcast: + handler.PriceReport(ctx, payload[1:]) + + case consts.OpCodeEventLogBroadcast: + handler.EventLog(ctx, payload[1:]) + + case consts.OpCodeCorrectnessReportBroadcast: + handler.CorrectnessReport(ctx, payload[1:]) + + default: + utils.Logger. + With("Code", payload[0]). + Error("Unknown call code") + } + }(payload) } }() } diff --git a/internal/transport/client/conn/conn.go b/internal/transport/client/conn/conn.go index a7068d60..87a15bc3 100644 --- a/internal/transport/client/conn/conn.go +++ b/internal/transport/client/conn/conn.go @@ -5,12 +5,12 @@ import ( "sync" "time" + "github.com/TimeleapLabs/unchained/internal/consts" + "github.com/TimeleapLabs/unchained/internal/utils" + "github.com/TimeleapLabs/unchained/internal/crypto" "github.com/TimeleapLabs/unchained/internal/config" - "github.com/TimeleapLabs/unchained/internal/constants" - "github.com/TimeleapLabs/unchained/internal/constants/opcodes" - "github.com/TimeleapLabs/unchained/internal/log" "github.com/gorilla/websocket" ) @@ -19,50 +19,54 @@ var conn *websocket.Conn var IsClosed bool var mu = new(sync.Mutex) +// Start function create a new websocket connection to the broker. func Start() { var err error - log.Logger. - With("URL", fmt.Sprintf("%s/%s", config.App.Network.BrokerURI, constants.ProtocolVersion)). + utils.Logger. + With("URL", fmt.Sprintf("%s/%s", config.App.Network.BrokerURI, consts.ProtocolVersion)). Info("Connecting to the broker") conn, _, err = websocket.DefaultDialer.Dial( - fmt.Sprintf("%s/%s", config.App.Network.BrokerURI, constants.ProtocolVersion), nil, + fmt.Sprintf("%s/%s", config.App.Network.BrokerURI, consts.ProtocolVersion), nil, ) if err != nil { - log.Logger. - With("URI", fmt.Sprintf("%s/%s", config.App.Network.BrokerURI, constants.ProtocolVersion)). + utils.Logger. + With("URI", fmt.Sprintf("%s/%s", config.App.Network.BrokerURI, consts.ProtocolVersion)). With("Error", err). Error("can't connect to broker") panic(err) } - Send(opcodes.Hello, crypto.Identity.ExportBlsSigner().Sia().Content) + Send(consts.OpCodeHello, crypto.Identity.ExportEvmSigner().Sia().Bytes()) } func Reconnect(err error) { - IsClosed = true - hello := crypto.Identity.ExportBlsSigner().Sia().Content - if websocket.IsUnexpectedCloseError(err) { + Close() + hello := crypto.Identity.ExportEvmSigner().Sia().Bytes() + for i := 1; i < 6; i++ { time.Sleep(time.Duration(i) * 3 * time.Second) - log.Logger. - With("URL", fmt.Sprintf("%s/%s", config.App.Network.BrokerURI, constants.ProtocolVersion)). + utils.Logger. + With("URL", fmt.Sprintf("%s/%s", config.App.Network.BrokerURI, consts.ProtocolVersion)). With("Retry", i). Info("Reconnecting to broker") - conn, _, err = websocket.DefaultDialer.Dial(config.App.Network.BrokerURI, nil) + conn, _, err = websocket.DefaultDialer.Dial( + fmt.Sprintf("%s/%s", config.App.Network.BrokerURI, consts.ProtocolVersion), + nil, + ) if err != nil { - log.Logger. - With("URI", fmt.Sprintf("%s/%s", config.App.Network.BrokerURI, constants.ProtocolVersion)). + utils.Logger. + With("URI", fmt.Sprintf("%s/%s", config.App.Network.BrokerURI, consts.ProtocolVersion)). With("Error", err). - Error("can't connect to broker") + Error("Can't reconnect to broker") } else { IsClosed = false - Send(opcodes.Hello, hello) - log.Logger.Info("Connection with broker recovered") + Send(consts.OpCodeHello, hello) + utils.Logger.Info("Connection with broker recovered") return } } @@ -71,25 +75,27 @@ func Reconnect(err error) { } } +// Close function gracefully disconnect from the broker. func Close() { if conn != nil && config.App.Network.BrokerURI != "" { err := conn.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, "")) if err != nil { - log.Logger. + utils.Logger. With("Error", err). Error("Can't sent close packet") } - IsClosed = false + IsClosed = true err = conn.Close() if err != nil { - log.Logger. + utils.Logger. With("Error", err). Error("Connection closed") } } } +// Read function consume from the broker's messages and push them into a channel. func Read() <-chan []byte { out := make(chan []byte) @@ -97,26 +103,26 @@ func Read() <-chan []byte { for { _, payload, err := conn.ReadMessage() if err != nil { - log.Logger. + utils.Logger. With("Error", err). Error("Read error") Reconnect(err) if IsClosed { - return + break } continue } - if payload[0] == byte(opcodes.Error) { - log.Logger. + if payload[0] == byte(consts.OpCodeError) { + utils.Logger. With("Error", string(payload[1:])). Error("Incoming error") Reconnect(err) if IsClosed { - return + break } continue @@ -135,15 +141,15 @@ func SendRaw(data []byte) error { return conn.WriteMessage(websocket.BinaryMessage, data) } -func Send(opCode opcodes.OpCode, payload []byte) { +func Send(opCode consts.OpCode, payload []byte) { err := SendRaw( append([]byte{byte(opCode)}, payload...), ) if err != nil { - log.Logger.Error("Can't send packet: %v", err) + utils.Logger.Error("Can't send packet: %v", err) } } -func SendMessage(opCode opcodes.OpCode, message string) { +func SendMessage(opCode consts.OpCode, message string) { Send(opCode, []byte(message)) } diff --git a/internal/transport/client/handler/challenge.go b/internal/transport/client/handler/challenge.go index 099af8c4..8d40f171 100644 --- a/internal/transport/client/handler/challenge.go +++ b/internal/transport/client/handler/challenge.go @@ -3,24 +3,23 @@ package handler import ( "github.com/TimeleapLabs/unchained/internal/crypto" "github.com/TimeleapLabs/unchained/internal/crypto/bls" - "github.com/TimeleapLabs/unchained/internal/crypto/kosk" - sia "github.com/pouya-eghbali/go-sia/v2/pkg" + "github.com/TimeleapLabs/unchained/internal/model" ) -func (h *consumer) Challenge(message []byte) *kosk.Challenge { - challenge := new(kosk.Challenge).DeSia(&sia.Sia{Content: message}) +func (h *consumer) Challenge(message []byte) []byte { + challenge := new(model.ChallengePacket).FromBytes(message) signature, _ := bls.Sign(*crypto.Identity.Bls.SecretKey, challenge.Random[:]) challenge.Signature = signature.Bytes() - return challenge + return challenge.Sia().Bytes() } -func (w worker) Challenge(message []byte) *kosk.Challenge { - challenge := new(kosk.Challenge).DeSia(&sia.Sia{Content: message}) +func (w worker) Challenge(message []byte) []byte { + challenge := new(model.ChallengePacket).FromBytes(message) signature, _ := bls.Sign(*crypto.Identity.Bls.SecretKey, challenge.Random[:]) challenge.Signature = signature.Bytes() - return challenge + return challenge.Sia().Bytes() } diff --git a/internal/transport/client/handler/consumer.go b/internal/transport/client/handler/consumer.go index 46c49fec..abf6aef0 100644 --- a/internal/transport/client/handler/consumer.go +++ b/internal/transport/client/handler/consumer.go @@ -1,7 +1,8 @@ package handler import ( - "github.com/TimeleapLabs/unchained/internal/constants/opcodes" + "github.com/TimeleapLabs/unchained/internal/config" + "github.com/TimeleapLabs/unchained/internal/consts" "github.com/TimeleapLabs/unchained/internal/service/correctness" "github.com/TimeleapLabs/unchained/internal/service/evmlog" "github.com/TimeleapLabs/unchained/internal/service/uniswap" @@ -9,17 +10,17 @@ import ( ) type consumer struct { - correctness *correctness.Service - uniswap *uniswap.Service - evmlog *evmlog.Service + correctness correctness.Service + uniswap uniswap.Service + evmlog evmlog.Service } func NewConsumerHandler( - correctness *correctness.Service, - uniswap *uniswap.Service, - evmlog *evmlog.Service, + correctness correctness.Service, + uniswap uniswap.Service, + evmlog evmlog.Service, ) Handler { - conn.Send(opcodes.RegisterConsumer, nil) + conn.Send(consts.OpCodeRegisterConsumer, []byte(config.App.Network.SubscribedChannel)) return &consumer{ correctness: correctness, diff --git a/internal/transport/client/handler/correctness.go b/internal/transport/client/handler/correctness.go index 780ba78d..50486e1a 100644 --- a/internal/transport/client/handler/correctness.go +++ b/internal/transport/client/handler/correctness.go @@ -1,42 +1,41 @@ package handler import ( + "context" + "github.com/TimeleapLabs/unchained/internal/crypto/bls" - "github.com/TimeleapLabs/unchained/internal/datasets" - "github.com/TimeleapLabs/unchained/internal/log" - sia "github.com/pouya-eghbali/go-sia/v2/pkg" + "github.com/TimeleapLabs/unchained/internal/model" + "github.com/TimeleapLabs/unchained/internal/utils" ) -func (h *consumer) CorrectnessReport(message []byte) { - packet := new(datasets.BroadcastCorrectnessPacket).DeSia(&sia.Sia{Content: message}) - toHash := packet.Info.Sia().Content - hash, err := bls.Hash(toHash) +func (h *consumer) CorrectnessReport(ctx context.Context, message []byte) { + packet := new(model.BroadcastCorrectnessPacket).FromBytes(message) + correctnessHash, err := packet.Info.Bls() if err != nil { - log.Logger. - With("Error", err). - Error("Hash error") - return } signature, err := bls.RecoverSignature(packet.Signature) - if err != nil { - log.Logger. + utils.Logger. With("Error", err). Error("Failed to recover packet signature") return } - h.correctness.RecordSignature( + err = h.correctness.RecordSignature( + ctx, signature, packet.Signer, - hash, + correctnessHash, packet.Info, true, ) + if err != nil { + return + } } -func (w worker) CorrectnessReport(_ []byte) {} +func (w worker) CorrectnessReport(_ context.Context, _ []byte) {} diff --git a/internal/transport/client/handler/event.go b/internal/transport/client/handler/event.go index 0d01ef68..a33f9f16 100644 --- a/internal/transport/client/handler/event.go +++ b/internal/transport/client/handler/event.go @@ -1,43 +1,42 @@ package handler import ( + "context" + "github.com/TimeleapLabs/unchained/internal/crypto/bls" - "github.com/TimeleapLabs/unchained/internal/datasets" - "github.com/TimeleapLabs/unchained/internal/log" - sia "github.com/pouya-eghbali/go-sia/v2/pkg" + "github.com/TimeleapLabs/unchained/internal/model" + "github.com/TimeleapLabs/unchained/internal/utils" ) -func (h *consumer) EventLog(message []byte) { - packet := new(datasets.BroadcastEventPacket).DeSia(&sia.Sia{Content: message}) - toHash := packet.Info.Sia().Content - hash, err := bls.Hash(toHash) +func (h *consumer) EventLog(ctx context.Context, message []byte) { + packet := new(model.BroadcastEventPacket).FromBytes(message) + eventLogHash, err := packet.Info.Bls() if err != nil { - log.Logger. - With("Error", err). - Error("Hash error") - return } signature, err := bls.RecoverSignature(packet.Signature) - if err != nil { - log.Logger. + utils.Logger. With("Error", err). Error("Failed to recover packet signature") return } - h.evmlog.RecordSignature( + err = h.evmlog.RecordSignature( + ctx, signature, packet.Signer, - hash, + eventLogHash, packet.Info, true, false, ) + if err != nil { + return + } } -func (w worker) EventLog(_ []byte) {} +func (w worker) EventLog(_ context.Context, _ []byte) {} diff --git a/internal/transport/client/handler/handler.go b/internal/transport/client/handler/handler.go index d865ebf2..71fad11e 100644 --- a/internal/transport/client/handler/handler.go +++ b/internal/transport/client/handler/handler.go @@ -1,12 +1,12 @@ package handler import ( - "github.com/TimeleapLabs/unchained/internal/crypto/kosk" + "context" ) type Handler interface { - Challenge(message []byte) *kosk.Challenge - CorrectnessReport(message []byte) - EventLog(message []byte) - PriceReport(message []byte) + Challenge(message []byte) []byte + CorrectnessReport(ctx context.Context, message []byte) + EventLog(ctx context.Context, message []byte) + PriceReport(ctx context.Context, message []byte) } diff --git a/internal/transport/client/handler/price.go b/internal/transport/client/handler/price.go index 96c3ec68..09b34a33 100644 --- a/internal/transport/client/handler/price.go +++ b/internal/transport/client/handler/price.go @@ -1,43 +1,42 @@ package handler import ( + "context" + "github.com/TimeleapLabs/unchained/internal/crypto/bls" - "github.com/TimeleapLabs/unchained/internal/datasets" - "github.com/TimeleapLabs/unchained/internal/log" - sia "github.com/pouya-eghbali/go-sia/v2/pkg" + "github.com/TimeleapLabs/unchained/internal/model" + "github.com/TimeleapLabs/unchained/internal/utils" ) -func (h *consumer) PriceReport(message []byte) { - packet := new(datasets.BroadcastPricePacket).DeSia(&sia.Sia{Content: message}) - toHash := packet.Info.Sia().Content - hash, err := bls.Hash(toHash) +func (h *consumer) PriceReport(ctx context.Context, message []byte) { + packet := new(model.BroadcastPricePacket).FromBytes(message) + priceInfoHash, err := packet.Info.Bls() if err != nil { - log.Logger. - With("Error", err). - Error("Hash error") - return } signature, err := bls.RecoverSignature(packet.Signature) - if err != nil { - log.Logger. + utils.Logger. With("Error", err). Error("Failed to recover packet signature") return } - h.uniswap.RecordSignature( + err = h.uniswap.RecordSignature( + ctx, signature, packet.Signer, - hash, + priceInfoHash, packet.Info, true, false, ) + if err != nil { + return + } } -func (w worker) PriceReport(_ []byte) {} +func (w worker) PriceReport(_ context.Context, _ []byte) {} diff --git a/internal/transport/database/database.go b/internal/transport/database/database.go new file mode 100644 index 00000000..39ded2c0 --- /dev/null +++ b/internal/transport/database/database.go @@ -0,0 +1,12 @@ +package database + +import ( + "context" + + "github.com/TimeleapLabs/unchained/internal/ent" +) + +type Database interface { + GetConnection() *ent.Client + HealthCheck(ctx context.Context) bool +} diff --git a/internal/transport/database/mock/postgres_mock.go b/internal/transport/database/mock/postgres_mock.go new file mode 100644 index 00000000..367bf0ef --- /dev/null +++ b/internal/transport/database/mock/postgres_mock.go @@ -0,0 +1,53 @@ +package mock + +import ( + "context" + "testing" + + "github.com/TimeleapLabs/unchained/internal/ent" + "github.com/TimeleapLabs/unchained/internal/transport/database" + + "github.com/peterldowns/pgtestdb" +) + +type mockConnection struct { + t *testing.T + db *ent.Client +} + +func (m *mockConnection) GetConnection() *ent.Client { + if m.db != nil { + return m.db + } + + _ = pgtestdb.New( + m.t, + pgtestdb.Config{ + DriverName: "pgx", + User: "postgres", + Password: "password", + Host: "localhost", + Port: "5433", + Options: "sslmode=disable", + }, + pgtestdb.NoopMigrator{}, + ) + + var err error + m.db, err = ent.Open("postgres", "postgresql://postgres:password@127.0.0.1:5433/unchained?sslmode=disable") + if err != nil { + panic(err) + } + + return m.db +} + +func (m *mockConnection) HealthCheck(_ context.Context) bool { + return true +} + +func New(t *testing.T) database.Database { + return &mockConnection{ + t: t, + } +} diff --git a/internal/transport/database/postgres/postgres.go b/internal/transport/database/postgres/postgres.go new file mode 100644 index 00000000..40784bd2 --- /dev/null +++ b/internal/transport/database/postgres/postgres.go @@ -0,0 +1,52 @@ +package postgres + +import ( + "context" + + "github.com/TimeleapLabs/unchained/internal/config" + "github.com/TimeleapLabs/unchained/internal/ent" + "github.com/TimeleapLabs/unchained/internal/transport/database" + "github.com/TimeleapLabs/unchained/internal/utils" + + // these imports are required for ent to work with postgres. + _ "github.com/jackc/pgx/v5/stdlib" + _ "github.com/lib/pq" +) + +type connection struct { + db *ent.Client +} + +func (c *connection) HealthCheck(_ context.Context) bool { + return true +} + +func (c *connection) GetConnection() *ent.Client { + if c.db != nil { + return c.db + } + + if config.App.Postgres.URL == "" { + return nil + } + + var err error + + utils.Logger.Info("Connecting to DB") + + c.db, err = ent.Open("postgres", config.App.Postgres.URL) + + if err != nil { + utils.Logger.With("err", err).Error("failed opening connection to postgres") + } + + if err = c.db.Schema.Create(context.Background()); err != nil { + utils.Logger.With("err", err).Error("failed creating schema resources") + } + + return c.db +} + +func New() database.Database { + return &connection{} +} diff --git a/internal/transport/server/gql/args.resolvers.go b/internal/transport/server/gql/args.resolvers.go index c0676631..014d802d 100644 --- a/internal/transport/server/gql/args.resolvers.go +++ b/internal/transport/server/gql/args.resolvers.go @@ -7,14 +7,14 @@ package gql import ( "context" "fmt" + "github.com/TimeleapLabs/unchained/internal/model" "strings" - "github.com/TimeleapLabs/unchained/internal/datasets" "github.com/TimeleapLabs/unchained/internal/transport/server/gql/generated" ) // Value is the resolver for the value field. -func (r *eventLogArgResolver) Value(ctx context.Context, obj *datasets.EventLogArg) (string, error) { +func (r *eventLogArgResolver) Value(ctx context.Context, obj *model.EventLogArg) (string, error) { switch { case strings.HasPrefix(obj.Type, "uint"), strings.HasPrefix(obj.Type, "int"): return obj.Value.(string), nil diff --git a/internal/transport/server/gql/generated/args.generated.go b/internal/transport/server/gql/generated/args.generated.go index d8f5a396..62e0fe21 100644 --- a/internal/transport/server/gql/generated/args.generated.go +++ b/internal/transport/server/gql/generated/args.generated.go @@ -5,12 +5,12 @@ package generated import ( "context" "errors" + "github.com/TimeleapLabs/unchained/internal/model" "strconv" "sync" "sync/atomic" "github.com/99designs/gqlgen/graphql" - "github.com/TimeleapLabs/unchained/internal/datasets" "github.com/TimeleapLabs/unchained/internal/transport/server/gql/types" "github.com/vektah/gqlparser/v2/ast" ) @@ -18,7 +18,7 @@ import ( // region ************************** generated!.gotpl ************************** type EventLogArgResolver interface { - Value(ctx context.Context, obj *datasets.EventLogArg) (string, error) + Value(ctx context.Context, obj *model.EventLogArg) (string, error) } // endregion ************************** generated!.gotpl ************************** @@ -33,7 +33,7 @@ type EventLogArgResolver interface { // region **************************** field.gotpl ***************************** -func (ec *executionContext) _EventLogArg_name(ctx context.Context, field graphql.CollectedField, obj *datasets.EventLogArg) (ret graphql.Marshaler) { +func (ec *executionContext) _EventLogArg_name(ctx context.Context, field graphql.CollectedField, obj *model.EventLogArg) (ret graphql.Marshaler) { fc, err := ec.fieldContext_EventLogArg_name(ctx, field) if err != nil { return graphql.Null @@ -77,7 +77,7 @@ func (ec *executionContext) fieldContext_EventLogArg_name(ctx context.Context, f return fc, nil } -func (ec *executionContext) _EventLogArg_value(ctx context.Context, field graphql.CollectedField, obj *datasets.EventLogArg) (ret graphql.Marshaler) { +func (ec *executionContext) _EventLogArg_value(ctx context.Context, field graphql.CollectedField, obj *model.EventLogArg) (ret graphql.Marshaler) { fc, err := ec.fieldContext_EventLogArg_value(ctx, field) if err != nil { return graphql.Null @@ -135,7 +135,7 @@ func (ec *executionContext) fieldContext_EventLogArg_value(ctx context.Context, var eventLogArgImplementors = []string{"EventLogArg"} -func (ec *executionContext) _EventLogArg(ctx context.Context, sel ast.SelectionSet, obj *datasets.EventLogArg) graphql.Marshaler { +func (ec *executionContext) _EventLogArg(ctx context.Context, sel ast.SelectionSet, obj *model.EventLogArg) graphql.Marshaler { fields := graphql.CollectFields(ec.OperationContext, sel, eventLogArgImplementors) out := graphql.NewFieldSet(fields) @@ -228,11 +228,11 @@ func (ec *executionContext) marshalNBytes2githubᚗcomᚋTimeleapLabsᚋunchaine return v } -func (ec *executionContext) marshalNEventLogArg2githubᚗcomᚋTimeleapLabsᚋunchainedᚋinternalᚋdatasetsᚐEventLogArg(ctx context.Context, sel ast.SelectionSet, v datasets.EventLogArg) graphql.Marshaler { +func (ec *executionContext) marshalNEventLogArg2githubᚗcomᚋTimeleapLabsᚋunchainedᚋinternalᚋdatasetsᚐEventLogArg(ctx context.Context, sel ast.SelectionSet, v model.EventLogArg) graphql.Marshaler { return ec._EventLogArg(ctx, sel, &v) } -func (ec *executionContext) marshalNEventLogArg2ᚕgithubᚗcomᚋTimeleapLabsᚋunchainedᚋinternalᚋdatasetsᚐEventLogArgᚄ(ctx context.Context, sel ast.SelectionSet, v []datasets.EventLogArg) graphql.Marshaler { +func (ec *executionContext) marshalNEventLogArg2ᚕgithubᚗcomᚋTimeleapLabsᚋunchainedᚋinternalᚋdatasetsᚐEventLogArgᚄ(ctx context.Context, sel ast.SelectionSet, v []model.EventLogArg) graphql.Marshaler { ret := make(graphql.Array, len(v)) var wg sync.WaitGroup isLen1 := len(v) == 1 diff --git a/internal/transport/server/gql/generated/unchained.generated.go b/internal/transport/server/gql/generated/unchained.generated.go index e948521b..a68d855a 100644 --- a/internal/transport/server/gql/generated/unchained.generated.go +++ b/internal/transport/server/gql/generated/unchained.generated.go @@ -6,6 +6,7 @@ import ( "context" "errors" "fmt" + "github.com/TimeleapLabs/unchained/internal/model" "strconv" "sync" "sync/atomic" @@ -13,7 +14,6 @@ import ( "entgo.io/contrib/entgql" "github.com/99designs/gqlgen/graphql" "github.com/99designs/gqlgen/graphql/introspection" - "github.com/TimeleapLabs/unchained/internal/datasets" "github.com/TimeleapLabs/unchained/internal/ent" "github.com/TimeleapLabs/unchained/internal/transport/server/gql/types" "github.com/vektah/gqlparser/v2/ast" @@ -2277,7 +2277,7 @@ func (ec *executionContext) _EventLog_args(ctx context.Context, field graphql.Co } return graphql.Null } - res := resTmp.([]datasets.EventLogArg) + res := resTmp.([]model.EventLogArg) fc.Result = res return ec.marshalNEventLogArg2ᚕgithubᚗcomᚋTimeleapLabsᚋunchainedᚋinternalᚋdatasetsᚐEventLogArgᚄ(ctx, field.Selections, res) } diff --git a/internal/transport/server/gql/server.go b/internal/transport/server/gql/server.go index 6abc2aa3..96c2e394 100644 --- a/internal/transport/server/gql/server.go +++ b/internal/transport/server/gql/server.go @@ -3,19 +3,18 @@ package gql import ( "net/http" - "github.com/TimeleapLabs/unchained/internal/log" - - "github.com/TimeleapLabs/unchained/internal/db" + "github.com/TimeleapLabs/unchained/internal/transport/database" + "github.com/TimeleapLabs/unchained/internal/utils" "github.com/99designs/gqlgen/graphql/handler" "github.com/99designs/gqlgen/graphql/playground" ) -func WithGraphQL() func() { +func WithGraphQL(db database.Database) func() { return func() { - log.Logger.Info("GraphQL service is activated") + utils.Logger.Info("GraphQL service is activated") - srv := handler.NewDefaultServer(NewSchema(db.GetClient())) + srv := handler.NewDefaultServer(NewSchema(db.GetConnection())) http.Handle("/gql", playground.Handler("Unchained Playground", "/gql/query")) http.Handle("/gql/query", srv) } diff --git a/internal/transport/server/gql/types/bytes.go b/internal/transport/server/gql/types/bytes.go index f2cbbdac..91822bc5 100644 --- a/internal/transport/server/gql/types/bytes.go +++ b/internal/transport/server/gql/types/bytes.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/TimeleapLabs/unchained/internal/log" + "github.com/TimeleapLabs/unchained/internal/utils" ) type Bytes []byte @@ -29,6 +29,6 @@ func (bytes Bytes) MarshalGQL(w io.Writer) { hexValue := fmt.Sprintf(`"%x"`, bytes) _, err := w.Write([]byte(hexValue)) if err != nil { - log.Logger.Error(err.Error()) + utils.Logger.Error(err.Error()) } } diff --git a/internal/transport/server/pubsub/pubsub.go b/internal/transport/server/pubsub/pubsub.go new file mode 100644 index 00000000..71f1596b --- /dev/null +++ b/internal/transport/server/pubsub/pubsub.go @@ -0,0 +1,47 @@ +package pubsub + +import ( + "strings" + "sync" + + "github.com/TimeleapLabs/unchained/internal/consts" +) + +var topics = make(map[consts.Channels][]chan []byte) +var mu sync.Mutex + +func getTopicsByPrefix(topic consts.Channels) map[consts.Channels][]chan []byte { + keys := make(map[consts.Channels][]chan []byte) + for key := range topics { + if strings.HasPrefix(string(topic), string(key)) { + keys[key] = make([]chan []byte, len(topics[key])) + copy(keys[key], topics[key]) + } + } + + return keys +} + +func Publish(destinationTopic consts.Channels, operation consts.OpCode, message []byte) { + mu.Lock() + defer mu.Unlock() + + allSubTopics := getTopicsByPrefix(destinationTopic) + + for _, subscribers := range allSubTopics { + for _, ch := range subscribers { + go func(ch chan []byte) { + ch <- append([]byte{byte(operation)}, message...) + }(ch) + } + } +} + +func Subscribe(topic string) chan []byte { + mu.Lock() + defer mu.Unlock() + + ch := make(chan []byte) + topics[consts.Channels(topic)] = append(topics[consts.Channels(topic)], ch) + return ch +} diff --git a/internal/transport/server/pubsub/pubsub_test.go b/internal/transport/server/pubsub/pubsub_test.go new file mode 100644 index 00000000..f493d5bc --- /dev/null +++ b/internal/transport/server/pubsub/pubsub_test.go @@ -0,0 +1,56 @@ +package pubsub + +import ( + "testing" + + "github.com/TimeleapLabs/unchained/internal/consts" +) + +func TestSubscribeDirectly(t *testing.T) { + sub := Subscribe("a.b.c") + + Publish("a.b.c", consts.OpCodeCorrectnessReportBroadcast, []byte("Hello, world!")) + + msg := <-sub + if string(msg[1:]) != "Hello, world!" { + t.Fatalf("Received unexpected message: %s", msg) + } +} + +func TestGetTopicsByPrefix(t *testing.T) { + const ( + first consts.Channels = "a.b.c" + second consts.Channels = "a" + third consts.Channels = "b.c.d" + ) + + topics = map[consts.Channels][]chan []byte{ + first: make([]chan []byte, 0), + second: make([]chan []byte, 0), + third: make([]chan []byte, 0), + } + + trimmedTopics := getTopicsByPrefix(first) + + for topic := range trimmedTopics { + if topic != first && topic != second { + t.Fatalf("Unexpected topic: %s", topic) + } + } +} + +func TestSubscribeWithPrefix(t *testing.T) { + sub := Subscribe("a") + + Publish("a.b.c", consts.OpCodeCorrectnessReportBroadcast, []byte("Hello, world!")) + + msg := <-sub + + if string(msg[1:]) != "Hello, world!" { + t.Fatalf("Received unexpected message: %s", msg) + } +} + +func TestPublishWithoutSubscriber(_ *testing.T) { + Publish("a.b.c", consts.OpCodeCorrectnessReportBroadcast, []byte("Hello, world!")) +} diff --git a/internal/transport/server/server.go b/internal/transport/server/server.go index 3cbc508e..47e4eeef 100644 --- a/internal/transport/server/server.go +++ b/internal/transport/server/server.go @@ -4,8 +4,9 @@ import ( "fmt" "net/http" + "github.com/TimeleapLabs/unchained/internal/utils" + "github.com/TimeleapLabs/unchained/internal/config" - "github.com/TimeleapLabs/unchained/internal/log" ) func New(options ...func()) { @@ -13,7 +14,7 @@ func New(options ...func()) { option() } - log.Logger. + utils.Logger. With("Bind", fmt.Sprintf("http://%s", config.App.Network.Bind)). Info("Starting a HTTP server") diff --git a/internal/transport/server/websocket/handler/correctness.go b/internal/transport/server/websocket/handler/correctness.go index 713fa3d7..c99a9354 100644 --- a/internal/transport/server/websocket/handler/correctness.go +++ b/internal/transport/server/websocket/handler/correctness.go @@ -1,15 +1,10 @@ package handler import ( - "github.com/TimeleapLabs/unchained/internal/constants" - "github.com/TimeleapLabs/unchained/internal/crypto" - "github.com/TimeleapLabs/unchained/internal/crypto/bls" - "github.com/TimeleapLabs/unchained/internal/datasets" - "github.com/TimeleapLabs/unchained/internal/log" + "github.com/TimeleapLabs/unchained/internal/consts" + "github.com/TimeleapLabs/unchained/internal/model" "github.com/TimeleapLabs/unchained/internal/transport/server/websocket/middleware" - "github.com/TimeleapLabs/unchained/internal/transport/server/websocket/store" "github.com/gorilla/websocket" - sia "github.com/pouya-eghbali/go-sia/v2/pkg" ) func CorrectnessRecord(conn *websocket.Conn, payload []byte) ([]byte, error) { @@ -18,47 +13,22 @@ func CorrectnessRecord(conn *websocket.Conn, payload []byte) ([]byte, error) { return []byte{}, err } - signer, ok := store.Signers.Load(conn) - if !ok { - return nil, constants.ErrMissingHello - } - - report := new(datasets.CorrectnessReport).DeSia(&sia.Sia{Content: payload}) - toHash := report.Correctness.Sia().Content - hash, err := bls.Hash(toHash) - - if err != nil { - log.Logger.Error("Can't hash bls: %v", err) - return []byte{}, constants.ErrInternalError - } - - signature, err := bls.RecoverSignature(report.Signature) + correctness := new(model.CorrectnessReportPacket).FromBytes(payload) + correctnessHash, err := correctness.Correctness.Bls() if err != nil { - log.Logger.Error("Can't recover bls signature: %v", err) - return []byte{}, constants.ErrInternalError + return []byte{}, consts.ErrInternalError } - pk, err := bls.RecoverPublicKey(signer.PublicKey) + signer, err := middleware.IsMessageValid(conn, correctnessHash, correctness.Signature) if err != nil { - log.Logger.Error("Can't recover bls pub-key: %v", err) - return []byte{}, constants.ErrCantVerifyBls - } - - ok, err = crypto.Identity.Bls.Verify(signature, hash, pk) - if err != nil { - log.Logger.With("Error", err).Error("Can't verify bls") - return []byte{}, constants.ErrCantVerifyBls - } - if !ok { - return []byte{}, constants.ErrInvalidSignature + return []byte{}, err } - broadcastPacket := datasets.BroadcastCorrectnessPacket{ - Info: report.Correctness, - Signature: report.Signature, + broadcastPacket := model.BroadcastCorrectnessPacket{ + Info: correctness.Correctness, + Signature: correctness.Signature, Signer: signer, } - broadcastPayload := broadcastPacket.Sia().Content - return broadcastPayload, nil + return broadcastPacket.Sia().Bytes(), nil } diff --git a/internal/transport/server/websocket/handler/event.go b/internal/transport/server/websocket/handler/event.go index 45bfb387..4aa3d206 100644 --- a/internal/transport/server/websocket/handler/event.go +++ b/internal/transport/server/websocket/handler/event.go @@ -1,15 +1,10 @@ package handler import ( - "github.com/TimeleapLabs/unchained/internal/constants" - "github.com/TimeleapLabs/unchained/internal/crypto" - "github.com/TimeleapLabs/unchained/internal/crypto/bls" - "github.com/TimeleapLabs/unchained/internal/datasets" - "github.com/TimeleapLabs/unchained/internal/log" + "github.com/TimeleapLabs/unchained/internal/consts" + "github.com/TimeleapLabs/unchained/internal/model" "github.com/TimeleapLabs/unchained/internal/transport/server/websocket/middleware" - "github.com/TimeleapLabs/unchained/internal/transport/server/websocket/store" "github.com/gorilla/websocket" - sia "github.com/pouya-eghbali/go-sia/v2/pkg" ) func EventLog(conn *websocket.Conn, payload []byte) ([]byte, error) { @@ -18,47 +13,22 @@ func EventLog(conn *websocket.Conn, payload []byte) ([]byte, error) { return []byte{}, err } - signer, ok := store.Signers.Load(conn) - if !ok { - return nil, constants.ErrMissingHello - } - - report := new(datasets.EventLogReport).DeSia(&sia.Sia{Content: payload}) - toHash := report.EventLog.Sia().Content - hash, err := bls.Hash(toHash) - - if err != nil { - log.Logger.Error("Can't hash bls: %v", err) - return []byte{}, constants.ErrInternalError - } - - signature, err := bls.RecoverSignature(report.Signature) + priceReport := new(model.EventLogReportPacket).FromBytes(payload) + priceInfoHash, err := priceReport.EventLog.Bls() if err != nil { - log.Logger.Error("Can't recover bls signature: %v", err) - return []byte{}, constants.ErrInternalError + return []byte{}, consts.ErrInternalError } - pk, err := bls.RecoverPublicKey(signer.PublicKey) + signer, err := middleware.IsMessageValid(conn, priceInfoHash, priceReport.Signature) if err != nil { - log.Logger.Error("Can't recover bls pub-key: %v", err) - return []byte{}, constants.ErrCantVerifyBls - } - - ok, err = crypto.Identity.Bls.Verify(signature, hash, pk) - if err != nil { - log.Logger.Error("Can't recover bls pub-key: %v", err) - return []byte{}, constants.ErrCantVerifyBls - } - if !ok { - return []byte{}, constants.ErrInvalidSignature + return []byte{}, err } - broadcastPacket := datasets.BroadcastEventPacket{ - Info: report.EventLog, - Signature: report.Signature, + broadcastPacket := model.BroadcastEventPacket{ + Info: priceReport.EventLog, + Signature: priceReport.Signature, Signer: signer, } - broadcastPayload := broadcastPacket.Sia().Content - return broadcastPayload, nil + return broadcastPacket.Sia().Bytes(), nil } diff --git a/internal/transport/server/websocket/handler/hello.go b/internal/transport/server/websocket/handler/hello.go index fa5dc27d..b76d5d4e 100644 --- a/internal/transport/server/websocket/handler/hello.go +++ b/internal/transport/server/websocket/handler/hello.go @@ -1,24 +1,22 @@ package handler import ( - "github.com/TimeleapLabs/unchained/internal/constants" - "github.com/TimeleapLabs/unchained/internal/crypto/kosk" - "github.com/TimeleapLabs/unchained/internal/datasets" - "github.com/TimeleapLabs/unchained/internal/log" + "github.com/TimeleapLabs/unchained/internal/consts" + "github.com/TimeleapLabs/unchained/internal/model" "github.com/TimeleapLabs/unchained/internal/transport/server/websocket/store" + "github.com/TimeleapLabs/unchained/internal/utils" "github.com/gorilla/websocket" - sia "github.com/pouya-eghbali/go-sia/v2/pkg" ) func Hello(conn *websocket.Conn, payload []byte) ([]byte, error) { - signer := new(datasets.Signer).DeSia(&sia.Sia{Content: payload}) + signer := new(model.Signer).FromBytes(payload) if signer.Name == "" { - log.Logger.Error("Signer name is empty Or public key is invalid") - return []byte{}, constants.ErrInvalidConfig + utils.Logger.Error("Signer name is empty Or public key is invalid") + return []byte{}, consts.ErrInvalidConfig } - store.Signers.Range(func(conn *websocket.Conn, signerInMap datasets.Signer) bool { + store.Signers.Range(func(conn *websocket.Conn, signerInMap model.Signer) bool { publicKeyInUse := signerInMap.PublicKey == signer.PublicKey if publicKeyInUse { Close(conn) @@ -29,9 +27,8 @@ func Hello(conn *websocket.Conn, payload []byte) ([]byte, error) { store.Signers.Store(conn, *signer) // Start KOSK verification - challenge := kosk.Challenge{Random: kosk.NewChallenge()} + challenge := model.ChallengePacket{Random: utils.NewChallenge()} store.Challenges.Store(conn, challenge) - koskPayload := challenge.Sia().Content - return koskPayload, nil + return challenge.Sia().Bytes(), nil } diff --git a/internal/transport/server/websocket/handler/helper.go b/internal/transport/server/websocket/handler/helper.go index e194054f..e6db66a5 100644 --- a/internal/transport/server/websocket/handler/helper.go +++ b/internal/transport/server/websocket/handler/helper.go @@ -1,13 +1,14 @@ package handler import ( - "github.com/TimeleapLabs/unchained/internal/constants/opcodes" - "github.com/TimeleapLabs/unchained/internal/log" - "github.com/TimeleapLabs/unchained/internal/transport/server/websocket/store" + "context" + + "github.com/TimeleapLabs/unchained/internal/consts" + "github.com/TimeleapLabs/unchained/internal/utils" "github.com/gorilla/websocket" ) -func Send(conn *websocket.Conn, messageType int, opCode opcodes.OpCode, payload []byte) { +func Send(conn *websocket.Conn, messageType int, opCode consts.OpCode, payload []byte) { err := conn.WriteMessage( messageType, append( @@ -15,33 +16,31 @@ func Send(conn *websocket.Conn, messageType int, opCode opcodes.OpCode, payload payload...), ) if err != nil { - log.Logger.With("Error", err).Error("Can't send packet") + utils.Logger.With("Error", err).Error("Can't send packet") } } -func SendMessage(conn *websocket.Conn, messageType int, opCode opcodes.OpCode, message string) { +func SendMessage(conn *websocket.Conn, messageType int, opCode consts.OpCode, message string) { Send(conn, messageType, opCode, []byte(message)) } -func BroadcastPayload(opCode opcodes.OpCode, message []byte) { - store.Consumers.Range(func(consumer *websocket.Conn, _ bool) bool { - mu, ok := store.BroadcastMutex.Load(consumer) - if ok { - mu.Lock() - defer mu.Unlock() - err := consumer.WriteMessage(websocket.BinaryMessage, append( - []byte{byte(opCode)}, - message..., - )) +func BroadcastListener(ctx context.Context, conn *websocket.Conn, ch chan []byte) { + for { + select { + case <-ctx.Done(): + utils.Logger.Info("Closing connection") + close(ch) + return + case message := <-ch: + err := conn.WriteMessage(websocket.BinaryMessage, message) if err != nil { - log.Logger.Error(err.Error()) + utils.Logger.Error(err.Error()) } } - return true - }) + } } -func SendError(conn *websocket.Conn, messageType int, opCode opcodes.OpCode, err error) { +func SendError(conn *websocket.Conn, messageType int, opCode consts.OpCode, err error) { SendMessage(conn, messageType, opCode, err.Error()) } @@ -50,11 +49,11 @@ func Close(conn *websocket.Conn) { websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, "")) if err != nil { - log.Logger.With("Error", err).Error("Connection closed") + utils.Logger.With("Error", err).Error("Connection closed") } err = conn.Close() if err != nil { - log.Logger.With("Error", err).Error("Can't close connection") + utils.Logger.With("Error", err).Error("Can't close connection") } } diff --git a/internal/transport/server/websocket/handler/kosk.go b/internal/transport/server/websocket/handler/kosk.go index a1c7e381..9555ca70 100644 --- a/internal/transport/server/websocket/handler/kosk.go +++ b/internal/transport/server/websocket/handler/kosk.go @@ -1,34 +1,29 @@ package handler import ( - "github.com/TimeleapLabs/unchained/internal/constants" - "github.com/TimeleapLabs/unchained/internal/crypto/kosk" - "github.com/TimeleapLabs/unchained/internal/log" + "github.com/TimeleapLabs/unchained/internal/consts" + "github.com/TimeleapLabs/unchained/internal/crypto/bls" + "github.com/TimeleapLabs/unchained/internal/model" + "github.com/TimeleapLabs/unchained/internal/transport/server/websocket/middleware" "github.com/TimeleapLabs/unchained/internal/transport/server/websocket/store" "github.com/gorilla/websocket" - sia "github.com/pouya-eghbali/go-sia/v2/pkg" ) func Kosk(conn *websocket.Conn, payload []byte) error { - challenge := new(kosk.Challenge).DeSia(&sia.Sia{Content: payload}) - - signer, ok := store.Signers.Load(conn) - if !ok { - return constants.ErrMissingHello - } - - var err error - challenge.Passed, err = kosk.VerifyChallenge(challenge.Random, signer.PublicKey, challenge.Signature) + challenge := new(model.ChallengePacket).FromBytes(payload) + hash, err := bls.Hash(challenge.Random[:]) if err != nil { - return constants.ErrInvalidKosk + return err } - if !challenge.Passed { - log.Logger.Error("challenge is Passed") - return constants.ErrInvalidKosk + _, err = middleware.IsMessageValid(conn, hash, challenge.Signature) + if err != nil { + return consts.ErrInvalidKosk } + challenge.Passed = true store.Challenges.Store(conn, *challenge) + return nil } diff --git a/internal/transport/server/websocket/handler/price.go b/internal/transport/server/websocket/handler/price.go index 516a6337..f56187e9 100644 --- a/internal/transport/server/websocket/handler/price.go +++ b/internal/transport/server/websocket/handler/price.go @@ -1,64 +1,35 @@ package handler import ( - "github.com/TimeleapLabs/unchained/internal/constants" - "github.com/TimeleapLabs/unchained/internal/crypto" - "github.com/TimeleapLabs/unchained/internal/crypto/bls" - "github.com/TimeleapLabs/unchained/internal/datasets" - "github.com/TimeleapLabs/unchained/internal/log" + "github.com/TimeleapLabs/unchained/internal/consts" + "github.com/TimeleapLabs/unchained/internal/model" "github.com/TimeleapLabs/unchained/internal/transport/server/websocket/middleware" - "github.com/TimeleapLabs/unchained/internal/transport/server/websocket/store" "github.com/gorilla/websocket" - sia "github.com/pouya-eghbali/go-sia/v2/pkg" ) +// PriceReport check signature of message and return price info. func PriceReport(conn *websocket.Conn, payload []byte) ([]byte, error) { err := middleware.IsConnectionAuthenticated(conn) if err != nil { return []byte{}, err } - signer, ok := store.Signers.Load(conn) - if !ok { - return nil, constants.ErrMissingHello - } - - report := new(datasets.PriceReport).DeSia(&sia.Sia{Content: payload}) - toHash := report.PriceInfo.Sia().Content - hash, err := bls.Hash(toHash) - - if err != nil { - log.Logger.Error("Can't hash bls: %v", err) - return []byte{}, constants.ErrInternalError - } - - signature, err := bls.RecoverSignature(report.Signature) + priceReport := new(model.PriceReportPacket).FromBytes(payload) + priceInfoHash, err := priceReport.PriceInfo.Bls() if err != nil { - log.Logger.Error("Can't recover bls signature: %v", err) - return []byte{}, constants.ErrInternalError + return []byte{}, consts.ErrInternalError } - pk, err := bls.RecoverPublicKey(signer.PublicKey) + signer, err := middleware.IsMessageValid(conn, priceInfoHash, priceReport.Signature) if err != nil { - log.Logger.Error("Can't recover bls pub-key: %v", err) - return []byte{}, constants.ErrInternalError - } - - ok, err = crypto.Identity.Bls.Verify(signature, hash, pk) - if err != nil { - log.Logger.Error("Can't recover bls pub-key: %v", err) - return []byte{}, constants.ErrCantVerifyBls - } - if !ok { - return []byte{}, constants.ErrInvalidSignature + return []byte{}, err } - priceInfo := datasets.BroadcastPricePacket{ - Info: report.PriceInfo, - Signature: report.Signature, + priceInfo := model.BroadcastPricePacket{ + Info: priceReport.PriceInfo, + Signature: priceReport.Signature, Signer: signer, } - priceInfoByte := priceInfo.Sia().Content - return priceInfoByte, nil + return priceInfo.Sia().Bytes(), nil } diff --git a/internal/transport/server/websocket/middleware/authentication.go b/internal/transport/server/websocket/middleware/authentication.go index 5ead14e1..246cae16 100644 --- a/internal/transport/server/websocket/middleware/authentication.go +++ b/internal/transport/server/websocket/middleware/authentication.go @@ -1,7 +1,7 @@ package middleware import ( - "github.com/TimeleapLabs/unchained/internal/constants" + "github.com/TimeleapLabs/unchained/internal/consts" "github.com/TimeleapLabs/unchained/internal/transport/server/websocket/store" "github.com/gorilla/websocket" ) @@ -9,7 +9,7 @@ import ( func IsConnectionAuthenticated(conn *websocket.Conn) error { challenge, ok := store.Challenges.Load(conn) if !ok || !challenge.Passed { - return constants.ErrMissingKosk + return consts.ErrMissingKosk } return nil diff --git a/internal/transport/server/websocket/middleware/signature.go b/internal/transport/server/websocket/middleware/signature.go new file mode 100644 index 00000000..4cf3dbde --- /dev/null +++ b/internal/transport/server/websocket/middleware/signature.go @@ -0,0 +1,43 @@ +package middleware + +import ( + "github.com/TimeleapLabs/unchained/internal/consts" + "github.com/TimeleapLabs/unchained/internal/crypto" + "github.com/TimeleapLabs/unchained/internal/crypto/bls" + "github.com/TimeleapLabs/unchained/internal/model" + "github.com/TimeleapLabs/unchained/internal/transport/server/websocket/store" + "github.com/TimeleapLabs/unchained/internal/utils" + bls12381 "github.com/consensys/gnark-crypto/ecc/bls12-381" + "github.com/gorilla/websocket" +) + +func IsMessageValid(conn *websocket.Conn, message bls12381.G1Affine, signature [48]byte) (model.Signer, error) { + signer, ok := store.Signers.Load(conn) + if !ok { + return model.Signer{}, consts.ErrMissingHello + } + + signatureBls, err := bls.RecoverSignature(signature) + if err != nil { + utils.Logger.With("Err", err).Error("Can't recover bls signature") + return model.Signer{}, consts.ErrInternalError + } + + pk, err := bls.RecoverPublicKey(signer.PublicKey) + if err != nil { + utils.Logger.With("Err", err).Error("Can't recover pub key pub-key") + return model.Signer{}, consts.ErrInternalError + } + + ok, err = crypto.Identity.Bls.Verify(signatureBls, message, pk) + if err != nil { + utils.Logger.With("Err", err).Error("Can't verify bls") + return model.Signer{}, consts.ErrCantVerifyBls + } + + if !ok { + return model.Signer{}, consts.ErrInvalidSignature + } + + return signer, nil +} diff --git a/internal/transport/server/websocket/store/store.go b/internal/transport/server/websocket/store/store.go index 8f31d0e6..6bf69d7e 100644 --- a/internal/transport/server/websocket/store/store.go +++ b/internal/transport/server/websocket/store/store.go @@ -1,17 +1,11 @@ package store import ( - "sync" - - "github.com/TimeleapLabs/unchained/internal/crypto/kosk" - "github.com/TimeleapLabs/unchained/internal/datasets" + "github.com/TimeleapLabs/unchained/internal/model" "github.com/gorilla/websocket" "github.com/puzpuzpuz/xsync/v3" ) -var Consumers = xsync.NewMapOf[*websocket.Conn, bool]() -var BroadcastMutex = xsync.NewMapOf[*websocket.Conn, *sync.Mutex]() - -var Challenges = xsync.NewMapOf[*websocket.Conn, kosk.Challenge]() -var Signers = xsync.NewMapOf[*websocket.Conn, datasets.Signer]() +var Challenges = xsync.NewMapOf[*websocket.Conn, model.ChallengePacket]() +var Signers = xsync.NewMapOf[*websocket.Conn, model.Signer]() diff --git a/internal/transport/server/websocket/websocket.go b/internal/transport/server/websocket/websocket.go index 7a759fca..f94cd296 100644 --- a/internal/transport/server/websocket/websocket.go +++ b/internal/transport/server/websocket/websocket.go @@ -1,13 +1,14 @@ package websocket import ( + "context" "fmt" "net/http" - "sync" - "github.com/TimeleapLabs/unchained/internal/constants" - "github.com/TimeleapLabs/unchained/internal/constants/opcodes" - "github.com/TimeleapLabs/unchained/internal/log" + "github.com/TimeleapLabs/unchained/internal/consts" + "github.com/TimeleapLabs/unchained/internal/transport/server/pubsub" + "github.com/TimeleapLabs/unchained/internal/utils" + "github.com/TimeleapLabs/unchained/internal/transport/server/websocket/handler" "github.com/TimeleapLabs/unchained/internal/transport/server/websocket/store" "github.com/gorilla/websocket" @@ -17,9 +18,9 @@ var upgrader = websocket.Upgrader{} func WithWebsocket() func() { return func() { - log.Logger.Info("Starting a websocket server") + utils.Logger.Info("Starting a websocket server") - versionedRoot := fmt.Sprintf("/%s", constants.ProtocolVersion) + versionedRoot := fmt.Sprintf("/%s", consts.ProtocolVersion) http.HandleFunc(versionedRoot, multiplexer) } } @@ -27,23 +28,24 @@ func WithWebsocket() func() { func multiplexer(w http.ResponseWriter, r *http.Request) { conn, err := upgrader.Upgrade(w, r, nil) if err != nil { - log.Logger.Error("Can't upgrade the HTTP connection: %v", err) + utils.Logger.Error("Can't upgrade the HTTP connection: %v", err) return } + ctx, cancel := context.WithCancel(context.TODO()) + defer store.Signers.Delete(conn) defer store.Challenges.Delete(conn) - defer store.Consumers.Delete(conn) - defer store.BroadcastMutex.Delete(conn) + defer cancel() for { messageType, payload, err := conn.ReadMessage() if err != nil { - log.Logger.Error("Can't read message: %v", err) + utils.Logger.Error("Can't read message: %v", err) err := conn.Close() if err != nil { - log.Logger.Error("Can't close connection: %v", err) + utils.Logger.Error("Can't close connection: %v", err) } break @@ -53,63 +55,61 @@ func multiplexer(w http.ResponseWriter, r *http.Request) { continue } - switch opcodes.OpCode(payload[0]) { - case opcodes.Hello: - log.Logger.With("IP", conn.RemoteAddr().String()).Info("New Client Registered") + switch consts.OpCode(payload[0]) { + case consts.OpCodeHello: + utils.Logger.With("IP", conn.RemoteAddr().String()).Info("New Client Registered") result, err := handler.Hello(conn, payload[1:]) if err != nil { - handler.SendError(conn, messageType, opcodes.Error, err) + handler.SendError(conn, messageType, consts.OpCodeError, err) continue } - handler.SendMessage(conn, messageType, opcodes.Feedback, "conf.ok") - handler.Send(conn, messageType, opcodes.KoskChallenge, result) - case opcodes.PriceReport: + handler.SendMessage(conn, messageType, consts.OpCodeFeedback, "conf.ok") + handler.Send(conn, messageType, consts.OpCodeKoskChallenge, result) + case consts.OpCodePriceReport: result, err := handler.PriceReport(conn, payload[1:]) if err != nil { - handler.SendError(conn, messageType, opcodes.Error, err) + handler.SendError(conn, messageType, consts.OpCodeError, err) continue } - handler.BroadcastPayload(opcodes.PriceReportBroadcast, result) - handler.SendMessage(conn, messageType, opcodes.Feedback, "signature.accepted") - case opcodes.EventLog: + pubsub.Publish(consts.ChannelPriceReport, consts.OpCodePriceReportBroadcast, result) + handler.SendMessage(conn, messageType, consts.OpCodeFeedback, "signature.accepted") + case consts.OpCodeEventLog: result, err := handler.EventLog(conn, payload[1:]) if err != nil { - handler.SendError(conn, messageType, opcodes.Error, err) + handler.SendError(conn, messageType, consts.OpCodeError, err) continue } - handler.BroadcastPayload(opcodes.EventLogBroadcast, result) - handler.SendMessage(conn, messageType, opcodes.Feedback, "signature.accepted") - - case opcodes.CorrectnessReport: + pubsub.Publish(consts.ChannelEventLog, consts.OpCodeEventLogBroadcast, result) + handler.SendMessage(conn, messageType, consts.OpCodeFeedback, "signature.accepted") + case consts.OpCodeCorrectnessReport: result, err := handler.CorrectnessRecord(conn, payload[1:]) if err != nil { - handler.SendError(conn, messageType, opcodes.Error, err) + handler.SendError(conn, messageType, consts.OpCodeError, err) continue } - handler.BroadcastPayload(opcodes.CorrectnessReportBroadcast, result) - handler.SendMessage(conn, messageType, opcodes.Feedback, "signature.accepted") - - case opcodes.KoskResult: + pubsub.Publish(consts.ChannelCorrectnessReport, consts.OpCodeCorrectnessReportBroadcast, result) + handler.SendMessage(conn, messageType, consts.OpCodeFeedback, "signature.accepted") + case consts.OpCodeKoskResult: err := handler.Kosk(conn, payload[1:]) if err != nil { - handler.SendError(conn, messageType, opcodes.Error, err) + handler.SendError(conn, messageType, consts.OpCodeError, err) continue } - handler.SendMessage(conn, messageType, opcodes.Feedback, "kosk.ok") - - case opcodes.RegisterConsumer: - log.Logger.With("IP", conn.RemoteAddr().String()).Info("New Consumer registered") + handler.SendMessage(conn, messageType, consts.OpCodeFeedback, "kosk.ok") + case consts.OpCodeRegisterConsumer: + utils.Logger. + With("IP", conn.RemoteAddr().String()). + With("Channel", string(payload[1:])). + Info("New Consumer registered") - // TODO: Consumers must specify what they're subscribing to - store.Consumers.Store(conn, true) - store.BroadcastMutex.Store(conn, new(sync.Mutex)) + go handler.BroadcastListener(ctx, conn, pubsub.Subscribe(string(payload[1:]))) default: - handler.SendError(conn, messageType, opcodes.Error, constants.ErrNotSupportedInstruction) + handler.SendError(conn, messageType, consts.OpCodeError, consts.ErrNotSupportedInstruction) } } } diff --git a/internal/address/address.go b/internal/utils/address/address.go similarity index 79% rename from internal/address/address.go rename to internal/utils/address/address.go index 7d4ff0be..08e8ebe2 100644 --- a/internal/address/address.go +++ b/internal/utils/address/address.go @@ -3,10 +3,19 @@ package address import ( "fmt" - "github.com/TimeleapLabs/unchained/internal/crypto/shake" + "github.com/TimeleapLabs/unchained/internal/utils" ) -var chars = "0123456789ABCDEFGHJKMNPQRSTUVXYZ" +const chars = "0123456789ABCDEFGHJKMNPQRSTUVXYZ" + +func Calculate(input []byte) string { + hash := utils.Shake(input) + address := ToBase32(hash[:20]) + checksum := utils.Shake([]byte(address)) + checkchars := []byte{chars[checksum[0]%32], chars[checksum[1]%32]} + + return fmt.Sprintf("%s%s", address, checkchars) +} func ToBase32(input []byte) string { var output []byte @@ -32,17 +41,8 @@ func ToBase32(input []byte) string { return string(output) } -func Calculate(input []byte) string { - hash := shake.Shake(input) - address := ToBase32(hash[:20]) - checksum := shake.Shake([]byte(address)) - checkchars := []byte{chars[checksum[0]%32], chars[checksum[1]%32]} - - return fmt.Sprintf("%s%s", address, checkchars) -} - func CalculateHex(input []byte) (string, [20]byte) { - hash := shake.Shake(input) + hash := utils.Shake(input) addressBytes := hash[:20] return fmt.Sprintf("0x%x", addressBytes), [20]byte(addressBytes) } diff --git a/internal/utils/challenge.go b/internal/utils/challenge.go new file mode 100644 index 00000000..243456af --- /dev/null +++ b/internal/utils/challenge.go @@ -0,0 +1,20 @@ +package utils + +import ( + "crypto/rand" +) + +const ( + LenOfChallenge = 128 +) + +// NewChallenge generate a new challenge. +func NewChallenge() [LenOfChallenge]byte { + challenge := make([]byte, LenOfChallenge) + _, err := rand.Read(challenge) + if err != nil { + panic(err) + } + + return [LenOfChallenge]byte(challenge) +} diff --git a/internal/utils/convert.go b/internal/utils/convert.go new file mode 100644 index 00000000..ce99958c --- /dev/null +++ b/internal/utils/convert.go @@ -0,0 +1,21 @@ +package utils + +import ( + "math/big" + + "golang.org/x/crypto/sha3" +) + +func BigIntToFloat(power *big.Int) *big.Float { + decimalPlaces := big.NewInt(1e18) + powerFloat := new(big.Float).SetInt(power) + powerFloat.Quo(powerFloat, new(big.Float).SetInt(decimalPlaces)) + return powerFloat +} + +func Shake(input []byte) []byte { + shake := sha3.NewShake256() + shake.Write(input) + hash := shake.Sum(nil) + return hash +} diff --git a/internal/utils/debounce.go b/internal/utils/debounce.go index 35b18b96..dc79d507 100644 --- a/internal/utils/debounce.go +++ b/internal/utils/debounce.go @@ -1,6 +1,7 @@ package utils import ( + "context" "sync" "time" ) @@ -17,7 +18,8 @@ func newDebounceContext[KeyType comparable, ArgType any]() *debounceContext[KeyT } func Debounce[KeyType comparable, ArgType any]( - wait time.Duration, function func(ArgType)) func(key KeyType, arg ArgType) { + wait time.Duration, function func(context.Context, ArgType) error, +) func(key KeyType, arg ArgType) { debounce := newDebounceContext[KeyType, ArgType]() return func(key KeyType, arg ArgType) { @@ -34,7 +36,12 @@ func Debounce[KeyType comparable, ArgType any]( go func() { defer debounce.Unlock() delete(debounce.timers, key) - function(arg) + ctx, cancel := context.WithTimeout(context.TODO(), time.Minute) + defer cancel() + err := function(ctx, arg) + if err != nil { + Logger.With("err", err).Error("unsuccessful debounced function call") + } }() }) } diff --git a/internal/log/logger.go b/internal/utils/logger.go similarity index 84% rename from internal/log/logger.go rename to internal/utils/logger.go index 5b7a9410..c1324c39 100644 --- a/internal/log/logger.go +++ b/internal/utils/logger.go @@ -1,4 +1,4 @@ -package log +package utils import ( "log/slog" @@ -10,7 +10,8 @@ import ( var Logger *slog.Logger -func Start(logLevel string) { +// SetupLogger initializes the logger. +func SetupLogger(logLevel string) { levels := make(map[string]slog.Level) levels["info"] = slog.LevelInfo levels["warn"] = slog.LevelWarn