Merge branch 'master' into ethskills

Author: STetsing

.circleci/config.yml

@@ -14,7 +14,7 @@ parameters:
     default: ""
   run_file_tests_keyword:
     type: enum
-    enum: ["", "ai_panel", "ai_tool_selector", "ballot", "ballot_0_4_14", "blockchain", "bottom-bar", "circom", "code_format", "compile_run_widget", "compiler_api", "contract_flattener", "contract_verification", "debugger", "defaultLayout", "deploy_vefiry", "dgit_github", "dgit_local", "editor", "editorGoToDefinition", "editorHoverContext", "editorReferences", "editor_autocomplete", "editor_error_marker", "editor_line_text", "eip1153", "eip7702", "environment-account", "erc721", "etherscan_api", "expandAllFolders", "fileExplorer", "fileManager_api", "file_decorator", "file_explorer_context_menu", "file_explorer_dragdrop", "file_explorer_multiselect", "generalSettings", "gist", "homeTab", "importFromGithub", "importResolver", "layout", "learneth", "libraryDeployment", "matomo-bot-detection", "matomo-consent", "maximizePanels", "mcp_all_resources", "mcp_compilation_tools", "mcp_debugging_tools", "mcp_deployment_tools", "mcp_file_management_tools", "mcp_file_permissions", "mcp_integration_workflows", "mcp_misc_tools", "mcp_resource_providers", "mcp_security_middleware", "mcp_server_complete", "mcp_server_connection", "mcp_server_lifecycle", "metamask", "migrateFileSystem", "noir", "pinned_contracts", "pluginManager", "plugin_api", "providers", "proxy_oz_v4", "proxy_oz_v5", "proxy_oz_v5_non_shanghai_runtime", "publishContract", "quickDapp_metamask", "recorder", "remixd", "runAndDeploy", "script-runner", "search", "signingMessage", "sol2uml", "solidityImport", "solidityUnittests", "specialFunctions", "staticAnalysis", "stressEditor", "template_exp_modal", "terminal", "toggle_panels", "transaction-simulator", "transactionExecution", "txListener", "uniswap_v4_core", "url", "usingWebWorker", "verticalIconsPanel", "vm_state", "vyper_api", "walkthrough", "workspace", "workspace_git"]
+    enum: ["", "ai_panel", "ai_tool_selector", "ballot", "ballot_0_4_14", "blockchain", "bottom-bar", "circom", "code_format", "compile_run_widget", "compiler_api", "contract_flattener", "contract_verification", "debugger", "defaultLayout", "deploy_vefiry", "dgit_github", "dgit_local", "editor", "editorGoToDefinition", "editorHoverContext", "editorReferences", "editor_autocomplete", "editor_error_marker", "editor_line_text", "eip1153", "eip7702", "environment-account", "erc721", "etherscan_api", "expandAllFolders", "fileExplorer", "fileManager_api", "file_decorator", "file_explorer_context_menu", "file_explorer_dragdrop", "file_explorer_multiselect", "generalSettings", "gist", "homeTab", "importFromGithub", "importResolver", "layout", "learneth", "libraryDeployment", "matomo-bot-detection", "matomo-consent", "maximizePanels", "mcp_all_resources", "mcp_compilation_tools", "mcp_debugging_tools", "mcp_deployment_tools", "mcp_file_management_tools", "mcp_file_permissions", "mcp_integration_workflows", "mcp_misc_tools", "mcp_resource_providers", "mcp_security_middleware", "mcp_server_complete", "mcp_server_connection", "mcp_server_lifecycle", "metamask", "migrateFileSystem", "noir", "pinned_contracts", "pluginManager", "plugin_api", "providers", "proxy_oz_v4", "proxy_oz_v5", "proxy_oz_v5_non_shanghai_runtime", "publishContract", "quickDapp_metamask", "quickDapp_v2", "recorder", "remixd", "runAndDeploy", "script-runner", "search", "signingMessage", "sol2uml", "solidityImport", "solidityUnittests", "specialFunctions", "staticAnalysis", "stressEditor", "template_exp_modal", "terminal", "toggle_panels", "transaction-simulator", "transactionExecution", "txListener", "uniswap_v4_core", "url", "usingWebWorker", "verticalIconsPanel", "vm_state", "vyper_api", "walkthrough", "workspace", "workspace_git"]
     default: ""
   run_flaky_tests:
     type: boolean

