Disable large contract test on firefox

This reverts commit 69d81c9682.

.github/workflows/build-revive-wasm.yml

@@ -9,6 +9,7 @@ on:
 env:
   CARGO_TERM_COLOR: always
   REVIVE_WASM_INSTALL_DIR: ${{ github.workspace }}/target/wasm32-unknown-emscripten/release
+  BUN_VERSION: 1.1.43
 
 jobs:
   build-revive-wasm:
@@ -112,6 +113,21 @@ jobs:
         with:
           node-version: "20"
 
+      - name: Install Bun on Windows
+        if: runner.os == 'Windows'
+        run: |
+          Set-ExecutionPolicy RemoteSigned -Scope CurrentUser
+          iex (new-object net.webclient).downloadstring('https://get.scoop.sh')
+          scoop install bun@${{ env.BUN_VERSION }}
+          scoop install wget
+          Join-Path (Resolve-Path ~).Path "scoop\shims" >> $Env:GITHUB_PATH
+
+      - name: Install Bun on macOS and Linux
+        if: runner.os != 'Windows'
+        run: |
+          curl -fsSL https://bun.sh/install | bash -s bun-v${{ env.BUN_VERSION }}
+          echo "$HOME/.bun/bin" >> $GITHUB_PATH
+
       - name: Install packages
         run: npm install
 

.github/workflows/get-release-artifact.js

@@ -1,36 +0,0 @@
-module.exports = async ({
-  octokit,
-  context,
-  releasePrefix,
-  artifactSuffix,
-}) => {
-  let page = 1;
-
-  while (true) {
-    const res = await octokit.rest.repos.listReleases({
-      owner: context.repo.owner,
-      repo: context.repo.repo,
-      per_page: 100,
-      page,
-    });
-    if (res.data.length === 0) {
-      throw new Error(
-        `No LLVM releases with '${artifactSuffix}' atifacts found! Please release LLVM before running this workflow.`,
-      );
-    }
-
-    for (let release of res.data) {
-      if (release.tag_name.startsWith(releasePrefix)) {
-        for (let asset of release.assets) {
-          if (asset.name.includes(artifactSuffix)) {
-            return asset.browser_download_url;
-          }
-        }
-        console.warn(
-          `LLVM release ${release.tag_name} doesn't have a '${artifactSuffix}' artifact; searching for older releases...`,
-        );
-      }
-    }
-    page++;
-  }
-};

.github/workflows/release-llvm.yml

@@ -1,167 +0,0 @@
-name: Release LLVM
-
-on:
-  workflow_dispatch:
-    inputs:
-      llvm_version:
-        type: string
-        required: true
-        description: llvm version in "x.x.x" format, e.g. "18.1.8"
-
-env:
-  CARGO_TERM_COLOR: always
-
-jobs:
-  create-release:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    outputs:
-      version: ${{ steps.resolve-version.outputs.version }}
-    steps:
-      - id: resolve-version
-        run: |
-          echo "version=llvm-${{ inputs.llvm_version }}-revive.${GITHUB_SHA:0:7}" >> $GITHUB_OUTPUT
-
-      - name: create release
-        uses: softprops/action-gh-release@v2
-        with:
-          name: "LLVM binaries release: ${{ steps.resolve-version.outputs.version }}"
-          body: "This release includes binaries of LLVM, used to compile revive itself"
-          make_latest: "false"
-          tag_name: ${{ steps.resolve-version.outputs.version }}
-
-  build-macos:
-    strategy:
-      matrix:
-        os: [macos-14, macos-13]
-        include:
-          - os: macos-13
-            arch: x64
-          - os: macos-14
-            arch: arm64
-    needs: create-release
-    runs-on: ${{ matrix.os }}
-    name: "build-macos-${{ matrix.arch }}"
-    env:
-      RUST_LOG: trace
-    permissions:
-      contents: write # for uploading assets to release
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: install macos deps
-        run: |
-          brew install ninja
-
-      - name: versions
-        run: |
-          rustup show
-          cargo --version
-          cmake --version
-          echo "bash:" && bash --version
-          echo "ninja:" && ninja --version
-          echo "clang:" && clang --version
-
-      - name: Build LLVM
-        run: |
-          make install-llvm
-
-      - name: clean
-        # check removed files
-        run: |
-          cd target-llvm/gnu/target-final/bin/
-          rm diagtool llvm-libtool-darwin llvm-lipo llvm-pdbutil llvm-dwarfdump llvm-nm llvm-readobj llvm-cfi-verify \
-             sancov llvm-debuginfo-analyzer llvm-objdump llvm-profgen llvm-extract llvm-jitlink llvm-c-test llvm-gsymutil llvm-dwp \
-             dsymutil llvm-dwarfutil llvm-exegesis lli clang-rename bugpoint clang-extdef-mapping clang-refactor c-index-test \
-             llvm-reduce llvm-lto clang-linker-wrapper llc llvm-lto2
-
-      - name: package artifacts
-        run: |
-          tar -czf "${{ needs.create-release.outputs.version }}-macos-${{ matrix.arch }}.tar.gz" target-llvm/gnu/target-final
-
-      - name: upload archive to release
-        uses: softprops/action-gh-release@v2
-        with:
-          make_latest: "false"
-          tag_name: ${{ needs.create-release.outputs.version }}
-          files: |
-            ${{ needs.create-release.outputs.version }}-macos-${{ matrix.arch }}.tar.gz
-
-
-  build-linux-all:
-    needs: create-release
-    runs-on: parity-large
-    env:
-      RUST_LOG: trace
-    permissions:
-      contents: write # for uploading assets to release
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: install linux deps
-        run: |
-          sudo apt-get update && sudo apt-get install -y cmake ninja-build curl git libssl-dev pkg-config clang lld musl
-
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: stable
-          components: rust-src
-          target: wasm32-unknown-emscripten
-          rustflags: ""
-
-      - name: versions
-        run: |
-          rustup show
-          cargo --version
-          cmake --version
-          echo "bash:" && bash --version
-          echo "ninja:" && ninja --version
-          echo "clang:" && clang --version
-
-      - name: Build host LLVM
-        run: |
-          make install-llvm
-
-      - name: Build gnu LLVM
-        run: |
-          revive-llvm clone
-          revive-llvm build --llvm-projects lld --llvm-projects clang
-
-      - name: Build musl LLVM
-        run: |
-          revive-llvm --target-env musl build --llvm-projects lld --llvm-projects clang
-
-      - name: Build emscripten LLVM
-        run: |
-          revive-llvm --target-env emscripten clone
-          source emsdk/emsdk_env.sh
-          revive-llvm --target-env emscripten build --llvm-projects lld
-
-      - name: clean
-        # check removed files
-        run: |
-          for target in gnu emscripten musl; do
-            cd target-llvm/${target}/target-final/bin/
-            rm -rf diagtool llvm-libtool-darwin llvm-lipo llvm-pdbutil llvm-dwarfdump llvm-nm llvm-readobj llvm-cfi-verify \
-               sancov llvm-debuginfo-analyzer llvm-objdump llvm-profgen llvm-extract llvm-jitlink llvm-c-test llvm-gsymutil llvm-dwp \
-               dsymutil llvm-dwarfutil llvm-exegesis lli clang-rename bugpoint clang-extdef-mapping clang-refactor c-index-test \
-               llvm-reduce llvm-lto clang-linker-wrapper llc llvm-lto2 llvm-otool llvm-readelf
-            cd -
-          done
-
-      - name: package artifacts
-        run: |
-          tar -czf "${{ needs.create-release.outputs.version }}-x86_64-linux-gnu-linux.tar.gz" target-llvm/gnu/target-final
-          tar -czf "${{ needs.create-release.outputs.version }}-x86_64-linux-musl.tar.gz" target-llvm/musl/target-final
-          tar -czf "${{ needs.create-release.outputs.version }}-wasm32-unknown-emscripten.tar.gz" target-llvm/emscripten/target-final
-
-      - name: upload archive to release
-        uses: softprops/action-gh-release@v2
-        with:
-          make_latest: "false"
-          tag_name: ${{ needs.create-release.outputs.version }}
-          files: |
-            ${{ needs.create-release.outputs.version }}-x86_64-linux-gnu-linux.tar.gz
-            ${{ needs.create-release.outputs.version }}-x86_64-linux-musl.tar.gz
-            ${{ needs.create-release.outputs.version }}-wasm32-unknown-emscripten.tar.gz

