Merge pull request #128 from Consensys/127-refactor-solidity-workspac…

…e-test-and-fixes Continuation - 127
Consensys · Oct 13, 2023 · 804eced · 804eced
2 parents 4a3961a + 92173f4
commit 804eced
Show file tree

Hide file tree

Showing 28 changed files with 13,392 additions and 9,431 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1,20 +1,15 @@
 {
-	"version": "0.2.0",
-	"configurations": [
-		{
-			"name": "Launch Extension",
-			"type": "extensionHost",
-			"request": "launch",
-			"runtimeExecutable": "${execPath}",
-			"args": [
-				"--extensionDevelopmentPath=${workspaceRoot}"
-			],
-			"stopOnEntry": false,
-			"sourceMaps": true,
-			"outFiles": [
-				"${workspaceRoot}/out/**/*.js"
-			],
-			"preLaunchTask": "npm: install"
-		}
-	]
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Launch Extension",
+      "type": "extensionHost",
+      "request": "launch",
+      "runtimeExecutable": "${execPath}",
+      "args": ["--extensionDevelopmentPath=${workspaceRoot}"],
+      "sourceMaps": true,
+      "outFiles": ["${workspaceRoot}/out/**/*.js"],
+      "preLaunchTask": "npm: install"
+    }
+  ]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -1,12 +1,12 @@
 {
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "npm: install",
-            "type": "shell",
-            "command": "npm install"
-        }
-    ]
-}
+  // See https://go.microsoft.com/fwlink/?LinkId=733558
+  // for the documentation about the tasks.json format
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "npm: install",
+      "type": "shell",
+      "command": "npm install"
+    }
+  ]
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/README.md b/README.md
diff --git a/examples/cockpitFunctionOverride.sol b/examples/cockpitFunctionOverride.sol
@@ -0,0 +1,37 @@
+//SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.17;
+
+interface B {
+    function testCall(uint256 a) external payable;
+}
+
+
+contract TestFunctionOverride {
+
+struct test1 {
+    uint256 t1;
+}
+
+struct test2 {
+    string t2;
+}
+
+    address test;
+    function foo() public {}
+
+    function foo(string memory bar2) public {}
+
+    function bar(uint256 t1, uint256 t2) public {
+        B(test).testCall(t1);
+    }
+    function bar(uint256 t2) public payable {
+        B(test).testCall(t2);
+    }
+
+    function bar(test1 calldata t1) public {
+    }
+
+    function bar(test2 calldata t2) public {}
+
+}