apps/remix-ide-e2e/src/tests/debugger.test.ts

@@ -96,7 +96,7 @@ module.exports = {
       .waitForElementVisible('#stepdetail')
       .waitForElementVisible({
         locateStrategy: 'xpath',
-        selector: '//*[@data-id="treeViewLivm trace step" and contains(.,"3")]',
+        selector: '//*[@data-id="treeViewLivm trace step" and contains(.,"474")]',
       }).pause(1000)      
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf(`constructor (string memory name_, string memory symbol_) {
@@ -132,7 +132,7 @@ module.exports = {
       .waitForElementVisible('#stepdetail')
       .waitForElementVisible({
         locateStrategy: 'xpath',
-        selector: '//*[@data-id="treeViewLivm trace step" and contains(.,"42")]',
+        selector: '//*[@data-id="treeViewLivm trace step" and contains(.,"131")]',
       })
       .goToVMTraceStep(261)
       .waitForElementPresent('.highlightLine8')
@@ -452,36 +452,72 @@ const sources = [
 ]
 
 const localVariable_step266_ABIEncoder = { // eslint-disable-line
-  idAsk: {
-    type: 'bytes32',
-    value: '0x0000000000000000000000000000000000000000000000000000000000000002'
-  },
-  userData: {
-    value: '0x000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000015b38da6a701c568545dcfcb03fcb875f56beddc4',
-    type: 'bytes'
-  }
+	"userData": {
+		"value": "0x000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000015b38da6a701c568545dcfcb03fcb875f56beddc4",
+		"type": "bytes"
+	},
+	"<1>": {
+		"length": "0x0",
+		"value": "0x",
+		"type": "bytes"
+	},
+	"<2>": {
+		"value": "0x0000000000000000000000000000000000000000000000000000000000000000",
+		"type": "bytes32"
+	},
+	"<3>": {
+		"value": "0x0000000000000000000000000000000000000000000000000000000000000000",
+		"type": "bytes32"
+	},
+	"<4>": {
+		"value": "0",
+		"type": "uint256"
+	},
+	"idAsk": {
+		"value": "0x0000000000000000000000000000000000000000000000000000000000000002",
+		"type": "bytes32"
+	}
 }
 
 const localVariable_step717_ABIEncoder = { // eslint-disable-line
-  idAsk: {
-    type: 'bytes32',
-    value: '0x0000000000000000000000000000000000000000000000000000000000000002'
-  },
-  idOffer: {
-    type: 'bytes32',
-    value: '0x0000000000000000000000000000000000000000000000000000000000000001'
-  },
-  ro: {
-    length: '0xd0',
-    type: 'bytes',
-    value: '0x5b38da6a701c568545dcfcb03fcb875f56beddc45b38da6a701c568545dcfcb03fcb875f56beddc400000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001'
-  },
-  userData: {
-    value: '0x000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000015b38da6a701c568545dcfcb03fcb875f56beddc4',
-    type: 'bytes'
-  }
+	"userData": {
+		"value": "0x000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000015b38da6a701c568545dcfcb03fcb875f56beddc4",
+		"type": "bytes"
+	},
+	"<1>": {
+		"length": "0xd0",
+		"value": "0x5b38da6a701c568545dcfcb03fcb875f56beddc45b38da6a701c568545dcfcb03fcb875f56beddc400000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001",
+		"type": "bytes"
+	},
+	"<2>": {
+		"value": "0x0000000000000000000000000000000000000000000000000000000000000002",
+		"type": "bytes32"
+	},
+	"<3>": {
+		"value": "0x0000000000000000000000000000000000000000000000000000000000000001",
+		"type": "bytes32"
+	},
+	"<4>": {
+		"value": "84",
+		"type": "uint256"
+	},
+	"idAsk": {
+		"value": "0x0000000000000000000000000000000000000000000000000000000000000002",
+		"type": "bytes32"
+	},
+	"idOffer": {
+		"value": "0x0000000000000000000000000000000000000000000000000000000000000001",
+		"type": "bytes32"
+	},
+	"ro": {
+		"length": "0xd0",
+		"value": "0x5b38da6a701c568545dcfcb03fcb875f56beddc45b38da6a701c568545dcfcb03fcb875f56beddc400000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001",
+		"type": "bytes"
+	}
 }
 
+
+
 const jsGetTrace = `(async () => {
   try {
       const result = await remix.call('debugger', 'getTrace', '<txhash>')