From 580241a8dcaa937f111c9c258d8daa452e52548a Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Wed, 26 Apr 2023 09:11:14 +0200
Subject: [PATCH 01/41] rm package

---
 package.json |   2 -
 yarn.lock    | 473 +--------------------------------------------------
 2 files changed, 8 insertions(+), 467 deletions(-)

diff --git a/package.json b/package.json
index 3c97cf46e9..d843e3b5f8 100644
--- a/package.json
+++ b/package.json
@@ -220,8 +220,6 @@
     "@babel/plugin-transform-runtime": "^7.10.4",
     "@babel/polyfill": "^7.4.4",
     "@babel/preset-env": "^7.19.4",
-    "@babel/preset-es2015": "^7.0.0-beta.53",
-    "@babel/preset-es2017": "latest",
     "@babel/preset-react": "^7.18.6",
     "@babel/preset-stage-0": "^7.0.0",
     "@babel/preset-typescript": "^7.18.6",
diff --git a/yarn.lock b/yarn.lock
index 161ab96bcb..a1edd732d8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -31,13 +31,6 @@
     "@nicolo-ribaudo/chokidar-2" "2.1.8-no-fsevents.3"
     chokidar "^3.4.0"
 
-"@babel/code-frame@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.53.tgz#980d1560b863575bf5a377925037e0132ef5921e"
-  integrity sha512-6o6EnDfG+zQqfrYDLPc5kGp6+klZFFFqGucljRcUa7IZuTBpvALWG0O+7rtOGFF1sYhr4jBib995RvFuNFxDMw==
-  dependencies:
-    "@babel/highlight" "7.0.0-beta.53"
-
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4":
   version "7.15.8"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.15.8.tgz#45990c47adadb00c03677baa89221f7cc23d2503"
@@ -163,17 +156,6 @@
     json5 "^2.2.1"
     semver "^6.3.0"
 
-"@babel/generator@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.53.tgz#b8cad72c572be3234affde22be6dacc4250e034b"
-  integrity sha512-XnfdZ6oFVC4cE4+7jbEa1MLFSXrGY/SfSE6onUyyPSrRbjYs9sdrYKi/JgKGSJX65A8GFswHwWcBPCynfVEr5g==
-  dependencies:
-    "@babel/types" "7.0.0-beta.53"
-    jsesc "^2.5.1"
-    lodash "^4.17.5"
-    source-map "^0.5.0"
-    trim-right "^1.0.1"
-
 "@babel/generator@^7.0.0-beta.44":
   version "7.15.8"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.8.tgz#fa56be6b596952ceb231048cf84ee499a19c0cd1"
@@ -229,13 +211,6 @@
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
-"@babel/helper-annotate-as-pure@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0-beta.53.tgz#59960628375cbeef96a07edfe1ca38b756f01aa8"
-  integrity sha512-HVsEm3wjSe3BCXWxnyqrTWWQAxvtHR35F4q84jS68aS8R3WfbOnFEwlqsrWX5quZL0ArR68REOWRDCyG+JBSlQ==
-  dependencies:
-    "@babel/types" "7.0.0-beta.53"
-
 "@babel/helper-annotate-as-pure@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.0.tgz#9a1f0ebcda53d9a2d00108c4ceace6a5d5f1f08d"
@@ -258,15 +233,6 @@
     "@babel/helper-explode-assignable-expression" "^7.18.6"
     "@babel/types" "^7.18.9"
 
-"@babel/helper-call-delegate@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.0.0-beta.53.tgz#95de8babd03f9e6cf4f2b564a038708c138ffe31"
-  integrity sha512-kOdnk7nDkQsAM+fxhiN6sy0jNep5VN6jv7H8pbu2trW5ziopw+cwNxTkihLUAEC+gJU45WngJTZtjUMR/2Kckg==
-  dependencies:
-    "@babel/helper-hoist-variables" "7.0.0-beta.53"
-    "@babel/traverse" "7.0.0-beta.53"
-    "@babel/types" "7.0.0-beta.53"
-
 "@babel/helper-compilation-targets@^7.15.4", "@babel/helper-compilation-targets@^7.20.7":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz#a6cd33e93629f5eb473b021aac05df62c4cd09bb"
@@ -339,15 +305,6 @@
     "@babel/helper-annotate-as-pure" "^7.18.6"
     regexpu-core "^5.1.0"
 
-"@babel/helper-define-map@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.0.0-beta.53.tgz#48e9e2265453787975043efaab1edad239ea9695"
-  integrity sha512-rqDAadUz9cLul+epYez/X6PPwS85j/xL2q61JT14MFJaaCFKmQ8QhmZmktcSsYC8XhsDlaLAdwxSIw1a8oih9g==
-  dependencies:
-    "@babel/helper-function-name" "7.0.0-beta.53"
-    "@babel/types" "7.0.0-beta.53"
-    lodash "^4.17.5"
-
 "@babel/helper-define-polyfill-provider@^0.3.3":
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a"
@@ -372,15 +329,6 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-function-name@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.53.tgz#512804ae8e9cbce5431ebea19e47628c2ed653f2"
-  integrity sha512-vmdaNg17OWa0lFVJqZLQcvc59KIOcJDpyvqr3EJT9BYsjh/JxDlYq/JpBzLpWv9AkXeBdY4NevZXD37gdsLu0Q==
-  dependencies:
-    "@babel/helper-get-function-arity" "7.0.0-beta.53"
-    "@babel/template" "7.0.0-beta.53"
-    "@babel/types" "7.0.0-beta.53"
-
 "@babel/helper-function-name@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz#b7dd0797d00bbfee4f07e9c4ea5b0e30c8bb1481"
@@ -406,13 +354,6 @@
     "@babel/template" "^7.20.7"
     "@babel/types" "^7.21.0"
 
-"@babel/helper-get-function-arity@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.53.tgz#ded88ab29f9b1db61c87d1bb8d38a35dda779de6"
-  integrity sha512-jLbME3MfCVT88GLuUDJ1X+ErDeWi59aeBb/O6pyhp5C+eVRRiLxzptRmpvJqG+Va6aOBWSoJ8uBNKJ1ghT/ONg==
-  dependencies:
-    "@babel/types" "7.0.0-beta.53"
-
 "@babel/helper-get-function-arity@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz#0088c7486b29a9cb5d948b1a1de46db66e089cfa"
@@ -420,13 +361,6 @@
   dependencies:
     "@babel/types" "^7.16.0"
 
-"@babel/helper-hoist-variables@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0-beta.53.tgz#4c27e3b873fa09c5ad6e93eb40704c200f84137c"
-  integrity sha512-ktLEBpVZkvPUjNn8JK11m/74cWw9H9U3QizAiJUPdnvkvz/F0ucMyIOpMa7vuhmpHmlRzgAraIlTrmQfxv6BGg==
-  dependencies:
-    "@babel/types" "7.0.0-beta.53"
-
 "@babel/helper-hoist-variables@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz#4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a"
@@ -441,13 +375,6 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-member-expression-to-functions@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0-beta.53.tgz#0fb0ef8b2d3b903d1c3bf426da4a74575e019ce4"
-  integrity sha512-/rJvy0+ipYwZh5pXSrifbUo7Ct+Dfm85AQqSYphbX67qEOEk92phxE95Tpw1wtLgWEbWBQ3WRHfTyEadqlPocg==
-  dependencies:
-    "@babel/types" "7.0.0-beta.53"
-
 "@babel/helper-member-expression-to-functions@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.0.tgz#29287040efd197c77636ef75188e81da8bccd5a4"
@@ -462,14 +389,6 @@
   dependencies:
     "@babel/types" "^7.18.9"
 
-"@babel/helper-module-imports@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0-beta.53.tgz#e735e6aa30a504b0f9d85c38a6d470a9f4aa81d9"
-  integrity sha512-nyyERQH7kRCy0OR2Ek0+sD+wxZEhCmaLAVE7SylPYmCce1Dq8XGmibT1eQVekRkr78utXnDKMe4A269SBVlIRA==
-  dependencies:
-    "@babel/types" "7.0.0-beta.53"
-    lodash "^4.17.5"
-
 "@babel/helper-module-imports@^7.0.0-beta.44":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz#90538e60b672ecf1b448f5f4f5433d37e79a3ec3"
@@ -484,18 +403,6 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-module-transforms@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.0.0-beta.53.tgz#7ba214cdcc8f8623f2d1797deaff1ff349aace13"
-  integrity sha512-FQrR3poCdkIxIl+QGkw9Fq3fYcEmcFloO/CSX26FYZuXcHZ5FbPLZajtdcQmPNWWqIicHzCXd0h+gkcRSP9siQ==
-  dependencies:
-    "@babel/helper-module-imports" "7.0.0-beta.53"
-    "@babel/helper-simple-access" "7.0.0-beta.53"
-    "@babel/helper-split-export-declaration" "7.0.0-beta.53"
-    "@babel/template" "7.0.0-beta.53"
-    "@babel/types" "7.0.0-beta.53"
-    lodash "^4.17.5"
-
 "@babel/helper-module-transforms@^7.15.8":
   version "7.21.2"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz#160caafa4978ac8c00ac66636cb0fa37b024e2d2"
@@ -552,13 +459,6 @@
     "@babel/traverse" "^7.21.0"
     "@babel/types" "^7.21.0"
 
-"@babel/helper-optimise-call-expression@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0-beta.53.tgz#8fc78ef4c0f69f8bb3bbdf34cd232c20120414c8"
-  integrity sha512-B6DMEnC9slZtBDRRjLi7OTcfmsXPPZsRLldqQ0TZjWj4QuZWFSDlonVWIYI+2Fb9DiA/dZMXMv9JDgVGGibMkw==
-  dependencies:
-    "@babel/types" "7.0.0-beta.53"
-
 "@babel/helper-optimise-call-expression@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz#cecdb145d70c54096b1564f8e9f10cd7d193b338"
@@ -573,11 +473,6 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-plugin-utils@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0-beta.53.tgz#d64458636ffc258b42714a9dd93aeb6f8b8cf3ed"
-  integrity sha512-ziTIzKm3Hj8LvmV6HwyPC2t2NgSNg2T72Cifqaw3zo44ATRUeNI/nH7NoQZChNNwye97pbzs+UAHq6fCTt3uFg==
-
 "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9"
@@ -593,24 +488,6 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629"
   integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==
 
-"@babel/helper-regex@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.0.0-beta.53.tgz#6e9d2197b562779e225565946ae9a85c215b225e"
-  integrity sha512-Wh9ORGs15i37YovmEcS2W8PQDMR9T5UxAL1EtHW/uAfqH4T703dRK/7rsREYjA2lQ8pPHJWN/y0tMuCoOvl3jQ==
-  dependencies:
-    lodash "^4.17.5"
-
-"@babel/helper-remap-async-to-generator@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.0.0-beta.53.tgz#b834a7572dec176389ffac7e763579586490c922"
-  integrity sha512-yVndfFtBJjwX1QuE1ks8FEHyJkxAXKZfykk/PPprhd4zWJZRBh0UgtV6uHcb302s2wPQ/6cUgB4GEF8z9aN2DQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "7.0.0-beta.53"
-    "@babel/helper-wrap-function" "7.0.0-beta.53"
-    "@babel/template" "7.0.0-beta.53"
-    "@babel/traverse" "7.0.0-beta.53"
-    "@babel/types" "7.0.0-beta.53"
-
 "@babel/helper-remap-async-to-generator@^7.18.6", "@babel/helper-remap-async-to-generator@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519"
@@ -621,16 +498,6 @@
     "@babel/helper-wrap-function" "^7.18.9"
     "@babel/types" "^7.18.9"
 
-"@babel/helper-replace-supers@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.0.0-beta.53.tgz#339b5bdc102294495b1a27c558132306e1b7bca7"
-  integrity sha512-/KG2wmojlGgtuco35Aq5RYftukhXiql4dG7ux+oAnpi6wALb6BjPmUWJe5m57lNNQgLtCfQ8596j0h5GZu65QA==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "7.0.0-beta.53"
-    "@babel/helper-optimise-call-expression" "7.0.0-beta.53"
-    "@babel/traverse" "7.0.0-beta.53"
-    "@babel/types" "7.0.0-beta.53"
-
 "@babel/helper-replace-supers@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.0.tgz#73055e8d3cf9bcba8ddb55cad93fedc860f68f17"
@@ -652,15 +519,6 @@
     "@babel/traverse" "^7.19.1"
     "@babel/types" "^7.19.0"
 
-"@babel/helper-simple-access@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.0.0-beta.53.tgz#72f6db9abe42f8681fa6f028efd59d81544752b3"
-  integrity sha512-mq4csKX0vucrhZKgTG/ogNCuq6KiLEVXRDG5sRWggpuN4N6f/z+CyGNi83tqLRv9VLjV7IEQu/6UyI2wAUxFOg==
-  dependencies:
-    "@babel/template" "7.0.0-beta.53"
-    "@babel/types" "7.0.0-beta.53"
-    lodash "^4.17.5"
-
 "@babel/helper-simple-access@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz#d6d8f51f4ac2978068df934b569f08f29788c7ea"
@@ -689,13 +547,6 @@
   dependencies:
     "@babel/types" "^7.18.9"
 
-"@babel/helper-split-export-declaration@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.53.tgz#aef54b8b1f99616ea37c98478716a3780263325b"
-  integrity sha512-7twjNOXZFIuiGpfkaf2j1WuGFbfrmHS5ES9GXXXT0xbQ5UmyX9nvaTJHMt11t6pvIjv1xvtBVuDyMCrvyd+E/w==
-  dependencies:
-    "@babel/types" "7.0.0-beta.53"
-
 "@babel/helper-split-export-declaration@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz#29672f43663e936df370aaeb22beddb3baec7438"
@@ -735,16 +586,6 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
   integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
 
-"@babel/helper-wrap-function@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.0.0-beta.53.tgz#abfb2bfa9401042bab257c0190f5ad6db8df15d5"
-  integrity sha512-BAjHzqq+lkhepz79vY0eZ7WfBl09XGDsHrqfCN2fg2PLipWZYJR0O8rP94YUTpS0gy1AIB4lCQl/5dV4SvMV9A==
-  dependencies:
-    "@babel/helper-function-name" "7.0.0-beta.53"
-    "@babel/template" "7.0.0-beta.53"
-    "@babel/traverse" "7.0.0-beta.53"
-    "@babel/types" "7.0.0-beta.53"
-
 "@babel/helper-wrap-function@^7.18.9":
   version "7.19.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz#89f18335cff1152373222f76a4b37799636ae8b1"
@@ -782,15 +623,6 @@
     "@babel/traverse" "^7.19.4"
     "@babel/types" "^7.19.4"
 
-"@babel/highlight@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.53.tgz#f4e952dad1787d205e188d3e384cdce49ca368fb"
-  integrity sha512-5wvZd8RHAOzmTJ5bpupKM6x5OWXlViUK5ACDAUn7YXDd/JqQQZXi0CxDb8pH5IFV79mt6r5A/bZ/+NLhxpcZ5g==
-  dependencies:
-    chalk "^2.0.0"
-    esutils "^2.0.2"
-    js-tokens "^3.0.0"
-
 "@babel/highlight@^7.14.5", "@babel/highlight@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a"
@@ -809,11 +641,6 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.0.0-beta.53.tgz#1f45eb617bf9463d482b2c04d349d9e4edbf4892"
-  integrity sha512-SYoyLjcE+D28Ly2kkPXP6eIVy4YwViRSffri5WHi8PRxy8ngnx6mTXFzGAsSSPzUN3DK+sf8qBsdDGeQz1SJEw==
-
 "@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.21.0", "@babel/parser@^7.7.0":
   version "7.21.1"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.1.tgz#a8f81ee2fe872af23faea4b17a08fcc869de7bcc"
@@ -1181,13 +1008,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.19.0"
 
