Merge pull request #82 from skalenetwork/ticket-1672-exception-duping…

…-POW-mining-in-develop Ticket 1672 exception in pow mining in develop
skalenetwork · Feb 6, 2024 · 7a8b166 · 7a8b166
2 parents 48a7462 + c36b3b1
commit 7a8b166
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 46 deletions.
diff --git a/.github/workflows/comprehensive.yml b/.github/workflows/comprehensive.yml
@@ -276,27 +276,6 @@ jobs:
         cd comprehensive-test
         cd engine 
         yarn install
-        cd ../..
-
-    - name: SELF-TEST A - use IMA to browse S-Chain via node 00-00 and test last is alive
-      working-directory: ${{env.working-directory}}
-      run: |
-        node ./src/build/main.js --colors --no-gathered --browse-s-chain --url-s-chain=http://127.0.0.1:2164 || true
-
-    - name: SELF-TEST B - use IMA to browse S-Chain via node 00-01 and test last is alive
-      working-directory: ${{env.working-directory}}
-      run: |
-        node ./src/build/main.js --colors --no-gathered --browse-s-chain --url-s-chain=http://127.0.0.2:2264 || true
-
-    - name: SELF-TEST C - use IMA to browse S-Chain via node 01-00 and test last is alive
-      working-directory: ${{env.working-directory}}
-      run: |
-        node ./src/build/main.js --colors --no-gathered --browse-s-chain --url-s-chain=http://127.0.0.3:2364 || true
-
-    - name: SELF-TEST D - use IMA to browse S-Chain via node 01-01 and test last is alive
-      working-directory: ${{env.working-directory}}
-      run: |
-        node ./src/build/main.js --colors --no-gathered --browse-s-chain --url-s-chain=http://127.0.0.4:2464 || true
 
     - name: INIT - download SGX Wallet
       working-directory: ${{env.working-directory}}

diff --git a/.github/workflows/container-test.yml b/.github/workflows/container-test.yml
@@ -286,27 +286,6 @@ jobs:
         cd comprehensive-test
         cd engine 
         yarn install
-        cd ../..
-
-    - name: SELF-TEST A - use IMA to browse S-Chain via node 00-00 and test last is alive
-      working-directory: ${{env.working-directory}}
-      run: |
-        node ./src/build/main.js --colors --no-gathered --browse-s-chain --url-s-chain=http://127.0.0.1:2164 || true
-
-    - name: SELF-TEST B - use IMA to browse S-Chain via node 00-01 and test last is alive
-      working-directory: ${{env.working-directory}}
-      run: |
-        node ./src/build/main.js --colors --no-gathered --browse-s-chain --url-s-chain=http://127.0.0.2:2264 || true
-
-    - name: SELF-TEST C - use IMA to browse S-Chain via node 01-00 and test last is alive
-      working-directory: ${{env.working-directory}}
-      run: |
-        node ./src/build/main.js --colors --no-gathered --browse-s-chain --url-s-chain=http://127.0.0.3:2364 || true
-
-    - name: SELF-TEST D - use IMA to browse S-Chain via node 01-01 and test last is alive
-      working-directory: ${{env.working-directory}}
-      run: |
-        node ./src/build/main.js --colors --no-gathered --browse-s-chain --url-s-chain=http://127.0.0.4:2464 || true
 
     - name: INIT - build IMA docker container
       working-directory: ${{env.working-directory}}

diff --git a/.github/workflows/network-browser-test.yml b/.github/workflows/network-browser-test.yml
@@ -1,5 +1,5 @@
 name: network-browser test
-on: [push, pull_request]
+on: [push]
 env:
   ETH_PRIVATE_KEY: ${{ secrets.ETH_PRIVATE_KEY }}
   MANAGER_TAG: "1.9.3-beta.0"
@@ -25,4 +25,4 @@ jobs:
 
       - name: Run network-browser tests
         working-directory: network-browser
-        run: bash run_tests.sh
+        run: bash run_tests.sh
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -69,6 +69,11 @@ jobs:
       with:
         python-version: 3.8
 
+    - name: Ensure deps are latest and build everything
+      run: |
+        yarn install
+        yarn rebuild
+
     - name: Build and publish container
       run: |
         export BRANCH=${GITHUB_REF##*/}

diff --git a/Dockerfile b/Dockerfile
@@ -43,6 +43,7 @@ COPY package.json package.json
 
 COPY runner runner
 COPY src src
+COPY src/pow src/build/pow
 RUN mkdir IMA
 COPY IMA/proxy IMA/proxy
 COPY IMA/package.json IMA/package.json

diff --git a/IMA b/IMA
diff --git a/src/package.json b/src/package.json
@@ -4,7 +4,7 @@
     "author": "SKALE Labs and contributors",
     "type": "module",
     "scripts": {
-        "build": "./node_modules/typescript/bin/tsc",
+        "build": "./node_modules/typescript/bin/tsc && cp -f ./pow ./build/pow",
         "rebuild": "yarn clean-build && yarn build",
         "clean-build": "rm -rf ./src/build/* || true",
         "lint-check": "eslint -c .eslintrc.cjs ./*.ts",
+27 −61		.github/workflows/main.yml
+0 −1		proxy/hardhat.config.ts
+5 −33		proxy/migrations/deploySchain.ts
+1 −2		proxy/package.json
+20 −0		proxy/scripts/test_deploy.sh
+8 −2		proxy/scripts/test_upgrade.sh
+64 −32		proxy/yarn.lock