.github/workflows/release.yml

@@ -1,366 +0,0 @@
-name: Release
-run-name: Release ${{ github.ref_name }}
-on:
-  push:
-    branches:
-      - "main"
-
-concurrency:
-  group: ${{ github.ref }}-${{ github.workflow }}
-  cancel-in-progress: true
-
-env:
-  #rust-musl-cross:x86_64-musl
-  RUST_MUSL_CROSS_IMAGE: messense/rust-musl-cross@sha256:68b86bc7cb2867259e6b233415a665ff4469c28b57763e78c3bfea1c68091561
-  RUST_LOG: trace
-
-jobs:
-  tag:
-    runs-on: ubuntu-24.04
-    permissions:
-      contents: write
-    outputs:
-      TAG: ${{ steps.versions.outputs.TAG }}
-      PKG_VER: ${{ steps.versions.outputs.PKG_VER }}
-      RELEASE_NOTES: ${{ steps.versions.outputs.RELEASE_NOTES }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-tags: "true"
-          fetch-depth: 0
-
-      - name: Versions
-        id: versions
-        run: |
-          export CURRENT_TAG=$(git describe --tags --abbrev=0 --exclude "llvm-*")
-          export PKG_VER=v$(cat Cargo.toml | grep -A 5 package] | grep version | cut -d '=' -f 2 | tr -d '"' | tr -d " ")
-          echo "Current tag $CURRENT_TAG"
-          echo "Package version $PKG_VER"
-          #
-          echo "PKG_VER=$PKG_VER" >> $GITHUB_OUTPUT
-          if [[ $CURRENT_TAG == $PKG_VER  ]];
-            then
-              echo "Tag is up to date. Nothing to do.";
-              export TAG=old;
-            else
-              echo "Tag was updated.";
-              export TAG=new;
-            fi
-          echo "TAG=$TAG" >> $GITHUB_OUTPUT
-          
-          # Generating release notes early, in order to avoid checkout at the last step
-          export RELEASE_NOTES="$(sed '/^## '${PKG_VER}'/,/^## v/!d' CHANGELOG.md | sed -e '1d' -e '$d')"
-          
-          echo "Release notes:"
-          echo "$RELEASE_NOTES"
-          
-          echo 'RELEASE_NOTES<<EOF' >> $GITHUB_OUTPUT
-          echo "$RELEASE_NOTES" >> $GITHUB_OUTPUT
-          echo 'EOF' >> $GITHUB_OUTPUT
-
-  build-macos:
-    strategy:
-      matrix:
-        os: [macos-14, macos-13]
-        include:
-          - os: macos-13
-            arch: x64
-          - os: macos-14
-            arch: arm64
-    if: ${{ needs.tag.outputs.TAG == 'new' }}
-    runs-on: ${{ matrix.os }}
-    name: "build-macos-${{ matrix.arch }}"
-    needs: [tag]
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Get latest macos ${{ matrix.arch }} LLVM release artifact
-        id: get-llvm-artifact
-        uses: actions/github-script@v7
-        with:
-          result-encoding: string
-          script: |
-            const getReleaseArtifact = require("./.github/workflows/get-release-artifact.js");
-            return await getReleaseArtifact({ 
-              octokit: github, 
-              context, 
-              releasePrefix: "llvm-",
-              artifactSuffix: "-macos-${{ matrix.arch }}"
-            });
-
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: stable
-          components: rust-src
-          target: wasm32-unknown-emscripten
-          rustflags: ""
-
-      - name: install macos deps
-        run: |
-          brew install ninja
-
-      - name: versions
-        run: |
-          rustup show
-          cargo --version
-          cmake --version
-          echo "bash:" && bash --version
-          echo "ninja:" && ninja --version
-          echo "clang:" && clang --version
-
-      - name: download llvm
-        run: |
-          curl -L -o llvm.tar.gz "${{ steps.get-llvm-artifact.outputs.result }}"
-          tar -xvf llvm.tar.gz
-
-      - name: build revive
-        run: |
-          export LLVM_SYS_181_PREFIX=$PWD/target-llvm/gnu/target-final
-          make install-bin
-          cp ./target/release/resolc ./target/release/resolc-${{ matrix.arch }}
-
-      - name: check revive
-        run: |
-          mkdir solc
-          curl -sSLo solc/solc https://github.com/ethereum/solidity/releases/download/v0.8.28/solc-macos
-          chmod +x solc/solc
-          PATH=$PWD/solc:$PATH
-          result=$(./target/release/resolc-${{ matrix.arch }} --bin crates/integration/contracts/flipper.sol)
-          echo $result
-          if [[ $result == *'0x50564d'* ]]; then exit 0; else exit 1; fi
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: "revive-macos-${{ matrix.arch }}"
-          path: |
-            ./target/release/resolc-${{ matrix.arch }}
-          retention-days: 1
-
-  macos-universal-binary:
-    runs-on: macos-14
-    needs: [build-macos]
-    steps:
-      - uses: actions/download-artifact@v4
-        with:
-          pattern: revive-macos-*
-          path: revive-macos
-
-      - name: run lipo
-        run: |
-          lipo revive-macos/revive-macos-arm64/resolc-arm64 revive-macos/revive-macos-x64/resolc-x64 -create -output resolc-macos
-
-      - name: compress macos artifact
-        run: |
-          tar -czf resolc-macos.tar.gz ./resolc-macos
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: revive-macos
-          path: |
-            resolc-macos.tar.gz
-          retention-days: 1
-
-  build-linux-all:
-    if: ${{ needs.tag.outputs.TAG == 'new' }}
-    runs-on: parity-large
-    needs: [tag]
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Get latest linux LLVM release artifact
-        id: get-llvm-musl-artifact
-        uses: actions/github-script@v7
-        with:
-          result-encoding: string
-          script: |
-            const getReleaseArtifact = require("./.github/workflows/get-release-artifact.js")
-            return await getReleaseArtifact({
-              octokit: github,
-              context,
-              releasePrefix: "llvm-",
-              artifactSuffix: "-x86_64-linux-musl"
-            })
-
-      - name: install linux deps
-        run: |
-          sudo apt-get update && sudo apt-get install -y cmake ninja-build \
-          curl git libssl-dev pkg-config clang lld musl
-
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: stable
-          components: rust-src
-          target: wasm32-unknown-emscripten
-          rustflags: ""
-
-      - name: versions
-        run: |
-          rustup show
-          cargo --version
-          cmake --version
-          echo "bash:" && bash --version
-          echo "ninja:" && ninja --version
-          echo "clang:" && clang --version
-
-      - name: download llvm
-        run: |
-          curl -L -o llvm.tar.gz "${{ steps.get-llvm-musl-artifact.outputs.result }}"
-          tar -xvf llvm.tar.gz
-
-      # Build revive
-
-      - name: build musl
-        run: |
-          mkdir resolc-out
-          docker run -v $PWD:/opt/revive $RUST_MUSL_CROSS_IMAGE /bin/bash -c "
-           cd /opt/revive
-           apt update && apt upgrade -y && apt install -y pkg-config
-           export LLVM_SYS_181_PREFIX=/opt/revive/target-llvm/musl/target-final
-           make install-bin
-           cp /root/.cargo/bin/resolc /opt/revive/resolc-out/resolc-static-linux
-           "
-
-      - name: check musl
-        run: |
-          mkdir solc
-          curl -sSLo solc/solc https://github.com/ethereum/solidity/releases/download/v0.8.28/solc-static-linux
-          chmod +x solc/solc
-          PATH=$PWD/solc:$PATH
-          result=$(./resolc-out/resolc-static-linux --bin crates/integration/contracts/flipper.sol)
-          echo $result
-          if [[ $result == *'0x50564d'* ]]; then exit 0; else exit 1; fi
-
-      - name: compress musl artifact
-        run: |
-          tar --strip-components 1 -czf resolc-static-linux.tar.gz ./resolc-out/resolc-static-linux
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: revive-linux
-          path: |
-            ./resolc-static-linux.tar.gz
-          retention-days: 1
-
-      - name: Set Up Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: "20"
-
-      - name: Get latest emscripten LLVM release artifact
-        id: get-llvm-emscripten-artifact
-        uses: actions/github-script@v7
-        with:
-          result-encoding: string
-          script: |
-            const getReleaseArtifact = require("./.github/workflows/get-release-artifact.js")
-            return await getReleaseArtifact({
-              octokit: github,
-              context,
-              releasePrefix: "llvm-",
-              artifactSuffix: "-wasm32-unknown-emscripten"
-            })
-
-      - name: download llvm
-        run: |
-          curl -L -o llvm.tar.gz "${{ steps.get-llvm-emscripten-artifact.outputs.result }}"
-          tar -xvf llvm.tar.gz
-
-      - name: build wasm
-        run: |
-          make install-llvm-builder
-          revive-llvm --target-env emscripten clone
-          export LLVM_SYS_181_PREFIX=$PWD/target-llvm/musl/target-final
-          export REVIVE_LLVM_TARGET_PREFIX=$PWD/target-llvm/emscripten/target-final
-          source emsdk/emsdk_env.sh
-          rustup target add wasm32-unknown-emscripten
-          make install-wasm
-
-      - name: check wasm
-        run: |
-          curl -sSLo solc/soljson.js https://github.com/ethereum/solidity/releases/download/v0.8.28/soljson.js
-          node -e "
-          const soljson = require('solc/soljson');
-          const createRevive = require('./target/wasm32-unknown-emscripten/release/resolc.js');
-
-          const compiler = createRevive();
-          compiler.soljson = soljson;
-
-          const standardJsonInput =
-          {
-            language: 'Solidity',
-            sources: {
-              'MyContract.sol': {
-                content: 'pragma solidity ^0.8.0; contract MyContract { function greet() public pure returns (string memory) { return \'Hello\'; } }',
-              },
-            },
-            settings: { optimizer: { enabled: false } }
-          };
-
-          compiler.writeToStdin(JSON.stringify(standardJsonInput));
-          compiler.callMain(['--standard-json']);
-
-          // Collect output
-          const stdout = compiler.readFromStdout();
-          const stderr = compiler.readFromStderr();
-
-          if (stderr) { console.error(stderr); process.exit(1); }
-
-          let out = JSON.parse(stdout);
-          let bytecode = out.contracts['MyContract.sol']['MyContract'].evm.bytecode.object
-          console.log(bytecode);
-
-          if(!bytecode.startsWith('50564d')) { process.exit(1); }
-          "
-
-      - 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
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: revive-wasm
-          path: |
-            resolc-wasm.tar.gz
-          retention-days: 1
-
-  create-release:
-    needs: [tag, build-linux-all, macos-universal-binary]
-    runs-on: ubuntu-24.04
-    permissions:
-      contents: write
-    outputs:
-      upload_url: ${{ steps.create_release.outputs.result }}
-    steps:
-      - name: Download revive-wasm
-        uses: actions/download-artifact@v4
-        with:
-          name: revive-wasm
-          path: resolc-wasm/
-
-      - name: Download revive-linux
-        uses: actions/download-artifact@v4
-        with:
-          name: revive-linux
-          path: resolc-linux/
-
-      - name: Download revive-macos
-        uses: actions/download-artifact@v4
-        with:
-          name: revive-macos
-          path: resolc-macos/
-
-      - name: create-release
-        uses: softprops/action-gh-release@v2
-        with:
-          body: ${{ needs.tag.outputs.RELEASE_NOTES }}
-          tag_name: ${{ needs.tag.outputs.PKG_VER }}
-          name: ${{ needs.tag.outputs.PKG_VER }}
-          draft: true
-          files: |
-            ./resolc-linux/resolc-static-linux.tar.gz
-            ./resolc-macos/resolc-macos.tar.gz
-            ./resolc-wasm/resolc-wasm.tar.gz

