develop2beta

.github/workflows/main.yml

@@ -10,13 +10,18 @@ on:
     branches-ignore:
       - 'docs-v*'
 
+env:
+  NODE_VERSION: 18
+  PYTHON_VERSION: 3.8
+
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   test-contracts:
     runs-on: ubuntu-latest
 
-    env:
-      working-directory: ./proxy
+    defaults:
+      run:
+        working-directory: proxy
 
     steps:
     - uses: actions/checkout@v2
@@ -43,47 +48,43 @@ jobs:
     - name: Install PYTHON
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: ${{ env.PYTHON_VERSION }}
 
     - name: Install NODE JS
       uses: actions/setup-node@v2
       with:
-        node-version: 16
+        node-version: ${{ env.NODE_VERSION }}
 
     - name: Install project
-      working-directory: ${{env.working-directory}}
-      run: |
-        yarn install
+      run: yarn install
 
     - name: Install slither
-      working-directory: ${{env.working-directory}}
       run: pip3 install -r scripts/requirements.txt
 
     - name: Lint solidity
-      working-directory: ${{env.working-directory}}
       run: yarn lint
 
     - name: Compile typescript
-      working-directory: ${{env.working-directory}}
       run: yarn tsc
 
     - name: Lint typescript
-      working-directory: ${{env.working-directory}}
       run: yarn eslint
 
     - name: Slither checks
-      working-directory: ${{env.working-directory}}
       run: yarn slither
 
+    - name: Test ABI generation
+      env:
+        VERSION: "0.0.0"
+      run: npx hardhat run scripts/generateAbi.ts
+
     - name: Gas calculation test
-      working-directory: ${{env.working-directory}}
       run: npx hardhat test gas/calculateGas.ts
 
     - name: Test upgrade
-      run: bash ./proxy/scripts/test_upgrade.sh
+      run: bash scripts/test_upgrade.sh
 
     - name: Run tests