-"@babel/plugin-transform-arrow-functions@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.0.0-beta.53.tgz#a75f5fa8497aac1729d033bf41c250416b9d1e04"
-  integrity sha512-CxYIFD+eutA6WzT16fsxGn8Y1A50iG3JVOeL8MGn51h42E2ea5xvfWnT/aAthEuKqbHR+FDyxBZ7o2lXRMwAag==
-  dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.53"
-
 "@babel/plugin-transform-arrow-functions@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz#19063fcf8771ec7b31d742339dac62433d0611fe"
@@ -1195,15 +1015,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-async-to-generator@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.0.0-beta.53.tgz#444c761cc4215c97a9b556ff58ca7ba7df5d4153"
-  integrity sha512-CQQJkRgY/Zt6ezbk4yk1offtvjGzX8MsZC8q39PMj3zKfmawzfRqcBO5O00vw3MgoeAju4/ZZ1gtCzhhNqtgYg==
-  dependencies:
-    "@babel/helper-module-imports" "7.0.0-beta.53"
-    "@babel/helper-plugin-utils" "7.0.0-beta.53"
-    "@babel/helper-remap-async-to-generator" "7.0.0-beta.53"
-
 "@babel/plugin-transform-async-to-generator@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz#ccda3d1ab9d5ced5265fdb13f1882d5476c71615"
@@ -1213,13 +1024,6 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/helper-remap-async-to-generator" "^7.18.6"
 
-"@babel/plugin-transform-block-scoped-functions@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.0.0-beta.53.tgz#0a43221a1b0c90cd4d09f1b46b959dd248657f73"
-  integrity sha512-bBCniYwYf4HI9jaVT1sf272aijJBDg17hAAAa1XduB/humwRD+XE5nZXYfh5ktMTjxHyWxB55LK6Y1W+F4RSDg==
-  dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.53"
-
 "@babel/plugin-transform-block-scoped-functions@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz#9187bf4ba302635b9d70d986ad70f038726216a8"
@@ -1227,14 +1031,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-block-scoping@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.0.0-beta.53.tgz#9efd6e50ca1fa398dcaa7119621da3f1fbb821b6"
-  integrity sha512-lBDSm853wqigbxRR9m71Ow91whK/gjOJzFo2kFwJulUZJaV/pdQGSXopANPRjITplKbDufIbClPdIK1V6dnN+w==
-  dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.53"
-    lodash "^4.17.5"
-
 "@babel/plugin-transform-block-scoping@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.9.tgz#f9b7e018ac3f373c81452d6ada8bd5a18928926d"
@@ -1249,20 +1045,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.19.0"
 
-"@babel/plugin-transform-classes@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.0.0-beta.53.tgz#5dc2ec31bf1e98066acdf0c4887b7744c14bec6e"
-  integrity sha512-Mv/3NVDJ40aawBuwg+Yy776Qynmo8FRM4RLtGk+TyIH9PKw83b1jL0Gxa1OvzXjBiizq6oQLOhUvWnmh1uSL5A==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "7.0.0-beta.53"
-    "@babel/helper-define-map" "7.0.0-beta.53"
-    "@babel/helper-function-name" "7.0.0-beta.53"
-    "@babel/helper-optimise-call-expression" "7.0.0-beta.53"
-    "@babel/helper-plugin-utils" "7.0.0-beta.53"
-    "@babel/helper-replace-supers" "7.0.0-beta.53"
-    "@babel/helper-split-export-declaration" "7.0.0-beta.53"
-    globals "^11.1.0"
-
 "@babel/plugin-transform-classes@^7.19.0":
   version "7.19.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz#0e61ec257fba409c41372175e7c1e606dc79bb20"
@@ -1278,13 +1060,6 @@
     "@babel/helper-split-export-declaration" "^7.18.6"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.0.0-beta.53.tgz#9747e26082ae94eda530f98d2c2059e8d2dbc005"
-  integrity sha512-5q7Epq0AIj3Pakj1w4WeJvcGZbPpIGymjXjinh7s/U8nCuXsxxjBiBXc0Hk0IaY95C51FxWmmbp3t1v7QqifNw==
-  dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.53"
-
 "@babel/plugin-transform-computed-properties@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz#2357a8224d402dad623caf6259b611e56aec746e"
@@ -1292,13 +1067,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-destructuring@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.0.0-beta.53.tgz#0f0adb0e1a6dcd35a3664101609ec062ff127a76"
-  integrity sha512-V7qWHCE5f2/hb4gd7rFe1MIkVoC0ZIo/XFR9YAHbRdUQtOI57FUjJL+Fz2BT5MaZYglfWFZy+YLnVzQhInJFJA==
-  dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.53"
-
 "@babel/plugin-transform-destructuring@^7.18.13":
   version "7.18.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.13.tgz#9e03bc4a94475d62b7f4114938e6c5c33372cbf5"
@@ -1329,13 +1097,6 @@
     "@babel/helper-create-regexp-features-plugin" "^7.16.0"
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-duplicate-keys@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.0.0-beta.53.tgz#0f559913abfa18239ca4e08f73eec36c5e57b81f"
-  integrity sha512-Laqs9gb/pkNVCZBugOYRhz8qaxz+XMz9CjKpF9eMrET1FToh0I2lp4yRKUHc4VPHd+oolkWvN55Hi28Ia3QOHQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.53"
-
 "@babel/plugin-transform-duplicate-keys@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz#687f15ee3cdad6d85191eb2a372c4528eaa0ae0e"
@@ -1351,13 +1112,6 @@
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-for-of@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.0.0-beta.53.tgz#fa065215e18569c8f74dd524b5721e11dcca973b"
-  integrity sha512-7DD7gd/ywy3fTBZvQ8CiulD3SsUZLNrw22zD4nmH7LS8mTFcUnAsenbzHMDKmFs02ZwkLaAOS0lAQZFuSA/bNQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.53"
-
 "@babel/plugin-transform-for-of@^7.18.8":
   version "7.18.8"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz#6ef8a50b244eb6a0bdbad0c7c61877e4e30097c1"
@@ -1365,14 +1119,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-function-name@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.0.0-beta.53.tgz#2b3a5bb364c1e1c57eccbfe25c6bf55f2804113e"
-  integrity sha512-mvkWR0ay5U8IZQiCRV02jnhk0uY+DHZCbmBVQ9KAYq0mvunmtxHsk3NtEzSTHMSyXr69BUkQlVnYlWtYN0HP6w==
-  dependencies:
-    "@babel/helper-function-name" "7.0.0-beta.53"
-    "@babel/helper-plugin-utils" "7.0.0-beta.53"
-
 "@babel/plugin-transform-function-name@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz#cc354f8234e62968946c61a46d6365440fc764e0"
@@ -1382,20 +1128,6 @@
     "@babel/helper-function-name" "^7.18.9"
     "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-instanceof@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-instanceof/-/plugin-transform-instanceof-7.0.0-beta.53.tgz#582d82b725188201ad0e2231f1fce94c745a2c06"
-  integrity sha512-/WX7rfrMy2nYfSGWdST3RZTPREDpNUNzl5YGx3O/M33qqepbeWBCwSggTSkdQ7iBAPi/CBjY7fGSVGCcCPR7/w==
-  dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.53"
-
-"@babel/plugin-transform-literals@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.0.0-beta.53.tgz#bec4f144e9a96ef5121d1430c7ebe5fd088657c9"
-  integrity sha512-1bWy5iRSQngH9klvojOdMotFH9PWY6aRDWSiHddIsc54VQrKz9NH6bBAwhf+2Jt+SJfCUbAaGuleeZkfMPZ7fg==
-  dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.53"
-
 "@babel/plugin-transform-literals@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc"
@@ -1410,14 +1142,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-modules-amd@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.0.0-beta.53.tgz#5854d739e679233a8877c0b418269c6beb7a322c"
-  integrity sha512-DldT9fmUfjr+pY1/fLidnMq4wk2GiN4114oWshYHSd5Eachi5BkfM6Ao2CsTbDL5PyTy3rdIRB6K9nL+7ze0YQ==
-  dependencies:
-    "@babel/helper-module-transforms" "7.0.0-beta.53"
-    "@babel/helper-plugin-utils" "7.0.0-beta.53"
-
 "@babel/plugin-transform-modules-amd@^7.10.4", "@babel/plugin-transform-modules-amd@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz#8c91f8c5115d2202f277549848874027d7172d21"
@@ -1427,15 +1151,6 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-commonjs@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.0.0-beta.53.tgz#ebc3fba1c5a6c8743b909403ecd3e7e3681cafa5"
-  integrity sha512-PP1obXrhqknxHDtJ90DoB+SwjwLzC0bGCeYBAx1T0rgLjmWYMGB103wNpfdJ1jqUH5mmC6PTNKBlasTGiEc9Cw==
-  dependencies:
-    "@babel/helper-module-transforms" "7.0.0-beta.53"
-    "@babel/helper-plugin-utils" "7.0.0-beta.53"
-    "@babel/helper-simple-access" "7.0.0-beta.53"
-
 "@babel/plugin-transform-modules-commonjs@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz#afd243afba166cca69892e24a8fd8c9f2ca87883"
@@ -1455,14 +1170,6 @@
     "@babel/helper-plugin-utils" "^7.19.0"
     "@babel/helper-simple-access" "^7.19.4"
 
-"@babel/plugin-transform-modules-systemjs@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.0.0-beta.53.tgz#b80fcd9c15972dc6823214f5248527860bbf058e"
-  integrity sha512-ZCJZ18qEd7zf9F7Caph/z4TUARMlZiC5aI67wzOSeNpLhqSOrno5qxN7uukOuYvpsk3ji04S4tJOqHSuG+NUTA==
-  dependencies:
-    "@babel/helper-hoist-variables" "7.0.0-beta.53"
-    "@babel/helper-plugin-utils" "7.0.0-beta.53"
-
 "@babel/plugin-transform-modules-systemjs@^7.19.0":
   version "7.19.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.0.tgz#5f20b471284430f02d9c5059d9b9a16d4b085a1f"
@@ -1474,14 +1181,6 @@
     "@babel/helper-validator-identifier" "^7.18.6"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-umd@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.0.0-beta.53.tgz#2a36abe40a1da676e43a1c3071578e27bd2d679d"
-  integrity sha512-TXX2R9rZQJbxyJ2leae4N+pT73t6Niolosa0WyZpLTGBmjKrFRHm/vpCm3v+tqb0GZMXbMQ/vzCRlMcQD8tPTQ==
-  dependencies:
-    "@babel/helper-module-transforms" "7.0.0-beta.53"
-    "@babel/helper-plugin-utils" "7.0.0-beta.53"
-
 "@babel/plugin-transform-modules-umd@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz#81d3832d6034b75b54e62821ba58f28ed0aab4b9"
@@ -1512,14 +1211,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-object-super@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.0.0-beta.53.tgz#e2c4f06edb34b3d7a4b2757ba18829d0df2029cb"
-  integrity sha512-ko8FH0QnK76kZoNmP0KuZPFRlp2D07oLEXFylwpfOw6v2xmwqxajGiL51qrf0fhS5CT7zFbkHDmZljPfOo6Tzw==
-  dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.53"
-    "@babel/helper-replace-supers" "7.0.0-beta.53"
-
 "@babel/plugin-transform-object-super@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c"
@@ -1528,15 +1219,6 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/helper-replace-supers" "^7.18.6"
 
-"@babel/plugin-transform-parameters@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.0.0-beta.53.tgz#efe60cec8ceca0d19d5c6fa1ae79bc4e33279d56"
-  integrity sha512-X9zQrth/hIJ8EQFIF4lc+I16MmgEBoiog0izTC37wwXHEMtC9UWtspfDNVOIwuJ5vqKbQn8arqCUCh63SSG90g==
-  dependencies:
-    "@babel/helper-call-delegate" "7.0.0-beta.53"
-    "@babel/helper-get-function-arity" "7.0.0-beta.53"
-    "@babel/helper-plugin-utils" "7.0.0-beta.53"
-
 "@babel/plugin-transform-parameters@^7.18.8":
   version "7.18.8"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz#ee9f1a0ce6d78af58d0956a9378ea3427cccb48a"
@@ -1591,13 +1273,6 @@
     "@babel/helper-annotate-as-pure" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-regenerator@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0-beta.53.tgz#4febbf6084afa0c1c9ec8497de68c0695fe9da0b"
-  integrity sha512-mGWykD0r9/7isJjTMG45kgUb63zWp9Rx1Mrd0tt8928IlNx4V2/1zjB1RqObiBE+ylkmhz6G3ywNmXuXSy9haQ==
-  dependencies:
-    regenerator-transform "^0.13.3"
-
 "@babel/plugin-transform-regenerator@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz#585c66cb84d4b4bf72519a34cfce761b8676ca73"
@@ -1625,13 +1300,6 @@
     babel-plugin-polyfill-regenerator "^0.4.1"
     semver "^6.3.0"
 
-"@babel/plugin-transform-shorthand-properties@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.0.0-beta.53.tgz#dfc4881b6bd7658a0031ec3b8163e588f0898d4b"
-  integrity sha512-kNjYrpDKi+ZYjWM1qQwD10ERplviaDb37/9RoLpeIRezf+DXPm5PMdIMYJH2gD552fbtkYwESp44hm2Izpi3rg==
-  dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.53"
-
 "@babel/plugin-transform-shorthand-properties@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9"
@@ -1639,13 +1307,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-spread@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.0.0-beta.53.tgz#83e8f646ca24f1c98228f9f1444cf60cbd4938bc"
-  integrity sha512-pkK2dpGXiblw+OojZnyMdJAD/qUs0bDnhqqmN4WLdbvsbQW0wC/nWD7YmGUwl9B8kJ4cFmrvT1l5idh4d9Az3Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.53"
-
 "@babel/plugin-transform-spread@^7.19.0":
   version "7.19.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz#dd60b4620c2fec806d60cfaae364ec2188d593b6"
@@ -1654,14 +1315,6 @@
     "@babel/helper-plugin-utils" "^7.19.0"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
 
-"@babel/plugin-transform-sticky-regex@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.0.0-beta.53.tgz#0fcf3c994abdd8bab59ba9782fe4d9f8a545d6e7"
-  integrity sha512-axZvAsF66i0/hBqtlAeVWB66OGx+EU/5cY4DEQtqd217LdbtrTpV3oynG0cZylNPeY2TCU848ojlBCA1L3PvTQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.53"
-    "@babel/helper-regex" "7.0.0-beta.53"
-
 "@babel/plugin-transform-sticky-regex@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz#c6706eb2b1524028e317720339583ad0f444adcc"
@@ -1669,14 +1322,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-template-literals@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.0.0-beta.53.tgz#fa6b0b417100d23e2db14c1df47a2b1b3978f1d9"
-  integrity sha512-0q5OZuPVBAB/rsqulVLWT/bEoT1dEcKiVkyUagKgaVer2rXy1eB6eSFV3cJ/gpnlXDB2L0dCgeakgGJz/a1q4g==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "7.0.0-beta.53"
-    "@babel/helper-plugin-utils" "7.0.0-beta.53"
-
 "@babel/plugin-transform-template-literals@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e"
@@ -1684,13 +1329,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-typeof-symbol@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.0.0-beta.53.tgz#65aae871a9aa40f611483665731209aebd5c2a2b"
-  integrity sha512-xm9X4m0x+HrZ9r8GqNFjnFlip0nh7zUjGzGFOFD1l07gepng3tG1HYrO+LJ9WwOqnE1pqc8d0cCz7nvxlEqHLQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.53"
-
 "@babel/plugin-transform-typeof-symbol@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz#c8cea68263e45addcd6afc9091429f80925762c0"