.github/workflows/rust.yml

@@ -32,9 +32,10 @@ jobs:
 
       - name: Install geth
         run: |
-          sudo add-apt-repository -y ppa:ethereum/ethereum
+          git clone https://github.com/xermicus/go-ethereum --branch=cl/fix-runner-state-dump --depth=1
-          sudo apt update
+          cd go-ethereum
-          sudo apt install -y ethereum
+          make all
+          echo "$(pwd)/build/bin/" >> $GITHUB_PATH
 
       - name: Machete
         uses: bnjbvr/cargo-machete@main

CHANGELOG.md

@@ -6,29 +6,8 @@ This is a development pre-release.
 
 Supported `polkadot-sdk` rev: `274a781e8ca1a9432c7ec87593bd93214abbff50`
 
-## v0.1.0-dev.11
-
-This is a development pre-release.
-
-Supported `polkadot-sdk` rev: `274a781e8ca1a9432c7ec87593bd93214abbff50`
-
-### Added
-
-### Changed 
-
-### Fixed
-- A bug causing incorrect loads from the emulated EVM linear memory.
-- A missing integer truncate after switching to 64bit.
-
-## v0.1.0-dev.10
-
-This is a development pre-release.
-
-Supported `polkadot-sdk` rev: `274a781e8ca1a9432c7ec87593bd93214abbff50`
-
 ### Added
 - Support for the `coinbase` opcode.
