bump go daemon tag version

.appveyor.yml

@@ -40,7 +40,7 @@ install:
 
   # install and build go-libp2p-daemon
   - curl -O -L -s -S https://raw.githubusercontent.com/status-im/nimbus-build-system/master/scripts/build_p2pd.sh
-  - bash build_p2pd.sh p2pdCache
+  - bash build_p2pd.sh p2pdCache v0.2.4
 
 build_script:
   - nimble install -y --depsOnly

.travis.yml

@@ -12,7 +12,7 @@ git:
   # when multiple CI builds are queued, the tested commit needs to be in the last X commits cloned with "--depth X"
   depth: 10
 
-go: "1.12.x"
+go: "1.14.x"
 
 matrix:
   include:
@@ -45,9 +45,10 @@ install:
 
   # install and build go-libp2p-daemon
   - curl -O -L -s -S https://raw.githubusercontent.com/status-im/nimbus-build-system/master/scripts/build_p2pd.sh
-  - bash build_p2pd.sh p2pdCache v0.2.1
+  - bash build_p2pd.sh p2pdCache v0.2.4
 
 script:
   - nimble install -y --depsOnly
   - nimble test
   - nimble examples_build
+

azure-pipelines.yml

@@ -13,186 +13,108 @@ strategy:
       VM: 'windows-latest'
       PLATFORM: x64
       TEST_LANG: c
-    # Windows_cpp_64bit:
-    #   VM: 'windows-latest'
-    #   UCPU: amd64
-    #   PLATFORM: x64
-    #   TEST_LANG: cpp
-    #Linux_64bit:
-      #VM: 'ubuntu-16.04'
-      #PLATFORM: x64
-      #TEST_LANG: c
-    # Linux_cpp_64bit:
-    #   VM: 'ubuntu-16.04'
-    #   UCPU: amd64
-    #   PLATFORM: x64
-    #   TEST_LANG: cpp
-
-    # TODO this requires gcc -m32 as the Ubuntu image is 64-bit
-    # Linux_32bit:
-    #   VM: 'ubuntu-16.04'
-    #   ARCH: x86
-    #   PLATFORM: x86
-    #   TEST_LANG: c
-
-    # TODO: go version on Azure is problematic,
-    #       we have xerrors package issue
-    # MacOS_64bit:
-    #   VM: 'macOS-10.14'
-    #   PLATFORM: x64
-    #   TEST_LANG: c
 
 pool:
   vmImage: $(VM)
 
 variables:
-  GOPATH: '$(system.defaultWorkingDirectory)/go'
   V: 0 # Scripts verbosity, 1 for debugging build scripts
 
 steps:
   - task: CacheBeta@1
     displayName: 'cache Nim binaries'
     inputs:
-      key: NimBinaries | $(Agent.OS) | $(PLATFORM) | "$(Build.SourceBranchName)" | "v3"
+      key: NimBinaries | $(Agent.OS) | $(PLATFORM) | "$(Build.SourceBranchName)" | "v4"
       path: NimBinaries
 
   - task: CacheBeta@1
     displayName: 'cache Go libp2p daemon'
     inputs:
-      key: p2pdCache | $(Agent.OS) | $(PLATFORM)
+      key: p2pdCache | $(Agent.OS) | $(PLATFORM) | "v3"
       path: p2pdCache
 
   - task: CacheBeta@1
     displayName: 'cache MinGW-w64'
     inputs:
-      key: mingwCache | 8_1_0 | $(PLATFORM)
+      key: mingwCache | 8_1_0 | $(PLATFORM) | "v1"
       path: mingwCache
-    condition: eq(variables['Agent.OS'], 'Windows_NT')
 
   - powershell: |
       Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem' -Name 'LongPathsEnabled' -Value 1
     displayName: 'long path support'
-    condition: eq(variables['Agent.OS'], 'Windows_NT')
+
   - bash: |
       set -e
-      echo "PATH=${PATH}"
+
+      # custom MinGW-w64 versions for both 32-bit and 64-bit, since we need a 64-bit build of p2pd
       echo "Installing MinGW-w64"
