From 684c54a317dd3760c115eb756207a37c6b66625f Mon Sep 17 00:00:00 2001 From: Linus Gasser Date: Thu, 4 Jul 2024 10:16:46 +0200 Subject: [PATCH] @pierluca's comments - Adding new version of libp2p - Re-enabling failing test and remove goverall - Use peer.ID.Validate - Don't export Packet and Forward - Merging participant and orchestrator --- .github/workflows/go_test.yml | 1 + Makefile | 4 +- go.mod | 62 +++---- go.sum | 149 ++++++++-------- mino/minows/address.go | 10 +- mino/minows/key/mod.go | 3 +- mino/minows/rpc.go | 167 ++++++------------ mino/minows/session.go | 319 ++++++++++++++++------------------ mino/minows/session_test.go | 33 ++-- test/cosidela_test.go | 36 ++-- 10 files changed, 356 insertions(+), 428 deletions(-) diff --git a/.github/workflows/go_test.yml b/.github/workflows/go_test.yml index 4ed35d3d..f5f85d6e 100644 --- a/.github/workflows/go_test.yml +++ b/.github/workflows/go_test.yml @@ -62,6 +62,7 @@ jobs: # notifies that all test jobs are finished. finish: + if: github.repository == 'dedis/dela' needs: test runs-on: ubuntu-latest steps: diff --git a/Makefile b/Makefile index b317bcc3..1364f4c5 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ generate: tidy # Some packages are excluded from staticcheck due to deprecated warnings: #208. lint: tidy # Coding style static check. - @go install honnef.co/go/tools/cmd/staticcheck@latest + @go install honnef.co/go/tools/cmd/staticcheck@v0.4.7 staticcheck `go list ./... | grep -Ev "(go\.dedis\.ch/dela/internal/testing|go\.dedis\.ch/dela/mino/minogrpc/ptypes)"` vet: tidy @@ -54,4 +54,4 @@ coverage: tidy pushdoc: @echo "Requesting the proxy..." @curl "https://proxy.golang.org/go.dedis.ch/dela/@v/$(shell git log origin/master -1 --format=format:%H).info" - @echo "\nDone." \ No newline at end of file + @echo "\nDone." diff --git a/go.mod b/go.mod index cf416601..67e1249d 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,8 @@ go 1.21 require ( github.com/golang/protobuf v1.5.4 - github.com/libp2p/go-libp2p v0.35.2 + github.com/libp2p/go-libp2p v0.36.1 + github.com/libp2p/go-yamux/v4 v4.0.1 github.com/multiformats/go-multiaddr v0.13.0 github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e github.com/opentracing/opentracing-go v1.2.0 @@ -17,9 +18,9 @@ require ( go.dedis.ch/debugtools v0.1.1 go.dedis.ch/kyber/v3 v3.1.0 go.etcd.io/bbolt v1.3.9 - golang.org/x/crypto v0.23.0 - golang.org/x/net v0.25.0 - golang.org/x/tools v0.21.0 + golang.org/x/crypto v0.25.0 + golang.org/x/net v0.27.0 + golang.org/x/tools v0.23.0 golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 google.golang.org/grpc v1.63.0 gopkg.in/yaml.v2 v2.4.0 @@ -29,7 +30,7 @@ require ( github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect github.com/benbjohnson/clock v1.3.5 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/containerd/cgroups v1.1.0 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect @@ -37,14 +38,14 @@ require ( github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect github.com/docker/go-units v0.5.0 // indirect - github.com/elastic/gosigar v0.14.2 // indirect + github.com/elastic/gosigar v0.14.3 // indirect github.com/flynn/noise v1.1.0 // indirect github.com/francoispqt/gojay v1.2.13 // indirect - github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect + github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/godbus/dbus/v5 v5.1.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/google/gopacket v1.1.19 // indirect - github.com/google/pprof v0.0.0-20240207164012-fb44976bdcd5 // indirect + github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect github.com/google/uuid v1.6.0 // indirect github.com/gorilla/websocket v1.5.3 // indirect github.com/huin/goupnp v1.3.0 // indirect @@ -52,8 +53,8 @@ require ( github.com/ipfs/go-log/v2 v2.5.1 // indirect github.com/jackpal/go-nat-pmp v1.0.2 // indirect github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect - github.com/klauspost/compress v1.17.8 // indirect - github.com/klauspost/cpuid/v2 v2.2.7 // indirect + github.com/klauspost/compress v1.17.9 // indirect + github.com/klauspost/cpuid/v2 v2.2.8 // indirect github.com/koron/go-ssdp v0.0.4 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect github.com/libp2p/go-flow-metrics v0.1.0 // indirect @@ -62,11 +63,10 @@ require ( github.com/libp2p/go-nat v0.2.0 // indirect github.com/libp2p/go-netroute v0.2.1 // indirect github.com/libp2p/go-reuseport v0.4.0 // indirect - github.com/libp2p/go-yamux/v4 v4.0.1 // indirect github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect - github.com/miekg/dns v1.1.58 // indirect + github.com/miekg/dns v1.1.61 // indirect github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect github.com/minio/sha256-simd v1.0.1 // indirect @@ -80,38 +80,40 @@ require ( github.com/multiformats/go-multihash v0.2.3 // indirect github.com/multiformats/go-multistream v0.5.0 // indirect github.com/multiformats/go-varint v0.0.7 // indirect - github.com/onsi/ginkgo/v2 v2.15.0 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/onsi/ginkgo/v2 v2.19.1 // indirect github.com/opencontainers/runtime-spec v1.2.0 // indirect github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect - github.com/pion/datachannel v1.5.6 // indirect - github.com/pion/dtls/v2 v2.2.11 // indirect - github.com/pion/ice/v2 v2.3.25 // indirect + github.com/pion/datachannel v1.5.8 // indirect + github.com/pion/dtls/v2 v2.2.12 // indirect + github.com/pion/ice/v2 v2.3.32 // indirect github.com/pion/interceptor v0.1.29 // indirect github.com/pion/logging v0.2.2 // indirect github.com/pion/mdns v0.0.12 // indirect github.com/pion/randutil v0.1.0 // indirect github.com/pion/rtcp v1.2.14 // indirect - github.com/pion/rtp v1.8.6 // indirect - github.com/pion/sctp v1.8.16 // indirect + github.com/pion/rtp v1.8.8 // indirect + github.com/pion/sctp v1.8.20 // indirect github.com/pion/sdp/v3 v3.0.9 // indirect - github.com/pion/srtp/v2 v2.0.18 // indirect + github.com/pion/srtp/v2 v2.0.20 // indirect github.com/pion/stun v0.6.1 // indirect - github.com/pion/transport/v2 v2.2.5 // indirect + github.com/pion/transport/v2 v2.2.9 // indirect github.com/pion/turn/v2 v2.1.6 // indirect - github.com/pion/webrtc/v3 v3.2.40 // indirect + github.com/pion/webrtc/v3 v3.2.50 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.48.0 // indirect - github.com/prometheus/procfs v0.12.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect github.com/quic-go/qpack v0.4.0 // indirect - github.com/quic-go/quic-go v0.44.0 // indirect + github.com/quic-go/quic-go v0.45.2 // indirect github.com/quic-go/webtransport-go v0.8.0 // indirect github.com/raulk/go-watchdog v1.3.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect + github.com/wlynxg/anet v0.0.3 // indirect github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect go.dedis.ch/fixbuf v1.0.3 // indirect go.dedis.ch/protobuf v1.0.11 // indirect @@ -121,13 +123,13 @@ require ( go.uber.org/mock v0.4.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect - golang.org/x/mod v0.17.0 // indirect + golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect + golang.org/x/mod v0.19.0 // indirect golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/sys v0.22.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect - google.golang.org/protobuf v1.34.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - lukechampine.com/blake3 v1.2.1 // indirect + lukechampine.com/blake3 v1.3.0 // indirect ) diff --git a/go.sum b/go.sum index f11d501d..037b69d6 100644 --- a/go.sum +++ b/go.sum @@ -23,8 +23,8 @@ 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/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= -github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= -github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX2Qs= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/containerd/cgroups v0.0.0-20201119153540-4cbc285b3327/go.mod h1:ZJeTFisyysqgcCdecO57Dj79RfL0LNeGiFUqLYQRYLE= @@ -53,8 +53,8 @@ github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/elastic/gosigar v0.12.0/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs= -github.com/elastic/gosigar v0.14.2 h1:Dg80n8cr90OZ7x+bAax/QjoW/XqTI11RmA79ZwIm9/4= -github.com/elastic/gosigar v0.14.2/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs= +github.com/elastic/gosigar v0.14.3 h1:xwkKwPia+hSfg9GqrCUKYdId102m9qTJIIr7egmK/uo= +github.com/elastic/gosigar v0.14.3/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/flynn/noise v1.1.0 h1:KjPQoQCEFdZDiP03phOvGi11+SVVhBG2wOWAorLsstg= github.com/flynn/noise v1.1.0/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag= @@ -66,10 +66,10 @@ github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeME github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= 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-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= -github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= @@ -100,8 +100,8 @@ github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20240207164012-fb44976bdcd5 h1:E/LAvt58di64hlYjx7AsNS6C/ysHWYo+2qPCZKTQhRo= -github.com/google/pprof v0.0.0-20240207164012-fb44976bdcd5/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= +github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 h1:FKHo8hFI3A+7w0aUQuYXQ+6EN5stWmeY/AZqtM8xk9k= +github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= github.com/google/uuid v1.3.1/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= @@ -130,10 +130,10 @@ github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E 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/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= -github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= -github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM= -github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM= +github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/koron/go-ssdp v0.0.4 h1:1IDwrghSKYM7yLf7XCzbByg2sJ/JcNOZRXS2jczTwz0= github.com/koron/go-ssdp v0.0.4/go.mod h1:oDXq+E5IL5q0U8uSBcoAXzTzInwy5lEgC91HoKtbmZk= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= @@ -149,8 +149,8 @@ github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6 github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg= github.com/libp2p/go-flow-metrics v0.1.0 h1:0iPhMI8PskQwzh57jB9WxIuIOQ0r+15PChFGkx3Q3WM= github.com/libp2p/go-flow-metrics v0.1.0/go.mod h1:4Xi8MX8wj5aWNDAZttg6UPmc0ZrnFNsMtpsYUClFtro= -github.com/libp2p/go-libp2p v0.35.2 h1:287oHbuplkrLdAF+syB0n/qDgd50AUBtEODqS0e0HDs= -github.com/libp2p/go-libp2p v0.35.2/go.mod h1:RKCDNt30IkFipGL0tl8wQW/3zVWEGFUZo8g2gAKxwjU= +github.com/libp2p/go-libp2p v0.36.1 h1:piAHesy0/8ifBEBUS8HF2m7ywR5vnktUFv00dTsVKcs= +github.com/libp2p/go-libp2p v0.36.1/go.mod h1:vHzel3CpRB+vS11fIjZSJAU4ALvieKV9VZHC9VerHj8= github.com/libp2p/go-libp2p-asn-util v0.4.1 h1:xqL7++IKD9TBFMgnLPZR6/6iYhawHKHl950SO9L6n94= github.com/libp2p/go-libp2p-asn-util v0.4.1/go.mod h1:d/NI6XZ9qxw67b4e+NgpQexCIiFYJjErASrYW4PFDN8= github.com/libp2p/go-libp2p-testing v0.12.0 h1:EPvBb4kKMWO29qP4mZGyhVzUyR25dvfUIK5WDu6iPUA= @@ -179,8 +179,8 @@ github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4= github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= -github.com/miekg/dns v1.1.58 h1:ca2Hdkz+cDg/7eNF6V56jjzuZ4aCAE+DbVkILdQWG/4= -github.com/miekg/dns v1.1.58/go.mod h1:Ypv+3b/KadlvW9vJfXOTf300O4UqaHFzFCuHz+rPkBY= +github.com/miekg/dns v1.1.61 h1:nLxbwF3XxhwVSm8g9Dghm9MHPaUZuqhPiGL+675ZmEs= +github.com/miekg/dns v1.1.61/go.mod h1:mnAarhS3nWaW+NVP2wTkYVIZyHNJ098SJZUki3eykwQ= github.com/mikioh/tcp v0.0.0-20190314235350-803a9b46060c h1:bzE/A84HN25pxAuk9Eej1Kz9OUelF97nAc82bDquQI8= github.com/mikioh/tcp v0.0.0-20190314235350-803a9b46060c/go.mod h1:0SQS9kMwD2VsyFEB++InYyBJroV/FRmBgcydeSUcJms= github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b h1:z78hV3sbSMAUoyUMM0I83AUIT6Hu17AWfgjzIbtrYFc= @@ -220,13 +220,15 @@ github.com/multiformats/go-multistream v0.5.0/go.mod h1:n6tMZiwiP2wUsR8DgfDWw1dy github.com/multiformats/go-varint v0.0.1/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE= github.com/multiformats/go-varint v0.0.7 h1:sWSGR+f/eu5ABZA2ZpYKBILXTTs9JWpdEM/nEGOHFS8= github.com/multiformats/go-varint v0.0.7/go.mod h1:r8PUYw/fD/SjBCiKOoDlGF6QawOELpZAu9eioSos/OU= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY= -github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM= -github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8= -github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= +github.com/onsi/ginkgo/v2 v2.19.1 h1:QXgq3Z8Crl5EL1WBAC98A5sEBHARrAJNzAmMxzLcRF0= +github.com/onsi/ginkgo/v2 v2.19.1/go.mod h1:O3DtEWQkPa/F7fBMgmZQKKsluAy8pd3rEQdrjkPb9zA= +github.com/onsi/gomega v1.34.0 h1:eSSPsPNp6ZpsG8X1OVmOTxig+CblTc4AxpPBykhe2Os= +github.com/onsi/gomega v1.34.0/go.mod h1:MIKI8c+f+QLWk+hxbePD4i0LMJSExPaZOVfkoex4cAo= github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE7dzrbT927iTk= github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= @@ -238,13 +240,13 @@ github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYr github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0= github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y= -github.com/pion/datachannel v1.5.6 h1:1IxKJntfSlYkpUj8LlYRSWpYiTTC02nUrOE8T3DqGeg= -github.com/pion/datachannel v1.5.6/go.mod h1:1eKT6Q85pRnr2mHiWHxJwO50SfZRtWHTsNIVb/NfGW4= +github.com/pion/datachannel v1.5.8 h1:ph1P1NsGkazkjrvyMfhRBUAWMxugJjq2HfQifaOoSNo= +github.com/pion/datachannel v1.5.8/go.mod h1:PgmdpoaNBLX9HNzNClmdki4DYW5JtI7Yibu8QzbL3tI= github.com/pion/dtls/v2 v2.2.7/go.mod h1:8WiMkebSHFD0T+dIU+UeBaoV7kDhOW5oDCzZ7WZ/F9s= -github.com/pion/dtls/v2 v2.2.11 h1:9U/dpCYl1ySttROPWJgqWKEylUdT0fXp/xst6JwY5Ks= -github.com/pion/dtls/v2 v2.2.11/go.mod h1:d9SYc9fch0CqK90mRk1dC7AkzzpwJj6u2GU3u+9pqFE= -github.com/pion/ice/v2 v2.3.25 h1:M5rJA07dqhi3nobJIg+uPtcVjFECTrhcR3n0ns8kDZs= -github.com/pion/ice/v2 v2.3.25/go.mod h1:KXJJcZK7E8WzrBEYnV4UtqEZsGeWfHxsNqhVcVvgjxw= +github.com/pion/dtls/v2 v2.2.12 h1:KP7H5/c1EiVAAKUmXyCzPiQe5+bCJrpOeKg/L05dunk= +github.com/pion/dtls/v2 v2.2.12/go.mod h1:d9SYc9fch0CqK90mRk1dC7AkzzpwJj6u2GU3u+9pqFE= +github.com/pion/ice/v2 v2.3.32 h1:VwE/uEeqiMm0zUWpdt1DJtnqEkj3UjEbhX92/CurtWI= +github.com/pion/ice/v2 v2.3.32/go.mod h1:8fac0+qftclGy1tYd/nfwfHC729BLaxtVqMdMVCAVPU= github.com/pion/interceptor v0.1.29 h1:39fsnlP1U8gw2JzOFWdfCU82vHvhW9o0rZnZF56wF+M= github.com/pion/interceptor v0.1.29/go.mod h1:ri+LGNjRUc5xUNtDEPzfdkmSqISixVTBF/z/Zms/6T4= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= @@ -257,31 +259,30 @@ github.com/pion/rtcp v1.2.12/go.mod h1:sn6qjxvnwyAkkPzPULIbVqSKI5Dv54Rv7VG0kNxh9 github.com/pion/rtcp v1.2.14 h1:KCkGV3vJ+4DAJmvP0vaQShsb0xkRfWkO540Gy102KyE= github.com/pion/rtcp v1.2.14/go.mod h1:sn6qjxvnwyAkkPzPULIbVqSKI5Dv54Rv7VG0kNxh9L4= github.com/pion/rtp v1.8.3/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU= -github.com/pion/rtp v1.8.6 h1:MTmn/b0aWWsAzux2AmP8WGllusBVw4NPYPVFFd7jUPw= -github.com/pion/rtp v1.8.6/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU= -github.com/pion/sctp v1.8.13/go.mod h1:YKSgO/bO/6aOMP9LCie1DuD7m+GamiK2yIiPM6vH+GA= -github.com/pion/sctp v1.8.16 h1:PKrMs+o9EMLRvFfXq59WFsC+V8mN1wnKzqrv+3D/gYY= -github.com/pion/sctp v1.8.16/go.mod h1:P6PbDVA++OJMrVNg2AL3XtYHV4uD6dvfyOovCgMs0PE= +github.com/pion/rtp v1.8.8 h1:EtYFHI0rpUEjT/RMnGfb1vdJhbYmPG77szD72uUnSxs= +github.com/pion/rtp v1.8.8/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU= +github.com/pion/sctp v1.8.20 h1:sOc3lkV/tQaP57ZUEXIMdM2V92IIB2ia5v/ygnBxaEg= +github.com/pion/sctp v1.8.20/go.mod h1:oTxw8i5m+WbDHZJL/xUpe6CPIn1Y0GIKKwTLF4h53H8= github.com/pion/sdp/v3 v3.0.9 h1:pX++dCHoHUwq43kuwf3PyJfHlwIj4hXA7Vrifiq0IJY= github.com/pion/sdp/v3 v3.0.9/go.mod h1:B5xmvENq5IXJimIO4zfp6LAe1fD9N+kFv+V/1lOdz8M= -github.com/pion/srtp/v2 v2.0.18 h1:vKpAXfawO9RtTRKZJbG4y0v1b11NZxQnxRl85kGuUlo= -github.com/pion/srtp/v2 v2.0.18/go.mod h1:0KJQjA99A6/a0DOVTu1PhDSw0CXF2jTkqOoMg3ODqdA= +github.com/pion/srtp/v2 v2.0.20 h1:HNNny4s+OUmG280ETrCdgFndp4ufx3/uy85EawYEhTk= +github.com/pion/srtp/v2 v2.0.20/go.mod h1:0KJQjA99A6/a0DOVTu1PhDSw0CXF2jTkqOoMg3ODqdA= github.com/pion/stun v0.6.1 h1:8lp6YejULeHBF8NmV8e2787BogQhduZugh5PdhDyyN4= github.com/pion/stun v0.6.1/go.mod h1:/hO7APkX4hZKu/D0f2lHzNyvdkTGtIy3NDmLR7kSz/8= github.com/pion/transport/v2 v2.2.1/go.mod h1:cXXWavvCnFF6McHTft3DWS9iic2Mftcz1Aq29pGcU5g= -github.com/pion/transport/v2 v2.2.2/go.mod h1:OJg3ojoBJopjEeECq2yJdXH9YVrUJ1uQ++NjXLOUorc= github.com/pion/transport/v2 v2.2.3/go.mod h1:q2U/tf9FEfnSBGSW6w5Qp5PFWRLRj3NjLhCCgpRK4p0= github.com/pion/transport/v2 v2.2.4/go.mod h1:q2U/tf9FEfnSBGSW6w5Qp5PFWRLRj3NjLhCCgpRK4p0= -github.com/pion/transport/v2 v2.2.5 h1:iyi25i/21gQck4hfRhomF6SktmUQjRsRW4WJdhfc3Kc= -github.com/pion/transport/v2 v2.2.5/go.mod h1:q2U/tf9FEfnSBGSW6w5Qp5PFWRLRj3NjLhCCgpRK4p0= +github.com/pion/transport/v2 v2.2.8/go.mod h1:sq1kSLWs+cHW9E+2fJP95QudkzbK7wscs8yYgQToO5E= +github.com/pion/transport/v2 v2.2.9 h1:WEDygVovkJlV2CCunM9KS2kds+kcl7zdIefQA5y/nkE= +github.com/pion/transport/v2 v2.2.9/go.mod h1:sq1kSLWs+cHW9E+2fJP95QudkzbK7wscs8yYgQToO5E= github.com/pion/transport/v3 v3.0.1/go.mod h1:UY7kiITrlMv7/IKgd5eTUcaahZx5oUN3l9SzK5f5xE0= -github.com/pion/transport/v3 v3.0.2 h1:r+40RJR25S9w3jbA6/5uEPTzcdn7ncyU44RWCbHkLg4= -github.com/pion/transport/v3 v3.0.2/go.mod h1:nIToODoOlb5If2jF9y2Igfx3PFYWfuXi37m0IlWa/D0= +github.com/pion/transport/v3 v3.0.6 h1:k1mQU06bmmX143qSWgXFqSH1KUJceQvIUuVH/K5ELWw= +github.com/pion/transport/v3 v3.0.6/go.mod h1:HvJr2N/JwNJAfipsRleqwFoR3t/pWyHeZUs89v3+t5s= github.com/pion/turn/v2 v2.1.3/go.mod h1:huEpByKKHix2/b9kmTAM3YoX6MKP+/D//0ClgUYR2fY= github.com/pion/turn/v2 v2.1.6 h1:Xr2niVsiPTB0FPtt+yAWKFUkU1eotQbGgpTIld4x1Gc= github.com/pion/turn/v2 v2.1.6/go.mod h1:huEpByKKHix2/b9kmTAM3YoX6MKP+/D//0ClgUYR2fY= -github.com/pion/webrtc/v3 v3.2.40 h1:Wtfi6AZMQg+624cvCXUuSmrKWepSB7zfgYDOYqsSOVU= -github.com/pion/webrtc/v3 v3.2.40/go.mod h1:M1RAe3TNTD1tzyvqHrbVODfwdPGSXOUo/OgpoGGJqFY= +github.com/pion/webrtc/v3 v3.2.50 h1:C/rwL2mBfCxHv6tlLzDAO3krJpQXfVx8A8WHnGJ2j34= +github.com/pion/webrtc/v3 v3.2.50/go.mod h1:dytYYoSBy7ZUWhJMbndx9UckgYvzNAfL7xgVnrIKxqo= 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= @@ -294,15 +295,15 @@ github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1: github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= -github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo= github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A= -github.com/quic-go/quic-go v0.44.0 h1:So5wOr7jyO4vzL2sd8/pD9Kesciv91zSk8BoFngItQ0= -github.com/quic-go/quic-go v0.44.0/go.mod h1:z4cx/9Ny9UtGITIPzmPTXh1ULfOyWh4qGQlpnPcWmek= +github.com/quic-go/quic-go v0.45.2 h1:DfqBmqjb4ExSdxRIb/+qXhPC+7k6+DUNZha4oeiC9fY= +github.com/quic-go/quic-go v0.45.2/go.mod h1:1dLehS7TIR64+vxGR70GDcatWTOtMX2PUtnKsjbTurI= github.com/quic-go/webtransport-go v0.8.0 h1:HxSrwun11U+LlmwpgM1kEqIqH90IT4N8auv/cD7QFJg= github.com/quic-go/webtransport-go v0.8.0/go.mod h1:N99tjprW432Ut5ONql/aUhSLT0YVSlwHohQsuac9WaM= github.com/raulk/go-watchdog v1.3.0 h1:oUmdlHxdkXRJlwfG0O9omj8ukerm8MEQavSiDTEtBsk= @@ -354,7 +355,6 @@ github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/ 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.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -372,6 +372,8 @@ 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/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU= github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM= +github.com/wlynxg/anet v0.0.3 h1:PvR53psxFXstc12jelG6f1Lv4MWqE0tI76/hHGjh9rg= +github.com/wlynxg/anet v0.0.3/go.mod h1:eay5PRQr7fIVAMbTbchTnO9gG65Hg/uYGdc7mguHxoA= 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/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -425,21 +427,18 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE= -golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= -golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= -golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= -golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= +golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/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-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM= -golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= 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= @@ -457,8 +456,8 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= -golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8= +golang.org/x/mod v0.19.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= @@ -480,13 +479,10 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.13.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -531,35 +527,28 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= -golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= -golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= 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.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= @@ -582,8 +571,8 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw= -golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg= +golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI= 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= @@ -615,8 +604,8 @@ google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZi google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.63.0 h1:WjKe+dnvABXyPJMD7KDNLxtoGk5tgk+YFWN6cBWjZE8= google.golang.org/grpc v1.63.0/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -638,8 +627,8 @@ honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWh 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-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -lukechampine.com/blake3 v1.2.1 h1:YuqqRuaqsGV71BV/nm9xlI0MKUv4QC54jQnBChWbGnI= -lukechampine.com/blake3 v1.2.1/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k= +lukechampine.com/blake3 v1.3.0 h1:sJ3XhFINmHSrYCgl958hscfIa3bw8x4DqMP3u1YvoYE= +lukechampine.com/blake3 v1.3.0/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck= sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= diff --git a/mino/minows/address.go b/mino/minows/address.go index d23f5cbc..1d1a0cc6 100644 --- a/mino/minows/address.go +++ b/mino/minows/address.go @@ -25,9 +25,15 @@ type address struct { // newAddress creates a new address from a publicly reachable location with a // peer identity. func newAddress(location ma.Multiaddr, identity peer.ID) (address, error) { - if location == nil || identity.String() == "" { - return address{}, xerrors.New("address must have location and identity") + if location == nil { + return address{}, xerrors.New("address must have a location") } + + err := identity.Validate() + if err != nil { + return address{}, xerrors.Errorf("address must have a valid identity: %v", err) + } + return address{ location: location, identity: identity, diff --git a/mino/minows/key/mod.go b/mino/minows/key/mod.go index 2a07a0aa..6e10c4a3 100644 --- a/mino/minows/key/mod.go +++ b/mino/minows/key/mod.go @@ -2,6 +2,7 @@ package key import ( "crypto/rand" + "github.com/libp2p/go-libp2p/core/crypto" "go.dedis.ch/dela/core/store/kv" "golang.org/x/xerrors" @@ -16,7 +17,7 @@ type Storage struct { // NewStorage creates a new Storage for private keys. func NewStorage(db kv.DB) *Storage { return &Storage{ - bucket: []byte("keys"), + bucket: []byte("minows_keys"), db: db, } } diff --git a/mino/minows/rpc.go b/mino/minows/rpc.go index 52a72ca3..37431c6d 100644 --- a/mino/minows/rpc.go +++ b/mino/minows/rpc.go @@ -16,18 +16,17 @@ import ( "go.dedis.ch/dela/mino" "go.dedis.ch/dela/serde" "golang.org/x/xerrors" - "strings" "sync" - "time" ) const pathCall = "/call" const pathStream = "/stream" -// Packet encapsulates a message sent over the network streams. -type Packet struct { - Source []byte - Payload []byte +// packet encapsulates a message sent over the network streams. +type packet struct { + Source []byte + Payload []byte + ForwardDest *[]byte } type envelope struct { @@ -81,6 +80,7 @@ func (r rpc) Call(ctx context.Context, req serde.Message, go func() { defer close(responses) for i := 0; i < len(addrs); i++ { + select { case <-ctx.Done(): return @@ -125,6 +125,7 @@ func (r rpc) Stream(ctx context.Context, players mino.Players) (mino.Sender, min return nil, nil, xerrors.Errorf("%v: %T", ErrWrongAddressType, player) } + go func(addr address) { defer wg.Done() initiator.Peerstore().AddAddr(addr.identity, addr.location, @@ -137,6 +138,7 @@ func (r rpc) Stream(ctx context.Context, players mino.Players) (mino.Sender, min return } streams <- stream + go func() { <-ctx.Done() err = stream.Reset() @@ -166,31 +168,23 @@ func (r rpc) Stream(ctx context.Context, players mino.Players) (mino.Sender, min } func (r rpc) handleCall(stream network.Stream) { - handle := func() error { - dec := gob.NewDecoder(stream) - from, req, err := r.receive(dec) - if err != nil { - return xerrors.Errorf("could not receive: %v", err) - } - - id := stream.Conn().RemotePeer() - author := address{location: from, identity: id} - reply, err := r.handler.Process(mino.Request{Address: author, Message: req}) - if err != nil { - return xerrors.Errorf("could not process: %v", err) - } + dec := gob.NewDecoder(stream) + from, req, err := r.receive(dec) + if err != nil { + r.logger.Error().Err(err).Msg("could not receive") + } - enc := gob.NewEncoder(stream) - err = r.send(enc, reply) - if err != nil { - return xerrors.Errorf("could not reply: %v", err) - } - return nil + id := stream.Conn().RemotePeer() + author := address{location: from, identity: id} + reply, err := r.handler.Process(mino.Request{Address: author, Message: req}) + if err != nil { + r.logger.Error().Err(err).Msg("could not process") } - err := handle() + enc := gob.NewEncoder(stream) + err = r.send(enc, reply) if err != nil { - r.logger.Error().Err(err).Msg("could not handle call") + r.logger.Error().Err(err).Msg("could not reply") } } @@ -278,7 +272,7 @@ func (r rpc) send(enc *gob.Encoder, msg serde.Message) error { payload = bytes } - err := enc.Encode(&Packet{Source: from, Payload: payload}) + err := enc.Encode(&packet{Source: from, Payload: payload}) if errors.Is(err, network.ErrReset) { return err } @@ -289,8 +283,8 @@ func (r rpc) send(enc *gob.Encoder, msg serde.Message) error { } func (r rpc) receive(dec *gob.Decoder) (ma.Multiaddr, serde.Message, error) { - var packet Packet - err := dec.Decode(&packet) + var pkt packet + err := dec.Decode(&pkt) if errors.Is(err, network.ErrReset) { return nil, nil, err } @@ -298,16 +292,16 @@ func (r rpc) receive(dec *gob.Decoder) (ma.Multiaddr, serde.Message, error) { return nil, nil, xerrors.Errorf("could not decode packet: %v", err) } - from, err := ma.NewMultiaddrBytes(packet.Source) + from, err := ma.NewMultiaddrBytes(pkt.Source) if err != nil { return nil, nil, xerrors.Errorf("could not unmarshal address: %v", - packet.Source) + pkt.Source) } - if packet.Payload == nil { + if pkt.Payload == nil { return from, nil, nil } - msg, err := r.factory.Deserialize(r.context, packet.Payload) + msg, err := r.factory.Deserialize(r.context, pkt.Payload) if err != nil { return from, nil, xerrors.Errorf( "could not deserialize message: %v", @@ -317,7 +311,7 @@ func (r rpc) receive(dec *gob.Decoder) (ma.Multiaddr, serde.Message, error) { } func (r rpc) createOrchestrator(ctx context.Context, - initiator host.Host, streams []network.Stream) (*orchestrator, error) { + initiator host.Host, streams []network.Stream) (*messageHandler, error) { participant := r.mino.GetAddress().(address).location myAddr, err := newOrchestratorAddr(participant, initiator.ID()) if err != nil { @@ -329,94 +323,35 @@ func (r rpc) createOrchestrator(ctx context.Context, encoders[stream.Conn().RemotePeer()] = gob.NewEncoder(stream) } - o := &orchestrator{ + m := &messageHandler{ logger: r.logger.With().Stringer("mino", myAddr). Stringer("orchestrator", xid.New()).Logger(), - myAddr: myAddr, - rpc: r, - outs: encoders, - in: make(chan Packet, MaxUnreadAllowed), - } - - var wg sync.WaitGroup - wg.Add(len(streams)) - for _, stream := range streams { - go func(stream network.Stream) { - defer wg.Done() - decoder := gob.NewDecoder(stream) - for { - packet, err := o.listen(decoder) - if err != nil { - if strings.Contains(err.Error(), network.ErrReset.Error()) { - return - } - r.logger.Error().Err(err).Msg("message dropped") - continue - } - select { - case <-ctx.Done(): - return - case o.in <- packet: - } - } - }(stream) + myAddr: myAddr, + rpc: r, + streams: streams, + outs: encoders, + in: make(chan packet, MaxUnreadAllowed), } - go func() { - wg.Wait() - close(o.in) - }() - - return o, nil + m.loop(ctx) + return m, nil } -func (r rpc) createParticipant(stream network.Stream) participant { - encoder := gob.NewEncoder(stream) - decoder := gob.NewDecoder(stream) - - p := participant{ - logger: r.logger.With().Stringer("participant", xid.New()).Logger(), - myAddr: r.mino.myAddr, - rpc: r, - out: encoder, - in: make(chan Packet), +func (r rpc) createParticipant(stream network.Stream) messageHandler { + out := gob.NewEncoder(stream) + + ctx, cancel := context.WithCancel(context.Background()) + m := messageHandler{ + logger: r.logger.With().Stringer("participant", xid.New()).Logger(), + myAddr: r.mino.myAddr, + rpc: r, + cancel: cancel, + streams: []network.Stream{stream}, + outs: map[peer.ID]*gob.Encoder{stream.Conn().RemotePeer(): out}, + in: make(chan packet), } - done := make(chan any) - go func() { - hasReset := func() bool { - for _, s := range stream.Conn().GetStreams() { - if s.ID() == stream.ID() { - return false - } - } - return true - } - - for !hasReset() { - time.Sleep(2 * time.Second) - } - close(done) - }() - - go func() { - for { - packet, err := p.listen(decoder) - if err != nil { - if strings.Contains(err.Error(), network.ErrReset.Error()) { - close(p.in) - return - } - r.logger.Error().Err(err).Msg("message dropped") - continue - } - select { - case <-done: - return - case p.in <- packet: - } - } - }() + m.loop(ctx) - return p + return m } diff --git a/mino/minows/session.go b/mino/minows/session.go index e8284118..35808f9f 100644 --- a/mino/minows/session.go +++ b/mino/minows/session.go @@ -3,13 +3,17 @@ package minows import ( "context" "encoding/gob" + "fmt" + "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/peer" "github.com/rs/zerolog" "go.dedis.ch/dela/mino" "go.dedis.ch/dela/serde" "golang.org/x/xerrors" "io" + "strings" "sync" + "time" ) var ErrWrongAddressType = xerrors.New("wrong address type") @@ -19,31 +23,117 @@ var ErrNotPlayer = xerrors.New("not player") // in orchestrator's incoming message buffer before pausing relaying const MaxUnreadAllowed = 1e3 -type Forward struct { - Packet - Destination []byte -} - -type orchestrator struct { +type messageHandler struct { logger zerolog.Logger - myAddr orchestratorAddr - rpc rpc + myAddr mino.Address + rpc rpc + streams []network.Stream // Connects to the participants outs map[peer.ID]*gob.Encoder - in chan Packet + in chan packet + // Only used for the participant + cancel context.CancelFunc } -func (o orchestrator) Send(msg serde.Message, addrs ...mino.Address) <-chan error { - return doSend(addrs, msg, o.send, o.logger) +func (m messageHandler) Send(msg serde.Message, addrs ...mino.Address) <-chan error { + errs := make(chan error, len(addrs)) + var wg sync.WaitGroup + wg.Add(len(addrs)) + for _, addr := range addrs { + go func(addr mino.Address) { + defer wg.Done() + err := m.send(addr, msg) + if err != nil { + errs <- xerrors.Errorf("could not send %T to %v: %v", msg, addr, err) + return + } + m.logger.Debug().Msgf("sent %T to %v", msg, addr) + }(addr) + } + + go func() { + wg.Wait() + close(errs) + }() + return errs } -func (o orchestrator) Recv(ctx context.Context) (mino.Address, serde.Message, error) { - unpack := unpacker(o.rpc.mino.GetAddressFactory(), o.rpc.factory, o.rpc.context) - return doReceive(ctx, o.in, unpack, o.logger) +func (m messageHandler) Recv(ctx context.Context) (mino.Address, serde.Message, error) { + select { + case <-ctx.Done(): + return nil, nil, ctx.Err() + case packet, open := <-m.in: + if !open { + return nil, nil, io.EOF + } + + origin := m.rpc.mino.GetAddressFactory().FromText(packet.Source) + if origin == nil { + return nil, nil, xerrors.New("could not unmarshal address") + } + msg, err := m.rpc.factory.Deserialize(m.rpc.context, packet.Payload) + if err != nil { + return origin, nil, xerrors.Errorf("could not deserialize message: %v", err) + } + + m.logger.Debug().Msgf("received %T from %v", msg, origin) + return origin, msg, nil + } } -func (o orchestrator) send(addr mino.Address, msg serde.Message) error { +func (m messageHandler) loop(ctx context.Context) { + if m.isParticipant() { + go m.waitAllClosed() + } + + var wg sync.WaitGroup + wg.Add(len(m.streams)) + for _, stream := range m.streams { + go m.passMessages(ctx, stream, &wg) + } + + go func() { + wg.Wait() + close(m.in) + }() +} + +func (m messageHandler) passMessages(ctx context.Context, stream network.Stream, wg *sync.WaitGroup) { + defer wg.Done() + decoder := gob.NewDecoder(stream) + for { + pkt, err := m.listen(decoder) + if err != nil { + if strings.Contains(err.Error(), network.ErrReset.Error()) { + return + } + m.logger.Error().Err(err).Msg("message dropped") + continue + } + select { + case <-ctx.Done(): + fmt.Println("messageHandler done:", m.isOrchestrator()) + return + case m.in <- pkt: + } + } +} + +func (m messageHandler) waitAllClosed() { + for { + for _, s := range m.streams[0].Conn().GetStreams() { + if s.ID() == m.streams[0].ID() { + time.Sleep(2 * time.Second) + continue + } + } + break + } + m.cancel() +} + +func (m messageHandler) send(addr mino.Address, msg serde.Message) error { var unwrapped address switch a := addr.(type) { case address: @@ -54,45 +144,38 @@ func (o orchestrator) send(addr mino.Address, msg serde.Message) error { return xerrors.Errorf("%v: %T", ErrWrongAddressType, addr) } - encoder, ok := o.outs[unwrapped.identity] + encoder, ok := m.outs[unwrapped.identity] if !ok { return xerrors.Errorf("%v: %v", ErrNotPlayer, addr) } - src, err := o.myAddr.MarshalText() + src, err := m.myAddr.MarshalText() if err != nil { return xerrors.Errorf("could not marshal address: %v", err) } - payload, err := msg.Serialize(o.rpc.context) + payload, err := msg.Serialize(m.rpc.context) if err != nil { return xerrors.Errorf("could not serialize message: %v", err) } + pkt := packet{Source: src, Payload: payload} - err = encoder.Encode(&Packet{Source: src, Payload: payload}) - if err != nil { - return xerrors.Errorf("could not encode packet: %v", err) + if m.isParticipant() { + // Send to orchestrator to relay to the destination participant + dest, err := addr.MarshalText() + if err != nil { + return xerrors.Errorf("could not marshal address: %v", err) + } + pkt.ForwardDest = &dest } - return nil -} -func (o orchestrator) fetch(decoder *gob.Decoder) (Packet, mino.Address, - error) { - var forward Forward - err := decoder.Decode(&forward) + err = encoder.Encode(&pkt) if err != nil { - return Packet{}, nil, - xerrors.Errorf("could not decode packet: %v", err) - } - dest := o.rpc.mino.GetAddressFactory(). - FromText(forward.Destination) - if dest == nil { - return Packet{}, nil, - xerrors.New("could not unmarshal address") + return xerrors.Errorf("could not encode packet: %v", err) } - return forward.Packet, dest, nil + return nil } -func (o orchestrator) relay(packet Packet, dest address) error { - encoder, ok := o.outs[dest.identity] +func (m messageHandler) relay(packet packet, dest address) error { + encoder, ok := m.outs[dest.identity] if !ok { return xerrors.Errorf("%v: %v", ErrNotPlayer, dest) } @@ -100,151 +183,53 @@ func (o orchestrator) relay(packet Packet, dest address) error { if err != nil { return xerrors.Errorf("could not encode packet: %v", err) } - o.logger.Debug().Stringer("to", dest).Msgf("relayed packet") + m.logger.Debug().Stringer("to", dest).Msgf("relayed packet") return nil } -func (o orchestrator) listen(decoder *gob.Decoder) (Packet, error) { +func (m messageHandler) listen(decoder *gob.Decoder) (packet, error) { for { - packet, dest, err := o.fetch(decoder) + var pkt packet + err := decoder.Decode(&pkt) if err != nil { - return Packet{}, xerrors.Errorf("could not receive: %v", err) + return packet{}, xerrors.Errorf("could not decode packet: %v", err) + } + + if m.isParticipant() { + return pkt, nil + } + + // An orchestrator needs to distinguish between packets for itself and packets + // only forwarded to itself, which need to be relayed. + if pkt.ForwardDest == nil { + return packet{}, xerrors.Errorf("no forward found in packet for orchestrator") + } + + dest := m.rpc.mino.GetAddressFactory(). + FromText(*pkt.ForwardDest) + if dest == nil { + return packet{}, xerrors.Errorf("invalid forward destination") } + switch to := dest.(type) { case orchestratorAddr: - if o.myAddr.Equal(to) { - return packet, nil + if m.myAddr.Equal(to) { + return pkt, nil } case address: - err := o.relay(packet, to) + err := m.relay(pkt, to) if err != nil { - return Packet{}, xerrors.Errorf("could not relay: %v", err) + return packet{}, xerrors.Errorf("could not relay: %v", err) } } } } -type participant struct { - logger zerolog.Logger - - myAddr address - rpc rpc - // Connects to the orchestrator - out *gob.Encoder - in chan Packet -} - -func (p participant) Send(msg serde.Message, addrs ...mino.Address) <-chan error { - return doSend(addrs, msg, p.send, p.logger) -} - -func (p participant) Recv(ctx context.Context) (mino.Address, serde.Message, error) { - unpack := unpacker(p.rpc.mino.GetAddressFactory(), p.rpc.factory, p.rpc.context) - return doReceive(ctx, p.in, unpack, p.logger) -} - -func (p participant) send(addr mino.Address, msg serde.Message) error { - switch addr.(type) { - case address: - case orchestratorAddr: - default: - return xerrors.Errorf("%v: %T", ErrWrongAddressType, addr) - } - - src, err := p.myAddr.MarshalText() - if err != nil { - return xerrors.Errorf("could not marshal address: %v", err) - } - payload, err := msg.Serialize(p.rpc.context) - if err != nil { - return xerrors.Errorf("could not serialize message: %v", err) - } - dest, err := addr.MarshalText() - if err != nil { - return xerrors.Errorf("could not marshal address: %v", err) - } - - // Send to orchestrator to relay to the destination participant - forward := Forward{ - Packet: Packet{Source: src, Payload: payload}, - Destination: dest, - } - err = p.out.Encode(&forward) - if err != nil { - return xerrors.Errorf("could not encode packet: %v", err) - } - return nil -} - -func (p participant) listen(decoder *gob.Decoder) (Packet, error) { - var packet Packet - err := decoder.Decode(&packet) - if err != nil { - return Packet{}, xerrors.Errorf("could not decode packet: %v", err) - } - return packet, nil -} - -type sendFn func(addr mino.Address, msg serde.Message) error - -func doSend(addrs []mino.Address, msg serde.Message, send sendFn, - logger zerolog.Logger) chan error { - errs := make(chan error, len(addrs)) - var wg sync.WaitGroup - wg.Add(len(addrs)) - for _, addr := range addrs { - go func(addr mino.Address) { - defer wg.Done() - err := send(addr, msg) - if err != nil { - errs <- xerrors.Errorf("could not send to %v: %v", addr, err) - logger.Warn().Err(err).Msgf("could not send %T to %v", msg, addr) - return - } - logger.Debug().Msgf("sent %T to %v", msg, addr) - }(addr) - } - - go func() { - wg.Wait() - close(errs) - }() - return errs +func (m messageHandler) isOrchestrator() bool { + _, o := m.myAddr.(orchestratorAddr) + return o } -type unpackFn func(packet Packet) (mino.Address, serde.Message, error) - -func unpacker(af mino.AddressFactory, f serde.Factory, - c serde.Context) unpackFn { - return func(packet Packet) (mino.Address, serde.Message, error) { - src := af.FromText(packet.Source) - if src == nil { - return nil, nil, xerrors.New("could not unmarshal address") - } - msg, err := f.Deserialize(c, packet.Payload) - if err != nil { - return src, nil, xerrors.Errorf("could not deserialize message: %v", err) - } - return src, msg, nil - } -} - -func doReceive(ctx context.Context, in chan Packet, - unpack unpackFn, logger zerolog.Logger) (mino.Address, serde.Message, error) { - select { - case <-ctx.Done(): - return nil, nil, ctx.Err() - case packet, open := <-in: - if !open { - return nil, nil, io.EOF - } - origin, msg, err := unpack(packet) - if err != nil { - logger.Warn().Err(err).Msg("could not receive") - return nil, nil, xerrors.Errorf("could not receive from %v: %v", - origin, err) - } - logger.Debug().Msgf("received %T from %v", msg, origin) - return origin, msg, nil - } +func (m messageHandler) isParticipant() bool { + return !m.isOrchestrator() } diff --git a/mino/minows/session_test.go b/mino/minows/session_test.go index c2d9f43a..d6c1bef2 100644 --- a/mino/minows/session_test.go +++ b/mino/minows/session_test.go @@ -2,14 +2,17 @@ package minows import ( "context" + "io" + "strings" + "testing" + "time" + "github.com/libp2p/go-libp2p/core/network" + "github.com/libp2p/go-yamux/v4" "github.com/stretchr/testify/require" "go.dedis.ch/dela/mino" "go.dedis.ch/dela/serde" "go.dedis.ch/dela/testing/fake" - "io" - "testing" - "time" ) func Test_session_Send(t *testing.T) { @@ -43,8 +46,8 @@ func Test_session_Send(t *testing.T) { require.False(t, open) wait() - require.Equal(t, []mino.Address{s.(*orchestrator).myAddr, - s.(*orchestrator).myAddr, s.(*orchestrator).myAddr}, handler.from) + require.Equal(t, []mino.Address{s.(*messageHandler).myAddr, + s.(*messageHandler).myAddr, s.(*messageHandler).myAddr}, handler.from) require.Equal(t, []serde.Message{fake.Message{}, fake.Message{}, fake.Message{}}, handler.messages) } @@ -75,11 +78,11 @@ func Test_session_Send_ToSelf(t *testing.T) { require.False(t, open) wait() - require.Equal(t, []mino.Address{s.(*orchestrator).myAddr, - s.(*orchestrator).myAddr, s.(*orchestrator).myAddr}, handler.from) + require.Equal(t, []mino.Address{s.(*messageHandler).myAddr, + s.(*messageHandler).myAddr, s.(*messageHandler).myAddr}, handler.from) require.Equal(t, []serde.Message{fake.Message{}, fake.Message{}, fake.Message{}}, handler.messages) - require.NotEqual(t, s.(*orchestrator).myAddr, initiator.GetAddress()) + require.NotEqual(t, s.(*messageHandler).myAddr, initiator.GetAddress()) } func Test_session_Send_WrongAddressType(t *testing.T) { @@ -139,8 +142,12 @@ func Test_session_Send_SessionEnded(t *testing.T) { wait() errs := s.Send(fake.Message{}, initiator.GetAddress(), player.GetAddress()) - require.ErrorContains(t, <-errs, network.ErrReset.Error()) - require.ErrorContains(t, <-errs, network.ErrReset.Error()) + for i := 0; i < 2; i++ { + err := (<-errs).Error() + require.True(t, strings.Contains(err, network.ErrReset.Error()) || + strings.Contains(err, yamux.ErrSessionShutdown.Error())) + } + _, open := <-errs require.False(t, open) require.Nil(t, handler.messages) @@ -237,9 +244,9 @@ func Test_session_Recv_FromSelf(t *testing.T) { require.Equal(t, fake.Message{}, msg) require.NotEqual(t, from1, from2) - require.Equal(t, []mino.Address{s.(*orchestrator).myAddr, - s.(*orchestrator).myAddr, s.(*orchestrator).myAddr}, handler.from) - require.NotEqual(t, s.(*orchestrator).myAddr, initiator.GetAddress()) + require.Equal(t, []mino.Address{s.(*messageHandler).myAddr, + s.(*messageHandler).myAddr, s.(*messageHandler).myAddr}, handler.from) + require.NotEqual(t, s.(*messageHandler).myAddr, initiator.GetAddress()) } func Test_session_Recv_SessionEnded(t *testing.T) { diff --git a/test/cosidela_test.go b/test/cosidela_test.go index 9279638c..c8b48e1f 100644 --- a/test/cosidela_test.go +++ b/test/cosidela_test.go @@ -5,9 +5,7 @@ import ( "crypto/ecdsa" "crypto/elliptic" "crypto/x509" - ma "github.com/multiformats/go-multiaddr" - "go.dedis.ch/dela/mino/minows" - "go.dedis.ch/dela/mino/minows/key" + "fmt" "io" "math/rand" "net/url" @@ -15,6 +13,10 @@ import ( "path/filepath" "time" + ma "github.com/multiformats/go-multiaddr" + "go.dedis.ch/dela/mino/minows" + "go.dedis.ch/dela/mino/minows/key" + "github.com/stretchr/testify/require" accessContract "go.dedis.ch/dela/contracts/access" "go.dedis.ch/dela/contracts/value" @@ -95,31 +97,31 @@ func newDelaNode(t require.TestingT, path string, port int, kind string) dela { router := tree.NewRouter(minogrpc.NewAddressFactory()) addr := minogrpc.ParseAddress("127.0.0.1", uint16(port)) - certs := certs.NewDiskStore(db, session.AddressFactory{}) + delaCerts := certs.NewDiskStore(db, session.AddressFactory{}) fload := loader.NewFileLoader(filepath.Join(path, certKeyName)) keydata, err := fload.LoadOrCreate(newCertGenerator(rand.New(rand.NewSource(0)), elliptic.P521())) require.NoError(t, err) - key, err := x509.ParseECPrivateKey(keydata) + privateKey, err := x509.ParseECPrivateKey(keydata) require.NoError(t, err) opts := []minogrpc.Option{ - minogrpc.WithStorage(certs), - minogrpc.WithCertificateKey(key, key.Public()), + minogrpc.WithStorage(delaCerts), + minogrpc.WithCertificateKey(privateKey, privateKey.Public()), } onet, err = minogrpc.NewMinogrpc(addr, nil, router, opts...) require.NoError(t, err) case minoWS: - listen, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/0/ws") + listen, err := ma.NewMultiaddr(fmt.Sprintf("/ip4/127.0.0.1/tcp/%d/ws", port)) require.NoError(t, err) storage := key.NewStorage(db) - key, _ := storage.LoadOrCreate() + privKey, _ := storage.LoadOrCreate() - onet, err = minows.NewMinows(listen, nil, key) + onet, err = minows.NewMinows(listen, nil, privKey) require.NoError(t, err) } onet.GetAddress() @@ -147,22 +149,22 @@ func newDelaNode(t require.TestingT, path string, port int, kind string) dela { txFac := signed.NewTransactionFactory() vs := simple.NewService(exec, txFac) - pool, err := poolimpl.NewPool(gossip.NewFlat(onet.WithSegment("pool"), txFac)) + newPool, err := poolimpl.NewPool(gossip.NewFlat(onet.WithSegment("pool"), txFac)) require.NoError(t, err) - tree := binprefix.NewMerkleTree(db, binprefix.Nonce{}) + newTree := binprefix.NewMerkleTree(db, binprefix.Nonce{}) param := cosipbft.ServiceParam{ Mino: onet, Cosi: cosi, Validation: vs, Access: accessService, - Pool: pool, + Pool: newPool, DB: db, - Tree: tree, + Tree: newTree, } - err = tree.Load() + err = newTree.Load() require.NoError(t, err) genstore := blockstore.NewGenesisDiskStore(db, types.NewGenesisFactory(rosterFac)) @@ -202,10 +204,10 @@ func newDelaNode(t require.TestingT, path string, port int, kind string) dela { ordering: srvc, cosi: cosi, txManager: mgr, - pool: pool, + pool: newPool, accessService: accessService, accessStore: accessStore, - tree: tree, + tree: newTree, } }