Repository: skalenetwork/IMA (language: python)

Issue:
Prepare stable



Discussion / hints:

Fix patch:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b6a2a670e..a8a0624a7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -182,7 +182,7 @@ jobs:
         echo ------------ check lcov
         lcov --version || true
 
-    - name: NODE 10.x
+    - name: NODE 12.x
       run: |
         echo ------------ uninstall
         sudo apt-get remove nodejs || true
@@ -192,7 +192,7 @@ jobs:
         sudo rm -f /usr/bin/node || true
         sudo rm -f /usr/bin/npm || true
         echo ------------ download
-        curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash -
+        curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
         echo ------------ install
         sudo apt-get install nodejs
         echo ------------ node version check
@@ -299,7 +299,7 @@ jobs:
     - name: Set up Node
       uses: actions/setup-node@v2
       with:
-        node-version: '10'
+        node-version: '12'
 
     - name: Set up Python
       uses: actions/setup-python@v2
diff --git a/VERSION b/VERSION
index 3eefcb9dd..9084fa2f7 100644
--- a/VERSION
+++ b/VERSION
@@ -1,1 +1,1 @@
-1.0.0
+1.1.0
diff --git a/agent/main.js b/agent/main.js
index 056b7be89..a94578e52 100644
--- a/agent/main.js
+++ b/agent/main.js
@@ -1398,11 +1398,11 @@ async function discover_s_chain_network( fnAfter, isSilent, joPrevSChainNetworkI
                             cc.info( nCountReceivedImaDescriptions ) + cc.debug( " node(s)." ) + "\n"
                         );
                     }
-                    if( nCountReceivedImaDescriptions >= nCountToWait ) {
-                        clearInterval( iv );
-                        fnAfter( null, joSChainNetworkInfo );
-                        return;
-                    }
+                    // if( nCountReceivedImaDescriptions >= nCountToWait ) {
+                    //     clearInterval( iv );
+                    //     fnAfter( null, joSChainNetworkInfo );
+                    //     return;
+                    // }
                     ++ nWaitAttempt;
                     if( nWaitAttempt >= cntWaitAttempts ) {
                         clearInterval( iv );
diff --git a/agent/yarn.lock b/agent/yarn.lock
index 6d42ae100..36a19f4a4 100644
--- a/agent/yarn.lock
+++ b/agent/yarn.lock
@@ -1057,6 +1057,18 @@ ethereumjs-util@^6.0.0:
     ethjs-util "0.1.6"
     rlp "^2.2.3"
 
+ethereumjs-util@^7.0.10, ethereumjs-util@^7.0.2:
+  version "7.0.10"
+  resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-7.0.10.tgz#5fb7b69fa1fda0acc59634cf39d6b0291180fc1f"
+  integrity sha512-c/xThw6A+EAnej5Xk5kOzFzyoSnw0WX0tSlZ6pAsfGVvQj3TItaDg9b1+Fz1RJXA+y2YksKwQnuzgt1eY6LKzw==
+  dependencies:
+    "@types/bn.js" "^5.1.0"
+    bn.js "^5.1.2"
+    create-hash "^1.1.2"
+    ethereum-cryptography "^0.1.3"
+    ethjs-util "0.1.6"
+    rlp "^2.2.4"
+
 ethereumjs-wallet@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ethereumjs-wallet/-/ethereumjs-wallet-1.0.1.tgz#664a4bcacfc1291ca2703de066df1178938dba1c"
diff --git a/npms/skale-ima/yarn.lock b/npms/skale-ima/yarn.lock
index 16aff11e3..1813193f6 100644
--- a/npms/skale-ima/yarn.lock
+++ b/npms/skale-ima/yarn.lock
@@ -1132,6 +1132,18 @@ ethereumjs-util@^5.0.0:
     rlp "^2.0.0"
     safe-buffer "^5.1.1"
 
+ethereumjs-util@^7.0.10, ethereumjs-util@^7.0.2:
+  version "7.0.10"
+  resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-7.0.10.tgz#5fb7b69fa1fda0acc59634cf39d6b0291180fc1f"
+  integrity sha512-c/xThw6A+EAnej5Xk5kOzFzyoSnw0WX0tSlZ6pAsfGVvQj3TItaDg9b1+Fz1RJXA+y2YksKwQnuzgt1eY6LKzw==
+  dependencies:
+    "@types/bn.js" "^5.1.0"
+    bn.js "^5.1.2"
+    create-hash "^1.1.2"
+    ethereum-cryptography "^0.1.3"
+    ethjs-util "0.1.6"
+    rlp "^2.2.4"
+
 ethereumjs-wallet@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ethereumjs-wallet/-/ethereumjs-wallet-1.0.1.tgz#664a4bcacfc1291ca2703de066df1178938dba1c"
diff --git a/proxy/DEPLOYED b/proxy/DEPLOYED
index dac3f98eb..b355bd656 100644
--- a/proxy/DEPLOYED
+++ b/proxy/DEPLOYED
@@ -1,1 +1,1 @@
-1.0.0-stable.0
\ No newline at end of file
+1.0.0-stable.1
\ No newline at end of file
diff --git a/proxy/VERSION b/proxy/VERSION
deleted file mode 100644
index 7f207341d..000000000
--- a/proxy/VERSION
+++ /dev/null
@@ -1,1 +0,0 @@
-1.0.1
\ No newline at end of file
diff --git a/proxy/migrations/tools/version.ts b/proxy/migrations/tools/version.ts
index 53c8af9c4..cdbeb45fb 100644
--- a/proxy/migrations/tools/version.ts
+++ b/proxy/migrations/tools/version.ts
@@ -11,6 +11,6 @@ export async function getVersion() {
         const tag = (await exec("git describe --tags")).stdout.trim();
         return tag;
     } catch {
-        return (await fs.readFile("VERSION", "utf-8")).trim();
+        return (await fs.readFile("../VERSION", "utf-8")).trim();
     }
 }
