update audit branch to check on fixes

.devcontainer/Dockerfile

@@ -5,7 +5,11 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     && apt-get -y install --no-install-recommends cmake pkg-config libssl-dev git clang build-essential curl ca-certificates
 
 RUN useradd -ms /bin/bash codespace
+COPY ./scripts/init.sh /home/codespace/init.sh
+RUN chmod +x /home/codespace/init.sh
+
 USER codespace
 WORKDIR /home/codespace
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y && \
-        export PATH=$PATH:$HOME/.cargo/bin
+    export PATH=$PATH:$HOME/.cargo/bin && \
+    ./init.sh

.devcontainer/devcontainer.json

@@ -1,5 +1,6 @@
 {
     "build": {
-        "dockerfile": "Dockerfile"
+        "dockerfile": "Dockerfile",
+        "context": ".."
     }
 }

.github/workflows/binary.yml

@@ -16,23 +16,23 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Cache cargo registry  
-      uses: actions/[email protected].6  
+      uses: actions/[email protected].7  
       with: 
         path: ~/.cargo/registry 
         key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
         restore-keys: |
           ${{ runner.os }}-cargo-registry-
 
     - name: Cache cargo index 
-      uses: actions/[email protected].6  
+      uses: actions/[email protected].7  
       with: 
         path: ~/.cargo/git  
         key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
         restore-keys: |
           ${{ runner.os }}-cargo-index-
 
     - name: Cache cargo build
-      uses: actions/[email protected].6
+      uses: actions/[email protected].7
       with:
         path: target
         key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}

.github/workflows/ci.yml

@@ -1,72 +1,96 @@
 name: Test rust code
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+  workflow_dispatch:
+
+env:
+  nightly: nightly-2021-11-01
+  target: wasm32-unknown-unknown
+  tarpaulin-vers: '0.18.4'
+  try-runtime-chain: dev
+  try-runtime-uri: wss://main3.nodleprotocol.io:443
 
 jobs:
-
   test:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
+    runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
+    - uses: actions-rs/toolchain@v1
+      with:
+        profile: minimal
+        toolchain: ${{ env.nightly }}
+        override: true
+        target: ${{ env.target }}
 
-    - name: Cache cargo registry  
-      uses: actions/[email protected].6  
-      with: 
-        path: ~/.cargo/registry 
+    - name: Cache cargo registry
+      uses: actions/[email protected].7
+      with:
+        path: ~/.cargo/registry
         key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
         restore-keys: |
           ${{ runner.os }}-cargo-registry-
 
-    - name: Cache cargo index 
-      uses: actions/[email protected].6  
-      with: 
-        path: ~/.cargo/git  
+    - name: Cache cargo index
+      uses: actions/[email protected].7
+      with:
+        path: ~/.cargo/git
         key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
         restore-keys: |
           ${{ runner.os }}-cargo-index-
 
     - name: Cache cargo build
-      uses: actions/[email protected].6
+      uses: actions/[email protected].7
       with:
         path: target
         key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
         restore-keys: |
           ${{ runner.os }}-cargo-build-target-
 
-    - name: Install ubuntu native dependencies
-      if: matrix.os == 'ubuntu-latest'
-      run: sudo apt install -y cmake pkg-config libssl-dev git build-essential clang libclang-dev
-
-    - name: Cleanup ubuntu filesystem
-      if: matrix.os == 'ubuntu-latest'
-      run: |
-        sudo apt clean
-        sudo rm -rf "/usr/local/share/boost"
-        sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-
-    - name: Setup toolchain
-      run: ./scripts/init.sh
-
-    - name: Install tarpaulin
-      run: cargo install cargo-tarpaulin
-
-    - name: Cargo check
-      run: SKIP_WASM_BUILD= cargo check --all-targets --all-features --workspace
-
-    - name: Generate coverage report
-      run: cargo +nightly tarpaulin --verbose --all-features --workspace --timeout 120 --out Xml
+    - name: Run cargo-tarpaulin
+      uses: actions-rs/[email protected]
+      with:
+        version: ${{ env.tarpaulin-vers }}
+        args: '--avoid-cfg-tarpaulin --verbose --all-features --workspace --timeout 120'
 
     - name: Upload to Codecov
       uses: codecov/[email protected]
       with:
         fail_ci_if_error: true
 
-    # - name: Run tests
-    #   run: SKIP_WASM_BUILD= cargo test --all-targets --all-features --workspace
+  try-runtime:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install latest stable Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+
+      - name: Install Rust nightly
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ env.nightly }}
+          target: ${{ env.target }}
+
+      - name: Cargo build --features=try-runtime
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --release --features=try-runtime
+
+      - name: Try Runtime
+        uses: actions-rs/cargo@v1
+        with:
+          command: run
+          args: --release --features=try-runtime try-runtime --execution native --chain ${{ env.try-runtime-chain }} on-runtime-upgrade live -u ${{ env.try-runtime-uri }}
 
   fmt:
     runs-on: ubuntu-latest

.github/workflows/doc.yml

