.github/actions/nimbus-build-system/action.yml

@@ -81,35 +81,35 @@ runs:
           mingw-w64-i686-ntldd-git
           mingw-w64-i686-rust
 
-    - name: Install gcc 14 on Linux
+    - name: MSYS2 (Windows All) - Update to gcc 14
-      # We don't want to install gcc 14 for coverage (Ubuntu 20.04)
+      if: inputs.os == 'windows'
-      if : ${{ inputs.os == 'linux' && inputs.coverage != 'true' }}
       shell: ${{ inputs.shell }} {0}
       run: |
-        # Skip for older Ubuntu versions
+        pacman -U --noconfirm https://repo.msys2.org/mingw/ucrt64/mingw-w64-ucrt-x86_64-gcc-14.2.0-2-any.pkg.tar.zst https://repo.msys2.org/mingw/ucrt64/mingw-w64-ucrt-x86_64-gcc-libs-14.2.0-2-any.pkg.tar.zst
-        if [[ $(lsb_release -r | awk -F '[^0-9]+' '{print $2}') -ge 24 ]]; then
+
-          # Install GCC-14
+    - name: Install gcc 14 on Linux
-          sudo apt-get update -qq
+      # We don't want to install gcc 14 for coverage (Ubuntu 20.04)
-          sudo apt-get install -yq gcc-14
+      if : ${{ inputs.os == 'linux' && !inputs.coverage }}
-          # Add GCC-14 to alternatives
+      shell: ${{ inputs.shell }} {0}
-          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 14
+      run: |
-          # Set GCC-14 as the default
+        # Add GCC-14 to alternatives
-          sudo update-alternatives --set gcc /usr/bin/gcc-14
+        sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 14
-        fi
+        # Set GCC-14 as the default
+        sudo update-alternatives --set gcc /usr/bin/gcc-14
 
     - name: Install ccache on Linux/Mac
       if: inputs.os == 'linux' || inputs.os == 'macos'
       uses: hendrikmuhs/ccache-action@v1.2
       with:
         create-symlink: true
-        key: ${{ inputs.os }}-${{ inputs.builder }}-${{ inputs.cpu }}-${{ inputs.tests }}-${{ inputs.nim_version }}
+        key: ${{ matrix.os }}-${{ matrix.builder }}-${{ matrix.cpu }}-${{ matrix.tests }}-${{ matrix.nim_version }}
         evict-old-files: 7d
 
     - name: Install ccache on Windows
       if: inputs.os == 'windows'
       uses: hendrikmuhs/ccache-action@v1.2
       with:
-        key: ${{ inputs.os }}-${{ inputs.builder }}-${{ inputs.cpu }}-${{ inputs.tests }}-${{ inputs.nim_version }}
+        key: ${{ matrix.os }}-${{ matrix.builder }}-${{ matrix.cpu }}-${{ matrix.tests }}-${{ matrix.nim_version }}
         evict-old-files: 7d
 
     - name: Enable ccache on Windows
@@ -202,7 +202,7 @@ runs:
     - name: Restore Nim toolchain binaries from cache
       id: nim-cache
       uses: actions/cache@v4
-      if : ${{ inputs.coverage != 'true'  }}
+      if : ${{ !inputs.coverage  }}
       with:
         path: NimBinaries
         key: ${{ inputs.os }}-${{ inputs.cpu }}-nim-${{ inputs.nim_version }}-cache-${{ env.cache_nonce }}-${{ github.run_id }}
@@ -218,7 +218,7 @@ runs:
       run: |
         git config --global core.symlinks false
 
-    - name: Build Nim and Logos Storage dependencies
+    - name: Build Nim and Codex dependencies
       shell: ${{ inputs.shell }} {0}
       run: |
         which gcc

.github/workflows/Readme.md

@@ -3,14 +3,12 @@ Tips for shorter build times
 
 ### Runner availability ###
 
-When running on the Github free, pro or team plan, the bottleneck when
+Currently, the biggest bottleneck when optimizing workflows is the availability
-optimizing workflows is the availability of macOS runners. Therefore, anything
+of Windows and macOS runners. Therefore, anything that reduces the time spent in
-that reduces the time spent in macOS jobs will have a positive impact on the
+Windows or macOS jobs will have a positive impact on the time waiting for
-time waiting for runners to become available. On the Github enterprise plan,
+runners to become available. The usage limits for Github Actions are [described
-this is not the case and you can more freely use parallelization on multiple
+here][limits]. You can see a breakdown of runner usage for your jobs in the
-runners. The usage limits for Github Actions are [described here][limits]. You
+Github Actions tab ([example][usage]).
-can see a breakdown of runner usage for your jobs in the Github Actions tab
-([example][usage]).
 
 ### Windows is slow ###
 
@@ -24,10 +22,11 @@ analysis, etc. are therefore better performed on a Linux runner.
 
 Breaking up a long build job into several jobs that you run in parallel can have
 a positive impact on the wall clock time that a workflow runs. For instance, you
-might consider running unit tests and integration tests in parallel. When
+might consider running unit tests and integration tests in parallel. Keep in
-running on the Github free, pro or team plan, keep in mind that availability of
+mind however that availability of macOS and Windows runners is the biggest
-macOS runners is a bottleneck. If you split a macOS job into two jobs, you now
+bottleneck. If you split a Windows job into two jobs, you now need to wait for
-need to wait for two macOS runners to become available.
+two Windows runners to become available! Therefore parallelization often only
+makes sense for Linux jobs.
 
 ### Refactoring ###
 
@@ -67,10 +66,9 @@ might seem inconvenient, because when you're debugging an issue you often want
 to know whether you introduced a failure on all platforms, or only on a single
 one. You might be tempted to disable fail-fast, but keep in mind that this keeps
 runners busy for longer on a workflow that you know is going to fail anyway.
-Consequent runs will therefore take longer to start. Fail fast is most likely
+Consequent runs will therefore take longer to start. Fail fast is most likely better for overall development speed.
-better for overall development speed.
 
-[usage]: https://github.com/logos-storage/logos-storage-nim/actions/runs/3462031231/usage
+[usage]: https://github.com/codex-storage/nim-codex/actions/runs/3462031231/usage
 [composite]: https://docs.github.com/en/actions/creating-actions/creating-a-composite-action
 [reusable]: https://docs.github.com/en/actions/using-workflows/reusing-workflows
 [cache]: https://github.com/actions/cache/blob/main/workarounds.md#update-a-cache

.github/workflows/ci-reusable.yml

@@ -24,9 +24,9 @@ jobs:
       run:
         shell: ${{ matrix.shell }} {0}
 
-    name: ${{ matrix.os }}-${{ matrix.tests }}-${{ matrix.cpu }}-${{ matrix.nim_version }}-${{ matrix.job_number }}
+    name: ${{ matrix.os }}-${{ matrix.tests }}-${{ matrix.cpu }}-${{ matrix.nim_version }}
     runs-on: ${{ matrix.builder }}
-    timeout-minutes: 90
+    timeout-minutes: 120
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
@@ -38,7 +38,6 @@ jobs:
         uses: ./.github/actions/nimbus-build-system
         with:
           os: ${{ matrix.os }}
-          cpu: ${{ matrix.cpu }}
           shell: ${{ matrix.shell }}
           nim_version: ${{ matrix.nim_version }}
           coverage: false
@@ -48,22 +47,20 @@ jobs:
         if: matrix.tests == 'unittest' || matrix.tests == 'all'
         run: make -j${ncpu} test
 
+      # workaround for https://github.com/NomicFoundation/hardhat/issues/3877
       - name: Setup Node.js
-        if: matrix.tests == 'contract' || matrix.tests == 'integration' || matrix.tests == 'tools' || matrix.tests == 'all'
         uses: actions/setup-node@v4
         with:
-          node-version: 22
+          node-version: 18.15
 
-      - name: Start Ethereum node with Logos Storage contracts
+      - name: Start Ethereum node with Codex contracts
         if: matrix.tests == 'contract' || matrix.tests == 'integration' || matrix.tests == 'tools' || matrix.tests == 'all'
-        working-directory: vendor/logos-storage-contracts-eth
+        working-directory: vendor/codex-contracts-eth
         env:
           MSYS2_PATH_TYPE: inherit
         run: |
-          npm ci
+          npm install
           npm start &
-          # Wait for the contracts to be deployed
-          sleep 5
 
       ## Part 2 Tests ##
       - name: Contract tests
@@ -73,15 +70,13 @@ jobs:
       ## Part 3 Tests ##
       - name: Integration tests
         if: matrix.tests == 'integration' || matrix.tests == 'all'
-        env:
-          CODEX_INTEGRATION_TEST_INCLUDES: ${{ matrix.includes }}
         run: make -j${ncpu} testIntegration
 
       - name: Upload integration tests log files
         uses: actions/upload-artifact@v4
         if: (matrix.tests == 'integration' || matrix.tests == 'all') && always()
         with:
-          name: ${{ matrix.os }}-${{ matrix.cpu }}-${{ matrix.nim_version }}-${{ matrix.job_number }}-integration-tests-logs
+          name: ${{ matrix.os }}-${{ matrix.cpu }}-${{ matrix.nim_version }}-integration-tests-logs
           path: tests/integration/logs/
           retention-days: 1
 

.github/workflows/ci.yml

@@ -9,28 +9,36 @@ on:
 
 env:
   cache_nonce: 0 # Allows for easily busting actions/cache caches
-  nim_version: v2.2.4
+  nim_version: v2.0.14
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:
-
   matrix:
     runs-on: ubuntu-latest
     outputs:
       matrix: ${{ steps.matrix.outputs.matrix }}
       cache_nonce: ${{ env.cache_nonce }}
     steps:
-      - name: Checkout sources
-        uses: actions/checkout@v4
       - name: Compute matrix
         id: matrix
-        run: |
+        uses: fabiocaccamo/create-matrix-action@v5
-          echo 'matrix<<EOF' >> $GITHUB_OUTPUT
+        with:
-          tools/scripts/ci-job-matrix.sh >> $GITHUB_OUTPUT
+          matrix: |
-          echo 'EOF' >> $GITHUB_OUTPUT
+            os {linux},   cpu {amd64}, builder {ubuntu-latest},   tests {unittest},    nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail}
+            os {linux},   cpu {amd64}, builder {ubuntu-latest},   tests {contract},    nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail}
+            os {linux},   cpu {amd64}, builder {ubuntu-latest},   tests {integration}, nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail}
+            os {linux},   cpu {amd64}, builder {ubuntu-latest},   tests {tools},       nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail}
+            os {macos},   cpu {amd64}, builder {macos-13},       tests {unittest},    nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail}
+            os {macos},   cpu {amd64}, builder {macos-13},       tests {contract},    nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail}
+            os {macos},   cpu {amd64}, builder {macos-13},       tests {integration}, nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail}
+            os {macos},   cpu {amd64}, builder {macos-13},       tests {tools},       nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail}
+            os {windows}, cpu {amd64}, builder {windows-latest}, tests {unittest},    nim_version {${{ env.nim_version }}}, shell {msys2}
+            os {windows}, cpu {amd64}, builder {windows-latest}, tests {contract},    nim_version {${{ env.nim_version }}}, shell {msys2}
+            os {windows}, cpu {amd64}, builder {windows-latest}, tests {integration}, nim_version {${{ env.nim_version }}}, shell {msys2}
+            os {windows}, cpu {amd64}, builder {windows-latest}, tests {tools},       nim_version {${{ env.nim_version }}}, shell {msys2}
 
   build:
     needs: matrix
@@ -53,7 +61,11 @@ jobs:
           suggest: true
 
   coverage:
-    runs-on: ubuntu-latest
+    # Force to stick to ubuntu 20.04 for coverage because
+    # lcov was updated to 2.x version in ubuntu-latest
+    # and cause a lot of issues.
+    # See https://github.com/linux-test-project/lcov/issues/238
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4

.github/workflows/conventional-commits.yml

@@ -1,19 +0,0 @@
-name: Conventional Commits Linting
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-  workflow_dispatch:
-  merge_group:
-
-jobs:
-  pr-title:
-    runs-on: ubuntu-latest
-    if: github.event_name == 'pull_request'
-    steps:
-      - name: PR Conventional Commit Validation
-        uses:  ytanikin/pr-conventional-commits@1.4.1
-        with:
-          task_types: '["feat","fix","docs","test","ci","build","refactor","style","perf","chore","revert"]'

.github/workflows/docker-dist-tests.yml

@@ -0,0 +1,38 @@
+name: Docker - Dist-Tests
+
+
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - 'v*.*.*'
+    paths-ignore:
+      - '**/*.md'
+      - '.gitignore'
+      - '.github/**'
+      - '!.github/workflows/docker-dist-tests.yml'
+      - '!.github/workflows/docker-reusable.yml'
+      - 'docker/**'
+      - '!docker/codex.Dockerfile'
+      - '!docker/docker-entrypoint.sh'
+  workflow_dispatch:
+    inputs:
+      run_release_tests:
+        description: Run Release tests
+        required: false
+        type: boolean
+        default: false
+
+
+jobs:
+  build-and-push:
+    name: Build and Push
+    uses: ./.github/workflows/docker-reusable.yml
+    with:
+      nimflags: '-d:disableMarchNative -d:codex_enable_api_debug_peers=true -d:codex_enable_proof_failures=true -d:codex_enable_log_counter=true -d:verify_circuit=true'
+      nat_ip_auto: true
+      tag_latest: ${{ github.ref_name == github.event.repository.default_branch || startsWith(github.ref, 'refs/tags/') }}
+      tag_suffix: dist-tests
+      run_release_tests: ${{ inputs.run_release_tests }}
+    secrets: inherit

.github/workflows/docker-reusable.yml

@@ -34,11 +34,6 @@ on:
         description: Set latest tag for Docker images
         required: false
         type: boolean
-      tag_stable:
-        default: false
-        description: Set stable tag for Docker images
-        required: false
-        type: boolean
       tag_sha:
         default: true
         description: Set Git short commit as Docker tag
@@ -64,14 +59,6 @@ on:
         required: false
         type: string
         default: false
-      contract_image:
-        description: Specifies compatible smart contract image
-        required: false
-        type: string
-    outputs:
-      codex_image:
-        description: Logos Storage Docker image tag
-        value: ${{ jobs.publish.outputs.codex_image }}
 
 
 env:
@@ -82,12 +69,10 @@ env:
   NIMFLAGS: ${{ inputs.nimflags }}
   NAT_IP_AUTO: ${{ inputs.nat_ip_auto }}
   TAG_LATEST: ${{ inputs.tag_latest }}
-  TAG_STABLE: ${{ inputs.tag_stable }}
   TAG_SHA: ${{ inputs.tag_sha }}
   TAG_SUFFIX: ${{ inputs.tag_suffix }}
-  CONTRACT_IMAGE: ${{ inputs.contract_image }}
   # Tests
-  TESTS_SOURCE: logos-storage/logos-storage-nim-cs-dist-tests
+  TESTS_SOURCE: codex-storage/cs-codex-dist-tests
   TESTS_BRANCH: master
   CONTINUOUS_TESTS_LIST: ${{ inputs.continuous_tests_list }}
   CONTINUOUS_TESTS_DURATION: ${{ inputs.continuous_tests_duration }}
@@ -95,20 +80,8 @@ env:
 
 
 jobs:
-  # Compute variables
-  compute:
-    name: Compute build ID
-    runs-on: ubuntu-latest
-    outputs:
-      build_id: ${{ steps.build_id.outputs.build_id }}
-    steps:
-      - name: Generate unique build id
-        id: build_id
-        run: echo "build_id=$(openssl rand -hex 5)" >> $GITHUB_OUTPUT
-
   # Build platform specific image
   build:
-    needs: compute
     strategy:
       fail-fast: true
       matrix:
@@ -135,19 +108,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Docker - Variables
-        run: |
-          # Create contract label for compatible contract image if specified
-          if [[ -n "${{ env.CONTRACT_IMAGE }}" ]]; then
-            echo "CONTRACT_LABEL=storage.codex.nim-codex.blockchain-image=${{ env.CONTRACT_IMAGE }}" >> $GITHUB_ENV
-          fi
-
       - name: Docker - Meta
         id: meta
         uses: docker/metadata-action@v5
         with:
           images: ${{ env.DOCKER_REPO }}
-          labels: ${{ env.CONTRACT_LABEL }}
 
       - name: Docker - Set up Buildx
         uses: docker/setup-buildx-action@v3
@@ -182,7 +147,7 @@ jobs:
       - name: Docker - Upload digest
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ needs.compute.outputs.build_id }}-${{ matrix.target.arch }}
+          name: digests-${{ matrix.target.arch }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
@@ -194,41 +159,35 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       version: ${{ steps.meta.outputs.version }}
-      codex_image: ${{ steps.image_tag.outputs.codex_image }}
+    needs: build
-    needs: [build, compute]
     steps:
       - name: Docker - Variables
         run: |
-          # Adjust custom suffix when set
+          # Adjust custom suffix when set and
           if [[ -n "${{ env.TAG_SUFFIX }}" ]]; then
-            echo "TAG_SUFFIX=-${{ env.TAG_SUFFIX }}" >> $GITHUB_ENV
+            echo "TAG_SUFFIX=-${{ env.TAG_SUFFIX }}" >>$GITHUB_ENV
           fi
           # Disable SHA tags on tagged release
           if [[ ${{ startsWith(github.ref, 'refs/tags/') }} == "true" ]]; then
-            echo "TAG_SHA=false" >> $GITHUB_ENV
+            echo "TAG_SHA=false" >>$GITHUB_ENV
           fi
           # Handle latest and latest-custom using raw
           if [[ ${{ env.TAG_SHA }} == "false" ]]; then
-            echo "TAG_LATEST=false" >> $GITHUB_ENV
+            echo "TAG_LATEST=false" >>$GITHUB_ENV
-            echo "TAG_RAW=true" >> $GITHUB_ENV
+            echo "TAG_RAW=true" >>$GITHUB_ENV
             if [[ -z "${{ env.TAG_SUFFIX }}" ]]; then
-              echo "TAG_RAW_VALUE=latest" >> $GITHUB_ENV
+              echo "TAG_RAW_VALUE=latest" >>$GITHUB_ENV
             else
-              echo "TAG_RAW_VALUE=latest-{{ env.TAG_SUFFIX }}" >> $GITHUB_ENV
+              echo "TAG_RAW_VALUE=latest-{{ env.TAG_SUFFIX }}" >>$GITHUB_ENV
             fi
           else
-            echo "TAG_RAW=false" >> $GITHUB_ENV
+            echo "TAG_RAW=false" >>$GITHUB_ENV
-          fi
-          
-          # Create contract label for compatible contract image if specified
-          if [[ -n "${{ env.CONTRACT_IMAGE }}" ]]; then
-            echo "CONTRACT_LABEL=storage.codex.nim-codex.blockchain-image=${{ env.CONTRACT_IMAGE }}" >> $GITHUB_ENV
           fi
 
       - name: Docker - Download digests
         uses: actions/download-artifact@v4
         with:
-          pattern: digests-${{ needs.compute.outputs.build_id }}-*
+          pattern: digests-*
           merge-multiple: true
           path: /tmp/digests
 
@@ -240,14 +199,12 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: ${{ env.DOCKER_REPO }}
-          labels: ${{ env.CONTRACT_LABEL }}
           flavor: |
             latest=${{ env.TAG_LATEST }}
             suffix=${{ env.TAG_SUFFIX }},onlatest=true
           tags: |
             type=semver,pattern={{version}}
             type=raw,enable=${{ env.TAG_RAW }},value=latest
-            type=raw,enable=${{ env.TAG_STABLE }},value=stable
             type=sha,enable=${{ env.TAG_SHA }}
 
       - name: Docker - Login to Docker Hub
@@ -262,12 +219,9 @@ jobs:
           docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
             $(printf '${{ env.DOCKER_REPO }}@sha256:%s ' *)
 
-      - name: Docker - Image tag
-        id: image_tag
-        run: echo "codex_image=${{ env.DOCKER_REPO }}:${{ steps.meta.outputs.version }}" >> "$GITHUB_OUTPUT"
-
       - name: Docker - Inspect image
-        run: docker buildx imagetools inspect ${{ steps.image_tag.outputs.codex_image }}
+        run: |
+          docker buildx imagetools inspect ${{ env.DOCKER_REPO }}:${{ steps.meta.outputs.version }}
 
 
   # Compute Tests inputs
@@ -316,7 +270,7 @@ jobs:
       max-parallel: 1
       matrix:
         tests: ${{ fromJSON(needs.compute-continuous-tests-inputs.outputs.continuous_tests_list) }}
-    uses: logos-storage/logos-storage-nim-cs-dist-tests/.github/workflows/run-continuous-tests.yaml@master
+    uses: codex-storage/cs-codex-dist-tests/.github/workflows/run-continuous-tests.yaml@master
     with:
       source: ${{ needs.compute-tests-inputs.outputs.source }}
       branch: ${{ needs.compute-tests-inputs.outputs.branch }}
@@ -333,7 +287,7 @@ jobs:
     name: Run Release Tests
     needs: [compute-tests-inputs]
     if: ${{ inputs.run_release_tests == 'true' }}
-    uses: logos-storage/logos-storage-nim-cs-dist-tests/.github/workflows/run-release-tests.yaml@master
+    uses: codex-storage/cs-codex-dist-tests/.github/workflows/run-release-tests.yaml@master
     with:
       source: ${{ needs.compute-tests-inputs.outputs.source }}
       branch: ${{ needs.compute-tests-inputs.outputs.branch }}

.github/workflows/docker.yml

@@ -18,27 +18,11 @@ on:
       - '!docker/docker-entrypoint.sh'
   workflow_dispatch:
 
-jobs:
-  get-contracts-hash:
-    runs-on: ubuntu-latest
-    outputs:
-      hash: ${{ steps.get-hash.outputs.hash }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
 
-      - name: Get submodule short hash
+jobs:
-        id: get-hash
-        run: |
-          hash=$(git rev-parse --short HEAD:vendor/logos-storage-contracts-eth)
-          echo "hash=$hash" >> $GITHUB_OUTPUT
   build-and-push:
     name: Build and Push
     uses: ./.github/workflows/docker-reusable.yml
-    needs: get-contracts-hash
     with:
       tag_latest: ${{ github.ref_name == github.event.repository.default_branch || startsWith(github.ref, 'refs/tags/') }}
-      tag_stable: ${{ startsWith(github.ref, 'refs/tags/') }}
-      contract_image: "codexstorage/codex-contracts-eth:sha-${{ needs.get-contracts-hash.outputs.hash }}"
     secrets: inherit

.github/workflows/docs.yml

@@ -52,7 +52,7 @@ jobs:
           node-version: 18
 
       - name: Build OpenAPI
-        run: npx @redocly/cli build-docs openapi.yaml --output openapi/index.html --title "Logos Storage API"
+        run: npx @redocly/cli build-docs openapi.yaml --output openapi/index.html --title "Codex API"
 
       - name: Build Postman Collection
         run: npx -y openapi-to-postmanv2 -s openapi.yaml -o openapi/postman.json -p -O folderStrategy=Tags,includeAuthInfoInExample=false

.github/workflows/nim-matrix.yml

@@ -15,14 +15,15 @@ jobs:
       matrix: ${{ steps.matrix.outputs.matrix }}
       cache_nonce: ${{ env.cache_nonce }}
     steps:
-      - name: Checkout sources
+    - name: Compute matrix
-        uses: actions/checkout@v4
+      id: matrix
-      - name: Compute matrix
+      uses: fabiocaccamo/create-matrix-action@v5
-        id: matrix
+      with:
-        run: |
+        matrix: |
-          echo 'matrix<<EOF' >> $GITHUB_OUTPUT
+          os {linux}, cpu {amd64}, builder {ubuntu-20.04}, tests {unittest},    nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail}
-          tools/scripts/ci-job-matrix.sh linux >> $GITHUB_OUTPUT
+          os {linux}, cpu {amd64}, builder {ubuntu-20.04}, tests {contract},    nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail}
-          echo 'EOF' >> $GITHUB_OUTPUT
+          os {linux}, cpu {amd64}, builder {ubuntu-20.04}, tests {integration}, nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail}
+          os {linux}, cpu {amd64}, builder {ubuntu-20.04}, tests {tools},       nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail}
 
   build:
     needs: matrix

.github/workflows/release.yml

@@ -4,15 +4,13 @@ on:
   push:
     tags:
       - 'v*.*.*'
-    branches:
-      - master
   workflow_dispatch:
 
 env:
   cache_nonce: 0 # Allows for easily busting actions/cache caches
   nim_version: pinned
   rust_version: 1.79.0
-  storage_binary_base: storage
+  codex_binary_base: codex
   cirdl_binary_base: cirdl
   build_dir: build
   nim_flags: ''
@@ -30,8 +28,9 @@ jobs:
       uses: fabiocaccamo/create-matrix-action@v5
       with:
         matrix: |
-          os {linux},   cpu {amd64}, builder {ubuntu-22.04},     nim_version {${{ env.nim_version }}}, rust_version {${{ env.rust_version }}}, shell {bash --noprofile --norc -e -o pipefail}
+          os {linux},   cpu {amd64}, builder {ubuntu-20.04},     nim_version {${{ env.nim_version }}}, rust_version {${{ env.rust_version }}}, shell {bash --noprofile --norc -e -o pipefail}
           os {linux},   cpu {arm64}, builder {ubuntu-22.04-arm}, nim_version {${{ env.nim_version }}}, rust_version {${{ env.rust_version }}}, shell {bash --noprofile --norc -e -o pipefail}
+          os {macos},   cpu {amd64}, builder {macos-13},         nim_version {${{ env.nim_version }}}, rust_version {${{ env.rust_version }}}, shell {bash --noprofile --norc -e -o pipefail}
           os {macos},   cpu {arm64}, builder {macos-14},         nim_version {${{ env.nim_version }}}, rust_version {${{ env.rust_version }}}, shell {bash --noprofile --norc -e -o pipefail}
           os {windows}, cpu {amd64}, builder {windows-latest},   nim_version {${{ env.nim_version }}}, rust_version {${{ env.rust_version }}}, shell {msys2}
 
@@ -73,18 +72,18 @@ jobs:
             windows*) os_name="windows" ;;
           esac
           github_ref_name="${GITHUB_REF_NAME/\//-}"
-          storage_binary="${{ env.storage_binary_base }}-${github_ref_name}-${os_name}-${{ matrix.cpu }}"
+          codex_binary="${{ env.codex_binary_base }}-${github_ref_name}-${os_name}-${{ matrix.cpu }}"
           cirdl_binary="${{ env.cirdl_binary_base }}-${github_ref_name}-${os_name}-${{ matrix.cpu }}"
           if [[ ${os_name} == "windows" ]]; then
-            storage_binary="${storage_binary}.exe"
+            codex_binary="${codex_binary}.exe"
             cirdl_binary="${cirdl_binary}.exe"
           fi
-          echo "storage_binary=${storage_binary}" >>$GITHUB_ENV
+          echo "codex_binary=${codex_binary}" >>$GITHUB_ENV
           echo "cirdl_binary=${cirdl_binary}" >>$GITHUB_ENV
 
       - name: Release - Build
         run: |
-          make NIMFLAGS="--out:${{ env.build_dir }}/${{ env.storage_binary }} ${{ env.nim_flags }}"
+          make NIMFLAGS="--out:${{ env.build_dir }}/${{ env.codex_binary }} ${{ env.nim_flags }}"
           make cirdl NIMFLAGS="--out:${{ env.build_dir }}/${{ env.cirdl_binary }} ${{ env.nim_flags }}"
 
       - name: Release - Libraries
@@ -95,11 +94,11 @@ jobs:
             done
           fi
 
-      - name: Release - Upload Logos Storage build artifacts
+      - name: Release - Upload codex build artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: release-${{ env.storage_binary }}
+          name: release-${{ env.codex_binary }}
-          path: ${{ env.build_dir }}/${{ env.storage_binary_base }}*
+          path: ${{ env.build_dir }}/${{ env.codex_binary_base }}*
           retention-days: 30
 
       - name: Release - Upload cirdl build artifacts
@@ -139,7 +138,7 @@ jobs:
           }
 
           # Compress and prepare
-          for file in ${{ env.storage_binary_base }}* ${{ env.cirdl_binary_base }}*; do
+          for file in ${{ env.codex_binary_base }}* ${{ env.cirdl_binary_base }}*; do
             if [[ "${file}" == *".exe"* ]]; then
 
               # Windows - binary only
@@ -171,34 +170,6 @@ jobs:
           path: /tmp/release/
           retention-days: 30
 
-      - name: Release - Upload to the cloud
-        env:
-          s3_endpoint: ${{ secrets.S3_ENDPOINT }}
-          s3_bucket: ${{ secrets.S3_BUCKET }}
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
-        run: |
-          # Variables
-          branch="${GITHUB_REF_NAME/\//-}"
-          folder="/tmp/release"
-
-          # Tagged releases
-          if [[ "${{ github.ref }}" == *"refs/tags/"* ]]; then
-            aws s3 cp --recursive "${folder}" s3://${{ env.s3_bucket }}/releases/${branch} --endpoint-url ${{ env.s3_endpoint }}
-            echo "${branch}" >  "${folder}"/latest
-            aws s3 cp "${folder}"/latest s3://${{ env.s3_bucket }}/releases/latest --endpoint-url ${{ env.s3_endpoint }}
-            rm -f "${folder}"/latest
-
-          # master branch
-          elif [[ "${branch}" == "${{ github.event.repository.default_branch }}" ]]; then
-            aws s3 cp --recursive "${folder}" s3://${{ env.s3_bucket }}/${branch} --endpoint-url ${{ env.s3_endpoint }}
-
-          # Custom branch
-          else
-            aws s3 cp --recursive "${folder}" s3://${{ env.s3_bucket }}/branches/${branch} --endpoint-url ${{ env.s3_endpoint }}
-          fi
-
       - name: Release
         uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
@@ -206,12 +177,3 @@ jobs:
           files: |
             /tmp/release/*
           make_latest: true
-
-      - name: Generate Python SDK
-        uses: peter-evans/repository-dispatch@v3
-        if: startsWith(github.ref, 'refs/tags/')
-        with:
-          token: ${{ secrets.DISPATCH_PAT }}
-          repository: logos-storage/logos-storage-py-api-client
-          event-type: generate
-          client-payload: '{"openapi_url": "https://raw.githubusercontent.com/logos-storage/logos-storage-nim/${{ github.ref }}/openapi.yaml"}'

.gitmodules

@@ -37,17 +37,22 @@
 	path = vendor/nim-nitro
 	url = https://github.com/status-im/nim-nitro.git
 	ignore = untracked
-	branch = main
+	branch = master
 [submodule "vendor/questionable"]
 	path = vendor/questionable
 	url = https://github.com/status-im/questionable.git
 	ignore = untracked
-	branch = main
+	branch = master
+[submodule "vendor/upraises"]
+	path = vendor/upraises
+	url = https://github.com/markspanbroek/upraises.git
+	ignore = untracked
+	branch = master
 [submodule "vendor/asynctest"]
 	path = vendor/asynctest
 	url = https://github.com/status-im/asynctest.git
 	ignore = untracked
-	branch = main 
+	branch = master
 [submodule "vendor/nim-presto"]
 	path = vendor/nim-presto
 	url = https://github.com/status-im/nim-presto.git
@@ -127,7 +132,7 @@
 	path = vendor/nim-websock
 	url = https://github.com/status-im/nim-websock.git
 	ignore = untracked
-	branch = main
+	branch = master
 [submodule "vendor/nim-contract-abi"]
 	path = vendor/nim-contract-abi
 	url = https://github.com/status-im/nim-contract-abi
@@ -155,13 +160,13 @@
 	path = vendor/nim-taskpools
 	url = https://github.com/status-im/nim-taskpools.git
 	ignore = untracked
-	branch = stable
+	branch = master
 [submodule "vendor/nim-leopard"]
 	path = vendor/nim-leopard
 	url = https://github.com/status-im/nim-leopard.git
-[submodule "vendor/logos-storage-nim-dht"]
+[submodule "vendor/nim-codex-dht"]
-	path = vendor/logos-storage-nim-dht
+	path = vendor/nim-codex-dht
-	url = https://github.com/logos-storage/logos-storage-nim-dht.git
+	url = https://github.com/codex-storage/nim-codex-dht.git
 	ignore = untracked
 	branch = master
 [submodule "vendor/nim-datastore"]
@@ -173,11 +178,9 @@
 [submodule "vendor/nim-eth"]
 	path = vendor/nim-eth
 	url = https://github.com/status-im/nim-eth
-[submodule "vendor/logos-storage-contracts-eth"]
+[submodule "vendor/codex-contracts-eth"]
-	path = vendor/logos-storage-contracts-eth
+	path = vendor/codex-contracts-eth
-	url = https://github.com/logos-storage/logos-storage-contracts-eth.git
+	url = https://github.com/status-im/codex-contracts-eth
-	ignore = untracked
-	branch = master
 [submodule "vendor/nim-protobuf-serialization"]
 	path = vendor/nim-protobuf-serialization
 	url = https://github.com/status-im/nim-protobuf-serialization
@@ -192,41 +195,29 @@
 	url = https://github.com/zevv/npeg
 [submodule "vendor/nim-poseidon2"]
 	path = vendor/nim-poseidon2
-	url = https://github.com/logos-storage/nim-poseidon2.git
+	url = https://github.com/codex-storage/nim-poseidon2.git
-	ignore = untracked
-	branch = master
 [submodule "vendor/constantine"]
 	path = vendor/constantine
 	url = https://github.com/mratsim/constantine.git
 [submodule "vendor/nim-circom-compat"]
 	path = vendor/nim-circom-compat
-	url = https://github.com/logos-storage/nim-circom-compat.git
+	url = https://github.com/codex-storage/nim-circom-compat.git
 	ignore = untracked
 	branch = master
-[submodule "vendor/logos-storage-proofs-circuits"]
+[submodule "vendor/codex-storage-proofs-circuits"]
-	path = vendor/logos-storage-proofs-circuits
+	path = vendor/codex-storage-proofs-circuits
-	url = https://github.com/logos-storage/logos-storage-proofs-circuits.git
+	url = https://github.com/codex-storage/codex-storage-proofs-circuits.git
 	ignore = untracked
 	branch = master
 [submodule "vendor/nim-serde"]
 	path = vendor/nim-serde
-	url = https://github.com/logos-storage/nim-serde.git
+	url = https://github.com/codex-storage/nim-serde.git
 [submodule "vendor/nim-leveldbstatic"]
 	path = vendor/nim-leveldbstatic
-	url = https://github.com/logos-storage/nim-leveldb.git
+	url = https://github.com/codex-storage/nim-leveldb.git
 [submodule "vendor/nim-zippy"]
 	path = vendor/nim-zippy
 	url = https://github.com/status-im/nim-zippy.git
 [submodule "vendor/nph"]
 	path = vendor/nph
 	url = https://github.com/arnetheduck/nph.git
-[submodule "vendor/nim-quic"]
-	path = vendor/nim-quic
-	url = https://github.com/vacp2p/nim-quic.git
-	ignore = untracked
-	branch = main
-[submodule "vendor/nim-ngtcp2"]
-	path = vendor/nim-ngtcp2
-	url = https://github.com/vacp2p/nim-ngtcp2.git
-	ignore = untracked
-	branch = main

Jenkinsfile

@@ -25,7 +25,7 @@ pipeline {
     stage('Check') {
       steps {
         script {
-          sh './result/bin/storage --version'
+          sh './result/bin/codex --version'
         }
       }
     }

Makefile

@@ -15,7 +15,8 @@
 #
 # If NIM_COMMIT is set to "nimbusbuild", this will use the
 # version pinned by nimbus-build-system.
-PINNED_NIM_VERSION := v2.2.4
+#PINNED_NIM_VERSION := 38640664088251bbc88917b4bacfd86ec53014b8 # 1.6.21
+PINNED_NIM_VERSION := v2.0.14
 
 ifeq ($(NIM_COMMIT),)
 NIM_COMMIT := $(PINNED_NIM_VERSION)
@@ -93,10 +94,10 @@ else # "variables.mk" was included. Business as usual until the end of this file
 
 # default target, because it's the first one that doesn't start with '.'
 
-# Builds the Logos Storage binary
+# Builds the codex binary
 all: | build deps
 	echo -e $(BUILD_MSG) "build/$@" && \
-		$(ENV_SCRIPT) nim storage $(NIM_PARAMS) build.nims
+		$(ENV_SCRIPT) nim codex $(NIM_PARAMS) build.nims
 
 # Build tools/cirdl
 cirdl: | deps
@@ -138,12 +139,12 @@ test: | build deps
 # Builds and runs the smart contract tests
 testContracts: | build deps
 	echo -e $(BUILD_MSG) "build/$@" && \
-		$(ENV_SCRIPT) nim testContracts $(NIM_PARAMS) --define:ws_resubscribe=240 build.nims
+		$(ENV_SCRIPT) nim testContracts $(NIM_PARAMS) build.nims
 
 # Builds and runs the integration tests
 testIntegration: | build deps
 	echo -e $(BUILD_MSG) "build/$@" && \
-		$(ENV_SCRIPT) nim testIntegration $(NIM_PARAMS) --define:ws_resubscribe=240 build.nims
+		$(ENV_SCRIPT) nim testIntegration $(NIM_PARAMS) build.nims
 
 # Builds and runs all tests (except for Taiko L2 tests)
 testAll: | build deps
@@ -178,11 +179,11 @@ coverage:
 	$(MAKE) NIMFLAGS="$(NIMFLAGS) --lineDir:on --passC:-fprofile-arcs --passC:-ftest-coverage --passL:-fprofile-arcs --passL:-ftest-coverage" test
 	cd nimcache/release/testCodex && rm -f *.c
 	mkdir -p coverage
-	lcov --capture --keep-going --directory nimcache/release/testCodex --output-file coverage/coverage.info
+	lcov --capture --directory nimcache/release/testCodex --output-file coverage/coverage.info
 	shopt -s globstar && ls $$(pwd)/codex/{*,**/*}.nim
-	shopt -s globstar && lcov --extract coverage/coverage.info --keep-going $$(pwd)/codex/{*,**/*}.nim --output-file coverage/coverage.f.info
+	shopt -s globstar && lcov --extract coverage/coverage.info $$(pwd)/codex/{*,**/*}.nim --output-file coverage/coverage.f.info
 	echo -e $(BUILD_MSG) "coverage/report/index.html"
-	genhtml coverage/coverage.f.info --keep-going --output-directory coverage/report
+	genhtml coverage/coverage.f.info --output-directory coverage/report
 
 show-coverage:
 	if which open >/dev/null; then (echo -e "\e[92mOpening\e[39m HTML coverage report in browser..." && open coverage/report/index.html) || true; fi
@@ -232,7 +233,6 @@ format:
 	$(NPH) *.nim
 	$(NPH) codex/
 	$(NPH) tests/
-	$(NPH) library/
 
 clean-nph:
 	rm -f $(NPH)
@@ -243,32 +243,4 @@ print-nph-path:
 
 clean: | clean-nph
 
-################
-## C Bindings ##
-################
-.PHONY: libstorage
-
-STATIC ?= 0
-
-ifneq ($(strip $(STORAGE_LIB_PARAMS)),)
-NIM_PARAMS := $(NIM_PARAMS) $(STORAGE_LIB_PARAMS)
-endif
-
-libstorage:
-	$(MAKE) deps
-	rm -f build/libstorage*
-
-ifeq ($(STATIC), 1)
-		echo -e $(BUILD_MSG) "build/$@.a" && \
-		$(ENV_SCRIPT) nim libstorageStatic $(NIM_PARAMS) -d:LeopardCmakeFlags="\"-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release\"" codex.nims
-else ifeq ($(detected_OS),Windows)
-		echo -e $(BUILD_MSG) "build/$@.dll" && \
-		$(ENV_SCRIPT) nim libstorageDynamic $(NIM_PARAMS) -d:LeopardCmakeFlags="\"-G \\\"MSYS Makefiles\\\" -DCMAKE_BUILD_TYPE=Release\"" codex.nims
-else ifeq ($(detected_OS),macOS)
-		echo -e $(BUILD_MSG) "build/$@.dylib" && \
-		$(ENV_SCRIPT) nim libstorageDynamic $(NIM_PARAMS) -d:LeopardCmakeFlags="\"-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release\"" codex.nims
-else
-		echo -e $(BUILD_MSG) "build/$@.so" && \
-		$(ENV_SCRIPT) nim libstorageDynamic $(NIM_PARAMS) -d:LeopardCmakeFlags="\"-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release\"" codex.nims
-endif
 endif # "variables.mk" was not included

README.md

@@ -1,22 +1,22 @@
-# Logos Storage Decentralized Engine
+# Codex Decentralized Durability Engine
 
-> The Logos Storage project aims to create a decentralized engine that allows persisting data in p2p networks.
+> The Codex project aims to create a decentralized durability engine that allows persisting data in p2p networks. In other words, it allows storing files and data with predictable durability guarantees for later retrieval.
 
 > WARNING: This project is under active development and is considered pre-alpha.
 
 [![License: Apache](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 [![Stability: experimental](https://img.shields.io/badge/stability-experimental-orange.svg)](#stability)
-[![CI](https://github.com/logos-storage/logos-storage-nim/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/logos-storage/logos-storage-nim/actions/workflows/ci.yml?query=branch%3Amaster)
+[![CI](https://github.com/codex-storage/nim-codex/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/codex-storage/nim-codex/actions/workflows/ci.yml?query=branch%3Amaster)
-[![Docker](https://github.com/logos-storage/logos-storage-nim/actions/workflows/docker.yml/badge.svg?branch=master)](https://github.com/logos-storage/logos-storage-nim/actions/workflows/docker.yml?query=branch%3Amaster)
+[![Docker](https://github.com/codex-storage/nim-codex/actions/workflows/docker.yml/badge.svg?branch=master)](https://github.com/codex-storage/nim-codex/actions/workflows/docker.yml?query=branch%3Amaster)
-[![Codecov](https://codecov.io/gh/logos-storage/logos-storage-nim/branch/master/graph/badge.svg?token=XFmCyPSNzW)](https://codecov.io/gh/logos-storage/logos-storage-nim)
+[![Codecov](https://codecov.io/gh/codex-storage/nim-codex/branch/master/graph/badge.svg?token=XFmCyPSNzW)](https://codecov.io/gh/codex-storage/nim-codex)
 [![Discord](https://img.shields.io/discord/895609329053474826)](https://discord.gg/CaJTh24ddQ)
 ![Docker Pulls](https://img.shields.io/docker/pulls/codexstorage/nim-codex)
 
 
 ## Build and Run
 
-For detailed instructions on preparing to build logos-storagenim see [*Build Logos Storage*](https://docs.codex.storage/learn/build).
+For detailed instructions on preparing to build nim-codex see [*Build Codex*](https://docs.codex.storage/learn/build).
 
 To build the project, clone it and run:
 
@@ -29,12 +29,12 @@ The executable will be placed under the `build` directory under the project root
 Run the client with:
 
 ```bash
-build/storage
+build/codex
 ```
 
 ## Configuration
 
-It is possible to configure a Logos Storage node in several ways:
+It is possible to configure a Codex node in several ways:
  1. CLI options
  2. Environment variables
  3. Configuration file
@@ -45,72 +45,22 @@ Please check [documentation](https://docs.codex.storage/learn/run#configuration)
 
 ## Guides
 
-To get acquainted with Logos Storage, consider:
+To get acquainted with Codex, consider:
-* running the simple [Logos Storage Two-Client Test](https://docs.codex.storage/learn/local-two-client-test) for a start, and;
+* running the simple [Codex Two-Client Test](https://docs.codex.storage/learn/local-two-client-test) for a start, and;
-* if you are feeling more adventurous, try [Running a Local Logos Storage Network with Marketplace Support](https://docs.codex.storage/learn/local-marketplace) using a local blockchain as well.
+* if you are feeling more adventurous, try [Running a Local Codex Network with Marketplace Support](https://docs.codex.storage/learn/local-marketplace) using a local blockchain as well.
 
 ## API
 
 The client exposes a REST API that can be used to interact with the clients. Overview of the API can be found on [api.codex.storage](https://api.codex.storage).
 
-## Bindings
-
-Logos Storage provides a C API that can be wrapped by other languages. The bindings is located in the `library` folder.
-Currently, only a Go binding is included.
-
-### Build the C library
-
-```bash
-make libstorage
-```
-
-This produces the shared library under `build/`.
-
-### Run the Go example
-
-Build the Go example:
-
-```bash
-go build -o storage-go examples/golang/storage.go
-```
-
-Export the library path:
-
-```bash
-export LD_LIBRARY_PATH=build
-```
-
-Run the example:
-
-```bash
-./storage-go
-```
-
-### Static vs Dynamic build
-
-By default, Logos Storage builds a dynamic library (`libstorage.so`), which you can load at runtime.
-If you prefer a static library (`libstorage.a`), set the `STATIC` flag:
-
-```bash
-# Build dynamic (default)
-make libstorage
-
-# Build static
-make STATIC=1 libstorage
-```
-
-### Limitation
-
-Callbacks must be fast and non-blocking; otherwise, the working thread will hang and prevent other requests from being processed.
-
 ## Contributing and development
 
 Feel free to dive in, contributions are welcomed! Open an issue or submit PRs.
 
 ### Linting and formatting
 
-`logos-storage-nim` uses [nph](https://github.com/arnetheduck/nph) for formatting our code and it is required to adhere to its styling.
+`nim-codex` uses [nph](https://github.com/arnetheduck/nph) for formatting our code and it is requrired to adhere to its styling.
 If you are setting up fresh setup, in order to get `nph` run `make build-nph`.
 In order to format files run `make nph/<file/folder you want to format>`. 
-If you want you can install Git pre-commit hook using `make install-nph-commit`, which will format modified files prior committing them. 
+If you want you can install Git pre-commit hook using `make install-nph-commit`, which will format modified files prior commiting them. 
 If you are using VSCode and the [NimLang](https://marketplace.visualstudio.com/items?itemName=NimLang.nimlang) extension you can enable "Format On Save" (eq. the `nim.formatOnSave` property) that will format the files using `nph`.

benchmarks/README.md

@@ -10,17 +10,17 @@ nim c -r run_benchmarks
 ```
 
 By default all circuit files for each combinations of circuit args will be generated in a unique folder named like:
-    logos-storage-nim/benchmarks/circuit_bench_depth32_maxslots256_cellsize2048_blocksize65536_nsamples9_entropy1234567_seed12345_nslots11_ncells512_index3
+    nim-codex/benchmarks/circuit_bench_depth32_maxslots256_cellsize2048_blocksize65536_nsamples9_entropy1234567_seed12345_nslots11_ncells512_index3
 
 Generating the circuit files often takes longer than running benchmarks, so caching the results allows re-running the benchmark as needed.
 
 You can modify the `CircuitArgs` and `CircuitEnv` objects in `runAllBenchMarks` to suite your needs. See `create_circuits.nim` for their definition.
 
-The runner executes all commands relative to the `logos-storage-nim` repo. This simplifies finding the correct circuit includes paths, etc. `CircuitEnv` sets all of this.
+The runner executes all commands relative to the `nim-codex` repo. This simplifies finding the correct circuit includes paths, etc. `CircuitEnv` sets all of this.
 
-## Logos Storage Ark Circom CLI
+## Codex Ark Circom CLI
 
-Runs Logos Storage's prover setup with Ark / Circom.
+Runs Codex's prover setup with Ark / Circom.
 
 Compile:
 ```sh

benchmarks/create_circuits.nim

@@ -29,10 +29,10 @@ proc findCodexProjectDir(): string =
 func default*(tp: typedesc[CircuitEnv]): CircuitEnv =
   let codexDir = findCodexProjectDir()
   result.nimCircuitCli =
-    codexDir / "vendor" / "logos-storage-proofs-circuits" / "reference" / "nim" /
+    codexDir / "vendor" / "codex-storage-proofs-circuits" / "reference" / "nim" /
     "proof_input" / "cli"
   result.circuitDirIncludes =
-    codexDir / "vendor" / "logos-storage-proofs-circuits" / "circuit"
+    codexDir / "vendor" / "codex-storage-proofs-circuits" / "circuit"
   result.ptauPath =
     codexDir / "benchmarks" / "ceremony" / "powersOfTau28_hez_final_23.ptau"
   result.ptauUrl = "https://storage.googleapis.com/zkevm/ptau".parseUri
@@ -118,7 +118,7 @@ proc createCircuit*(
   ## 
   ## All needed circuit files will be generated as needed. 
   ## They will be located in `circBenchDir` which defaults to a folder like:
-  ##    `logos-storage-nim/benchmarks/circuit_bench_depth32_maxslots256_cellsize2048_blocksize65536_nsamples9_entropy1234567_seed12345_nslots11_ncells512_index3`
+  ##    `nim-codex/benchmarks/circuit_bench_depth32_maxslots256_cellsize2048_blocksize65536_nsamples9_entropy1234567_seed12345_nslots11_ncells512_index3`
   ## with all the given CircuitArgs.
   ## 
   let circdir = circBenchDir

benchmarks/utils.nim

@@ -41,7 +41,7 @@ template benchmark*(name: untyped, count: int, blk: untyped) =
   )
   benchRuns[benchmarkName] = (runs.avg(), count)
 
-template printBenchMarkSummaries*(printRegular = true, printTsv = true) =
+template printBenchMarkSummaries*(printRegular=true, printTsv=true) =
   if printRegular:
     echo ""
     for k, v in benchRuns:
@@ -53,6 +53,7 @@ template printBenchMarkSummaries*(printRegular = true, printTsv = true) =
     for k, v in benchRuns:
       echo k, "\t", v.avgTimeSec, "\t", v.count
 
+
 import std/math
 
 func floorLog2*(x: int): int =

build.nims

@@ -3,7 +3,7 @@ mode = ScriptMode.Verbose
 import std/os except commandLineParams
 
 ### Helper functions
-proc buildBinary(srcName: string, outName = os.lastPathPart(srcName),  srcDir = "./", params = "", lang = "c") =
+proc buildBinary(name: string, srcDir = "./", params = "", lang = "c") =
   if not dirExists "build":
     mkDir "build"
 
@@ -18,82 +18,57 @@ proc buildBinary(srcName: string, outName = os.lastPathPart(srcName),  srcDir =
 
   let
     # Place build output in 'build' folder, even if name includes a longer path.
+    outName = os.lastPathPart(name)
     cmd =
       "nim " & lang & " --out:build/" & outName & " " & extra_params & " " & srcDir &
-      srcName & ".nim"
+      name & ".nim"
 
   exec(cmd)
 
-proc buildLibrary(name: string, srcDir = "./", params = "", `type` = "dynamic") =
+proc test(name: string, srcDir = "tests/", params = "", lang = "c") =
-  if not dirExists "build":
+  buildBinary name, srcDir, params
-    mkDir "build"
+  exec "build/" & name
 
-  if `type` == "dynamic":
+task codex, "build codex binary":
-    let lib_name = (
-      when defined(windows): name & ".dll"
-      elif defined(macosx): name & ".dylib"
-      else: name & ".so"
-    )
-    exec "nim c" & " --out:build/" & lib_name &
-      " --threads:on --app:lib --opt:size --noMain --mm:refc --header --d:metrics " &
-      "--nimMainPrefix:libstorage -d:noSignalHandler " &
-      "-d:LeopardExtraCompilerFlags=-fPIC " & "-d:chronicles_runtime_filtering " &
-      "-d:chronicles_log_level=TRACE " & params & " " & srcDir & name & ".nim"
-  else:
-    exec "nim c" & " --out:build/" & name &
-      ".a --threads:on --app:staticlib --opt:size --noMain --mm:refc --header --d:metrics " &
-      "--nimMainPrefix:libstorage -d:noSignalHandler " &
-      "-d:LeopardExtraCompilerFlags=-fPIC " &
-      "-d:chronicles_runtime_filtering " &
-      "-d:chronicles_log_level=TRACE " &
-      params & " " & srcDir & name & ".nim"
-
-proc test(name: string, outName = name, srcDir = "tests/", params = "", lang = "c") =
-  buildBinary name, outName, srcDir, params
-  exec "build/" & outName
-
-task storage, "build logos storage binary":
   buildBinary "codex",
-    outname = "storage",
     params = "-d:chronicles_runtime_filtering -d:chronicles_log_level=TRACE"
 
 task toolsCirdl, "build tools/cirdl binary":
   buildBinary "tools/cirdl/cirdl"
 
-task testStorage, "Build & run Logos Storage tests":
+task testCodex, "Build & run Codex tests":
-  test "testCodex", outName = "testStorage", params = "-d:storage_enable_proof_failures=true"
+  test "testCodex", params = "-d:codex_enable_proof_failures=true"
 
-task testContracts, "Build & run Logos Storage Contract tests":
+task testContracts, "Build & run Codex Contract tests":
   test "testContracts"
 
 task testIntegration, "Run integration tests":
   buildBinary "codex",
-    outName = "storage",
     params =
-      "-d:chronicles_runtime_filtering -d:chronicles_log_level=TRACE -d:storage_enable_proof_failures=true"
+      "-d:chronicles_runtime_filtering -d:chronicles_log_level=TRACE -d:codex_enable_proof_failures=true"
   test "testIntegration"
   # use params to enable logging from the integration test executable
   # test "testIntegration", params = "-d:chronicles_sinks=textlines[notimestamps,stdout],textlines[dynamic] " &
   #   "-d:chronicles_enabled_topics:integration:TRACE"  
 
-task build, "build Logos Storage binary":
+task build, "build codex binary":
-  storageTask()
+  codexTask()
 
 task test, "Run tests":
-  testStorageTask()
+  testCodexTask()
 
 task testTools, "Run Tools tests":
   toolsCirdlTask()
   test "testTools"
 
 task testAll, "Run all tests (except for Taiko L2 tests)":
-  testStorageTask()
+  testCodexTask()
   testContractsTask()
   testIntegrationTask()
   testToolsTask()
 
 task testTaiko, "Run Taiko L2 tests":
-  storageTask()
+  codexTask()
   test "testTaiko"
 
 import strutils
@@ -126,43 +101,23 @@ task coverage, "generates code coverage report":
   test "coverage",
     srcDir = "tests/",
     params =
-      " --nimcache:nimcache/coverage -d:release -d:storage_enable_proof_failures=true"
+      " --nimcache:nimcache/coverage -d:release -d:codex_enable_proof_failures=true"
   exec("rm nimcache/coverage/*.c")
   rmDir("coverage")
   mkDir("coverage")
   echo " ======== Running LCOV ======== "
   exec(
-    "lcov --capture --keep-going --directory nimcache/coverage --output-file coverage/coverage.info"
+    "lcov --capture --directory nimcache/coverage --output-file coverage/coverage.info"
   )
   exec(
-    "lcov --extract coverage/coverage.info --keep-going --output-file coverage/coverage.f.info " &
+    "lcov --extract coverage/coverage.info --output-file coverage/coverage.f.info " &
       nimSrcs
   )
   echo " ======== Generating HTML coverage report ======== "
-  exec("genhtml coverage/coverage.f.info --keep-going --output-directory coverage/report ")
+  exec("genhtml coverage/coverage.f.info --output-directory coverage/report ")
   echo " ======== Coverage report Done ======== "
 
 task showCoverage, "open coverage html":
   echo " ======== Opening HTML coverage report in browser... ======== "
   if findExe("open") != "":
     exec("open coverage/report/index.html")
-
-task libstorageDynamic, "Generate bindings":
-  var params = ""
-  when compiles(commandLineParams):
-    for param in commandLineParams():
-      if param.len > 0 and param.startsWith("-"):
-        params.add " " & param
-
-  let name = "libstorage"
-  buildLibrary name, "library/", params, "dynamic"
-
-task libstorageStatic, "Generate bindings":
-  var params = ""
-  when compiles(commandLineParams):
-    for param in commandLineParams():
-      if param.len > 0 and param.startsWith("-"):
-        params.add " " & param
-
-  let name = "libstorage"
-  buildLibrary name, "library/", params, "static"

codex.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -45,7 +45,7 @@ when isMainModule:
 
   let config = CodexConf.load(
     version = codexFullVersion,
-    envVarsPrefix = "storage",
+    envVarsPrefix = "codex",
     secondarySources = proc(
         config: CodexConf, sources: auto
     ) {.gcsafe, raises: [ConfigurationError].} =
@@ -54,16 +54,6 @@ when isMainModule:
     ,
   )
   config.setupLogging()
-
-  try:
-    updateLogLevel(config.logLevel)
-  except ValueError as err:
-    try:
-      stderr.write "Invalid value for --log-level. " & err.msg & "\n"
-    except IOError:
-      echo "Invalid value for --log-level. " & err.msg
-    quit QuitFailure
-
   config.setupMetrics()
 
   if not (checkAndCreateDataDir((config.dataDir).string)):
@@ -99,15 +89,15 @@ when isMainModule:
       try:
         CodexServer.new(config, privateKey)
       except Exception as exc:
-        error "Failed to start Logos Storage", msg = exc.msg
+        error "Failed to start Codex", msg = exc.msg
         quit QuitFailure
 
   ## Ctrl+C handling
   proc doShutdown() =
-    shutdown = server.shutdown()
+    shutdown = server.stop()
     state = CodexStatus.Stopping
 
-    notice "Stopping Logos Storage"
+    notice "Stopping Codex"
 
   proc controlCHandler() {.noconv.} =
     when defined(windows):
@@ -138,7 +128,7 @@ when isMainModule:
   try:
     waitFor server.start()
   except CatchableError as error:
-    error "Logos Storage failed to start", error = error.msg
+    error "Codex failed to start", error = error.msg
     # XXX ideally we'd like to issue a stop instead of quitting cold turkey,
     #   but this would mean we'd have to fix the implementation of all
     #   services so they won't crash if we attempt to stop them before they
@@ -159,7 +149,7 @@ when isMainModule:
     # be assigned before state switches to Stopping
     waitFor shutdown
   except CatchableError as error:
-    error "Logos Storage didn't shutdown correctly", error = error.msg
+    error "Codex didn't shutdown correctly", error = error.msg
     quit QuitFailure
 
-  notice "Exited Storage"
+  notice "Exited codex"

codex.nimble

@@ -1,5 +1,5 @@
 version = "0.1.0"
-author = "Logos Storage Team"
+author = "Codex Team"
 description = "p2p data durability engine"
 license = "MIT"
 binDir = "build"

codex/blockexchange/engine/advertiser.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2022 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -7,8 +7,6 @@
 ## This file may not be copied, modified, or distributed except according to
 ## those terms.
 
-{.push raises: [].}
-
 import pkg/chronos
 import pkg/libp2p/cid
 import pkg/libp2p/multicodec
@@ -43,109 +41,106 @@ type Advertiser* = ref object of RootObj
   advertiserRunning*: bool # Indicates if discovery is running
   concurrentAdvReqs: int # Concurrent advertise requests
 
-  advertiseLocalStoreLoop*: Future[void].Raising([]) # Advertise loop task handle
+  advertiseLocalStoreLoop*: Future[void] # Advertise loop task handle
   advertiseQueue*: AsyncQueue[Cid] # Advertise queue
   trackedFutures*: TrackedFutures # Advertise tasks futures
 
   advertiseLocalStoreLoopSleep: Duration # Advertise loop sleep
   inFlightAdvReqs*: Table[Cid, Future[void]] # Inflight advertise requests
 
-proc addCidToQueue(b: Advertiser, cid: Cid) {.async: (raises: [CancelledError]).} =
+proc addCidToQueue(b: Advertiser, cid: Cid) {.async.} =
   if cid notin b.advertiseQueue:
     await b.advertiseQueue.put(cid)
-
     trace "Advertising", cid
 
-proc advertiseBlock(b: Advertiser, cid: Cid) {.async: (raises: [CancelledError]).} =
+proc advertiseBlock(b: Advertiser, cid: Cid) {.async.} =
   without isM =? cid.isManifest, err:
     warn "Unable to determine if cid is manifest"
     return
 
-  try:
+  if isM:
-    if isM:
+    without blk =? await b.localStore.getBlock(cid), err:
-      without blk =? await b.localStore.getBlock(cid), err:
+      error "Error retrieving manifest block", cid, err = err.msg
-        error "Error retrieving manifest block", cid, err = err.msg
+      return
-        return
 
-      without manifest =? Manifest.decode(blk), err:
+    without manifest =? Manifest.decode(blk), err:
-        error "Unable to decode as manifest", err = err.msg
+      error "Unable to decode as manifest", err = err.msg
-        return
+      return
 
-      # announce manifest cid and tree cid
+    # announce manifest cid and tree cid
-      await b.addCidToQueue(cid)
+    await b.addCidToQueue(cid)
-      await b.addCidToQueue(manifest.treeCid)
+    await b.addCidToQueue(manifest.treeCid)
-  except CancelledError as exc:
-    trace "Cancelled advertise block", cid
-    raise exc
-  except CatchableError as e:
-    error "failed to advertise block", cid, error = e.msgDetail
 
 proc advertiseLocalStoreLoop(b: Advertiser) {.async: (raises: []).} =
-  try:
+  while b.advertiserRunning:
-    while b.advertiserRunning:
+    try:
-      if cidsIter =? await b.localStore.listBlocks(blockType = BlockType.Manifest):
+      if cids =? await b.localStore.listBlocks(blockType = BlockType.Manifest):
         trace "Advertiser begins iterating blocks..."
-        for c in cidsIter:
+        for c in cids:
           if cid =? await c:
             await b.advertiseBlock(cid)
         trace "Advertiser iterating blocks finished."
 
       await sleepAsync(b.advertiseLocalStoreLoopSleep)
-  except CancelledError:
+    except CancelledError:
-    warn "Cancelled advertise local store loop"
+      break # do not propagate as advertiseLocalStoreLoop was asyncSpawned
+    except CatchableError as e:
+      error "failed to advertise blocks in local store", error = e.msgDetail
 
   info "Exiting advertise task loop"
 
 proc processQueueLoop(b: Advertiser) {.async: (raises: []).} =
-  try:
+  while b.advertiserRunning:
-    while b.advertiserRunning:
+    try:
       let cid = await b.advertiseQueue.get()
 
       if cid in b.inFlightAdvReqs:
         continue
 
-      let request = b.discovery.provide(cid)
+      try:
-      b.inFlightAdvReqs[cid] = request
+        let request = b.discovery.provide(cid)
-      codex_inflight_advertise.set(b.inFlightAdvReqs.len.int64)
 
-      defer:
+        b.inFlightAdvReqs[cid] = request
+        codex_inflight_advertise.set(b.inFlightAdvReqs.len.int64)
+        await request
+      finally:
         b.inFlightAdvReqs.del(cid)
         codex_inflight_advertise.set(b.inFlightAdvReqs.len.int64)
-
+    except CancelledError:
-      await request
+      trace "Advertise task cancelled"
-  except CancelledError:
+      return
-    warn "Cancelled advertise task runner"
+    except CatchableError as exc:
+      warn "Exception in advertise task runner", exc = exc.msg
 
   info "Exiting advertise task runner"
 
-proc start*(b: Advertiser) {.async: (raises: []).} =
+proc start*(b: Advertiser) {.async.} =
   ## Start the advertiser
   ##
 
   trace "Advertiser start"
 
-  # The advertiser is expected to be started only once.
+  proc onBlock(cid: Cid) {.async.} =
-  if b.advertiserRunning:
+    await b.advertiseBlock(cid)
-    raiseAssert "Advertiser can only be started once — this should not happen"
-
-  proc onBlock(cid: Cid) {.async: (raises: []).} =
-    try:
-      await b.advertiseBlock(cid)
-    except CancelledError:
-      trace "Cancelled advertise block", cid
 
   doAssert(b.localStore.onBlockStored.isNone())
   b.localStore.onBlockStored = onBlock.some
 
+  if b.advertiserRunning:
+    warn "Starting advertiser twice"
+    return
+
   b.advertiserRunning = true
   for i in 0 ..< b.concurrentAdvReqs:
     let fut = b.processQueueLoop()
     b.trackedFutures.track(fut)
+    asyncSpawn fut
 
   b.advertiseLocalStoreLoop = advertiseLocalStoreLoop(b)
   b.trackedFutures.track(b.advertiseLocalStoreLoop)
+  asyncSpawn b.advertiseLocalStoreLoop
 
-proc stop*(b: Advertiser) {.async: (raises: []).} =
+proc stop*(b: Advertiser) {.async.} =
   ## Stop the advertiser
   ##
 

codex/blockexchange/engine/discovery.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2022 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -8,7 +8,6 @@
 ## those terms.
 
 import std/sequtils
-import std/algorithm
 
 import pkg/chronos
 import pkg/libp2p/cid
@@ -39,7 +38,6 @@ const
   DefaultConcurrentDiscRequests = 10
   DefaultDiscoveryTimeout = 1.minutes
   DefaultMinPeersPerBlock = 3
-  DefaultMaxPeersPerBlock = 8
   DefaultDiscoveryLoopSleep = 3.seconds
 
 type DiscoveryEngine* = ref object of RootObj
@@ -50,90 +48,77 @@ type DiscoveryEngine* = ref object of RootObj
   pendingBlocks*: PendingBlocksManager # Blocks we're awaiting to be resolved
   discEngineRunning*: bool # Indicates if discovery is running
   concurrentDiscReqs: int # Concurrent discovery requests
-  discoveryLoop*: Future[void].Raising([]) # Discovery loop task handle
+  discoveryLoop*: Future[void] # Discovery loop task handle
   discoveryQueue*: AsyncQueue[Cid] # Discovery queue
   trackedFutures*: TrackedFutures # Tracked Discovery tasks futures
-  minPeersPerBlock*: int # Min number of peers with block
+  minPeersPerBlock*: int # Max number of peers with block
-  maxPeersPerBlock*: int # Max number of peers with block
   discoveryLoopSleep: Duration # Discovery loop sleep
   inFlightDiscReqs*: Table[Cid, Future[seq[SignedPeerRecord]]]
     # Inflight discovery requests
 
-proc cleanupExcessPeers(b: DiscoveryEngine, cid: Cid) {.gcsafe, raises: [].} =
-  var haves = b.peers.peersHave(cid)
-  let count = haves.len - b.maxPeersPerBlock
-  if count <= 0:
-    return
-
-  haves.sort(
-    proc(a, b: BlockExcPeerCtx): int =
-      cmp(a.lastExchange, b.lastExchange)
-  )
-
-  let toRemove = haves[0 ..< count]
-  for peer in toRemove:
-    try:
-      peer.cleanPresence(BlockAddress.init(cid))
-      trace "Removed block presence from peer", cid, peer = peer.id
-    except CatchableError as exc:
-      error "Failed to clean presence for peer",
-        cid, peer = peer.id, error = exc.msg, name = exc.name
-
 proc discoveryQueueLoop(b: DiscoveryEngine) {.async: (raises: []).} =
-  try:
+  while b.discEngineRunning:
-    while b.discEngineRunning:
+    for cid in toSeq(b.pendingBlocks.wantListBlockCids):
-      for cid in toSeq(b.pendingBlocks.wantListBlockCids):
+      try:
         await b.discoveryQueue.put(cid)
+      except CancelledError:
+        trace "Discovery loop cancelled"
+        return
+      except CatchableError as exc:
+        warn "Exception in discovery loop", exc = exc.msg
 
+    try:
+      logScope:
+        sleep = b.discoveryLoopSleep
+        wanted = b.pendingBlocks.len
       await sleepAsync(b.discoveryLoopSleep)
-  except CancelledError:
+    except CancelledError:
-    trace "Discovery loop cancelled"
+      discard # do not propagate as discoveryQueueLoop was asyncSpawned
 
 proc discoveryTaskLoop(b: DiscoveryEngine) {.async: (raises: []).} =
   ## Run discovery tasks
   ##
 
-  try:
+  while b.discEngineRunning:
-    while b.discEngineRunning:
+    try:
       let cid = await b.discoveryQueue.get()
 
       if cid in b.inFlightDiscReqs:
         trace "Discovery request already in progress", cid
         continue
 
-      trace "Running discovery task for cid", cid
-
       let haves = b.peers.peersHave(cid)
 
-      if haves.len > b.maxPeersPerBlock:
-        trace "Cleaning up excess peers",
-          cid, peers = haves.len, max = b.maxPeersPerBlock
-        b.cleanupExcessPeers(cid)
-        continue
-
       if haves.len < b.minPeersPerBlock:
-        let request = b.discovery.find(cid)
+        try:
-        b.inFlightDiscReqs[cid] = request
+          let request = b.discovery.find(cid).wait(DefaultDiscoveryTimeout)
-        codex_inflight_discovery.set(b.inFlightDiscReqs.len.int64)
 
-        defer:
+          b.inFlightDiscReqs[cid] = request
-          b.inFlightDiscReqs.del(cid)
           codex_inflight_discovery.set(b.inFlightDiscReqs.len.int64)
+          let peers = await request
 
-        if (await request.withTimeout(DefaultDiscoveryTimeout)) and
-            peers =? (await request).catch:
           let dialed = await allFinished(peers.mapIt(b.network.dialPeer(it.data)))
 
           for i, f in dialed:
             if f.failed:
               await b.discovery.removeProvider(peers[i].data.peerId)
-  except CancelledError:
+        finally:
-    trace "Discovery task cancelled"
+          b.inFlightDiscReqs.del(cid)
-    return
+          codex_inflight_discovery.set(b.inFlightDiscReqs.len.int64)
+    except CancelledError:
+      trace "Discovery task cancelled"
+      return
+    except CatchableError as exc:
+      warn "Exception in discovery task runner", exc = exc.msg
+    except Exception as e:
+      # Raised by b.discovery.removeProvider somehow...
+      # This should not be catchable, and we should never get here. Therefore,
+      # raise a Defect.
+      raiseAssert "Exception when removing provider"
 
   info "Exiting discovery task runner"
 
-proc queueFindBlocksReq*(b: DiscoveryEngine, cids: seq[Cid]) =
+proc queueFindBlocksReq*(b: DiscoveryEngine, cids: seq[Cid]) {.inline.} =
   for cid in cids:
     if cid notin b.discoveryQueue:
       try:
@@ -141,11 +126,11 @@ proc queueFindBlocksReq*(b: DiscoveryEngine, cids: seq[Cid]) =
       except CatchableError as exc:
         warn "Exception queueing discovery request", exc = exc.msg
 
-proc start*(b: DiscoveryEngine) {.async: (raises: []).} =
+proc start*(b: DiscoveryEngine) {.async.} =
   ## Start the discengine task
   ##
 
-  trace "Discovery engine starting"
+  trace "Discovery engine start"
 
   if b.discEngineRunning:
     warn "Starting discovery engine twice"
@@ -155,13 +140,12 @@ proc start*(b: DiscoveryEngine) {.async: (raises: []).} =
   for i in 0 ..< b.concurrentDiscReqs:
     let fut = b.discoveryTaskLoop()
     b.trackedFutures.track(fut)
+    asyncSpawn fut
 
   b.discoveryLoop = b.discoveryQueueLoop()
   b.trackedFutures.track(b.discoveryLoop)
 
-  trace "Discovery engine started"
+proc stop*(b: DiscoveryEngine) {.async.} =
-
-proc stop*(b: DiscoveryEngine) {.async: (raises: []).} =
   ## Stop the discovery engine
   ##
 
@@ -187,7 +171,6 @@ proc new*(
     concurrentDiscReqs = DefaultConcurrentDiscRequests,
     discoveryLoopSleep = DefaultDiscoveryLoopSleep,
     minPeersPerBlock = DefaultMinPeersPerBlock,
-    maxPeersPerBlock = DefaultMaxPeersPerBlock,
 ): DiscoveryEngine =
   ## Create a discovery engine instance for advertising services
   ##
@@ -203,5 +186,4 @@ proc new*(
     inFlightDiscReqs: initTable[Cid, Future[seq[SignedPeerRecord]]](),
     discoveryLoopSleep: discoveryLoopSleep,
     minPeersPerBlock: minPeersPerBlock,
-    maxPeersPerBlock: maxPeersPerBlock,
   )

codex/blockexchange/engine/payments.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -7,8 +7,6 @@
 ## This file may not be copied, modified, or distributed except according to
 ## those terms.
 
-{.push raises: [].}
-
 import std/math
 import pkg/nitro
 import pkg/questionable/results
@@ -17,6 +15,9 @@ import ../peers
 export nitro
 export results
 
+push:
+  {.upraises: [].}
+
 const ChainId* = 0.u256 # invalid chain id for now
 const Asset* = EthAddress.zero # invalid ERC20 asset address for now
 const AmountPerChannel = (10'u64 ^ 18).u256 # 1 asset, ERC20 default is 18 decimals

codex/blockexchange/engine/pendingblocks.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -34,7 +34,7 @@ declareGauge(
 
 const
   DefaultBlockRetries* = 3000
-  DefaultRetryInterval* = 2.seconds
+  DefaultRetryInterval* = 500.millis
 
 type
   RetriesExhaustedError* = object of CatchableError
@@ -42,7 +42,7 @@ type
 
   BlockReq* = object
     handle*: BlockHandle
-    requested*: ?PeerId
+    inFlight*: bool
     blockRetries*: int
     startTime*: int64
 
@@ -50,13 +50,12 @@ type
     blockRetries*: int = DefaultBlockRetries
     retryInterval*: Duration = DefaultRetryInterval
     blocks*: Table[BlockAddress, BlockReq] # pending Block requests
-    lastInclusion*: Moment # time at which we last included a block into our wantlist
 
 proc updatePendingBlockGauge(p: PendingBlocksManager) =
   codex_block_exchange_pending_block_requests.set(p.blocks.len.int64)
 
 proc getWantHandle*(
-    self: PendingBlocksManager, address: BlockAddress, requested: ?PeerId = PeerId.none
+    self: PendingBlocksManager, address: BlockAddress, inFlight = false
 ): Future[Block] {.async: (raw: true, raises: [CancelledError, RetriesExhaustedError]).} =
   ## Add an event for a block
   ##
@@ -66,13 +65,11 @@ proc getWantHandle*(
   do:
     let blk = BlockReq(
       handle: newFuture[Block]("pendingBlocks.getWantHandle"),
-      requested: requested,
+      inFlight: inFlight,
       blockRetries: self.blockRetries,
       startTime: getMonoTime().ticks,
     )
     self.blocks[address] = blk
-    self.lastInclusion = Moment.now()
-
     let handle = blk.handle
 
     proc cleanUpBlock(data: pointer) {.raises: [].} =
@@ -89,22 +86,9 @@ proc getWantHandle*(
     return handle
 
 proc getWantHandle*(
-    self: PendingBlocksManager, cid: Cid, requested: ?PeerId = PeerId.none
+    self: PendingBlocksManager, cid: Cid, inFlight = false
 ): Future[Block] {.async: (raw: true, raises: [CancelledError, RetriesExhaustedError]).} =
-  self.getWantHandle(BlockAddress.init(cid), requested)
+  self.getWantHandle(BlockAddress.init(cid), inFlight)
-
-proc completeWantHandle*(
-    self: PendingBlocksManager, address: BlockAddress, blk: Block
-) {.raises: [].} =
-  ## Complete a pending want handle
-  self.blocks.withValue(address, blockReq):
-    if not blockReq[].handle.finished:
-      trace "Completing want handle from provided block", address
-      blockReq[].handle.complete(blk)
-    else:
-      trace "Want handle already completed", address
-  do:
-    trace "No pending want handle found for address", address
 
 proc resolve*(
     self: PendingBlocksManager, blocksDelivery: seq[BlockDelivery]
@@ -124,6 +108,9 @@ proc resolve*(
         blockReq.handle.complete(bd.blk)
 
         codex_block_exchange_retrieval_time_us.set(retrievalDurationUs)
+
+        if retrievalDurationUs > 500000:
+          warn "High block retrieval time", retrievalDurationUs, address = bd.address
       else:
         trace "Block handle already finished", address = bd.address
 
@@ -141,40 +128,19 @@ func retriesExhausted*(self: PendingBlocksManager, address: BlockAddress): bool
   self.blocks.withValue(address, pending):
     result = pending[].blockRetries <= 0
 
-func isRequested*(self: PendingBlocksManager, address: BlockAddress): bool =
+func setInFlight*(self: PendingBlocksManager, address: BlockAddress, inFlight = true) =
-  ## Check if a block has been requested to a peer
+  ## Set inflight status for a block
-  ##
-  result = false
-  self.blocks.withValue(address, pending):
-    result = pending[].requested.isSome
-
-func getRequestPeer*(self: PendingBlocksManager, address: BlockAddress): ?PeerId =
-  ## Returns the peer that requested this block
-  ##
-  result = PeerId.none
-  self.blocks.withValue(address, pending):
-    result = pending[].requested
-
-proc markRequested*(
-    self: PendingBlocksManager, address: BlockAddress, peer: PeerId
-): bool =
-  ## Marks this block as having been requested to a peer
   ##
 
-  if self.isRequested(address):
+  self.blocks.withValue(address, pending):
-    return false
+    pending[].inFlight = inFlight
+
+func isInFlight*(self: PendingBlocksManager, address: BlockAddress): bool =
+  ## Check if a block is in flight
+  ##
 
   self.blocks.withValue(address, pending):
-    pending[].requested = peer.some
+    result = pending[].inFlight
-  return true
-
-proc clearRequest*(
-    self: PendingBlocksManager, address: BlockAddress, peer: ?PeerId = PeerId.none
-) =
-  self.blocks.withValue(address, pending):
-    if peer.isSome:
-      assert peer == pending[].requested
-    pending[].requested = PeerId.none
 
 func contains*(self: PendingBlocksManager, cid: Cid): bool =
   BlockAddress.init(cid) in self.blocks

codex/blockexchange/network/network.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -35,14 +35,13 @@ const
   DefaultMaxInflight* = 100
 
 type
-  WantListHandler* = proc(peer: PeerId, wantList: WantList) {.async: (raises: []).}
+  WantListHandler* = proc(peer: PeerId, wantList: WantList): Future[void] {.gcsafe.}
   BlocksDeliveryHandler* =
-    proc(peer: PeerId, blocks: seq[BlockDelivery]) {.async: (raises: []).}
+    proc(peer: PeerId, blocks: seq[BlockDelivery]): Future[void] {.gcsafe.}
   BlockPresenceHandler* =
-    proc(peer: PeerId, precense: seq[BlockPresence]) {.async: (raises: []).}
+    proc(peer: PeerId, precense: seq[BlockPresence]): Future[void] {.gcsafe.}
-  AccountHandler* = proc(peer: PeerId, account: Account) {.async: (raises: []).}
+  AccountHandler* = proc(peer: PeerId, account: Account): Future[void] {.gcsafe.}
-  PaymentHandler* = proc(peer: PeerId, payment: SignedState) {.async: (raises: []).}
+  PaymentHandler* = proc(peer: PeerId, payment: SignedState): Future[void] {.gcsafe.}
-  PeerEventHandler* = proc(peer: PeerId) {.async: (raises: [CancelledError]).}
 
   BlockExcHandlers* = object
     onWantList*: WantListHandler
@@ -50,9 +49,6 @@ type
     onPresence*: BlockPresenceHandler
     onAccount*: AccountHandler
     onPayment*: PaymentHandler
-    onPeerJoined*: PeerEventHandler
-    onPeerDeparted*: PeerEventHandler
-    onPeerDropped*: PeerEventHandler
 
   WantListSender* = proc(
     id: PeerId,
@@ -62,20 +58,15 @@ type
     wantType: WantType = WantType.WantHave,
     full: bool = false,
     sendDontHave: bool = false,
-  ) {.async: (raises: [CancelledError]).}
+  ): Future[void] {.gcsafe.}
-  WantCancellationSender* = proc(peer: PeerId, addresses: seq[BlockAddress]) {.
+  WantCancellationSender* =
-    async: (raises: [CancelledError])
+    proc(peer: PeerId, addresses: seq[BlockAddress]): Future[void] {.gcsafe.}
-  .}
+  BlocksDeliverySender* =
-  BlocksDeliverySender* = proc(peer: PeerId, blocksDelivery: seq[BlockDelivery]) {.
+    proc(peer: PeerId, blocksDelivery: seq[BlockDelivery]): Future[void] {.gcsafe.}
-    async: (raises: [CancelledError])
+  PresenceSender* =
-  .}
+    proc(peer: PeerId, presence: seq[BlockPresence]): Future[void] {.gcsafe.}
-  PresenceSender* = proc(peer: PeerId, presence: seq[BlockPresence]) {.
+  AccountSender* = proc(peer: PeerId, account: Account): Future[void] {.gcsafe.}
-    async: (raises: [CancelledError])
+  PaymentSender* = proc(peer: PeerId, payment: SignedState): Future[void] {.gcsafe.}
-  .}
-  AccountSender* =
-    proc(peer: PeerId, account: Account) {.async: (raises: [CancelledError]).}
-  PaymentSender* =
-    proc(peer: PeerId, payment: SignedState) {.async: (raises: [CancelledError]).}
 
   BlockExcRequest* = object
     sendWantList*: WantListSender
@@ -107,9 +98,7 @@ proc isSelf*(b: BlockExcNetwork, peer: PeerId): bool =
 
   return b.peerId == peer
 
-proc send*(
+proc send*(b: BlockExcNetwork, id: PeerId, msg: pb.Message) {.async.} =
-    b: BlockExcNetwork, id: PeerId, msg: pb.Message
-) {.async: (raises: [CancelledError]).} =
   ## Send message to peer
   ##
 
@@ -117,9 +106,8 @@ proc send*(
     trace "Unable to send, peer not found", peerId = id
     return
 
+  let peer = b.peers[id]
   try:
-    let peer = b.peers[id]
-
     await b.inflightSema.acquire()
     await peer.send(msg)
   except CancelledError as error:
@@ -129,9 +117,7 @@ proc send*(
   finally:
     b.inflightSema.release()
 
-proc handleWantList(
+proc handleWantList(b: BlockExcNetwork, peer: NetworkPeer, list: WantList) {.async.} =
-    b: BlockExcNetwork, peer: NetworkPeer, list: WantList
-) {.async: (raises: []).} =
   ## Handle incoming want list
   ##
 
@@ -147,7 +133,7 @@ proc sendWantList*(
     wantType: WantType = WantType.WantHave,
     full: bool = false,
     sendDontHave: bool = false,
-) {.async: (raw: true, raises: [CancelledError]).} =
+): Future[void] =
   ## Send a want message to peer
   ##
 
@@ -168,14 +154,14 @@ proc sendWantList*(
 
 proc sendWantCancellations*(
     b: BlockExcNetwork, id: PeerId, addresses: seq[BlockAddress]
-): Future[void] {.async: (raises: [CancelledError]).} =
+): Future[void] {.async.} =
   ## Informs a remote peer that we're no longer interested in a set of blocks
   ##
   await b.sendWantList(id = id, addresses = addresses, cancel = true)
 
 proc handleBlocksDelivery(
     b: BlockExcNetwork, peer: NetworkPeer, blocksDelivery: seq[BlockDelivery]
-) {.async: (raises: []).} =
+) {.async.} =
   ## Handle incoming blocks
   ##
 
@@ -184,7 +170,7 @@ proc handleBlocksDelivery(
 
 proc sendBlocksDelivery*(
     b: BlockExcNetwork, id: PeerId, blocksDelivery: seq[BlockDelivery]
-) {.async: (raw: true, raises: [CancelledError]).} =
+): Future[void] =
   ## Send blocks to remote
   ##
 
@@ -192,7 +178,7 @@ proc sendBlocksDelivery*(
 
 proc handleBlockPresence(
     b: BlockExcNetwork, peer: NetworkPeer, presence: seq[BlockPresence]
-) {.async: (raises: []).} =
+) {.async.} =
   ## Handle block presence
   ##
 
@@ -201,7 +187,7 @@ proc handleBlockPresence(
 
 proc sendBlockPresence*(
     b: BlockExcNetwork, id: PeerId, presence: seq[BlockPresence]
-) {.async: (raw: true, raises: [CancelledError]).} =
+): Future[void] =
   ## Send presence to remote
   ##
 
@@ -209,24 +195,20 @@ proc sendBlockPresence*(
 
 proc handleAccount(
     network: BlockExcNetwork, peer: NetworkPeer, account: Account
-) {.async: (raises: []).} =
+) {.async.} =
   ## Handle account info
   ##
 
   if not network.handlers.onAccount.isNil:
     await network.handlers.onAccount(peer.id, account)
 
-proc sendAccount*(
+proc sendAccount*(b: BlockExcNetwork, id: PeerId, account: Account): Future[void] =
-    b: BlockExcNetwork, id: PeerId, account: Account
-) {.async: (raw: true, raises: [CancelledError]).} =
   ## Send account info to remote
   ##
 
   b.send(id, Message(account: AccountMessage.init(account)))
 
-proc sendPayment*(
+proc sendPayment*(b: BlockExcNetwork, id: PeerId, payment: SignedState): Future[void] =
-    b: BlockExcNetwork, id: PeerId, payment: SignedState
-) {.async: (raw: true, raises: [CancelledError]).} =
   ## Send payment to remote
   ##
 
@@ -234,7 +216,7 @@ proc sendPayment*(
 
 proc handlePayment(
     network: BlockExcNetwork, peer: NetworkPeer, payment: SignedState
-) {.async: (raises: []).} =
+) {.async.} =
   ## Handle payment
   ##
 
@@ -242,123 +224,99 @@ proc handlePayment(
     await network.handlers.onPayment(peer.id, payment)
 
 proc rpcHandler(
-    self: BlockExcNetwork, peer: NetworkPeer, msg: Message
+    b: BlockExcNetwork, peer: NetworkPeer, msg: Message
-) {.async: (raises: []).} =
+) {.async: (raises: [CatchableError]).} =
   ## handle rpc messages
   ##
   if msg.wantList.entries.len > 0:
-    self.trackedFutures.track(self.handleWantList(peer, msg.wantList))
+    b.trackedFutures.track(b.handleWantList(peer, msg.wantList))
 
   if msg.payload.len > 0:
-    self.trackedFutures.track(self.handleBlocksDelivery(peer, msg.payload))
+    b.trackedFutures.track(b.handleBlocksDelivery(peer, msg.payload))
 
   if msg.blockPresences.len > 0:
-    self.trackedFutures.track(self.handleBlockPresence(peer, msg.blockPresences))
+    b.trackedFutures.track(b.handleBlockPresence(peer, msg.blockPresences))
 
   if account =? Account.init(msg.account):
-    self.trackedFutures.track(self.handleAccount(peer, account))
+    b.trackedFutures.track(b.handleAccount(peer, account))
 
   if payment =? SignedState.init(msg.payment):
-    self.trackedFutures.track(self.handlePayment(peer, payment))
+    b.trackedFutures.track(b.handlePayment(peer, payment))
 
-proc getOrCreatePeer(self: BlockExcNetwork, peer: PeerId): NetworkPeer =
+proc getOrCreatePeer(b: BlockExcNetwork, peer: PeerId): NetworkPeer =
   ## Creates or retrieves a BlockExcNetwork Peer
   ##
 
-  if peer in self.peers:
+  if peer in b.peers:
-    return self.peers.getOrDefault(peer, nil)
+    return b.peers.getOrDefault(peer, nil)
 
-  var getConn: ConnProvider = proc(): Future[Connection] {.
+  var getConn: ConnProvider = proc(): Future[Connection] {.async, gcsafe, closure.} =
-      async: (raises: [CancelledError])
-  .} =
     try:
       trace "Getting new connection stream", peer
-      return await self.switch.dial(peer, Codec)
+      return await b.switch.dial(peer, Codec)
     except CancelledError as error:
       raise error
     except CatchableError as exc:
       trace "Unable to connect to blockexc peer", exc = exc.msg
 
-  if not isNil(self.getConn):
+  if not isNil(b.getConn):
-    getConn = self.getConn
+    getConn = b.getConn
 
-  let rpcHandler = proc(p: NetworkPeer, msg: Message) {.async: (raises: []).} =
+  let rpcHandler = proc(
-    await self.rpcHandler(p, msg)
+      p: NetworkPeer, msg: Message
+  ) {.async: (raises: [CatchableError]).} =
+    await b.rpcHandler(p, msg)
 
   # create new pubsub peer
   let blockExcPeer = NetworkPeer.new(peer, getConn, rpcHandler)
   debug "Created new blockexc peer", peer
 
-  self.peers[peer] = blockExcPeer
+  b.peers[peer] = blockExcPeer
 
   return blockExcPeer
 
-proc dialPeer*(self: BlockExcNetwork, peer: PeerRecord) {.async.} =
+proc setupPeer*(b: BlockExcNetwork, peer: PeerId) =
+  ## Perform initial setup, such as want
+  ## list exchange
+  ##
+
+  discard b.getOrCreatePeer(peer)
+
+proc dialPeer*(b: BlockExcNetwork, peer: PeerRecord) {.async.} =
   ## Dial a peer
   ##
 
-  if self.isSelf(peer.peerId):
+  if b.isSelf(peer.peerId):
     trace "Skipping dialing self", peer = peer.peerId
     return
 
-  if peer.peerId in self.peers:
+  if peer.peerId in b.peers:
     trace "Already connected to peer", peer = peer.peerId
     return
 
-  await self.switch.connect(peer.peerId, peer.addresses.mapIt(it.address))
+  await b.switch.connect(peer.peerId, peer.addresses.mapIt(it.address))
 
-proc dropPeer*(
+proc dropPeer*(b: BlockExcNetwork, peer: PeerId) =
-    self: BlockExcNetwork, peer: PeerId
-) {.async: (raises: [CancelledError]).} =
-  trace "Dropping peer", peer
-
-  try:
-    if not self.switch.isNil:
-      await self.switch.disconnect(peer)
-  except CatchableError as error:
-    warn "Error attempting to disconnect from peer", peer = peer, error = error.msg
-
-  if not self.handlers.onPeerDropped.isNil:
-    await self.handlers.onPeerDropped(peer)
-
-proc handlePeerJoined*(
-    self: BlockExcNetwork, peer: PeerId
-) {.async: (raises: [CancelledError]).} =
-  discard self.getOrCreatePeer(peer)
-  if not self.handlers.onPeerJoined.isNil:
-    await self.handlers.onPeerJoined(peer)
-
-proc handlePeerDeparted*(
-    self: BlockExcNetwork, peer: PeerId
-) {.async: (raises: [CancelledError]).} =
   ## Cleanup disconnected peer
   ##
 
-  trace "Cleaning up departed peer", peer
+  trace "Dropping peer", peer
-  self.peers.del(peer)
+  b.peers.del(peer)
-  if not self.handlers.onPeerDeparted.isNil:
-    await self.handlers.onPeerDeparted(peer)
 
-method init*(self: BlockExcNetwork) {.raises: [].} =
+method init*(self: BlockExcNetwork) =
   ## Perform protocol initialization
   ##
 
-  proc peerEventHandler(
+  proc peerEventHandler(peerId: PeerId, event: PeerEvent) {.async.} =
-      peerId: PeerId, event: PeerEvent
-  ): Future[void] {.async: (raises: [CancelledError]).} =
     if event.kind == PeerEventKind.Joined:
-      await self.handlePeerJoined(peerId)
+      self.setupPeer(peerId)
-    elif event.kind == PeerEventKind.Left:
-      await self.handlePeerDeparted(peerId)
     else:
-      warn "Unknown peer event", event
+      self.dropPeer(peerId)
 
   self.switch.addPeerEventHandler(peerEventHandler, PeerEventKind.Joined)
   self.switch.addPeerEventHandler(peerEventHandler, PeerEventKind.Left)
 
-  proc handler(
+  proc handler(conn: Connection, proto: string) {.async.} =
-      conn: Connection, proto: string
-  ): Future[void] {.async: (raises: [CancelledError]).} =
     let peerId = conn.peerId
     let blockexcPeer = self.getOrCreatePeer(peerId)
     await blockexcPeer.readLoop(conn) # attach read loop
@@ -395,32 +353,26 @@ proc new*(
       wantType: WantType = WantType.WantHave,
       full: bool = false,
       sendDontHave: bool = false,
-  ): Future[void] {.async: (raw: true, raises: [CancelledError]).} =
+  ): Future[void] {.gcsafe.} =
     self.sendWantList(id, cids, priority, cancel, wantType, full, sendDontHave)
 
   proc sendWantCancellations(
       id: PeerId, addresses: seq[BlockAddress]
-  ): Future[void] {.async: (raw: true, raises: [CancelledError]).} =
+  ): Future[void] {.gcsafe.} =
     self.sendWantCancellations(id, addresses)
 
   proc sendBlocksDelivery(
       id: PeerId, blocksDelivery: seq[BlockDelivery]
-  ): Future[void] {.async: (raw: true, raises: [CancelledError]).} =
+  ): Future[void] {.gcsafe.} =
     self.sendBlocksDelivery(id, blocksDelivery)
 
-  proc sendPresence(
+  proc sendPresence(id: PeerId, presence: seq[BlockPresence]): Future[void] {.gcsafe.} =
-      id: PeerId, presence: seq[BlockPresence]
-  ): Future[void] {.async: (raw: true, raises: [CancelledError]).} =
     self.sendBlockPresence(id, presence)
 
-  proc sendAccount(
+  proc sendAccount(id: PeerId, account: Account): Future[void] {.gcsafe.} =
-      id: PeerId, account: Account
-  ): Future[void] {.async: (raw: true, raises: [CancelledError]).} =
     self.sendAccount(id, account)
 
-  proc sendPayment(
+  proc sendPayment(id: PeerId, payment: SignedState): Future[void] {.gcsafe.} =
-      id: PeerId, payment: SignedState
-  ): Future[void] {.async: (raw: true, raises: [CancelledError]).} =
     self.sendPayment(id, payment)
 
   self.request = BlockExcRequest(

codex/blockexchange/network/networkpeer.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -7,7 +7,9 @@
 ## This file may not be copied, modified, or distributed except according to
 ## those terms.
 
-{.push raises: [].}
+import pkg/upraises
+push:
+  {.upraises: [].}
 
 import pkg/chronos
 import pkg/libp2p
@@ -16,7 +18,6 @@ import ../protobuf/blockexc
 import ../protobuf/message
 import ../../errors
 import ../../logutils
-import ../../utils/trackedfutures
 
 logScope:
   topics = "codex blockexcnetworkpeer"
@@ -24,9 +25,11 @@ logScope:
 const DefaultYieldInterval = 50.millis
 
 type
-  ConnProvider* = proc(): Future[Connection] {.async: (raises: [CancelledError]).}
+  ConnProvider* = proc(): Future[Connection] {.gcsafe, closure.}
 
-  RPCHandler* = proc(peer: NetworkPeer, msg: Message) {.async: (raises: []).}
+  RPCHandler* = proc(
+    peer: NetworkPeer, msg: Message
+  ): Future[void].Raising(CatchableError) {.gcsafe.}
 
   NetworkPeer* = ref object of RootObj
     id*: PeerId
@@ -34,68 +37,56 @@ type
     sendConn: Connection
     getConn: ConnProvider
     yieldInterval*: Duration = DefaultYieldInterval
-    trackedFutures: TrackedFutures
 
-proc connected*(self: NetworkPeer): bool =
+proc connected*(b: NetworkPeer): bool =
-  not (isNil(self.sendConn)) and not (self.sendConn.closed or self.sendConn.atEof)
+  not (isNil(b.sendConn)) and not (b.sendConn.closed or b.sendConn.atEof)
 
-proc readLoop*(self: NetworkPeer, conn: Connection) {.async: (raises: []).} =
+proc readLoop*(b: NetworkPeer, conn: Connection) {.async.} =
   if isNil(conn):
-    trace "No connection to read from", peer = self.id
+    trace "No connection to read from", peer = b.id
     return
 
-  trace "Attaching read loop", peer = self.id, connId = conn.oid
+  trace "Attaching read loop", peer = b.id, connId = conn.oid
   try:
-    var nextYield = Moment.now() + self.yieldInterval
+    var nextYield = Moment.now() + b.yieldInterval
     while not conn.atEof or not conn.closed:
       if Moment.now() > nextYield:
-        nextYield = Moment.now() + self.yieldInterval
+        nextYield = Moment.now() + b.yieldInterval
         trace "Yielding in read loop",
-          peer = self.id, nextYield = nextYield, interval = self.yieldInterval
+          peer = b.id, nextYield = nextYield, interval = b.yieldInterval
         await sleepAsync(10.millis)
 
       let
         data = await conn.readLp(MaxMessageSize.int)
         msg = Message.protobufDecode(data).mapFailure().tryGet()
-      trace "Received message", peer = self.id, connId = conn.oid
+      trace "Received message", peer = b.id, connId = conn.oid
-      await self.handler(self, msg)
+      await b.handler(b, msg)
   except CancelledError:
     trace "Read loop cancelled"
   except CatchableError as err:
     warn "Exception in blockexc read loop", msg = err.msg
   finally:
-    warn "Detaching read loop", peer = self.id, connId = conn.oid
+    trace "Detaching read loop", peer = b.id, connId = conn.oid
-    if self.sendConn == conn:
-      self.sendConn = nil
     await conn.close()
 
-proc connect*(
+proc connect*(b: NetworkPeer): Future[Connection] {.async.} =
-    self: NetworkPeer
+  if b.connected:
-): Future[Connection] {.async: (raises: [CancelledError]).} =
+    trace "Already connected", peer = b.id, connId = b.sendConn.oid
-  if self.connected:
+    return b.sendConn
-    trace "Already connected", peer = self.id, connId = self.sendConn.oid
-    return self.sendConn
 
-  self.sendConn = await self.getConn()
+  b.sendConn = await b.getConn()
-  self.trackedFutures.track(self.readLoop(self.sendConn))
+  asyncSpawn b.readLoop(b.sendConn)
-  return self.sendConn
+  return b.sendConn
 
-proc send*(
+proc send*(b: NetworkPeer, msg: Message) {.async.} =
-    self: NetworkPeer, msg: Message
+  let conn = await b.connect()
-) {.async: (raises: [CancelledError, LPStreamError]).} =
-  let conn = await self.connect()
 
   if isNil(conn):
-    warn "Unable to get send connection for peer message not sent", peer = self.id
+    warn "Unable to get send connection for peer message not sent", peer = b.id
     return
 
-  trace "Sending message", peer = self.id, connId = conn.oid
+  trace "Sending message", peer = b.id, connId = conn.oid
-  try:
+  await conn.writeLp(protobufEncode(msg))
-    await conn.writeLp(protobufEncode(msg))
-  except CatchableError as err:
-    if self.sendConn == conn:
-      self.sendConn = nil
-    raise newException(LPStreamError, "Failed to send message: " & err.msg)
 
 func new*(
     T: type NetworkPeer,
@@ -105,9 +96,4 @@ func new*(
 ): NetworkPeer =
   doAssert(not isNil(connProvider), "should supply connection provider")
 
-  NetworkPeer(
+  NetworkPeer(id: peer, getConn: connProvider, handler: rpcHandler)
-    id: peer,
-    getConn: connProvider,
-    handler: rpcHandler,
-    trackedFutures: TrackedFutures(),
-  )

codex/blockexchange/peers/peercontext.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -25,77 +25,28 @@ import ../../logutils
 
 export payments, nitro
 
-const
-  MinRefreshInterval = 1.seconds
-  MaxRefreshBackoff = 36 # 36 seconds
-  MaxWantListBatchSize* = 1024 # Maximum blocks to send per WantList message
-
 type BlockExcPeerCtx* = ref object of RootObj
   id*: PeerId
   blocks*: Table[BlockAddress, Presence] # remote peer have list including price
-  wantedBlocks*: HashSet[BlockAddress] # blocks that the peer wants
+  peerWants*: seq[WantListEntry] # remote peers want lists
   exchanged*: int # times peer has exchanged with us
-  refreshInProgress*: bool # indicates if a refresh is in progress
+  lastExchange*: Moment # last time peer has exchanged with us
-  lastRefresh*: Moment # last time we refreshed our knowledge of the blocks this peer has
-  refreshBackoff*: int = 1 # backoff factor for refresh requests
   account*: ?Account # ethereum account of this peer
   paymentChannel*: ?ChannelId # payment channel id
-  blocksSent*: HashSet[BlockAddress] # blocks sent to peer
-  blocksRequested*: HashSet[BlockAddress] # pending block requests to this peer
-  lastExchange*: Moment # last time peer has sent us a block
-  activityTimeout*: Duration
-  lastSentWants*: HashSet[BlockAddress]
-    # track what wantList we last sent for delta updates
 
-proc isKnowledgeStale*(self: BlockExcPeerCtx): bool =
+proc peerHave*(self: BlockExcPeerCtx): seq[BlockAddress] =
-  let staleness =
+  toSeq(self.blocks.keys)
-    self.lastRefresh + self.refreshBackoff * MinRefreshInterval < Moment.now()
 
-  if staleness and self.refreshInProgress:
+proc peerHaveCids*(self: BlockExcPeerCtx): HashSet[Cid] =
-    trace "Cleaning up refresh state", peer = self.id
+  self.blocks.keys.toSeq.mapIt(it.cidOrTreeCid).toHashSet
-    self.refreshInProgress = false
-    self.refreshBackoff = 1
 
-  staleness
+proc peerWantsCids*(self: BlockExcPeerCtx): HashSet[Cid] =
-
+  self.peerWants.mapIt(it.address.cidOrTreeCid).toHashSet
-proc isBlockSent*(self: BlockExcPeerCtx, address: BlockAddress): bool =
-  address in self.blocksSent
-
-proc markBlockAsSent*(self: BlockExcPeerCtx, address: BlockAddress) =
-  self.blocksSent.incl(address)
-
-proc markBlockAsNotSent*(self: BlockExcPeerCtx, address: BlockAddress) =
-  self.blocksSent.excl(address)
-
-proc refreshRequested*(self: BlockExcPeerCtx) =
-  trace "Refresh requested for peer", peer = self.id, backoff = self.refreshBackoff
-  self.refreshInProgress = true
-  self.lastRefresh = Moment.now()
-
-proc refreshReplied*(self: BlockExcPeerCtx) =
-  self.refreshInProgress = false
-  self.lastRefresh = Moment.now()
-  self.refreshBackoff = min(self.refreshBackoff * 2, MaxRefreshBackoff)
-
-proc havesUpdated(self: BlockExcPeerCtx) =
-  self.refreshBackoff = 1
-
-proc wantsUpdated*(self: BlockExcPeerCtx) =
-  self.refreshBackoff = 1
-
-proc peerHave*(self: BlockExcPeerCtx): HashSet[BlockAddress] =
-  # XXX: this is ugly an inefficient, but since those will typically
-  #  be used in "joins", it's better to pay the price here and have
-  #  a linear join than to not do it and have a quadratic join.
-  toHashSet(self.blocks.keys.toSeq)
 
 proc contains*(self: BlockExcPeerCtx, address: BlockAddress): bool =
   address in self.blocks
 
 func setPresence*(self: BlockExcPeerCtx, presence: Presence) =
-  if presence.address notin self.blocks:
-    self.havesUpdated()
-
   self.blocks[presence.address] = presence
 
 func cleanPresence*(self: BlockExcPeerCtx, addresses: seq[BlockAddress]) =
@@ -112,36 +63,3 @@ func price*(self: BlockExcPeerCtx, addresses: seq[BlockAddress]): UInt256 =
       price += precense[].price
 
   price
-
-proc blockRequestScheduled*(self: BlockExcPeerCtx, address: BlockAddress) =
-  ## Adds a block the set of blocks that have been requested to this peer
-  ## (its request schedule).
-  if self.blocksRequested.len == 0:
-    self.lastExchange = Moment.now()
-  self.blocksRequested.incl(address)
-
-proc blockRequestCancelled*(self: BlockExcPeerCtx, address: BlockAddress) =
-  ## Removes a block from the set of blocks that have been requested to this peer
-  ## (its request schedule).
-  self.blocksRequested.excl(address)
-
-proc blockReceived*(self: BlockExcPeerCtx, address: BlockAddress): bool =
-  let wasRequested = address in self.blocksRequested
-  self.blocksRequested.excl(address)
-  self.lastExchange = Moment.now()
-  wasRequested
-
-proc activityTimer*(
-    self: BlockExcPeerCtx
-): Future[void] {.async: (raises: [CancelledError]).} =
-  ## This is called by the block exchange when a block is scheduled for this peer.
-  ## If the peer sends no blocks for a while, it is considered inactive/uncooperative
-  ## and the peer is dropped. Note that ANY block that the peer sends will reset this
-  ## timer for all blocks.
-  ##
-  while true:
-    let idleTime = Moment.now() - self.lastExchange
-    if idleTime > self.activityTimeout:
-      return
-
-    await sleepAsync(self.activityTimeout - idleTime)

codex/blockexchange/peers/peerctxstore.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2022 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -7,13 +7,16 @@
 ## This file may not be copied, modified, or distributed except according to
 ## those terms.
 
-{.push raises: [].}
-
 import std/sequtils
 import std/tables
 import std/algorithm
 import std/sequtils
 
+import pkg/upraises
+
+push:
+  {.upraises: [].}
+
 import pkg/chronos
 import pkg/libp2p
 
@@ -62,23 +65,21 @@ func len*(self: PeerCtxStore): int =
   self.peers.len
 
 func peersHave*(self: PeerCtxStore, address: BlockAddress): seq[BlockExcPeerCtx] =
-  toSeq(self.peers.values).filterIt(address in it.peerHave)
+  toSeq(self.peers.values).filterIt(it.peerHave.anyIt(it == address))
 
 func peersHave*(self: PeerCtxStore, cid: Cid): seq[BlockExcPeerCtx] =
-  # FIXME: this is way slower and can end up leading to unexpected performance loss.
   toSeq(self.peers.values).filterIt(it.peerHave.anyIt(it.cidOrTreeCid == cid))
 
 func peersWant*(self: PeerCtxStore, address: BlockAddress): seq[BlockExcPeerCtx] =
-  toSeq(self.peers.values).filterIt(address in it.wantedBlocks)
+  toSeq(self.peers.values).filterIt(it.peerWants.anyIt(it == address))
 
 func peersWant*(self: PeerCtxStore, cid: Cid): seq[BlockExcPeerCtx] =
-  # FIXME: this is way slower and can end up leading to unexpected performance loss.
+  toSeq(self.peers.values).filterIt(it.peerWants.anyIt(it.address.cidOrTreeCid == cid))
-  toSeq(self.peers.values).filterIt(it.wantedBlocks.anyIt(it.cidOrTreeCid == cid))
 
 proc getPeersForBlock*(self: PeerCtxStore, address: BlockAddress): PeersForBlock =
   var res: PeersForBlock = (@[], @[])
   for peer in self:
-    if address in peer:
+    if peer.peerHave.anyIt(it == address):
       res.with.add(peer)
     else:
       res.without.add(peer)

codex/blockexchange/protobuf/blockexc.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -9,6 +9,7 @@
 
 import std/hashes
 import std/sequtils
+import pkg/stew/endians2
 
 import message
 
@@ -19,6 +20,13 @@ export Wantlist, WantType, WantListEntry
 export BlockDelivery, BlockPresenceType, BlockPresence
 export AccountMessage, StateChannelUpdate
 
+proc hash*(a: BlockAddress): Hash =
+  if a.leaf:
+    let data = a.treeCid.data.buffer & @(a.index.uint64.toBytesBE)
+    hash(data)
+  else:
+    hash(a.cid.data.buffer)
+
 proc hash*(e: WantListEntry): Hash =
   hash(e.address)
 

codex/blockexchange/protobuf/message.nim

@@ -1,4 +1,4 @@
-# Protocol of data exchange between Logos Storage nodes
+# Protocol of data exchange between Codex nodes
 # and Protobuf encoder/decoder for these messages.
 #
 # Eventually all this code should be auto-generated from message.proto.
@@ -25,15 +25,11 @@ type
 
   WantListEntry* = object
     address*: BlockAddress
-    # XXX: I think explicit priority is pointless as the peer will request
-    # the blocks in the order it wants to receive them, and all we have to
-    # do is process those in the same order as we send them back. It also
-    # complicates things for no reason at the moment, as the priority is
-    # always set to 0.
     priority*: int32 # The priority (normalized). default to 1
     cancel*: bool # Whether this revokes an entry
     wantType*: WantType # Note: defaults to enum 0, ie Block
     sendDontHave*: bool # Note: defaults to false
+    inFlight*: bool # Whether block sending is in progress. Not serialized.
 
   WantList* = object
     entries*: seq[WantListEntry] # A list of wantList entries
@@ -101,7 +97,7 @@ proc write*(pb: var ProtoBuffer, field: int, value: WantList) =
   pb.write(field, ipb)
 
 proc write*(pb: var ProtoBuffer, field: int, value: BlockDelivery) =
-  var ipb = initProtoBuffer()
+  var ipb = initProtoBuffer(maxSize = MaxBlockSize)
   ipb.write(1, value.blk.cid.data.buffer)
   ipb.write(2, value.blk.data)
   ipb.write(3, value.address)
@@ -132,7 +128,7 @@ proc write*(pb: var ProtoBuffer, field: int, value: StateChannelUpdate) =
   pb.write(field, ipb)
 
 proc protobufEncode*(value: Message): seq[byte] =
-  var ipb = initProtoBuffer()
+  var ipb = initProtoBuffer(maxSize = MaxMessageSize)
   ipb.write(1, value.wantList)
   for v in value.payload:
     ipb.write(3, v)
@@ -258,14 +254,16 @@ proc decode*(
 proc protobufDecode*(_: type Message, msg: seq[byte]): ProtoResult[Message] =
   var
     value = Message()
-    pb = initProtoBuffer(msg)
+    pb = initProtoBuffer(msg, maxSize = MaxMessageSize)
     ipb: ProtoBuffer
     sublist: seq[seq[byte]]
   if ?pb.getField(1, ipb):
     value.wantList = ?WantList.decode(ipb)
   if ?pb.getRepeatedField(3, sublist):
     for item in sublist:
-      value.payload.add(?BlockDelivery.decode(initProtoBuffer(item)))
+      value.payload.add(
+        ?BlockDelivery.decode(initProtoBuffer(item, maxSize = MaxBlockSize))
+      )
   if ?pb.getRepeatedField(4, sublist):
     for item in sublist:
       value.blockPresences.add(?BlockPresence.decode(initProtoBuffer(item)))

codex/blockexchange/protobuf/message.proto

@@ -1,4 +1,4 @@
-// Protocol of data exchange between Logos Storage nodes.
+// Protocol of data exchange between Codex nodes.
 // Extended version of https://github.com/ipfs/specs/blob/main/BITSWAP.md
 
 syntax = "proto3";

codex/blockexchange/protobuf/payments.nim

@@ -1,9 +1,8 @@
-{.push raises: [].}
-
 import pkg/stew/byteutils
 import pkg/stint
 import pkg/nitro
 import pkg/questionable
+import pkg/upraises
 import ./blockexc
 
 export AccountMessage
@@ -12,6 +11,9 @@ export StateChannelUpdate
 export stint
 export nitro
 
+push:
+  {.upraises: [].}
+
 type Account* = object
   address*: EthAddress
 

codex/blockexchange/protobuf/presence.nim

@@ -1,9 +1,8 @@
-{.push raises: [].}
-
 import libp2p
 import pkg/stint
 import pkg/questionable
 import pkg/questionable/results
+import pkg/upraises
 import ./blockexc
 
 import ../../blocktype
@@ -12,6 +11,9 @@ export questionable
 export stint
 export BlockPresenceType
 
+upraises.push:
+  {.upraises: [].}
+
 type
   PresenceMessage* = blockexc.BlockPresence
   Presence* = object

codex/blocktype.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -9,14 +9,16 @@
 
 import std/tables
 import std/sugar
-import std/hashes
 
 export tables
 
-{.push raises: [], gcsafe.}
+import pkg/upraises
+
+push:
+  {.upraises: [].}
 
 import pkg/libp2p/[cid, multicodec, multihash]
-import pkg/stew/[byteutils, endians2]
+import pkg/stew/byteutils
 import pkg/questionable
 import pkg/questionable/results
 
@@ -65,13 +67,6 @@ proc `$`*(a: BlockAddress): string =
   else:
     "cid: " & $a.cid
 
-proc hash*(a: BlockAddress): Hash =
-  if a.leaf:
-    let data = a.treeCid.data.buffer & @(a.index.uint64.toBytesBE)
-    hash(data)
-  else:
-    hash(a.cid.data.buffer)
-
 proc cidOrTreeCid*(a: BlockAddress): Cid =
   if a.leaf: a.treeCid else: a.cid
 

codex/chunker.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -9,7 +9,10 @@
 
 # TODO: This is super inneficient and needs a rewrite, but it'll do for now
 
-{.push raises: [], gcsafe.}
+import pkg/upraises
+
+push:
+  {.upraises: [].}
 
 import pkg/questionable
 import pkg/questionable/results
@@ -25,11 +28,8 @@ const DefaultChunkSize* = DefaultBlockSize
 
 type
   # default reader type
-  ChunkerError* = object of CatchableError
   ChunkBuffer* = ptr UncheckedArray[byte]
-  Reader* = proc(data: ChunkBuffer, len: int): Future[int] {.
+  Reader* = proc(data: ChunkBuffer, len: int): Future[int] {.gcsafe, raises: [Defect].}
-    async: (raises: [ChunkerError, CancelledError])
-  .}
 
   # Reader that splits input data into fixed-size chunks
   Chunker* = ref object
@@ -74,7 +74,7 @@ proc new*(
 
   proc reader(
       data: ChunkBuffer, len: int
-  ): Future[int] {.async: (raises: [ChunkerError, CancelledError]).} =
+  ): Future[int] {.gcsafe, async, raises: [Defect].} =
     var res = 0
     try:
       while res < len:
@@ -85,7 +85,7 @@ proc new*(
       raise error
     except LPStreamError as error:
       error "LPStream error", err = error.msg
-      raise newException(ChunkerError, "LPStream error", error)
+      raise error
     except CatchableError as exc:
       error "CatchableError exception", exc = exc.msg
       raise newException(Defect, exc.msg)
@@ -102,7 +102,7 @@ proc new*(
 
   proc reader(
       data: ChunkBuffer, len: int
-  ): Future[int] {.async: (raises: [ChunkerError, CancelledError]).} =
+  ): Future[int] {.gcsafe, async, raises: [Defect].} =
     var total = 0
     try:
       while total < len:

codex/clock.nim

@@ -1,7 +1,6 @@
-{.push raises: [].}
-
 import pkg/chronos
 import pkg/stew/endians2
+import pkg/upraises
 import pkg/stint
 
 type
@@ -9,12 +8,10 @@ type
   SecondsSince1970* = int64
   Timeout* = object of CatchableError
 
-method now*(clock: Clock): SecondsSince1970 {.base, gcsafe, raises: [].} =
+method now*(clock: Clock): SecondsSince1970 {.base, gcsafe, upraises: [].} =
   raiseAssert "not implemented"
 
-method waitUntil*(
+method waitUntil*(clock: Clock, time: SecondsSince1970) {.base, async.} =
-    clock: Clock, time: SecondsSince1970
-) {.base, async: (raises: [CancelledError]).} =
   raiseAssert "not implemented"
 
 method start*(clock: Clock) {.base, async.} =

codex/codex.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -12,7 +12,6 @@ import std/strutils
 import std/os
 import std/tables
 import std/cpuinfo
-import std/net
 
 import pkg/chronos
 import pkg/taskpools
@@ -22,13 +21,14 @@ import pkg/confutils
 import pkg/confutils/defs
 import pkg/nitro
 import pkg/stew/io2
+import pkg/stew/shims/net as stewnet
 import pkg/datastore
 import pkg/ethers except Rng
 import pkg/stew/io2
 
 import ./node
 import ./conf
-import ./rng as random
+import ./rng
 import ./rest/api
 import ./stores
 import ./slots
@@ -56,21 +56,10 @@ type
     codexNode: CodexNodeRef
     repoStore: RepoStore
     maintenance: BlockMaintainer
-    taskpool: Taskpool
-    isStarted: bool
 
   CodexPrivateKey* = libp2p.PrivateKey # alias
   EthWallet = ethers.Wallet
 
-func config*(self: CodexServer): CodexConf =
-  return self.config
-
-func node*(self: CodexServer): CodexNodeRef =
-  return self.codexNode
-
-func repoStore*(self: CodexServer): RepoStore =
-  return self.repoStore
-
 proc waitForSync(provider: Provider): Future[void] {.async.} =
   var sleepTime = 1
   trace "Checking sync state of Ethereum provider..."
@@ -94,9 +83,7 @@ proc bootstrapInteractions(s: CodexServer): Future[void] {.async.} =
       error "Persistence enabled, but no Ethereum account was set"
       quit QuitFailure
 
-    let provider = JsonRpcProvider.new(
+    let provider = JsonRpcProvider.new(config.ethProvider)
-      config.ethProvider, maxPriorityFeePerGas = config.maxPriorityFeePerGas.u256
-    )
     await waitForSync(provider)
     var signer: Signer
     if account =? config.ethAccount:
@@ -116,7 +103,7 @@ proc bootstrapInteractions(s: CodexServer): Future[void] {.async.} =
         quit QuitFailure
       signer = wallet
 
-    let deploy = Deployment.new(provider, config.marketplaceAddress)
+    let deploy = Deployment.new(provider, config)
     without marketplaceAddress =? await deploy.address(Marketplace):
       error "No Marketplace address was specified or there is no known address for the current network"
       quit QuitFailure
@@ -138,7 +125,7 @@ proc bootstrapInteractions(s: CodexServer): Future[void] {.async.} =
 
     # This is used for simulation purposes. Normal nodes won't be compiled with this flag
     # and hence the proof failure will always be 0.
-    when storage_enable_proof_failures:
+    when codex_enable_proof_failures:
       let proofFailures = config.simulateProofFailures
       if proofFailures > 0:
         warn "Enabling proof failure simulation!"
@@ -147,10 +134,6 @@ proc bootstrapInteractions(s: CodexServer): Future[void] {.async.} =
       if config.simulateProofFailures > 0:
         warn "Proof failure simulation is not enabled for this build! Configuration ignored"
 
-    if error =? (await market.loadConfig()).errorOption:
-      fatal "Cannot load market configuration", error = error.msg
-      quit QuitFailure
-
     let purchasing = Purchasing.new(market, clock)
     let sales = Sales.new(market, clock, repo, proofFailures)
     client = some ClientInteractions.new(clock, purchasing)
@@ -169,13 +152,9 @@ proc bootstrapInteractions(s: CodexServer): Future[void] {.async.} =
     s.codexNode.contracts = (client, host, validator)
 
 proc start*(s: CodexServer) {.async.} =
-  if s.isStarted:
+  trace "Starting codex node", config = $s.config
-    warn "Storage server already started, skipping"
-    return
 
-  trace "Starting Storage node", config = $s.config
   await s.repoStore.start()
-
   s.maintenance.start()
 
   await s.codexNode.switch.start()
@@ -189,55 +168,18 @@ proc start*(s: CodexServer) {.async.} =
 
   await s.bootstrapInteractions()
   await s.codexNode.start()
-
+  s.restServer.start()
-  if s.restServer != nil:
-    s.restServer.start()
-
-  s.isStarted = true
 
 proc stop*(s: CodexServer) {.async.} =
-  if not s.isStarted:
+  notice "Stopping codex node"
-    warn "Storage is not started"
-    return
 
-  notice "Stopping Storage node"
+  await allFuturesThrowing(
-
+    s.restServer.stop(),
-  var futures =
+    s.codexNode.switch.stop(),
-    @[
+    s.codexNode.stop(),
-      s.codexNode.switch.stop(),
+    s.repoStore.stop(),
-      s.codexNode.stop(),
+    s.maintenance.stop(),
-      s.repoStore.stop(),
+  )
-      s.maintenance.stop(),
-    ]
-
-  if s.restServer != nil:
-    futures.add(s.restServer.stop())
-
-  let res = await noCancel allFinishedFailed[void](futures)
-
-  if res.failure.len > 0:
-    error "Failed to stop Storage node", failures = res.failure.len
-    raiseAssert "Failed to stop Storage node"
-
-proc close*(s: CodexServer) {.async.} =
-  var futures = @[s.codexNode.close(), s.repoStore.close()]
-
-  let res = await noCancel allFinishedFailed[void](futures)
-
-  if not s.taskpool.isNil:
-    try:
-      s.taskpool.shutdown()
-    except Exception as exc:
-      error "Failed to stop the taskpool", failures = res.failure.len
-      raiseAssert("Failure in taskpool shutdown:" & exc.msg)
-
-  if res.failure.len > 0:
-    error "Failed to close Storage node", failures = res.failure.len
-    raiseAssert "Failed to close Storage node"
-
-proc shutdown*(server: CodexServer) {.async.} =
-  await server.stop()
-  await server.close()
 
 proc new*(
     T: type CodexServer, config: CodexConf, privateKey: CodexPrivateKey
@@ -247,13 +189,13 @@ proc new*(
     .new()
     .withPrivateKey(privateKey)
     .withAddresses(config.listenAddrs)
-    .withRng(random.Rng.instance())
+    .withRng(Rng.instance())
     .withNoise()
     .withMplex(5.minutes, 5.minutes)
     .withMaxConnections(config.maxPeers)
     .withAgentVersion(config.agentString)
     .withSignedPeerRecord(true)
-    .withTcpTransport({ServerFlags.ReuseAddr, ServerFlags.TcpNoDelay})
+    .withTcpTransport({ServerFlags.ReuseAddr})
     .build()
 
   var
@@ -337,7 +279,7 @@ proc new*(
     )
 
     peerStore = PeerCtxStore.new()
-    pendingBlocks = PendingBlocksManager.new(retries = config.blockRetries)
+    pendingBlocks = PendingBlocksManager.new()
     advertiser = Advertiser.new(repoStore, discovery)
     blockDiscovery =
       DiscoveryEngine.new(repoStore, peerStore, network, discovery, pendingBlocks)
@@ -362,13 +304,10 @@ proc new*(
       taskPool = taskpool,
     )
 
-  var restServer: RestServerRef = nil
-
-  if config.apiBindAddress.isSome:
     restServer = RestServerRef
       .new(
         codexNode.initRestApi(config, repoStore, config.apiCorsAllowedOrigin),
-        initTAddress(config.apiBindAddress.get(), config.apiPort),
+        initTAddress(config.apiBindAddress, config.apiPort),
         bufferSize = (1024 * 64),
         maxRequestBodySize = int.high,
       )
@@ -382,5 +321,4 @@ proc new*(
     restServer: restServer,
     repoStore: repoStore,
     maintenance: maintenance,
-    taskpool: taskpool,
   )

codex/codextypes.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2023 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))

codex/conf.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -16,10 +16,8 @@ import std/terminal # Is not used in tests
 {.pop.}
 
 import std/options
-import std/parseutils
 import std/strutils
 import std/typetraits
-import std/net
 
 import pkg/chronos
 import pkg/chronicles/helpers
@@ -29,12 +27,13 @@ import pkg/confutils/std/net
 import pkg/toml_serialization
 import pkg/metrics
 import pkg/metrics/chronos_httpserver
+import pkg/stew/shims/net as stewnet
+import pkg/stew/shims/parseutils
 import pkg/stew/byteutils
 import pkg/libp2p
 import pkg/ethers
 import pkg/questionable
 import pkg/questionable/results
-import pkg/stew/base64
 
 import ./codextypes
 import ./discovery
@@ -45,16 +44,15 @@ import ./utils
 import ./nat
 import ./utils/natutils
 
-from ./contracts/config import DefaultRequestCacheSize, DefaultMaxPriorityFeePerGas
+from ./contracts/config import DefaultRequestCacheSize
 from ./validationconfig import MaxSlots, ValidationGroups
-from ./blockexchange/engine/pendingblocks import DefaultBlockRetries
 
 export units, net, codextypes, logutils, completeCmdArg, parseCmdArg, NatConfig
 export ValidationGroups, MaxSlots
 
 export
   DefaultQuotaBytes, DefaultBlockTtl, DefaultBlockInterval, DefaultNumBlocksPerInterval,
-  DefaultRequestCacheSize, DefaultMaxPriorityFeePerGas, DefaultBlockRetries
+  DefaultRequestCacheSize
 
 type ThreadCount* = distinct Natural
 
@@ -63,19 +61,21 @@ proc `==`*(a, b: ThreadCount): bool {.borrow.}
 proc defaultDataDir*(): string =
   let dataDir =
     when defined(windows):
-      "AppData" / "Roaming" / "Storage"
+      "AppData" / "Roaming" / "Codex"
     elif defined(macosx):
-      "Library" / "Application Support" / "Storage"
+      "Library" / "Application Support" / "Codex"
     else:
-      ".cache" / "storage"
+      ".cache" / "codex"
 
   getHomeDir() / dataDir
 
 const
-  storage_enable_api_debug_peers* {.booldefine.} = false
+  codex_enable_api_debug_peers* {.booldefine.} = false
-  storage_enable_proof_failures* {.booldefine.} = false
+  codex_enable_proof_failures* {.booldefine.} = false
-  storage_enable_log_counter* {.booldefine.} = false
+  codex_enable_log_counter* {.booldefine.} = false
 
+  DefaultDataDir* = defaultDataDir()
+  DefaultCircuitDir* = defaultDataDir() / "circuits"
   DefaultThreadCount* = ThreadCount(0)
 
 type
@@ -137,9 +137,9 @@ type
     .}: Port
 
     dataDir* {.
-      desc: "The directory where Storage will store configuration and data",
+      desc: "The directory where codex will store configuration and data",
-      defaultValue: defaultDataDir(),
+      defaultValue: DefaultDataDir,
-      defaultValueDesc: "",
+      defaultValueDesc: $DefaultDataDir,
       abbr: "d",
       name: "data-dir"
     .}: OutDir
@@ -198,16 +198,14 @@ type
     .}: ThreadCount
 
     agentString* {.
-      defaultValue: "Logos Storage",
+      defaultValue: "Codex",
       desc: "Node agent string which is used as identifier in network",
       name: "agent-string"
     .}: string
 
     apiBindAddress* {.
-      desc: "The REST API bind address",
+      desc: "The REST API bind address", defaultValue: "127.0.0.1", name: "api-bindaddr"
-      defaultValue: "127.0.0.1".some,
+    .}: string
-      name: "api-bindaddr"
-    .}: Option[string]
 
     apiPort* {.
       desc: "The REST Api port",
@@ -265,13 +263,6 @@ type
       name: "block-mn"
     .}: int
 
-    blockRetries* {.
-      desc: "Number of times to retry fetching a block before giving up",
-      defaultValue: DefaultBlockRetries,
-      defaultValueDesc: $DefaultBlockRetries,
-      name: "block-retries"
-    .}: int
-
     cacheSize* {.
       desc:
         "The size of the block cache, 0 disables the cache - " &
@@ -379,43 +370,34 @@ type
         hidden
       .}: uint16
 
-      maxPriorityFeePerGas* {.
-        desc:
-          "Sets the default maximum priority fee per gas for Ethereum EIP-1559 transactions, in wei, when not provided by the network.",
-        defaultValue: DefaultMaxPriorityFeePerGas,
-        defaultValueDesc: $DefaultMaxPriorityFeePerGas,
-        name: "max-priority-fee-per-gas",
-        hidden
-      .}: uint64
-
       case persistenceCmd* {.defaultValue: noCmd, command.}: PersistenceCmd
       of PersistenceCmd.prover:
         circuitDir* {.
-          desc: "Directory where Storage will store proof circuit data",
+          desc: "Directory where Codex will store proof circuit data",
-          defaultValue: defaultDataDir() / "circuits",
+          defaultValue: DefaultCircuitDir,
-          defaultValueDesc: "data/circuits",
+          defaultValueDesc: $DefaultCircuitDir,
           abbr: "cd",
           name: "circuit-dir"
         .}: OutDir
 
         circomR1cs* {.
           desc: "The r1cs file for the storage circuit",
-          defaultValue: defaultDataDir() / "circuits" / "proof_main.r1cs",
+          defaultValue: $DefaultCircuitDir / "proof_main.r1cs",
-          defaultValueDesc: "data/circuits/proof_main.r1cs",
+          defaultValueDesc: $DefaultCircuitDir & "/proof_main.r1cs",
           name: "circom-r1cs"
         .}: InputFile
 
         circomWasm* {.
           desc: "The wasm file for the storage circuit",
-          defaultValue: defaultDataDir() / "circuits" / "proof_main.wasm",
+          defaultValue: $DefaultCircuitDir / "proof_main.wasm",
-          defaultValueDesc: "data/circuits/proof_main.wasm",
+          defaultValueDesc: $DefaultDataDir & "/circuits/proof_main.wasm",
           name: "circom-wasm"
         .}: InputFile
 
         circomZkey* {.
           desc: "The zkey file for the storage circuit",
-          defaultValue: defaultDataDir() / "circuits" / "proof_main.zkey",
+          defaultValue: $DefaultCircuitDir / "proof_main.zkey",
-          defaultValueDesc: "data/circuits/proof_main.zkey",
+          defaultValueDesc: $DefaultDataDir & "/circuits/proof_main.zkey",
           name: "circom-zkey"
         .}: InputFile
 
@@ -485,7 +467,7 @@ func prover*(self: CodexConf): bool =
   self.persistence and self.persistenceCmd == PersistenceCmd.prover
 
 proc getCodexVersion(): string =
-  let tag = strip(staticExec("git describe --tags --abbrev=0"))
+  let tag = strip(staticExec("git tag"))
   if tag.isEmptyOrWhitespace:
     return "untagged build"
   return tag
@@ -495,100 +477,76 @@ proc getCodexRevision(): string =
   var res = strip(staticExec("git rev-parse --short HEAD"))
   return res
 
-proc getCodexContractsRevision(): string =
-  let res =
-    strip(staticExec("git rev-parse --short HEAD:vendor/logos-storage-contracts-eth"))
-  return res
-
 proc getNimBanner(): string =
   staticExec("nim --version | grep Version")
 
 const
   codexVersion* = getCodexVersion()
   codexRevision* = getCodexRevision()
-  codexContractsRevision* = getCodexContractsRevision()
   nimBanner* = getNimBanner()
 
   codexFullVersion* =
-    "Storage version:  " & codexVersion & "\p" & "Storage revision: " & codexRevision &
+    "Codex version:  " & codexVersion & "\p" & "Codex revision: " & codexRevision & "\p" &
-    "\p" & "Storage contracts revision: " & codexContractsRevision & "\p" & nimBanner
+    nimBanner
 
 proc parseCmdArg*(
     T: typedesc[MultiAddress], input: string
-): MultiAddress {.raises: [ValueError].} =
+): MultiAddress {.upraises: [ValueError].} =
   var ma: MultiAddress
   try:
     let res = MultiAddress.init(input)
     if res.isOk:
       ma = res.get()
     else:
-      fatal "Invalid MultiAddress", input = input, error = res.error()
+      warn "Invalid MultiAddress", input = input, error = res.error()
       quit QuitFailure
   except LPError as exc:
-    fatal "Invalid MultiAddress uri", uri = input, error = exc.msg
+    warn "Invalid MultiAddress uri", uri = input, error = exc.msg
     quit QuitFailure
   ma
 
-proc parse*(T: type ThreadCount, p: string): Result[ThreadCount, string] =
+proc parseCmdArg*(T: type ThreadCount, input: string): T {.upraises: [ValueError].} =
-  try:
+  let count = parseInt(input)
-    let count = parseInt(p)
+  if count != 0 and count < 2:
-    if count != 0 and count < 2:
+    warn "Invalid number of threads", input = input
-      return err("Invalid number of threads: " & p)
-    return ok(ThreadCount(count))
-  except ValueError as e:
-    return err("Invalid number of threads: " & p & ", error=" & e.msg)
-
-proc parseCmdArg*(T: type ThreadCount, input: string): T =
-  let val = ThreadCount.parse(input)
-  if val.isErr:
-    fatal "Cannot parse the thread count.", input = input, error = val.error()
     quit QuitFailure
-  return val.get()
+  ThreadCount(count)
-
-proc parse*(T: type SignedPeerRecord, p: string): Result[SignedPeerRecord, string] =
-  var res: SignedPeerRecord
-  try:
-    if not res.fromURI(p):
-      return err("The uri is not a valid SignedPeerRecord: " & p)
-    return ok(res)
-  except LPError, Base64Error:
-    let e = getCurrentException()
-    return err(e.msg)
 
 proc parseCmdArg*(T: type SignedPeerRecord, uri: string): T =
-  let res = SignedPeerRecord.parse(uri)
+  var res: SignedPeerRecord
-  if res.isErr:
+  try:
-    fatal "Cannot parse the signed peer.", error = res.error(), input = uri
+    if not res.fromURI(uri):
+      warn "Invalid SignedPeerRecord uri", uri = uri
+      quit QuitFailure
+  except LPError as exc:
+    warn "Invalid SignedPeerRecord uri", uri = uri, error = exc.msg
     quit QuitFailure
-  return res.get()
+  except CatchableError as exc:
+    warn "Invalid SignedPeerRecord uri", uri = uri, error = exc.msg
+    quit QuitFailure
+  res
 
-func parse*(T: type NatConfig, p: string): Result[NatConfig, string] =
+func parseCmdArg*(T: type NatConfig, p: string): T {.raises: [ValueError].} =
   case p.toLowerAscii
   of "any":
-    return ok(NatConfig(hasExtIp: false, nat: NatStrategy.NatAny))
+    NatConfig(hasExtIp: false, nat: NatStrategy.NatAny)
   of "none":
-    return ok(NatConfig(hasExtIp: false, nat: NatStrategy.NatNone))
+    NatConfig(hasExtIp: false, nat: NatStrategy.NatNone)
   of "upnp":
-    return ok(NatConfig(hasExtIp: false, nat: NatStrategy.NatUpnp))
+    NatConfig(hasExtIp: false, nat: NatStrategy.NatUpnp)
   of "pmp":
-    return ok(NatConfig(hasExtIp: false, nat: NatStrategy.NatPmp))
+    NatConfig(hasExtIp: false, nat: NatStrategy.NatPmp)
   else:
     if p.startsWith("extip:"):
       try:
         let ip = parseIpAddress(p[6 ..^ 1])
-        return ok(NatConfig(hasExtIp: true, extIp: ip))
+        NatConfig(hasExtIp: true, extIp: ip)
       except ValueError:
         let error = "Not a valid IP address: " & p[6 ..^ 1]
-        return err(error)
+        raise newException(ValueError, error)
     else:
-      return err("Not a valid NAT option: " & p)
+      let error = "Not a valid NAT option: " & p
-
+      raise newException(ValueError, error)
-proc parseCmdArg*(T: type NatConfig, p: string): T =
-  let res = NatConfig.parse(p)
-  if res.isErr:
-    fatal "Cannot parse the NAT config.", error = res.error(), input = p
-    quit QuitFailure
-  return res.get()
 
 proc completeCmdArg*(T: type NatConfig, val: string): seq[string] =
   return @[]
@@ -596,31 +554,25 @@ proc completeCmdArg*(T: type NatConfig, val: string): seq[string] =
 proc parseCmdArg*(T: type EthAddress, address: string): T =
   EthAddress.init($address).get()
 
-func parse*(T: type NBytes, p: string): Result[NBytes, string] =
-  var num = 0'i64
-  let count = parseSize(p, num, alwaysBin = true)
-  if count == 0:
-    return err("Invalid number of bytes: " & p)
-  return ok(NBytes(num))
-
 proc parseCmdArg*(T: type NBytes, val: string): T =
-  let res = NBytes.parse(val)
+  var num = 0'i64
-  if res.isErr:
+  let count = parseSize(val, num, alwaysBin = true)
-    fatal "Cannot parse NBytes.", error = res.error(), input = val
+  if count == 0:
+    warn "Invalid number of bytes", nbytes = val
     quit QuitFailure
-  return res.get()
+  NBytes(num)
 
 proc parseCmdArg*(T: type Duration, val: string): T =
   var dur: Duration
   let count = parseDuration(val, dur)
   if count == 0:
-    fatal "Cannot parse duration", dur = dur
+    warn "Cannot parse duration", dur = dur
     quit QuitFailure
   dur
 
 proc readValue*(
     r: var TomlReader, val: var EthAddress
-) {.raises: [SerializationError, IOError].} =
+) {.upraises: [SerializationError, IOError].} =
   val = EthAddress.init(r.readValue(string)).get()
 
 proc readValue*(r: var TomlReader, val: var SignedPeerRecord) =
@@ -631,7 +583,7 @@ proc readValue*(r: var TomlReader, val: var SignedPeerRecord) =
   try:
     val = SignedPeerRecord.parseCmdArg(uri)
   except LPError as err:
-    fatal "Invalid SignedPeerRecord uri", uri = uri, error = err.msg
+    warn "Invalid SignedPeerRecord uri", uri = uri, error = err.msg
     quit QuitFailure
 
 proc readValue*(r: var TomlReader, val: var MultiAddress) =
@@ -643,12 +595,12 @@ proc readValue*(r: var TomlReader, val: var MultiAddress) =
   if res.isOk:
     val = res.get()
   else:
-    fatal "Invalid MultiAddress", input = input, error = res.error()
+    warn "Invalid MultiAddress", input = input, error = res.error()
     quit QuitFailure
 
 proc readValue*(
     r: var TomlReader, val: var NBytes
-) {.raises: [SerializationError, IOError].} =
+) {.upraises: [SerializationError, IOError].} =
   var value = 0'i64
   var str = r.readValue(string)
   let count = parseSize(str, value, alwaysBin = true)
@@ -659,7 +611,7 @@ proc readValue*(
 
 proc readValue*(
     r: var TomlReader, val: var ThreadCount
-) {.raises: [SerializationError, IOError].} =
+) {.upraises: [SerializationError, IOError].} =
   var str = r.readValue(string)
   try:
     val = parseCmdArg(ThreadCount, str)
@@ -668,7 +620,7 @@ proc readValue*(
 
 proc readValue*(
     r: var TomlReader, val: var Duration
-) {.raises: [SerializationError, IOError].} =
+) {.upraises: [SerializationError, IOError].} =
   var str = r.readValue(string)
   var dur: Duration
   let count = parseDuration(str, dur)
@@ -735,7 +687,7 @@ proc stripAnsi*(v: string): string =
 
   res
 
-proc updateLogLevel*(logLevel: string) {.raises: [ValueError].} =
+proc updateLogLevel*(logLevel: string) {.upraises: [ValueError].} =
   # Updates log levels (without clearing old ones)
   let directives = logLevel.split(";")
   try:
@@ -804,7 +756,7 @@ proc setupLogging*(conf: CodexConf) =
       of LogKind.None:
         noOutput
 
-    when storage_enable_log_counter:
+    when codex_enable_log_counter:
       var counter = 0.uint64
       proc numberedWriter(logLevel: LogLevel, msg: LogOutputStr) =
         inc(counter)
@@ -815,6 +767,15 @@ proc setupLogging*(conf: CodexConf) =
     else:
       defaultChroniclesStream.outputs[0].writer = writer
 
+  try:
+    updateLogLevel(conf.logLevel)
+  except ValueError as err:
+    try:
+      stderr.write "Invalid value for --log-level. " & err.msg & "\n"
+    except IOError:
+      echo "Invalid value for --log-level. " & err.msg
+    quit QuitFailure
+
 proc setupMetrics*(config: CodexConf) =
   if config.metricsEnabled:
     let metricsAddress = config.metricsAddress

codex/contentids_exts.nim

@@ -1,8 +0,0 @@
-const ContentIdsExts = [
-  multiCodec("codex-root"),
-  multiCodec("codex-manifest"),
-  multiCodec("codex-block"),
-  multiCodec("codex-slot-root"),
-  multiCodec("codex-proving-root"),
-  multiCodec("codex-slot-cell"),
-]

codex/contracts/Readme.md

@@ -1,13 +1,13 @@
-Logos Storage Contracts in Nim
+Codex Contracts in Nim
 =======================
 
-Nim API for the [Logos Storage smart contracts][1].
+Nim API for the [Codex smart contracts][1].
 
 Usage
 -----
 
 For a global overview of the steps involved in starting and fulfilling a
-storage contract, see [Logos Storage Contracts][1].
+storage contract, see [Codex Contracts][1].
 
 Smart contract
 --------------
@@ -144,5 +144,5 @@ await storage
   .markProofAsMissing(id, period)
 ```
 
-[1]: https://github.com/logos-storage/logos-storage-contracts-eth/
+[1]: https://github.com/status-im/codex-contracts-eth/
-[2]: https://github.com/logos-storage/logos-storage-research/blob/master/design/storage-proof-timing.md
+[2]: https://github.com/status-im/codex-research/blob/main/design/storage-proof-timing.md

codex/contracts/clock.nim

@@ -1,5 +1,3 @@
-{.push raises: [].}
-
 import std/times
 import pkg/ethers
 import pkg/questionable
@@ -7,7 +5,6 @@ import pkg/chronos
 import pkg/stint
 import ../clock
 import ../conf
-import ../utils/trackedfutures
 
 export clock
 
@@ -21,12 +18,9 @@ type OnChainClock* = ref object of Clock
   blockNumber: UInt256
   started: bool
   newBlock: AsyncEvent
-  trackedFutures: TrackedFutures
 
 proc new*(_: type OnChainClock, provider: Provider): OnChainClock =
-  OnChainClock(
+  OnChainClock(provider: provider, newBlock: newAsyncEvent())
-    provider: provider, newBlock: newAsyncEvent(), trackedFutures: TrackedFutures()
-  )
 
 proc update(clock: OnChainClock, blck: Block) =
   if number =? blck.number and number > clock.blockNumber:
@@ -38,12 +32,15 @@ proc update(clock: OnChainClock, blck: Block) =
       blockTime = blck.timestamp, blockNumber = number, offset = clock.offset
     clock.newBlock.fire()
 
-proc update(clock: OnChainClock) {.async: (raises: []).} =
+proc update(clock: OnChainClock) {.async.} =
   try:
     if latest =? (await clock.provider.getBlock(BlockTag.latest)):
       clock.update(latest)
+  except CancelledError as error:
+    raise error
   except CatchableError as error:
     debug "error updating clock: ", error = error.msg
+    discard
 
 method start*(clock: OnChainClock) {.async.} =
   if clock.started:
@@ -55,7 +52,7 @@ method start*(clock: OnChainClock) {.async.} =
       return
 
     # ignore block parameter; hardhat may call this with pending blocks
-    clock.trackedFutures.track(clock.update())
+    asyncSpawn clock.update()
 
   await clock.update()
 
@@ -67,16 +64,13 @@ method stop*(clock: OnChainClock) {.async.} =
     return
 
   await clock.subscription.unsubscribe()
-  await clock.trackedFutures.cancelTracked()
   clock.started = false
 
 method now*(clock: OnChainClock): SecondsSince1970 =
   doAssert clock.started, "clock should be started before calling now()"
   return toUnix(getTime() + clock.offset)
 
-method waitUntil*(
+method waitUntil*(clock: OnChainClock, time: SecondsSince1970) {.async.} =
-    clock: OnChainClock, time: SecondsSince1970
-) {.async: (raises: [CancelledError]).} =
   while (let difference = time - clock.now(); difference > 0):
     clock.newBlock.clear()
     discard await clock.newBlock.wait().withTimeout(chronos.seconds(difference))

codex/contracts/config.nim

@@ -1,11 +1,10 @@
 import pkg/contractabi
-import pkg/ethers/contracts/fields
+import pkg/ethers/fields
 import pkg/questionable/results
 
 export contractabi
 
 const DefaultRequestCacheSize* = 128.uint16
-const DefaultMaxPriorityFeePerGas* = 1_000_000_000.uint64
 
 type
   MarketplaceConfig* = object

codex/contracts/deployment.nim

@@ -9,7 +9,7 @@ import ./marketplace
 
 type Deployment* = ref object
   provider: Provider
-  marketplaceAddressOverride: ?Address
+  config: CodexConf
 
 const knownAddresses = {
   # Hardhat localhost network
@@ -18,12 +18,9 @@ const knownAddresses = {
   # Taiko Alpha-3 Testnet
   "167005":
     {"Marketplace": Address.init("0x948CF9291b77Bd7ad84781b9047129Addf1b894F")}.toTable,
-  # Codex Testnet - Jun 19 2025 13:11:56 PM (+00:00 UTC)
+  # Codex Testnet - Feb 25 2025 07:24:19 AM (+00:00 UTC)
   "789987":
-    {"Marketplace": Address.init("0x5378a4EA5dA2a548ce22630A3AE74b052000C62D")}.toTable,
+    {"Marketplace": Address.init("0xfFaF679D5Cbfdd5Dbc9Be61C616ed115DFb597ed")}.toTable,
-  # Linea (Status)
-  "1660990954":
-    {"Marketplace": Address.init("0x34F606C65869277f236ce07aBe9af0B8c88F486B")}.toTable,
 }.toTable
 
 proc getKnownAddress(T: type, chainId: UInt256): ?Address =
@@ -35,16 +32,12 @@ proc getKnownAddress(T: type, chainId: UInt256): ?Address =
 
   return knownAddresses[id].getOrDefault($T, Address.none)
 
-proc new*(
+proc new*(_: type Deployment, provider: Provider, config: CodexConf): Deployment =
-    _: type Deployment,
+  Deployment(provider: provider, config: config)
-    provider: Provider,
-    marketplaceAddressOverride: ?Address = none Address,
-): Deployment =
-  Deployment(provider: provider, marketplaceAddressOverride: marketplaceAddressOverride)
 
 proc address*(deployment: Deployment, contract: type): Future[?Address] {.async.} =
   when contract is Marketplace:
-    if address =? deployment.marketplaceAddressOverride:
+    if address =? deployment.config.marketplaceAddress:
       return some address
 
   let chainId = await deployment.provider.getChainId()

codex/contracts/market.nim

@@ -1,6 +1,6 @@
-import std/strformat
 import std/strutils
 import pkg/ethers
+import pkg/upraises
 import pkg/questionable
 import pkg/lrucache
 import ../utils/exceptions
@@ -22,7 +22,6 @@ type
     rewardRecipient: ?Address
     configuration: ?MarketplaceConfig
     requestCache: LruCache[string, StorageRequest]
-    allowanceLock: AsyncLock
 
   MarketSubscription = market.Subscription
   EventSubscription = ethers.Subscription
@@ -50,195 +49,130 @@ func new*(
 proc raiseMarketError(message: string) {.raises: [MarketError].} =
   raise newException(MarketError, message)
 
-func prefixWith(suffix, prefix: string, separator = ": "): string =
+template convertEthersError(body) =
-  if prefix.len > 0:
-    return &"{prefix}{separator}{suffix}"
-  else:
-    return suffix
-
-template convertEthersError(msg: string = "", body) =
   try:
     body
   except EthersError as error:
-    raiseMarketError(error.msgDetail.prefixWith(msg))
+    raiseMarketError(error.msgDetail)
 
-proc config(
+proc config(market: OnChainMarket): Future[MarketplaceConfig] {.async.} =
-    market: OnChainMarket
-): Future[MarketplaceConfig] {.async: (raises: [CancelledError, MarketError]).} =
   without resolvedConfig =? market.configuration:
-    if err =? (await market.loadConfig()).errorOption:
+    let fetchedConfig = await market.contract.configuration()
-      raiseMarketError(err.msg)
+    market.configuration = some fetchedConfig
-
+    return fetchedConfig
-    without config =? market.configuration:
-      raiseMarketError("Failed to access to config from the Marketplace contract")
-
-    return config
 
   return resolvedConfig
 
-template withAllowanceLock*(market: OnChainMarket, body: untyped) =
+proc approveFunds(market: OnChainMarket, amount: UInt256) {.async.} =
-  if market.allowanceLock.isNil:
-    market.allowanceLock = newAsyncLock()
-  await market.allowanceLock.acquire()
-  try:
-    body
-  finally:
-    try:
-      market.allowanceLock.release()
-    except AsyncLockError as error:
-      raise newException(Defect, error.msg, error)
-
-proc approveFunds(
-    market: OnChainMarket, amount: UInt256
-) {.async: (raises: [CancelledError, MarketError]).} =
   debug "Approving tokens", amount
-  convertEthersError("Failed to approve funds"):
+  convertEthersError:
     let tokenAddress = await market.contract.token()
     let token = Erc20Token.new(tokenAddress, market.signer)
-    let owner = await market.signer.getAddress()
+    discard await token.increaseAllowance(market.contract.address(), amount).confirm(1)
-    let spender = market.contract.address
-    market.withAllowanceLock:
-      let allowance = await token.allowance(owner, spender)
-      discard await token.approve(spender, allowance + amount).confirm(1)
 
-method loadConfig*(
+method getZkeyHash*(market: OnChainMarket): Future[?string] {.async.} =
-    market: OnChainMarket
-): Future[?!void] {.async: (raises: [CancelledError]).} =
-  try:
-    without config =? market.configuration:
-      let fetchedConfig = await market.contract.configuration()
-
-      market.configuration = some fetchedConfig
-
-    return success()
-  except EthersError as err:
-    return failure newException(
-      MarketError,
-      "Failed to fetch the config from the Marketplace contract: " & err.msg,
-    )
-
-method getZkeyHash*(
-    market: OnChainMarket
-): Future[?string] {.async: (raises: [CancelledError, MarketError]).} =
   let config = await market.config()
   return some config.proofs.zkeyHash
 
-method getSigner*(
+method getSigner*(market: OnChainMarket): Future[Address] {.async.} =
-    market: OnChainMarket
+  convertEthersError:
-): Future[Address] {.async: (raises: [CancelledError, MarketError]).} =
-  convertEthersError("Failed to get signer address"):
     return await market.signer.getAddress()
 
-method periodicity*(
+method periodicity*(market: OnChainMarket): Future[Periodicity] {.async.} =
-    market: OnChainMarket
+  convertEthersError:
-): Future[Periodicity] {.async: (raises: [CancelledError, MarketError]).} =
-  convertEthersError("Failed to get Marketplace config"):
     let config = await market.config()
     let period = config.proofs.period
     return Periodicity(seconds: period)
 
-method proofTimeout*(
+method proofTimeout*(market: OnChainMarket): Future[uint64] {.async.} =
-    market: OnChainMarket
+  convertEthersError:
-): Future[uint64] {.async: (raises: [CancelledError, MarketError]).} =
-  convertEthersError("Failed to get Marketplace config"):
     let config = await market.config()
     return config.proofs.timeout
 
-method repairRewardPercentage*(
+method repairRewardPercentage*(market: OnChainMarket): Future[uint8] {.async.} =
-    market: OnChainMarket
+  convertEthersError:
-): Future[uint8] {.async: (raises: [CancelledError, MarketError]).} =
-  convertEthersError("Failed to get Marketplace config"):
     let config = await market.config()
     return config.collateral.repairRewardPercentage
 
 method requestDurationLimit*(market: OnChainMarket): Future[uint64] {.async.} =
-  convertEthersError("Failed to get Marketplace config"):
+  convertEthersError:
     let config = await market.config()
     return config.requestDurationLimit
 
-method proofDowntime*(
+method proofDowntime*(market: OnChainMarket): Future[uint8] {.async.} =
-    market: OnChainMarket
+  convertEthersError:
-): Future[uint8] {.async: (raises: [CancelledError, MarketError]).} =
-  convertEthersError("Failed to get Marketplace config"):
     let config = await market.config()
     return config.proofs.downtime
 
 method getPointer*(market: OnChainMarket, slotId: SlotId): Future[uint8] {.async.} =
-  convertEthersError("Failed to get slot pointer"):
+  convertEthersError:
     let overrides = CallOverrides(blockTag: some BlockTag.pending)
     return await market.contract.getPointer(slotId, overrides)
 
 method myRequests*(market: OnChainMarket): Future[seq[RequestId]] {.async.} =
-  convertEthersError("Failed to get my requests"):
+  convertEthersError:
     return await market.contract.myRequests
 
 method mySlots*(market: OnChainMarket): Future[seq[SlotId]] {.async.} =
-  convertEthersError("Failed to get my slots"):
+  convertEthersError:
     let slots = await market.contract.mySlots()
     debug "Fetched my slots", numSlots = len(slots)
 
     return slots
 
-method requestStorage(
+method requestStorage(market: OnChainMarket, request: StorageRequest) {.async.} =
-    market: OnChainMarket, request: StorageRequest
+  convertEthersError:
-) {.async: (raises: [CancelledError, MarketError]).} =
-  convertEthersError("Failed to request storage"):
     debug "Requesting storage"
     await market.approveFunds(request.totalPrice())
     discard await market.contract.requestStorage(request).confirm(1)
 
 method getRequest*(
     market: OnChainMarket, id: RequestId
-): Future[?StorageRequest] {.async: (raises: [CancelledError]).} =
+): Future[?StorageRequest] {.async.} =
-  try:
+  let key = $id
-    let key = $id
 
-    if key in market.requestCache:
+  if market.requestCache.contains(key):
-      return some market.requestCache[key]
+    return some market.requestCache[key]
 
-    let request = await market.contract.getRequest(id)
+  convertEthersError:
-    market.requestCache[key] = request
+    try:
-    return some request
+      let request = await market.contract.getRequest(id)
-  except Marketplace_UnknownRequest, KeyError:
+      market.requestCache[key] = request
-    warn "Cannot retrieve the request", error = getCurrentExceptionMsg()
+      return some request
-    return none StorageRequest
+    except Marketplace_UnknownRequest:
-  except EthersError as e:
+      return none StorageRequest
-    error "Cannot retrieve the request", error = e.msg
-    return none StorageRequest
 
 method requestState*(
     market: OnChainMarket, requestId: RequestId
 ): Future[?RequestState] {.async.} =
-  convertEthersError("Failed to get request state"):
+  convertEthersError:
     try:
       let overrides = CallOverrides(blockTag: some BlockTag.pending)
       return some await market.contract.requestState(requestId, overrides)
     except Marketplace_UnknownRequest:
       return none RequestState
 
-method slotState*(
+method slotState*(market: OnChainMarket, slotId: SlotId): Future[SlotState] {.async.} =
-    market: OnChainMarket, slotId: SlotId
+  convertEthersError:
-): Future[SlotState] {.async: (raises: [CancelledError, MarketError]).} =
-  convertEthersError("Failed to fetch the slot state from the Marketplace contract"):
     let overrides = CallOverrides(blockTag: some BlockTag.pending)
     return await market.contract.slotState(slotId, overrides)
 
 method getRequestEnd*(
     market: OnChainMarket, id: RequestId
 ): Future[SecondsSince1970] {.async.} =
-  convertEthersError("Failed to get request end"):
+  convertEthersError:
     return await market.contract.requestEnd(id)
 
 method requestExpiresAt*(
     market: OnChainMarket, id: RequestId
 ): Future[SecondsSince1970] {.async.} =
-  convertEthersError("Failed to get request expiry"):
+  convertEthersError:
     return await market.contract.requestExpiry(id)
 
 method getHost(
     market: OnChainMarket, requestId: RequestId, slotIndex: uint64
-): Future[?Address] {.async: (raises: [CancelledError, MarketError]).} =
+): Future[?Address] {.async.} =
-  convertEthersError("Failed to get slot's host"):
+  convertEthersError:
     let slotId = slotId(requestId, slotIndex)
     let address = await market.contract.getHost(slotId)
     if address != Address.default:
@@ -248,12 +182,12 @@ method getHost(
 
 method currentCollateral*(
     market: OnChainMarket, slotId: SlotId
-): Future[UInt256] {.async: (raises: [MarketError, CancelledError]).} =
+): Future[UInt256] {.async.} =
-  convertEthersError("Failed to get slot's current collateral"):
+  convertEthersError:
     return await market.contract.currentCollateral(slotId)
 
 method getActiveSlot*(market: OnChainMarket, slotId: SlotId): Future[?Slot] {.async.} =
-  convertEthersError("Failed to get active slot"):
+  convertEthersError:
     try:
       return some await market.contract.getActiveSlot(slotId)
     except Marketplace_SlotIsFree:
@@ -265,88 +199,42 @@ method fillSlot(
     slotIndex: uint64,
     proof: Groth16Proof,
     collateral: UInt256,
-) {.async: (raises: [CancelledError, MarketError]).} =
+) {.async.} =
-  convertEthersError("Failed to fill slot"):
+  convertEthersError:
     logScope:
       requestId
       slotIndex
 
-    try:
+    await market.approveFunds(collateral)
-      await market.approveFunds(collateral)
+    trace "calling fillSlot on contract"
+    discard await market.contract.fillSlot(requestId, slotIndex, proof).confirm(1)
+    trace "fillSlot transaction completed"
 
-      # Add 10% to gas estimate to deal with different evm code flow when we
+method freeSlot*(market: OnChainMarket, slotId: SlotId) {.async.} =
-      # happen to be the last one to fill a slot in this request
+  convertEthersError:
-      trace "estimating gas for fillSlot"
+    var freeSlot: Future[Confirmable]
-      let gas = await market.contract.estimateGas.fillSlot(requestId, slotIndex, proof)
+    if rewardRecipient =? market.rewardRecipient:
-      let gasLimit = (gas * 110) div 100
+      # If --reward-recipient specified, use it as the reward recipient, and use
-      let overrides = TransactionOverrides(gasLimit: some gasLimit)
+      # the SP's address as the collateral recipient
+      let collateralRecipient = await market.getSigner()
+      freeSlot = market.contract.freeSlot(
+        slotId,
+        rewardRecipient, # --reward-recipient
+        collateralRecipient,
+      ) # SP's address
+    else:
+      # Otherwise, use the SP's address as both the reward and collateral
+      # recipient (the contract will use msg.sender for both)
+      freeSlot = market.contract.freeSlot(slotId)
 
-      trace "calling fillSlot on contract", estimatedGas = gas, gasLimit = gasLimit
+    discard await freeSlot.confirm(1)
-      discard await market.contract
-      .fillSlot(requestId, slotIndex, proof, overrides)
-      .confirm(1)
-      trace "fillSlot transaction completed"
-    except Marketplace_SlotNotFree as parent:
-      raise newException(
-        SlotStateMismatchError, "Failed to fill slot because the slot is not free",
-        parent,
-      )
 
-method freeSlot*(
+method withdrawFunds(market: OnChainMarket, requestId: RequestId) {.async.} =
-    market: OnChainMarket, slotId: SlotId
+  convertEthersError:
-) {.async: (raises: [CancelledError, MarketError]).} =
-  convertEthersError("Failed to free slot"):
-    try:
-      var freeSlot: Future[Confirmable]
-      if rewardRecipient =? market.rewardRecipient:
-        # If --reward-recipient specified, use it as the reward recipient, and use
-        # the SP's address as the collateral recipient
-        let collateralRecipient = await market.getSigner()
-
-        # Add 200% to gas estimate to deal with different evm code flow when we
-        # happen to be the one to make the request fail
-        let gas = await market.contract.estimateGas.freeSlot(
-          slotId, rewardRecipient, collateralRecipient
-        )
-        let gasLimit = gas * 3
-        let overrides = TransactionOverrides(gasLimit: some gasLimit)
-
-        trace "calling freeSlot on contract", estimatedGas = gas, gasLimit = gasLimit
-
-        freeSlot = market.contract.freeSlot(
-          slotId,
-          rewardRecipient, # --reward-recipient
-          collateralRecipient, # SP's address
-          overrides,
-        )
-      else:
-        # Otherwise, use the SP's address as both the reward and collateral
-        # recipient (the contract will use msg.sender for both)
-
-        # Add 200% to gas estimate to deal with different evm code flow when we
-        # happen to be the one to make the request fail
-        let gas = await market.contract.estimateGas.freeSlot(slotId)
-        let gasLimit = gas * 3
-        let overrides = TransactionOverrides(gasLimit: some (gasLimit))
-
-        trace "calling freeSlot on contract", estimatedGas = gas, gasLimit = gasLimit
-
-        freeSlot = market.contract.freeSlot(slotId, overrides)
-
-      discard await freeSlot.confirm(1)
-    except Marketplace_SlotIsFree as parent:
-      raise newException(
-        SlotStateMismatchError, "Failed to free slot, slot is already free", parent
-      )
-
-method withdrawFunds(
-    market: OnChainMarket, requestId: RequestId
-) {.async: (raises: [CancelledError, MarketError]).} =
-  convertEthersError("Failed to withdraw funds"):
     discard await market.contract.withdrawFunds(requestId).confirm(1)
 
 method isProofRequired*(market: OnChainMarket, id: SlotId): Future[bool] {.async.} =
-  convertEthersError("Failed to get proof requirement"):
+  convertEthersError:
     try:
       let overrides = CallOverrides(blockTag: some BlockTag.pending)
       return await market.contract.isProofRequired(id, overrides)
@@ -354,7 +242,7 @@ method isProofRequired*(market: OnChainMarket, id: SlotId): Future[bool] {.async
       return false
 
 method willProofBeRequired*(market: OnChainMarket, id: SlotId): Future[bool] {.async.} =
-  convertEthersError("Failed to get future proof requirement"):
+  convertEthersError:
     try:
       let overrides = CallOverrides(blockTag: some BlockTag.pending)
       return await market.contract.willProofBeRequired(id, overrides)
@@ -364,42 +252,28 @@ method willProofBeRequired*(market: OnChainMarket, id: SlotId): Future[bool] {.a
 method getChallenge*(
     market: OnChainMarket, id: SlotId
 ): Future[ProofChallenge] {.async.} =
-  convertEthersError("Failed to get proof challenge"):
+  convertEthersError:
     let overrides = CallOverrides(blockTag: some BlockTag.pending)
     return await market.contract.getChallenge(id, overrides)
 
-method submitProof*(
+method submitProof*(market: OnChainMarket, id: SlotId, proof: Groth16Proof) {.async.} =
-    market: OnChainMarket, id: SlotId, proof: Groth16Proof
+  convertEthersError:
-) {.async: (raises: [CancelledError, MarketError]).} =
+    discard await market.contract.submitProof(id, proof).confirm(1)
-  convertEthersError("Failed to submit proof"):
-    try:
-      discard await market.contract.submitProof(id, proof).confirm(1)
-    except Proofs_InvalidProof as parent:
-      raise newException(
-        ProofInvalidError, "Failed to submit proof because the proof is invalid", parent
-      )
 
 method markProofAsMissing*(
     market: OnChainMarket, id: SlotId, period: Period
-) {.async: (raises: [CancelledError, MarketError]).} =
+) {.async.} =
-  convertEthersError("Failed to mark proof as missing"):
+  convertEthersError:
-    # Add 50% to gas estimate to deal with different evm code flow when we
+    discard await market.contract.markProofAsMissing(id, period).confirm(1)
-    # happen to be the one to make the request fail
-    let gas = await market.contract.estimateGas.markProofAsMissing(id, period)
-    let gasLimit = (gas * 150) div 100
-    let overrides = TransactionOverrides(gasLimit: some gasLimit)
 
-    trace "calling markProofAsMissing on contract",
+method canProofBeMarkedAsMissing*(
-      estimatedGas = gas, gasLimit = gasLimit
-
-    discard await market.contract.markProofAsMissing(id, period, overrides).confirm(1)
-
-method canMarkProofAsMissing*(
     market: OnChainMarket, id: SlotId, period: Period
-): Future[bool] {.async: (raises: [CancelledError]).} =
+): Future[bool] {.async.} =
+  let provider = market.contract.provider
+  let contractWithoutSigner = market.contract.connect(provider)
+  let overrides = CallOverrides(blockTag: some BlockTag.pending)
   try:
-    let overrides = CallOverrides(blockTag: some BlockTag.pending)
+    discard await contractWithoutSigner.markProofAsMissing(id, period, overrides)
-    discard await market.contract.canMarkProofAsMissing(id, period, overrides)
     return true
   except EthersError as e:
     trace "Proof cannot be marked as missing", msg = e.msg
@@ -407,56 +281,48 @@ method canMarkProofAsMissing*(
 
 method reserveSlot*(
     market: OnChainMarket, requestId: RequestId, slotIndex: uint64
-) {.async: (raises: [CancelledError, MarketError]).} =
+) {.async.} =
-  convertEthersError("Failed to reserve slot"):
+  convertEthersError:
-    try:
+    discard await market.contract
-      # Add 25% to gas estimate to deal with different evm code flow when we
+    .reserveSlot(
-      # happen to be the last one that is allowed to reserve the slot
+      requestId,
-      let gas = await market.contract.estimateGas.reserveSlot(requestId, slotIndex)
+      slotIndex,
-      let gasLimit = (gas * 125) div 100
+      # reserveSlot runs out of gas for unknown reason, but 100k gas covers it
-      let overrides = TransactionOverrides(gasLimit: some gasLimit)
+      TransactionOverrides(gasLimit: some 100000.u256),
-
+    )
-      trace "calling reserveSlot on contract", estimatedGas = gas, gasLimit = gasLimit
+    .confirm(1)
-
-      discard
-        await market.contract.reserveSlot(requestId, slotIndex, overrides).confirm(1)
-    except SlotReservations_ReservationNotAllowed:
-      raise newException(
-        SlotReservationNotAllowedError,
-        "Failed to reserve slot because reservation is not allowed",
-      )
 
 method canReserveSlot*(
     market: OnChainMarket, requestId: RequestId, slotIndex: uint64
 ): Future[bool] {.async.} =
-  convertEthersError("Unable to determine if slot can be reserved"):
+  convertEthersError:
     return await market.contract.canReserveSlot(requestId, slotIndex)
 
 method subscribeRequests*(
     market: OnChainMarket, callback: OnRequest
 ): Future[MarketSubscription] {.async.} =
-  proc onEvent(eventResult: ?!StorageRequested) {.raises: [].} =
+  proc onEvent(eventResult: ?!StorageRequested) {.upraises: [].} =
     without event =? eventResult, eventErr:
       error "There was an error in Request subscription", msg = eventErr.msg
       return
 
     callback(event.requestId, event.ask, event.expiry)
 
-  convertEthersError("Failed to subscribe to StorageRequested events"):
+  convertEthersError:
     let subscription = await market.contract.subscribe(StorageRequested, onEvent)
     return OnChainMarketSubscription(eventSubscription: subscription)
 
 method subscribeSlotFilled*(
     market: OnChainMarket, callback: OnSlotFilled
 ): Future[MarketSubscription] {.async.} =
-  proc onEvent(eventResult: ?!SlotFilled) {.raises: [].} =
+  proc onEvent(eventResult: ?!SlotFilled) {.upraises: [].} =
     without event =? eventResult, eventErr:
       error "There was an error in SlotFilled subscription", msg = eventErr.msg
       return
 
     callback(event.requestId, event.slotIndex)
 
-  convertEthersError("Failed to subscribe to SlotFilled events"):
+  convertEthersError:
     let subscription = await market.contract.subscribe(SlotFilled, onEvent)
     return OnChainMarketSubscription(eventSubscription: subscription)
 
@@ -470,27 +336,27 @@ method subscribeSlotFilled*(
     if eventRequestId == requestId and eventSlotIndex == slotIndex:
       callback(requestId, slotIndex)
 
-  convertEthersError("Failed to subscribe to SlotFilled events"):
+  convertEthersError:
     return await market.subscribeSlotFilled(onSlotFilled)
 
 method subscribeSlotFreed*(
     market: OnChainMarket, callback: OnSlotFreed
 ): Future[MarketSubscription] {.async.} =
-  proc onEvent(eventResult: ?!SlotFreed) {.raises: [].} =
+  proc onEvent(eventResult: ?!SlotFreed) {.upraises: [].} =
     without event =? eventResult, eventErr:
       error "There was an error in SlotFreed subscription", msg = eventErr.msg
       return
 
     callback(event.requestId, event.slotIndex)
 
-  convertEthersError("Failed to subscribe to SlotFreed events"):
+  convertEthersError:
     let subscription = await market.contract.subscribe(SlotFreed, onEvent)
     return OnChainMarketSubscription(eventSubscription: subscription)
 
 method subscribeSlotReservationsFull*(
     market: OnChainMarket, callback: OnSlotReservationsFull
 ): Future[MarketSubscription] {.async.} =
-  proc onEvent(eventResult: ?!SlotReservationsFull) {.raises: [].} =
+  proc onEvent(eventResult: ?!SlotReservationsFull) {.upraises: [].} =
     without event =? eventResult, eventErr:
       error "There was an error in SlotReservationsFull subscription",
         msg = eventErr.msg
@@ -498,28 +364,28 @@ method subscribeSlotReservationsFull*(
 
     callback(event.requestId, event.slotIndex)
 
-  convertEthersError("Failed to subscribe to SlotReservationsFull events"):
+  convertEthersError:
     let subscription = await market.contract.subscribe(SlotReservationsFull, onEvent)
     return OnChainMarketSubscription(eventSubscription: subscription)
 
 method subscribeFulfillment(
     market: OnChainMarket, callback: OnFulfillment
 ): Future[MarketSubscription] {.async.} =
-  proc onEvent(eventResult: ?!RequestFulfilled) {.raises: [].} =
+  proc onEvent(eventResult: ?!RequestFulfilled) {.upraises: [].} =
     without event =? eventResult, eventErr:
       error "There was an error in RequestFulfillment subscription", msg = eventErr.msg
       return
 
     callback(event.requestId)
 
-  convertEthersError("Failed to subscribe to RequestFulfilled events"):
+  convertEthersError:
     let subscription = await market.contract.subscribe(RequestFulfilled, onEvent)
     return OnChainMarketSubscription(eventSubscription: subscription)
 
 method subscribeFulfillment(
     market: OnChainMarket, requestId: RequestId, callback: OnFulfillment
 ): Future[MarketSubscription] {.async.} =
-  proc onEvent(eventResult: ?!RequestFulfilled) {.raises: [].} =
+  proc onEvent(eventResult: ?!RequestFulfilled) {.upraises: [].} =
     without event =? eventResult, eventErr:
       error "There was an error in RequestFulfillment subscription", msg = eventErr.msg
       return
@@ -527,28 +393,28 @@ method subscribeFulfillment(
     if event.requestId == requestId:
       callback(event.requestId)
 
-  convertEthersError("Failed to subscribe to RequestFulfilled events"):
+  convertEthersError:
     let subscription = await market.contract.subscribe(RequestFulfilled, onEvent)
     return OnChainMarketSubscription(eventSubscription: subscription)
 
 method subscribeRequestCancelled*(
     market: OnChainMarket, callback: OnRequestCancelled
 ): Future[MarketSubscription] {.async.} =
-  proc onEvent(eventResult: ?!RequestCancelled) {.raises: [].} =
+  proc onEvent(eventResult: ?!RequestCancelled) {.upraises: [].} =
     without event =? eventResult, eventErr:
       error "There was an error in RequestCancelled subscription", msg = eventErr.msg
       return
 
     callback(event.requestId)
 
-  convertEthersError("Failed to subscribe to RequestCancelled events"):
+  convertEthersError:
     let subscription = await market.contract.subscribe(RequestCancelled, onEvent)
     return OnChainMarketSubscription(eventSubscription: subscription)
 
 method subscribeRequestCancelled*(
     market: OnChainMarket, requestId: RequestId, callback: OnRequestCancelled
 ): Future[MarketSubscription] {.async.} =
-  proc onEvent(eventResult: ?!RequestCancelled) {.raises: [].} =
+  proc onEvent(eventResult: ?!RequestCancelled) {.upraises: [].} =
     without event =? eventResult, eventErr:
       error "There was an error in RequestCancelled subscription", msg = eventErr.msg
       return
@@ -556,28 +422,28 @@ method subscribeRequestCancelled*(
     if event.requestId == requestId:
       callback(event.requestId)
 
-  convertEthersError("Failed to subscribe to RequestCancelled events"):
+  convertEthersError:
     let subscription = await market.contract.subscribe(RequestCancelled, onEvent)
     return OnChainMarketSubscription(eventSubscription: subscription)
 
 method subscribeRequestFailed*(
     market: OnChainMarket, callback: OnRequestFailed
 ): Future[MarketSubscription] {.async.} =
-  proc onEvent(eventResult: ?!RequestFailed) {.raises: [].} =
+  proc onEvent(eventResult: ?!RequestFailed) {.upraises: [].} =
     without event =? eventResult, eventErr:
       error "There was an error in RequestFailed subscription", msg = eventErr.msg
       return
 
     callback(event.requestId)
 
-  convertEthersError("Failed to subscribe to RequestFailed events"):
+  convertEthersError:
     let subscription = await market.contract.subscribe(RequestFailed, onEvent)
     return OnChainMarketSubscription(eventSubscription: subscription)
 
 method subscribeRequestFailed*(
     market: OnChainMarket, requestId: RequestId, callback: OnRequestFailed
 ): Future[MarketSubscription] {.async.} =
-  proc onEvent(eventResult: ?!RequestFailed) {.raises: [].} =
+  proc onEvent(eventResult: ?!RequestFailed) {.upraises: [].} =
     without event =? eventResult, eventErr:
       error "There was an error in RequestFailed subscription", msg = eventErr.msg
       return
@@ -585,21 +451,21 @@ method subscribeRequestFailed*(
     if event.requestId == requestId:
       callback(event.requestId)
 
-  convertEthersError("Failed to subscribe to RequestFailed events"):
+  convertEthersError:
     let subscription = await market.contract.subscribe(RequestFailed, onEvent)
     return OnChainMarketSubscription(eventSubscription: subscription)
 
 method subscribeProofSubmission*(
     market: OnChainMarket, callback: OnProofSubmitted
 ): Future[MarketSubscription] {.async.} =
-  proc onEvent(eventResult: ?!ProofSubmitted) {.raises: [].} =
+  proc onEvent(eventResult: ?!ProofSubmitted) {.upraises: [].} =
     without event =? eventResult, eventErr:
       error "There was an error in ProofSubmitted subscription", msg = eventErr.msg
       return
 
     callback(event.id)
 
-  convertEthersError("Failed to subscribe to ProofSubmitted events"):
+  convertEthersError:
     let subscription = await market.contract.subscribe(ProofSubmitted, onEvent)
     return OnChainMarketSubscription(eventSubscription: subscription)
 
@@ -609,13 +475,13 @@ method unsubscribe*(subscription: OnChainMarketSubscription) {.async.} =
 method queryPastSlotFilledEvents*(
     market: OnChainMarket, fromBlock: BlockTag
 ): Future[seq[SlotFilled]] {.async.} =
-  convertEthersError("Failed to get past SlotFilled events from block"):
+  convertEthersError:
     return await market.contract.queryFilter(SlotFilled, fromBlock, BlockTag.latest)
 
 method queryPastSlotFilledEvents*(
     market: OnChainMarket, blocksAgo: int
 ): Future[seq[SlotFilled]] {.async.} =
-  convertEthersError("Failed to get past SlotFilled events"):
+  convertEthersError:
     let fromBlock = await market.contract.provider.pastBlockTag(blocksAgo)
 
     return await market.queryPastSlotFilledEvents(fromBlock)
@@ -623,58 +489,21 @@ method queryPastSlotFilledEvents*(
 method queryPastSlotFilledEvents*(
     market: OnChainMarket, fromTime: SecondsSince1970
 ): Future[seq[SlotFilled]] {.async.} =
-  convertEthersError("Failed to get past SlotFilled events from time"):
+  convertEthersError:
     let fromBlock = await market.contract.provider.blockNumberForEpoch(fromTime)
     return await market.queryPastSlotFilledEvents(BlockTag.init(fromBlock))
 
 method queryPastStorageRequestedEvents*(
     market: OnChainMarket, fromBlock: BlockTag
 ): Future[seq[StorageRequested]] {.async.} =
-  convertEthersError("Failed to get past StorageRequested events from block"):
+  convertEthersError:
     return
       await market.contract.queryFilter(StorageRequested, fromBlock, BlockTag.latest)
 
 method queryPastStorageRequestedEvents*(
     market: OnChainMarket, blocksAgo: int
 ): Future[seq[StorageRequested]] {.async.} =
-  convertEthersError("Failed to get past StorageRequested events"):
+  convertEthersError:
     let fromBlock = await market.contract.provider.pastBlockTag(blocksAgo)
 
     return await market.queryPastStorageRequestedEvents(fromBlock)
-
-method slotCollateral*(
-    market: OnChainMarket, requestId: RequestId, slotIndex: uint64
-): Future[?!UInt256] {.async: (raises: [CancelledError]).} =
-  let slotid = slotId(requestId, slotIndex)
-
-  try:
-    let slotState = await market.slotState(slotid)
-
-    without request =? await market.getRequest(requestId):
-      return failure newException(
-        MarketError, "Failure calculating the slotCollateral, cannot get the request"
-      )
-
-    return market.slotCollateral(request.ask.collateralPerSlot, slotState)
-  except MarketError as error:
-    error "Error when trying to calculate the slotCollateral", error = error.msg
-    return failure error
-
-method slotCollateral*(
-    market: OnChainMarket, collateralPerSlot: UInt256, slotState: SlotState
-): ?!UInt256 {.raises: [].} =
-  if slotState == SlotState.Repair:
-    without repairRewardPercentage =?
-      market.configuration .? collateral .? repairRewardPercentage:
-      return failure newException(
-        MarketError,
-        "Failure calculating the slotCollateral, cannot get the reward percentage",
-      )
-
-    return success (
-      collateralPerSlot - (collateralPerSlot * repairRewardPercentage.u256).div(
-        100.u256
-      )
-    )
-
-  return success(collateralPerSlot)

codex/contracts/marketplace.nim

@@ -51,8 +51,8 @@ type
   Proofs_ProofNotMissing* = object of SolidityError
   Proofs_ProofNotRequired* = object of SolidityError
   Proofs_ProofAlreadyMarkedMissing* = object of SolidityError
+  Proofs_InvalidProbability* = object of SolidityError
   Periods_InvalidSecondsPerPeriod* = object of SolidityError
-  SlotReservations_ReservationNotAllowed* = object of SolidityError
 
 proc configuration*(marketplace: Marketplace): MarketplaceConfig {.contract, view.}
 proc token*(marketplace: Marketplace): Address {.contract, view.}
@@ -67,9 +67,7 @@ proc requestStorage*(
   errors: [
     Marketplace_InvalidClientAddress, Marketplace_RequestAlreadyExists,
     Marketplace_InvalidExpiry, Marketplace_InsufficientSlots,
-    Marketplace_InvalidMaxSlotLoss, Marketplace_InsufficientDuration,
+    Marketplace_InvalidMaxSlotLoss,
-    Marketplace_InsufficientProofProbability, Marketplace_InsufficientCollateral,
-    Marketplace_InsufficientReward, Marketplace_InvalidCid,
   ]
 .}
 
@@ -178,17 +176,6 @@ proc markProofAsMissing*(
   ]
 .}
 
-proc canMarkProofAsMissing*(
-  marketplace: Marketplace, id: SlotId, period: uint64
-): Confirmable {.
-  contract,
-  errors: [
-    Marketplace_SlotNotAcceptingProofs, Proofs_PeriodNotEnded,
-    Proofs_ValidationTimedOut, Proofs_ProofNotMissing, Proofs_ProofNotRequired,
-    Proofs_ProofAlreadyMarkedMissing,
-  ]
-.}
-
 proc reserveSlot*(
   marketplace: Marketplace, requestId: RequestId, slotIndex: uint64
 ): Confirmable {.contract.}

codex/contracts/proofs.nim

@@ -1,6 +1,6 @@
 import pkg/stint
 import pkg/contractabi
-import pkg/ethers/contracts/fields
+import pkg/ethers/fields
 
 type
   Groth16Proof* = object

codex/contracts/requests.nim

@@ -2,13 +2,14 @@ import std/hashes
 import std/sequtils
 import std/typetraits
 import pkg/contractabi
-import pkg/nimcrypto/keccak
+import pkg/nimcrypto
-import pkg/ethers/contracts/fields
+import pkg/ethers/fields
 import pkg/questionable/results
 import pkg/stew/byteutils
 import pkg/libp2p/[cid, multicodec]
 import ../logutils
 import ../utils/json
+import ../clock
 from ../errors import mapFailure
 
 export contractabi

codex/discovery.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2022 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -7,16 +7,14 @@
 ## This file may not be copied, modified, or distributed except according to
 ## those terms.
 
-{.push raises: [].}
-
 import std/algorithm
-import std/net
 import std/sequtils
 
 import pkg/chronos
 import pkg/libp2p/[cid, multicodec, routing_record, signed_envelope]
 import pkg/questionable
 import pkg/questionable/results
+import pkg/stew/shims/net
 import pkg/contractabi/address as ca
 import pkg/codexdht/discv5/[routing_table, protocol as discv5]
 from pkg/nimcrypto import keccak256
@@ -43,7 +41,6 @@ type Discovery* = ref object of RootObj
     # record to advertice node connection information, this carry any
     # address that the node can be connected on
   dhtRecord*: ?SignedPeerRecord # record to advertice DHT connection information
-  isStarted: bool
 
 proc toNodeId*(cid: Cid): NodeId =
   ## Cid to discovery id
@@ -57,122 +54,70 @@ proc toNodeId*(host: ca.Address): NodeId =
 
   readUintBE[256](keccak256.digest(host.toArray).data)
 
-proc findPeer*(
+proc findPeer*(d: Discovery, peerId: PeerId): Future[?PeerRecord] {.async.} =
-    d: Discovery, peerId: PeerId
-): Future[?PeerRecord] {.async: (raises: [CancelledError]).} =
   trace "protocol.resolve..."
   ## Find peer using the given Discovery object
   ##
+  let node = await d.protocol.resolve(toNodeId(peerId))
 
-  try:
+  return
-    let node = await d.protocol.resolve(toNodeId(peerId))
+    if node.isSome():
+      node.get().record.data.some
+    else:
+      PeerRecord.none
 
-    return
+method find*(d: Discovery, cid: Cid): Future[seq[SignedPeerRecord]] {.async, base.} =
-      if node.isSome():
-        node.get().record.data.some
-      else:
-        PeerRecord.none
-  except CancelledError as exc:
-    warn "Error finding peer", peerId = peerId, exc = exc.msg
-    raise exc
-  except CatchableError as exc:
-    warn "Error finding peer", peerId = peerId, exc = exc.msg
-
-  return PeerRecord.none
-
-method find*(
-    d: Discovery, cid: Cid
-): Future[seq[SignedPeerRecord]] {.async: (raises: [CancelledError]), base.} =
   ## Find block providers
   ##
+  without providers =? (await d.protocol.getProviders(cid.toNodeId())).mapFailure, error:
+    warn "Error finding providers for block", cid, error = error.msg
 
-  try:
+  return providers.filterIt(not (it.data.peerId == d.peerId))
-    without providers =? (await d.protocol.getProviders(cid.toNodeId())).mapFailure,
-      error:
-      warn "Error finding providers for block", cid, error = error.msg
 
-    return providers.filterIt(not (it.data.peerId == d.peerId))
+method provide*(d: Discovery, cid: Cid) {.async, base.} =
-  except CancelledError as exc:
-    warn "Error finding providers for block", cid, exc = exc.msg
-    raise exc
-  except CatchableError as exc:
-    warn "Error finding providers for block", cid, exc = exc.msg
-
-method provide*(d: Discovery, cid: Cid) {.async: (raises: [CancelledError]), base.} =
   ## Provide a block Cid
   ##
-  try:
+  let nodes = await d.protocol.addProvider(cid.toNodeId(), d.providerRecord.get)
-    let nodes = await d.protocol.addProvider(cid.toNodeId(), d.providerRecord.get)
 
-    if nodes.len <= 0:
+  if nodes.len <= 0:
-      warn "Couldn't provide to any nodes!"
+    warn "Couldn't provide to any nodes!"
-  except CancelledError as exc:
-    warn "Error providing block", cid, exc = exc.msg
-    raise exc
-  except CatchableError as exc:
-    warn "Error providing block", cid, exc = exc.msg
 
 method find*(
     d: Discovery, host: ca.Address
-): Future[seq[SignedPeerRecord]] {.async: (raises: [CancelledError]), base.} =
+): Future[seq[SignedPeerRecord]] {.async, base.} =
   ## Find host providers
   ##
 
-  try:
+  trace "Finding providers for host", host = $host
-    trace "Finding providers for host", host = $host
+  without var providers =? (await d.protocol.getProviders(host.toNodeId())).mapFailure,
-    without var providers =? (await d.protocol.getProviders(host.toNodeId())).mapFailure,
+    error:
-      error:
+    trace "Error finding providers for host", host = $host, exc = error.msg
-      trace "Error finding providers for host", host = $host, exc = error.msg
+    return
-      return
 
-    if providers.len <= 0:
+  if providers.len <= 0:
-      trace "No providers found", host = $host
+    trace "No providers found", host = $host
-      return
+    return
 
-    providers.sort do(a, b: SignedPeerRecord) -> int:
+  providers.sort do(a, b: SignedPeerRecord) -> int:
-      system.cmp[uint64](a.data.seqNo, b.data.seqNo)
+    system.cmp[uint64](a.data.seqNo, b.data.seqNo)
 
-    return providers
+  return providers
-  except CancelledError as exc:
-    warn "Error finding providers for host", host = $host, exc = exc.msg
-    raise exc
-  except CatchableError as exc:
-    warn "Error finding providers for host", host = $host, exc = exc.msg
 
-method provide*(
+method provide*(d: Discovery, host: ca.Address) {.async, base.} =
-    d: Discovery, host: ca.Address
-) {.async: (raises: [CancelledError]), base.} =
   ## Provide hosts
   ##
 
-  try:
+  trace "Providing host", host = $host
-    trace "Providing host", host = $host
+  let nodes = await d.protocol.addProvider(host.toNodeId(), d.providerRecord.get)
-    let nodes = await d.protocol.addProvider(host.toNodeId(), d.providerRecord.get)
+  if nodes.len > 0:
-    if nodes.len > 0:
+    trace "Provided to nodes", nodes = nodes.len
-      trace "Provided to nodes", nodes = nodes.len
-  except CancelledError as exc:
-    warn "Error providing host", host = $host, exc = exc.msg
-    raise exc
-  except CatchableError as exc:
-    warn "Error providing host", host = $host, exc = exc.msg
 
-method removeProvider*(
+method removeProvider*(d: Discovery, peerId: PeerId): Future[void] {.base, gcsafe.} =
-    d: Discovery, peerId: PeerId
-): Future[void] {.base, async: (raises: [CancelledError]).} =
   ## Remove provider from providers table
   ##
 
   trace "Removing provider", peerId
-  try:
+  d.protocol.removeProvidersLocal(peerId)
-    await d.protocol.removeProvidersLocal(peerId)
-  except CancelledError as exc:
-    warn "Error removing provider", peerId = peerId, exc = exc.msg
-    raise exc
-  except CatchableError as exc:
-    warn "Error removing provider", peerId = peerId, exc = exc.msg
-  except Exception as exc: # Something in discv5 is raising Exception
-    warn "Error removing provider", peerId = peerId, exc = exc.msg
-    raiseAssert("Unexpected Exception in removeProvider")
 
 proc updateAnnounceRecord*(d: Discovery, addrs: openArray[MultiAddress]) =
   ## Update providers record
@@ -180,7 +125,7 @@ proc updateAnnounceRecord*(d: Discovery, addrs: openArray[MultiAddress]) =
 
   d.announceAddrs = @addrs
 
-  info "Updating announce record", addrs = d.announceAddrs
+  trace "Updating announce record", addrs = d.announceAddrs
   d.providerRecord = SignedPeerRecord
     .init(d.key, PeerRecord.init(d.peerId, d.announceAddrs))
     .expect("Should construct signed record").some
@@ -192,7 +137,7 @@ proc updateDhtRecord*(d: Discovery, addrs: openArray[MultiAddress]) =
   ## Update providers record
   ##
 
-  info "Updating Dht record", addrs = addrs
+  trace "Updating Dht record", addrs = addrs
   d.dhtRecord = SignedPeerRecord
     .init(d.key, PeerRecord.init(d.peerId, @addrs))
     .expect("Should construct signed record").some
@@ -200,23 +145,12 @@ proc updateDhtRecord*(d: Discovery, addrs: openArray[MultiAddress]) =
   if not d.protocol.isNil:
     d.protocol.updateRecord(d.dhtRecord).expect("Should update SPR")
 
-proc start*(d: Discovery) {.async: (raises: []).} =
+proc start*(d: Discovery) {.async.} =
-  try:
+  d.protocol.open()
-    d.protocol.open()
+  await d.protocol.start()
-    await d.protocol.start()
-    d.isStarted = true
-  except CatchableError as exc:
-    error "Error starting discovery", exc = exc.msg
 
-proc stop*(d: Discovery) {.async: (raises: []).} =
+proc stop*(d: Discovery) {.async.} =
-  if not d.isStarted:
+  await d.protocol.closeWait()
-    warn "Discovery not started, skipping stop"
-    return
-
-  try:
-    await noCancel d.protocol.closeWait()
-  except CatchableError as exc:
-    error "Error stopping discovery", exc = exc.msg
 
 proc new*(
     T: type Discovery,

codex/erasure.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2022 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))

codex/erasure/backend.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2022 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -7,7 +7,10 @@
 ## This file may not be copied, modified, or distributed except according to
 ## those terms.
 
-{.push raises: [], gcsafe.}
+import pkg/upraises
+
+push:
+  {.upraises: [].}
 
 import ../stores
 

codex/erasure/backends/leopard.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2022 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))

codex/erasure/erasure.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2022 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -7,7 +7,10 @@
 ## This file may not be copied, modified, or distributed except according to
 ## those terms.
 
-{.push raises: [], gcsafe.}
+import pkg/upraises
+
+push:
+  {.upraises: [].}
 
 import std/[sugar, atomics, sequtils]
 
@@ -22,7 +25,6 @@ import ../logutils
 import ../manifest
 import ../merkletree
 import ../stores
-import ../clock
 import ../blocktype as bt
 import ../utils
 import ../utils/asynciter
@@ -118,22 +120,19 @@ func indexToPos(steps, idx, step: int): int {.inline.} =
   (idx - step) div steps
 
 proc getPendingBlocks(
-    self: Erasure, manifest: Manifest, indices: seq[int]
+    self: Erasure, manifest: Manifest, indicies: seq[int]
 ): AsyncIter[(?!bt.Block, int)] =
   ## Get pending blocks iterator
   ##
-  var pendingBlocks: seq[Future[(?!bt.Block, int)]] = @[]
 
-  proc attachIndex(
+  var
-      fut: Future[?!bt.Block], i: int
-  ): Future[(?!bt.Block, int)] {.async.} =
-    ## avoids closure capture issues
-    return (await fut, i)
-
-  for blockIndex in indices:
     # request blocks from the store
-    let fut = self.store.getBlock(BlockAddress.init(manifest.treeCid, blockIndex))
+    pendingBlocks = indicies.map(
-    pendingBlocks.add(attachIndex(fut, blockIndex))
+      (i: int) =>
+        self.store.getBlock(BlockAddress.init(manifest.treeCid, i)).map(
+          (r: ?!bt.Block) => (r, i)
+        ) # Get the data blocks (first K)
+    )
 
   proc isFinished(): bool =
     pendingBlocks.len == 0
@@ -169,16 +168,16 @@ proc prepareEncodingData(
     strategy = params.strategy.init(
       firstIndex = 0, lastIndex = params.rounded - 1, iterations = params.steps
     )
-    indices = toSeq(strategy.getIndices(step))
+    indicies = toSeq(strategy.getIndicies(step))
     pendingBlocksIter =
-      self.getPendingBlocks(manifest, indices.filterIt(it < manifest.blocksCount))
+      self.getPendingBlocks(manifest, indicies.filterIt(it < manifest.blocksCount))
 
   var resolved = 0
   for fut in pendingBlocksIter:
     let (blkOrErr, idx) = await fut
     without blk =? blkOrErr, err:
-      warn "Failed retrieving a block", treeCid = manifest.treeCid, idx, msg = err.msg
+      warn "Failed retreiving a block", treeCid = manifest.treeCid, idx, msg = err.msg
-      return failure(err)
+      continue
 
     let pos = indexToPos(params.steps, idx, step)
     shallowCopy(data[pos], if blk.isEmpty: emptyBlock else: blk.data)
@@ -186,7 +185,7 @@ proc prepareEncodingData(
 
     resolved.inc()
 
-  for idx in indices.filterIt(it >= manifest.blocksCount):
+  for idx in indicies.filterIt(it >= manifest.blocksCount):
     let pos = indexToPos(params.steps, idx, step)
     trace "Padding with empty block", idx
     shallowCopy(data[pos], emptyBlock)
@@ -219,8 +218,8 @@ proc prepareDecodingData(
     strategy = encoded.protectedStrategy.init(
       firstIndex = 0, lastIndex = encoded.blocksCount - 1, iterations = encoded.steps
     )
-    indices = toSeq(strategy.getIndices(step))
+    indicies = toSeq(strategy.getIndicies(step))
-    pendingBlocksIter = self.getPendingBlocks(encoded, indices)
+    pendingBlocksIter = self.getPendingBlocks(encoded, indicies)
 
   var
     dataPieces = 0
@@ -234,7 +233,7 @@ proc prepareDecodingData(
 
     let (blkOrErr, idx) = await fut
     without blk =? blkOrErr, err:
-      trace "Failed retrieving a block", idx, treeCid = encoded.treeCid, msg = err.msg
+      trace "Failed retreiving a block", idx, treeCid = encoded.treeCid, msg = err.msg
       continue
 
     let pos = indexToPos(encoded.steps, idx, step)
@@ -311,10 +310,10 @@ proc leopardEncodeTask(tp: Taskpool, task: ptr EncodeTask) {.gcsafe.} =
   else:
     task[].success.store(true)
 
-proc asyncEncode*(
+proc encodeAsync*(
     self: Erasure,
     blockSize, blocksLen, parityLen: int,
-    blocks: ref seq[seq[byte]],
+    data: ref seq[seq[byte]],
     parity: ptr UncheckedArray[ptr UncheckedArray[byte]],
 ): Future[?!void] {.async: (raises: [CancelledError]).} =
   without threadPtr =? ThreadSignalPtr.new():
@@ -323,10 +322,13 @@ proc asyncEncode*(
   defer:
     threadPtr.close().expect("closing once works")
 
-  var data = makeUncheckedArray(blocks)
+  var blockData = createDoubleArray(blocksLen, blockSize)
+
+  for i in 0 ..< data[].len:
+    copyMem(blockData[i], addr data[i][0], blockSize)
 
   defer:
-    dealloc(data)
+    freeDoubleArray(blockData, blocksLen)
 
   ## Create an ecode task with block data 
   var task = EncodeTask(
@@ -334,26 +336,33 @@ proc asyncEncode*(
     blockSize: blockSize,
     blocksLen: blocksLen,
     parityLen: parityLen,
-    blocks: data,
+    blocks: blockData,
     parity: parity,
     signal: threadPtr,
   )
 
+  let t = addr task
+
   doAssert self.taskPool.numThreads > 1,
     "Must have at least one separate thread or signal will never be fired"
-  self.taskPool.spawn leopardEncodeTask(self.taskPool, addr task)
+  self.taskPool.spawn leopardEncodeTask(self.taskPool, t)
   let threadFut = threadPtr.wait()
 
-  if joinErr =? catch(await threadFut.join()).errorOption:
+  try:
-    if err =? catch(await noCancel threadFut).errorOption:
+    await threadFut.join()
-      return failure(err)
+  except CatchableError as exc:
-    if joinErr of CancelledError:
+    try:
-      raise (ref CancelledError) joinErr
+      await threadFut
-    else:
+    except AsyncError as asyncExc:
-      return failure(joinErr)
+      return failure(asyncExc.msg)
+    finally:
+      if exc of CancelledError:
+        raise (ref CancelledError) exc
+      else:
+        return failure(exc.msg)
 
-  if not task.success.load():
+  if not t.success.load():
-    return failure("Leopard encoding task failed")
+    return failure("Leopard encoding failed")
 
   success()
 
@@ -383,8 +392,6 @@ proc encodeData(
       var
         data = seq[seq[byte]].new() # number of blocks to encode
         parity = createDoubleArray(params.ecM, manifest.blockSize.int)
-      defer:
-        freeDoubleArray(parity, params.ecM)
 
       data[].setLen(params.ecK)
       # TODO: this is a tight blocking loop so we sleep here to allow
@@ -402,13 +409,15 @@ proc encodeData(
 
       try:
         if err =? (
-          await self.asyncEncode(
+          await self.encodeAsync(
             manifest.blockSize.int, params.ecK, params.ecM, data, parity
           )
         ).errorOption:
           return failure(err)
       except CancelledError as exc:
         raise exc
+      finally:
+        freeDoubleArray(parity, params.ecM)
 
       var idx = params.rounded + step
       for j in 0 ..< params.ecM:
@@ -420,8 +429,8 @@ proc encodeData(
 
         trace "Adding parity block", cid = blk.cid, idx
         cids[idx] = blk.cid
-        if error =? (await self.store.putBlock(blk)).errorOption:
+        if isErr (await self.store.putBlock(blk)):
-          warn "Unable to store block!", cid = blk.cid, msg = error.msg
+          trace "Unable to store block!", cid = blk.cid
           return failure("Unable to store block!")
         idx.inc(params.steps)
 
@@ -480,7 +489,6 @@ proc leopardDecodeTask(tp: Taskpool, task: ptr DecodeTask) {.gcsafe.} =
     task[].erasure.decoderProvider(task[].blockSize, task[].blocksLen, task[].parityLen)
   defer:
     decoder.release()
-    discard task[].signal.fireSync()
 
   if (
     let res = decoder.decode(
@@ -498,7 +506,9 @@ proc leopardDecodeTask(tp: Taskpool, task: ptr DecodeTask) {.gcsafe.} =
   else:
     task[].success.store(true)
 
-proc asyncDecode*(
+  discard task[].signal.fireSync()
+
+proc decodeAsync*(
     self: Erasure,
     blockSize, blocksLen, parityLen: int,
     blocks, parity: ref seq[seq[byte]],
@@ -511,12 +521,24 @@ proc asyncDecode*(
     threadPtr.close().expect("closing once works")
 
   var
-    blockData = makeUncheckedArray(blocks)
+    blocksData = createDoubleArray(blocksLen, blockSize)
-    parityData = makeUncheckedArray(parity)
+    parityData = createDoubleArray(parityLen, blockSize)
+
+  for i in 0 ..< blocks[].len:
+    if blocks[i].len > 0:
+      copyMem(blocksData[i], addr blocks[i][0], blockSize)
+    else:
+      blocksData[i] = nil
+
+  for i in 0 ..< parity[].len:
+    if parity[i].len > 0:
+      copyMem(parityData[i], addr parity[i][0], blockSize)
+    else:
+      parityData[i] = nil
 
   defer:
-    dealloc(blockData)
+    freeDoubleArray(blocksData, blocksLen)
-    dealloc(parityData)
+    freeDoubleArray(parityData, parityLen)
 
   ## Create an decode task with block data 
   var task = DecodeTask(
@@ -525,33 +547,44 @@ proc asyncDecode*(
     blocksLen: blocksLen,
     parityLen: parityLen,
     recoveredLen: blocksLen,
-    blocks: blockData,
+    blocks: blocksData,
     parity: parityData,
     recovered: recovered,
     signal: threadPtr,
   )
 
+  # Hold the task pointer until the signal is received
+  let t = addr task
   doAssert self.taskPool.numThreads > 1,
     "Must have at least one separate thread or signal will never be fired"
-  self.taskPool.spawn leopardDecodeTask(self.taskPool, addr task)
+  self.taskPool.spawn leopardDecodeTask(self.taskPool, t)
   let threadFut = threadPtr.wait()
 
-  if joinErr =? catch(await threadFut.join()).errorOption:
+  try:
-    if err =? catch(await noCancel threadFut).errorOption:
+    await threadFut.join()
-      return failure(err)
+  except CatchableError as exc:
-    if joinErr of CancelledError:
+    try:
-      raise (ref CancelledError) joinErr
+      await threadFut
-    else:
+    except AsyncError as asyncExc:
-      return failure(joinErr)
+      return failure(asyncExc.msg)
+    finally:
+      if exc of CancelledError:
+        raise (ref CancelledError) exc
+      else:
+        return failure(exc.msg)
 
-  if not task.success.load():
+  if not t.success.load():
-    return failure("Leopard decoding task failed")
+    return failure("Leopard encoding failed")
 
   success()
 
-proc decodeInternal(
+proc decode*(self: Erasure, encoded: Manifest): Future[?!Manifest] {.async.} =
-    self: Erasure, encoded: Manifest
+  ## Decode a protected manifest into it's original
-): Future[?!(ref seq[Cid], seq[Natural])] {.async.} =
+  ## manifest
+  ##
+  ## `encoded` - the encoded (protected) manifest to
+  ##             be recovered
+  ##
   logScope:
     steps = encoded.steps
     rounded_blocks = encoded.rounded
@@ -575,8 +608,6 @@ proc decodeInternal(
         data = seq[seq[byte]].new()
         parityData = seq[seq[byte]].new()
         recovered = createDoubleArray(encoded.ecK, encoded.blockSize.int)
-      defer:
-        freeDoubleArray(recovered, encoded.ecK)
 
       data[].setLen(encoded.ecK) # set len to K
       parityData[].setLen(encoded.ecM) # set len to M
@@ -596,13 +627,15 @@ proc decodeInternal(
       trace "Erasure decoding data"
       try:
         if err =? (
-          await self.asyncDecode(
+          await self.decodeAsync(
             encoded.blockSize.int, encoded.ecK, encoded.ecM, data, parityData, recovered
           )
         ).errorOption:
           return failure(err)
       except CancelledError as exc:
         raise exc
+      finally:
+        freeDoubleArray(recovered, encoded.ecK)
 
       for i in 0 ..< encoded.ecK:
         let idx = i * encoded.steps + step
@@ -616,12 +649,10 @@ proc decodeInternal(
             return failure(error)
 
           trace "Recovered block", cid = blk.cid, index = i
-          if error =? (await self.store.putBlock(blk)).errorOption:
+          if isErr (await self.store.putBlock(blk)):
-            warn "Unable to store block!", cid = blk.cid, msg = error.msg
+            trace "Unable to store block!", cid = blk.cid
             return failure("Unable to store block!")
 
-          self.store.completeBlock(BlockAddress.init(encoded.treeCid, idx), blk)
-
           cids[idx] = blk.cid
           recoveredIndices.add(idx)
   except CancelledError as exc:
@@ -633,19 +664,6 @@ proc decodeInternal(
   finally:
     decoder.release()
 
-  return (cids, recoveredIndices).success
-
-proc decode*(self: Erasure, encoded: Manifest): Future[?!Manifest] {.async.} =
-  ## Decode a protected manifest into it's original
-  ## manifest
-  ##
-  ## `encoded` - the encoded (protected) manifest to
-  ##             be recovered
-  ##
-
-  without (cids, recoveredIndices) =? (await self.decodeInternal(encoded)), err:
-    return failure(err)
-
   without tree =? CodexTree.init(cids[0 ..< encoded.originalBlocksCount]), err:
     return failure(err)
 
@@ -667,44 +685,6 @@ proc decode*(self: Erasure, encoded: Manifest): Future[?!Manifest] {.async.} =
 
   return decoded.success
 
-proc repair*(self: Erasure, encoded: Manifest): Future[?!void] {.async.} =
-  ## Repair a protected manifest by reconstructing the full dataset
-  ##
-  ## `encoded` - the encoded (protected) manifest to
-  ##             be repaired
-  ##
-
-  without (cids, _) =? (await self.decodeInternal(encoded)), err:
-    return failure(err)
-
-  without tree =? CodexTree.init(cids[0 ..< encoded.originalBlocksCount]), err:
-    return failure(err)
-
-  without treeCid =? tree.rootCid, err:
-    return failure(err)
-
-  if treeCid != encoded.originalTreeCid:
-    return failure(
-      "Original tree root differs from the tree root computed out of recovered data"
-    )
-
-  if err =? (await self.store.putAllProofs(tree)).errorOption:
-    return failure(err)
-
-  without repaired =? (
-    await self.encode(
-      Manifest.new(encoded), encoded.ecK, encoded.ecM, encoded.protectedStrategy
-    )
-  ), err:
-    return failure(err)
-
-  if repaired.treeCid != encoded.treeCid:
-    return failure(
-      "Original tree root differs from the repaired tree root encoded out of recovered data"
-    )
-
-  return success()
-
 proc start*(self: Erasure) {.async.} =
   return
 

codex/errors.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -7,11 +7,7 @@
 ## This file may not be copied, modified, or distributed except according to
 ## those terms.
 
-{.push raises: [].}
-
 import std/options
-import std/sugar
-import std/sequtils
 
 import pkg/results
 import pkg/chronos
@@ -23,8 +19,6 @@ type
   CodexError* = object of CatchableError # base codex error
   CodexResult*[T] = Result[T, ref CodexError]
 
-  FinishedFailed*[T] = tuple[success: seq[Future[T]], failure: seq[Future[T]]]
-
 template mapFailure*[T, V, E](
     exp: Result[T, V], exc: typedesc[E]
 ): Result[T, ref CatchableError] =
@@ -46,43 +40,35 @@ func toFailure*[T](exp: Option[T]): Result[T, ref CatchableError] {.inline.} =
   else:
     T.failure("Option is None")
 
-proc allFinishedFailed*[T](
+# allFuturesThrowing was moved to the tests in libp2p
-    futs: auto
+proc allFuturesThrowing*[T](args: varargs[Future[T]]): Future[void] =
-): Future[FinishedFailed[T]] {.async: (raises: [CancelledError]).} =
+  var futs: seq[Future[T]]
-  ## Check if all futures have finished or failed
+  for fut in args:
-  ##
+    futs &= fut
-  ## TODO: wip, not sure if we want this - at the minimum,
+  proc call() {.async.} =
-  ## we should probably avoid the async transform
+    var first: ref CatchableError = nil
+    futs = await allFinished(futs)
+    for fut in futs:
+      if fut.failed:
+        let err = fut.readError()
+        if err of Defect:
+          raise err
+        else:
+          if err of CancelledError:
+            raise err
+          if isNil(first):
+            first = err
+    if not isNil(first):
+      raise first
 
-  var res: FinishedFailed[T] = (@[], @[])
+  return call()
-  await allFutures(futs)
-  for f in futs:
-    if f.failed:
-      res.failure.add f
-    else:
-      res.success.add f
 
-  return res
+proc allFutureResult*[T](fut: seq[Future[T]]): Future[?!void] {.async.} =
+  try:
+    await allFuturesThrowing(fut)
+  except CancelledError as exc:
+    raise exc
+  except CatchableError as exc:
+    return failure(exc.msg)
 
-proc allFinishedValues*[T](
+  return success()
-    futs: auto
-): Future[?!seq[T]] {.async: (raises: [CancelledError]).} =
-  ## If all futures have finished, return corresponding values,
-  ## otherwise return failure
-  ##
-
-  # wait for all futures to be either completed, failed or canceled
-  await allFutures(futs)
-
-  let numOfFailed = futs.countIt(it.failed)
-
-  if numOfFailed > 0:
-    return failure "Some futures failed (" & $numOfFailed & "))"
-
-  # here, we know there are no failed futures in "futs"
-  # and we are only interested in those that completed successfully
-  let values = collect:
-    for b in futs:
-      if b.finished:
-        b.value
-  return success values

codex/indexingstrategy.nim

@@ -24,17 +24,13 @@ type
   IndexingError* = object of CodexError
   IndexingWrongIndexError* = object of IndexingError
   IndexingWrongIterationsError* = object of IndexingError
-  IndexingWrongGroupCountError* = object of IndexingError
-  IndexingWrongPadBlockCountError* = object of IndexingError
 
   IndexingStrategy* = object
-    strategyType*: StrategyType # Indexing strategy algorithm
+    strategyType*: StrategyType
     firstIndex*: int # Lowest index that can be returned
     lastIndex*: int # Highest index that can be returned
-    iterations*: int # Number of iteration steps (0 ..< iterations)
+    iterations*: int # getIndices(iteration) will run from 0 ..< iterations
-    step*: int # Step size between generated indices
+    step*: int
-    groupCount*: int # Number of groups to partition indices into
-    padBlockCount*: int # Number of padding blocks to append per group
 
 func checkIteration(
     self: IndexingStrategy, iteration: int
@@ -48,47 +44,39 @@ func getIter(first, last, step: int): Iter[int] =
   {.cast(noSideEffect).}:
     Iter[int].new(first, last, step)
 
-func getLinearIndices(self: IndexingStrategy, iteration: int): Iter[int] =
+func getLinearIndicies(
+    self: IndexingStrategy, iteration: int
+): Iter[int] {.raises: [IndexingError].} =
+  self.checkIteration(iteration)
+
   let
     first = self.firstIndex + iteration * self.step
     last = min(first + self.step - 1, self.lastIndex)
 
   getIter(first, last, 1)
 
-func getSteppedIndices(self: IndexingStrategy, iteration: int): Iter[int] =
+func getSteppedIndicies(
+    self: IndexingStrategy, iteration: int
+): Iter[int] {.raises: [IndexingError].} =
+  self.checkIteration(iteration)
+
   let
     first = self.firstIndex + iteration
     last = self.lastIndex
 
   getIter(first, last, self.iterations)
 
-func getStrategyIndices(self: IndexingStrategy, iteration: int): Iter[int] =
+func getIndicies*(
-  case self.strategyType
-  of StrategyType.LinearStrategy:
-    self.getLinearIndices(iteration)
-  of StrategyType.SteppedStrategy:
-    self.getSteppedIndices(iteration)
-
-func getIndices*(
     self: IndexingStrategy, iteration: int
 ): Iter[int] {.raises: [IndexingError].} =
-  self.checkIteration(iteration)
+  case self.strategyType
-  {.cast(noSideEffect).}:
+  of StrategyType.LinearStrategy:
-    Iter[int].new(
+    self.getLinearIndicies(iteration)
-      iterator (): int {.gcsafe.} =
+  of StrategyType.SteppedStrategy:
-        for value in self.getStrategyIndices(iteration):
+    self.getSteppedIndicies(iteration)
-          yield value
-
-        for i in 0 ..< self.padBlockCount:
-          yield self.lastIndex + (iteration + 1) + i * self.groupCount
-
-    )
 
 func init*(
-    strategy: StrategyType,
+    strategy: StrategyType, firstIndex, lastIndex, iterations: int
-    firstIndex, lastIndex, iterations: int,
-    groupCount = 0,
-    padBlockCount = 0,
 ): IndexingStrategy {.raises: [IndexingError].} =
   if firstIndex > lastIndex:
     raise newException(
@@ -103,24 +91,10 @@ func init*(
       "iterations (" & $iterations & ") must be greater than zero.",
     )
 
-  if padBlockCount < 0:
-    raise newException(
-      IndexingWrongPadBlockCountError,
-      "padBlockCount (" & $padBlockCount & ") must be equal or greater than zero.",
-    )
-
-  if padBlockCount > 0 and groupCount <= 0:
-    raise newException(
-      IndexingWrongGroupCountError,
-      "groupCount (" & $groupCount & ") must be greater than zero.",
-    )
-
   IndexingStrategy(
     strategyType: strategy,
     firstIndex: firstIndex,
     lastIndex: lastIndex,
     iterations: iterations,
     step: divUp((lastIndex - firstIndex + 1), iterations),
-    groupCount: groupCount,
-    padBlockCount: padBlockCount,
   )

codex/logutils.nim

@@ -11,7 +11,7 @@
 ## 4. Remove usages of `nim-json-serialization` from the codebase
 ## 5. Remove need to declare `writeValue` for new types
 ## 6. Remove need to [avoid importing or exporting `toJson`, `%`, `%*` to prevent
-##    conflicts](https://github.com/logos-storage/logos-storage-nim/pull/645#issuecomment-1838834467)
+##    conflicts](https://github.com/codex-storage/nim-codex/pull/645#issuecomment-1838834467)
 ##
 ## When declaring a new type, one should consider importing the `codex/logutils`
 ## module, and specifying `formatIt`. If textlines log output and json log output

codex/manifest/coders.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2022 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -9,9 +9,11 @@
 
 # This module implements serialization and deserialization of Manifest
 
+import pkg/upraises
 import times
 
-{.push raises: [].}
+push:
+  {.upraises: [].}
 
 import std/tables
 import std/sequtils

codex/manifest/manifest.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2022 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -9,7 +9,10 @@
 
 # This module defines all operations on Manifest
 
-{.push raises: [], gcsafe.}
+import pkg/upraises
+
+push:
+  {.upraises: [].}
 
 import pkg/libp2p/protobuf/minprotobuf
 import pkg/libp2p/[cid, multihash, multicodec]

codex/market.nim

@@ -1,4 +1,5 @@
 import pkg/chronos
+import pkg/upraises
 import pkg/questionable
 import pkg/ethers/erc20
 import ./contracts/requests
@@ -17,20 +18,17 @@ export periods
 type
   Market* = ref object of RootObj
   MarketError* = object of CodexError
-  SlotStateMismatchError* = object of MarketError
-  SlotReservationNotAllowedError* = object of MarketError
-  ProofInvalidError* = object of MarketError
   Subscription* = ref object of RootObj
   OnRequest* =
-    proc(id: RequestId, ask: StorageAsk, expiry: uint64) {.gcsafe, raises: [].}
+    proc(id: RequestId, ask: StorageAsk, expiry: uint64) {.gcsafe, upraises: [].}
-  OnFulfillment* = proc(requestId: RequestId) {.gcsafe, raises: [].}
+  OnFulfillment* = proc(requestId: RequestId) {.gcsafe, upraises: [].}
-  OnSlotFilled* = proc(requestId: RequestId, slotIndex: uint64) {.gcsafe, raises: [].}
+  OnSlotFilled* = proc(requestId: RequestId, slotIndex: uint64) {.gcsafe, upraises: [].}
-  OnSlotFreed* = proc(requestId: RequestId, slotIndex: uint64) {.gcsafe, raises: [].}
+  OnSlotFreed* = proc(requestId: RequestId, slotIndex: uint64) {.gcsafe, upraises: [].}
   OnSlotReservationsFull* =
-    proc(requestId: RequestId, slotIndex: uint64) {.gcsafe, raises: [].}
+    proc(requestId: RequestId, slotIndex: uint64) {.gcsafe, upraises: [].}
-  OnRequestCancelled* = proc(requestId: RequestId) {.gcsafe, raises: [].}
+  OnRequestCancelled* = proc(requestId: RequestId) {.gcsafe, upraises: [].}
-  OnRequestFailed* = proc(requestId: RequestId) {.gcsafe, raises: [].}
+  OnRequestFailed* = proc(requestId: RequestId) {.gcsafe, upraises: [].}
-  OnProofSubmitted* = proc(id: SlotId) {.gcsafe, raises: [].}
+  OnProofSubmitted* = proc(id: SlotId) {.gcsafe, upraises: [].}
   ProofChallenge* = array[32, byte]
 
   # Marketplace events -- located here due to the Market abstraction
@@ -64,42 +62,25 @@ type
   ProofSubmitted* = object of MarketplaceEvent
     id*: SlotId
 
-method loadConfig*(
+method getZkeyHash*(market: Market): Future[?string] {.base, async.} =
-    market: Market
-): Future[?!void] {.base, async: (raises: [CancelledError]).} =
   raiseAssert("not implemented")
 
-method getZkeyHash*(
+method getSigner*(market: Market): Future[Address] {.base, async.} =
-    market: Market
-): Future[?string] {.base, async: (raises: [CancelledError, MarketError]).} =
   raiseAssert("not implemented")
 
-method getSigner*(
+method periodicity*(market: Market): Future[Periodicity] {.base, async.} =
-    market: Market
-): Future[Address] {.base, async: (raises: [CancelledError, MarketError]).} =
   raiseAssert("not implemented")
 
-method periodicity*(
+method proofTimeout*(market: Market): Future[uint64] {.base, async.} =
-    market: Market
-): Future[Periodicity] {.base, async: (raises: [CancelledError, MarketError]).} =
   raiseAssert("not implemented")
 
-method proofTimeout*(
+method repairRewardPercentage*(market: Market): Future[uint8] {.base, async.} =
-    market: Market
-): Future[uint64] {.base, async: (raises: [CancelledError, MarketError]).} =
-  raiseAssert("not implemented")
-
-method repairRewardPercentage*(
-    market: Market
-): Future[uint8] {.base, async: (raises: [CancelledError, MarketError]).} =
   raiseAssert("not implemented")
 
 method requestDurationLimit*(market: Market): Future[uint64] {.base, async.} =
   raiseAssert("not implemented")
 
-method proofDowntime*(
+method proofDowntime*(market: Market): Future[uint8] {.base, async.} =
-    market: Market
-): Future[uint8] {.base, async: (raises: [CancelledError, MarketError]).} =
   raiseAssert("not implemented")
 
 method getPointer*(market: Market, slotId: SlotId): Future[uint8] {.base, async.} =
@@ -110,9 +91,7 @@ proc inDowntime*(market: Market, slotId: SlotId): Future[bool] {.async.} =
   let pntr = await market.getPointer(slotId)
   return pntr < downtime
 
-method requestStorage*(
+method requestStorage*(market: Market, request: StorageRequest) {.base, async.} =
-    market: Market, request: StorageRequest
-) {.base, async: (raises: [CancelledError, MarketError]).} =
   raiseAssert("not implemented")
 
 method myRequests*(market: Market): Future[seq[RequestId]] {.base, async.} =
@@ -123,7 +102,7 @@ method mySlots*(market: Market): Future[seq[SlotId]] {.base, async.} =
 
 method getRequest*(
     market: Market, id: RequestId
-): Future[?StorageRequest] {.base, async: (raises: [CancelledError]).} =
+): Future[?StorageRequest] {.base, async.} =
   raiseAssert("not implemented")
 
 method requestState*(
@@ -131,9 +110,7 @@ method requestState*(
 ): Future[?RequestState] {.base, async.} =
   raiseAssert("not implemented")
 
-method slotState*(
+method slotState*(market: Market, slotId: SlotId): Future[SlotState] {.base, async.} =
-    market: Market, slotId: SlotId
-): Future[SlotState] {.base, async: (raises: [CancelledError, MarketError]).} =
   raiseAssert("not implemented")
 
 method getRequestEnd*(
@@ -148,12 +125,12 @@ method requestExpiresAt*(
 
 method getHost*(
     market: Market, requestId: RequestId, slotIndex: uint64
-): Future[?Address] {.base, async: (raises: [CancelledError, MarketError]).} =
+): Future[?Address] {.base, async.} =
   raiseAssert("not implemented")
 
 method currentCollateral*(
     market: Market, slotId: SlotId
-): Future[UInt256] {.base, async: (raises: [MarketError, CancelledError]).} =
+): Future[UInt256] {.base, async.} =
   raiseAssert("not implemented")
 
 method getActiveSlot*(market: Market, slotId: SlotId): Future[?Slot] {.base, async.} =
@@ -165,17 +142,13 @@ method fillSlot*(
     slotIndex: uint64,
     proof: Groth16Proof,
     collateral: UInt256,
-) {.base, async: (raises: [CancelledError, MarketError]).} =
+) {.base, async.} =
   raiseAssert("not implemented")
 
-method freeSlot*(
+method freeSlot*(market: Market, slotId: SlotId) {.base, async.} =
-    market: Market, slotId: SlotId
-) {.base, async: (raises: [CancelledError, MarketError]).} =
   raiseAssert("not implemented")
 
-method withdrawFunds*(
+method withdrawFunds*(market: Market, requestId: RequestId) {.base, async.} =
-    market: Market, requestId: RequestId
-) {.base, async: (raises: [CancelledError, MarketError]).} =
   raiseAssert("not implemented")
 
 method subscribeRequests*(
@@ -194,24 +167,20 @@ method getChallenge*(
 ): Future[ProofChallenge] {.base, async.} =
   raiseAssert("not implemented")
 
-method submitProof*(
+method submitProof*(market: Market, id: SlotId, proof: Groth16Proof) {.base, async.} =
-    market: Market, id: SlotId, proof: Groth16Proof
-) {.base, async: (raises: [CancelledError, MarketError]).} =
   raiseAssert("not implemented")
 
-method markProofAsMissing*(
+method markProofAsMissing*(market: Market, id: SlotId, period: Period) {.base, async.} =
-    market: Market, id: SlotId, period: Period
-) {.base, async: (raises: [CancelledError, MarketError]).} =
   raiseAssert("not implemented")
 
-method canMarkProofAsMissing*(
+method canProofBeMarkedAsMissing*(
     market: Market, id: SlotId, period: Period
-): Future[bool] {.base, async: (raises: [CancelledError]).} =
+): Future[bool] {.base, async.} =
   raiseAssert("not implemented")
 
 method reserveSlot*(
     market: Market, requestId: RequestId, slotIndex: uint64
-) {.base, async: (raises: [CancelledError, MarketError]).} =
+) {.base, async.} =
   raiseAssert("not implemented")
 
 method canReserveSlot*(
@@ -274,7 +243,7 @@ method subscribeProofSubmission*(
 ): Future[Subscription] {.base, async.} =
   raiseAssert("not implemented")
 
-method unsubscribe*(subscription: Subscription) {.base, async.} =
+method unsubscribe*(subscription: Subscription) {.base, async, upraises: [].} =
   raiseAssert("not implemented")
 
 method queryPastSlotFilledEvents*(
@@ -301,13 +270,3 @@ method queryPastStorageRequestedEvents*(
     market: Market, blocksAgo: int
 ): Future[seq[StorageRequested]] {.base, async.} =
   raiseAssert("not implemented")
-
-method slotCollateral*(
-    market: Market, requestId: RequestId, slotIndex: uint64
-): Future[?!UInt256] {.base, async: (raises: [CancelledError]).} =
-  raiseAssert("not implemented")
-
-method slotCollateral*(
-    market: Market, collateralPerSlot: UInt256, slotState: SlotState
-): ?!UInt256 {.base, gcsafe, raises: [].} =
-  raiseAssert("not implemented")

codex/merkletree/codex/coders.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2023 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -7,7 +7,10 @@
 ## This file may not be copied, modified, or distributed except according to
 ## those terms.
 
-{.push raises: [], gcsafe.}
+import pkg/upraises
+
+push:
+  {.upraises: [].}
 
 import pkg/libp2p
 import pkg/questionable
@@ -24,11 +27,11 @@ const MaxMerkleTreeSize = 100.MiBs.uint
 const MaxMerkleProofSize = 1.MiBs.uint
 
 proc encode*(self: CodexTree): seq[byte] =
-  var pb = initProtoBuffer()
+  var pb = initProtoBuffer(maxSize = MaxMerkleTreeSize)
   pb.write(1, self.mcodec.uint64)
   pb.write(2, self.leavesCount.uint64)
   for node in self.nodes:
-    var nodesPb = initProtoBuffer()
+    var nodesPb = initProtoBuffer(maxSize = MaxMerkleTreeSize)
     nodesPb.write(1, node)
     nodesPb.finish()
     pb.write(3, nodesPb)
@@ -37,7 +40,7 @@ proc encode*(self: CodexTree): seq[byte] =
   pb.buffer
 
 proc decode*(_: type CodexTree, data: seq[byte]): ?!CodexTree =
-  var pb = initProtoBuffer(data)
+  var pb = initProtoBuffer(data, maxSize = MaxMerkleTreeSize)
   var mcodecCode: uint64
   var leavesCount: uint64
   discard ?pb.getField(1, mcodecCode).mapFailure
@@ -60,13 +63,13 @@ proc decode*(_: type CodexTree, data: seq[byte]): ?!CodexTree =
   CodexTree.fromNodes(mcodec, nodes, leavesCount.int)
 
 proc encode*(self: CodexProof): seq[byte] =
-  var pb = initProtoBuffer()
+  var pb = initProtoBuffer(maxSize = MaxMerkleProofSize)
   pb.write(1, self.mcodec.uint64)
   pb.write(2, self.index.uint64)
   pb.write(3, self.nleaves.uint64)
 
   for node in self.path:
-    var nodesPb = initProtoBuffer()
+    var nodesPb = initProtoBuffer(maxSize = MaxMerkleTreeSize)
     nodesPb.write(1, node)
     nodesPb.finish()
     pb.write(4, nodesPb)
@@ -75,7 +78,7 @@ proc encode*(self: CodexProof): seq[byte] =
   pb.buffer
 
 proc decode*(_: type CodexProof, data: seq[byte]): ?!CodexProof =
-  var pb = initProtoBuffer(data)
+  var pb = initProtoBuffer(data, maxSize = MaxMerkleProofSize)
   var mcodecCode: uint64
   var index: uint64
   var nleaves: uint64

codex/merkletree/codex/codex.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2023 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -15,7 +15,7 @@ import std/sequtils
 import pkg/questionable
 import pkg/questionable/results
 import pkg/libp2p/[cid, multicodec, multihash]
-import pkg/constantine/hashes
+
 import ../../utils
 import ../../rng
 import ../../errors
@@ -47,6 +47,28 @@ type
   CodexProof* = ref object of ByteProof
     mcodec*: MultiCodec
 
+# CodeHashes is not exported from libp2p
+# So we need to recreate it instead of 
+proc initMultiHashCodeTable(): Table[MultiCodec, MHash] {.compileTime.} =
+  for item in HashesList:
+    result[item.mcodec] = item
+
+const CodeHashes = initMultiHashCodeTable()
+
+func mhash*(mcodec: MultiCodec): ?!MHash =
+  let mhash = CodeHashes.getOrDefault(mcodec)
+
+  if isNil(mhash.coder):
+    return failure "Invalid multihash codec"
+
+  success mhash
+
+func digestSize*(self: (CodexTree or CodexProof)): int =
+  ## Number of leaves
+  ##
+
+  self.mhash.size
+
 func getProof*(self: CodexTree, index: int): ?!CodexProof =
   var proof = CodexProof(mcodec: self.mcodec)
 
@@ -106,12 +128,13 @@ proc `$`*(self: CodexProof): string =
   "CodexProof(" & " nleaves: " & $self.nleaves & ", index: " & $self.index & ", path: " &
     $self.path.mapIt(byteutils.toHex(it)) & ", mcodec: " & $self.mcodec & " )"
 
-func compress*(x, y: openArray[byte], key: ByteTreeKey, codec: MultiCodec): ?!ByteHash =
+func compress*(x, y: openArray[byte], key: ByteTreeKey, mhash: MHash): ?!ByteHash =
   ## Compress two hashes
   ##
-  let input = @x & @y & @[key.byte]
+
-  let digest = ?MultiHash.digest(codec, input).mapFailure
+  var digest = newSeq[byte](mhash.size)
-  success digest.digestBytes
+  mhash.coder(@x & @y & @[key.byte], digest)
+  success digest
 
 func init*(
     _: type CodexTree, mcodec: MultiCodec = Sha256HashCodec, leaves: openArray[ByteHash]
@@ -120,12 +143,12 @@ func init*(
     return failure "Empty leaves"
 
   let
+    mhash = ?mcodec.mhash()
     compressor = proc(x, y: seq[byte], key: ByteTreeKey): ?!ByteHash {.noSideEffect.} =
-      compress(x, y, key, mcodec)
+      compress(x, y, key, mhash)
-    digestSize = ?mcodec.digestSize.mapFailure
+    Zero: ByteHash = newSeq[byte](mhash.size)
-    Zero: ByteHash = newSeq[byte](digestSize)
 
-  if digestSize != leaves[0].len:
+  if mhash.size != leaves[0].len:
     return failure "Invalid hash length"
 
   var self = CodexTree(mcodec: mcodec, compress: compressor, zero: Zero)
@@ -163,12 +186,12 @@ proc fromNodes*(
     return failure "Empty nodes"
 
   let
-    digestSize = ?mcodec.digestSize.mapFailure
+    mhash = ?mcodec.mhash()
-    Zero = newSeq[byte](digestSize)
+    Zero = newSeq[byte](mhash.size)
     compressor = proc(x, y: seq[byte], key: ByteTreeKey): ?!ByteHash {.noSideEffect.} =
-      compress(x, y, key, mcodec)
+      compress(x, y, key, mhash)
 
-  if digestSize != nodes[0].len:
+  if mhash.size != nodes[0].len:
     return failure "Invalid hash length"
 
   var
@@ -201,10 +224,10 @@ func init*(
     return failure "Empty nodes"
 
   let
-    digestSize = ?mcodec.digestSize.mapFailure
+    mhash = ?mcodec.mhash()
-    Zero = newSeq[byte](digestSize)
+    Zero = newSeq[byte](mhash.size)
     compressor = proc(x, y: seq[byte], key: ByteTreeKey): ?!seq[byte] {.noSideEffect.} =
-      compress(x, y, key, mcodec)
+      compress(x, y, key, mhash)
 
   success CodexProof(
     compress: compressor,

codex/merkletree/merkletree.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2023 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))

codex/merkletree/poseidon2.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2023 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))

codex/multicodec_exts.nim

@@ -1,11 +0,0 @@
-const CodecExts = [
-  ("poseidon2-alt_bn_128-sponge-r2", 0xCD10), # bn128 rate 2 sponge
-  ("poseidon2-alt_bn_128-merkle-2kb", 0xCD11), # bn128 2kb compress & merkleize
-  ("poseidon2-alt_bn_128-keyed-compress", 0xCD12), # bn128 keyed compress]
-  ("codex-manifest", 0xCD01),
-  ("codex-block", 0xCD02),
-  ("codex-root", 0xCD03),
-  ("codex-slot-root", 0xCD04),
-  ("codex-proving-root", 0xCD05),
-  ("codex-slot-cell", 0xCD06),
-]

codex/multihash_exts.nim

@@ -1,40 +0,0 @@
-import blscurve/bls_public_exports
-import pkg/constantine/hashes
-import poseidon2
-
-proc sha2_256hash_constantine(data: openArray[byte], output: var openArray[byte]) =
-  # Using Constantine's SHA256 instead of mhash for optimal performance on 32-byte merkle node hashing
-  # See: https://github.com/logos-storage/logos-storage-nim/issues/1162
-  if len(output) > 0:
-    let digest = hashes.sha256.hash(data)
-    copyMem(addr output[0], addr digest[0], 32)
-
-proc poseidon2_sponge_rate2(data: openArray[byte], output: var openArray[byte]) =
-  if len(output) > 0:
-    var digest = poseidon2.Sponge.digest(data).toBytes()
-    copyMem(addr output[0], addr digest[0], uint(len(output)))
-
-proc poseidon2_merkle_2kb_sponge(data: openArray[byte], output: var openArray[byte]) =
-  if len(output) > 0:
-    var digest = poseidon2.SpongeMerkle.digest(data, 2048).toBytes()
-    copyMem(addr output[0], addr digest[0], uint(len(output)))
-
-const Sha2256MultiHash* = MHash(
-  mcodec: multiCodec("sha2-256"),
-  size: sha256.sizeDigest,
-  coder: sha2_256hash_constantine,
-)
-const HashExts = [
-  # override sha2-256 hash function
-  Sha2256MultiHash,
-  MHash(
-    mcodec: multiCodec("poseidon2-alt_bn_128-sponge-r2"),
-    size: 32,
-    coder: poseidon2_sponge_rate2,
-  ),
-  MHash(
-    mcodec: multiCodec("poseidon2-alt_bn_128-merkle-2kb"),
-    size: 32,
-    coder: poseidon2_merkle_2kb_sponge,
-  ),
-]

codex/namespaces.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2022 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))

codex/nat.nim

@@ -9,11 +9,11 @@
 {.push raises: [].}
 
 import
-  std/[options, os, strutils, times, net, atomics],
+  std/[options, os, strutils, times, net],
-  stew/[objects],
+  stew/shims/net as stewNet,
+  stew/[objects, results],
   nat_traversal/[miniupnpc, natpmp],
-  json_serialization/std/net,
+  json_serialization/std/net
-  results
 
 import pkg/chronos
 import pkg/chronicles
@@ -28,29 +28,14 @@ const
   PORT_MAPPING_INTERVAL = 20 * 60 # seconds
   NATPMP_LIFETIME = 60 * 60 # in seconds, must be longer than PORT_MAPPING_INTERVAL
 
-type PortMappings* = object
-  internalTcpPort: Port
-  externalTcpPort: Port
-  internalUdpPort: Port
-  externalUdpPort: Port
-  description: string
-
-type PortMappingArgs =
-  tuple[strategy: NatStrategy, tcpPort, udpPort: Port, description: string]
-
-type NatConfig* = object
-  case hasExtIp*: bool
-  of true: extIp*: IpAddress
-  of false: nat*: NatStrategy
-
 var
   upnp {.threadvar.}: Miniupnp
   npmp {.threadvar.}: NatPmp
   strategy = NatStrategy.NatNone
-  natClosed: Atomic[bool]
+  internalTcpPort: Port
-  extIp: Option[IpAddress]
+  externalTcpPort: Port
-  activeMappings: seq[PortMappings]
+  internalUdpPort: Port
-  natThreads: seq[Thread[PortMappingArgs]] = @[]
+  externalUdpPort: Port
 
 logScope:
   topics = "nat"
@@ -122,7 +107,7 @@ proc getExternalIP*(natStrategy: NatStrategy, quiet = false): Option[IpAddress]
       else:
         try:
           externalIP = parseIpAddress($(nires.value))
-          strategy = NatStrategy.NatPmp
+          strategy = NatPmp
           return some(externalIP)
         except ValueError as e:
           error "parseIpAddress() exception", err = e.msg
@@ -168,7 +153,7 @@ proc getPublicRoutePrefSrcOrExternalIP*(
       return some(extIp.get)
 
 proc doPortMapping(
-    strategy: NatStrategy, tcpPort, udpPort: Port, description: string
+    tcpPort, udpPort: Port, description: string
 ): Option[(Port, Port)] {.gcsafe.} =
   var
     extTcpPort: Port
@@ -228,10 +213,15 @@ proc doPortMapping(
           extUdpPort = extPort
   return some((extTcpPort, extUdpPort))
 
+type PortMappingArgs = tuple[tcpPort, udpPort: Port, description: string]
+var
+  natThread: Thread[PortMappingArgs]
+  natCloseChan: Channel[bool]
+
 proc repeatPortMapping(args: PortMappingArgs) {.thread, raises: [ValueError].} =
   ignoreSignalsInThread()
   let
-    (strategy, tcpPort, udpPort, description) = args
+    (tcpPort, udpPort, description) = args
     interval = initDuration(seconds = PORT_MAPPING_INTERVAL)
     sleepDuration = 1_000 # in ms, also the maximum delay after pressing Ctrl-C
 
@@ -243,23 +233,30 @@ proc repeatPortMapping(args: PortMappingArgs) {.thread, raises: [ValueError].} =
   # even though we don't need the external IP's value.
   let ipres = getExternalIP(strategy, quiet = true)
   if ipres.isSome:
-    while natClosed.load() == false:
+    while true:
-      let
+      # we're being silly here with this channel polling because we can't
-        # we're being silly here with this channel polling because we can't
+      # select on Nim channels like on Go ones
-        # select on Nim channels like on Go ones
+      let (dataAvailable, _) =
-        currTime = now()
+        try:
-      if currTime >= (lastUpdate + interval):
+          natCloseChan.tryRecv()
-        discard doPortMapping(strategy, tcpPort, udpPort, description)
+        except Exception:
-        lastUpdate = currTime
+          (false, false)
-
+      if dataAvailable:
+        return
+      else:
+        let currTime = now()
+        if currTime >= (lastUpdate + interval):
+          discard doPortMapping(tcpPort, udpPort, description)
+          lastUpdate = currTime
         sleep(sleepDuration)
 
-proc stopNatThreads() {.noconv.} =
+proc stopNatThread() {.noconv.} =
   # stop the thread
-  debug "Stopping NAT port mapping renewal threads"
+
   try:
-    natClosed.store(true)
+    natCloseChan.send(true)
-    joinThreads(natThreads)
+    natThread.joinThread()
+    natCloseChan.close()
   except Exception as exc:
     warn "Failed to stop NAT port mapping renewal thread", exc = exc.msg
 
@@ -271,68 +268,54 @@ proc stopNatThreads() {.noconv.} =
 
   # In Windows, a new thread is created for the signal handler, so we need to
   # initialise our threadvars again.
-
   let ipres = getExternalIP(strategy, quiet = true)
   if ipres.isSome:
     if strategy == NatStrategy.NatUpnp:
-      for entry in activeMappings:
+      for t in [
-        for t in [
+        (externalTcpPort, internalTcpPort, UPNPProtocol.TCP),
-          (entry.externalTcpPort, entry.internalTcpPort, UPNPProtocol.TCP),
+        (externalUdpPort, internalUdpPort, UPNPProtocol.UDP),
-          (entry.externalUdpPort, entry.internalUdpPort, UPNPProtocol.UDP),
+      ]:
-        ]:
+        let
-          let
+          (eport, iport, protocol) = t
-            (eport, iport, protocol) = t
+          pmres = upnp.deletePortMapping(externalPort = $eport, protocol = protocol)
-            pmres = upnp.deletePortMapping(externalPort = $eport, protocol = protocol)
+        if pmres.isErr:
-          if pmres.isErr:
+          error "UPnP port mapping deletion", msg = pmres.error
-            error "UPnP port mapping deletion", msg = pmres.error
+        else:
-          else:
+          debug "UPnP: deleted port mapping",
-            debug "UPnP: deleted port mapping",
+            externalPort = eport, internalPort = iport, protocol = protocol
-              externalPort = eport, internalPort = iport, protocol = protocol
     elif strategy == NatStrategy.NatPmp:
-      for entry in activeMappings:
+      for t in [
-        for t in [
+        (externalTcpPort, internalTcpPort, NatPmpProtocol.TCP),
-          (entry.externalTcpPort, entry.internalTcpPort, NatPmpProtocol.TCP),
+        (externalUdpPort, internalUdpPort, NatPmpProtocol.UDP),
-          (entry.externalUdpPort, entry.internalUdpPort, NatPmpProtocol.UDP),
+      ]:
-        ]:
+        let
-          let
+          (eport, iport, protocol) = t
-            (eport, iport, protocol) = t
+          pmres = npmp.deletePortMapping(
-            pmres = npmp.deletePortMapping(
+            eport = eport.cushort, iport = iport.cushort, protocol = protocol
-              eport = eport.cushort, iport = iport.cushort, protocol = protocol
+          )
-            )
+        if pmres.isErr:
-          if pmres.isErr:
+          error "NAT-PMP port mapping deletion", msg = pmres.error
-            error "NAT-PMP port mapping deletion", msg = pmres.error
+        else:
-          else:
+          debug "NAT-PMP: deleted port mapping",
-            debug "NAT-PMP: deleted port mapping",
+            externalPort = eport, internalPort = iport, protocol = protocol
-              externalPort = eport, internalPort = iport, protocol = protocol
 
-proc redirectPorts*(
+proc redirectPorts*(tcpPort, udpPort: Port, description: string): Option[(Port, Port)] =
-    strategy: NatStrategy, tcpPort, udpPort: Port, description: string
+  result = doPortMapping(tcpPort, udpPort, description)
-): Option[(Port, Port)] =
-  result = doPortMapping(strategy, tcpPort, udpPort, description)
   if result.isSome:
-    let (externalTcpPort, externalUdpPort) = result.get()
+    (externalTcpPort, externalUdpPort) = result.get()
     # needed by NAT-PMP on port mapping deletion
+    internalTcpPort = tcpPort
+    internalUdpPort = udpPort
     # Port mapping works. Let's launch a thread that repeats it, in case the
     # NAT-PMP lease expires or the router is rebooted and forgets all about
     # these mappings.
-    activeMappings.add(
+    natCloseChan.open()
-      PortMappings(
-        internalTcpPort: tcpPort,
-        externalTcpPort: externalTcpPort,
-        internalUdpPort: udpPort,
-        externalUdpPort: externalUdpPort,
-        description: description,
-      )
-    )
     try:
-      natThreads.add(Thread[PortMappingArgs]())
+      natThread.createThread(
-      natThreads[^1].createThread(
+        repeatPortMapping, (externalTcpPort, externalUdpPort, description)
-        repeatPortMapping, (strategy, externalTcpPort, externalUdpPort, description)
       )
       # atexit() in disguise
-      if natThreads.len == 1:
+      addQuitProc(stopNatThread)
-        # we should register the thread termination function only once
-        addQuitProc(stopNatThreads)
     except Exception as exc:
       warn "Failed to create NAT port mapping renewal thread", exc = exc.msg
 
@@ -343,15 +326,12 @@ proc setupNat*(
   ## If any of this fails, we don't return any IP address but do return the
   ## original ports as best effort.
   ## TODO: Allow for tcp or udp port mapping to be optional.
-  if extIp.isNone:
+  let extIp = getExternalIP(natStrategy)
-    extIp = getExternalIP(natStrategy)
   if extIp.isSome:
     let ip = extIp.get
     let extPorts = (
       {.gcsafe.}:
-        redirectPorts(
+        redirectPorts(tcpPort = tcpPort, udpPort = udpPort, description = clientId)
-          strategy, tcpPort = tcpPort, udpPort = udpPort, description = clientId
-        )
     )
     if extPorts.isSome:
       let (extTcpPort, extUdpPort) = extPorts.get()
@@ -363,6 +343,11 @@ proc setupNat*(
     warn "UPnP/NAT-PMP not available"
     (ip: none(IpAddress), tcpPort: some(tcpPort), udpPort: some(udpPort))
 
+type NatConfig* = object
+  case hasExtIp*: bool
+  of true: extIp*: IpAddress
+  of false: nat*: NatStrategy
+
 proc setupAddress*(
     natConfig: NatConfig, bindIp: IpAddress, tcpPort, udpPort: Port, clientId: string
 ): tuple[ip: Option[IpAddress], tcpPort, udpPort: Option[Port]] {.gcsafe.} =

codex/node.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -44,7 +44,7 @@ import ./indexingstrategy
 import ./utils
 import ./errors
 import ./logutils
-import ./utils/safeasynciter
+import ./utils/asynciter
 import ./utils/trackedfutures
 
 export logutils
@@ -52,10 +52,7 @@ export logutils
 logScope:
   topics = "codex node"
 
-const
+const DefaultFetchBatch = 10
-  DefaultFetchBatch = 1024
-  MaxOnBatchBlocks = 128
-  BatchRefillThreshold = 0.75 # Refill when 75% of window completes
 
 type
   Contracts* =
@@ -81,9 +78,7 @@ type
   CodexNodeRef* = ref CodexNode
 
   OnManifest* = proc(cid: Cid, manifest: Manifest): void {.gcsafe, raises: [].}
-  BatchProc* =
+  BatchProc* = proc(blocks: seq[bt.Block]): Future[?!void] {.gcsafe, raises: [].}
-    proc(blocks: seq[bt.Block]): Future[?!void] {.async: (raises: [CancelledError]).}
-  OnBlockStoredProc = proc(chunk: seq[byte]): void {.gcsafe, raises: [].}
 
 func switch*(self: CodexNodeRef): Switch =
   return self.switch
@@ -114,9 +109,7 @@ proc storeManifest*(
 
   success blk
 
-proc fetchManifest*(
+proc fetchManifest*(self: CodexNodeRef, cid: Cid): Future[?!Manifest] {.async.} =
-    self: CodexNodeRef, cid: Cid
-): Future[?!Manifest] {.async: (raises: [CancelledError]).} =
   ## Fetch and decode a manifest block
   ##
 
@@ -151,7 +144,7 @@ proc connect*(
 
 proc updateExpiry*(
     self: CodexNodeRef, manifestCid: Cid, expiry: SecondsSince1970
-): Future[?!void] {.async: (raises: [CancelledError]).} =
+): Future[?!void] {.async.} =
   without manifest =? await self.fetchManifest(manifestCid), error:
     trace "Unable to fetch manifest for cid", manifestCid
     return failure(error)
@@ -160,11 +153,7 @@ proc updateExpiry*(
     let ensuringFutures = Iter[int].new(0 ..< manifest.blocksCount).mapIt(
         self.networkStore.localStore.ensureExpiry(manifest.treeCid, it, expiry)
       )
-
+    await allFuturesThrowing(ensuringFutures)
-    let res = await allFinishedFailed[?!void](ensuringFutures)
-    if res.failure.len > 0:
-      trace "Some blocks failed to update expiry", len = res.failure.len
-      return failure("Some blocks failed to update expiry (" & $res.failure.len & " )")
   except CancelledError as exc:
     raise exc
   except CatchableError as exc:
@@ -179,7 +168,7 @@ proc fetchBatched*(
     batchSize = DefaultFetchBatch,
     onBatch: BatchProc = nil,
     fetchLocal = true,
-): Future[?!void] {.async: (raises: [CancelledError]), gcsafe.} =
+): Future[?!void] {.async, gcsafe.} =
   ## Fetch blocks in batches of `batchSize`
   ##
 
@@ -189,62 +178,23 @@ proc fetchBatched*(
   #     (i: int) => self.networkStore.getBlock(BlockAddress.init(cid, i))
   #   )
 
-  # Sliding window: maintain batchSize blocks in-flight
+  while not iter.finished:
-  let
+    let blocks = collect:
-    refillThreshold = int(float(batchSize) * BatchRefillThreshold)
+      for i in 0 ..< batchSize:
-    refillSize = max(refillThreshold, 1)
-    maxCallbackBlocks = min(batchSize, MaxOnBatchBlocks)
-
-  var
-    blockData: seq[bt.Block]
-    failedBlocks = 0
-    successfulBlocks = 0
-    completedInWindow = 0
-
-  var addresses = newSeqOfCap[BlockAddress](batchSize)
-  for i in 0 ..< batchSize:
-    if not iter.finished:
-      let address = BlockAddress.init(cid, iter.next())
-      if fetchLocal or not (await address in self.networkStore):
-        addresses.add(address)
-
-  var blockResults = await self.networkStore.getBlocks(addresses)
-
-  while not blockResults.finished:
-    without blk =? await blockResults.next(), err:
-      inc(failedBlocks)
-      continue
-
-    inc(successfulBlocks)
-    inc(completedInWindow)
-
-    if not onBatch.isNil:
-      blockData.add(blk)
-      if blockData.len >= maxCallbackBlocks:
-        if batchErr =? (await onBatch(blockData)).errorOption:
-          return failure(batchErr)
-        blockData = @[]
-
-    if completedInWindow >= refillThreshold and not iter.finished:
-      var refillAddresses = newSeqOfCap[BlockAddress](refillSize)
-      for i in 0 ..< refillSize:
         if not iter.finished:
           let address = BlockAddress.init(cid, iter.next())
-          if fetchLocal or not (await address in self.networkStore):
+          if not (await address in self.networkStore) or fetchLocal:
-            refillAddresses.add(address)
+            self.networkStore.getBlock(address)
 
-      if refillAddresses.len > 0:
+    if blocksErr =? (await allFutureResult(blocks)).errorOption:
-        blockResults =
+      return failure(blocksErr)
-          chain(blockResults, await self.networkStore.getBlocks(refillAddresses))
-      completedInWindow = 0
 
-  if failedBlocks > 0:
+    if not onBatch.isNil and
-    return failure("Some blocks failed (Result) to fetch (" & $failedBlocks & ")")
+        batchErr =? (await onBatch(blocks.mapIt(it.read.get))).errorOption:
-
-  if not onBatch.isNil and blockData.len > 0:
-    if batchErr =? (await onBatch(blockData)).errorOption:
       return failure(batchErr)
 
+    await sleepAsync(1.millis)
+
   success()
 
 proc fetchBatched*(
@@ -253,7 +203,7 @@ proc fetchBatched*(
     batchSize = DefaultFetchBatch,
     onBatch: BatchProc = nil,
     fetchLocal = true,
-): Future[?!void] {.async: (raw: true, raises: [CancelledError]).} =
+): Future[?!void] =
   ## Fetch manifest in batches of `batchSize`
   ##
 
@@ -263,31 +213,7 @@ proc fetchBatched*(
   let iter = Iter[int].new(0 ..< manifest.blocksCount)
   self.fetchBatched(manifest.treeCid, iter, batchSize, onBatch, fetchLocal)
 
-proc fetchDatasetAsync*(
+proc streamSingleBlock(self: CodexNodeRef, cid: Cid): Future[?!LPStream] {.async.} =
-    self: CodexNodeRef, manifest: Manifest, fetchLocal = true
-): Future[void] {.async: (raises: []).} =
-  ## Asynchronously fetch a dataset in the background.
-  ## This task will be tracked and cleaned up on node shutdown.
-  ##
-  try:
-    if err =? (
-      await self.fetchBatched(
-        manifest = manifest, batchSize = DefaultFetchBatch, fetchLocal = fetchLocal
-      )
-    ).errorOption:
-      error "Unable to fetch blocks", err = err.msg
-  except CancelledError as exc:
-    trace "Cancelled fetching blocks", exc = exc.msg
-
-proc fetchDatasetAsyncTask*(self: CodexNodeRef, manifest: Manifest) =
-  ## Start fetching a dataset in the background.
-  ## The task will be tracked and cleaned up on node shutdown.
-  ##
-  self.trackedFutures.track(self.fetchDatasetAsync(manifest, fetchLocal = false))
-
-proc streamSingleBlock(
-    self: CodexNodeRef, cid: Cid
-): Future[?!LPStream] {.async: (raises: [CancelledError]).} =
   ## Streams the contents of a single block.
   ##
   trace "Streaming single block", cid = cid
@@ -297,31 +223,36 @@ proc streamSingleBlock(
   without blk =? (await self.networkStore.getBlock(BlockAddress.init(cid))), err:
     return failure(err)
 
-  proc streamOneBlock(): Future[void] {.async: (raises: []).} =
+  proc streamOneBlock(): Future[void] {.async.} =
     try:
-      defer:
-        await stream.pushEof()
       await stream.pushData(blk.data)
-    except CancelledError as exc:
+    except CatchableError as exc:
-      trace "Streaming block cancelled", cid, exc = exc.msg
-    except LPStreamError as exc:
       trace "Unable to send block", cid, exc = exc.msg
+      discard
+    finally:
+      await stream.pushEof()
 
   self.trackedFutures.track(streamOneBlock())
   LPStream(stream).success
 
 proc streamEntireDataset(
-    self: CodexNodeRef, manifest: Manifest, manifestCid: Cid
+    self: CodexNodeRef,
-): Future[?!LPStream] {.async: (raises: [CancelledError]).} =
+    manifest: Manifest,
+    manifestCid: Cid,
+    prefetchBatch = DefaultFetchBatch,
+): Future[?!LPStream] {.async.} =
   ## Streams the contents of the entire dataset described by the manifest.
+  ## Background jobs (erasure decoding and prefetching) will be cancelled when
+  ## the stream is closed.
   ##
   trace "Retrieving blocks from manifest", manifestCid
 
-  var jobs: seq[Future[void]]
   let stream = LPStream(StoreStream.new(self.networkStore, manifest, pad = false))
+  var jobs: seq[Future[void]]
+
   if manifest.protected:
     # Retrieve, decode and save to the local store all EС groups
-    proc erasureJob(): Future[void] {.async: (raises: []).} =
+    proc erasureJob(): Future[void] {.async.} =
       try:
         # Spawn an erasure decoding job
         let erasure = Erasure.new(
@@ -329,32 +260,40 @@ proc streamEntireDataset(
         )
         without _ =? (await erasure.decode(manifest)), error:
           error "Unable to erasure decode manifest", manifestCid, exc = error.msg
+      except CancelledError:
+        trace "Erasure job cancelled", manifestCid
       except CatchableError as exc:
         trace "Error erasure decoding manifest", manifestCid, exc = exc.msg
 
     jobs.add(erasureJob())
 
-  jobs.add(self.fetchDatasetAsync(manifest, fetchLocal = false))
+  proc prefetch(): Future[void] {.async.} =
+    try:
+      if err =?
+          (await self.fetchBatched(manifest, prefetchBatch, fetchLocal = false)).errorOption:
+        error "Unable to fetch blocks", err = err.msg
+    except CancelledError:
+      trace "Prefetch job cancelled"
+    except CatchableError as exc:
+      error "Error fetching blocks", exc = exc.msg
+
+  jobs.add(prefetch())
 
   # Monitor stream completion and cancel background jobs when done
-  proc monitorStream() {.async: (raises: []).} =
+  proc monitorStream() {.async.} =
     try:
       await stream.join()
-    except CancelledError as exc:
-      warn "Stream cancelled", exc = exc.msg
     finally:
-      await noCancel allFutures(jobs.mapIt(it.cancelAndWait))
+      await allFutures(jobs.mapIt(it.cancelAndWait))
 
   self.trackedFutures.track(monitorStream())
 
-  # Retrieve all blocks of the dataset sequentially from the local store or network
   trace "Creating store stream for manifest", manifestCid
-
   stream.success
 
 proc retrieve*(
     self: CodexNodeRef, cid: Cid, local: bool = true
-): Future[?!LPStream] {.async: (raises: [CancelledError]).} =
+): Future[?!LPStream] {.async.} =
   ## Retrieve by Cid a single block or an entire dataset described by manifest
   ##
 
@@ -434,7 +373,6 @@ proc store*(
     filename: ?string = string.none,
     mimetype: ?string = string.none,
     blockSize = DefaultBlockSize,
-    onBlockStored: OnBlockStoredProc = nil,
 ): Future[?!Cid] {.async.} =
   ## Save stream contents as dataset with given blockSize
   ## to nodes's BlockStore, and return Cid of its manifest
@@ -464,9 +402,6 @@ proc store*(
       if err =? (await self.networkStore.putBlock(blk)).errorOption:
         error "Unable to store block", cid = blk.cid, err = err.msg
         return failure(&"Unable to store block {blk.cid}")
-
-      if not onBlockStored.isNil:
-        onBlockStored(chunk)
   except CancelledError as exc:
     raise exc
   except CatchableError as exc:
@@ -514,11 +449,11 @@ proc store*(
   return manifestBlk.cid.success
 
 proc iterateManifests*(self: CodexNodeRef, onManifest: OnManifest) {.async.} =
-  without cidsIter =? await self.networkStore.listBlocks(BlockType.Manifest):
+  without cids =? await self.networkStore.listBlocks(BlockType.Manifest):
     warn "Failed to listBlocks"
     return
 
-  for c in cidsIter:
+  for c in cids:
     if cid =? await c:
       without blk =? await self.networkStore.getBlock(cid):
         warn "Failed to get manifest block by cid", cid
@@ -656,13 +591,8 @@ proc requestStorage*(
   success purchase.id
 
 proc onStore(
-    self: CodexNodeRef,
+    self: CodexNodeRef, request: StorageRequest, slotIdx: uint64, blocksCb: BlocksCb
-    request: StorageRequest,
+): Future[?!void] {.async.} =
-    expiry: SecondsSince1970,
-    slotIdx: uint64,
-    blocksCb: BlocksCb,
-    isRepairing: bool = false,
-): Future[?!void] {.async: (raises: [CancelledError]).} =
   ## store data in local storage
   ##
 
@@ -683,22 +613,19 @@ proc onStore(
     trace "Unable to create slots builder", err = err.msg
     return failure(err)
 
+  let expiry = request.expiry
+
   if slotIdx > manifest.slotRoots.high.uint64:
     trace "Slot index not in manifest", slotIdx
     return failure(newException(CodexError, "Slot index not in manifest"))
 
-  proc updateExpiry(
+  proc updateExpiry(blocks: seq[bt.Block]): Future[?!void] {.async.} =
-      blocks: seq[bt.Block]
-  ): Future[?!void] {.async: (raises: [CancelledError]).} =
     trace "Updating expiry for blocks", blocks = blocks.len
 
     let ensureExpiryFutures =
-      blocks.mapIt(self.networkStore.ensureExpiry(it.cid, expiry))
+      blocks.mapIt(self.networkStore.ensureExpiry(it.cid, expiry.toSecondsSince1970))
-
+    if updateExpiryErr =? (await allFutureResult(ensureExpiryFutures)).errorOption:
-    let res = await allFinishedFailed[?!void](ensureExpiryFutures)
+      return failure(updateExpiryErr)
-    if res.failure.len > 0:
-      trace "Some blocks failed to update expiry", len = res.failure.len
-      return failure("Some blocks failed to update expiry (" & $res.failure.len & " )")
 
     if not blocksCb.isNil and err =? (await blocksCb(blocks)).errorOption:
       trace "Unable to process blocks", err = err.msg
@@ -706,45 +633,32 @@ proc onStore(
 
     return success()
 
+  without indexer =?
+    manifest.verifiableStrategy.init(0, manifest.blocksCount - 1, manifest.numSlots).catch,
+    err:
+    trace "Unable to create indexing strategy from protected manifest", err = err.msg
+    return failure(err)
+
   if slotIdx > int.high.uint64:
     error "Cannot cast slot index to int", slotIndex = slotIdx
     return
 
-  if isRepairing:
+  without blksIter =? indexer.getIndicies(slotIdx.int).catch, err:
-    trace "start repairing slot", slotIdx
+    trace "Unable to get indicies from strategy", err = err.msg
-    try:
+    return failure(err)
-      let erasure = Erasure.new(
-        self.networkStore, leoEncoderProvider, leoDecoderProvider, self.taskpool
-      )
-      if err =? (await erasure.repair(manifest)).errorOption:
-        error "Unable to erasure decode repairing manifest",
-          cid = manifest.treeCid, exc = err.msg
-        return failure(err)
-    except CatchableError as exc:
-      error "Error erasure decoding repairing manifest",
-        cid = manifest.treeCid, exc = exc.msg
-      return failure(exc.msg)
-  else:
-    without indexer =?
-      manifest.verifiableStrategy.init(0, manifest.blocksCount - 1, manifest.numSlots).catch,
-      err:
-      trace "Unable to create indexing strategy from protected manifest", err = err.msg
-      return failure(err)
 
-    without blksIter =? indexer.getIndices(slotIdx.int).catch, err:
+  if err =? (
-      trace "Unable to get indices from strategy", err = err.msg
+    await self.fetchBatched(manifest.treeCid, blksIter, onBatch = updateExpiry)
-      return failure(err)
+  ).errorOption:
-
+    trace "Unable to fetch blocks", err = err.msg
-    if err =? (
+    return failure(err)
-      await self.fetchBatched(manifest.treeCid, blksIter, onBatch = updateExpiry)
-    ).errorOption:
-      trace "Unable to fetch blocks", err = err.msg
-      return failure(err)
 
   without slotRoot =? (await builder.buildSlot(slotIdx.int)), err:
     trace "Unable to build slot", err = err.msg
     return failure(err)
 
+  trace "Slot successfully retrieved and reconstructed"
+
   if cid =? slotRoot.toSlotCid() and cid != manifest.slotRoots[slotIdx]:
     trace "Slot root mismatch",
       manifest = manifest.slotRoots[slotIdx.int], recovered = slotRoot.toSlotCid()
@@ -756,7 +670,7 @@ proc onStore(
 
 proc onProve(
     self: CodexNodeRef, slot: Slot, challenge: ProofChallenge
-): Future[?!Groth16Proof] {.async: (raises: [CancelledError]).} =
+): Future[?!Groth16Proof] {.async.} =
   ## Generats a proof for a given slot and challenge
   ##
 
@@ -812,7 +726,7 @@ proc onProve(
 
 proc onExpiryUpdate(
     self: CodexNodeRef, rootCid: Cid, expiry: SecondsSince1970
-): Future[?!void] {.async: (raises: [CancelledError]).} =
+): Future[?!void] {.async.} =
   return await self.updateExpiry(rootCid, expiry)
 
 proc onClear(self: CodexNodeRef, request: StorageRequest, slotIndex: uint64) =
@@ -831,17 +745,13 @@ proc start*(self: CodexNodeRef) {.async.} =
 
   if hostContracts =? self.contracts.host:
     hostContracts.sales.onStore = proc(
-        request: StorageRequest,
+        request: StorageRequest, slot: uint64, onBatch: BatchProc
-        expiry: SecondsSince1970,
+    ): Future[?!void] =
-        slot: uint64,
+      self.onStore(request, slot, onBatch)
-        onBatch: BatchProc,
-        isRepairing: bool = false,
-    ): Future[?!void] {.async: (raw: true, raises: [CancelledError]).} =
-      self.onStore(request, expiry, slot, onBatch, isRepairing)
 
     hostContracts.sales.onExpiryUpdate = proc(
         rootCid: Cid, expiry: SecondsSince1970
-    ): Future[?!void] {.async: (raw: true, raises: [CancelledError]).} =
+    ): Future[?!void] =
       self.onExpiryUpdate(rootCid, expiry)
 
     hostContracts.sales.onClear = proc(request: StorageRequest, slotIndex: uint64) =
@@ -850,7 +760,7 @@ proc start*(self: CodexNodeRef) {.async.} =
 
     hostContracts.sales.onProve = proc(
         slot: Slot, challenge: ProofChallenge
-    ): Future[?!Groth16Proof] {.async: (raw: true, raises: [CancelledError]).} =
+    ): Future[?!Groth16Proof] =
       # TODO: generate proof
       self.onProve(slot, challenge)
 
@@ -881,11 +791,14 @@ proc start*(self: CodexNodeRef) {.async.} =
       self.contracts.validator = ValidatorInteractions.none
 
   self.networkId = self.switch.peerInfo.peerId
-  notice "Started Storage node", id = self.networkId, addrs = self.switch.peerInfo.addrs
+  notice "Started codex node", id = self.networkId, addrs = self.switch.peerInfo.addrs
 
 proc stop*(self: CodexNodeRef) {.async.} =
   trace "Stopping node"
 
+  if not self.taskpool.isNil:
+    self.taskpool.shutdown()
+
   await self.trackedFutures.cancelTracked()
 
   if not self.engine.isNil:
@@ -906,7 +819,6 @@ proc stop*(self: CodexNodeRef) {.async.} =
   if not self.clock.isNil:
     await self.clock.stop()
 
-proc close*(self: CodexNodeRef) {.async.} =
   if not self.networkStore.isNil:
     await self.networkStore.close
 
@@ -933,10 +845,3 @@ proc new*(
     contracts: contracts,
     trackedFutures: TrackedFutures(),
   )
-
-proc hasLocalBlock*(
-    self: CodexNodeRef, cid: Cid
-): Future[bool] {.async: (raises: [CancelledError]).} =
-  ## Returns true if the given Cid is present in the local store
-
-  return await (cid in self.networkStore.localStore)

codex/purchasing/states/submitted.nim

@@ -30,12 +30,12 @@ method run*(
     requestId = purchase.requestId
 
   proc wait() {.async.} =
-    let done = newAsyncEvent()
+    let done = newFuture[void]()
     proc callback(_: RequestId) =
-      done.fire()
+      done.complete()
 
     let subscription = await market.subscribeFulfillment(request.id, callback)
-    await done.wait()
+    await done
     await subscription.unsubscribe()
 
   proc withTimeout(future: Future[void]) {.async.} =

codex/rest/api.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -7,7 +7,10 @@
 ## This file may not be copied, modified, or distributed except according to
 ## those terms.
 
-{.push raises: [], gcsafe.}
+import pkg/upraises
+
+push:
+  {.upraises: [].}
 
 import std/sequtils
 import std/mimetypes
@@ -62,43 +65,30 @@ proc formatManifestBlocks(node: CodexNodeRef): Future[JsonNode] {.async.} =
 
   return %RestContentList.init(content)
 
-proc isPending(resp: HttpResponseRef): bool =
-  ## Checks that an HttpResponseRef object is still pending; i.e.,
-  ## that no body has yet been sent. This helps us guard against calling
-  ## sendBody(resp: HttpResponseRef, ...) twice, which is illegal.
-  return resp.getResponseState() == HttpResponseState.Empty
-
 proc retrieveCid(
     node: CodexNodeRef, cid: Cid, local: bool = true, resp: HttpResponseRef
-): Future[void] {.async: (raises: [CancelledError, HttpWriteError]).} =
+): Future[RestApiResponse] {.async.} =
   ## Download a file from the node in a streaming
   ## manner
   ##
 
-  var lpStream: LPStream
+  var stream: LPStream
 
   var bytes = 0
   try:
     without stream =? (await node.retrieve(cid, local)), error:
       if error of BlockNotFoundError:
         resp.status = Http404
-        await resp.sendBody(
+        return await resp.sendBody("")
-          "The requested CID could not be retrieved (" & error.msg & ")."
-        )
-        return
       else:
         resp.status = Http500
-        await resp.sendBody(error.msg)
+        return await resp.sendBody(error.msg)
-        return
-
-    lpStream = stream
 
     # It is ok to fetch again the manifest because it will hit the cache
     without manifest =? (await node.fetchManifest(cid)), err:
       error "Failed to fetch manifest", err = err.msg
       resp.status = Http404
-      await resp.sendBody(err.msg)
+      return await resp.sendBody(err.msg)
-      return
 
     if manifest.mimetype.isSome:
       resp.setHeader("Content-Type", manifest.mimetype.get())
@@ -113,14 +103,7 @@ proc retrieveCid(
     else:
       resp.setHeader("Content-Disposition", "attachment")
 
-    # For erasure-coded datasets, we need to return the _original_ length; i.e.,
+    await resp.prepareChunked()
-    # the length of the non-erasure-coded dataset, as that's what we will be
-    # returning to the client.
-    let contentLength =
-      if manifest.protected: manifest.originalDatasetSize else: manifest.datasetSize
-    resp.setHeader("Content-Length", $(contentLength.int))
-
-    await resp.prepare(HttpResponseStreamType.Plain)
 
     while not stream.atEof:
       var
@@ -133,20 +116,17 @@ proc retrieveCid(
 
       bytes += buff.len
 
-      await resp.send(addr buff[0], buff.len)
+      await resp.sendChunk(addr buff[0], buff.len)
     await resp.finish()
     codex_api_downloads.inc()
-  except CancelledError as exc:
+  except CatchableError as exc:
-    raise exc
-  except LPStreamError as exc:
     warn "Error streaming blocks", exc = exc.msg
     resp.status = Http500
-    if resp.isPending():
+    return await resp.sendBody("")
-      await resp.sendBody(exc.msg)
   finally:
     info "Sent bytes", cid = cid, bytes
-    if not lpStream.isNil:
+    if not stream.isNil:
-      await lpStream.close()
+      await stream.close()
 
 proc buildCorsHeaders(
     httpMethod: string, allowedOrigin: Option[string]
@@ -180,7 +160,7 @@ proc getFilenameFromContentDisposition(contentDisposition: string): ?string =
 proc initDataApi(node: CodexNodeRef, repoStore: RepoStore, router: var RestRouter) =
   let allowedOrigin = router.allowedOrigin # prevents capture inside of api defintion
 
-  router.api(MethodOptions, "/api/storage/v1/data") do(
+  router.api(MethodOptions, "/api/codex/v1/data") do(
     resp: HttpResponseRef
   ) -> RestApiResponse:
     if corsOrigin =? allowedOrigin:
@@ -192,7 +172,7 @@ proc initDataApi(node: CodexNodeRef, repoStore: RepoStore, router: var RestRoute
     resp.status = Http204
     await resp.sendBody("")
 
-  router.rawApi(MethodPost, "/api/storage/v1/data") do() -> RestApiResponse:
+  router.rawApi(MethodPost, "/api/codex/v1/data") do() -> RestApiResponse:
     ## Upload a file in a streaming manner
     ##
 
@@ -254,11 +234,11 @@ proc initDataApi(node: CodexNodeRef, repoStore: RepoStore, router: var RestRoute
     finally:
       await reader.closeWait()
 
-  router.api(MethodGet, "/api/storage/v1/data") do() -> RestApiResponse:
+  router.api(MethodGet, "/api/codex/v1/data") do() -> RestApiResponse:
     let json = await formatManifestBlocks(node)
     return RestApiResponse.response($json, contentType = "application/json")
 
-  router.api(MethodOptions, "/api/storage/v1/data/{cid}") do(
+  router.api(MethodOptions, "/api/codex/v1/data/{cid}") do(
     cid: Cid, resp: HttpResponseRef
   ) -> RestApiResponse:
     if corsOrigin =? allowedOrigin:
@@ -267,7 +247,7 @@ proc initDataApi(node: CodexNodeRef, repoStore: RepoStore, router: var RestRoute
     resp.status = Http204
     await resp.sendBody("")
 
-  router.api(MethodGet, "/api/storage/v1/data/{cid}") do(
+  router.api(MethodGet, "/api/codex/v1/data/{cid}") do(
     cid: Cid, resp: HttpResponseRef
   ) -> RestApiResponse:
     var headers = buildCorsHeaders("GET", allowedOrigin)
@@ -283,11 +263,11 @@ proc initDataApi(node: CodexNodeRef, repoStore: RepoStore, router: var RestRoute
 
     await node.retrieveCid(cid.get(), local = true, resp = resp)
 
-  router.api(MethodDelete, "/api/storage/v1/data/{cid}") do(
+  router.api(MethodDelete, "/api/codex/v1/data/{cid}") do(
     cid: Cid, resp: HttpResponseRef
   ) -> RestApiResponse:
     ## Deletes either a single block or an entire dataset
-    ## from the local node. Does nothing and returns 204
+    ## from the local node. Does nothing and returns 200
     ## if the dataset is not locally available.
     ##
     var headers = buildCorsHeaders("DELETE", allowedOrigin)
@@ -304,7 +284,7 @@ proc initDataApi(node: CodexNodeRef, repoStore: RepoStore, router: var RestRoute
     resp.status = Http204
     await resp.sendBody("")
 
-  router.api(MethodPost, "/api/storage/v1/data/{cid}/network") do(
+  router.api(MethodPost, "/api/codex/v1/data/{cid}/network") do(
     cid: Cid, resp: HttpResponseRef
   ) -> RestApiResponse:
     ## Download a file from the network to the local node
@@ -319,13 +299,20 @@ proc initDataApi(node: CodexNodeRef, repoStore: RepoStore, router: var RestRoute
       error "Failed to fetch manifest", err = err.msg
       return RestApiResponse.error(Http404, err.msg, headers = headers)
 
-    # Start fetching the dataset in the background
+    proc fetchDatasetAsync(): Future[void] {.async.} =
-    node.fetchDatasetAsyncTask(manifest)
+      try:
+        if err =? (await node.fetchBatched(manifest)).errorOption:
+          error "Unable to fetch dataset", cid = cid.get(), err = err.msg
+      except CatchableError as exc:
+        error "CatchableError when fetching dataset", cid = cid.get(), exc = exc.msg
+        discard
+
+    asyncSpawn fetchDatasetAsync()
 
     let json = %formatManifest(cid.get(), manifest)
     return RestApiResponse.response($json, contentType = "application/json")
 
-  router.api(MethodGet, "/api/storage/v1/data/{cid}/network/stream") do(
+  router.api(MethodGet, "/api/codex/v1/data/{cid}/network/stream") do(
     cid: Cid, resp: HttpResponseRef
   ) -> RestApiResponse:
     ## Download a file from the network in a streaming
@@ -341,10 +328,9 @@ proc initDataApi(node: CodexNodeRef, repoStore: RepoStore, router: var RestRoute
       resp.setCorsHeaders("GET", corsOrigin)
       resp.setHeader("Access-Control-Headers", "X-Requested-With")
 
-    resp.setHeader("Access-Control-Expose-Headers", "Content-Disposition")
     await node.retrieveCid(cid.get(), local = false, resp = resp)
 
-  router.api(MethodGet, "/api/storage/v1/data/{cid}/network/manifest") do(
+  router.api(MethodGet, "/api/codex/v1/data/{cid}/network/manifest") do(
     cid: Cid, resp: HttpResponseRef
   ) -> RestApiResponse:
     ## Download only the manifest.
@@ -362,23 +348,7 @@ proc initDataApi(node: CodexNodeRef, repoStore: RepoStore, router: var RestRoute
     let json = %formatManifest(cid.get(), manifest)
     return RestApiResponse.response($json, contentType = "application/json")
 
-  router.api(MethodGet, "/api/storage/v1/data/{cid}/exists") do(
+  router.api(MethodGet, "/api/codex/v1/space") do() -> RestApiResponse:
-    cid: Cid, resp: HttpResponseRef
-  ) -> RestApiResponse:
-    ## Only test if the give CID is available in the local store
-    ##
-    var headers = buildCorsHeaders("GET", allowedOrigin)
-
-    if cid.isErr:
-      return RestApiResponse.error(Http400, $cid.error(), headers = headers)
-
-    let cid = cid.get()
-    let hasCid = await node.hasLocalBlock(cid)
-
-    let json = %*{$cid: hasCid}
-    return RestApiResponse.response($json, contentType = "application/json")
-
-  router.api(MethodGet, "/api/storage/v1/space") do() -> RestApiResponse:
     let json =
       %RestRepoStore(
         totalBlocks: repoStore.totalBlocks,
@@ -391,7 +361,7 @@ proc initDataApi(node: CodexNodeRef, repoStore: RepoStore, router: var RestRoute
 proc initSalesApi(node: CodexNodeRef, router: var RestRouter) =
   let allowedOrigin = router.allowedOrigin
 
-  router.api(MethodGet, "/api/storage/v1/sales/slots") do() -> RestApiResponse:
+  router.api(MethodGet, "/api/codex/v1/sales/slots") do() -> RestApiResponse:
     var headers = buildCorsHeaders("GET", allowedOrigin)
 
     ## Returns active slots for the host
@@ -409,7 +379,7 @@ proc initSalesApi(node: CodexNodeRef, router: var RestRouter) =
       trace "Excepting processing request", exc = exc.msg
       return RestApiResponse.error(Http500, headers = headers)
 
-  router.api(MethodGet, "/api/storage/v1/sales/slots/{slotId}") do(
+  router.api(MethodGet, "/api/codex/v1/sales/slots/{slotId}") do(
     slotId: SlotId
   ) -> RestApiResponse:
     ## Returns active slot with id {slotId} for the host. Returns 404 if the
@@ -439,7 +409,7 @@ proc initSalesApi(node: CodexNodeRef, router: var RestRouter) =
       restAgent.toJson, contentType = "application/json", headers = headers
     )
 
-  router.api(MethodGet, "/api/storage/v1/sales/availability") do() -> RestApiResponse:
+  router.api(MethodGet, "/api/codex/v1/sales/availability") do() -> RestApiResponse:
     ## Returns storage that is for sale
     var headers = buildCorsHeaders("GET", allowedOrigin)
 
@@ -461,7 +431,7 @@ proc initSalesApi(node: CodexNodeRef, router: var RestRouter) =
       trace "Excepting processing request", exc = exc.msg
       return RestApiResponse.error(Http500, headers = headers)
 
-  router.rawApi(MethodPost, "/api/storage/v1/sales/availability") do() -> RestApiResponse:
+  router.rawApi(MethodPost, "/api/codex/v1/sales/availability") do() -> RestApiResponse:
     ## Add available storage to sell.
     ## Every time Availability's offer finishes, its capacity is
     ## returned to the availability.
@@ -490,24 +460,7 @@ proc initSalesApi(node: CodexNodeRef, router: var RestRouter) =
 
       if restAv.totalSize == 0:
         return RestApiResponse.error(
-          Http422, "Total size must be larger then zero", headers = headers
+          Http400, "Total size must be larger then zero", headers = headers
-        )
-
-      if restAv.duration == 0:
-        return RestApiResponse.error(
-          Http422, "duration must be larger then zero", headers = headers
-        )
-
-      if restAv.minPricePerBytePerSecond == 0:
-        return RestApiResponse.error(
-          Http422,
-          "minPricePerBytePerSecond must be larger then zero",
-          headers = headers,
-        )
-
-      if restAv.totalCollateral == 0:
-        return RestApiResponse.error(
-          Http422, "totalCollateral must be larger then zero", headers = headers
         )
 
       if not reservations.hasAvailable(restAv.totalSize):
@@ -516,19 +469,10 @@ proc initSalesApi(node: CodexNodeRef, router: var RestRouter) =
 
       without availability =? (
         await reservations.createAvailability(
-          restAv.totalSize,
+          restAv.totalSize, restAv.duration, restAv.minPricePerBytePerSecond,
-          restAv.duration,
-          restAv.minPricePerBytePerSecond,
           restAv.totalCollateral,
-          enabled = restAv.enabled |? true,
-          until = restAv.until |? 0,
         )
       ), error:
-        if error of CancelledError:
-          raise error
-        if error of UntilOutOfBoundsError:
-          return RestApiResponse.error(Http422, error.msg)
-
         return RestApiResponse.error(Http500, error.msg, headers = headers)
 
       return RestApiResponse.response(
@@ -541,7 +485,7 @@ proc initSalesApi(node: CodexNodeRef, router: var RestRouter) =
       trace "Excepting processing request", exc = exc.msg
       return RestApiResponse.error(Http500, headers = headers)
 
-  router.api(MethodOptions, "/api/storage/v1/sales/availability/{id}") do(
+  router.api(MethodOptions, "/api/codex/v1/sales/availability/{id}") do(
     id: AvailabilityId, resp: HttpResponseRef
   ) -> RestApiResponse:
     if corsOrigin =? allowedOrigin:
@@ -550,7 +494,7 @@ proc initSalesApi(node: CodexNodeRef, router: var RestRouter) =
     resp.status = Http204
     await resp.sendBody("")
 
-  router.rawApi(MethodPatch, "/api/storage/v1/sales/availability/{id}") do(
+  router.rawApi(MethodPatch, "/api/codex/v1/sales/availability/{id}") do(
     id: AvailabilityId
   ) -> RestApiResponse:
     ## Updates Availability.
@@ -565,7 +509,6 @@ proc initSalesApi(node: CodexNodeRef, router: var RestRouter) =
     ##   tokens) to be matched against the request's pricePerBytePerSecond
     ## totalCollateral - total collateral (in amount of
     ##   tokens) that can be distributed among matching requests
-
     try:
       without contracts =? node.contracts.host:
         return RestApiResponse.error(Http503, "Persistence is not enabled")
@@ -590,23 +533,17 @@ proc initSalesApi(node: CodexNodeRef, router: var RestRouter) =
         return RestApiResponse.error(Http500, error.msg)
 
       if isSome restAv.freeSize:
-        return RestApiResponse.error(Http422, "Updating freeSize is not allowed")
+        return RestApiResponse.error(Http400, "Updating freeSize is not allowed")
 
       if size =? restAv.totalSize:
-        if size == 0:
-          return RestApiResponse.error(Http422, "Total size must be larger then zero")
-
         # we don't allow lowering the totalSize bellow currently utilized size
         if size < (availability.totalSize - availability.freeSize):
           return RestApiResponse.error(
-            Http422,
+            Http400,
             "New totalSize must be larger then current totalSize - freeSize, which is currently: " &
               $(availability.totalSize - availability.freeSize),
           )
 
-        if not reservations.hasAvailable(size):
-          return RestApiResponse.error(Http422, "Not enough storage quota")
-
         availability.freeSize += size - availability.totalSize
         availability.totalSize = size
 
@@ -619,26 +556,15 @@ proc initSalesApi(node: CodexNodeRef, router: var RestRouter) =
       if totalCollateral =? restAv.totalCollateral:
         availability.totalCollateral = totalCollateral
 
-      if until =? restAv.until:
-        availability.until = until
-
-      if enabled =? restAv.enabled:
-        availability.enabled = enabled
-
       if err =? (await reservations.update(availability)).errorOption:
-        if err of CancelledError:
+        return RestApiResponse.error(Http500, err.msg)
-          raise err
-        if err of UntilOutOfBoundsError:
-          return RestApiResponse.error(Http422, err.msg)
-        else:
-          return RestApiResponse.error(Http500, err.msg)
 
-      return RestApiResponse.response(Http204)
+      return RestApiResponse.response(Http200)
     except CatchableError as exc:
       trace "Excepting processing request", exc = exc.msg
       return RestApiResponse.error(Http500)
 
-  router.rawApi(MethodGet, "/api/storage/v1/sales/availability/{id}/reservations") do(
+  router.rawApi(MethodGet, "/api/codex/v1/sales/availability/{id}/reservations") do(
     id: AvailabilityId
   ) -> RestApiResponse:
     ## Gets Availability's reservations.
@@ -682,7 +608,7 @@ proc initSalesApi(node: CodexNodeRef, router: var RestRouter) =
 proc initPurchasingApi(node: CodexNodeRef, router: var RestRouter) =
   let allowedOrigin = router.allowedOrigin
 
-  router.rawApi(MethodPost, "/api/storage/v1/storage/request/{cid}") do(
+  router.rawApi(MethodPost, "/api/codex/v1/storage/request/{cid}") do(
     cid: Cid
   ) -> RestApiResponse:
     var headers = buildCorsHeaders("POST", allowedOrigin)
@@ -711,36 +637,10 @@ proc initPurchasingApi(node: CodexNodeRef, router: var RestRouter) =
       without params =? StorageRequestParams.fromJson(body), error:
         return RestApiResponse.error(Http400, error.msg, headers = headers)
 
-      let expiry = params.expiry
-
-      if expiry <= 0 or expiry >= params.duration:
-        return RestApiResponse.error(
-          Http422,
-          "Expiry must be greater than zero and less than the request's duration",
-          headers = headers,
-        )
-
-      if params.proofProbability <= 0:
-        return RestApiResponse.error(
-          Http422, "Proof probability must be greater than zero", headers = headers
-        )
-
-      if params.collateralPerByte <= 0:
-        return RestApiResponse.error(
-          Http422, "Collateral per byte must be greater than zero", headers = headers
-        )
-
-      if params.pricePerBytePerSecond <= 0:
-        return RestApiResponse.error(
-          Http422,
-          "Price per byte per second must be greater than zero",
-          headers = headers,
-        )
-
       let requestDurationLimit = await contracts.purchasing.market.requestDurationLimit
       if params.duration > requestDurationLimit:
         return RestApiResponse.error(
-          Http422,
+          Http400,
           "Duration exceeds limit of " & $requestDurationLimit & " seconds",
           headers = headers,
         )
@@ -750,13 +650,13 @@ proc initPurchasingApi(node: CodexNodeRef, router: var RestRouter) =
 
       if tolerance == 0:
         return RestApiResponse.error(
-          Http422, "Tolerance needs to be bigger then zero", headers = headers
+          Http400, "Tolerance needs to be bigger then zero", headers = headers
         )
 
       # prevent underflow
       if tolerance > nodes:
         return RestApiResponse.error(
-          Http422,
+          Http400,
           "Invalid parameters: `tolerance` cannot be greater than `nodes`",
           headers = headers,
         )
@@ -767,11 +667,21 @@ proc initPurchasingApi(node: CodexNodeRef, router: var RestRouter) =
       # ensure leopard constrainst of 1 < K ≥ M
       if ecK <= 1 or ecK < ecM:
         return RestApiResponse.error(
-          Http422,
+          Http400,
           "Invalid parameters: parameters must satify `1 < (nodes - tolerance) ≥ tolerance`",
           headers = headers,
         )
 
+      without expiry =? params.expiry:
+        return RestApiResponse.error(Http400, "Expiry required", headers = headers)
+
+      if expiry <= 0 or expiry >= params.duration:
+        return RestApiResponse.error(
+          Http400,
+          "Expiry needs value bigger then zero and smaller then the request's duration",
+          headers = headers,
+        )
+
       without purchaseId =?
         await node.requestStorage(
           cid, params.duration, params.proofProbability, nodes, tolerance,
@@ -779,7 +689,7 @@ proc initPurchasingApi(node: CodexNodeRef, router: var RestRouter) =
         ), error:
         if error of InsufficientBlocksError:
           return RestApiResponse.error(
-            Http422,
+            Http400,
             "Dataset too small for erasure parameters, need at least " &
               $(ref InsufficientBlocksError)(error).minSize.int & " bytes",
             headers = headers,
@@ -792,7 +702,7 @@ proc initPurchasingApi(node: CodexNodeRef, router: var RestRouter) =
       trace "Excepting processing request", exc = exc.msg
       return RestApiResponse.error(Http500, headers = headers)
 
-  router.api(MethodGet, "/api/storage/v1/storage/purchases/{id}") do(
+  router.api(MethodGet, "/api/codex/v1/storage/purchases/{id}") do(
     id: PurchaseId
   ) -> RestApiResponse:
     var headers = buildCorsHeaders("GET", allowedOrigin)
@@ -824,7 +734,7 @@ proc initPurchasingApi(node: CodexNodeRef, router: var RestRouter) =
       trace "Excepting processing request", exc = exc.msg
       return RestApiResponse.error(Http500, headers = headers)
 
-  router.api(MethodGet, "/api/storage/v1/storage/purchases") do() -> RestApiResponse:
+  router.api(MethodGet, "/api/codex/v1/storage/purchases") do() -> RestApiResponse:
     var headers = buildCorsHeaders("GET", allowedOrigin)
 
     try:
@@ -846,7 +756,7 @@ proc initNodeApi(node: CodexNodeRef, conf: CodexConf, router: var RestRouter) =
 
   ## various node management api's
   ##
-  router.api(MethodGet, "/api/storage/v1/spr") do() -> RestApiResponse:
+  router.api(MethodGet, "/api/codex/v1/spr") do() -> RestApiResponse:
     ## Returns node SPR in requested format, json or text.
     ##
     var headers = buildCorsHeaders("GET", allowedOrigin)
@@ -869,7 +779,7 @@ proc initNodeApi(node: CodexNodeRef, conf: CodexConf, router: var RestRouter) =
       trace "Excepting processing request", exc = exc.msg
       return RestApiResponse.error(Http500, headers = headers)
 
-  router.api(MethodGet, "/api/storage/v1/peerid") do() -> RestApiResponse:
+  router.api(MethodGet, "/api/codex/v1/peerid") do() -> RestApiResponse:
     ## Returns node's peerId in requested format, json or text.
     ##
     var headers = buildCorsHeaders("GET", allowedOrigin)
@@ -888,7 +798,7 @@ proc initNodeApi(node: CodexNodeRef, conf: CodexConf, router: var RestRouter) =
       trace "Excepting processing request", exc = exc.msg
       return RestApiResponse.error(Http500, headers = headers)
 
-  router.api(MethodGet, "/api/storage/v1/connect/{peerId}") do(
+  router.api(MethodGet, "/api/codex/v1/connect/{peerId}") do(
     peerId: PeerId, addrs: seq[MultiAddress]
   ) -> RestApiResponse:
     ## Connect to a peer
@@ -926,7 +836,7 @@ proc initNodeApi(node: CodexNodeRef, conf: CodexConf, router: var RestRouter) =
 proc initDebugApi(node: CodexNodeRef, conf: CodexConf, router: var RestRouter) =
   let allowedOrigin = router.allowedOrigin
 
-  router.api(MethodGet, "/api/storage/v1/debug/info") do() -> RestApiResponse:
+  router.api(MethodGet, "/api/codex/v1/debug/info") do() -> RestApiResponse:
     ## Print rudimentary node information
     ##
     var headers = buildCorsHeaders("GET", allowedOrigin)
@@ -946,11 +856,7 @@ proc initDebugApi(node: CodexNodeRef, conf: CodexConf, router: var RestRouter) =
               "",
           "announceAddresses": node.discovery.announceAddrs,
           "table": table,
-          "storage": {
+          "codex": {"version": $codexVersion, "revision": $codexRevision},
-            "version": $codexVersion,
-            "revision": $codexRevision,
-            "contracts": $codexContractsRevision,
-          },
         }
 
       # return pretty json for human readability
@@ -961,7 +867,7 @@ proc initDebugApi(node: CodexNodeRef, conf: CodexConf, router: var RestRouter) =
       trace "Excepting processing request", exc = exc.msg
       return RestApiResponse.error(Http500, headers = headers)
 
-  router.api(MethodPost, "/api/storage/v1/debug/chronicles/loglevel") do(
+  router.api(MethodPost, "/api/codex/v1/debug/chronicles/loglevel") do(
     level: Option[string]
   ) -> RestApiResponse:
     ## Set log level at run time
@@ -987,8 +893,8 @@ proc initDebugApi(node: CodexNodeRef, conf: CodexConf, router: var RestRouter) =
       trace "Excepting processing request", exc = exc.msg
       return RestApiResponse.error(Http500, headers = headers)
 
-  when storage_enable_api_debug_peers:
+  when codex_enable_api_debug_peers:
-    router.api(MethodGet, "/api/storage/v1/debug/peer/{peerId}") do(
+    router.api(MethodGet, "/api/codex/v1/debug/peer/{peerId}") do(
       peerId: PeerId
     ) -> RestApiResponse:
       var headers = buildCorsHeaders("GET", allowedOrigin)

codex/rest/coders.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2022 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))

codex/rest/json.nim

@@ -17,7 +17,7 @@ type
     proofProbability* {.serialize.}: UInt256
     pricePerBytePerSecond* {.serialize.}: UInt256
     collateralPerByte* {.serialize.}: UInt256
-    expiry* {.serialize.}: uint64
+    expiry* {.serialize.}: ?uint64
     nodes* {.serialize.}: ?uint
     tolerance* {.serialize.}: ?uint
 
@@ -33,8 +33,6 @@ type
     minPricePerBytePerSecond* {.serialize.}: UInt256
     totalCollateral* {.serialize.}: UInt256
     freeSize* {.serialize.}: ?uint64
-    enabled* {.serialize.}: ?bool
-    until* {.serialize.}: ?SecondsSince1970
 
   RestSalesAgent* = object
     state* {.serialize.}: string

codex/rng.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -7,7 +7,10 @@
 ## This file may not be copied, modified, or distributed except according to
 ## those terms.
 
-{.push raises: [], gcsafe.}
+import pkg/upraises
+
+push:
+  {.upraises: [].}
 
 import pkg/libp2p/crypto/crypto
 import pkg/bearssl/rand

codex/sales.nim

@@ -22,7 +22,7 @@ import ./utils/exceptions
 ## Sales holds a list of available storage that it may sell.
 ##
 ## When storage is requested on the market that matches availability, the Sales
-## object will instruct the Logos Storage node to persist the requested data. Once the
+## object will instruct the Codex node to persist the requested data. Once the
 ## data has been persisted, it uploads a proof of storage to the market in an
 ## attempt to win a storage contract.
 ##
@@ -105,15 +105,19 @@ proc new*(
     subscriptions: @[],
   )
 
-proc remove(sales: Sales, agent: SalesAgent) {.async: (raises: []).} =
+proc remove(sales: Sales, agent: SalesAgent) {.async.} =
   await agent.stop()
-
   if sales.running:
     sales.agents.keepItIf(it != agent)
 
 proc cleanUp(
-    sales: Sales, agent: SalesAgent, reprocessSlot: bool, returnedCollateral: ?UInt256
+    sales: Sales,
-) {.async: (raises: []).} =
+    agent: SalesAgent,
+    returnBytes: bool,
+    reprocessSlot: bool,
+    returnedCollateral: ?UInt256,
+    processing: Future[void],
+) {.async.} =
   let data = agent.data
 
   logScope:
@@ -128,70 +132,72 @@ proc cleanUp(
   # if reservation for the SalesAgent was not created, then it means
   # that the cleanUp was called before the sales process really started, so
   # there are not really any bytes to be returned
-  if request =? data.request and reservation =? data.reservation:
+  if returnBytes and request =? data.request and reservation =? data.reservation:
     if returnErr =? (
-      await noCancel sales.context.reservations.returnBytesToAvailability(
+      await sales.context.reservations.returnBytesToAvailability(
         reservation.availabilityId, reservation.id, request.ask.slotSize
       )
     ).errorOption:
       error "failure returning bytes",
         error = returnErr.msg, bytes = request.ask.slotSize
 
-    # delete reservation and return reservation bytes back to the availability
+  # delete reservation and return reservation bytes back to the availability
-    if reservation =? data.reservation and
+  if reservation =? data.reservation and
-        deleteErr =? (
+      deleteErr =? (
-          await noCancel sales.context.reservations.deleteReservation(
+        await sales.context.reservations.deleteReservation(
-            reservation.id, reservation.availabilityId, returnedCollateral
+          reservation.id, reservation.availabilityId, returnedCollateral
-          )
+        )
-        ).errorOption:
+      ).errorOption:
-      error "failure deleting reservation", error = deleteErr.msg
+    error "failure deleting reservation", error = deleteErr.msg
+
+  if data.slotIndex > uint16.high.uint64:
+    error "Cannot cast slot index to uint16", slotIndex = data.slotIndex
+    return
 
   # Re-add items back into the queue to prevent small availabilities from
   # draining the queue. Seen items will be ordered last.
-  if reprocessSlot and request =? data.request and var item =? agent.data.slotQueueItem:
+  if reprocessSlot and request =? data.request:
     let queue = sales.context.slotQueue
-    item.seen = true
+    var seenItem = SlotQueueItem.init(
+      data.requestId, data.slotIndex.uint16, data.ask, request.expiry, seen = true
+    )
     trace "pushing ignored item to queue, marked as seen"
-    if err =? queue.push(item).errorOption:
+    if err =? queue.push(seenItem).errorOption:
       error "failed to readd slot to queue", errorType = $(type err), error = err.msg
 
-  let fut = sales.remove(agent)
+  await sales.remove(agent)
-  sales.trackedFutures.track(fut)
 
-proc filled(sales: Sales, request: StorageRequest, slotIndex: uint64) =
+  # signal back to the slot queue to cycle a worker
+  if not processing.isNil and not processing.finished():
+    processing.complete()
+
+proc filled(
+    sales: Sales, request: StorageRequest, slotIndex: uint64, processing: Future[void]
+) =
   if onSale =? sales.context.onSale:
     onSale(request, slotIndex)
 
-proc processSlot(
+  # signal back to the slot queue to cycle a worker
-    sales: Sales, item: SlotQueueItem
+  if not processing.isNil and not processing.finished():
-) {.async: (raises: [CancelledError]).} =
+    processing.complete()
+
+proc processSlot(sales: Sales, item: SlotQueueItem, done: Future[void]) =
   debug "Processing slot from queue", requestId = item.requestId, slot = item.slotIndex
 
-  let agent = newSalesAgent(
+  let agent =
-    sales.context, item.requestId, item.slotIndex, none StorageRequest, some item
+    newSalesAgent(sales.context, item.requestId, item.slotIndex, none StorageRequest)
-  )
-
-  let completed = newAsyncEvent()
 
   agent.onCleanUp = proc(
-      reprocessSlot = false, returnedCollateral = UInt256.none
+      returnBytes = false, reprocessSlot = false, returnedCollateral = UInt256.none
-  ) {.async: (raises: []).} =
+  ) {.async.} =
-    trace "slot cleanup"
+    await sales.cleanUp(agent, returnBytes, reprocessSlot, returnedCollateral, done)
-    await sales.cleanUp(agent, reprocessSlot, returnedCollateral)
-    completed.fire()
 
   agent.onFilled = some proc(request: StorageRequest, slotIndex: uint64) =
-    trace "slot filled"
+    sales.filled(request, slotIndex, done)
-    sales.filled(request, slotIndex)
-    completed.fire()
 
   agent.start(SalePreparing())
   sales.agents.add agent
 
-  trace "waiting for slot processing to complete"
-  await completed.wait()
-  trace "slot processing completed"
-
 proc deleteInactiveReservations(sales: Sales, activeSlots: seq[Slot]) {.async.} =
   let reservations = sales.context.reservations
   without reservs =? await reservations.all(Reservation):
@@ -250,9 +256,12 @@ proc load*(sales: Sales) {.async.} =
       newSalesAgent(sales.context, slot.request.id, slot.slotIndex, some slot.request)
 
     agent.onCleanUp = proc(
-        reprocessSlot = false, returnedCollateral = UInt256.none
+        returnBytes = false, reprocessSlot = false, returnedCollateral = UInt256.none
-    ) {.async: (raises: []).} =
+    ) {.async.} =
-      await sales.cleanUp(agent, reprocessSlot, returnedCollateral)
+      # since workers are not being dispatched, this future has not been created
+      # by a worker. Create a dummy one here so we can call sales.cleanUp
+      let done: Future[void] = nil
+      await sales.cleanUp(agent, returnBytes, reprocessSlot, returnedCollateral, done)
 
     # There is no need to assign agent.onFilled as slots loaded from `mySlots`
     # are inherently already filled and so assigning agent.onFilled would be
@@ -261,9 +270,7 @@ proc load*(sales: Sales) {.async.} =
     agent.start(SaleUnknown())
     sales.agents.add agent
 
-proc OnAvailabilitySaved(
+proc onAvailabilityAdded(sales: Sales, availability: Availability) {.async.} =
-    sales: Sales, availability: Availability
-) {.async: (raises: []).} =
   ## When availabilities are modified or added, the queue should be unpaused if
   ## it was paused and any slots in the queue should have their `seen` flag
   ## cleared.
@@ -276,7 +283,7 @@ proc OnAvailabilitySaved(
 
 proc onStorageRequested(
     sales: Sales, requestId: RequestId, ask: StorageAsk, expiry: uint64
-) {.raises: [].} =
+) =
   logScope:
     topics = "marketplace sales onStorageRequested"
     requestId
@@ -287,14 +294,7 @@ proc onStorageRequested(
 
   trace "storage requested, adding slots to queue"
 
-  let market = sales.context.market
+  without items =? SlotQueueItem.init(requestId, ask, expiry).catch, err:
-
-  without collateral =? market.slotCollateral(ask.collateralPerSlot, SlotState.Free),
-    err:
-    error "Request failure, unable to calculate collateral", error = err.msg
-    return
-
-  without items =? SlotQueueItem.init(requestId, ask, expiry, collateral).catch, err:
     if err of SlotsOutOfRangeError:
       warn "Too many slots, cannot add to queue"
     else:
@@ -324,54 +324,39 @@ proc onSlotFreed(sales: Sales, requestId: RequestId, slotIndex: uint64) =
     let market = context.market
     let queue = context.slotQueue
 
-    try:
+    if slotIndex > uint16.high.uint64:
-      without request =? (await market.getRequest(requestId)), err:
+      error "Cannot cast slot index to uint16, value = ", slotIndex
-        error "unknown request in contract", error = err.msgDetail
+      return
-        return
 
-      # Take the repairing state into consideration to calculate the collateral.
+    # first attempt to populate request using existing  metadata in queue
-      # This is particularly needed because it will affect the priority in the queue
+    without var found =? queue.populateItem(requestId, slotIndex.uint16):
-      # and we want to give the user the ability to tweak the parameters.
+      trace "no existing request metadata, getting request info from contract"
-      # Adding the repairing state directly in the queue priority calculation
+      # if there's no existing slot for that request, retrieve the request
-      # would not allow this flexibility.
+      # from the contract.
-      without collateral =?
+      try:
-        market.slotCollateral(request.ask.collateralPerSlot, SlotState.Repair), err:
+        without request =? await market.getRequest(requestId):
-        error "Failed to add freed slot to queue: unable to calculate collateral",
+          error "unknown request in contract"
-          error = err.msg
+          return
-        return
 
-      if slotIndex > uint16.high.uint64:
+        found = SlotQueueItem.init(request, slotIndex.uint16)
-        error "Cannot cast slot index to uint16, value = ", slotIndex
+      except CancelledError:
-        return
+        discard # do not propagate as addSlotToQueue was asyncSpawned
+      except CatchableError as e:
+        error "failed to get request from contract and add slots to queue",
+          error = e.msgDetail
 
-      without slotQueueItem =?
+    if err =? queue.push(found).errorOption:
-        SlotQueueItem.init(request, slotIndex.uint16, collateral = collateral).catch,
+      error "failed to push slot items to queue", error = err.msgDetail
-        err:
-        warn "Too many slots, cannot add to queue", error = err.msgDetail
-        return
 
-      if err =? queue.push(slotQueueItem).errorOption:
-        if err of SlotQueueItemExistsError:
-          error "Failed to push item to queue because it already exists",
-            error = err.msgDetail
-        elif err of QueueNotRunningError:
-          warn "Failed to push item to queue because queue is not running",
-            error = err.msgDetail
-    except CancelledError as e:
-      trace "sales.addSlotToQueue was cancelled"
-
-  # We could get rid of this by adding the storage ask in the SlotFreed event,
-  # so we would not need to call getRequest to get the collateralPerSlot.
   let fut = addSlotToQueue()
   sales.trackedFutures.track(fut)
+  asyncSpawn fut
 
 proc subscribeRequested(sales: Sales) {.async.} =
   let context = sales.context
   let market = context.market
 
-  proc onStorageRequested(
+  proc onStorageRequested(requestId: RequestId, ask: StorageAsk, expiry: uint64) =
-      requestId: RequestId, ask: StorageAsk, expiry: uint64
-  ) {.raises: [].} =
     sales.onStorageRequested(requestId, ask, expiry)
 
   try:
@@ -503,20 +488,16 @@ proc startSlotQueue(sales: Sales) =
   let slotQueue = sales.context.slotQueue
   let reservations = sales.context.reservations
 
-  slotQueue.onProcessSlot = proc(item: SlotQueueItem) {.async: (raises: []).} =
+  slotQueue.onProcessSlot = proc(item: SlotQueueItem, done: Future[void]) {.async.} =
     trace "processing slot queue item", reqId = item.requestId, slotIdx = item.slotIndex
-    try:
+    sales.processSlot(item, done)
-      await sales.processSlot(item)
-    except CancelledError:
-      discard
 
   slotQueue.start()
 
-  proc OnAvailabilitySaved(availability: Availability) {.async: (raises: []).} =
+  proc onAvailabilityAdded(availability: Availability) {.async.} =
-    if availability.enabled:
+    await sales.onAvailabilityAdded(availability)
-      await sales.OnAvailabilitySaved(availability)
 
-  reservations.OnAvailabilitySaved = OnAvailabilitySaved
+  reservations.onAvailabilityAdded = onAvailabilityAdded
 
 proc subscribe(sales: Sales) {.async.} =
   await sales.subscribeRequested()

codex/sales/reservations.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2022 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -27,15 +27,17 @@
 ## | UInt256          | totalRemainingCollateral |     |
 ## +---------------------------------------------------+
 
-{.push raises: [], gcsafe.}
+import pkg/upraises
+push:
+  {.upraises: [].}
 
 import std/sequtils
 import std/sugar
 import std/typetraits
 import std/sequtils
-import std/times
 import pkg/chronos
 import pkg/datastore
+import pkg/nimcrypto
 import pkg/questionable
 import pkg/questionable/results
 import pkg/stint
@@ -52,10 +54,8 @@ import ../units
 export requests
 export logutils
 
-from nimcrypto import randomBytes
-
 logScope:
-  topics = "marketplace sales reservations"
+  topics = "sales reservations"
 
 type
   AvailabilityId* = distinct array[32, byte]
@@ -70,12 +70,6 @@ type
     minPricePerBytePerSecond* {.serialize.}: UInt256
     totalCollateral {.serialize.}: UInt256
     totalRemainingCollateral* {.serialize.}: UInt256
-    # If set to false, the availability will not accept new slots.
-    # If enabled, it will not impact any existing slots that are already being hosted.
-    enabled* {.serialize.}: bool
-    # Specifies the latest timestamp after which the availability will no longer host any slots.
-    # If set to 0, there will be no restrictions.
-    until* {.serialize.}: SecondsSince1970
 
   Reservation* = ref object
     id* {.serialize.}: ReservationId
@@ -83,18 +77,17 @@ type
     size* {.serialize.}: uint64
     requestId* {.serialize.}: RequestId
     slotIndex* {.serialize.}: uint64
-    validUntil* {.serialize.}: SecondsSince1970
 
   Reservations* = ref object of RootObj
     availabilityLock: AsyncLock
       # Lock for protecting assertions of availability's sizes when searching for matching availability
     repo: RepoStore
-    OnAvailabilitySaved: ?OnAvailabilitySaved
+    onAvailabilityAdded: ?OnAvailabilityAdded
 
-  GetNext* = proc(): Future[?seq[byte]] {.async: (raises: [CancelledError]), closure.}
+  GetNext* = proc(): Future[?seq[byte]] {.upraises: [], gcsafe, closure.}
-  IterDispose* = proc(): Future[?!void] {.async: (raises: [CancelledError]), closure.}
+  IterDispose* = proc(): Future[?!void] {.gcsafe, closure.}
-  OnAvailabilitySaved* =
+  OnAvailabilityAdded* =
-    proc(availability: Availability): Future[void] {.async: (raises: []).}
+    proc(availability: Availability): Future[void] {.upraises: [], gcsafe.}
   StorableIter* = ref object
     finished*: bool
     next*: GetNext
@@ -109,20 +102,13 @@ type
   SerializationError* = object of ReservationsError
   UpdateFailedError* = object of ReservationsError
   BytesOutOfBoundsError* = object of ReservationsError
-  UntilOutOfBoundsError* = object of ReservationsError
 
 const
   SalesKey = (CodexMetaKey / "sales").tryGet # TODO: move to sales module
   ReservationsKey = (SalesKey / "reservations").tryGet
 
 proc hash*(x: AvailabilityId): Hash {.borrow.}
-proc all*(
+proc all*(self: Reservations, T: type SomeStorableObject): Future[?!seq[T]] {.async.}
-  self: Reservations, T: type SomeStorableObject
-): Future[?!seq[T]] {.async: (raises: [CancelledError]).}
-
-proc all*(
-  self: Reservations, T: type SomeStorableObject, availabilityId: AvailabilityId
-): Future[?!seq[T]] {.async: (raises: [CancelledError]).}
 
 template withLock(lock, body) =
   try:
@@ -142,8 +128,6 @@ proc init*(
     duration: uint64,
     minPricePerBytePerSecond: UInt256,
     totalCollateral: UInt256,
-    enabled: bool,
-    until: SecondsSince1970,
 ): Availability =
   var id: array[32, byte]
   doAssert randomBytes(id) == 32
@@ -155,8 +139,6 @@ proc init*(
     minPricePerBytePerSecond: minPricePerBytePerSecond,
     totalCollateral: totalCollateral,
     totalRemainingCollateral: totalCollateral,
-    enabled: enabled,
-    until: until,
   )
 
 func totalCollateral*(self: Availability): UInt256 {.inline.} =
@@ -172,7 +154,6 @@ proc init*(
     size: uint64,
     requestId: RequestId,
     slotIndex: uint64,
-    validUntil: SecondsSince1970,
 ): Reservation =
   var id: array[32, byte]
   doAssert randomBytes(id) == 32
@@ -182,7 +163,6 @@ proc init*(
     size: size,
     requestId: requestId,
     slotIndex: slotIndex,
-    validUntil: validUntil,
   )
 
 func toArray(id: SomeStorableId): array[32, byte] =
@@ -209,10 +189,10 @@ logutils.formatIt(LogFormat.textLines, SomeStorableId):
 logutils.formatIt(LogFormat.json, SomeStorableId):
   it.to0xHexLog
 
-proc `OnAvailabilitySaved=`*(
+proc `onAvailabilityAdded=`*(
-    self: Reservations, OnAvailabilitySaved: OnAvailabilitySaved
+    self: Reservations, onAvailabilityAdded: OnAvailabilityAdded
 ) =
-  self.OnAvailabilitySaved = some OnAvailabilitySaved
+  self.onAvailabilityAdded = some onAvailabilityAdded
 
 func key*(id: AvailabilityId): ?!Key =
   ## sales / reservations / <availabilityId>
@@ -226,11 +206,6 @@ func key*(availability: Availability): ?!Key =
   return availability.id.key
 
 func maxCollateralPerByte*(availability: Availability): UInt256 =
-  # If freeSize happens to be zero, we convention that the maxCollateralPerByte
-  # should be equal to totalRemainingCollateral.
-  if availability.freeSize == 0.uint64:
-    return availability.totalRemainingCollateral
-
   return availability.totalRemainingCollateral div availability.freeSize.stuint(256)
 
 func key*(reservation: Reservation): ?!Key =
@@ -242,19 +217,11 @@ func available*(self: Reservations): uint =
 func hasAvailable*(self: Reservations, bytes: uint): bool =
   self.repo.available(bytes.NBytes)
 
-proc exists*(
+proc exists*(self: Reservations, key: Key): Future[bool] {.async.} =
-    self: Reservations, key: Key
-): Future[bool] {.async: (raises: [CancelledError]).} =
   let exists = await self.repo.metaDs.ds.contains(key)
   return exists
 
-iterator items(self: StorableIter): auto =
+proc getImpl(self: Reservations, key: Key): Future[?!seq[byte]] {.async.} =
-  while not self.finished:
-    yield self.next()
-
-proc getImpl(
-    self: Reservations, key: Key
-): Future[?!seq[byte]] {.async: (raises: [CancelledError]).} =
   if not await self.exists(key):
     let err =
       newException(NotExistsError, "object with key " & $key & " does not exist")
@@ -267,7 +234,7 @@ proc getImpl(
 
 proc get*(
     self: Reservations, key: Key, T: type SomeStorableObject
-): Future[?!T] {.async: (raises: [CancelledError]).} =
+): Future[?!T] {.async.} =
   without serialized =? await self.getImpl(key), error:
     return failure(error)
 
@@ -276,9 +243,7 @@ proc get*(
 
   return success obj
 
-proc updateImpl(
+proc updateImpl(self: Reservations, obj: SomeStorableObject): Future[?!void] {.async.} =
-    self: Reservations, obj: SomeStorableObject
-): Future[?!void] {.async: (raises: [CancelledError]).} =
   trace "updating " & $(obj.type), id = obj.id
 
   without key =? obj.key, error:
@@ -291,15 +256,10 @@ proc updateImpl(
 
 proc updateAvailability(
     self: Reservations, obj: Availability
-): Future[?!void] {.async: (raises: [CancelledError]).} =
+): Future[?!void] {.async.} =
   logScope:
     availabilityId = obj.id
 
-  if obj.until < 0:
-    let error =
-      newException(UntilOutOfBoundsError, "Cannot set until to a negative value")
-    return failure(error)
-
   without key =? obj.key, error:
     return failure(error)
 
@@ -308,26 +268,22 @@ proc updateAvailability(
       trace "Creating new Availability"
       let res = await self.updateImpl(obj)
       # inform subscribers that Availability has been added
-      if OnAvailabilitySaved =? self.OnAvailabilitySaved:
+      if onAvailabilityAdded =? self.onAvailabilityAdded:
-        await OnAvailabilitySaved(obj)
+        # when chronos v4 is implemented, and OnAvailabilityAdded is annotated
+        # with async:(raises:[]), we can remove this try/catch as we know, with
+        # certainty, that nothing will be raised
+        try:
+          await onAvailabilityAdded(obj)
+        except CancelledError as e:
+          raise e
+        except CatchableError as e:
+          # we don't have any insight into types of exceptions that
+          # `onAvailabilityAdded` can raise because it is caller-defined
+          warn "Unknown error during 'onAvailabilityAdded' callback", error = e.msg
       return res
     else:
       return failure(err)
 
-  if obj.until > 0:
-    without allReservations =? await self.all(Reservation, obj.id), error:
-      error.msg = "Error updating reservation: " & error.msg
-      return failure(error)
-
-    let requestEnds = allReservations.mapIt(it.validUntil)
-
-    if requestEnds.len > 0 and requestEnds.max > obj.until:
-      let error = newException(
-        UntilOutOfBoundsError,
-        "Until parameter must be greater or equal to the longest currently hosted slot",
-      )
-      return failure(error)
-
   # Sizing of the availability changed, we need to adjust the repo reservation accordingly
   if oldAvailability.totalSize != obj.totalSize:
     trace "totalSize changed, updating repo reservation"
@@ -344,34 +300,32 @@ proc updateAvailability(
 
   let res = await self.updateImpl(obj)
 
-  if oldAvailability.freeSize < obj.freeSize or oldAvailability.duration < obj.duration or
+  if oldAvailability.freeSize < obj.freeSize: # availability added
-      oldAvailability.minPricePerBytePerSecond < obj.minPricePerBytePerSecond or
-      oldAvailability.totalRemainingCollateral < obj.totalRemainingCollateral:
-    # availability updated
     # inform subscribers that Availability has been modified (with increased
     # size)
-    if OnAvailabilitySaved =? self.OnAvailabilitySaved:
+    if onAvailabilityAdded =? self.onAvailabilityAdded:
-      await OnAvailabilitySaved(obj)
+      # when chronos v4 is implemented, and OnAvailabilityAdded is annotated
+      # with async:(raises:[]), we can remove this try/catch as we know, with
+      # certainty, that nothing will be raised
+      try:
+        await onAvailabilityAdded(obj)
+      except CancelledError as e:
+        raise e
+      except CatchableError as e:
+        # we don't have any insight into types of exceptions that
+        # `onAvailabilityAdded` can raise because it is caller-defined
+        warn "Unknown error during 'onAvailabilityAdded' callback", error = e.msg
+
   return res
 
-proc update*(
+proc update*(self: Reservations, obj: Reservation): Future[?!void] {.async.} =
-    self: Reservations, obj: Reservation
-): Future[?!void] {.async: (raises: [CancelledError]).} =
   return await self.updateImpl(obj)
 
-proc update*(
+proc update*(self: Reservations, obj: Availability): Future[?!void] {.async.} =
-    self: Reservations, obj: Availability
+  withLock(self.availabilityLock):
-): Future[?!void] {.async: (raises: [CancelledError]).} =
+    return await self.updateAvailability(obj)
-  try:
-    withLock(self.availabilityLock):
-      return await self.updateAvailability(obj)
-  except AsyncLockError as e:
-    error "Lock error when trying to update the availability", err = e.msg
-    return failure(e)
 
-proc delete(
+proc delete(self: Reservations, key: Key): Future[?!void] {.async.} =
-    self: Reservations, key: Key
-): Future[?!void] {.async: (raises: [CancelledError]).} =
   trace "deleting object", key
 
   if not await self.exists(key):
@@ -387,23 +341,25 @@ proc deleteReservation*(
     reservationId: ReservationId,
     availabilityId: AvailabilityId,
     returnedCollateral: ?UInt256 = UInt256.none,
-): Future[?!void] {.async: (raises: [CancelledError]).} =
+): Future[?!void] {.async.} =
   logScope:
     reservationId
     availabilityId
 
   trace "deleting reservation"
-
   without key =? key(reservationId, availabilityId), error:
     return failure(error)
 
-  try:
+  withLock(self.availabilityLock):
-    withLock(self.availabilityLock):
+    without reservation =? (await self.get(key, Reservation)), error:
-      without reservation =? (await self.get(key, Reservation)), error:
+      if error of NotExistsError:
-        if error of NotExistsError:
+        return success()
-          return success()
+      else:
-        else:
+        return failure(error)
-          return failure(error)
+
+    if reservation.size > 0.uint64:
+      trace "returning remaining reservation bytes to availability",
+        size = reservation.size
 
       without availabilityKey =? availabilityId.key, error:
         return failure(error)
@@ -411,10 +367,7 @@ proc deleteReservation*(
       without var availability =? await self.get(availabilityKey, Availability), error:
         return failure(error)
 
-      if reservation.size > 0.uint64:
+      availability.freeSize += reservation.size
-        trace "returning remaining reservation bytes to availability",
-          size = reservation.size
-        availability.freeSize += reservation.size
 
       if collateral =? returnedCollateral:
         availability.totalRemainingCollateral += collateral
@@ -422,13 +375,10 @@ proc deleteReservation*(
       if updateErr =? (await self.updateAvailability(availability)).errorOption:
         return failure(updateErr)
 
-      if err =? (await self.repo.metaDs.ds.delete(key)).errorOption:
+    if err =? (await self.repo.metaDs.ds.delete(key)).errorOption:
-        return failure(err.toErr(DeleteFailedError))
+      return failure(err.toErr(DeleteFailedError))
 
-      return success()
+    return success()
-  except AsyncLockError as e:
-    error "Lock error when trying to delete the availability", err = e.msg
-    return failure(e)
 
 # TODO: add support for deleting availabilities
 # To delete, must not have any active sales.
@@ -439,20 +389,12 @@ proc createAvailability*(
     duration: uint64,
     minPricePerBytePerSecond: UInt256,
     totalCollateral: UInt256,
-    enabled: bool,
+): Future[?!Availability] {.async.} =
-    until: SecondsSince1970,
-): Future[?!Availability] {.async: (raises: [CancelledError]).} =
   trace "creating availability",
-    size, duration, minPricePerBytePerSecond, totalCollateral, enabled, until
+    size, duration, minPricePerBytePerSecond, totalCollateral
 
-  if until < 0:
+  let availability =
-    let error =
+    Availability.init(size, size, duration, minPricePerBytePerSecond, totalCollateral)
-      newException(UntilOutOfBoundsError, "Cannot set until to a negative value")
-    return failure(error)
-
-  let availability = Availability.init(
-    size, size, duration, minPricePerBytePerSecond, totalCollateral, enabled, until
-  )
   let bytes = availability.freeSize
 
   if reserveErr =? (await self.repo.reserve(bytes.NBytes)).errorOption:
@@ -476,124 +418,114 @@ method createReservation*(
     requestId: RequestId,
     slotIndex: uint64,
     collateralPerByte: UInt256,
-    validUntil: SecondsSince1970,
+): Future[?!Reservation] {.async, base.} =
-): Future[?!Reservation] {.async: (raises: [CancelledError]), base.} =
+  withLock(self.availabilityLock):
-  try:
+    without availabilityKey =? availabilityId.key, error:
-    withLock(self.availabilityLock):
+      return failure(error)
-      without availabilityKey =? availabilityId.key, error:
-        return failure(error)
 
-      without availability =? await self.get(availabilityKey, Availability), error:
+    without availability =? await self.get(availabilityKey, Availability), error:
-        return failure(error)
+      return failure(error)
 
-      # Check that the found availability has enough free space after the lock has been acquired, to prevent asynchronous Availiability modifications
+    # Check that the found availability has enough free space after the lock has been acquired, to prevent asynchronous Availiability modifications
-      if availability.freeSize < slotSize:
+    if availability.freeSize < slotSize:
-        let error = newException(
+      let error = newException(
-          BytesOutOfBoundsError,
+        BytesOutOfBoundsError,
-          "trying to reserve an amount of bytes that is greater than the free size of the Availability",
+        "trying to reserve an amount of bytes that is greater than the free size of the Availability",
-        )
+      )
-        return failure(error)
+      return failure(error)
 
-      trace "Creating reservation",
+    trace "Creating reservation", availabilityId, slotSize, requestId, slotIndex
-        availabilityId, slotSize, requestId, slotIndex, validUntil = validUntil
 
-      let reservation =
+    let reservation = Reservation.init(availabilityId, slotSize, requestId, slotIndex)
-        Reservation.init(availabilityId, slotSize, requestId, slotIndex, validUntil)
 
-      if createResErr =? (await self.update(reservation)).errorOption:
+    if createResErr =? (await self.update(reservation)).errorOption:
-        return failure(createResErr)
+      return failure(createResErr)
 
-      # reduce availability freeSize by the slot size, which is now accounted for in
+    # reduce availability freeSize by the slot size, which is now accounted for in
-      # the newly created Reservation
+    # the newly created Reservation
-      availability.freeSize -= slotSize
+    availability.freeSize -= slotSize
 
-      # adjust the remaining totalRemainingCollateral
+    # adjust the remaining totalRemainingCollateral
-      availability.totalRemainingCollateral -= slotSize.u256 * collateralPerByte
+    availability.totalRemainingCollateral -= slotSize.stuint(256) * collateralPerByte
 
-      # update availability with reduced size
+    # update availability with reduced size
-      trace "Updating availability with reduced size", freeSize = availability.freeSize
+    trace "Updating availability with reduced size"
-      if updateErr =? (await self.updateAvailability(availability)).errorOption:
+    if updateErr =? (await self.updateAvailability(availability)).errorOption:
-        trace "Updating availability failed, rolling back reservation creation"
+      trace "Updating availability failed, rolling back reservation creation"
 
-        without key =? reservation.key, keyError:
+      without key =? reservation.key, keyError:
-          keyError.parent = updateErr
+        keyError.parent = updateErr
-          return failure(keyError)
+        return failure(keyError)
 
-        # rollback the reservation creation
+      # rollback the reservation creation
-        if rollbackErr =? (await self.delete(key)).errorOption:
+      if rollbackErr =? (await self.delete(key)).errorOption:
-          rollbackErr.parent = updateErr
+        rollbackErr.parent = updateErr
-          return failure(rollbackErr)
+        return failure(rollbackErr)
 
-        return failure(updateErr)
+      return failure(updateErr)
 
-      trace "Reservation succesfully created"
+    trace "Reservation succesfully created"
-      return success(reservation)
+    return success(reservation)
-  except AsyncLockError as e:
-    error "Lock error when trying to delete the availability", err = e.msg
-    return failure(e)
 
 proc returnBytesToAvailability*(
     self: Reservations,
     availabilityId: AvailabilityId,
     reservationId: ReservationId,
     bytes: uint64,
-): Future[?!void] {.async: (raises: [CancelledError]).} =
+): Future[?!void] {.async.} =
   logScope:
     reservationId
     availabilityId
-  try:
-    withLock(self.availabilityLock):
-      without key =? key(reservationId, availabilityId), error:
-        return failure(error)
 
-      without var reservation =? (await self.get(key, Reservation)), error:
+  withLock(self.availabilityLock):
-        return failure(error)
+    without key =? key(reservationId, availabilityId), error:
+      return failure(error)
 
-      # We are ignoring bytes that are still present in the Reservation because
+    without var reservation =? (await self.get(key, Reservation)), error:
-      # they will be returned to Availability through `deleteReservation`.
+      return failure(error)
-      let bytesToBeReturned = bytes - reservation.size
 
-      if bytesToBeReturned == 0:
+    # We are ignoring bytes that are still present in the Reservation because
-        trace "No bytes are returned",
+    # they will be returned to Availability through `deleteReservation`.
-          requestSizeBytes = bytes, returningBytes = bytesToBeReturned
+    let bytesToBeReturned = bytes - reservation.size
-        return success()
 
-      trace "Returning bytes",
+    if bytesToBeReturned == 0:
+      trace "No bytes are returned",
         requestSizeBytes = bytes, returningBytes = bytesToBeReturned
-
-      # First lets see if we can re-reserve the bytes, if the Repo's quota
-      # is depleted then we will fail-fast as there is nothing to be done atm.
-      if reserveErr =? (await self.repo.reserve(bytesToBeReturned.NBytes)).errorOption:
-        return failure(reserveErr.toErr(ReserveFailedError))
-
-      without availabilityKey =? availabilityId.key, error:
-        return failure(error)
-
-      without var availability =? await self.get(availabilityKey, Availability), error:
-        return failure(error)
-
-      availability.freeSize += bytesToBeReturned
-
-      # Update availability with returned size
-      if updateErr =? (await self.updateAvailability(availability)).errorOption:
-        trace "Rolling back returning bytes"
-        if rollbackErr =? (await self.repo.release(bytesToBeReturned.NBytes)).errorOption:
-          rollbackErr.parent = updateErr
-          return failure(rollbackErr)
-
-        return failure(updateErr)
-
       return success()
-  except AsyncLockError as e:
+
-    error "Lock error when returning bytes to the availability", err = e.msg
+    trace "Returning bytes",
-    return failure(e)
+      requestSizeBytes = bytes, returningBytes = bytesToBeReturned
+
+    # First lets see if we can re-reserve the bytes, if the Repo's quota
+    # is depleted then we will fail-fast as there is nothing to be done atm.
+    if reserveErr =? (await self.repo.reserve(bytesToBeReturned.NBytes)).errorOption:
+      return failure(reserveErr.toErr(ReserveFailedError))
+
+    without availabilityKey =? availabilityId.key, error:
+      return failure(error)
+
+    without var availability =? await self.get(availabilityKey, Availability), error:
+      return failure(error)
+
+    availability.freeSize += bytesToBeReturned
+
+    # Update availability with returned size
+    if updateErr =? (await self.updateAvailability(availability)).errorOption:
+      trace "Rolling back returning bytes"
+      if rollbackErr =? (await self.repo.release(bytesToBeReturned.NBytes)).errorOption:
+        rollbackErr.parent = updateErr
+        return failure(rollbackErr)
+
+      return failure(updateErr)
+
+    return success()
 
 proc release*(
     self: Reservations,
     reservationId: ReservationId,
     availabilityId: AvailabilityId,
     bytes: uint,
-): Future[?!void] {.async: (raises: [CancelledError]).} =
+): Future[?!void] {.async.} =
   logScope:
     topics = "release"
     bytes
@@ -631,9 +563,13 @@ proc release*(
 
   return success()
 
+iterator items(self: StorableIter): Future[?seq[byte]] =
+  while not self.finished:
+    yield self.next()
+
 proc storables(
     self: Reservations, T: type SomeStorableObject, queryKey: Key = ReservationsKey
-): Future[?!StorableIter] {.async: (raises: [CancelledError]).} =
+): Future[?!StorableIter] {.async.} =
   var iter = StorableIter()
   let query = Query.init(queryKey)
   when T is Availability:
@@ -651,7 +587,7 @@ proc storables(
     return failure(error)
 
   # /sales/reservations
-  proc next(): Future[?seq[byte]] {.async: (raises: [CancelledError]).} =
+  proc next(): Future[?seq[byte]] {.async.} =
     await idleAsync()
     iter.finished = results.finished
     if not results.finished and res =? (await results.next()) and res.data.len > 0 and
@@ -660,7 +596,7 @@ proc storables(
 
     return none seq[byte]
 
-  proc dispose(): Future[?!void] {.async: (raises: [CancelledError]).} =
+  proc dispose(): Future[?!void] {.async.} =
     return await results.dispose()
 
   iter.next = next
@@ -669,40 +605,32 @@ proc storables(
 
 proc allImpl(
     self: Reservations, T: type SomeStorableObject, queryKey: Key = ReservationsKey
-): Future[?!seq[T]] {.async: (raises: [CancelledError]).} =
+): Future[?!seq[T]] {.async.} =
   var ret: seq[T] = @[]
 
   without storables =? (await self.storables(T, queryKey)), error:
     return failure(error)
 
   for storable in storables.items:
-    try:
+    without bytes =? (await storable):
-      without bytes =? (await storable):
-        continue
-
-      without obj =? T.fromJson(bytes), error:
-        error "json deserialization error",
-          json = string.fromBytes(bytes), error = error.msg
-        continue
-
-      ret.add obj
-    except CancelledError as err:
-      raise err
-    except CatchableError as err:
-      error "Error when retrieving storable", error = err.msg
       continue
 
+    without obj =? T.fromJson(bytes), error:
+      error "json deserialization error",
+        json = string.fromBytes(bytes), error = error.msg
+      continue
+
+    ret.add obj
+
   return success(ret)
 
-proc all*(
+proc all*(self: Reservations, T: type SomeStorableObject): Future[?!seq[T]] {.async.} =
-    self: Reservations, T: type SomeStorableObject
-): Future[?!seq[T]] {.async: (raises: [CancelledError]).} =
   return await self.allImpl(T)
 
 proc all*(
     self: Reservations, T: type SomeStorableObject, availabilityId: AvailabilityId
-): Future[?!seq[T]] {.async: (raises: [CancelledError]).} =
+): Future[?!seq[T]] {.async.} =
-  without key =? key(availabilityId):
+  without key =? (ReservationsKey / $availabilityId):
     return failure("no key")
 
   return await self.allImpl(T, key)
@@ -711,22 +639,18 @@ proc findAvailability*(
     self: Reservations,
     size, duration: uint64,
     pricePerBytePerSecond, collateralPerByte: UInt256,
-    validUntil: SecondsSince1970,
+): Future[?Availability] {.async.} =
-): Future[?Availability] {.async: (raises: [CancelledError]).} =
   without storables =? (await self.storables(Availability)), e:
     error "failed to get all storables", error = e.msg
     return none Availability
 
   for item in storables.items:
     if bytes =? (await item) and availability =? Availability.fromJson(bytes):
-      if availability.enabled and size <= availability.freeSize and
+      if size <= availability.freeSize and duration <= availability.duration and
-          duration <= availability.duration and
           collateralPerByte <= availability.maxCollateralPerByte and
-          pricePerBytePerSecond >= availability.minPricePerBytePerSecond and
+          pricePerBytePerSecond >= availability.minPricePerBytePerSecond:
-          (availability.until == 0 or availability.until >= validUntil):
         trace "availability matched",
           id = availability.id,
-          enabled = availability.enabled,
           size,
           availFreeSize = availability.freeSize,
           duration,
@@ -734,8 +658,7 @@ proc findAvailability*(
           pricePerBytePerSecond,
           availMinPricePerBytePerSecond = availability.minPricePerBytePerSecond,
           collateralPerByte,
-          availMaxCollateralPerByte = availability.maxCollateralPerByte,
+          availMaxCollateralPerByte = availability.maxCollateralPerByte
-          until = availability.until
 
         # TODO: As soon as we're on ARC-ORC, we can use destructors
         # to automatically dispose our iterators when they fall out of scope.
@@ -747,7 +670,6 @@ proc findAvailability*(
 
       trace "availability did not match",
         id = availability.id,
-        enabled = availability.enabled,
         size,
         availFreeSize = availability.freeSize,
         duration,
@@ -755,5 +677,4 @@ proc findAvailability*(
         pricePerBytePerSecond,
         availMinPricePerBytePerSecond = availability.minPricePerBytePerSecond,
         collateralPerByte,
-        availMaxCollateralPerByte = availability.maxCollateralPerByte,
+        availMaxCollateralPerByte = availability.maxCollateralPerByte
-        until = availability.until

codex/sales/salesagent.nim

@@ -2,6 +2,7 @@ import pkg/chronos
 import pkg/questionable
 import pkg/questionable/results
 import pkg/stint
+import pkg/upraises
 import ../contracts/requests
 import ../errors
 import ../logutils
@@ -10,7 +11,6 @@ import ./statemachine
 import ./salescontext
 import ./salesdata
 import ./reservations
-import ./slotqueue
 
 export reservations
 
@@ -26,10 +26,10 @@ type
     onCleanUp*: OnCleanUp
     onFilled*: ?OnFilled
 
-  OnCleanUp* = proc(reprocessSlot = false, returnedCollateral = UInt256.none) {.
+  OnCleanUp* = proc(
-    async: (raises: [])
+    returnBytes = false, reprocessSlot = false, returnedCollateral = UInt256.none
-  .}
+  ): Future[void] {.gcsafe, upraises: [].}
-  OnFilled* = proc(request: StorageRequest, slotIndex: uint64) {.gcsafe, raises: [].}
+  OnFilled* = proc(request: StorageRequest, slotIndex: uint64) {.gcsafe, upraises: [].}
 
   SalesAgentError = object of CodexError
   AllSlotsFilledError* = object of SalesAgentError
@@ -42,16 +42,10 @@ proc newSalesAgent*(
     requestId: RequestId,
     slotIndex: uint64,
     request: ?StorageRequest,
-    slotQueueItem = SlotQueueItem.none,
 ): SalesAgent =
   var agent = SalesAgent.new()
   agent.context = context
-  agent.data = SalesData(
+  agent.data = SalesData(requestId: requestId, slotIndex: slotIndex, request: request)
-    requestId: requestId,
-    slotIndex: slotIndex,
-    request: request,
-    slotQueueItem: slotQueueItem,
-  )
   return agent
 
 proc retrieveRequest*(agent: SalesAgent) {.async.} =
@@ -109,15 +103,18 @@ proc subscribeCancellation(agent: SalesAgent) {.async.} =
       error "Error while waiting for expiry to lapse", error = e.msgDetail
 
   data.cancelled = onCancelled()
+  asyncSpawn data.cancelled
 
 method onFulfilled*(
     agent: SalesAgent, requestId: RequestId
-) {.base, gcsafe, raises: [].} =
+) {.base, gcsafe, upraises: [].} =
   let cancelled = agent.data.cancelled
   if agent.data.requestId == requestId and not cancelled.isNil and not cancelled.finished:
     cancelled.cancelSoon()
 
-method onFailed*(agent: SalesAgent, requestId: RequestId) {.base, gcsafe, raises: [].} =
+method onFailed*(
+    agent: SalesAgent, requestId: RequestId
+) {.base, gcsafe, upraises: [].} =
   without request =? agent.data.request:
     return
   if agent.data.requestId == requestId:
@@ -125,7 +122,7 @@ method onFailed*(agent: SalesAgent, requestId: RequestId) {.base, gcsafe, raises
 
 method onSlotFilled*(
     agent: SalesAgent, requestId: RequestId, slotIndex: uint64
-) {.base, gcsafe, raises: [].} =
+) {.base, gcsafe, upraises: [].} =
   if agent.data.requestId == requestId and agent.data.slotIndex == slotIndex:
     agent.schedule(slotFilledEvent(requestId, slotIndex))
 
@@ -136,7 +133,7 @@ proc subscribe*(agent: SalesAgent) {.async.} =
   await agent.subscribeCancellation()
   agent.subscribed = true
 
-proc unsubscribe*(agent: SalesAgent) {.async: (raises: []).} =
+proc unsubscribe*(agent: SalesAgent) {.async.} =
   if not agent.subscribed:
     return
 
@@ -147,6 +144,6 @@ proc unsubscribe*(agent: SalesAgent) {.async: (raises: []).} =
 
   agent.subscribed = false
 
-proc stop*(agent: SalesAgent) {.async: (raises: []).} =
+proc stop*(agent: SalesAgent) {.async.} =
   await Machine(agent).stop()
   await agent.unsubscribe()

codex/sales/salescontext.nim

@@ -1,5 +1,6 @@
 import pkg/questionable
 import pkg/questionable/results
+import pkg/upraises
 import pkg/libp2p/cid
 
 import ../market
@@ -23,20 +24,15 @@ type
     slotQueue*: SlotQueue
     simulateProofFailures*: int
 
-  BlocksCb* =
+  BlocksCb* = proc(blocks: seq[bt.Block]): Future[?!void] {.gcsafe, raises: [].}
-    proc(blocks: seq[bt.Block]): Future[?!void] {.async: (raises: [CancelledError]).}
   OnStore* = proc(
-    request: StorageRequest,
+    request: StorageRequest, slot: uint64, blocksCb: BlocksCb
-    expiry: SecondsSince1970,
+  ): Future[?!void] {.gcsafe, upraises: [].}
-    slot: uint64,
-    blocksCb: BlocksCb,
-    isRepairing: bool,
-  ): Future[?!void] {.async: (raises: [CancelledError]).}
   OnProve* = proc(slot: Slot, challenge: ProofChallenge): Future[?!Groth16Proof] {.
-    async: (raises: [CancelledError])
+    gcsafe, upraises: []
   .}
   OnExpiryUpdate* = proc(rootCid: Cid, expiry: SecondsSince1970): Future[?!void] {.
-    async: (raises: [CancelledError])
+    gcsafe, upraises: []
   .}
-  OnClear* = proc(request: StorageRequest, slotIndex: uint64) {.gcsafe, raises: [].}
+  OnClear* = proc(request: StorageRequest, slotIndex: uint64) {.gcsafe, upraises: [].}
-  OnSale* = proc(request: StorageRequest, slotIndex: uint64) {.gcsafe, raises: [].}
+  OnSale* = proc(request: StorageRequest, slotIndex: uint64) {.gcsafe, upraises: [].}

codex/sales/salesdata.nim

@@ -2,7 +2,6 @@ import pkg/chronos
 import ../contracts/requests
 import ../market
 import ./reservations
-import ./slotqueue
 
 type SalesData* = ref object
   requestId*: RequestId
@@ -11,4 +10,3 @@ type SalesData* = ref object
   slotIndex*: uint64
   cancelled*: Future[void]
   reservation*: ?Reservation
-  slotQueueItem*: ?SlotQueueItem

codex/sales/slotqueue.nim

@@ -3,7 +3,9 @@ import std/tables
 import pkg/chronos
 import pkg/questionable
 import pkg/questionable/results
+import pkg/upraises
 import ../errors
+import ../clock
 import ../logutils
 import ../rng
 import ../utils
@@ -15,21 +17,25 @@ logScope:
   topics = "marketplace slotqueue"
 
 type
-  OnProcessSlot* = proc(item: SlotQueueItem): Future[void] {.async: (raises: []).}
+  OnProcessSlot* =
+    proc(item: SlotQueueItem, done: Future[void]): Future[void] {.gcsafe, upraises: [].}
 
   # Non-ref obj copies value when assigned, preventing accidental modification
   # of values which could cause an incorrect order (eg
   # ``slotQueue[1].collateral = 1`` would cause ``collateral`` to be updated,
   # but the heap invariant would no longer be honoured. When non-ref, the
   # compiler can ensure that statement will fail).
+  SlotQueueWorker = object
+    doneProcessing*: Future[void]
+
   SlotQueueItem* = object
     requestId: RequestId
     slotIndex: uint16
     slotSize: uint64
     duration: uint64
     pricePerBytePerSecond: UInt256
-    collateral: UInt256 # Collateral computed
+    collateralPerByte: UInt256
-    expiry: ?uint64
+    expiry: uint64
     seen: bool
 
   # don't need to -1 to prevent overflow when adding 1 (to always allow push)
@@ -41,6 +47,7 @@ type
     onProcessSlot: ?OnProcessSlot
     queue: AsyncHeapQueue[SlotQueueItem]
     running: bool
+    workers: AsyncQueue[SlotQueueWorker]
     trackedFutures: TrackedFutures
     unpaused: AsyncEvent
 
@@ -69,6 +76,9 @@ proc profitability(item: SlotQueueItem): UInt256 =
     slotSize: item.slotSize,
   ).pricePerSlot
 
+proc collateralPerSlot(item: SlotQueueItem): UInt256 =
+  StorageAsk(collateralPerByte: item.collateralPerByte, slotSize: item.slotSize).collateralPerSlot
+
 proc `<`*(a, b: SlotQueueItem): bool =
   # for A to have a higher priority than B (in a min queue), A must be less than
   # B.
@@ -85,12 +95,11 @@ proc `<`*(a, b: SlotQueueItem): bool =
   scoreA.addIf(a.profitability > b.profitability, 3)
   scoreB.addIf(a.profitability < b.profitability, 3)
 
-  scoreA.addIf(a.collateral < b.collateral, 2)
+  scoreA.addIf(a.collateralPerSlot < b.collateralPerSlot, 2)
-  scoreB.addIf(a.collateral > b.collateral, 2)
+  scoreB.addIf(a.collateralPerSlot > b.collateralPerSlot, 2)
 
-  if expiryA =? a.expiry and expiryB =? b.expiry:
+  scoreA.addIf(a.expiry > b.expiry, 1)
-    scoreA.addIf(expiryA > expiryB, 1)
+  scoreB.addIf(a.expiry < b.expiry, 1)
-    scoreB.addIf(expiryA < expiryB, 1)
 
   return scoreA > scoreB
 
@@ -119,13 +128,15 @@ proc new*(
   # avoid instantiating `workers` in constructor to avoid side effects in
   # `newAsyncQueue` procedure
 
+proc init(_: type SlotQueueWorker): SlotQueueWorker =
+  SlotQueueWorker(doneProcessing: newFuture[void]("slotqueue.worker.processing"))
+
 proc init*(
     _: type SlotQueueItem,
     requestId: RequestId,
     slotIndex: uint16,
     ask: StorageAsk,
-    expiry: ?uint64,
+    expiry: uint64,
-    collateral: UInt256,
     seen = false,
 ): SlotQueueItem =
   SlotQueueItem(
@@ -134,43 +145,25 @@ proc init*(
     slotSize: ask.slotSize,
     duration: ask.duration,
     pricePerBytePerSecond: ask.pricePerBytePerSecond,
-    collateral: collateral,
+    collateralPerByte: ask.collateralPerByte,
     expiry: expiry,
     seen: seen,
   )
 
 proc init*(
-    _: type SlotQueueItem,
+    _: type SlotQueueItem, request: StorageRequest, slotIndex: uint16
-    requestId: RequestId,
-    slotIndex: uint16,
-    ask: StorageAsk,
-    expiry: uint64,
-    collateral: UInt256,
-    seen = false,
 ): SlotQueueItem =
-  SlotQueueItem.init(requestId, slotIndex, ask, some expiry, collateral, seen)
+  SlotQueueItem.init(request.id, slotIndex, request.ask, request.expiry)
 
 proc init*(
-    _: type SlotQueueItem,
+    _: type SlotQueueItem, requestId: RequestId, ask: StorageAsk, expiry: uint64
-    request: StorageRequest,
+): seq[SlotQueueItem] =
-    slotIndex: uint16,
-    collateral: UInt256,
-): SlotQueueItem =
-  SlotQueueItem.init(request.id, slotIndex, request.ask, request.expiry, collateral)
-
-proc init*(
-    _: type SlotQueueItem,
-    requestId: RequestId,
-    ask: StorageAsk,
-    expiry: ?uint64,
-    collateral: UInt256,
-): seq[SlotQueueItem] {.raises: [SlotsOutOfRangeError].} =
   if not ask.slots.inRange:
     raise newException(SlotsOutOfRangeError, "Too many slots")
 
   var i = 0'u16
   proc initSlotQueueItem(): SlotQueueItem =
-    let item = SlotQueueItem.init(requestId, i, ask, expiry, collateral)
+    let item = SlotQueueItem.init(requestId, i, ask, expiry)
     inc i
     return item
 
@@ -178,19 +171,8 @@ proc init*(
   Rng.instance.shuffle(items)
   return items
 
-proc init*(
+proc init*(_: type SlotQueueItem, request: StorageRequest): seq[SlotQueueItem] =
-    _: type SlotQueueItem,
+  return SlotQueueItem.init(request.id, request.ask, request.expiry)
-    requestId: RequestId,
-    ask: StorageAsk,
-    expiry: uint64,
-    collateral: UInt256,
-): seq[SlotQueueItem] {.raises: [SlotsOutOfRangeError].} =
-  SlotQueueItem.init(requestId, ask, some expiry, collateral)
-
-proc init*(
-    _: type SlotQueueItem, request: StorageRequest, collateral: UInt256
-): seq[SlotQueueItem] =
-  return SlotQueueItem.init(request.id, request.ask, uint64.none, collateral)
 
 proc inRange*(val: SomeUnsignedInt): bool =
   val.uint16 in SlotQueueSize.low .. SlotQueueSize.high
@@ -216,9 +198,6 @@ proc collateralPerByte*(self: SlotQueueItem): UInt256 =
 proc seen*(self: SlotQueueItem): bool =
   self.seen
 
-proc `seen=`*(self: var SlotQueueItem, seen: bool) =
-  self.seen = seen
-
 proc running*(self: SlotQueue): bool =
   self.running
 
@@ -237,6 +216,13 @@ proc `$`*(self: SlotQueue): string =
 proc `onProcessSlot=`*(self: SlotQueue, onProcessSlot: OnProcessSlot) =
   self.onProcessSlot = some onProcessSlot
 
+proc activeWorkers*(self: SlotQueue): int =
+  if not self.running:
+    return 0
+
+  # active = capacity - available
+  self.maxWorkers - self.workers.len
+
 proc contains*(self: SlotQueue, item: SlotQueueItem): bool =
   self.queue.contains(item)
 
@@ -248,7 +234,25 @@ proc unpause*(self: SlotQueue) =
   # set unpaused flag to true -- unblocks coroutines waiting on unpaused.wait()
   self.unpaused.fire()
 
-proc push*(self: SlotQueue, item: SlotQueueItem): ?!void {.raises: [].} =
+proc populateItem*(
+    self: SlotQueue, requestId: RequestId, slotIndex: uint16
+): ?SlotQueueItem =
+  trace "populate item, items in queue", len = self.queue.len
+  for item in self.queue.items:
+    trace "populate item search", itemRequestId = item.requestId, requestId
+    if item.requestId == requestId:
+      return some SlotQueueItem(
+        requestId: requestId,
+        slotIndex: slotIndex,
+        slotSize: item.slotSize,
+        duration: item.duration,
+        pricePerBytePerSecond: item.pricePerBytePerSecond,
+        collateralPerByte: item.collateralPerByte,
+        expiry: item.expiry,
+      )
+  return none SlotQueueItem
+
+proc push*(self: SlotQueue, item: SlotQueueItem): ?!void =
   logScope:
     requestId = item.requestId
     slotIndex = item.slotIndex
@@ -320,6 +324,52 @@ proc delete*(self: SlotQueue, requestId: RequestId) =
 proc `[]`*(self: SlotQueue, i: Natural): SlotQueueItem =
   self.queue[i]
 
+proc addWorker(self: SlotQueue): ?!void =
+  if not self.running:
+    let err = newException(QueueNotRunningError, "queue must be running")
+    return failure(err)
+
+  trace "adding new worker to worker queue"
+
+  let worker = SlotQueueWorker.init()
+  try:
+    self.trackedFutures.track(worker.doneProcessing)
+    self.workers.addLastNoWait(worker)
+  except AsyncQueueFullError:
+    return failure("failed to add worker, worker queue full")
+
+  return success()
+
+proc dispatch(
+    self: SlotQueue, worker: SlotQueueWorker, item: SlotQueueItem
+) {.async: (raises: []).} =
+  logScope:
+    requestId = item.requestId
+    slotIndex = item.slotIndex
+
+  if not self.running:
+    warn "Could not dispatch worker because queue is not running"
+    return
+
+  if onProcessSlot =? self.onProcessSlot:
+    try:
+      self.trackedFutures.track(worker.doneProcessing)
+      await onProcessSlot(item, worker.doneProcessing)
+      await worker.doneProcessing
+
+      if err =? self.addWorker().errorOption:
+        raise err # catch below
+    except QueueNotRunningError as e:
+      info "could not re-add worker to worker queue, queue not running", error = e.msg
+    except CancelledError:
+      # do not bubble exception up as it is called with `asyncSpawn` which would
+      # convert the exception into a `FutureDefect`
+      discard
+    except CatchableError as e:
+      # we don't have any insight into types of errors that `onProcessSlot` can
+      # throw because it is caller-defined
+      warn "Unknown error processing slot in worker", error = e.msg
+
 proc clearSeenFlags*(self: SlotQueue) =
   # Enumerate all items in the queue, overwriting each item with `seen = false`.
   # To avoid issues with new queue items being pushed to the queue while all
@@ -337,8 +387,7 @@ proc clearSeenFlags*(self: SlotQueue) =
 
   trace "all 'seen' flags cleared"
 
-proc runWorker(self: SlotQueue) {.async: (raises: []).} =
+proc run(self: SlotQueue) {.async: (raises: []).} =
-  trace "slot queue worker loop started"
   while self.running:
     try:
       if self.paused:
@@ -347,6 +396,8 @@ proc runWorker(self: SlotQueue) {.async: (raises: []).} =
       # block until unpaused is true/fired, ie wait for queue to be unpaused
       await self.unpaused.wait()
 
+      let worker =
+        await self.workers.popFirst() # if workers saturated, wait here for new workers
       let item = await self.queue.pop() # if queue empty, wait here for new items
 
       logScope:
@@ -369,19 +420,24 @@ proc runWorker(self: SlotQueue) {.async: (raises: []).} =
         # immediately (with priority over other items) once unpaused
         trace "readding seen item back into the queue"
         discard self.push(item) # on error, drop the item and continue
+        worker.doneProcessing.complete()
+        if err =? self.addWorker().errorOption:
+          error "error adding new worker", error = err.msg
+        await sleepAsync(1.millis) # poll
         continue
 
       trace "processing item"
-      without onProcessSlot =? self.onProcessSlot:
-        raiseAssert "slot queue onProcessSlot not set"
 
-      await onProcessSlot(item)
+      let fut = self.dispatch(worker, item)
+      self.trackedFutures.track(fut)
+      asyncSpawn fut
+
+      await sleepAsync(1.millis) # poll
     except CancelledError:
-      trace "slot queue worker cancelled"
+      trace "slot queue cancelled"
       break
-    except CatchableError as e: # raised from self.queue.pop()
+    except CatchableError as e: # raised from self.queue.pop() or self.workers.pop()
-      warn "slot queue worker error encountered during processing", error = e.msg
+      warn "slot queue error encountered during processing", error = e.msg
-  trace "slot queue worker loop stopped"
 
 proc start*(self: SlotQueue) =
   if self.running:
@@ -391,11 +447,18 @@ proc start*(self: SlotQueue) =
 
   self.running = true
 
+  # must be called in `start` to avoid sideeffects in `new`
+  self.workers = newAsyncQueue[SlotQueueWorker](self.maxWorkers)
+
   # Add initial workers to the `AsyncHeapQueue`. Once a worker has completed its
   # task, a new worker will be pushed to the queue
   for i in 0 ..< self.maxWorkers:
-    let worker = self.runWorker()
+    if err =? self.addWorker().errorOption:
-    self.trackedFutures.track(worker)
+      error "start: error adding new worker", error = err.msg
+
+  let fut = self.run()
+  self.trackedFutures.track(fut)
+  asyncSpawn fut
 
 proc stop*(self: SlotQueue) {.async.} =
   if not self.running:

codex/sales/statemachine.nim

@@ -1,4 +1,5 @@
 import pkg/questionable
+import pkg/upraises
 import ../errors
 import ../utils/asyncstatemachine
 import ../market
@@ -11,21 +12,21 @@ export asyncstatemachine
 
 type
   SaleState* = ref object of State
-  SaleError* = object of CodexError
+  SaleError* = ref object of CodexError
 
 method onCancelled*(
     state: SaleState, request: StorageRequest
-): ?State {.base, raises: [].} =
+): ?State {.base, upraises: [].} =
   discard
 
 method onFailed*(
     state: SaleState, request: StorageRequest
-): ?State {.base, raises: [].} =
+): ?State {.base, upraises: [].} =
   discard
 
 method onSlotFilled*(
     state: SaleState, requestId: RequestId, slotIndex: uint64
-): ?State {.base, raises: [].} =
+): ?State {.base, upraises: [].} =
   discard
 
 proc cancelledEvent*(request: StorageRequest): Event =

codex/sales/states/cancelled.nim

@@ -12,14 +12,6 @@ type SaleCancelled* = ref object of SaleState
 method `$`*(state: SaleCancelled): string =
   "SaleCancelled"
 
-proc slotIsFilledByMe(
-    market: Market, requestId: RequestId, slotIndex: uint64
-): Future[bool] {.async: (raises: [CancelledError, MarketError]).} =
-  let host = await market.getHost(requestId, slotIndex)
-  let me = await market.getSigner()
-
-  return host == me.some
-
 method run*(
     state: SaleCancelled, machine: Machine
 ): Future[?State] {.async: (raises: []).} =
@@ -31,27 +23,21 @@ method run*(
     raiseAssert "no sale request"
 
   try:
-    var returnedCollateral = UInt256.none
+    let slot = Slot(request: request, slotIndex: data.slotIndex)
-
+    debug "Collecting collateral and partial payout",
-    if await slotIsFilledByMe(market, data.requestId, data.slotIndex):
+      requestId = data.requestId, slotIndex = data.slotIndex
-      debug "Collecting collateral and partial payout",
+    let currentCollateral = await market.currentCollateral(slot.id)
-        requestId = data.requestId, slotIndex = data.slotIndex
+    await market.freeSlot(slot.id)
-
-      let slot = Slot(request: request, slotIndex: data.slotIndex)
-      let currentCollateral = await market.currentCollateral(slot.id)
-
-      try:
-        await market.freeSlot(slot.id)
-      except SlotStateMismatchError as e:
-        warn "Failed to free slot because slot is already free", error = e.msg
-
-      returnedCollateral = currentCollateral.some
 
     if onClear =? agent.context.onClear and request =? data.request:
       onClear(request, data.slotIndex)
 
     if onCleanUp =? agent.onCleanUp:
-      await onCleanUp(reprocessSlot = false, returnedCollateral = returnedCollateral)
+      await onCleanUp(
+        returnBytes = true,
+        reprocessSlot = false,
+        returnedCollateral = some currentCollateral,
+      )
 
     warn "Sale cancelled due to timeout",
       requestId = data.requestId, slotIndex = data.slotIndex

codex/sales/states/downloading.nim

@@ -38,7 +38,6 @@ method run*(
   let agent = SalesAgent(machine)
   let data = agent.data
   let context = agent.context
-  let market = context.market
   let reservations = context.reservations
 
   without onStore =? context.onStore:
@@ -56,9 +55,7 @@ method run*(
     reservationId = reservation.id
     availabilityId = reservation.availabilityId
 
-  proc onBlocks(
+  proc onBlocks(blocks: seq[bt.Block]): Future[?!void] {.async.} =
-      blocks: seq[bt.Block]
-  ): Future[?!void] {.async: (raises: [CancelledError]).} =
     # release batches of blocks as they are written to disk and
     # update availability size
     var bytes: uint = 0
@@ -70,21 +67,8 @@ method run*(
     return await reservations.release(reservation.id, reservation.availabilityId, bytes)
 
   try:
-    let requestId = request.id
-    let slotId = slotId(requestId, data.slotIndex)
-    let requestState = await market.requestState(requestId)
-    let isRepairing = (await market.slotState(slotId)) == SlotState.Repair
-
-    trace "Retrieving expiry"
-    var expiry: SecondsSince1970
-    if state =? requestState and state == RequestState.Started:
-      expiry = await market.getRequestEnd(requestId)
-    else:
-      expiry = await market.requestExpiresAt(requestId)
-
     trace "Starting download"
-    if err =?
+    if err =? (await onStore(request, data.slotIndex, onBlocks)).errorOption:
-        (await onStore(request, expiry, data.slotIndex, onBlocks, isRepairing)).errorOption:
       return some State(SaleErrored(error: err, reprocessSlot: false))
 
     trace "Download complete"

codex/sales/states/errored.nim

@@ -1,5 +1,6 @@
 import pkg/questionable
 import pkg/questionable/results
+import pkg/upraises
 
 import ../statemachine
 import ../salesagent
@@ -33,7 +34,7 @@ method run*(
       onClear(request, data.slotIndex)
 
     if onCleanUp =? agent.onCleanUp:
-      await onCleanUp(reprocessSlot = state.reprocessSlot)
+      await onCleanUp(returnBytes = true, reprocessSlot = state.reprocessSlot)
   except CancelledError as e:
     trace "SaleErrored.run was cancelled", error = e.msgDetail
   except CatchableError as e:

codex/sales/states/failed.nim

@@ -28,7 +28,6 @@ method run*(
     let slot = Slot(request: request, slotIndex: data.slotIndex)
     debug "Removing slot from mySlots",
       requestId = data.requestId, slotIndex = data.slotIndex
-
     await market.freeSlot(slot.id)
 
     let error = newException(SaleFailedError, "Sale failed")

codex/sales/states/filled.nim

@@ -11,7 +11,7 @@ import ./cancelled
 import ./failed
 import ./proving
 
-when storage_enable_proof_failures:
+when codex_enable_proof_failures:
   import ./provingsimulated
 
 logScope:
@@ -59,7 +59,7 @@ method run*(
       if err =? (await onExpiryUpdate(request.content.cid, requestEnd)).errorOption:
         return some State(SaleErrored(error: err))
 
-      when storage_enable_proof_failures:
+      when codex_enable_proof_failures:
         if context.simulateProofFailures > 0:
           info "Proving with failure rate", rate = context.simulateProofFailures
           return some State(

codex/sales/states/filling.nim

@@ -30,7 +30,6 @@ method run*(
 ): Future[?State] {.async: (raises: []).} =
   let data = SalesAgent(machine).data
   let market = SalesAgent(machine).context.market
-
   without (request =? data.request):
     raiseAssert "Request not set"
 
@@ -39,20 +38,28 @@ method run*(
     slotIndex = data.slotIndex
 
   try:
-    without collateral =? await market.slotCollateral(data.requestId, data.slotIndex),
+    let slotState = await market.slotState(slotId(data.requestId, data.slotIndex))
-      err:
+    let requestedCollateral = request.ask.collateralPerSlot
-      error "Failure attempting to fill slot: unable to calculate collateral",
+    var collateral: UInt256
-        error = err.msg
+
-      return some State(SaleErrored(error: err))
+    if slotState == SlotState.Repair:
+      # When repairing the node gets "discount" on the collateral that it needs to
+      let repairRewardPercentage = (await market.repairRewardPercentage).u256
+      collateral =
+        requestedCollateral -
+        ((requestedCollateral * repairRewardPercentage)).div(100.u256)
+    else:
+      collateral = requestedCollateral
 
     debug "Filling slot"
     try:
       await market.fillSlot(data.requestId, data.slotIndex, state.proof, collateral)
-    except SlotStateMismatchError as e:
-      debug "Slot is already filled, ignoring slot"
-      return some State(SaleIgnored(reprocessSlot: false, returnsCollateral: true))
     except MarketError as e:
-      return some State(SaleErrored(error: e))
+      if e.msg.contains "Slot is not free":
+        debug "Slot is already filled, ignoring slot"
+        return some State(SaleIgnored(reprocessSlot: false, returnBytes: true))
+      else:
+        return some State(SaleErrored(error: e))
     # other CatchableErrors are handled "automatically" by the SaleState
 
     return some State(SaleFilled())

codex/sales/states/finished.nim

@@ -36,9 +36,6 @@ method run*(
     requestId = data.requestId, slotIndex = data.slotIndex
 
   try:
-    if onClear =? agent.context.onClear:
-      onClear(request, data.slotIndex)
-
     if onCleanUp =? agent.onCleanUp:
       await onCleanUp(returnedCollateral = state.returnedCollateral)
   except CancelledError as e:

codex/sales/states/ignored.nim

@@ -14,7 +14,7 @@ logScope:
 
 type SaleIgnored* = ref object of SaleState
   reprocessSlot*: bool # readd slot to queue with `seen` flag
-  returnsCollateral*: bool # returns collateral when a reservation was created
+  returnBytes*: bool # return unreleased bytes from Reservation to Availability
 
 method `$`*(state: SaleIgnored): string =
   "SaleIgnored"
@@ -23,26 +23,11 @@ method run*(
     state: SaleIgnored, machine: Machine
 ): Future[?State] {.async: (raises: []).} =
   let agent = SalesAgent(machine)
-  let data = agent.data
-  let market = agent.context.market
-
-  without request =? data.request:
-    raiseAssert "no sale request"
-
-  var returnedCollateral = UInt256.none
 
   try:
-    if state.returnsCollateral:
-      # The returnedCollateral is needed because a reservation could
-      # be created and the collateral assigned to that reservation.
-      # The returnedCollateral will be used in the cleanup function
-      # and be passed to the deleteReservation function.
-      let slot = Slot(request: request, slotIndex: data.slotIndex)
-      returnedCollateral = request.ask.collateralPerSlot.some
-
     if onCleanUp =? agent.onCleanUp:
       await onCleanUp(
-        reprocessSlot = state.reprocessSlot, returnedCollateral = returnedCollateral
+        reprocessSlot = state.reprocessSlot, returnBytes = state.returnBytes
       )
   except CancelledError as e:
     trace "SaleIgnored.run was cancelled", error = e.msgDetail

codex/sales/states/preparing.nim

@@ -51,17 +51,15 @@ method run*(
     await agent.subscribe()
 
     without request =? data.request:
-      error "request could not be retrieved", id = data.requestId
+      raiseAssert "no sale request"
-      let error = newException(SaleError, "request could not be retrieved")
-      return some State(SaleErrored(error: error))
 
     let slotId = slotId(data.requestId, data.slotIndex)
     let state = await market.slotState(slotId)
     if state != SlotState.Free and state != SlotState.Repair:
-      return some State(SaleIgnored(reprocessSlot: false))
+      return some State(SaleIgnored(reprocessSlot: false, returnBytes: false))
 
     # TODO: Once implemented, check to ensure the host is allowed to fill the slot,
-    # due to the [sliding window mechanism](https://github.com/logos-storage/logos-storage-research/blob/master/design/marketplace.md#dispersal)
+    # due to the [sliding window mechanism](https://github.com/codex-storage/codex-research/blob/master/design/marketplace.md#dispersal)
 
     logScope:
       slotIndex = data.slotIndex
@@ -70,12 +68,10 @@ method run*(
       pricePerBytePerSecond = request.ask.pricePerBytePerSecond
       collateralPerByte = request.ask.collateralPerByte
 
-    let requestEnd = await market.getRequestEnd(data.requestId)
-
     without availability =?
       await reservations.findAvailability(
         request.ask.slotSize, request.ask.duration, request.ask.pricePerBytePerSecond,
-        request.ask.collateralPerByte, requestEnd,
+        request.ask.collateralPerByte,
       ):
       debug "No availability found for request, ignoring"
 
@@ -84,9 +80,9 @@ method run*(
     info "Availability found for request, creating reservation"
 
     without reservation =?
-      await noCancel reservations.createReservation(
+      await reservations.createReservation(
         availability.id, request.ask.slotSize, request.id, data.slotIndex,
-        request.ask.collateralPerByte, requestEnd,
+        request.ask.collateralPerByte,
       ), error:
       trace "Creation of reservation failed"
       # Race condition:

codex/sales/states/provingsimulated.nim

@@ -1,5 +1,5 @@
 import ../../conf
-when storage_enable_proof_failures:
+when codex_enable_proof_failures:
   import std/strutils
   import pkg/stint
   import pkg/ethers
@@ -40,7 +40,7 @@ when storage_enable_proof_failures:
         try:
           warn "Submitting INVALID proof", period = currentPeriod, slotId = slot.id
           await market.submitProof(slot.id, Groth16Proof.default)
-        except ProofInvalidError as e:
+        except Proofs_InvalidProof as e:
           discard # expected
         except CancelledError as error:
           raise error

codex/sales/states/slotreserving.nim

@@ -44,11 +44,12 @@ method run*(
       try:
         trace "Reserving slot"
         await market.reserveSlot(data.requestId, data.slotIndex)
-      except SlotReservationNotAllowedError as e:
-        debug "Slot cannot be reserved, ignoring", error = e.msg
-        return some State(SaleIgnored(reprocessSlot: false, returnsCollateral: true))
       except MarketError as e:
-        return some State(SaleErrored(error: e))
+        if e.msg.contains "SlotReservations_ReservationNotAllowed":
+          debug "Slot cannot be reserved, ignoring", error = e.msg
+          return some State(SaleIgnored(reprocessSlot: false, returnBytes: true))
+        else:
+          return some State(SaleErrored(error: e))
       # other CatchableErrors are handled "automatically" by the SaleState
 
       trace "Slot successfully reserved"
@@ -57,7 +58,7 @@ method run*(
       # do not re-add this slot to the queue, and return bytes from Reservation to
       # the Availability
       debug "Slot cannot be reserved, ignoring"
-      return some State(SaleIgnored(reprocessSlot: false, returnsCollateral: true))
+      return some State(SaleIgnored(reprocessSlot: false, returnBytes: true))
   except CancelledError as e:
     trace "SaleSlotReserving.run was cancelled", error = e.msgDetail
   except CatchableError as e:

codex/sales/states/unknown.nim

@@ -38,11 +38,6 @@ method run*(
     await agent.retrieveRequest()
     await agent.subscribe()
 
-    without request =? data.request:
-      error "request could not be retrieved", id = data.requestId
-      let error = newException(SaleError, "request could not be retrieved")
-      return some State(SaleErrored(error: error))
-
     let slotId = slotId(data.requestId, data.slotIndex)
     let slotState = await market.slotState(slotId)
 

codex/slots/builder/builder.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2023 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -113,17 +113,17 @@ func numSlotCells*[T, H](self: SlotsBuilder[T, H]): Natural =
 
   self.numBlockCells * self.numSlotBlocks
 
-func slotIndicesIter*[T, H](self: SlotsBuilder[T, H], slot: Natural): ?!Iter[int] =
+func slotIndiciesIter*[T, H](self: SlotsBuilder[T, H], slot: Natural): ?!Iter[int] =
   ## Returns the slot indices.
   ##
 
-  self.strategy.getIndices(slot).catch
+  self.strategy.getIndicies(slot).catch
 
-func slotIndices*[T, H](self: SlotsBuilder[T, H], slot: Natural): seq[int] =
+func slotIndicies*[T, H](self: SlotsBuilder[T, H], slot: Natural): seq[int] =
   ## Returns the slot indices.
   ##
 
-  if iter =? self.strategy.getIndices(slot).catch:
+  if iter =? self.strategy.getIndicies(slot).catch:
     return toSeq(iter)
 
 func manifest*[T, H](self: SlotsBuilder[T, H]): Manifest =
@@ -134,7 +134,7 @@ func manifest*[T, H](self: SlotsBuilder[T, H]): Manifest =
 
 proc buildBlockTree*[T, H](
     self: SlotsBuilder[T, H], blkIdx: Natural, slotPos: Natural
-): Future[?!(seq[byte], T)] {.async: (raises: [CancelledError]).} =
+): Future[?!(seq[byte], T)] {.async.} =
   ## Build the block digest tree and return a tuple with the
   ## block data and the tree.
   ##
@@ -167,7 +167,7 @@ proc buildBlockTree*[T, H](
 
 proc getCellHashes*[T, H](
     self: SlotsBuilder[T, H], slotIndex: Natural
-): Future[?!seq[H]] {.async: (raises: [CancelledError, IndexingError]).} =
+): Future[?!seq[H]] {.async.} =
   ## Collect all the cells from a block and return
   ## their hashes.
   ##
@@ -184,7 +184,7 @@ proc getCellHashes*[T, H](
     slotIndex = slotIndex
 
   let hashes = collect(newSeq):
-    for i, blkIdx in self.strategy.getIndices(slotIndex):
+    for i, blkIdx in self.strategy.getIndicies(slotIndex):
       logScope:
         blkIdx = blkIdx
         pos = i
@@ -202,23 +202,19 @@ proc getCellHashes*[T, H](
 
 proc buildSlotTree*[T, H](
     self: SlotsBuilder[T, H], slotIndex: Natural
-): Future[?!T] {.async: (raises: [CancelledError]).} =
+): Future[?!T] {.async.} =
   ## Build the slot tree from the block digest hashes
   ## and return the tree.
 
-  try:
+  without cellHashes =? (await self.getCellHashes(slotIndex)), err:
-    without cellHashes =? (await self.getCellHashes(slotIndex)), err:
+    error "Failed to select slot blocks", err = err.msg
-      error "Failed to select slot blocks", err = err.msg
-      return failure(err)
-
-    T.init(cellHashes)
-  except IndexingError as err:
-    error "Failed to build slot tree", err = err.msg
     return failure(err)
 
+  T.init(cellHashes)
+
 proc buildSlot*[T, H](
     self: SlotsBuilder[T, H], slotIndex: Natural
-): Future[?!H] {.async: (raises: [CancelledError]).} =
+): Future[?!H] {.async.} =
   ## Build a slot tree and store the proofs in
   ## the block store.
   ##
@@ -254,9 +250,7 @@ proc buildSlot*[T, H](
 func buildVerifyTree*[T, H](self: SlotsBuilder[T, H], slotRoots: openArray[H]): ?!T =
   T.init(@slotRoots)
 
-proc buildSlots*[T, H](
+proc buildSlots*[T, H](self: SlotsBuilder[T, H]): Future[?!void] {.async.} =
-    self: SlotsBuilder[T, H]
-): Future[?!void] {.async: (raises: [CancelledError]).} =
   ## Build all slot trees and store them in the block store.
   ##
 
@@ -286,9 +280,7 @@ proc buildSlots*[T, H](
 
   success()
 
-proc buildManifest*[T, H](
+proc buildManifest*[T, H](self: SlotsBuilder[T, H]): Future[?!Manifest] {.async.} =
-    self: SlotsBuilder[T, H]
-): Future[?!Manifest] {.async: (raises: [CancelledError]).} =
   if err =? (await self.buildSlots()).errorOption:
     error "Failed to build slot roots", err = err.msg
     return failure(err)
@@ -310,7 +302,7 @@ proc new*[T, H](
     _: type SlotsBuilder[T, H],
     store: BlockStore,
     manifest: Manifest,
-    strategy = LinearStrategy,
+    strategy = SteppedStrategy,
     cellSize = DefaultCellSize,
 ): ?!SlotsBuilder[T, H] =
   if not manifest.protected:
@@ -323,15 +315,13 @@ proc new*[T, H](
     cellSize = cellSize
 
   if (manifest.blocksCount mod manifest.numSlots) != 0:
-    const msg = "Number of blocks must be divisible by number of slots."
+    trace "Number of blocks must be divisable by number of slots."
-    trace msg
+    return failure("Number of blocks must be divisable by number of slots.")
-    return failure(msg)
 
   let cellSize = if manifest.verifiable: manifest.cellSize else: cellSize
   if (manifest.blockSize mod cellSize) != 0.NBytes:
-    const msg = "Block size must be divisible by cell size."
+    trace "Block size must be divisable by cell size."
-    trace msg
+    return failure("Block size must be divisable by cell size.")
-    return failure(msg)
 
   let
     numSlotBlocks = manifest.numSlotBlocks
@@ -354,14 +344,7 @@ proc new*[T, H](
     emptyBlock = newSeq[byte](manifest.blockSize.int)
     emptyDigestTree = ?T.digestTree(emptyBlock, cellSize.int)
 
-    strategy =
+    strategy = ?strategy.init(0, numBlocksTotal - 1, manifest.numSlots).catch
-      ?strategy.init(
-        0,
-        manifest.blocksCount - 1,
-        manifest.numSlots,
-        manifest.numSlots,
-        numPadSlotBlocks,
-      ).catch
 
   logScope:
     numSlotBlocks = numSlotBlocks

codex/slots/converters.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2024 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))

codex/slots/proofs/backends/circomcompat.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2024 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))

codex/slots/proofs/backends/converters.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2024 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))

codex/slots/proofs/prover.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2024 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -38,9 +38,7 @@ type
   AnyProof* = CircomProof
 
   AnySampler* = Poseidon2Sampler
-    # add any other generic type here, eg. Poseidon2Sampler | ReinforceConcreteSampler
   AnyBuilder* = Poseidon2Builder
-    # add any other generic type here, eg. Poseidon2Builder | ReinforceConcreteBuilder
 
   AnyProofInputs* = ProofInputs[Poseidon2Hash]
   Prover* = ref object of RootObj
@@ -50,7 +48,7 @@ type
 
 proc prove*(
     self: Prover, slotIdx: int, manifest: Manifest, challenge: ProofChallenge
-): Future[?!(AnyProofInputs, AnyProof)] {.async: (raises: [CancelledError]).} =
+): Future[?!(AnyProofInputs, AnyProof)] {.async.} =
   ## Prove a statement using backend.
   ## Returns a future that resolves to a proof.
 
@@ -82,7 +80,7 @@ proc prove*(
 
 proc verify*(
     self: Prover, proof: AnyProof, inputs: AnyProofInputs
-): Future[?!bool] {.async: (raises: [CancelledError]).} =
+): Future[?!bool] {.async.} =
   ## Prove a statement using backend.
   ## Returns a future that resolves to a proof.
   self.backend.verify(proof, inputs)

codex/slots/sampler/sampler.nim

@@ -1,4 +1,4 @@
-## Logos Storage
+## Nim-Codex
 ## Copyright (c) 2023 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -48,12 +48,12 @@ func getCell*[T, H](
 
 proc getSample*[T, H](
     self: DataSampler[T, H], cellIdx: int, slotTreeCid: Cid, slotRoot: H
-): Future[?!Sample[H]] {.async: (raises: [CancelledError]).} =
+): Future[?!Sample[H]] {.async.} =
   let
     cellsPerBlock = self.builder.numBlockCells
     blkCellIdx = cellIdx.toCellInBlk(cellsPerBlock) # block cell index
     blkSlotIdx = cellIdx.toBlkInSlot(cellsPerBlock) # slot tree index
-    origBlockIdx = self.builder.slotIndices(self.index)[blkSlotIdx]
+    origBlockIdx = self.builder.slotIndicies(self.index)[blkSlotIdx]
       # convert to original dataset block index
 
   logScope:
@@ -81,7 +81,7 @@ proc getSample*[T, H](
 
 proc getProofInput*[T, H](
     self: DataSampler[T, H], entropy: ProofChallenge, nSamples: Natural
-): Future[?!ProofInputs[H]] {.async: (raises: [CancelledError]).} =
+): Future[?!ProofInputs[H]] {.async.} =
   ## Generate proofs as input to the proving circuit.
   ##