-      working-directory: ${{env.working-directory}}
       run: |
         npx hardhat coverage --solcoverjs .solcover.js
         bash <(curl -s https://codecov.io/bash) -f coverage/lcov.info -t $CODECOV_TOKEN || echo "Codecov did not collect coverage reports"
@@ -120,12 +121,12 @@ jobs:
     - name: Install PYTHON
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: ${{ env. PYTHON_VERSION }}
 
     - name: Install NODE JS
       uses: actions/setup-node@v2
       with:
-        node-version: 16
+        node-version: ${{ env.NODE_VERSION }}
 
     - name: Install project
       run: |
@@ -329,12 +330,12 @@ jobs:
     - name: Set up Node
       uses: actions/setup-node@v2
       with:
-        node-version: '16'
+        node-version: ${{ env.NODE_VERSION }}
 
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: ${{ env.PYTHON_VERSION }}
 
     - name: Compile contracts
       working-directory: ./proxy
@@ -349,9 +350,11 @@ jobs:
         yarn install
 
     - name: Start background ganache
+      working-directory: proxy
       run: |
-        cd proxy
-        npx ganache --miner.blockGasLimit 12000000 --logging.quiet --chain.allowUnlimitedContractSize --wallet.defaultBalance 2000000 --wallet.accountKeysPath ../test/accounts.json &
+        INSTANCE=$(npx ganache --😈 --miner.blockGasLimit 12000000 --logging.quiet --chain.allowUnlimitedContractSize --wallet.defaultBalance 2000000 --wallet.accountKeysPath ../test/accounts.json)
+        echo "INSTANCE=$INSTANCE" >> "$GITHUB_ENV"
+
 
     - name: Prepare test (PY part)
       working-directory: ${{env.working-directory}}
@@ -373,3 +376,11 @@ jobs:
       working-directory: ${{env.working-directory}}
       run: |
         yarn test
+
+    - name: Stop ganache
+      working-directory: proxy
+      env:
+        INSTANCE: ${{ env.INSTANCE }}
+      run: npx ganache instances stop $INSTANCE
+
+

.github/workflows/publish.yml

@@ -12,15 +12,21 @@ on:
     tags:
       - 'custom-release-*'
 
+env:
+  NODE_VERSION: 18
+  PYTHON_VERSION: 3.8
+
 jobs:
   build:
     runs-on: ubuntu-latest
     env:
       DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
       DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-      PROXY_DIR: "proxy"
+    defaults:
+      run:
+        working-directory: proxy
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Get yarn cache directory path
       id: yarn-cache-dir-path
@@ -44,64 +50,60 @@ jobs:
     - name: Install NODE JS
       uses: actions/setup-node@v2
       with:
-        node-version: '16'
+        node-version: ${{ env.NODE_VERSION }}
 
-    - name: Set up Python 3.8
+    - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: ${{ env.PYTHON_VERSION }}
 
     - name: Build and publish container
       run: |
         export BRANCH=${GITHUB_REF##*/}
         echo "Branch $BRANCH"
-        export VERSION=$(bash ./scripts/calculate_version.sh)
+        export VERSION=$(bash ../scripts/calculate_version.sh)
         echo "VERSION=$VERSION" >> $GITHUB_ENV
         echo "Version $VERSION"
         ( test $BRANCH = "stable" && export PRERELEASE=false ) || export PRERELEASE=true
         echo "PRERELEASE=$PRERELEASE" >> $GITHUB_ENV
         echo ------------ download binaries
-        LIB_BLS_RELEASE_TAG=${{ secrets.LIB_BLS_RELEASE_TAG }} bash ./scripts/download_binaries.sh
+        LIB_BLS_RELEASE_TAG=${{ secrets.LIB_BLS_RELEASE_TAG }} bash ../scripts/download_binaries.sh
         export RELEASE=true
         echo "RELEASE=$RELEASE" >> $GITHUB_ENV
         echo ------------ docker image
-        bash ./scripts/build_image.sh ${{ secrets.DOCKER_USERNAME }} ${{ secrets.DOCKER_PASSWORD }} #|| echo "----> Looks like deploy failed"
+        bash ../scripts/build_image.sh ${{ secrets.DOCKER_USERNAME }} ${{ secrets.DOCKER_PASSWORD }} #|| echo "----> Looks like deploy failed"
 
     - name: Prepare for pip package building
       run: |
         python3 -m pip install --upgrade build
         python3 -m pip install --user --upgrade twine
 
     - name: Install project
-      working-directory: ${{env.PROXY_DIR}}
-      run: |
-        yarn install
+      run: yarn install
 
     - name: Generate Manifest
-      working-directory: ${{env.PROXY_DIR}}
-      run: |
-        npx hardhat run migrations/generateManifest.ts
+      run: npx hardhat run migrations/generateManifest.ts
 
     - name: Install python testing staff
-      working-directory: ${{env.PROXY_DIR}}
       run: pip3 install -r predeployed/test/requirements.txt
 
     - name: Build predeployed pip package
-      working-directory: ${{env.PROXY_DIR}}
       env:
         VERSION: ${{ env.VERSION }}
-      run: |
-        ./predeployed/scripts/build_package.sh
+      run: ./predeployed/scripts/build_package.sh
 
     - name: Publish predeployed pip package
-      working-directory: ${{env.PROXY_DIR}}
       env:
         PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
-      run: |
-        ./predeployed/scripts/publish_package.sh
+      run: ./predeployed/scripts/publish_package.sh
+
+    - name: Generate mainnet ABIs
+      env:
+        VERSION: ${{ env.VERSION }}
+      run: npx hardhat run scripts/generateAbi.ts
 
-    - name: Generate ABIs
-      working-directory: ${{env.PROXY_DIR}}/predeployed
+    - name: Generate predeployed ABIs
+      working-directory: proxy/predeployed
       env:
         VERSION: ${{ env.VERSION }}
       run: |
@@ -129,7 +131,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         release_id: ${{ steps.create_release.outputs.id }}
-        assets_path: proxy/predeployed/dist/
+        assets_path: predeployed/dist/
 
     - name: Upload Release Assets
       id: upload-static-data
@@ -138,7 +140,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         release_id: ${{ steps.create_release.outputs.id }}
-        assets_path: proxy/predeployed/data/
+        assets_path: predeployed/data/
 
     - name: Upload Release Assets
       id: upload-manifest-data
@@ -147,4 +149,12 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         release_id: ${{ steps.create_release.outputs.id }}
-        assets_path: proxy/data/ima-schain-*-manifest.json
+        assets_path: data/ima-schain-*-manifest.json
+
+    - name: Upload Release Assets
+      uses: dwenegar/upload-release-assets@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        release_id: ${{ steps.create_release.outputs.id }}
+        assets_path: data/*-abi.json

agent/bls.mjs

@@ -136,6 +136,7 @@ function discoverPublicKeyByIndex( nNodeIndex, joSChainNetworkInfo, details, isT
     const imaState = state.get();
     joSChainNetworkInfo = joSChainNetworkInfo || imaState.joSChainNetworkInfo;
     const jarrNodes = joSChainNetworkInfo.network;
+    const cntNodes = jarrNodes.length;
     const joNode = jarrNodes[nNodeIndex];
     if( joNode && "imaInfo" in joNode && typeof joNode.imaInfo === "object" &&
         "BLSPublicKey0" in joNode.imaInfo &&
@@ -159,10 +160,12 @@ function discoverPublicKeyByIndex( nNodeIndex, joSChainNetworkInfo, details, isT
         };
     }
     details.write( cc.fatal( "CRITICAL ERROR:" ) +
-        cc.error( " BLS 1/16 public key discovery failed for node #" ) + cc.info( nNodeIndex ) +
-        cc.error( ", node data is: " ) + cc.j( joNode ) + "\n" );
-    if( isThrowException )
-        throw new Error( "BLS 1/16 public key discovery failed for node #" + nNodeIndex );
+        cc.error( " BLS 1/" + cntNodes + " public key discovery failed for node #" ) +
+        cc.info( nNodeIndex ) + cc.error( ", node data is: " ) + cc.j( joNode ) + "\n" );
+    if( isThrowException ) {
+        throw new Error(
+            "BLS 1/" + cntNodes + " public key discovery failed for node #" + nNodeIndex );
+    }
     return null;
 }