+
+      install_mingw() {
+        mkdir -p mingwCache
+        cd mingwCache
+        if [[ ! -e "$MINGW_FILE" ]]; then
+          rm -f *.7z
+          curl -OLsS "$MINGW_URL"
+        fi
+        7z x -y -bd "$MINGW_FILE" >/dev/null
+        mkdir -p /c/custom
+        mv "$MINGW_DIR" /c/custom/
+        cd ..
+      }
+
+      # 32-bit
+      MINGW_FILE="i686-8.1.0-release-posix-dwarf-rt_v6-rev0.7z"
+      MINGW_URL="https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/8.1.0/threads-posix/dwarf/${MINGW_FILE}"
+      MINGW_DIR="mingw32"
+      install_mingw
+
+      # 64-bit
+      MINGW_FILE="x86_64-8.1.0-release-posix-seh-rt_v6-rev0.7z"
+      MINGW_URL="https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/8.1.0/threads-posix/seh/${MINGW_FILE}"
+      MINGW_DIR="mingw64"
+      install_mingw
+
       if [[ $PLATFORM == "x86" ]]; then
-        MINGW_FILE="i686-8.1.0-release-posix-dwarf-rt_v6-rev0.7z"
-        MINGW_URL="https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/8.1.0/threads-posix/dwarf/${MINGW_FILE}"
         MINGW_DIR="mingw32"
       else
-        MINGW_FILE="x86_64-8.1.0-release-posix-seh-rt_v6-rev0.7z"
-        MINGW_URL="https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/8.1.0/threads-posix/seh/${MINGW_FILE}"
         MINGW_DIR="mingw64"
       fi
-      mkdir -p mingwCache
-      pushd mingwCache
-      if [[ ! -e "$MINGW_FILE" ]]; then
-        rm -f *.7z
-        curl -OLsS "$MINGW_URL"
-      fi
-      7z x -y -bd "$MINGW_FILE" >/dev/null
-      mkdir -p /c/custom
-      mv "$MINGW_DIR" /c/custom/
-      popd
-
-      # Workaround https://developercommunity.visualstudio.com/content/problem/891929/windows-2019-cygheap-base-mismatch-detected-git-ba.html
-      echo "##vso[task.prependpath]/usr/bin"
-      echo "##vso[task.prependpath]/mingw64/bin"
-
-      echo "##vso[task.setvariable variable=MINGW_DIR;]$MINGW_DIR"
-    displayName: 'Install dependencies (Windows)'
-    condition: eq(variables['Agent.OS'], 'Windows_NT')
-  - powershell: |
-      # export custom mingw PATH to other tasks
-      echo "##vso[task.prependpath]c:\custom\$(MINGW_DIR)\bin"
-    displayName: 'Mingw PATH (Windows)'
-    condition: eq(variables['Agent.OS'], 'Windows_NT')
-
-  - bash: |
-      set -e
+      export PATH="/c/custom/${MINGW_DIR}/bin:${PATH}"
       echo "PATH=${PATH}"
-      export ncpu=
-      case '$(Agent.OS)' in
-      'Linux')
-        ncpu=$(nproc)
-        ;;
-      'Darwin')
-        ncpu=$(sysctl -n hw.ncpu)
-        ;;
-      'Windows_NT')
-        ncpu=$NUMBER_OF_PROCESSORS
-        ;;
-      esac
-      [[ -z "$ncpu" || $ncpu -le 0 ]] && ncpu=1
-      echo "Found ${ncpu} cores"
-      echo "##vso[task.setvariable variable=ncpu;]$ncpu"
-    displayName: 'Detecting number of cores'
+      which gcc
+      gcc -v
 
-  - bash: |
-      set -e
-      echo "PATH=${PATH}"
+      # detect number of cores
+      export ncpu="$NUMBER_OF_PROCESSORS"
+      [[ -z "$ncpu" || $ncpu -le 0 ]] && ncpu=2
+      echo "Found ${ncpu} cores"
 
       # build nim from our own branch - this to avoid the day-to-day churn and
       # regressions of the fast-paced Nim development while maintaining the
       # flexibility to apply patches
-      curl -O -L -s -S https://raw.githubusercontent.com/status-im/nimbus-build-system/master/scripts/build_nim.sh
+      curl -OLsS https://raw.githubusercontent.com/status-im/nimbus-build-system/master/scripts/build_nim.sh
       env MAKE="mingw32-make -j${ncpu}" ARCH_OVERRIDE=$(PLATFORM) bash build_nim.sh Nim csources dist/nimble NimBinaries
 
-    displayName: 'Building Nim (Windows)'
-    condition: eq(variables['Agent.OS'], 'Windows_NT')
-  - powershell: |
-      echo "##vso[task.prependpath]$pwd\Nim\bin"
-    displayName: 'Set env variable (Windows)'
-    condition: eq(variables['Agent.OS'], 'Windows_NT')
-
-  - bash: |
-      set -e
+      export PATH="${PWD}/Nim/bin:${PATH}"
       echo "PATH=${PATH}"
 