@@ -13,23 +13,23 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Cache cargo registry  
-      uses: actions/[email protected].6  
+      uses: actions/[email protected].7  
       with: 
         path: ~/.cargo/registry 
         key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
         restore-keys: |
           ${{ runner.os }}-cargo-registry-
 
     - name: Cache cargo index 
-      uses: actions/[email protected].6  
+      uses: actions/[email protected].7  
       with: 
         path: ~/.cargo/git  
         key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
         restore-keys: |
           ${{ runner.os }}-cargo-index-
 
     - name: Cache cargo build
-      uses: actions/[email protected].6
+      uses: actions/[email protected].7
       with:
         path: target
         key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}

.github/workflows/docker.yml

@@ -5,7 +5,7 @@ on: [ push, release ]
 jobs:
 
   container_gpr:
-    name: Push Docker image to GitHub Packages
+    name: Build and push docker image
     runs-on: ubuntu-latest
 
     steps:
@@ -19,6 +19,7 @@ jobs:
         with:
           # list of Docker images to use as base name for tags
           images: |
+            nodlecode/chain
             ghcr.io/nodlecode/chain
           # generate Docker tags based on the following events/attributes
           tags: |
@@ -38,11 +39,17 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Login to DockerHub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push
         uses: docker/build-push-action@v2
         with:
           context: .
-          file: '.maintain/docker/Dockerfile'
+          file: './Dockerfile'
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/srtool.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        chain: ["nodle-chain"]
+        runtime: ["main", "eden"]
 
     steps:
       - uses: actions/checkout@v2
@@ -18,35 +18,29 @@ jobs:
         id: srtool_build
         uses: chevdor/[email protected]
         with:
-          chain: ${{ matrix.chain }}
-          runtime_dir: runtime
+          chain: ${{ matrix.runtime }}
+          package: runtime-${{ matrix.runtime }}
+          runtime_dir: runtimes/${{ matrix.runtime }}
+          tag: 1.56.1
 
       - name: Summary
         run: |
-          echo '${{ steps.srtool_build.outputs.json }}' | jq > ${{ matrix.chain }}-srtool-digest.json
-          cat ${{ matrix.chain }}-srtool-digest.json
+          echo '${{ steps.srtool_build.outputs.json }}' | jq > ${{ matrix.runtime }}-srtool-digest.json
+          cat ${{ matrix.runtime }}-srtool-digest.json
           echo "Runtime location: ${{ steps.srtool_build.outputs.wasm }}"
 
-      - name: Archive Runtime
+      - name: Archive Metadata
         uses: actions/upload-artifact@v2
         with:
-          name: ${{ matrix.chain }}-runtime-${{ github.sha }}.compact.wasm
+          name: ${{ matrix.runtime }}-srtool-digest.json
           path: |
-            ${{ steps.srtool_build.outputs.wasm }}
-
-      - name: Archive Metadata
+            ${{ matrix.runtime }}-srtool-digest.json
+      
+      - name: Archive Runtime
         uses: actions/upload-artifact@v2
         with:
-          name: ${{ matrix.chain }}-srtool-digest.json
+          name: ${{ matrix.runtime }}-${{ github.sha }}
           path: |
-            ${{ matrix.chain }}-srtool-digest.json
-
-      # TODO: once supported, upload compressed runtime too
-      # - name: Archive Runtime
-      #   uses: actions/upload-artifact@v2
-      #   with:
-      #     name: ${{ matrix.chain }}-runtime-${{ github.sha }}
-      #     path: |
-      #       ${{ steps.srtool_build.outputs.wasm }}
-      #       ${{ steps.srtool_build.outputs.wasm_compressed }}
-      #       ${{ matrix.chain }}-srtool-digest.json
+            ${{ steps.srtool_build.outputs.wasm }}
+            ${{ steps.srtool_build.outputs.wasm_compressed }}
+            ${{ matrix.runtime }}-srtool-digest.json

.gitignore

@@ -16,3 +16,6 @@ launch.json
 # SRTool and release script
 nodle-chain-runtime*
 nodle-chain-srtool*
+
+# Polkadot Launch
+rococo-local*

.maintain/frame-weight-template.hbs

@@ -1,6 +1,6 @@
 /*
  * This file is part of the Nodle Chain distributed at https://github.com/NodleCode/chain
- * Copyright (C) 2020  Nodle International
+ * Copyright (C) 2022  Nodle International
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

.maintain/release.sh

@@ -14,4 +14,4 @@ echo "Please wait for srtool github action to complete and enter the file name:
 read runtime_file
 
 gh run download -n $runtime_file -n nodle-chain-srtool-digest.json
-gh release create $1 --title $1 --target master "$runtime_file/nodle_chain_runtime.compact.wasm" "nodle-chain-srtool-digest.json/nodle-chain-srtool-digest.json"
+gh release create $1 --title $1 --target master "$runtime_file/runtime_main.compact.wasm" "nodle-chain-srtool-digest.json"

.maintain/srtool.sh

@@ -0,0 +1 @@
+docker run --rm -it -e PACKAGE=runtime-eden -e RUNTIME_DIR="runtimes/eden" -v `pwd`:/build paritytech/srtool:1.56.1

.rustfmt.toml

@@ -1 +1 @@
-edition = "2018"
+edition = "2021"