\ No newline at end of file
diff --git a/proxy/yarn.lock b/proxy/yarn.lock
index 79690daa1..ea0b53654 100644
--- a/proxy/yarn.lock
+++ b/proxy/yarn.lock
@@ -125,6 +125,14 @@
     crc-32 "^1.2.0"
     ethereumjs-util "^7.1.0"
 
+"@ethereumjs/common@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@ethereumjs/common/-/common-2.4.0.tgz#2d67f6e6ba22246c5c89104e6b9a119fb3039766"
+  integrity sha512-UdkhFWzWcJCZVsj1O/H8/oqj/0RVYjLc1OhPjBrQdALAkQHpCp8xXI4WLnuGTADqTdJZww0NtgwG+TRPkXt27w==
+  dependencies:
+    crc-32 "^1.2.0"
+    ethereumjs-util "^7.1.0"
+
 "@ethereumjs/ethash@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@ethereumjs/ethash/-/ethash-1.0.0.tgz#4e77f85b37be1ade5393e8719bdabac3e796ddaa"
@@ -4079,6 +4087,18 @@ ethereumjs-util@^7.0.10, ethereumjs-util@^7.0.2, ethereumjs-util@^7.0.3, ethereu
     ethjs-util "0.1.6"
     rlp "^2.2.4"
 
+ethereumjs-util@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-7.1.0.tgz#e2b43a30bfcdbcb432a4eb42bd5f2393209b3fd5"
+  integrity sha512-kR+vhu++mUDARrsMMhsjjzPduRVAeundLGXucGRHF3B4oEltOUspfgCVco4kckucj3FMlLaZHUl9n7/kdmr6Tw==
+  dependencies:
+    "@types/bn.js" "^5.1.0"
+    bn.js "^5.1.2"
+    create-hash "^1.1.2"
+    ethereum-cryptography "^0.1.3"
+    ethjs-util "0.1.6"
+    rlp "^2.2.4"
+
 ethereumjs-vm@4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/ethereumjs-vm/-/ethereumjs-vm-4.2.0.tgz#e885e861424e373dbc556278f7259ff3fca5edab"


Test patch:
diff --git a/proxy/scripts/test_upgrade.sh b/proxy/scripts/test_upgrade.sh
index 492b8ec72..04e8382f3 100644
--- a/proxy/scripts/test_upgrade.sh
+++ b/proxy/scripts/test_upgrade.sh
@@ -12,12 +12,7 @@ GANACHE_PID=$!
 
 cd "$DEPLOYED_DIR"
 cd proxy
-rm yarn.lock
-yarn add @skalenetwork/skale-manager-interfaces@0.1.1 ts-node@8.10.2 || exit $?
-rm migrations/tools/verification.ts
-rm migrations/deployMainnet.ts
-cp "$GITHUB_WORKSPACE/proxy/migrations/tools/verification.ts" migrations/tools
-cp "$GITHUB_WORKSPACE/proxy/migrations/deployMainnet.ts" migrations
+yarn install
 CHAIN_NAME_SCHAIN="Test" VERSION="$DEPLOYED_VERSION" npx hardhat run migrations/deploySkaleManagerComponents.ts --network localhost || exit $?
 VERSION="$DEPLOYED_VERSION" npx hardhat run migrations/deployMainnet.ts --network localhost || exit $?
 rm "$GITHUB_WORKSPACE/proxy/.openzeppelin/unknown-*.json"