Merge branch 'multiformats:master' into feature/add-TLS-protocol

Author: carpawell

.github/workflows/automerge.yml

@@ -5,11 +5,35 @@
 # This reduces the friction associated with updating with our workflows.
 
 on: [ pull_request ]
+name: Automerge
 
 jobs:
-  automerge:
+  automerge-check:
     if: github.event.pull_request.user.login == 'web3-bot'
     runs-on: ubuntu-latest
+    outputs:
+      status: ${{ steps.should-automerge.outputs.status }}
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - name: Check if we should automerge
+      id: should-automerge
+      run: |
+        for commit in $(git rev-list --first-parent origin/${{ github.event.pull_request.base.ref }}..${{ github.event.pull_request.head.sha }}); do
+          committer=$(git show --format=$'%ce' -s $commit)
+          echo "Committer: $committer"
+          if [[ "$committer" != "[email protected]" ]]; then
+            echo "Commit $commit wasn't committed by web3-bot, but by $committer."
+            echo "::set-output name=status::false"
+            exit
+          fi
+        done
+        echo "::set-output name=status::true"
+  automerge:
+    needs: automerge-check
+    runs-on: ubuntu-latest
+    if: ${{ needs.automerge-check.outputs.status == 'true' }}
     steps:
     - name: Wait on tests
       uses: lewagon/wait-on-check-action@bafe56a6863672c681c3cf671f5e10b20abf2eaa # v0.2

.github/workflows/go-check.yml

@@ -2,26 +2,31 @@
 # See https://github.com/protocol/.github/ for details.
 
 on: [push, pull_request]
+name: Go Checks
 
 jobs:
   unit:
     runs-on: ubuntu-latest
-    name: Go checks
+    name: All
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: recursive
       - uses: actions/setup-go@v2
         with:
           go-version: "1.16.x"
       - name: Install staticcheck
-        run: go install honnef.co/go/tools/cmd/staticcheck@be534f007836a777104a15f2456cd1fffd3ddee8 # v2020.2.2
+        run: go install honnef.co/go/tools/cmd/staticcheck@434f5f3816b358fe468fa83dcba62d794e7fe04b # 2021.1 (v0.2.0)
       - name: Check that go.mod is tidy
-        run: |
-          go mod tidy
-          if [[ -n $(git ls-files --other --exclude-standard --directory -- go.sum) ]]; then
-            echo "go.sum was added by go mod tidy"
-            exit 1
-          fi
-          git diff --exit-code -- go.sum go.mod
+        uses: protocol/[email protected]
+        with:
+          run: |
+            go mod tidy
+            if [[ -n $(git ls-files --other --exclude-standard --directory -- go.sum) ]]; then
+              echo "go.sum was added by go mod tidy"
+              exit 1
+            fi
+            git diff --exit-code -- go.sum go.mod
       - name: gofmt
         if: ${{ success() || failure() }} # run this step even if the previous one failed
         run: |
@@ -32,10 +37,14 @@ jobs:
           fi
       - name: go vet
         if: ${{ success() || failure() }} # run this step even if the previous one failed
-        run: go vet ./...
+        uses: protocol/[email protected]
+        with:
+          run: go vet ./...
       - name: staticcheck
         if: ${{ success() || failure() }} # run this step even if the previous one failed
-        run: |
-          set -o pipefail
-          staticcheck ./... | sed -e 's@\(.*\)\.go@./\1.go@g'
+        uses: protocol/[email protected]
+        with:
+          run: |
+            set -o pipefail
+            staticcheck ./... | sed -e 's@\(.*\)\.go@./\1.go@g'
 

.github/workflows/go-test.yml

@@ -2,6 +2,7 @@
 # See https://github.com/protocol/.github/ for details.
 
 on: [push, pull_request]
+name: Go Test
 
 jobs:
   unit:
@@ -11,9 +12,11 @@ jobs:
         os: [ "ubuntu", "windows", "macos" ]
         go: [ "1.15.x", "1.16.x" ]
     runs-on: ${{ matrix.os }}-latest
-    name: Unit tests (${{ matrix.os}}, Go ${{ matrix.go }})
+    name: ${{ matrix.os}} (go ${{ matrix.go }})
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: recursive
       - uses: actions/setup-go@v2
         with:
           go-version: ${{ matrix.go }}
@@ -22,17 +25,23 @@ jobs:
           go version
           go env
       - name: Run tests
