integration: additional mcopy test (#245)

Closes #237

Signed-off-by: Cyrill Leutwiler <bigcyrill@hotmail.com>

.github/workflows/release.yml

@@ -140,6 +140,7 @@ jobs:
       - name: run lipo
         run: |
           lipo revive-macos/revive-macos-arm64/resolc-arm64 revive-macos/revive-macos-x64/resolc-x64 -create -output resolc-macos
+          chmod +x resolc-macos
 
       - name: compress macos artifact
         run: |
@@ -147,7 +148,7 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
-          name: revive-macos
+          name: resolc-macos.tar.gz
           path: |
             resolc-macos.tar.gz
           retention-days: 1
@@ -212,13 +213,13 @@ jobs:
 
       - name: compress musl artifact
         run: |
-          tar --strip-components 1 -czf resolc-static-linux.tar.gz ./resolc-out/resolc-static-linux
+          tar -czf $(pwd)/resolc-static-linux.tar.gz -C ./resolc-out resolc-static-linux
 
       - uses: actions/upload-artifact@v4
         with:
-          name: revive-linux
+          name: resolc-static-linux.tar.gz
           path: |
-            ./resolc-static-linux.tar.gz
+            resolc-static-linux.tar.gz
           retention-days: 1
 
       - name: Set Up Node.js
@@ -241,6 +242,7 @@ jobs:
           source emsdk/emsdk_env.sh
           rustup target add wasm32-unknown-emscripten
           make install-wasm
+          chmod -x ./target/wasm32-unknown-emscripten/release/resolc.wasm
 
       - name: check wasm
         run: |
@@ -281,14 +283,14 @@ jobs:
 
       - name: compress wasm artifact
         run: |
-          tar --strip-components 3 -czf resolc-wasm.tar.gz \
-            ./target/wasm32-unknown-emscripten/release/resolc.js \
-            ./target/wasm32-unknown-emscripten/release/resolc.wasm \
-            ./target/wasm32-unknown-emscripten/release/resolc_web.js
+          tar -czf $(pwd)/resolc-wasm.tar.gz -C ./target/wasm32-unknown-emscripten/release/ \
+            resolc.js \
+            resolc.wasm \
+            resolc_web.js
 
       - uses: actions/upload-artifact@v4
         with:
-          name: revive-wasm
+          name: resolc-wasm.tar.gz
           path: |
             resolc-wasm.tar.gz
           retention-days: 1
@@ -303,25 +305,29 @@ jobs:
       - name: Download revive-wasm
         uses: actions/download-artifact@v4
         with:
-          name: revive-wasm
+          name: resolc-wasm.tar.gz
           path: resolc-wasm/
 
       - name: Download revive-linux
         uses: actions/download-artifact@v4
         with:
-          name: revive-linux
+          name: resolc-static-linux.tar.gz
           path: resolc-linux/
 
       - name: Download revive-macos
         uses: actions/download-artifact@v4
         with:
-          name: revive-macos
+          name: resolc-macos.tar.gz
           path: resolc-macos/
 
       - name: create-release
         uses: softprops/action-gh-release@v2
         with:
-          body: ${{ needs.tag.outputs.RELEASE_NOTES }}
+          body: |
+            ${{ needs.tag.outputs.RELEASE_NOTES }}
+
+            # Note for macOS Users
+            The macOS binary is unsigned and it needs to be made runnable using `xattr -c resolc-macos`.
           tag_name: ${{ needs.tag.outputs.PKG_VER }}
           name: ${{ needs.tag.outputs.PKG_VER }}
           draft: true

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+This is a development pre-release.
+
+Supported `polkadot-sdk` rev:`c29e72a8628835e34deb6aa7db9a78a2e4eabcee`
+
 ## v0.1.0-dev.12
 
 This is a development pre-release.

Cargo.toml

@@ -72,7 +72,7 @@ assert_fs = "1.1"
 # polkadot-sdk and friends
 codec = { version = "3.6.12", default-features = false, package = "parity-scale-codec" }
 scale-info = { version = "2.11.6", default-features = false }
-polkadot-sdk = { git = "https://github.com/paritytech/polkadot-sdk", rev = "21f6f0705e53c15aa2b8a5706b208200447774a9" }
+polkadot-sdk = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c29e72a8628835e34deb6aa7db9a78a2e4eabcee" }
 
 # llvm
 [workspace.dependencies.inkwell]

crates/integration/contracts/DelegateCaller.sol

@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.28;
+
+/* runner.json
+{
+    "differential": true,
+    "actions": [
+        {
+            "Instantiate": {
+                "code": {
+                    "Solidity": {
+                        "contract": "DelegateCaller"
+                    }
+                }
+            }
+        },
+        {
+            "Call": {
+                "dest": {
+                    "Instantiated": 0
+                },
+                "data": "e466c6c9"
+            }
+        }
+    ]
+}
+*/
+
+contract DelegateCaller {
+    function delegateNoContract() external returns (bool) {
+        address testAddress = 0x0000000000000000000000000000000000000000;
+        (bool success, ) = testAddress.delegatecall(
+            abi.encodeWithSignature("test()")
+        );
+        return success;
+    }
+}

crates/integration/contracts/FunctionType.sol

@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.28;
+
+/* runner.json
+{
+    "differential": true,
+    "actions": [
+        {
+            "Instantiate": {
+                "code": {
+                    "Solidity": {
+                        "contract": "FunctionType"
+                    }
+                }
+            }
+        },
+        {
+            "Call": {
+                "dest": {
+                    "Instantiated": 0
+                },
+                "data": "b8c9d365"
+            }
+        }
+    ]
+}
+*/
+
+contract FunctionType {
+    uint public immutable x = 42;
+
+    function h() public view returns (function() external view returns (uint)) {
+        return this.x;
+    }
+}

crates/integration/contracts/MCopyOverlap.sol

@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8;
+
+/* runner.json
+{
+    "differential": true,
+    "actions": [
+        {
+            "Instantiate": {
+                "code": {
+                    "Solidity": {
+                        "contract": "MCopyOverlap"
+                    }
+                }
+            }
+        },
+        {
+            "Call": {
+                "dest": {
+                    "Instantiated": 0
+                },
+                "data": "afdce848"
+            }
+        }
+    ]
+}
+*/
+
+function copy(
+    uint dstOffset,
+    uint srcOffset,
+    uint length
+) pure returns (bytes memory out) {
+    out = hex"2222222222222222333333333333333344444444444444445555555555555555"
+    hex"6666666666666666777777777777777788888888888888889999999999999999"
+    hex"aaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbccccccccccccccccdddddddddddddddd";
+    assembly {
+        mcopy(
+            add(add(out, 0x20), dstOffset),
+            add(add(out, 0x20), srcOffset),
+            length
+        )
+    }
+}
+
+contract MCopyOverlap {
+    function mcopy_to_right_overlap() public pure returns (bytes memory) {
+        return copy(0x20, 0x10, 0x30);
+    }
+}

crates/integration/src/tests.rs

@@ -33,6 +33,7 @@ test_spec!(msize, "MSize", "MSize.sol");
 test_spec!(sha1, "SHA1", "SHA1.sol");
 test_spec!(block, "Block", "Block.sol");
 test_spec!(mcopy, "MCopy", "MCopy.sol");
+test_spec!(mcopy_overlap, "MCopyOverlap", "MCopyOverlap.sol");
 test_spec!(events, "Events", "Events.sol");
 test_spec!(storage, "Storage", "Storage.sol");
 test_spec!(mstore8, "MStore8", "MStore8.sol");
@@ -56,6 +57,8 @@ test_spec!(transfer, "Transfer", "Transfer.sol");
 test_spec!(send, "Send", "Send.sol");
 test_spec!(function_pointer, "FunctionPointer", "FunctionPointer.sol");
 test_spec!(mload, "MLoad", "MLoad.sol");
+test_spec!(delegate_no_contract, "DelegateCaller", "DelegateCaller.sol");
+test_spec!(function_type, "FunctionType", "FunctionType.sol");
 
 fn instantiate(path: &str, contract: &str) -> Vec<SpecsAction> {
     vec![Instantiate {