-      # build nim from our own branch - this to avoid the day-to-day churn and
-      # regressions of the fast-paced Nim development while maintaining the
-      # flexibility to apply patches
-      curl -O -L -s -S https://raw.githubusercontent.com/status-im/nimbus-build-system/master/scripts/build_nim.sh
-      env MAKE="make -j${ncpu}" ARCH_OVERRIDE=$(PLATFORM) bash build_nim.sh Nim csources dist/nimble NimBinaries
-    displayName: 'Building Nim (POSIX)'
-    condition: ne(variables['Agent.OS'], 'Windows_NT')
-  - bash: |
-      echo "##vso[task.prependpath]$PWD/Nim/bin"
-    displayName: 'Set env variable (Posix)'
-    condition: ne(variables['Agent.OS'], 'Windows_NT')
-
-  - bash: |
-      set -e
       # install and build go-libp2p-daemon
       go version
 
-      echo "##vso[task.prependpath]$(GOPATH)/bin"
-      curl -O -L -s -S https://raw.githubusercontent.com/status-im/nimbus-build-system/master/scripts/build_p2pd.sh
-      bash build_p2pd.sh p2pdCache
-    displayName: 'Building Go libp2p daemon'
-
-  - bash: |
-      set -e
+      export GOPATH="${PWD}/go"
+      export PATH="${GOPATH}/bin:${PATH}"
       echo "PATH=${PATH}"
+
+      curl -OLsS https://raw.githubusercontent.com/status-im/nimbus-build-system/master/scripts/build_p2pd.sh
+      # we can't seem to be able to build a 32-bit p2pd
+      env PATH="/c/custom/mingw64/bin:${PATH}" bash build_p2pd.sh p2pdCache v0.2.4
+
+      # install dependencies
       nimble refresh
       nimble install -y --depsOnly
-    displayName: 'Building dependencies (Posix)'
-    condition: ne(variables['Agent.OS'], 'Windows_NT')
-  - powershell: |
-      echo $Env:Path
-      nimble refresh
-      nimble install -y --depsOnly
-    displayName: 'Building dependencies (Windows)'
-    condition: eq(variables['Agent.OS'], 'Windows_NT')
-
-  - bash: |
-      set -e
-      echo "PATH=${PATH}"
-      which gcc
-      gcc -v
 
+      # run tests
       nimble test
       nimble examples_build
-    displayName: 'Testing the package'
+    displayName: 'build and test'
+

libp2p.nimble

@@ -17,18 +17,19 @@ requires "nim >= 1.2.0",
          "stew >= 0.1.0"
 
 proc runTest(filename: string, verify: bool = true, sign: bool = true) =
-  var excstr: string = "nim c -r --opt:speed -d:debug --verbosity:0 --hints:off -d:chronicles_log_level=info"
-  excstr.add(" ")
-  excstr.add("-d:libp2p_pubsub_sign=" & $sign)
-  excstr.add(" ")
-  excstr.add("-d:libp2p_pubsub_verify=" & $verify)
-  excstr.add(" ")
-  excstr.add("tests/" & filename)
+  var excstr = "nim c -r --opt:speed -d:debug --verbosity:0 --hints:off -d:chronicles_log_level=info"
+  excstr.add(" --warning[CaseTransition]:off --warning[ObservableStores]:off --warning[LockLevel]:off")
+  excstr.add(" -d:libp2p_pubsub_sign=" & $sign)
+  excstr.add(" -d:libp2p_pubsub_verify=" & $verify)
+  excstr.add(" tests/" & filename)
   exec excstr
   rmFile "tests/" & filename.toExe
 
 proc buildSample(filename: string) =
-  exec "nim c --opt:speed --threads:on -d:debug --verbosity:0 --hints:off examples/" & filename
+  var excstr = "nim c --opt:speed --threads:on -d:debug --verbosity:0 --hints:off"
+  excstr.add(" --warning[CaseTransition]:off --warning[ObservableStores]:off --warning[LockLevel]:off")
+  excstr.add(" examples/" & filename)
+  exec excstr
   rmFile "examples" & filename.toExe
 
 task testnative, "Runs libp2p native tests":

libp2p/daemon/daemonapi.nim

@@ -736,6 +736,7 @@ proc newDaemonApi*(flags: set[P2PDaemonFlags] = {},
       if i > 0: opt.add ","
       opt.add $address
     args.add(opt)
+  args.add("-noise=true")
   args.add("-listen=" & $api.address)
 
   # We are trying to get absolute daemon path.