-        run: go test -v -coverprofile coverage.txt ./...
+        uses: protocol/[email protected]
+        with:
+          run: go test -v -coverprofile coverage.txt ./...
       - name: Run tests (32 bit)
         if: ${{ matrix.os != 'macos' }} # can't run 32 bit tests on OSX.
+        uses: protocol/[email protected]
         env:
           GOARCH: 386
-        run: go test -v ./...
+        with:
+          run: go test -v ./...
       - name: Run tests with race detector
         if: ${{ matrix.os == 'ubuntu' }} # speed things up. Windows and OSX VMs are slow
-        run: go test -v -race ./...
+        uses: protocol/[email protected]
+        with:
+          run: go test -v -race ./...
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@967e2b38a85a62bd61be5529ada27ebc109948c2 # v1.4.1
+        uses: codecov/codecov-action@a1ed4b322b4b38cb846afb5a0ebfa17086917d27 # v1.5.0
         with:
           file: coverage.txt
           env_vars: OS=${{ matrix.os }}, GO=${{ matrix.go }}

net/net.go

@@ -248,16 +248,16 @@ func (l *maListener) Accept() (Conn, error) {
 	var raddr ma.Multiaddr
 	// This block protects us in transports (i.e. unix sockets) that don't have
 	// remote addresses for inbound connections.
-	if nconn.RemoteAddr().String() != "" {
-		raddr, err = FromNetAddr(nconn.RemoteAddr())
+	if addr := nconn.RemoteAddr(); addr != nil && addr.String() != "" {
+		raddr, err = FromNetAddr(addr)
 		if err != nil {
 			return nil, fmt.Errorf("failed to convert conn.RemoteAddr: %s", err)
 		}
 	}
 
 	var laddr ma.Multiaddr
-	if nconn.LocalAddr().String() != "" {
-		laddr, err = FromNetAddr(nconn.LocalAddr())
+	if addr := nconn.LocalAddr(); addr != nil && addr.String() != "" {
+		laddr, err = FromNetAddr(addr)
 		if err != nil {
 			return nil, fmt.Errorf("failed to convert conn.LocalAddr: %s", err)
 		}

net/registry.go

@@ -17,13 +17,13 @@ type ToNetAddrFunc func(ma ma.Multiaddr) (net.Addr, error)
 var defaultCodecs = NewCodecMap()
 
 func init() {
-	defaultCodecs.RegisterFromNetAddr(parseTCPNetAddr, "tcp", "tcp4", "tcp6")
-	defaultCodecs.RegisterFromNetAddr(parseUDPNetAddr, "udp", "udp4", "udp6")
-	defaultCodecs.RegisterFromNetAddr(parseIPNetAddr, "ip", "ip4", "ip6")
-	defaultCodecs.RegisterFromNetAddr(parseIPPlusNetAddr, "ip+net")
-	defaultCodecs.RegisterFromNetAddr(parseUnixNetAddr, "unix")
+	RegisterFromNetAddr(parseTCPNetAddr, "tcp", "tcp4", "tcp6")
+	RegisterFromNetAddr(parseUDPNetAddr, "udp", "udp4", "udp6")
+	RegisterFromNetAddr(parseIPNetAddr, "ip", "ip4", "ip6")
+	RegisterFromNetAddr(parseIPPlusNetAddr, "ip+net")
+	RegisterFromNetAddr(parseUnixNetAddr, "unix")
 
-	defaultCodecs.RegisterToNetAddr(parseBasicNetMaddr, "tcp", "udp", "ip6", "ip4", "unix")
+	RegisterToNetAddr(parseBasicNetMaddr, "tcp", "udp", "ip6", "ip4", "unix")
 }
 
 // CodecMap holds a map of NetCodecs indexed by their Protocol ID
@@ -77,6 +77,16 @@ func RegisterNetCodec(a *NetCodec) {
 	defaultCodecs.RegisterNetCodec(a)
 }
 
+// RegisterFromNetAddr registers a conversion from net.Addr instances to multiaddrs.
+func RegisterFromNetAddr(from FromNetAddrFunc, networks ...string) {
+	defaultCodecs.RegisterFromNetAddr(from, networks...)
+}
+
+// RegisterToNetAddr registers a conversion from multiaddrs to net.Addr instances.
+func RegisterToNetAddr(to ToNetAddrFunc, protocols ...string) {
+	defaultCodecs.RegisterToNetAddr(to, protocols...)
+}
+
 // RegisterNetCodec adds a new NetCodec to the CodecMap. This function is
 // thread safe.
 func (cm *CodecMap) RegisterNetCodec(a *NetCodec) {