-- The resolc web JS version.
 
 ### Changed 
 - Missing the `--overwrite` flag emits an error instead of a warning.

Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.1.0-dev.11"
+version = "0.1.0-dev.9"
 authors = [
     "Cyrill Leutwiler <cyrill@parity.io>",
     "Parity Technologies <admin@parity.io>",
@@ -14,31 +14,31 @@ repository = "https://github.com/paritytech/revive"
 rust-version = "1.81.0"
 
 [workspace.dependencies]
-revive-benchmarks = { version = "0.1.0-dev.11", path = "crates/benchmarks" }
+revive-benchmarks = { version = "0.1.0-dev.9", path = "crates/benchmarks" }
-revive-builtins = { version = "0.1.0-dev.11", path = "crates/builtins" }
+revive-builtins = { version = "0.1.0-dev.9", path = "crates/builtins" }
-revive-common = { version = "0.1.0-dev.11", path = "crates/common" }
+revive-common = { version = "0.1.0-dev.9", path = "crates/common" }
-revive-differential = { version = "0.1.0-dev.11", path = "crates/differential" }
+revive-differential = { version = "0.1.0-dev.9", path = "crates/differential" }
-revive-integration = { version = "0.1.0-dev.11", path = "crates/integration" }
+revive-integration = { version = "0.1.0-dev.9", path = "crates/integration" }
-revive-linker = { version = "0.1.0-dev.11", path = "crates/linker" }
+revive-linker = { version = "0.1.0-dev.9", path = "crates/linker" }
-lld-sys = { version = "0.1.0-dev.11", path = "crates/lld-sys" }
+lld-sys = { version = "0.1.0-dev.9", path = "crates/lld-sys" }
-revive-llvm-context = { version = "0.1.0-dev.11", path = "crates/llvm-context" }
+revive-llvm-context = { version = "0.1.0-dev.9", path = "crates/llvm-context" }
-revive-runtime-api = { version = "0.1.0-dev.11", path = "crates/runtime-api" }
+revive-runtime-api = { version = "0.1.0-dev.9", path = "crates/runtime-api" }
-revive-runner = { version = "0.1.0-dev.11", path = "crates/runner" }
+revive-runner = { version = "0.1.0-dev.9", path = "crates/runner" }
-revive-solidity = { version = "0.1.0-dev.11", path = "crates/solidity" }
+revive-solidity = { version = "0.1.0-dev.9", path = "crates/solidity" }
-revive-stdlib = { version = "0.1.0-dev.11", path = "crates/stdlib" }
+revive-stdlib = { version = "0.1.0-dev.9", path = "crates/stdlib" }
-revive-build-utils = { version = "0.1.0-dev.11", path = "crates/build-utils" }
+revive-build-utils = { version = "0.1.0-dev.9", path = "crates/build-utils" }
 
 hex = "0.4.3"
-cc = "1.2"
+cc = "1.0"
 libc = "0.2.169"
-tempfile = "3.17"
+tempfile = "3.8"
 anyhow = "1.0"
 semver = { version = "1.0", features = ["serde"] }
 itertools = "0.14"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", features = ["arbitrary_precision"] }
 regex = "1.10"
-once_cell = "1.20"
+once_cell = "1.19"
 num = "0.4.3"
 sha1 = "0.10"
 sha3 = "0.10"
@@ -47,14 +47,14 @@ which = "7.0"
 path-slash = "0.2"
 rayon = "1.8"
 clap = { version = "4", default-features = false, features = ["derive"] }
-polkavm-common = "0.21.0"
+polkavm-common = "0.19.0"
-polkavm-linker = "0.21.0"
+polkavm-linker = "0.19.0"
-polkavm-disassembler = "0.21.0"
+polkavm-disassembler = "0.19.0"
-polkavm = "0.21.0"
+polkavm = "0.19.0"
-alloy-primitives = { version = "0.8.21", features = ["serde"] }
+alloy-primitives = { version = "0.8.19", features = ["serde"] }
-alloy-sol-types = "0.8.21"
+alloy-sol-types = "0.8.19"
-alloy-genesis = "0.11.1"
+alloy-genesis = "0.11.0"
-alloy-serde = "0.11.1"
+alloy-serde = "0.11.0"
 env_logger = { version = "0.11.6", default-features = false }
 serde_stacker = "0.1.11"
 criterion = { version = "0.5.1", features = ["html_reports"] }
@@ -64,10 +64,10 @@ downloader = "0.2.8"
 flate2 = "1.0.35"
 fs_extra = "1.3.0"
 num_cpus = "1"
-tar = "0.4"
+tar = "0.4.43"
-toml = "0.8"
+toml = "0.8.19"
-assert_cmd = "2.0"
+assert_cmd = "2.0.16"
-assert_fs = "1.1"
+assert_fs = "1.1.2"
 
 # polkadot-sdk and friends
 codec = { version = "3.6.12", default-features = false, package = "parity-scale-codec" }

README.md

@@ -1,5 +1,5 @@
 ![CI](https://github.com/paritytech/revive/actions/workflows/rust.yml/badge.svg)
-[![Docs](https://img.shields.io/badge/Docs-contracts.polkadot.io-brightgreen.svg)](https://contracts.polkadot.io/revive_compiler/)
+[![Docs](https://img.shields.io/badge/Docs-contracts.polkadot.io-brightgreen.svg)](https://contracts.polkadot.io)
 
 # revive
 
@@ -14,7 +14,10 @@ This is experimental software in active development and not ready just yet for p
 Discussion around the development is hosted on the [Polkadot Forum](https://forum.polkadot.network/t/contracts-update-solidity-on-polkavm/6949#a-new-solidity-compiler-1).
 
 ## Installation
-Please consult [the documentation](https://contracts.polkadot.io/revive_compiler/installation) for installation instructions.
+
+`resolc` depends on the [solc](https://github.com/ethereum/solidity) binary installed on your system.
+
+Download and install the `resolc` frontend executable for your platform from our [releases](https://github.com/paritytech/revive/releases).
 
 ## Building from source
 
@@ -22,46 +25,22 @@ Building revive requires a [stable Rust installation](https://rustup.rs/) and a
 
 ### LLVM
 
-`revive` depends on a custom build of LLVM `v18.1.8` with the RISC-V _embedded_ target, including the `compiler-rt` builtins. You can either download a build from our releases (recommended for older hardware) or build it from source.
+`revive` depends on a custom build of LLVM `v18.1.8` with the RISC-V _embedded_ target, including the `compiler-rt` builtins. Use the provided [revive-llvm](crates/llvm-builder/README.md) utility to compile a compatible LLVM build locally and point `$LLVM_SYS_181_PREFIX` to the installation afterwards.
-
-<details>
-  <summary>Download from our LLVM releases</summary>
-
-Download the [latest LLVM build](https://github.com/paritytech/revive/releases?q=LLVM+binaries+release&expanded=true) from our releases.
-
-> **MacOS** users need to clear the `downloaded` attribute from all binaries after extracting the archive:
-> ```sh
-> xattr -rc </path/to/the/extracted/archive>/target-llvm/gnu/target-final/bin/*
-> ```
-
-After extracting the archive, point `$LLVM_SYS_181_PREFIX` to it:
-```sh
-export LLVM_SYS_181_PREFIX=</path/to/the/extracted/archive>/target-llvm/gnu/target-final
-```
-
-</details>
-
-<details>
-  <summary>Building from source</summary>
-
- Use the provided [revive-llvm](crates/llvm-builder/README.md) utility to compile a compatible LLVM build locally and point `$LLVM_SYS_181_PREFIX` to the installation afterwards.
 
 The `Makefile` provides a shortcut target to obtain a compatible LLVM build:
 
-```sh
+```bash
 make install-llvm
 export LLVM_SYS_181_PREFIX=${PWD}/target-llvm/gnu/target-final
 ```
 
-</details>
-
 ### The `resolc` Solidity frontend
 
-To build the `resolc` Solidity frontend executable, make sure you have obtained a compatible LLVM build and did export the `LLVM_SYS_181_PREFIX` environment variable pointing to it (see [above](#LLVM)).
+To build the `resolc` Solidity frontend executable, make sure you have obtained a compatible LLVM build using [revive-llvm](crates/llvm-builder/README.md) and did export the `LLVM_SYS_181_PREFIX` environment variable pointing to it (see [above](#LLVM)).
 
 To install the `resolc` Solidity frontend executable:
 
-```sh
+```bash
 make install-bin
 resolc --version
 ```
@@ -70,10 +49,7 @@ resolc --version
 
 Cross-compile the `resolc.js` frontend executable to Wasm for running it in a Node.js or browser environment. The `REVIVE_LLVM_TARGET_PREFIX` environment variable is used to control the target environment LLVM dependency.
 
-<details>
+```bash
-  <summary>Instructions for cross-compilation to wasm32-unknown-emscripten</summary>
-
-```sh
 # Build the host LLVM dependency with PolkaVM target support
 make install-llvm
 export LLVM_SYS_181_PREFIX=${PWD}/target-llvm/gnu/target-final
@@ -89,23 +65,21 @@ make install-wasm
 make test-wasm
 ```
 
-</details>
+### Development
-
-## Development
 
 Please consult the [Makefile](Makefile) targets to learn how to run tests and benchmarks. 
 Ensure that your branch passes `make test` locally when submitting a pull request.
 
-### Design overview
+## Design overview
-See the [relevant section in our documentation](https://contracts.polkadot.io/revive_compiler/architecture) to learn more about how the compiler works. 
 
-[Frontend](https://github.com/matter-labs/era-compiler-solidity) and [code generator](https://github.com/matter-labs/era-compiler-llvm-context) are based of ZKSync `zksolc` (the project started as a fork of the era compiler).
+`revive` uses [solc](https://github.com/ethereum/solidity/), the Ethereum Solidity compiler, as the [Solidity frontend](crates/solidity/src/lib.rs) to process smart contracts written in Solidity. The YUL IR code (or legacy EVM assembly as a fallback for older `solc` versions) emitted by `solc` is then translated to LLVM IR, targetting [Polkadots `revive` pallet](https://docs.rs/pallet-revive/latest/pallet_revive/trait.SyscallDoc.html).
+[Frontend](https://github.com/matter-labs/era-compiler-solidity) and [code generator](https://github.com/matter-labs/era-compiler-llvm-context) are based of ZKSync `zksolc`.
 
-### Tests
+## Tests
 
 Before running the tests, ensure that Geth (Go Ethereum) is installed on your system. Follow the installation guide here: [Installing Geth](https://geth.ethereum.org/docs/getting-started/installing-geth).
 Once Geth is installed, you can run the tests using the following command:
 
-```sh
+```bash
 make test
 ```

RELEASE.md

@@ -4,14 +4,8 @@ Prior to the first stable release we neither have formal release processes nor d
 
 To create a new pre-release:
 
-1. Merge a release PR which updates the `-dev.X` versions in the workspace `Cargo.toml` and updates the `CHANGELOG.md` accordingly. The release workflow will attempt to build and publish a new release whenever the latest git tag does not match the cargo package version.
+1. Merge a release PR which updates the `-dev.X` versions in the workspace `Cargo.toml` and updates the `CHANGELOG.md` accordingly
-2. Wait for the `Release` workflow to finish. If the workflow fails after the `build-linux-all` step, check if a tag has been created and delete it before restarting or pushing updates. Note: It's more convenient to debug the release workflow in a fork (the fork has to be under the `paritytech` org to access `parity-large` runners).
+2. Push a release tag to `main`
-3. Check draft release on [Releases page](https://github.com/paritytech/revive/releases) and publish (should contain `resolc.js`, `resolc.wasm`, `resolc-web.js`, and `resolc-static-linux` release assets)
+3. Create a __pre-release__ from the tag and manually upload the `resolc` binary from docker image
-4. Update the [contract-docs](https://github.com/paritytech/contract-docs/) accordingly
+4. Manually upload `resolc.js` and `resolc.wasm` from the `build-revive-wasm` action artifacts.
-
+5. Update the [contract-docs](https://github.com/paritytech/contract-docs/) accordingly
-# LLVM release
-
-To create a new LLVM release, run "Release LLVM" workflow. Use current LLVM version as parameter, e.g. `18.1.8`.
-Version suffix will be resolved automatically.  
-The workflows will create new GitHub release, and upload LLVM binaries.
-Next release of resolc will use newly created binaries.  

crates/integration/contracts/MLoad.sol

@@ -1,40 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8.28;
-
-/* runner.json
-{
-    "differential": true,
-    "actions": [
-        {
-            "Instantiate": {
-                "code": {
-                    "Solidity": {
-                        "contract": "MLoad"
-                    }
-                }
-            }
-        },
-        {
-            "Call": {
-                "dest": {
-                    "Instantiated": 0
-                },
-                "data": "e2179b8e"
-            }
-        }
-    ]
-}
-*/
-
-contract MLoad {
-    constructor() payable {
-        assert(g() == 0);
-    }
-
-    function g() public payable returns (uint m) {
-        assembly {
-            m := mload(0)
-        }
-    }
-}

crates/integration/src/tests.rs

@@ -55,7 +55,6 @@ test_spec!(create2, "CreateB", "Create2.sol");
 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");
 
 fn instantiate(path: &str, contract: &str) -> Vec<SpecsAction> {
     vec![Instantiate {

crates/llvm-builder/tests/build.rs

@@ -83,7 +83,6 @@ fn clone_build_and_clean_musl() -> anyhow::Result<()> {
 /// This test verifies that the LLVM repository can be successfully cloned and built in debug mode
 /// with tests and coverage enabled.
 #[test]
-#[cfg(target_os = "linux")]
 fn debug_build_with_tests_coverage() -> anyhow::Result<()> {
     let test_dir = common::TestDir::with_lockfile(None)?;
 
@@ -108,7 +107,6 @@ fn debug_build_with_tests_coverage() -> anyhow::Result<()> {
 
 /// This test verifies that the LLVM repository can be successfully built with address sanitizer.
 #[test]
-#[cfg(target_os = "linux")]
 fn build_with_sanitizers() -> anyhow::Result<()> {
     let test_dir = common::TestDir::with_lockfile(None)?;
 
@@ -131,7 +129,7 @@ fn build_with_sanitizers() -> anyhow::Result<()> {
 
 /// Tests the clone, build, and clean process of the LLVM repository for the emscripten target.
 #[test]
-#[cfg(target_os = "linux")]
+#[cfg(any(target_os = "linux", target_os = "macos"))]
 fn clone_build_and_clean_emscripten() -> anyhow::Result<()> {
     let test_dir = common::TestDir::with_lockfile(None)?;
     let command = Command::cargo_bin(common::REVIVE_LLVM)?;

crates/llvm-context/src/polkavm/const/mod.rs

@@ -6,9 +6,15 @@ pub const LLVM_VERSION: semver::Version = semver::Version::new(18, 1, 4);
 /// The pointer width sized type.
 pub static XLEN: usize = revive_common::BIT_LENGTH_X32;
 
+/// The heap memory pointer pointer global variable name.
+pub static GLOBAL_HEAP_MEMORY_POINTER: &str = "memory_pointer";
+
 /// The calldata size global variable name.
 pub static GLOBAL_CALLDATA_SIZE: &str = "calldatasize";
 
+/// The call flags global variable name.
+pub static GLOBAL_CALL_FLAGS: &str = "call_flags";
+
 /// The deployer call header size that consists of:
 /// - bytecode hash (32 bytes)
 pub const DEPLOYER_CALL_HEADER_SIZE: usize = revive_common::BYTE_LENGTH_WORD;

crates/llvm-context/src/polkavm/context/function/mod.rs

@@ -212,6 +212,22 @@ impl<'ctx> Function<'ctx> {
         }
     }
 
+    /// Sets the exception handler attributes.
+    pub fn set_exception_handler_attributes(
+        llvm: &'ctx inkwell::context::Context,
+        declaration: Declaration<'ctx>,
+    ) {
+        Self::set_attributes(llvm, declaration, vec![Attribute::NoInline], false);
+    }
+
+    /// Sets the CXA-throw attributes.
+    pub fn set_cxa_throw_attributes(
+        llvm: &'ctx inkwell::context::Context,
+        declaration: Declaration<'ctx>,
+    ) {
+        Self::set_attributes(llvm, declaration, vec![Attribute::NoProfile], false);
+    }
+
     /// Sets the pure function attributes.
     pub fn set_pure_function_attributes(
         llvm: &'ctx inkwell::context::Context,

crates/llvm-context/src/polkavm/context/function/runtime/entry.rs

@@ -24,6 +24,22 @@ impl Entry {
     where
         D: Dependency + Clone,
     {
+        context.set_global(
+            crate::polkavm::GLOBAL_HEAP_MEMORY_POINTER,
+            context.llvm().ptr_type(AddressSpace::Heap.into()),
+            AddressSpace::Stack,
+            context.xlen_type().get_undef(),
+        );
+        context.build_store(
+            context
+                .get_global(crate::polkavm::GLOBAL_HEAP_MEMORY_POINTER)?
+                .into(),
+            context.build_sbrk(
+                context.xlen_type().const_zero(),
+                context.xlen_type().const_zero(),
+            )?,
+        )?;
+
         context.set_global(
             crate::polkavm::GLOBAL_CALLDATA_SIZE,
             context.xlen_type(),
@@ -31,6 +47,13 @@ impl Entry {
             context.xlen_type().get_undef(),
         );
 
+        context.set_global(
+            crate::polkavm::GLOBAL_CALL_FLAGS,
+            context.word_type(),
+            AddressSpace::Stack,
+            context.word_const(0),
+        );
+
         Ok(())
     }
 
@@ -47,11 +70,6 @@ impl Entry {
             .build_runtime_call(revive_runtime_api::polkavm_imports::CALL_DATA_SIZE, &[])
             .expect("the call_data_size syscall method should return a value")
             .into_int_value();
-        let call_data_size_value = context.builder().build_int_truncate(
-            call_data_size_value,
-            context.xlen_type(),
-            "call_data_size_truncated",
-        )?;
         context
             .builder()
             .build_store(call_data_size_pointer, call_data_size_value)?;
@@ -72,6 +90,13 @@ impl Entry {
             .borrow()
             .get_nth_param(Self::ARGUMENT_INDEX_CALL_FLAGS);
 
+        context.set_global(
+            crate::polkavm::GLOBAL_CALL_FLAGS,
+            is_deploy.get_type(),
+            AddressSpace::Stack,
+            is_deploy.into_int_value(),
+        );
+
         let deploy_code_call_block = context.append_basic_block("deploy_code_call_block");
         let runtime_code_call_block = context.append_basic_block("runtime_code_call_block");
 

crates/llvm-context/src/polkavm/context/mod.rs

@@ -1209,17 +1209,17 @@ where
 
     /// Build a call to PolkaVM `msize` for querying the linear memory size.
     pub fn build_msize(&self) -> anyhow::Result<inkwell::values::IntValue<'ctx>> {
-        let memory_size_pointer = self
+        Ok(self
-            .module()
+            .builder()
-            .get_global(revive_runtime_api::polkavm_imports::MEMORY_SIZE)
+            .build_call(
-            .expect("the memory size symbol should have been declared")
+                self.runtime_api_method(revive_runtime_api::polkavm_imports::MEMORY_SIZE),
-            .as_pointer_value();
+                &[],
-        let memory_size_value = self.builder().build_load(
+                "call_msize",
-            self.xlen_type(),
+            )?
-            memory_size_pointer,
+            .try_as_basic_value()
-            "memory_size_value",
+            .left()
-        )?;
+            .expect("sbrk returns an int")
-        Ok(memory_size_value.into_int_value())
+            .into_int_value())
     }
 
     /// Call PolkaVM `sbrk` for extending the heap by `offset` + `size`,
@@ -1265,9 +1265,8 @@ where
         self.build_heap_alloc(offset, length)?;
 
         let heap_start = self
-            .module()
+            .get_global(crate::polkavm::GLOBAL_HEAP_MEMORY_POINTER)?
-            .get_global(revive_runtime_api::polkavm_imports::MEMORY)
+            .value
-            .expect("the memory symbol should have been declared")
             .as_pointer_value();
         Ok(self.build_gep(
             Pointer::new(self.byte_type(), AddressSpace::Stack, heap_start),

crates/runtime-api/src/polkavm_imports.c

@@ -8,8 +8,8 @@
 #define EVM_WORD_SIZE 32
 #define ALIGN(size) ((size + EVM_WORD_SIZE - 1) & ~(EVM_WORD_SIZE - 1))
 #define MAX_MEMORY_SIZE (64 * 1024)
-char __memory[MAX_MEMORY_SIZE];
+static char __memory[MAX_MEMORY_SIZE];
-uint32_t __memory_size = 0;
+static uint32_t __memory_size = 0;
 
 void *  __sbrk_internal(uint32_t offset, uint32_t size) {
     if (offset >= MAX_MEMORY_SIZE || size > MAX_MEMORY_SIZE) {
@@ -27,6 +27,10 @@ void * __sbrk_internal(uint32_t offset, uint32_t size) {
     return (void *)&__memory[__memory_size];
 }
 
+uint32_t __msize() {
+    return __memory_size;
+}
+
 void * memset(void *b, int c, size_t len) {
     uint8_t *dest = b;
     while (len-- > 0) *dest++ = c;

crates/runtime-api/src/polkavm_imports.rs

@@ -1,15 +1,19 @@
+//! This crate vendors the [PolkaVM][0] C API and provides a LLVM module for interacting
+//! with the `pallet-revive` runtime API.
+//! At present, the revive pallet requires blobs to export `call` and `deploy`,
+//! and offers a bunch of [runtime API methods][1]. The provided [module] implements
+//! those exports and imports.
+//! [0]: [https://crates.io/crates/polkavm]
+//! [1]: [https://docs.rs/pallet-contracts/26.0.0/pallet_contracts/api_doc/index.html]
+
 use inkwell::{context::Context, memory_buffer::MemoryBuffer, module::Module, support::LLVMString};
 
 include!(concat!(env!("OUT_DIR"), "/polkavm_imports.rs"));
 
-/// The emulated EVM heap memory global symbol.
-pub static MEMORY: &str = "__memory";
-
-/// The emulated EVM heap memory size global symbol.
-pub static MEMORY_SIZE: &str = "__memory_size";
-
 pub static SBRK: &str = "__sbrk_internal";
 
+pub static MEMORY_SIZE: &str = "__msize";
+
 pub static ADDRESS: &str = "address";
 
 pub static BALANCE: &str = "balance";
@@ -78,8 +82,9 @@ pub static WEIGHT_TO_FEE: &str = "weight_to_fee";
 
 /// All imported runtime API symbols.
 /// Useful for configuring common attributes and linkage.
-pub static IMPORTS: [&str; 34] = [
+pub static IMPORTS: [&str; 35] = [
     SBRK,
+    MEMORY_SIZE,
     ADDRESS,
     BALANCE,
     BALANCE_OF,

crates/solidity/src/tests/cli-tests/package.json

@@ -16,11 +16,11 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@types/jest": "^29.5.14",
+    "@types/jest": "^29.5.11",
     "@types/shelljs": "^0.8.15",
     "jest": "^29.7.0",
     "shelljs": "^0.8.5",
-    "ts-jest": "^29.2.5",
+    "ts-jest": "^29.1.1",
-    "typescript": "^5.7.3"
+    "typescript": "^5.3.3"
   }
 }

crates/solidity/src/yul/parser/statement/expression/function_call/mod.rs

@@ -943,7 +943,7 @@ impl FunctionCall {
             Name::BlobHash => {
                 let _arguments = self.pop_arguments_llvm::<D, 1>(context)?;
                 anyhow::bail!(
-                    "{} The `BLOBHASH` instruction is not supported in revive",
+                    "{} The `BLOBHASH` instruction is not supported until zkVM v1.5.0",
                     location
                 );
             }
@@ -958,7 +958,7 @@ impl FunctionCall {
             }
             Name::BlobBaseFee => {
                 anyhow::bail!(
-                    "{} The `BLOBBASEFEE` instruction is not supported in revive",
+                    "{} The `BLOBBASEFEE` instruction is not supported until zkVM v1.5.0",
                     location
                 );
             }

package.json

@@ -3,7 +3,7 @@
     "private": true,
     "scripts": {
         "test:cli": "npm run test -w crates/solidity/src/tests/cli-tests",
-        "test:wasm": "npm run test:node -w js",
+        "test:wasm": "npm run test:all -w js",
         "build:package": "npm run build:package -w js"
     },
     "workspaces": [