@@ -1714,15 +1352,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-unicode-regex@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.0.0-beta.53.tgz#0af74ec8019e7d59e38be64db7f62291942fed25"
-  integrity sha512-6DlspW3xuGi9JKzof3cqdel69TF/bE0tn7wC3tl1+VZ+BnUauEcZjlaN8azTD5YfgEUuiqWl9+Oz0WOyBf+0Yw==
-  dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.53"
-    "@babel/helper-regex" "7.0.0-beta.53"
-    regexpu-core "^4.1.3"
-
 "@babel/plugin-transform-unicode-regex@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca"
@@ -1901,45 +1530,6 @@
     core-js-compat "^3.25.1"
     semver "^6.3.0"
 
-"@babel/preset-es2015@^7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/preset-es2015/-/preset-es2015-7.0.0-beta.53.tgz#4982fa1948db1093766288f69913e2ce360311e4"
-  integrity sha512-rcLuTFjJ4jlJdjkFeyX/BUyht3tGmfa3fgtAlPafNLLsAZ6nriJFhFNSXdB6Sl+seTcKVYvZoEFWNuVvqDXrnQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.53"
-    "@babel/plugin-transform-arrow-functions" "7.0.0-beta.53"
-    "@babel/plugin-transform-block-scoped-functions" "7.0.0-beta.53"
-    "@babel/plugin-transform-block-scoping" "7.0.0-beta.53"
-    "@babel/plugin-transform-classes" "7.0.0-beta.53"
-    "@babel/plugin-transform-computed-properties" "7.0.0-beta.53"
-    "@babel/plugin-transform-destructuring" "7.0.0-beta.53"
-    "@babel/plugin-transform-duplicate-keys" "7.0.0-beta.53"
-    "@babel/plugin-transform-for-of" "7.0.0-beta.53"
-    "@babel/plugin-transform-function-name" "7.0.0-beta.53"
-    "@babel/plugin-transform-instanceof" "7.0.0-beta.53"
-    "@babel/plugin-transform-literals" "7.0.0-beta.53"
-    "@babel/plugin-transform-modules-amd" "7.0.0-beta.53"
-    "@babel/plugin-transform-modules-commonjs" "7.0.0-beta.53"
-    "@babel/plugin-transform-modules-systemjs" "7.0.0-beta.53"
-    "@babel/plugin-transform-modules-umd" "7.0.0-beta.53"
-    "@babel/plugin-transform-object-super" "7.0.0-beta.53"
-    "@babel/plugin-transform-parameters" "7.0.0-beta.53"
-    "@babel/plugin-transform-regenerator" "7.0.0-beta.53"
-    "@babel/plugin-transform-shorthand-properties" "7.0.0-beta.53"
-    "@babel/plugin-transform-spread" "7.0.0-beta.53"
-    "@babel/plugin-transform-sticky-regex" "7.0.0-beta.53"
-    "@babel/plugin-transform-template-literals" "7.0.0-beta.53"
-    "@babel/plugin-transform-typeof-symbol" "7.0.0-beta.53"
-    "@babel/plugin-transform-unicode-regex" "7.0.0-beta.53"
-
-"@babel/preset-es2017@latest":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/preset-es2017/-/preset-es2017-7.0.0-beta.53.tgz#c5132b245427550b7ce0efc7d9267abfa217feef"
-  integrity sha512-kFRWUrg0Fd9+R7uBP5T/MwzdheKCvBtTgyFh/gMlNKQqoV3l2qMJpetDzR4iBrtBCC/xwWS7HO2tK3RV7uJRPw==
-  dependencies:
-    "@babel/helper-plugin-utils" "7.0.0-beta.53"
-    "@babel/plugin-transform-async-to-generator" "7.0.0-beta.53"
-
 "@babel/preset-modules@^0.1.5":
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9"
@@ -2024,16 +1614,6 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.53.tgz#3322290900d0b187b0a7174381e1f3bb71050d2e"
-  integrity sha512-MCZLPfGfNBHdE5wNfY5eK1hpY3fyq8zq+NfbfFCUtIzHl7SfUzHzH8rKPBXSB2Ypetq2sBHdDyslSSgnG0Watg==
-  dependencies:
-    "@babel/code-frame" "7.0.0-beta.53"
-    "@babel/parser" "7.0.0-beta.53"
-    "@babel/types" "7.0.0-beta.53"
-    lodash "^4.17.5"
-
 "@babel/template@^7.15.4", "@babel/template@^7.20.7", "@babel/template@^7.3.3", "@babel/template@^7.4.0":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
@@ -2061,22 +1641,6 @@
     "@babel/parser" "^7.18.10"
     "@babel/types" "^7.18.10"
 
-"@babel/traverse@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.53.tgz#00d32cd8d0b58f4c01d31157be622c662826d344"
-  integrity sha512-JZh3vX/9ox9aoub2gLlpPRm8LM0yJuqzmp5MrbwD57SPh1dHMDWjGen9exbaITAe03t9MJV5PAacv0K2UJBffg==
-  dependencies:
-    "@babel/code-frame" "7.0.0-beta.53"
-    "@babel/generator" "7.0.0-beta.53"
-    "@babel/helper-function-name" "7.0.0-beta.53"
-    "@babel/helper-split-export-declaration" "7.0.0-beta.53"
-    "@babel/parser" "7.0.0-beta.53"
-    "@babel/types" "7.0.0-beta.53"
-    debug "^3.1.0"
-    globals "^11.1.0"
-    invariant "^2.2.0"
-    lodash "^4.17.5"
-
 "@babel/traverse@^7.15.4", "@babel/traverse@^7.21.2", "@babel/traverse@^7.4.3":
   version "7.21.2"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.2.tgz#ac7e1f27658750892e815e60ae90f382a46d8e75"
@@ -2172,15 +1736,6 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@7.0.0-beta.53":
-  version "7.0.0-beta.53"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.53.tgz#19a461c0da515595dfb6740b4b45dc7bb0e6b375"
-  integrity sha512-iL3DSWjQ890rA97uR5F1PhGtYniVGjqaRoRZtLz76bZhNNqmALftafrUnuJNzWC9z0eoaNcAtk7ZT/26mW/6Tg==
-  dependencies:
-    esutils "^2.0.2"
-    lodash "^4.17.5"
-    to-fast-properties "^2.0.0"
-
 "@babel/types@^7.0.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.7.0":
   version "7.21.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.0.tgz#1da00d89c2f18b226c9207d96edbeb79316a1819"
@@ -15381,7 +14936,7 @@ intro.js@^4.1.0:
   resolved "https://registry.yarnpkg.com/intro.js/-/intro.js-4.3.0.tgz#39d072e638eae9c8491e225b8565ad63b6aaf1f7"
   integrity sha512-F4LXM42QIXcO3/2myGBBFdbbUVUK0lBhK7pAxPLd082u+3HfvigFR+Rptqy05q3OzjG/O0vMFDedrnHdSPi2rQ==
 
-invariant@^2.2.0, invariant@^2.2.2, invariant@^2.2.4:
+invariant@^2.2.2, invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
@@ -16864,16 +16419,16 @@ js-sha3@^0.6.1:
   resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.6.1.tgz#5b89f77a7477679877f58c4a075240934b1f95c0"
   integrity sha1-W4n3enR3Z5h39YxKB1JAk0sflcA=
 
-js-tokens@^3.0.0, js-tokens@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
-  integrity sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg==
-
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
+js-tokens@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+  integrity sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg==
+
 js-yaml@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f"
@@ -17768,7 +17323,7 @@ lodash.without@~4.4.0:
   resolved "https://registry.yarnpkg.com/lodash.without/-/lodash.without-4.4.0.tgz#3cd4574a00b67bae373a94b748772640507b7aac"
   integrity sha1-PNRXSgC2e643OpS3SHcmQFB7eqw=
 
-lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1:
+lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.2.1:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -22814,13 +22369,6 @@ regenerator-transform@^0.10.0:
     babel-types "^6.19.0"
     private "^0.1.6"
 
-regenerator-transform@^0.13.3:
-  version "0.13.4"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.4.tgz#18f6763cf1382c69c36df76c6ce122cc694284fb"
-  integrity sha512-T0QMBjK3J0MtxjPmdIMXm72Wvj2Abb0Bd4HADdfijwMdoIsyQZ6fWC7kDFhk2YinBBEMZDL7Y7wh0J1sGx3S4A==
-  dependencies:
-    private "^0.1.6"
-
 regenerator-transform@^0.15.0:
   version "0.15.0"
   resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.0.tgz#cbd9ead5d77fae1a48d957cf889ad0586adb6537"
@@ -22874,7 +22422,7 @@ regexpu-core@^2.0.0:
     regjsgen "^0.2.0"
     regjsparser "^0.1.4"
 
-regexpu-core@^4.1.3, regexpu-core@^4.7.1:
+regexpu-core@^4.7.1:
   version "4.8.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0"
   integrity sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg==
@@ -25533,11 +25081,6 @@ trim-newlines@^3.0.0:
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
   integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
 
-trim-right@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
-  integrity sha512-WZGXGstmCWgeevgTL54hrCuw1dyMQIzWy7ZfqRJfSmJZBwklI15egmQytFP6bPidmw3M8d5yEowl1niq4vmqZw==
-
 trim@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd"

From d37f8a98a3d2d418dfcad26149e378718d83785f Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Wed, 26 Apr 2023 09:31:10 +0200
Subject: [PATCH 02/41] update types

---
 libs/remix-analyzer/package.json     | 2 +-
 libs/remix-solidity/package.json     | 2 +-
 libs/remix-tests/package.json        | 2 +-
 libs/remix-url-resolver/package.json | 2 +-
 libs/remixd/package.json             | 2 +-
 package.json                         | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libs/remix-analyzer/package.json b/libs/remix-analyzer/package.json
