Merge branch 'master' into react18v4

ethereum · Oct 20, 2023 · 3623835 · 3623835
2 parents 8cd615b + 3ee974d
commit 3623835
Show file tree

Hide file tree

Showing 37 changed files with 584 additions and 144 deletions.
diff --git a/apps/remix-ide-e2e/src/tests/proxy_oz_v4.test.ts b/apps/remix-ide-e2e/src/tests/proxy_oz_v4.test.ts
diff --git a/apps/remix-ide-e2e/src/tests/proxy.test.ts → ...mix-ide-e2e/src/tests/proxy_oz_v5.test.ts b/apps/remix-ide-e2e/src/tests/proxy.test.ts → ...mix-ide-e2e/src/tests/proxy_oz_v5.test.ts
@@ -91,6 +91,7 @@ module.exports = {
       .click('[data-id="confirmProxyDeployment-modal-footer-ok-react"]')
       .waitForElementPresent('[data-id="universalDappUiTitleExpander0"]')
       .waitForElementPresent('[data-id="universalDappUiTitleExpander1"]')
+      .waitForElementContainsText('*[data-id="terminalJournal"]', 'Deploying ERC1967 >= 5.0.0 as proxy...')
   },
 
   'Should interact with deployed contract via ERC1967 (proxy) #group1': function (browser: NightwatchBrowser) {
@@ -142,6 +143,7 @@ module.exports = {
       .click('[data-id="confirmProxyDeployment-modal-footer-ok-react"]')
       .waitForElementPresent('[data-id="universalDappUiTitleExpander0"]')
       .waitForElementPresent('[data-id="universalDappUiTitleExpander1"]')
+      .waitForElementContainsText('*[data-id="terminalJournal"]', 'Deploying ERC1967 >= 5.0.0 as proxy...')
   },
 
   'Should interact with initialized contract to verify parameters #group1': function (browser: NightwatchBrowser) {
@@ -165,6 +167,7 @@ module.exports = {
 
   'Should upgrade contract by selecting a previously deployed proxy address from dropdown (MyTokenV1 to MyTokenV2) #group1': function (browser: NightwatchBrowser) {
     browser
+      .click('*[data-id="terminalClearConsole"]') 
       .waitForElementPresent('[data-id="deployAndRunClearInstances"]')
       .click('[data-id="deployAndRunClearInstances"]')
       .openFile('myTokenV2.sol')
@@ -196,6 +199,7 @@ module.exports = {
         })
       .waitForElementPresent('[data-id="universalDappUiTitleExpander0"]')
       .waitForElementPresent('[data-id="universalDappUiTitleExpander1"]')
+      .waitForElementContainsText('*[data-id="terminalJournal"]', 'Using ERC1967 >= 5.0.0 for the proxy upgrade...')
   },
 
   'Should interact with upgraded function in contract MyTokenV2 #group1': function (browser: NightwatchBrowser) {
@@ -210,6 +214,7 @@ module.exports = {
 
   'Should upgrade contract by providing proxy address in input field (MyTokenV1 to MyTokenV2) #group1': function (browser: NightwatchBrowser) {
     browser
+      .click('*[data-id="terminalClearConsole"]') 
       .waitForElementPresent('[data-id="deployAndRunClearInstances"]')
       .click('[data-id="deployAndRunClearInstances"]')
       .openFile('myTokenV2.sol')
@@ -233,17 +238,30 @@ module.exports = {
       .click('[data-id="confirmProxyDeployment-modal-footer-ok-react"]')
       .waitForElementPresent('[data-id="universalDappUiTitleExpander0"]')
       .waitForElementPresent('[data-id="universalDappUiTitleExpander1"]')
+      .waitForElementContainsText('*[data-id="terminalJournal"]', 'Using ERC1967 >= 5.0.0 for the proxy upgrade...')
   },
 
   'Should interact with upgraded contract through provided proxy address #group1': function (browser: NightwatchBrowser) {
     browser
+      .clearConsole()
       .clickInstance(1)
       .perform((done) => {
         browser.testConstantFunction(firstProxyAddress, 'version - call', null, '0:\nstring: MyTokenV2!').perform(() => {
           done()
         })
       })
-      .end()
+  },
+  'Should debug the call': function(browser: NightwatchBrowser) {
+    browser
+    .debugTransaction(0)
+    .waitForElementVisible({
+      locateStrategy: 'xpath',
+      selector: '//*[@data-id="treeViewLivm trace step" and contains(.,"7")]',
+      timeout: 60000
+    })
+    .goToVMTraceStep(129)
+    .waitForElementContainsText('*[data-id="functionPanel"]', 'version()', 60000)
+    .end()
   }
 }
 

diff --git a/apps/remix-ide/src/app/tabs/debugger-tab.js b/apps/remix-ide/src/app/tabs/debugger-tab.js
@@ -5,7 +5,7 @@ import { ViewPlugin } from '@remixproject/engine-web'
 import * as packageJson from '../../../../../package.json'
 import React from 'react' // eslint-disable-line
 import { bleach } from '@remix-ui/helper'
-import { compilationFinishedToastMsg, compilingToastMsg, localCompilationToastMsg, notFoundToastMsg, sourceVerificationNotAvailableToastMsg } from '@remix-ui/helper'
+import { compilationFinishedToastMsg, compilingToastMsg, notFoundToastMsg, sourceVerificationNotAvailableToastMsg } from '@remix-ui/helper'
 const css = require('./styles/debugger-tab-styles')
 
 const profile = {

diff --git a/apps/remix-ide/src/app/tabs/locales/en/debugger.json b/apps/remix-ide/src/app/tabs/locales/en/debugger.json
@@ -2,6 +2,7 @@
   "debugger.displayName": "Debugger",
   "debugger.debuggerConfiguration": "Debugger Configuration",
   "debugger.stopDebugging": "Stop debugging",
+  "debugger.provideTxNumber": "Please provide a valid transaction hash",
   "debugger.startDebugging": "Start debugging",
   "debugger.placeholder": "Transaction hash, should start with 0x",
   "debugger.debugLocaNodeLabel": "Force using local node",

diff --git a/apps/remix-ide/src/app/tabs/network-module.js b/apps/remix-ide/src/app/tabs/network-module.js
@@ -53,7 +53,7 @@ export class NetworkModule extends Plugin {
     this.blockchain.addProvider({ name: network.name, provider })
   }
 
-  /** Remove a network to the list of availble networks */
+  /** Remove a network to the list of available networks */
   removeNetwork (name) {
     this.blockchain.removeProvider(name)
   }

diff --git a/apps/remix-ide/src/assets/css/themes/bootstrap-cerulean.min.css b/apps/remix-ide/src/assets/css/themes/bootstrap-cerulean.min.css
@@ -2118,6 +2118,7 @@ textarea.form-control {
 
 }
 .btn {
+    cursor: pointer;
     display:inline-block;
     font-weight:400;
     color:#495057;
@@ -2150,7 +2151,8 @@ textarea.form-control {
     box-shadow:0 0 0 .2rem rgba(47,164,231,.25)
 }
 .btn.disabled,.btn:disabled {
-    opacity:.65
+    opacity:.65;
+    cursor: not-allowed
 }
 .btn:not(:disabled):not(.disabled) {
     cursor:pointer
@@ -3928,7 +3930,8 @@ input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-
     padding:1.25rem
 }
 .card-title {
-    margin-bottom:.75rem
+    margin-bottom:.75rem;
+    color: var(--text);
 }
 .card-subtitle {
     margin-top:-.375rem;

diff --git a/apps/remix-ide/src/assets/css/themes/bootstrap-cyborg.min.css b/apps/remix-ide/src/assets/css/themes/bootstrap-cyborg.min.css
@@ -2119,6 +2119,7 @@ textarea.form-control {
 
 }
 .btn {
+    cursor: pointer;;
     display:inline-block;
     font-weight:400;
     color:#adafae;
@@ -2151,7 +2152,8 @@ textarea.form-control {
     box-shadow:0 0 0 .2rem rgba(42,159,214,.25)
 }
 .btn.disabled,.btn:disabled {
-    opacity:.65
+    opacity:.65;
+    cursor: not-allowed;
 }
 .btn:not(:disabled):not(.disabled) {
     cursor:pointer
@@ -3929,7 +3931,8 @@ input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-
     padding:1.25rem
 }
 .card-title {
-    margin-bottom:.75rem
+    margin-bottom:.75rem;
+    color: var(--text);
 }
 .card-subtitle {
     margin-top:-.375rem;

diff --git a/apps/remix-ide/src/assets/css/themes/bootstrap-flatly.min.css b/apps/remix-ide/src/assets/css/themes/bootstrap-flatly.min.css
@@ -2121,6 +2121,7 @@ textarea.form-control {
 
 }
 .btn {
+  cursor: pointer;
 	display:inline-block;
 	font-weight:400;
 	color:#212529;
@@ -2152,7 +2153,8 @@ textarea.form-control {
 	box-shadow:0 0 0 .2rem rgba(44,62,80,.25)
 }
 .btn.disabled,.btn:disabled {
-	opacity:.65
+	opacity:.65;
+  cursor: not-allowed;
 }
 .btn:not(:disabled):not(.disabled) {
 	cursor:pointer
@@ -3395,7 +3397,8 @@ input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-
 	-ms-flex:1 1 auto;	flex:1 1 auto;	min-height:1px;	padding:1.25rem
 }
 .card-title {
-	margin-bottom:.75rem
+	margin-bottom:.75rem;
+  color: var(--text);
 }
 .card-subtitle {
 	margin-top:-.375rem;	margin-bottom:0

diff --git a/apps/remix-ide/src/assets/css/themes/bootstrap-spacelab.min.css b/apps/remix-ide/src/assets/css/themes/bootstrap-spacelab.min.css
@@ -2121,6 +2121,7 @@ textarea.form-control {
 
 }
 .btn {
+    cursor: pointer;
     display:inline-block;
     font-weight:400;
     color:#777;
@@ -2153,7 +2154,8 @@ textarea.form-control {
     box-shadow:0 0 0 .2rem rgba(68,110,155,.25)
 }
 .btn.disabled,.btn:disabled {
-    opacity:.65
+    opacity:.65;
+    cursor: not-allowed
 }
 .btn:not(:disabled):not(.disabled) {
     cursor:pointer
@@ -3931,7 +3933,8 @@ input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-
     padding:1.25rem
 }
 .card-title {
-    margin-bottom:.75rem
+    margin-bottom:.75rem;
+    color: var(--text);
 }
 .card-subtitle {
     margin-top:-.375rem;

diff --git a/apps/remix-ide/src/assets/css/themes/remix-black_undtds.css b/apps/remix-ide/src/assets/css/themes/remix-black_undtds.css
@@ -2096,6 +2096,7 @@ textarea.form-control.is-invalid {
   }
 }
 .btn {
+  cursor: pointer;
   display: inline-block;
   font-weight: 400;
   color: #d5d5d5;
@@ -2127,6 +2128,7 @@ textarea.form-control.is-invalid {
 .btn.disabled,
 .btn:disabled {
   opacity: 0.65;
+  cursor: not-allowed
 }
 a.btn.disabled,
 fieldset:disabled a.btn {

diff --git a/apps/remix-ide/src/assets/css/themes/remix-candy_ikhg4m.css b/apps/remix-ide/src/assets/css/themes/remix-candy_ikhg4m.css
@@ -2314,6 +2314,7 @@ textarea.form-control.is-invalid {
 }
 
 .btn {
+  cursor: pointer;
   display: inline-block;
   font-weight: 400;
   color: #0f7292;
@@ -2346,6 +2347,7 @@ textarea.form-control.is-invalid {
 .btn.disabled,
 .btn:disabled {
   opacity: 0.7;
+  cursor: not-allowed
 }
 
 a.btn.disabled,
@@ -4371,6 +4373,7 @@ input[type="button"].btn-block {
 
 .card-title {
   margin-bottom: 0.75rem;
+  color: var(--text);
 }
 
 .card-subtitle {

diff --git a/apps/remix-ide/src/assets/css/themes/remix-dark_tvx1s2.css b/apps/remix-ide/src/assets/css/themes/remix-dark_tvx1s2.css
@@ -2097,6 +2097,7 @@ textarea.form-control.is-invalid {
   }
 }
 .btn {
+  cursor: pointer;
   display: inline-block;
   font-weight: 400;
   color: #fff;
@@ -2128,6 +2129,7 @@ textarea.form-control.is-invalid {
 .btn.disabled,
 .btn:disabled {
   opacity: 0.65;
+  cursor: not-allowed
 }
 a.btn.disabled,
 fieldset:disabled a.btn {

diff --git a/apps/remix-ide/src/assets/css/themes/remix-hacker_owl.css b/apps/remix-ide/src/assets/css/themes/remix-hacker_owl.css
@@ -2111,6 +2111,7 @@ textarea.form-control.is-invalid {
   }
 }
 .btn {
+  cursor: pointer;
   display: inline-block;
   font-weight: 400;
   color: #fff;
@@ -2142,6 +2143,7 @@ textarea.form-control.is-invalid {
 .btn.disabled,
 .btn:disabled {
   opacity: 0.65;
+  cursor: not-allowed;
 }
 a.btn.disabled,
 fieldset:disabled a.btn {

diff --git a/apps/remix-ide/src/assets/css/themes/remix-light_powaqg.css b/apps/remix-ide/src/assets/css/themes/remix-light_powaqg.css
@@ -2310,6 +2310,7 @@ textarea.form-control.is-invalid {
 }
 
 .btn {
+  cursor: pointer;
   display: inline-block;
   font-weight: 400;
   color: #2e3145;
@@ -2342,6 +2343,7 @@ textarea.form-control.is-invalid {
 .btn.disabled,
 .btn:disabled {
   opacity: 0.7;
+  cursor: not-allowed;
 }
 
 a.btn.disabled,
@@ -4367,6 +4369,7 @@ input[type="button"].btn-block {
 
 .card-title {
   margin-bottom: 0.75rem;
+  color: var(--text);
 }
 
 .card-subtitle {

diff --git a/apps/remix-ide/src/assets/css/themes/remix-midcentury_hrzph3.css b/apps/remix-ide/src/assets/css/themes/remix-midcentury_hrzph3.css
@@ -2315,6 +2315,7 @@ textarea.form-control.is-invalid {
 }
 
 .btn {
+  cursor: pointer;
   display: inline-block;
   font-weight: 400;
   color: #062809;
@@ -2347,6 +2348,7 @@ textarea.form-control.is-invalid {
 .btn.disabled,
 .btn:disabled {
   opacity: 0.7;
+  cursor: not-allowed;
 }
 
 a.btn.disabled,
@@ -4373,6 +4375,7 @@ input[type="button"].btn-block {
 
 .card-title {
   margin-bottom: 0.75rem;
+  color: var(--text);
 }
 
 .card-subtitle {

diff --git a/apps/remix-ide/src/assets/css/themes/remix-unicorn.css b/apps/remix-ide/src/assets/css/themes/remix-unicorn.css
@@ -2313,6 +2313,7 @@ textarea.form-control.is-invalid {
 }
 
 .btn {
+  cursor: pointer;
   display: inline-block;
   font-weight: 400;
   color: #2e3145;
@@ -2346,6 +2347,7 @@ textarea.form-control.is-invalid {
 .btn.disabled,
 .btn:disabled {
   opacity: 0.7;
+  cursor: not-allowed;
 }
 
 a.btn.disabled,
@@ -4371,6 +4373,7 @@ input[type="button"].btn-block {
 
 .card-title {
   margin-bottom: 0.75rem;
+  color: var(--text);
 }
 
 .card-subtitle {

diff --git a/apps/remix-ide/src/assets/css/themes/remix-violet.css b/apps/remix-ide/src/assets/css/themes/remix-violet.css
@@ -2310,6 +2310,7 @@ textarea.form-control.is-invalid {
 }
 
 .btn {
+  cursor: pointer;
   display: inline-block;
   font-weight: 400;
   color: #2e3145;
@@ -2342,6 +2343,7 @@ textarea.form-control.is-invalid {
 .btn.disabled,
 .btn:disabled {
   opacity: 0.7;
+  cursor: not-allowed;
 }
 
 a.btn.disabled,
@@ -4367,6 +4369,7 @@ input[type="button"].btn-block {
 
 .card-title {
   margin-bottom: 0.75rem;
+  color: var(--text);
 }
 
 .card-subtitle {