index 5dbc16d73a..5477ae4b92 100644
--- a/libs/remix-analyzer/package.json
+++ b/libs/remix-analyzer/package.json
@@ -40,7 +40,7 @@
   "license": "MIT",
   "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-analyzer#readme",
   "devDependencies": {
-    "@types/node": "^13.7.0",
+    "@types/node": "^18.16.1",
     "babel-eslint": "^7.1.1",
     "babel-plugin-transform-object-assign": "^6.22.0",
     "babel-preset-es2015": "^6.24.0",
diff --git a/libs/remix-solidity/package.json b/libs/remix-solidity/package.json
index 534e460bcb..d451636a26 100644
--- a/libs/remix-solidity/package.json
+++ b/libs/remix-solidity/package.json
@@ -38,7 +38,7 @@
     "@babel/preset-es2015": "latest",
     "@babel/preset-es2017": "latest",
     "@babel/preset-stage-0": "^7.0.0",
-    "@types/node": "^13.1.1",
+    "@types/node": "^18.16.1",
     "babel-eslint": "^10.0.0",
     "babelify": "^10.0.0",
     "typescript": "^3.7.4"
diff --git a/libs/remix-tests/package.json b/libs/remix-tests/package.json
index 5811357553..49f1b5f967 100644
--- a/libs/remix-tests/package.json
+++ b/libs/remix-tests/package.json
@@ -71,7 +71,7 @@
     "@types/colors": "^1.2.1",
     "@types/commander": "^2.12.2",
     "@types/mocha": "^5.2.5",
-    "@types/node": "^10.12.21",
+    "@types/node": "^18.16.1",
     "@types/web3": "^1.0.18",
     "mocha": "^5.1.0",
     "ts-node": "^8.0.2",
diff --git a/libs/remix-url-resolver/package.json b/libs/remix-url-resolver/package.json
index d7089164a0..9c268116d4 100644
--- a/libs/remix-url-resolver/package.json
+++ b/libs/remix-url-resolver/package.json
@@ -31,7 +31,7 @@
   "devDependencies": {
     "@types/chai": "^4.1.7",
     "@types/mocha": "^5.2.5",
-    "@types/node": "^10.12.18",
+    "@types/node": "^18.16.1",
     "chai": "^4.2.0",
     "mocha": "^5.1.0",
     "remix-plugin": "0.0.1-alpha.2",
diff --git a/libs/remixd/package.json b/libs/remixd/package.json
index 0b5931460a..9a9cfdb30d 100644
--- a/libs/remixd/package.json
+++ b/libs/remixd/package.json
@@ -49,7 +49,7 @@
   "devDependencies": {
     "@types/axios": "^0.14.0",
     "@types/fs-extra": "^9.0.1",
-    "@types/node": "^14.0.5",
+    "@types/node": "^18.16.1",
     "@types/ws": "^7.2.4",
     "@typescript-eslint/eslint-plugin": "^3.2.0",
     "@typescript-eslint/parser": "^3.2.0",
diff --git a/package.json b/package.json
index d843e3b5f8..57b1101cc6 100644
--- a/package.json
+++ b/package.json
@@ -247,7 +247,7 @@
     "@types/isomorphic-git__lightning-fs": "^4.4.2",
     "@types/lodash": "^4.14.172",
     "@types/mocha": "^9.1.1",
-    "@types/node": "18.7.18",
+    "@types/node": "18.16.1",
     "@types/react": "^17.0.24",
     "@types/react-beautiful-dnd": "^13.1.2",
     "@types/react-dom": "^17.0.9",

From ad66759ba522654487a86f21ae9cf495e0ddbec6 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 11:33:22 +0200
Subject: [PATCH 03/41] optimize

---
 .circleci/config.yml                     | 4 ++--
 apps/remix-ide/ci/download_e2e_assets.js | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 654fa0658b..d29fec3eec 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -34,6 +34,7 @@ jobs:
               NX_BIN_URL=http://127.0.0.1:8080/assets/js NX_WASM_URL=http://127.0.0.1:8080/assets/js NPM_URL=http://localhost:9090/ yarn build
             fi
       - run: yarn run build:e2e
+      - run: yarn run downloadsolc_assets_e2e
       - run: mkdir persist && zip -0 -r persist/dist.zip dist
       - persist_to_workspace:
           root: .
@@ -155,7 +156,7 @@ jobs:
           at: .
       - run: unzip ./persist/dist.zip
       - run: yarn install --cwd ./apps/remix-ide-e2e --modules-folder ../../node_modules
-      - run: yarn run downloadsolc_assets_e2e
+
       - run: ls -la ./dist/apps/remix-ide/assets/js
       - run: yarn run selenium-install || yarn run selenium-install
       - run:
@@ -202,7 +203,6 @@ jobs:
       - run: unzip ./persist/dist.zip
       - run: unzip ./persist/plugin-<< parameters.plugin >>.zip
       - run: yarn install --cwd ./apps/remix-ide-e2e --modules-folder ../../node_modules
-      - run: yarn run downloadsolc_assets_e2e
       - run: yarn run selenium-install || yarn run selenium-install
       - run:
           name: Start Selenium
diff --git a/apps/remix-ide/ci/download_e2e_assets.js b/apps/remix-ide/ci/download_e2e_assets.js
index 11ff135020..392941536a 100644
--- a/apps/remix-ide/ci/download_e2e_assets.js
+++ b/apps/remix-ide/ci/download_e2e_assets.js
@@ -6,6 +6,7 @@ let url = 'https://binaries.soliditylang.org/wasm/list.json'
 const axios = require('axios')
 
 // use axios to download the file
+/*
 axios({
     url: url,
     method: 'GET',
@@ -38,16 +39,18 @@ axios({
     }
 }
 )
+*/
 
 fs.readdirSync(testFolder).forEach(file => {
     let c = fs.readFileSync(testFolder + file, 'utf8');
     const re = /(?<=soljson).*(?=(.js))/g;
     const soljson = c.match(re);
     if (soljson) {
+        console.log(soljson)
         for (let i = 0; i < soljson.length; i++) {
 
             const version = soljson[i];
-            if (version && version.indexOf('nightly') > -1) {
+            if (version) {
                 const url = `https://solc-bin.ethereum.org/bin/soljson${version}.js`;
                 console.log(url)
 

From 8937e7ccfc2b7d0c461f5650814ee22e6278b0bf Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 12:21:16 +0200
Subject: [PATCH 04/41] grep script

---
 apps/remix-ide/ci/download_e2e_assets.js | 51 +++++++++++++++++++++++-
 apps/remix-ide/webpack.config.js         |  2 +-
 2 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/apps/remix-ide/ci/download_e2e_assets.js b/apps/remix-ide/ci/download_e2e_assets.js
index 392941536a..edd73ba57a 100644
--- a/apps/remix-ide/ci/download_e2e_assets.js
+++ b/apps/remix-ide/ci/download_e2e_assets.js
@@ -1,9 +1,11 @@
 const testFolder = './apps/remix-ide-e2e/src/tests/';
 const fs = require('fs');
+var child_process = require('child_process');
 
 let url = 'https://binaries.soliditylang.org/wasm/list.json'
 
-const axios = require('axios')
+const axios = require('axios');
+const { exit } = require('process');
 
 // use axios to download the file
 /*
@@ -41,6 +43,51 @@ axios({
 )
 */
 
+
+
+var child = child_process.spawnSync('grep', ['-ir', '"\soljson-v0"', 'libs/*', 'apps/*'], { encoding: 'utf8', cwd: process.cwd(), shell: true });
+
+if (child.error) {
+    console.log("ERROR: ", child);
+    exit(1);
+}
+
+
+const re = /(?<=soljson).*(?=(.js))/g;
+const soljson = child.stdout.match(re);
+if (soljson) {
+    for (let i = 0; i < soljson.length; i++) {
+        const version = soljson[i];
+        if (version) {
+            let url = ''
+
+            url = `https://binaries.soliditylang.org/bin/soljson${version}.js`;
+            console.log(url)
+            const path = `./dist/apps/remix-ide/assets/js/soljson${version}.js`;
+            // use axios to get the file
+            try {
+                axios({
+                    method: 'get',
+                    url: url,
+                }).then(function (response) {
+                    fs.writeFile(path, response.data, function (err) {
+                        if (err) {
+                            console.log(err);
+                        }
+                    })
+                })
+            } catch (e) {
+                console.log('Failed to download soljson' + version + ' from ' + url)
+            }
+
+
+        }
+
+    }
+}
+
+/*
+
 fs.readdirSync(testFolder).forEach(file => {
     let c = fs.readFileSync(testFolder + file, 'utf8');
     const re = /(?<=soljson).*(?=(.js))/g;
@@ -78,3 +125,5 @@ fs.readdirSync(testFolder).forEach(file => {
     }
 
 });
+
+*/
diff --git a/apps/remix-ide/webpack.config.js b/apps/remix-ide/webpack.config.js
index a10a6a3e47..8006ff5591 100644
--- a/apps/remix-ide/webpack.config.js
+++ b/apps/remix-ide/webpack.config.js
@@ -23,7 +23,7 @@ const loadLocalSolJson = async () => {
     let info = response.data;
     info.builds = info.builds.filter(build => build.path.indexOf('nightly') === -1)
     info.builds = info.builds.slice(-1)
-    const buildurl = `https://solc-bin.ethereum.org/wasm/${info.builds[0].path}`;
+    const buildurl = `https://binaries.soliditylang.org/bin/${info.builds[0].path}`;
     console.log(`Copying... ${buildurl} to assets`)
     const path = `./apps/remix-ide/src/assets/js/soljson.js`;
     axios({

From 36fc7fd8409022c4df3c62b307e2f16994ca2e5f Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 12:26:00 +0200
Subject: [PATCH 05/41] md5sum

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d29fec3eec..0dc6f017fa 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -35,6 +35,7 @@ jobs:
             fi
       - run: yarn run build:e2e
       - run: yarn run downloadsolc_assets_e2e
+      - run: grep -ir "soljson-v0" apps/* libs/* | md5sum
       - run: mkdir persist && zip -0 -r persist/dist.zip dist
       - persist_to_workspace:
           root: .

From 5121ad2b8f29f55f827db07030d5a14788ebc6b7 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 12:30:03 +0200
Subject: [PATCH 06/41] fix lint

---
 apps/remix-ide/ci/download_e2e_assets.js | 93 ++----------------------
 1 file changed, 8 insertions(+), 85 deletions(-)

diff --git a/apps/remix-ide/ci/download_e2e_assets.js b/apps/remix-ide/ci/download_e2e_assets.js
index edd73ba57a..5cb6a3f8e4 100644
--- a/apps/remix-ide/ci/download_e2e_assets.js
+++ b/apps/remix-ide/ci/download_e2e_assets.js
@@ -1,50 +1,9 @@
-const testFolder = './apps/remix-ide-e2e/src/tests/';
+
 const fs = require('fs');
 var child_process = require('child_process');
-
-let url = 'https://binaries.soliditylang.org/wasm/list.json'
-
 const axios = require('axios');
 const { exit } = require('process');
 
-// use axios to download the file
-/*
-axios({
-    url: url,
-    method: 'GET',
-}).then((response) => {
-
-    let info = response.data;
-    info.builds = info.builds.filter(build => build.path.indexOf('nightly') === -1)
-    for (let build of info.builds) {
-
-        const buildurl = `https://solc-bin.ethereum.org/wasm/${build.path}`;
-        console.log(buildurl)
-
-        const path = `./dist/apps/remix-ide/assets/js/${build.path}`;
-        // use axios to get the file
-        try {
-            axios({
-                method: 'get',
-                url: buildurl,
-            }).then(function (response) {
-                fs.writeFile(path, response.data, function (err) {
-                    if (err) {
-                        console.log(err);
-                    }
-                })
-            })
-        } catch (e) {
-            console.log('Failed to download ' + build.path + ' from ' + buildurl)
-        }
-
-    }
-}
-)
-*/
-
-
-
 var child = child_process.spawnSync('grep', ['-ir', '"\soljson-v0"', 'libs/*', 'apps/*'], { encoding: 'utf8', cwd: process.cwd(), shell: true });
 
 if (child.error) {
@@ -62,46 +21,12 @@ if (soljson) {
             let url = ''
 
             url = `https://binaries.soliditylang.org/bin/soljson${version}.js`;
-            console.log(url)
-            const path = `./dist/apps/remix-ide/assets/js/soljson${version}.js`;
-            // use axios to get the file
-            try {
-                axios({
-                    method: 'get',
-                    url: url,
-                }).then(function (response) {
-                    fs.writeFile(path, response.data, function (err) {
-                        if (err) {
-                            console.log(err);
-                        }
-                    })
-                })
-            } catch (e) {
-                console.log('Failed to download soljson' + version + ' from ' + url)
-            }
 
-
-        }
-
-    }
-}
-
-/*
-
-fs.readdirSync(testFolder).forEach(file => {
-    let c = fs.readFileSync(testFolder + file, 'utf8');
-    const re = /(?<=soljson).*(?=(.js))/g;
-    const soljson = c.match(re);
-    if (soljson) {
-        console.log(soljson)
-        for (let i = 0; i < soljson.length; i++) {
-
-            const version = soljson[i];
-            if (version) {
-                const url = `https://solc-bin.ethereum.org/bin/soljson${version}.js`;
+            const path = `./dist/apps/remix-ide/assets/js/soljson${version}.js`;
+            // check if the file exists
+            const exists = fs.existsSync(path);
+            if (!exists) {
                 console.log(url)
-
-                const path = `./dist/apps/remix-ide/assets/js/soljson${version}.js`;
                 // use axios to get the file
                 try {
                     axios({
@@ -117,13 +42,11 @@ fs.readdirSync(testFolder).forEach(file => {
                 } catch (e) {
                     console.log('Failed to download soljson' + version + ' from ' + url)
                 }
-
-
             }
 
+
         }
-    }
 
-});
+    }
+}
 
-*/

From bcb329b8ddfadfdf6f17a5f415c352ec826b3137 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 12:32:54 +0200
Subject: [PATCH 07/41] restore cache

---
 .circleci/config.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0dc6f017fa..11a8fe3bcb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -24,7 +24,6 @@ jobs:
           key: v1-deps-{{ checksum "yarn.lock" }}
           paths:
             - node_modules
-
       - run:
           name: Build
           command: |
@@ -34,8 +33,13 @@ jobs:
               NX_BIN_URL=http://127.0.0.1:8080/assets/js NX_WASM_URL=http://127.0.0.1:8080/assets/js NPM_URL=http://localhost:9090/ yarn build
             fi
       - run: yarn run build:e2e
+      
+      - restore_cache:
+          keys:
+            - soljson-{{ grep -ir "soljson-v0" apps/* libs/* | md5sum }}
       - run: yarn run downloadsolc_assets_e2e
       - run: grep -ir "soljson-v0" apps/* libs/* | md5sum
+      
       - run: mkdir persist && zip -0 -r persist/dist.zip dist
       - persist_to_workspace:
           root: .

From f3adbe5721c8f45551af7ee8113aa1415b9b6fb2 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 12:38:26 +0200
Subject: [PATCH 08/41] use file

---
 .circleci/config.yml                     | 5 +++--
 apps/remix-ide/ci/download_e2e_assets.js | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 11a8fe3bcb..0aad9fd2ff 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -34,11 +34,12 @@ jobs:
             fi
       - run: yarn run build:e2e
       
+      - run: grep -ir "soljson-v0" apps/* libs/* > soljson-versions.txt
       - restore_cache:
           keys:
-            - soljson-{{ grep -ir "soljson-v0" apps/* libs/* | md5sum }}
+            - soljson-{{ checksum "soljson-versions.txt" }}
       - run: yarn run downloadsolc_assets_e2e
-      - run: grep -ir "soljson-v0" apps/* libs/* | md5sum
+
       
       - run: mkdir persist && zip -0 -r persist/dist.zip dist
       - persist_to_workspace:
diff --git a/apps/remix-ide/ci/download_e2e_assets.js b/apps/remix-ide/ci/download_e2e_assets.js
index 5cb6a3f8e4..5349db0358 100644
--- a/apps/remix-ide/ci/download_e2e_assets.js
+++ b/apps/remix-ide/ci/download_e2e_assets.js
@@ -4,7 +4,7 @@ var child_process = require('child_process');
 const axios = require('axios');
 const { exit } = require('process');
 
-var child = child_process.spawnSync('grep', ['-ir', '"\soljson-v0"', 'libs/*', 'apps/*'], { encoding: 'utf8', cwd: process.cwd(), shell: true });
+var child = child_process.spawnSync('grep', ['-ir', '"\soljson-v"', 'libs/*', 'apps/*'], { encoding: 'utf8', cwd: process.cwd(), shell: true });
 
 if (child.error) {
     console.log("ERROR: ", child);
@@ -29,6 +29,7 @@ if (soljson) {
                 console.log(url)
                 // use axios to get the file
                 try {
+                    /*
                     axios({
                         method: 'get',
                         url: url,
@@ -38,7 +39,7 @@ if (soljson) {
                                 console.log(err);
                             }
                         })
-                    })
+                    })*/
                 } catch (e) {
                     console.log('Failed to download soljson' + version + ' from ' + url)
                 }

From 7486f0c326f97198bdb36537372a5eb3abaf649a Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 12:55:59 +0200
Subject: [PATCH 09/41] use caching

---
 .circleci/config.yml                     | 10 +++++++---
 apps/remix-ide/.gitignore                |  2 +-
 apps/remix-ide/ci/download_e2e_assets.js | 15 ++++++++++-----
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0aad9fd2ff..c510866f33 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -28,9 +28,9 @@ jobs:
           name: Build
           command: |
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
-              NX_BIN_URL=http://127.0.0.1:8080/assets/js NX_WASM_URL=http://127.0.0.1:8080/assets/js NPM_URL=http://localhost:9090/ yarn build:production
+              NX_BIN_URL=http://127.0.0.1:8080/assets/js/soljson NX_WASM_URL=http://127.0.0.1:8080/assets/js/soljson NPM_URL=http://localhost:9090/ yarn build:production
             else
-              NX_BIN_URL=http://127.0.0.1:8080/assets/js NX_WASM_URL=http://127.0.0.1:8080/assets/js NPM_URL=http://localhost:9090/ yarn build
+              NX_BIN_URL=http://127.0.0.1:8080/assets/js/soljson NX_WASM_URL=http://127.0.0.1:8080/assets/js/soljson NPM_URL=http://localhost:9090/ yarn build
             fi
       - run: yarn run build:e2e
       
@@ -39,7 +39,11 @@ jobs:
           keys:
             - soljson-{{ checksum "soljson-versions.txt" }}
       - run: yarn run downloadsolc_assets_e2e
-
+      - save_cache:
+          keys:
+            - soljson-{{ checksum "soljson-versions.txt" }}
+          paths:
+            - dist/apps/remix-ide/assets/js/soljson
       
       - run: mkdir persist && zip -0 -r persist/dist.zip dist
       - persist_to_workspace:
diff --git a/apps/remix-ide/.gitignore b/apps/remix-ide/.gitignore
index cf8c2c0ad3..3e0c4b3136 100644
--- a/apps/remix-ide/.gitignore
+++ b/apps/remix-ide/.gitignore
@@ -13,4 +13,4 @@ TODO
 .tern-port
 temp_publish_docker
 src/assets/version.json
-src/assets/js/soljson-v*
\ No newline at end of file
+src/assets/js/soljson/soljson-v*
\ No newline at end of file
diff --git a/apps/remix-ide/ci/download_e2e_assets.js b/apps/remix-ide/ci/download_e2e_assets.js
index 5349db0358..996f76134a 100644
--- a/apps/remix-ide/ci/download_e2e_assets.js
+++ b/apps/remix-ide/ci/download_e2e_assets.js
@@ -4,7 +4,7 @@ var child_process = require('child_process');
 const axios = require('axios');
 const { exit } = require('process');
 
-var child = child_process.spawnSync('grep', ['-ir', '"\soljson-v"', 'libs/*', 'apps/*'], { encoding: 'utf8', cwd: process.cwd(), shell: true });
+var child = child_process.spawnSync('grep', ['-ir', '"\soljson-v0"', 'libs/*', 'apps/*'], { encoding: 'utf8', cwd: process.cwd(), shell: true });
 
 if (child.error) {
     console.log("ERROR: ", child);
@@ -22,14 +22,17 @@ if (soljson) {
 
             url = `https://binaries.soliditylang.org/bin/soljson${version}.js`;
 
-            const path = `./dist/apps/remix-ide/assets/js/soljson${version}.js`;
+            const dir = './dist/apps/remix-ide/assets/js/soljson';
+            if (!fs.existsSync(dir)) {
+                fs.mkdirSync(dir);
+            }
+
+            const path = `./dist/apps/remix-ide/assets/js/soljson/soljson${version}.js`;
             // check if the file exists
             const exists = fs.existsSync(path);
             if (!exists) {
                 console.log(url)
-                // use axios to get the file
                 try {
-                    /*
                     axios({
                         method: 'get',
                         url: url,
@@ -39,7 +42,9 @@ if (soljson) {
                                 console.log(err);
                             }
                         })
-                    })*/
+                    }).catch(function (error) {
+                        console.log(error);
+                    })
                 } catch (e) {
                     console.log('Failed to download soljson' + version + ' from ' + url)
                 }

From b3ca7be3bc2e68085ecaf6c92da5f1f5c3557565 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 12:56:54 +0200
Subject: [PATCH 10/41] fix config

---
 .circleci/config.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c510866f33..e8d71b17e6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -40,8 +40,7 @@ jobs:
             - soljson-{{ checksum "soljson-versions.txt" }}
       - run: yarn run downloadsolc_assets_e2e
       - save_cache:
-          keys:
-            - soljson-{{ checksum "soljson-versions.txt" }}
+          keys: soljson-{{ checksum "soljson-versions.txt" }}
           paths:
             - dist/apps/remix-ide/assets/js/soljson
       

From 5e0a2e2f9c4ce281d3fb2d8388837eb5fa2ad967 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 12:57:37 +0200
Subject: [PATCH 11/41] config

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e8d71b17e6..6353a2fae4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -40,7 +40,7 @@ jobs:
             - soljson-{{ checksum "soljson-versions.txt" }}
       - run: yarn run downloadsolc_assets_e2e
       - save_cache:
-          keys: soljson-{{ checksum "soljson-versions.txt" }}
+          key: soljson-{{ checksum "soljson-versions.txt" }}
           paths:
             - dist/apps/remix-ide/assets/js/soljson
       

From 7542885e51e9d08567690e60ac792038a92534b5 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 13:00:39 +0200
Subject: [PATCH 12/41] fix grep

---
 .circleci/config.yml                     | 2 +-
 apps/remix-ide/ci/download_e2e_assets.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6353a2fae4..0338a563bd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -34,7 +34,7 @@ jobs:
             fi
       - run: yarn run build:e2e
       
-      - run: grep -ir "soljson-v0" apps/* libs/* > soljson-versions.txt
+      - run: grep -ir "soljson-v[0-9]" apps/* libs/* > soljson-versions.txt
       - restore_cache:
           keys:
             - soljson-{{ checksum "soljson-versions.txt" }}
diff --git a/apps/remix-ide/ci/download_e2e_assets.js b/apps/remix-ide/ci/download_e2e_assets.js
index 996f76134a..736d31eb2b 100644
--- a/apps/remix-ide/ci/download_e2e_assets.js
+++ b/apps/remix-ide/ci/download_e2e_assets.js
@@ -4,7 +4,7 @@ var child_process = require('child_process');
 const axios = require('axios');
 const { exit } = require('process');
 
-var child = child_process.spawnSync('grep', ['-ir', '"\soljson-v0"', 'libs/*', 'apps/*'], { encoding: 'utf8', cwd: process.cwd(), shell: true });
+var child = child_process.spawnSync('grep', ['-ir', '"\soljson-v[0-9]"', 'libs/*', 'apps/*'], { encoding: 'utf8', cwd: process.cwd(), shell: true });
 
 if (child.error) {
     console.log("ERROR: ", child);

From d5a73c7d4fe8066874e53677dfa2df7e93ed5ffd Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 13:05:42 +0200
Subject: [PATCH 13/41] fix lint

---
 apps/remix-ide/ci/download_e2e_assets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/remix-ide/ci/download_e2e_assets.js b/apps/remix-ide/ci/download_e2e_assets.js
index 736d31eb2b..eb9413fb5d 100644
--- a/apps/remix-ide/ci/download_e2e_assets.js
+++ b/apps/remix-ide/ci/download_e2e_assets.js
@@ -4,7 +4,7 @@ var child_process = require('child_process');
 const axios = require('axios');
 const { exit } = require('process');
 
-var child = child_process.spawnSync('grep', ['-ir', '"\soljson-v[0-9]"', 'libs/*', 'apps/*'], { encoding: 'utf8', cwd: process.cwd(), shell: true });
+var child = child_process.spawnSync('grep', ['-ir', '"soljson-v[0-9]"', 'libs/*', 'apps/*'], { encoding: 'utf8', cwd: process.cwd(), shell: true });
 
 if (child.error) {
     console.log("ERROR: ", child);

From 3bd34b57e4178434accc4eadef96300d9899c698 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 13:27:17 +0200
Subject: [PATCH 14/41] nightly

---
 apps/remix-ide/ci/download_e2e_assets.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/remix-ide/ci/download_e2e_assets.js b/apps/remix-ide/ci/download_e2e_assets.js
index eb9413fb5d..7d6a848fd5 100644
--- a/apps/remix-ide/ci/download_e2e_assets.js
+++ b/apps/remix-ide/ci/download_e2e_assets.js
@@ -20,7 +20,12 @@ if (soljson) {
         if (version) {
             let url = ''
 
-            url = `https://binaries.soliditylang.org/bin/soljson${version}.js`;
+            // if nightly
+            if (version.includes('nightly')) {
+                url = `https://binaries.soliditylang.org/bin/soljson${version}.js`;
+            }else{
+                url = `https://binaries.soliditylang.org/wasm/soljson${version}.js`;
+            }
 
             const dir = './dist/apps/remix-ide/assets/js/soljson';
             if (!fs.existsSync(dir)) {

From 37b53167e5c9bac7ffdf23e6299a4eb34e43da26 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 14:50:39 +0200
Subject: [PATCH 15/41] catch webpack

---
 apps/remix-ide/webpack.config.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/apps/remix-ide/webpack.config.js b/apps/remix-ide/webpack.config.js
index 8006ff5591..ff9a21e9d2 100644
--- a/apps/remix-ide/webpack.config.js
+++ b/apps/remix-ide/webpack.config.js
@@ -23,18 +23,22 @@ const loadLocalSolJson = async () => {
     let info = response.data;
     info.builds = info.builds.filter(build => build.path.indexOf('nightly') === -1)
     info.builds = info.builds.slice(-1)
-    const buildurl = `https://binaries.soliditylang.org/bin/${info.builds[0].path}`;
+    const buildurl = `https://binaries.soliditylang.org/bin/${info.builds[0].path}`
     console.log(`Copying... ${buildurl} to assets`)
     const path = `./apps/remix-ide/src/assets/js/soljson.js`;
     axios({
       method: 'get',
       url: buildurl,
       responseType: 'stream'
-    }).then(function (response) {
+    }).then((response) => {
       response.data.pipe(fs.createWriteStream(path));
+    }).catch((error) => {
+      console.log(error.message)
     })
   }
-  )
+  ).catch((error) => {
+    console.log(error.message)
+  })
 }
 
 fs.writeFileSync('./apps/remix-ide/src/assets/version.json', JSON.stringify(versionData))

From 0e366092880efd8f2b4e509d2abc33a288c2cf9a Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 15:17:59 +0200
Subject: [PATCH 16/41] url curl

---
 apps/remix-ide/ci/download_e2e_assets.js | 15 ++------------
 apps/remix-ide/ci/downloadsoljson.sh     | 19 +++++++++++++++++
 apps/remix-ide/webpack.config.js         | 26 ++----------------------
 3 files changed, 23 insertions(+), 37 deletions(-)
 create mode 100644 apps/remix-ide/ci/downloadsoljson.sh

diff --git a/apps/remix-ide/ci/download_e2e_assets.js b/apps/remix-ide/ci/download_e2e_assets.js
index 7d6a848fd5..5a22043201 100644
--- a/apps/remix-ide/ci/download_e2e_assets.js
+++ b/apps/remix-ide/ci/download_e2e_assets.js
@@ -1,7 +1,6 @@
 
 const fs = require('fs');
 var child_process = require('child_process');
-const axios = require('axios');
 const { exit } = require('process');
 
 var child = child_process.spawnSync('grep', ['-ir', '"soljson-v[0-9]"', 'libs/*', 'apps/*'], { encoding: 'utf8', cwd: process.cwd(), shell: true });
@@ -38,18 +37,8 @@ if (soljson) {
             if (!exists) {
                 console.log(url)
                 try {
-                    axios({
-                        method: 'get',
-                        url: url,
-                    }).then(function (response) {
-                        fs.writeFile(path, response.data, function (err) {
-                            if (err) {
-                                console.log(err);
-                            }
-                        })
-                    }).catch(function (error) {
-                        console.log(error);
-                    })
+                    // use curl to download the file
+                    child_process.exec(`curl -o ${path} ${url}`, { encoding: 'utf8', cwd: process.cwd(), shell: true })
                 } catch (e) {
                     console.log('Failed to download soljson' + version + ' from ' + url)
                 }
diff --git a/apps/remix-ide/ci/downloadsoljson.sh b/apps/remix-ide/ci/downloadsoljson.sh
new file mode 100644
index 0000000000..9d2562e08c
--- /dev/null
+++ b/apps/remix-ide/ci/downloadsoljson.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+set -e
+
+# download https://binaries.soliditylang.org/wasm/list.json as json
+curl https://binaries.soliditylang.org/wasm/list.json > list.json
+# get the latest version
+version=$(cat list.json | jq -r '.latestRelease')
+echo $version
+# the value of releases with key $version
+url=$(cat list.json | npx jq -r '.releases[]' | grep $version)
+echo $url
+# set path to the url
+path="https://binaries.soliditylang.org/bin/$url"
+echo $path
+# download the file to ./apps/remix-ide/src/assets/js/soljson.js
+curl $path > ./apps/remix-ide/src/assets/js/soljson.js
+# remove list.json
+rm list.json
diff --git a/apps/remix-ide/webpack.config.js b/apps/remix-ide/webpack.config.js
index ff9a21e9d2..3191b1d886 100644
--- a/apps/remix-ide/webpack.config.js
+++ b/apps/remix-ide/webpack.config.js
@@ -15,30 +15,8 @@ const versionData = {
 }
 
 const loadLocalSolJson = async () => {
-  let url = 'https://binaries.soliditylang.org/wasm/list.json'
-  axios({
-    url: url,
-    method: 'GET',
-  }).then((response) => {
-    let info = response.data;
-    info.builds = info.builds.filter(build => build.path.indexOf('nightly') === -1)
-    info.builds = info.builds.slice(-1)
-    const buildurl = `https://binaries.soliditylang.org/bin/${info.builds[0].path}`
-    console.log(`Copying... ${buildurl} to assets`)
-    const path = `./apps/remix-ide/src/assets/js/soljson.js`;
-    axios({
-      method: 'get',
-      url: buildurl,
-      responseType: 'stream'
-    }).then((response) => {
-      response.data.pipe(fs.createWriteStream(path));
-    }).catch((error) => {
-      console.log(error.message)
-    })
-  }
-  ).catch((error) => {
-    console.log(error.message)
-  })
+  // execute apps/remix-ide/ci/downloadsoljson.sh
+  const child = require('child_process').execSync('bash ./apps/remix-ide/ci/downloadsoljson.sh', { encoding: 'utf8', cwd: process.cwd(), shell: true })
 }
 
 fs.writeFileSync('./apps/remix-ide/src/assets/version.json', JSON.stringify(versionData))

From ad5b1da177677912280e990513ff6bca0784a4d8 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 15:18:47 +0200
Subject: [PATCH 17/41] check curl

---
 apps/remix-ide/ci/downloadsoljson.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/remix-ide/ci/downloadsoljson.sh b/apps/remix-ide/ci/downloadsoljson.sh
index 9d2562e08c..114bfea7d3 100644
--- a/apps/remix-ide/ci/downloadsoljson.sh
+++ b/apps/remix-ide/ci/downloadsoljson.sh
@@ -1,6 +1,12 @@
 #!/usr/bin/env bash
 
 set -e
+# check if curl is installed
+if ! command -v curl &> /dev/null
+then
+    echo "curl could not be found"
+    exit
+fi
 
 # download https://binaries.soliditylang.org/wasm/list.json as json
 curl https://binaries.soliditylang.org/wasm/list.json > list.json

From bb10f730848b22fb4d41eacf73694db086b4bba5 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 15:36:12 +0200
Subject: [PATCH 18/41] use plus

---
 apps/remix-ide/ci/downloadsoljson.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/remix-ide/ci/downloadsoljson.sh b/apps/remix-ide/ci/downloadsoljson.sh
index 114bfea7d3..7e6ff6fb16 100644
--- a/apps/remix-ide/ci/downloadsoljson.sh
+++ b/apps/remix-ide/ci/downloadsoljson.sh
@@ -14,7 +14,7 @@ curl https://binaries.soliditylang.org/wasm/list.json > list.json
 version=$(cat list.json | jq -r '.latestRelease')
 echo $version
 # the value of releases with key $version
-url=$(cat list.json | npx jq -r '.releases[]' | grep $version)
+url=$(cat list.json | npx jq -r '.releases[]' | grep "$version+")
 echo $url
 # set path to the url
 path="https://binaries.soliditylang.org/bin/$url"

From dca07d4ad13729562b0156cb3eda8e59ff1e6672 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 15:38:41 +0200
Subject: [PATCH 19/41] install jq

---
 apps/remix-ide/ci/downloadsoljson.sh | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/apps/remix-ide/ci/downloadsoljson.sh b/apps/remix-ide/ci/downloadsoljson.sh
index 7e6ff6fb16..6f7f10b081 100644
--- a/apps/remix-ide/ci/downloadsoljson.sh
+++ b/apps/remix-ide/ci/downloadsoljson.sh
@@ -8,13 +8,26 @@ then
     exit
 fi
 
+# install jq if not installed
+if ! command -v jq &> /dev/null
+then
+    echo "jq could not be found"
+    echo "installing jq"
+    sudo apt-get install jq
+fi
+if ! command -v jq &> /dev/null
+then
+    echo "jq could not be found"
+    exit
+fi
+
 # download https://binaries.soliditylang.org/wasm/list.json as json
 curl https://binaries.soliditylang.org/wasm/list.json > list.json
 # get the latest version
 version=$(cat list.json | jq -r '.latestRelease')
 echo $version
 # the value of releases with key $version
-url=$(cat list.json | npx jq -r '.releases[]' | grep "$version+")
+url=$(cat list.json | jq -r '.releases[]' | grep "$version+")
 echo $url
 # set path to the url
 path="https://binaries.soliditylang.org/bin/$url"

From 101b189c1250e8daaf7893c3a0f8fe12ae882a8f Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 15:41:16 +0200
Subject: [PATCH 20/41] use npx

---
 apps/remix-ide/ci/downloadsoljson.sh | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/apps/remix-ide/ci/downloadsoljson.sh b/apps/remix-ide/ci/downloadsoljson.sh
index 6f7f10b081..e3598e90bc 100644
--- a/apps/remix-ide/ci/downloadsoljson.sh
+++ b/apps/remix-ide/ci/downloadsoljson.sh
@@ -8,26 +8,14 @@ then
     exit
 fi
 
-# install jq if not installed
-if ! command -v jq &> /dev/null
-then
-    echo "jq could not be found"
-    echo "installing jq"
-    sudo apt-get install jq
-fi
-if ! command -v jq &> /dev/null
-then
-    echo "jq could not be found"
-    exit
-fi
 
 # download https://binaries.soliditylang.org/wasm/list.json as json
 curl https://binaries.soliditylang.org/wasm/list.json > list.json
 # get the latest version
-version=$(cat list.json | jq -r '.latestRelease')
+version=$(cat list.json | npx jq -r '.latestRelease')
 echo $version
 # the value of releases with key $version
-url=$(cat list.json | jq -r '.releases[]' | grep "$version+")
+url=$(cat list.json | npx jq -r '.releases[]' | grep "$version+")
 echo $url
 # set path to the url
 path="https://binaries.soliditylang.org/bin/$url"

From bb3d72665f47119e0707f10d8d44e0ccee521654 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 15:51:52 +0200
Subject: [PATCH 21/41] do not use jq

---
 apps/remix-ide/ci/downloadsoljson.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/remix-ide/ci/downloadsoljson.sh b/apps/remix-ide/ci/downloadsoljson.sh
index e3598e90bc..5a0d786bf1 100644
--- a/apps/remix-ide/ci/downloadsoljson.sh
+++ b/apps/remix-ide/ci/downloadsoljson.sh
@@ -11,16 +11,16 @@ fi
 
 # download https://binaries.soliditylang.org/wasm/list.json as json
 curl https://binaries.soliditylang.org/wasm/list.json > list.json
-# get the latest version
-version=$(cat list.json | npx jq -r '.latestRelease')
-echo $version
-# the value of releases with key $version
-url=$(cat list.json | npx jq -r '.releases[]' | grep "$version+")
-echo $url
-# set path to the url
+# get the latest version without jq
+latest=$(grep 'latestRelease' list.json | cut -d '"' -f 4)
+echo "latest version: $latest"
+# get url 
+url=$(grep "\"$latest\":" list.json | cut -d '"' -f 4)
+echo "url: $url"
 path="https://binaries.soliditylang.org/bin/$url"
-echo $path
+echo "path: $path"
 # download the file to ./apps/remix-ide/src/assets/js/soljson.js
 curl $path > ./apps/remix-ide/src/assets/js/soljson.js
 # remove list.json
 rm list.json
+

From 7225581809e094cd4447961b0f9b6a2150ae6bc7 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 15:58:11 +0200
Subject: [PATCH 22/41] rename cache

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0338a563bd..8cc64a3831 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -37,10 +37,10 @@ jobs:
       - run: grep -ir "soljson-v[0-9]" apps/* libs/* > soljson-versions.txt
       - restore_cache:
           keys:
-            - soljson-{{ checksum "soljson-versions.txt" }}
+            - soljson-cache-{{ checksum "soljson-versions.txt" }}
       - run: yarn run downloadsolc_assets_e2e
       - save_cache:
-          key: soljson-{{ checksum "soljson-versions.txt" }}
+          key: soljson-cache-{{ checksum "soljson-versions.txt" }}
           paths:
             - dist/apps/remix-ide/assets/js/soljson
       

From fcdc1e78814358e2fe43b5582e2ea906e447de78 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 16:07:17 +0200
Subject: [PATCH 23/41] filter duplicates

---
 apps/remix-ide/ci/download_e2e_assets.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/remix-ide/ci/download_e2e_assets.js b/apps/remix-ide/ci/download_e2e_assets.js
index 5a22043201..2f383c8e90 100644
--- a/apps/remix-ide/ci/download_e2e_assets.js
+++ b/apps/remix-ide/ci/download_e2e_assets.js
@@ -12,8 +12,11 @@ if (child.error) {
 
 
 const re = /(?<=soljson).*(?=(.js))/g;
-const soljson = child.stdout.match(re);
+let soljson = child.stdout.match(re);
 if (soljson) {
+    // filter out duplicates
+    soljson = soljson.filter((item, index) => soljson.indexOf(item) === index);
+    console.log('soljson versions found: ', soljson);
     for (let i = 0; i < soljson.length; i++) {
         const version = soljson[i];
         if (version) {
@@ -35,7 +38,7 @@ if (soljson) {
             // check if the file exists
             const exists = fs.existsSync(path);
             if (!exists) {
-                console.log(url)
+                console.log('URL:', url)
                 try {
                     // use curl to download the file
                     child_process.exec(`curl -o ${path} ${url}`, { encoding: 'utf8', cwd: process.cwd(), shell: true })

From 135bd16d6d7730bcd54a45a926c8680b512be60d Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 16:46:50 +0200
Subject: [PATCH 24/41] manual versions

---
 .circleci/config.yml                     |  2 +-
 apps/remix-ide/ci/download_e2e_assets.js | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8cc64a3831..3a41eadf9b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -34,7 +34,7 @@ jobs:
             fi
       - run: yarn run build:e2e
       
-      - run: grep -ir "soljson-v[0-9]" apps/* libs/* > soljson-versions.txt
+      - run: grep -ir "[0-9]+commit" apps/* libs/* --include \*.ts > soljson-versions.txt
       - restore_cache:
           keys:
             - soljson-cache-{{ checksum "soljson-versions.txt" }}
diff --git a/apps/remix-ide/ci/download_e2e_assets.js b/apps/remix-ide/ci/download_e2e_assets.js
index 2f383c8e90..3ab69ffb34 100644
--- a/apps/remix-ide/ci/download_e2e_assets.js
+++ b/apps/remix-ide/ci/download_e2e_assets.js
@@ -3,7 +3,7 @@ const fs = require('fs');
 var child_process = require('child_process');
 const { exit } = require('process');
 
-var child = child_process.spawnSync('grep', ['-ir', '"soljson-v[0-9]"', 'libs/*', 'apps/*'], { encoding: 'utf8', cwd: process.cwd(), shell: true });
+var child = child_process.spawnSync('grep', ['-ir', '[0-9]+commit', 'libs/**/*', 'apps/**/*', '--include', '\*.ts'], { encoding: 'utf8', cwd: process.cwd(), shell: true });
 
 if (child.error) {
     console.log("ERROR: ", child);
@@ -17,6 +17,11 @@ if (soljson) {
     // filter out duplicates
     soljson = soljson.filter((item, index) => soljson.indexOf(item) === index);
     console.log('soljson versions found: ', soljson);
+
+    // manually add some versions
+    soljson.push('soljson-v0.6.8+commit.0bbfe453.js');
+    soljson.push('soljson-v0.6.0+commit.26b70077.js');
+    
     for (let i = 0; i < soljson.length; i++) {
         const version = soljson[i];
         if (version) {
@@ -49,7 +54,8 @@ if (soljson) {
 
 
         }
+       
+    } 
 
-    }
 }
 

From f0b03eb4f47b02c80b7165e3104a1d984e9934cf Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 17:02:22 +0200
Subject: [PATCH 25/41] fix manual

---
 apps/remix-ide/ci/download_e2e_assets.js | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/apps/remix-ide/ci/download_e2e_assets.js b/apps/remix-ide/ci/download_e2e_assets.js
index 3ab69ffb34..f92803b9e4 100644
--- a/apps/remix-ide/ci/download_e2e_assets.js
+++ b/apps/remix-ide/ci/download_e2e_assets.js
@@ -10,6 +10,25 @@ if (child.error) {
     exit(1);
 }
 
+// find words between single quotes starting with a number
+const re2 = /(?<=\').*(?=\')/g;
+let versions = child.stdout.match(re2);
+console.log('versions found: ', versions);
+
+// get all words in versions
+const re3 = /(?<=v).*/g;
+let  version2 = []
+for (let i = 0; i < versions.length; i++) {
+    const version = versions[i];
+    if (version) {
+        const v = version.match(re3);
+        if (v) {
+            version2.push(v[0]);
+        }
+    }
+}
+console.log('versions found: ', version2);
+
 
 const re = /(?<=soljson).*(?=(.js))/g;
 let soljson = child.stdout.match(re);
@@ -19,8 +38,8 @@ if (soljson) {
     console.log('soljson versions found: ', soljson);
 
     // manually add some versions
-    soljson.push('soljson-v0.6.8+commit.0bbfe453.js');
-    soljson.push('soljson-v0.6.0+commit.26b70077.js');
+    soljson.push('-v0.6.8+commit.0bbfe453.js');
+    soljson.push('-v0.6.0+commit.26b70077.js');
     
     for (let i = 0; i < soljson.length; i++) {
         const version = soljson[i];

From fdf52250e49d28a19332c8d95692b4fe79699615 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 17:03:12 +0200
Subject: [PATCH 26/41] v3

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3a41eadf9b..75fbb11323 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -37,10 +37,10 @@ jobs:
       - run: grep -ir "[0-9]+commit" apps/* libs/* --include \*.ts > soljson-versions.txt
       - restore_cache:
           keys:
-            - soljson-cache-{{ checksum "soljson-versions.txt" }}
+            - soljson-v3-{{ checksum "soljson-versions.txt" }}
       - run: yarn run downloadsolc_assets_e2e
       - save_cache:
-          key: soljson-cache-{{ checksum "soljson-versions.txt" }}
+          key: soljson-v3-{{ checksum "soljson-versions.txt" }}
           paths:
             - dist/apps/remix-ide/assets/js/soljson
       

From f5e46488ec2f2086869c458b26180c2e7d47bc16 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 17:20:20 +0200
Subject: [PATCH 27/41] 8.18

---
 apps/remix-ide/ci/download_e2e_assets.js | 29 ++++++++----------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/apps/remix-ide/ci/download_e2e_assets.js b/apps/remix-ide/ci/download_e2e_assets.js
index f92803b9e4..ffc39956e9 100644
--- a/apps/remix-ide/ci/download_e2e_assets.js
+++ b/apps/remix-ide/ci/download_e2e_assets.js
@@ -10,31 +10,22 @@ if (child.error) {
     exit(1);
 }
 
-// find words between single quotes starting with a number
-const re2 = /(?<=\').*(?=\')/g;
-let versions = child.stdout.match(re2);
-console.log('versions found: ', versions);
-
-// get all words in versions
-const re3 = /(?<=v).*/g;
-let  version2 = []
-for (let i = 0; i < versions.length; i++) {
-    const version = versions[i];
-    if (version) {
-        const v = version.match(re3);
-        if (v) {
-            version2.push(v[0]);
-        }
-    }
-}
-console.log('versions found: ', version2);
+console.log('stdout here: \n' + child.stdout)
 
 
 const re = /(?<=soljson).*(?=(.js))/g;
 let soljson = child.stdout.match(re);
+
+const re2 = /(?<=soljson).*(?=(\'))/g;
+let soljson2 = child.stdout.match(re2);
+soljson2 = soljson2.filter((item, index) => !item.includes('.js'));
+
+// merge the two arrays
+soljson = soljson.concat(soljson2);
+
 if (soljson) {
     // filter out duplicates
-    soljson = soljson.filter((item, index) => soljson.indexOf(item) === index);
+    //soljson = soljson.filter((item, index) => soljson.indexOf(item) === index);
     console.log('soljson versions found: ', soljson);
 
     // manually add some versions

From 54313137040c7508b48107ec24abb65849b587ad Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 17:32:27 +0200
Subject: [PATCH 28/41] fix urls

---
 .circleci/config.yml                     |  4 ++--
 apps/remix-ide/ci/download_e2e_assets.js | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 75fbb11323..e1b341b551 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -37,10 +37,10 @@ jobs:
       - run: grep -ir "[0-9]+commit" apps/* libs/* --include \*.ts > soljson-versions.txt
       - restore_cache:
           keys:
-            - soljson-v3-{{ checksum "soljson-versions.txt" }}
+            - soljson-v4-{{ checksum "soljson-versions.txt" }}
       - run: yarn run downloadsolc_assets_e2e
       - save_cache:
-          key: soljson-v3-{{ checksum "soljson-versions.txt" }}
+          key: soljson-v4-{{ checksum "soljson-versions.txt" }}
           paths:
             - dist/apps/remix-ide/assets/js/soljson
       
diff --git a/apps/remix-ide/ci/download_e2e_assets.js b/apps/remix-ide/ci/download_e2e_assets.js
index ffc39956e9..8fe2dc41ac 100644
--- a/apps/remix-ide/ci/download_e2e_assets.js
+++ b/apps/remix-ide/ci/download_e2e_assets.js
@@ -10,8 +10,6 @@ if (child.error) {
     exit(1);
 }
 
-console.log('stdout here: \n' + child.stdout)
-
 
 const re = /(?<=soljson).*(?=(.js))/g;
 let soljson = child.stdout.match(re);
@@ -26,11 +24,13 @@ soljson = soljson.concat(soljson2);
 if (soljson) {
     // filter out duplicates
     //soljson = soljson.filter((item, index) => soljson.indexOf(item) === index);
-    console.log('soljson versions found: ', soljson);
+
 
     // manually add some versions
-    soljson.push('-v0.6.8+commit.0bbfe453.js');
-    soljson.push('-v0.6.0+commit.26b70077.js');
+    soljson.push('-v0.6.8+commit.0bbfe453');
+    soljson.push('-v0.6.0+commit.26b70077');
+
+    console.log('soljson versions found: ', soljson);
     
     for (let i = 0; i < soljson.length; i++) {
         const version = soljson[i];

From 94bc2009dc0dfd1665041b86d4013ab6ce4b55cc Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 17:42:29 +0200
Subject: [PATCH 29/41] 7.6

---
 apps/remix-ide/ci/download_e2e_assets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/remix-ide/ci/download_e2e_assets.js b/apps/remix-ide/ci/download_e2e_assets.js
index 8fe2dc41ac..3d42cd274a 100644
--- a/apps/remix-ide/ci/download_e2e_assets.js
+++ b/apps/remix-ide/ci/download_e2e_assets.js
@@ -10,7 +10,6 @@ if (child.error) {
     exit(1);
 }
 
-
 const re = /(?<=soljson).*(?=(.js))/g;
 let soljson = child.stdout.match(re);
 
@@ -29,6 +28,7 @@ if (soljson) {
     // manually add some versions
     soljson.push('-v0.6.8+commit.0bbfe453');
     soljson.push('-v0.6.0+commit.26b70077');
+    soljson.push('-v0.7.6+commit.7338295f');
 
     console.log('soljson versions found: ', soljson);
     

From 52befdd34ad69c2852dde42dda0a82fd002d88f4 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 18:10:16 +0200
Subject: [PATCH 30/41] fix regex

---
 .circleci/config.yml                     |  4 +--
 apps/remix-ide/ci/download_e2e_assets.js | 36 +++++++++++++++---------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e1b341b551..78ee7b3a95 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -37,10 +37,10 @@ jobs:
       - run: grep -ir "[0-9]+commit" apps/* libs/* --include \*.ts > soljson-versions.txt
       - restore_cache:
           keys:
-            - soljson-v4-{{ checksum "soljson-versions.txt" }}
+            - soljson-v5-{{ checksum "soljson-versions.txt" }}
       - run: yarn run downloadsolc_assets_e2e
       - save_cache:
-          key: soljson-v4-{{ checksum "soljson-versions.txt" }}
+          key: soljson-v5-{{ checksum "soljson-versions.txt" }}
           paths:
             - dist/apps/remix-ide/assets/js/soljson
       
diff --git a/apps/remix-ide/ci/download_e2e_assets.js b/apps/remix-ide/ci/download_e2e_assets.js
index 3d42cd274a..8b44014669 100644
--- a/apps/remix-ide/ci/download_e2e_assets.js
+++ b/apps/remix-ide/ci/download_e2e_assets.js
@@ -10,25 +10,35 @@ if (child.error) {
     exit(1);
 }
 
-const re = /(?<=soljson).*(?=(.js))/g;
-let soljson = child.stdout.match(re);
+const nonnightlyre = /v\d*\.\d*\.\d*\+commit\.[\d\w]*/g;
 
-const re2 = /(?<=soljson).*(?=(\'))/g;
-let soljson2 = child.stdout.match(re2);
-soljson2 = soljson2.filter((item, index) => !item.includes('.js'));
+let soljson = child.stdout.match(nonnightlyre);
+console.log('non nightly soljson versions found: ', soljson);
 
-// merge the two arrays
+const quotedversionre = /\'\d*\.\d*\.\d*\+commit\.[\d\w]*/g;
+let soljson2 = child.stdout.match(quotedversionre).map((item) => item.replace('\'', 'v'));
+console.log('quoted soljson versions found: ', soljson2);
+
+const nightlyversions = /\d*\.\d*\.\d-nightly.*\+commit\.[\d\w]*/g
+let soljson3 = child.stdout.match(nightlyversions).map((item) => 'v' + item);
+console.log('nightly soljson versions found: ', soljson3);
+
+// merge the three arrays
 soljson = soljson.concat(soljson2);
+soljson = soljson.concat(soljson3);
+
+console.log('soljson versions found: ', soljson);
+
+
 
 if (soljson) {
     // filter out duplicates
-    //soljson = soljson.filter((item, index) => soljson.indexOf(item) === index);
+    soljson = soljson.filter((item, index) => soljson.indexOf(item) === index);
 
 
     // manually add some versions
-    soljson.push('-v0.6.8+commit.0bbfe453');
-    soljson.push('-v0.6.0+commit.26b70077');
-    soljson.push('-v0.7.6+commit.7338295f');
+
+    soljson.push('v0.7.6+commit.7338295f');
 
     console.log('soljson versions found: ', soljson);
     
@@ -39,9 +49,9 @@ if (soljson) {
 
             // if nightly
             if (version.includes('nightly')) {
-                url = `https://binaries.soliditylang.org/bin/soljson${version}.js`;
+                url = `https://binaries.soliditylang.org/bin/soljson-${version}.js`;
             }else{
-                url = `https://binaries.soliditylang.org/wasm/soljson${version}.js`;
+                url = `https://binaries.soliditylang.org/wasm/soljson-${version}.js`;
             }
 
             const dir = './dist/apps/remix-ide/assets/js/soljson';
@@ -49,7 +59,7 @@ if (soljson) {
                 fs.mkdirSync(dir);
             }
 
-            const path = `./dist/apps/remix-ide/assets/js/soljson/soljson${version}.js`;
+            const path = `./dist/apps/remix-ide/assets/js/soljson/soljson-${version}.js`;
             // check if the file exists
             const exists = fs.existsSync(path);
             if (!exists) {

From 29bcebd53c764bd24b038c7d32510f5be9f34fae Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 18:24:55 +0200
Subject: [PATCH 31/41] fix latest

---
 apps/remix-ide/ci/download_e2e_assets.js | 5 ++---
 apps/remix-ide/ci/downloadsoljson.sh     | 6 ++++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/apps/remix-ide/ci/download_e2e_assets.js b/apps/remix-ide/ci/download_e2e_assets.js
index 8b44014669..027165fcdb 100644
--- a/apps/remix-ide/ci/download_e2e_assets.js
+++ b/apps/remix-ide/ci/download_e2e_assets.js
@@ -1,9 +1,8 @@
-
 const fs = require('fs');
 var child_process = require('child_process');
 const { exit } = require('process');
 
-var child = child_process.spawnSync('grep', ['-ir', '[0-9]+commit', 'libs/**/*', 'apps/**/*', '--include', '\*.ts'], { encoding: 'utf8', cwd: process.cwd(), shell: true });
+var child = child_process.spawnSync('grep', ['-ir', '[0-9]+commit', 'libs/**/*', 'apps/**/*', '--include', '*.ts'], { encoding: 'utf8', cwd: process.cwd(), shell: true });
 
 if (child.error) {
     console.log("ERROR: ", child);
@@ -15,7 +14,7 @@ const nonnightlyre = /v\d*\.\d*\.\d*\+commit\.[\d\w]*/g;
 let soljson = child.stdout.match(nonnightlyre);
 console.log('non nightly soljson versions found: ', soljson);
 
-const quotedversionre = /\'\d*\.\d*\.\d*\+commit\.[\d\w]*/g;
+const quotedversionre = /'\d*\.\d*\.\d*\+commit\.[\d\w]*/g;
 let soljson2 = child.stdout.match(quotedversionre).map((item) => item.replace('\'', 'v'));
 console.log('quoted soljson versions found: ', soljson2);
 
diff --git a/apps/remix-ide/ci/downloadsoljson.sh b/apps/remix-ide/ci/downloadsoljson.sh
index 5a0d786bf1..5fdbfddf39 100644
--- a/apps/remix-ide/ci/downloadsoljson.sh
+++ b/apps/remix-ide/ci/downloadsoljson.sh
@@ -21,6 +21,12 @@ path="https://binaries.soliditylang.org/bin/$url"
 echo "path: $path"
 # download the file to ./apps/remix-ide/src/assets/js/soljson.js
 curl $path > ./apps/remix-ide/src/assets/js/soljson.js
+# if directory ./apps/remix-ide/src/assets/js/soljson does not exist, create it
+if [ ! -d "./apps/remix-ide/src/assets/js/soljson" ]; then
+    mkdir ./apps/remix-ide/src/assets/js/soljson
+fi
+cp ./apps/remix-ide/src/assets/js/soljson.js ./apps/remix-ide/src/assets/js/soljson/$url
+
 # remove list.json
 rm list.json
 

From 5c3d606c6ede9d6b9408fa8fbefc1c9d661b141d Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 18:41:10 +0200
Subject: [PATCH 32/41] remixd

---
 apps/remix-ide/ci/download_e2e_assets.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/remix-ide/ci/download_e2e_assets.js b/apps/remix-ide/ci/download_e2e_assets.js
index 027165fcdb..1851e25abe 100644
--- a/apps/remix-ide/ci/download_e2e_assets.js
+++ b/apps/remix-ide/ci/download_e2e_assets.js
@@ -38,6 +38,7 @@ if (soljson) {
     // manually add some versions
 
     soljson.push('v0.7.6+commit.7338295f');
+    soljson.push('v0.5.17+commit.d19bba13');
 
     console.log('soljson versions found: ', soljson);
     

From 17d56226ae5f181c966e03cff59fdecd4571ca7c Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 18:43:56 +0200
Subject: [PATCH 33/41] rename

---
 apps/remix-ide/ci/download_e2e_assets.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/remix-ide/ci/download_e2e_assets.js b/apps/remix-ide/ci/download_e2e_assets.js
index 1851e25abe..e8188428e1 100644
--- a/apps/remix-ide/ci/download_e2e_assets.js
+++ b/apps/remix-ide/ci/download_e2e_assets.js
@@ -9,17 +9,17 @@ if (child.error) {
     exit(1);
 }
 
-const nonnightlyre = /v\d*\.\d*\.\d*\+commit\.[\d\w]*/g;
+const nonNightlyRegex = /v\d*\.\d*\.\d*\+commit\.[\d\w]*/g;
 
-let soljson = child.stdout.match(nonnightlyre);
+let soljson = child.stdout.match(nonNightlyRegex);
 console.log('non nightly soljson versions found: ', soljson);
 
-const quotedversionre = /'\d*\.\d*\.\d*\+commit\.[\d\w]*/g;
-let soljson2 = child.stdout.match(quotedversionre).map((item) => item.replace('\'', 'v'));
+const quotedVersionsRegex = /'\d*\.\d*\.\d*\+commit\.[\d\w]*/g;
+let soljson2 = child.stdout.match(quotedVersionsRegex).map((item) => item.replace('\'', 'v'));
 console.log('quoted soljson versions found: ', soljson2);
 
-const nightlyversions = /\d*\.\d*\.\d-nightly.*\+commit\.[\d\w]*/g
-let soljson3 = child.stdout.match(nightlyversions).map((item) => 'v' + item);
+const nightlyVersionsRegex = /\d*\.\d*\.\d-nightly.*\+commit\.[\d\w]*/g
+let soljson3 = child.stdout.match(nightlyVersionsRegex).map((item) => 'v' + item);
 console.log('nightly soljson versions found: ', soljson3);
 
 // merge the three arrays

From defc2ce0a3652d008bc77c07baa303a3892a82dd Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 12:21:16 +0200
Subject: [PATCH 34/41] grep script

md5sum

fix lint

restore cache

use file

use caching

fix config

config

fix grep

fix lint

nightly

catch webpack

url curl

check curl

use plus

install jq

use npx

do not use jq

rename cache

filter duplicates

manual versions

fix manual

v3

8.18

fix urls

7.6

fix regex

fix latest

remixd

rename
---
 .circleci/config.yml                     |  15 ++-
 apps/remix-ide/.gitignore                |   2 +-
 apps/remix-ide/ci/download_e2e_assets.js | 137 ++++++++++++-----------
 apps/remix-ide/ci/downloadsoljson.sh     |  32 ++++++
 apps/remix-ide/webpack.config.js         |  22 +---
 5 files changed, 116 insertions(+), 92 deletions(-)
 create mode 100644 apps/remix-ide/ci/downloadsoljson.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d29fec3eec..78ee7b3a95 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -24,17 +24,26 @@ jobs:
           key: v1-deps-{{ checksum "yarn.lock" }}
           paths:
             - node_modules
-
       - run:
           name: Build
           command: |
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
-              NX_BIN_URL=http://127.0.0.1:8080/assets/js NX_WASM_URL=http://127.0.0.1:8080/assets/js NPM_URL=http://localhost:9090/ yarn build:production
+              NX_BIN_URL=http://127.0.0.1:8080/assets/js/soljson NX_WASM_URL=http://127.0.0.1:8080/assets/js/soljson NPM_URL=http://localhost:9090/ yarn build:production
             else
-              NX_BIN_URL=http://127.0.0.1:8080/assets/js NX_WASM_URL=http://127.0.0.1:8080/assets/js NPM_URL=http://localhost:9090/ yarn build
+              NX_BIN_URL=http://127.0.0.1:8080/assets/js/soljson NX_WASM_URL=http://127.0.0.1:8080/assets/js/soljson NPM_URL=http://localhost:9090/ yarn build
             fi
       - run: yarn run build:e2e
+      
+      - run: grep -ir "[0-9]+commit" apps/* libs/* --include \*.ts > soljson-versions.txt
+      - restore_cache:
+          keys:
+            - soljson-v5-{{ checksum "soljson-versions.txt" }}
       - run: yarn run downloadsolc_assets_e2e
+      - save_cache:
+          key: soljson-v5-{{ checksum "soljson-versions.txt" }}
+          paths:
+            - dist/apps/remix-ide/assets/js/soljson
+      
       - run: mkdir persist && zip -0 -r persist/dist.zip dist
       - persist_to_workspace:
           root: .
diff --git a/apps/remix-ide/.gitignore b/apps/remix-ide/.gitignore
index cf8c2c0ad3..3e0c4b3136 100644
--- a/apps/remix-ide/.gitignore
+++ b/apps/remix-ide/.gitignore
@@ -13,4 +13,4 @@ TODO
 .tern-port
 temp_publish_docker
 src/assets/version.json
-src/assets/js/soljson-v*
\ No newline at end of file
+src/assets/js/soljson/soljson-v*
\ No newline at end of file
diff --git a/apps/remix-ide/ci/download_e2e_assets.js b/apps/remix-ide/ci/download_e2e_assets.js
index 392941536a..e8188428e1 100644
--- a/apps/remix-ide/ci/download_e2e_assets.js
+++ b/apps/remix-ide/ci/download_e2e_assets.js
@@ -1,80 +1,81 @@
-const testFolder = './apps/remix-ide-e2e/src/tests/';
 const fs = require('fs');
+var child_process = require('child_process');
+const { exit } = require('process');
 
-let url = 'https://binaries.soliditylang.org/wasm/list.json'
-
-const axios = require('axios')
-
-// use axios to download the file
-/*
-axios({
-    url: url,
-    method: 'GET',
-}).then((response) => {
-
-    let info = response.data;
-    info.builds = info.builds.filter(build => build.path.indexOf('nightly') === -1)
-    for (let build of info.builds) {
-
-        const buildurl = `https://solc-bin.ethereum.org/wasm/${build.path}`;
-        console.log(buildurl)
-
-        const path = `./dist/apps/remix-ide/assets/js/${build.path}`;
-        // use axios to get the file
-        try {
-            axios({
-                method: 'get',
-                url: buildurl,
-            }).then(function (response) {
-                fs.writeFile(path, response.data, function (err) {
-                    if (err) {
-                        console.log(err);
-                    }
-                })
-            })
-        } catch (e) {
-            console.log('Failed to download ' + build.path + ' from ' + buildurl)
-        }
+var child = child_process.spawnSync('grep', ['-ir', '[0-9]+commit', 'libs/**/*', 'apps/**/*', '--include', '*.ts'], { encoding: 'utf8', cwd: process.cwd(), shell: true });
 
-    }
+if (child.error) {
+    console.log("ERROR: ", child);
+    exit(1);
 }
-)
-*/
-
-fs.readdirSync(testFolder).forEach(file => {
-    let c = fs.readFileSync(testFolder + file, 'utf8');
-    const re = /(?<=soljson).*(?=(.js))/g;
-    const soljson = c.match(re);
-    if (soljson) {
-        console.log(soljson)
-        for (let i = 0; i < soljson.length; i++) {
-
-            const version = soljson[i];
-            if (version) {
-                const url = `https://solc-bin.ethereum.org/bin/soljson${version}.js`;
-                console.log(url)
-
-                const path = `./dist/apps/remix-ide/assets/js/soljson${version}.js`;
-                // use axios to get the file
+
+const nonNightlyRegex = /v\d*\.\d*\.\d*\+commit\.[\d\w]*/g;
+
+let soljson = child.stdout.match(nonNightlyRegex);
+console.log('non nightly soljson versions found: ', soljson);
+
+const quotedVersionsRegex = /'\d*\.\d*\.\d*\+commit\.[\d\w]*/g;
+let soljson2 = child.stdout.match(quotedVersionsRegex).map((item) => item.replace('\'', 'v'));
+console.log('quoted soljson versions found: ', soljson2);
+
+const nightlyVersionsRegex = /\d*\.\d*\.\d-nightly.*\+commit\.[\d\w]*/g
+let soljson3 = child.stdout.match(nightlyVersionsRegex).map((item) => 'v' + item);
+console.log('nightly soljson versions found: ', soljson3);
+
+// merge the three arrays
+soljson = soljson.concat(soljson2);
+soljson = soljson.concat(soljson3);
+
+console.log('soljson versions found: ', soljson);
+
+
+
+if (soljson) {
+    // filter out duplicates
+    soljson = soljson.filter((item, index) => soljson.indexOf(item) === index);
+
+
+    // manually add some versions
+
+    soljson.push('v0.7.6+commit.7338295f');
+    soljson.push('v0.5.17+commit.d19bba13');
+
+    console.log('soljson versions found: ', soljson);
+    
+    for (let i = 0; i < soljson.length; i++) {
+        const version = soljson[i];
+        if (version) {
+            let url = ''
+
+            // if nightly
+            if (version.includes('nightly')) {
+                url = `https://binaries.soliditylang.org/bin/soljson-${version}.js`;
+            }else{
+                url = `https://binaries.soliditylang.org/wasm/soljson-${version}.js`;
+            }
+
+            const dir = './dist/apps/remix-ide/assets/js/soljson';
+            if (!fs.existsSync(dir)) {
+                fs.mkdirSync(dir);
+            }
+
+            const path = `./dist/apps/remix-ide/assets/js/soljson/soljson-${version}.js`;
+            // check if the file exists
+            const exists = fs.existsSync(path);
+            if (!exists) {
+                console.log('URL:', url)
                 try {
-                    axios({
-                        method: 'get',
-                        url: url,
-                    }).then(function (response) {
-                        fs.writeFile(path, response.data, function (err) {
-                            if (err) {
-                                console.log(err);
-                            }
-                        })
-                    })
+                    // use curl to download the file
+                    child_process.exec(`curl -o ${path} ${url}`, { encoding: 'utf8', cwd: process.cwd(), shell: true })
                 } catch (e) {
                     console.log('Failed to download soljson' + version + ' from ' + url)
                 }
-
-
             }
 
+
         }
-    }
+       
+    } 
+
+}
 
-});
diff --git a/apps/remix-ide/ci/downloadsoljson.sh b/apps/remix-ide/ci/downloadsoljson.sh
new file mode 100644
index 0000000000..5fdbfddf39
--- /dev/null
+++ b/apps/remix-ide/ci/downloadsoljson.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+set -e
+# check if curl is installed
+if ! command -v curl &> /dev/null
+then
+    echo "curl could not be found"
+    exit
+fi
+
+
+# download https://binaries.soliditylang.org/wasm/list.json as json
+curl https://binaries.soliditylang.org/wasm/list.json > list.json
+# get the latest version without jq
+latest=$(grep 'latestRelease' list.json | cut -d '"' -f 4)
+echo "latest version: $latest"
+# get url 
+url=$(grep "\"$latest\":" list.json | cut -d '"' -f 4)
+echo "url: $url"
+path="https://binaries.soliditylang.org/bin/$url"
+echo "path: $path"
+# download the file to ./apps/remix-ide/src/assets/js/soljson.js
+curl $path > ./apps/remix-ide/src/assets/js/soljson.js
+# if directory ./apps/remix-ide/src/assets/js/soljson does not exist, create it
+if [ ! -d "./apps/remix-ide/src/assets/js/soljson" ]; then
+    mkdir ./apps/remix-ide/src/assets/js/soljson
+fi
+cp ./apps/remix-ide/src/assets/js/soljson.js ./apps/remix-ide/src/assets/js/soljson/$url
+
+# remove list.json
+rm list.json
+
diff --git a/apps/remix-ide/webpack.config.js b/apps/remix-ide/webpack.config.js
index a10a6a3e47..3191b1d886 100644
--- a/apps/remix-ide/webpack.config.js
+++ b/apps/remix-ide/webpack.config.js
@@ -15,26 +15,8 @@ const versionData = {
 }
 
 const loadLocalSolJson = async () => {
-  let url = 'https://binaries.soliditylang.org/wasm/list.json'
-  axios({
-    url: url,
-    method: 'GET',
-  }).then((response) => {
-    let info = response.data;
-    info.builds = info.builds.filter(build => build.path.indexOf('nightly') === -1)
-    info.builds = info.builds.slice(-1)
-    const buildurl = `https://solc-bin.ethereum.org/wasm/${info.builds[0].path}`;
-    console.log(`Copying... ${buildurl} to assets`)
-    const path = `./apps/remix-ide/src/assets/js/soljson.js`;
-    axios({
-      method: 'get',
-      url: buildurl,
-      responseType: 'stream'
-    }).then(function (response) {
-      response.data.pipe(fs.createWriteStream(path));
-    })
-  }
-  )
+  // execute apps/remix-ide/ci/downloadsoljson.sh
+  const child = require('child_process').execSync('bash ./apps/remix-ide/ci/downloadsoljson.sh', { encoding: 'utf8', cwd: process.cwd(), shell: true })
 }
 
 fs.writeFileSync('./apps/remix-ide/src/assets/version.json', JSON.stringify(versionData))

From 53c11a4cb2143968f44ca443ac8b20d72d8a6222 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 18:54:51 +0200
Subject: [PATCH 35/41] version

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 78ee7b3a95..d3bd9bc2d2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -37,10 +37,10 @@ jobs:
       - run: grep -ir "[0-9]+commit" apps/* libs/* --include \*.ts > soljson-versions.txt
       - restore_cache:
           keys:
-            - soljson-v5-{{ checksum "soljson-versions.txt" }}
+            - soljson-v6-{{ checksum "soljson-versions.txt" }}
       - run: yarn run downloadsolc_assets_e2e
       - save_cache:
-          key: soljson-v5-{{ checksum "soljson-versions.txt" }}
+          key: soljson-v6-{{ checksum "soljson-versions.txt" }}
           paths:
             - dist/apps/remix-ide/assets/js/soljson
       

From c49796d111eb3593e156bb628a5d7625a27d683c Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Mon, 1 May 2023 19:11:13 +0200
Subject: [PATCH 36/41] include tsx

---
 .circleci/config.yml                     | 2 +-
 apps/remix-ide/ci/download_e2e_assets.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d3bd9bc2d2..d0b3dace8e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -34,7 +34,7 @@ jobs:
             fi
       - run: yarn run build:e2e
       
-      - run: grep -ir "[0-9]+commit" apps/* libs/* --include \*.ts > soljson-versions.txt
+      - run: grep -ir "[0-9]+commit" apps/* libs/* --include \*.ts --include \*.tsx > soljson-versions.txt
       - restore_cache:
           keys:
             - soljson-v6-{{ checksum "soljson-versions.txt" }}
diff --git a/apps/remix-ide/ci/download_e2e_assets.js b/apps/remix-ide/ci/download_e2e_assets.js
index e8188428e1..a5343d5335 100644
--- a/apps/remix-ide/ci/download_e2e_assets.js
+++ b/apps/remix-ide/ci/download_e2e_assets.js
@@ -2,7 +2,7 @@ const fs = require('fs');
 var child_process = require('child_process');
 const { exit } = require('process');
 
-var child = child_process.spawnSync('grep', ['-ir', '[0-9]+commit', 'libs/**/*', 'apps/**/*', '--include', '*.ts'], { encoding: 'utf8', cwd: process.cwd(), shell: true });
+var child = child_process.spawnSync('grep', ['-ir', '[0-9]+commit', 'libs/**/*', 'apps/**/*', '--include', '*.ts', '--include', '*.tsx'], { encoding: 'utf8', cwd: process.cwd(), shell: true });
 
 if (child.error) {
     console.log("ERROR: ", child);

From cd833cde6fd781f9f77a70d474a3c74ff444d58b Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Tue, 2 May 2023 13:44:05 +0200
Subject: [PATCH 37/41] optimize

---
 apps/remix-ide/ci/download_e2e_assets.js | 4 +++-
 apps/remix-ide/ci/downloadsoljson.sh     | 5 +++--
 apps/remix-ide/project.json              | 1 +
 apps/remix-ide/webpack.config.js         | 2 ++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/apps/remix-ide/ci/download_e2e_assets.js b/apps/remix-ide/ci/download_e2e_assets.js
index a5343d5335..2c005056a3 100644
--- a/apps/remix-ide/ci/download_e2e_assets.js
+++ b/apps/remix-ide/ci/download_e2e_assets.js
@@ -2,8 +2,10 @@ const fs = require('fs');
 var child_process = require('child_process');
 const { exit } = require('process');
 
-var child = child_process.spawnSync('grep', ['-ir', '[0-9]+commit', 'libs/**/*', 'apps/**/*', '--include', '*.ts', '--include', '*.tsx'], { encoding: 'utf8', cwd: process.cwd(), shell: true });
+const child = child_process.spawnSync('grep', ['-ir', '[0-9]+commit', 'libs/**/*', 'apps/**/*', '--include', '*.ts', '--include', '*.tsx'], { encoding: 'utf8', cwd: process.cwd(), shell: true });
+const child2 = child_process.spawnSync('grep -r --include="*.json" "+commit" ', [], { encoding: 'utf8', cwd: process.cwd(), shell: true });
 
+console.log('child: ', child2);
 if (child.error) {
     console.log("ERROR: ", child);
     exit(1);
diff --git a/apps/remix-ide/ci/downloadsoljson.sh b/apps/remix-ide/ci/downloadsoljson.sh
index 5fdbfddf39..b99ed2d6b0 100644
--- a/apps/remix-ide/ci/downloadsoljson.sh
+++ b/apps/remix-ide/ci/downloadsoljson.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+echo "Downloading latest soljson.js from https://binaries.soliditylang.org/wasm/list.json"
 set -e
 # check if curl is installed
 if ! command -v curl &> /dev/null
@@ -10,7 +11,7 @@ fi
 
 
 # download https://binaries.soliditylang.org/wasm/list.json as json
-curl https://binaries.soliditylang.org/wasm/list.json > list.json
+curl -s https://binaries.soliditylang.org/wasm/list.json > list.json
 # get the latest version without jq
 latest=$(grep 'latestRelease' list.json | cut -d '"' -f 4)
 echo "latest version: $latest"
@@ -20,7 +21,7 @@ echo "url: $url"
 path="https://binaries.soliditylang.org/bin/$url"
 echo "path: $path"
 # download the file to ./apps/remix-ide/src/assets/js/soljson.js
-curl $path > ./apps/remix-ide/src/assets/js/soljson.js
+curl -s $path > ./apps/remix-ide/src/assets/js/soljson.js
 # if directory ./apps/remix-ide/src/assets/js/soljson does not exist, create it
 if [ ! -d "./apps/remix-ide/src/assets/js/soljson" ]; then
     mkdir ./apps/remix-ide/src/assets/js/soljson
diff --git a/apps/remix-ide/project.json b/apps/remix-ide/project.json
index 4e413240ee..15636c7961 100644
--- a/apps/remix-ide/project.json
+++ b/apps/remix-ide/project.json
@@ -52,6 +52,7 @@
       "configurations": {
         "development": {
           "buildTarget": "remix-ide:build:development",
+          "host": "0.0.0.0",
           "port": 8080
         },
         "hot":{
diff --git a/apps/remix-ide/webpack.config.js b/apps/remix-ide/webpack.config.js
index 3191b1d886..a6aa923939 100644
--- a/apps/remix-ide/webpack.config.js
+++ b/apps/remix-ide/webpack.config.js
@@ -17,6 +17,8 @@ const versionData = {
 const loadLocalSolJson = async () => {
   // execute apps/remix-ide/ci/downloadsoljson.sh
   const child = require('child_process').execSync('bash ./apps/remix-ide/ci/downloadsoljson.sh', { encoding: 'utf8', cwd: process.cwd(), shell: true })
+  // show output
+  console.log(child)
 }
 
 fs.writeFileSync('./apps/remix-ide/src/assets/version.json', JSON.stringify(versionData))

From 7f05ebd3095aa6c2c4fb1c160798dc3d1666dc85 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Tue, 2 May 2023 14:08:34 +0200
Subject: [PATCH 38/41] optimize

---
 apps/remix-ide/ci/download_e2e_assets.js | 32 ++++++++++++++----------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/apps/remix-ide/ci/download_e2e_assets.js b/apps/remix-ide/ci/download_e2e_assets.js
index 2c005056a3..9b5622b8cf 100644
--- a/apps/remix-ide/ci/download_e2e_assets.js
+++ b/apps/remix-ide/ci/download_e2e_assets.js
@@ -2,10 +2,8 @@ const fs = require('fs');
 var child_process = require('child_process');
 const { exit } = require('process');
 
-const child = child_process.spawnSync('grep', ['-ir', '[0-9]+commit', 'libs/**/*', 'apps/**/*', '--include', '*.ts', '--include', '*.tsx'], { encoding: 'utf8', cwd: process.cwd(), shell: true });
-const child2 = child_process.spawnSync('grep -r --include="*.json" "+commit" ', [], { encoding: 'utf8', cwd: process.cwd(), shell: true });
+const child = child_process.spawnSync('grep -r --include="*.json" --include="*.ts" --include="*.tsx" "+commit" apps/**/* libs/**/*', [], { encoding: 'utf8', cwd: process.cwd(), shell: true });
 
-console.log('child: ', child2);
 if (child.error) {
     console.log("ERROR: ", child);
     exit(1);
@@ -13,20 +11,29 @@ if (child.error) {
 
 const nonNightlyRegex = /v\d*\.\d*\.\d*\+commit\.[\d\w]*/g;
 
-let soljson = child.stdout.match(nonNightlyRegex);
+let soljson = child.stdout.match(nonNightlyRegex) || [];
 console.log('non nightly soljson versions found: ', soljson);
 
-const quotedVersionsRegex = /'\d*\.\d*\.\d*\+commit\.[\d\w]*/g;
-let soljson2 = child.stdout.match(quotedVersionsRegex).map((item) => item.replace('\'', 'v'));
-console.log('quoted soljson versions found: ', soljson2);
+const quotedVersionsRegex = /['"]\d*\.\d*\.\d*\+commit\.[\d\w]*/g;
+let quotedVersionsRegexMatch = child.stdout.match(quotedVersionsRegex)
+if(quotedVersionsRegexMatch){
+    let soljson2 = quotedVersionsRegexMatch.map((item) => item.replace('\'', 'v').replace('"', 'v'))
+    console.log('quoted soljson versions found: ', soljson2);
+    if(soljson2) soljson = soljson.concat(soljson2);
+}
+
 
 const nightlyVersionsRegex = /\d*\.\d*\.\d-nightly.*\+commit\.[\d\w]*/g
-let soljson3 = child.stdout.match(nightlyVersionsRegex).map((item) => 'v' + item);
-console.log('nightly soljson versions found: ', soljson3);
+const nightlyVersionsRegexMatch = child.stdout.match(nightlyVersionsRegex)
+if(nightlyVersionsRegexMatch){
+    let soljson3 = nightlyVersionsRegexMatch.map((item) => 'v' + item);
+    console.log('nightly soljson versions found: ', soljson3);
+    if(soljson3) soljson = soljson.concat(soljson3);
+}
 
 // merge the three arrays
-soljson = soljson.concat(soljson2);
-soljson = soljson.concat(soljson3);
+
+
 
 console.log('soljson versions found: ', soljson);
 
@@ -40,8 +47,7 @@ if (soljson) {
     // manually add some versions
 
     soljson.push('v0.7.6+commit.7338295f');
-    soljson.push('v0.5.17+commit.d19bba13');
-
+    
     console.log('soljson versions found: ', soljson);
     
     for (let i = 0; i < soljson.length; i++) {

From a70bfb92f89ba2bf28348e5ef6d6805c5765d16f Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Tue, 2 May 2023 14:11:44 +0200
Subject: [PATCH 39/41] config

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d0b3dace8e..4577894ad1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -34,7 +34,7 @@ jobs:
             fi
       - run: yarn run build:e2e
       
-      - run: grep -ir "[0-9]+commit" apps/* libs/* --include \*.ts --include \*.tsx > soljson-versions.txt
+      - run: grep -ir "[0-9]+commit" apps/* libs/* --include \*.ts --include \*.tsx --include \*.json > soljson-versions.txt
       - restore_cache:
           keys:
             - soljson-v6-{{ checksum "soljson-versions.txt" }}

From eab7c048f9a71dfc2275a2065832cb9bed1a38ee Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Tue, 2 May 2023 14:21:27 +0200
Subject: [PATCH 40/41] optimize script

---
 apps/remix-ide/ci/download_e2e_assets.js | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/apps/remix-ide/ci/download_e2e_assets.js b/apps/remix-ide/ci/download_e2e_assets.js
index 9b5622b8cf..51c161b895 100644
--- a/apps/remix-ide/ci/download_e2e_assets.js
+++ b/apps/remix-ide/ci/download_e2e_assets.js
@@ -9,16 +9,14 @@ if (child.error) {
     exit(1);
 }
 
-const nonNightlyRegex = /v\d*\.\d*\.\d*\+commit\.[\d\w]*/g;
 
-let soljson = child.stdout.match(nonNightlyRegex) || [];
-console.log('non nightly soljson versions found: ', soljson);
+let soljson =[];
 
-const quotedVersionsRegex = /['"]\d*\.\d*\.\d*\+commit\.[\d\w]*/g;
+const quotedVersionsRegex = /['"v]\d*\.\d*\.\d*\+commit\.[\d\w]*/g;
 let quotedVersionsRegexMatch = child.stdout.match(quotedVersionsRegex)
 if(quotedVersionsRegexMatch){
     let soljson2 = quotedVersionsRegexMatch.map((item) => item.replace('\'', 'v').replace('"', 'v'))
-    console.log('quoted soljson versions found: ', soljson2);
+    console.log('non nightly soljson versions found: ', soljson2);
     if(soljson2) soljson = soljson.concat(soljson2);
 }
 
@@ -31,24 +29,14 @@ if(nightlyVersionsRegexMatch){
     if(soljson3) soljson = soljson.concat(soljson3);
 }
 
-// merge the three arrays
-
-
-
-console.log('soljson versions found: ', soljson);
-
-
-
 if (soljson) {
     // filter out duplicates
     soljson = soljson.filter((item, index) => soljson.indexOf(item) === index);
 
-
     // manually add some versions
-
     soljson.push('v0.7.6+commit.7338295f');
     
-    console.log('soljson versions found: ', soljson);
+    console.log('soljson versions found: ', soljson, soljson.length);
     
     for (let i = 0; i < soljson.length; i++) {
         const version = soljson[i];

From 0dd0432ff50f214ecf142b3f32f327d8007feaf5 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Tue, 2 May 2023 14:22:06 +0200
Subject: [PATCH 41/41] v7

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4577894ad1..2821756cb9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -37,10 +37,10 @@ jobs:
       - run: grep -ir "[0-9]+commit" apps/* libs/* --include \*.ts --include \*.tsx --include \*.json > soljson-versions.txt
       - restore_cache:
           keys:
-            - soljson-v6-{{ checksum "soljson-versions.txt" }}
+            - soljson-v7-{{ checksum "soljson-versions.txt" }}
       - run: yarn run downloadsolc_assets_e2e
       - save_cache:
-          key: soljson-v6-{{ checksum "soljson-versions.txt" }}
+          key: soljson-v7-{{ checksum "soljson-versions.txt" }}
           paths:
             - dist/apps/remix-ide/assets/js/soljson