mirror of
https://github.com/pezkuwichain/revive.git
synced 2026-06-14 14:31:05 +00:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Cyrill Leutwiler
|
9c83352fdb |
@@ -94,7 +94,7 @@ jobs:
|
||||
|
||||
- name: Install LLVM Builder
|
||||
run: |
|
||||
cargo install --locked --force --path crates/llvm-builder
|
||||
cargo install --path crates/llvm-builder
|
||||
|
||||
- name: Clone LLVM
|
||||
run: |
|
||||
|
||||
@@ -44,7 +44,7 @@ jobs:
|
||||
exit 0
|
||||
fi
|
||||
|
||||
export PKG_VER=v$(cat crates/resolc/Cargo.toml | grep -A 5 package] | grep version | cut -d '=' -f 2 | tr -d '"' | tr -d " ")
|
||||
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"
|
||||
#
|
||||
@@ -143,7 +143,7 @@ jobs:
|
||||
runs-on: ubuntu-24.04
|
||||
needs: [check-version-changed]
|
||||
env:
|
||||
RELEASE_RESOLC_WASM_URI: https://github.com/paritytech/revive/releases/download/${{ github.ref_name }}/resolc.wasm
|
||||
RELEASE_RESOLC_WASM_URI: https://github.com/paritytech/revive-workflow-test/releases/download/${{ github.ref_name }}/resolc.wasm
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||
|
||||
@@ -6,35 +6,6 @@ This is a development pre-release.
|
||||
|
||||
Supported `polkadot-sdk` rev: `2503.0.1`
|
||||
|
||||
## v0.3.0
|
||||
|
||||
This is a development pre-release.
|
||||
|
||||
Supported `polkadot-sdk` rev: `2503.0.1`
|
||||
|
||||
### Fixed
|
||||
|
||||
- llvm-context: Bugfix the SAR YUL builtin translation.
|
||||
- runtime-api: Add the missing `memset` builtin.
|
||||
- npm package: Bugfix the exports field defined in the `package.json`.
|
||||
|
||||
|
||||
## v0.2.0
|
||||
|
||||
This is a development pre-release.
|
||||
|
||||
Supported `polkadot-sdk` rev: `2503.0.1`
|
||||
|
||||
### Changed
|
||||
|
||||
- Removed the license printer from the `resolc` binary.
|
||||
- EVM bytecode is no longer requested from solc (except in test utils) leading to less compilation work in the pipeline.
|
||||
|
||||
### Fixed
|
||||
|
||||
- solc-json-interface: Serializing of any custom key in the JSON input is only skipped if not provided.
|
||||
- npm package resolution no longer fails with an 'ERR_PACKAGE_PATH_NOT_EXPORTED' error for packages defining exports fields in the `package.json`.
|
||||
|
||||
## v0.1.0
|
||||
|
||||
This is a development pre-release.
|
||||
|
||||
Generated
+327
-447
File diff suppressed because it is too large
Load Diff
+35
-36
@@ -3,7 +3,7 @@ resolver = "2"
|
||||
members = ["crates/*"]
|
||||
|
||||
[workspace.package]
|
||||
version = "0.1.0"
|
||||
version = "0.1.0-dev.16"
|
||||
authors = [
|
||||
"Cyrill Leutwiler <cyrill@parity.io>",
|
||||
"Parity Technologies <admin@parity.io>",
|
||||
@@ -14,57 +14,56 @@ repository = "https://github.com/paritytech/revive"
|
||||
rust-version = "1.85.0"
|
||||
|
||||
[workspace.dependencies]
|
||||
resolc = { version = "0.3.0", path = "crates/resolc" }
|
||||
revive-benchmarks = { version = "0.1.0", path = "crates/benchmarks" }
|
||||
revive-builtins = { version = "0.1.0", path = "crates/builtins" }
|
||||
revive-common = { version = "0.1.0", path = "crates/common" }
|
||||
revive-differential = { version = "0.1.0", path = "crates/differential" }
|
||||
revive-integration = { version = "0.1.1", path = "crates/integration" }
|
||||
revive-linker = { version = "0.1.0", path = "crates/linker" }
|
||||
lld-sys = { version = "0.1.0", path = "crates/lld-sys" }
|
||||
revive-llvm-context = { version = "0.3.0", path = "crates/llvm-context" }
|
||||
revive-runtime-api = { version = "0.2.0", path = "crates/runtime-api" }
|
||||
revive-runner = { version = "0.1.0", path = "crates/runner" }
|
||||
revive-solc-json-interface = { version = "0.2.0", path = "crates/solc-json-interface" }
|
||||
revive-stdlib = { version = "0.1.1", path = "crates/stdlib" }
|
||||
revive-build-utils = { version = "0.1.0", path = "crates/build-utils" }
|
||||
revive-yul = { version = "0.2.1", path = "crates/yul" }
|
||||
revive-benchmarks = { version = "0.1.0-dev.16", path = "crates/benchmarks" }
|
||||
revive-builtins = { version = "0.1.0-dev.16", path = "crates/builtins" }
|
||||
revive-common = { version = "0.1.0-dev.16", path = "crates/common" }
|
||||
revive-differential = { version = "0.1.0-dev.16", path = "crates/differential" }
|
||||
revive-integration = { version = "0.1.0-dev.16", path = "crates/integration" }
|
||||
revive-linker = { version = "0.1.0-dev.16", path = "crates/linker" }
|
||||
lld-sys = { version = "0.1.0-dev.16", path = "crates/lld-sys" }
|
||||
revive-llvm-context = { version = "0.1.0-dev.16", path = "crates/llvm-context" }
|
||||
revive-runtime-api = { version = "0.1.0-dev.16", path = "crates/runtime-api" }
|
||||
revive-runner = { version = "0.1.0-dev.16", path = "crates/runner" }
|
||||
revive-solc-json-interface = { version = "0.1.0-dev.16", path = "crates/solc-json-interface" }
|
||||
revive-solidity = { version = "0.1.0-dev.16", path = "crates/solidity" }
|
||||
revive-stdlib = { version = "0.1.0-dev.16", path = "crates/stdlib" }
|
||||
revive-build-utils = { version = "0.1.0-dev.16", path = "crates/build-utils" }
|
||||
|
||||
hex = "0.4.3"
|
||||
cc = "1.2"
|
||||
libc = "0.2.172"
|
||||
tempfile = "3.20"
|
||||
tempfile = "3.17"
|
||||
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.11"
|
||||
once_cell = "1.21"
|
||||
regex = "1.10"
|
||||
once_cell = "1.20"
|
||||
num = "0.4.3"
|
||||
sha1 = "0.10"
|
||||
sha3 = "0.10"
|
||||
thiserror = "2.0"
|
||||
which = "7.0"
|
||||
path-slash = "0.2"
|
||||
rayon = "1.10"
|
||||
rayon = "1.8"
|
||||
clap = { version = "4", default-features = false, features = ["derive"] }
|
||||
polkavm-common = "0.24.0"
|
||||
polkavm-linker = "0.24.0"
|
||||
polkavm-disassembler = "0.24.0"
|
||||
polkavm = "0.24.0"
|
||||
alloy-primitives = { version = "1.1", features = ["serde"] }
|
||||
alloy-sol-types = "1.1"
|
||||
alloy-genesis = "1.0"
|
||||
alloy-serde = "1.0"
|
||||
env_logger = { version = "0.11.8", default-features = false }
|
||||
serde_stacker = "0.1.12"
|
||||
criterion = { version = "0.6", features = ["html_reports"] }
|
||||
log = { version = "0.4.27" }
|
||||
git2 = { version = "0.20.2", default-features = false }
|
||||
polkavm-common = "0.21.0"
|
||||
polkavm-linker = "0.21.0"
|
||||
polkavm-disassembler = "0.21.0"
|
||||
polkavm = "0.21.0"
|
||||
alloy-primitives = { version = "0.8.21", features = ["serde"] }
|
||||
alloy-sol-types = "0.8.21"
|
||||
alloy-genesis = "0.11.1"
|
||||
alloy-serde = "0.11.1"
|
||||
env_logger = { version = "0.11.6", default-features = false }
|
||||
serde_stacker = "0.1.11"
|
||||
criterion = { version = "0.5.1", features = ["html_reports"] }
|
||||
log = { version = "0.4.25" }
|
||||
git2 = { version = "0.20.0", default-features = false }
|
||||
downloader = "0.2.8"
|
||||
flate2 = "1.1"
|
||||
fs_extra = "1.3"
|
||||
flate2 = "1.0.35"
|
||||
fs_extra = "1.3.0"
|
||||
num_cpus = "1"
|
||||
tar = "0.4"
|
||||
toml = "0.8"
|
||||
@@ -72,7 +71,7 @@ assert_cmd = "2.0"
|
||||
assert_fs = "1.1"
|
||||
|
||||
# polkadot-sdk and friends
|
||||
codec = { version = "3.7.5", default-features = false, package = "parity-scale-codec" }
|
||||
codec = { version = "3.6.12", default-features = false, package = "parity-scale-codec" }
|
||||
scale-info = { version = "2.11.6", default-features = false }
|
||||
polkadot-sdk = { version = "2503.0.1" }
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
machete \
|
||||
test \
|
||||
test-integration \
|
||||
test-resolc \
|
||||
test-solidity \
|
||||
test-workspace \
|
||||
test-cli \
|
||||
test-wasm \
|
||||
@@ -24,24 +24,24 @@
|
||||
install: install-bin install-npm
|
||||
|
||||
install-bin:
|
||||
cargo install --force --locked --path crates/resolc
|
||||
cargo install --locked --path crates/solidity
|
||||
|
||||
install-npm:
|
||||
npm install && npm fund
|
||||
|
||||
install-wasm: install-npm
|
||||
cargo build --target wasm32-unknown-emscripten -p resolc --release --no-default-features
|
||||
cargo build --target wasm32-unknown-emscripten -p revive-solidity --release --no-default-features
|
||||
npm run build:package
|
||||
|
||||
install-llvm-builder:
|
||||
cargo install --force --locked --path crates/llvm-builder
|
||||
cargo install --path crates/llvm-builder
|
||||
|
||||
install-llvm: install-llvm-builder
|
||||
revive-llvm clone
|
||||
revive-llvm build --llvm-projects lld --llvm-projects clang
|
||||
|
||||
install-revive-runner:
|
||||
cargo install --locked --force --path crates/runner --no-default-features
|
||||
cargo install --path crates/runner --no-default-features --locked
|
||||
|
||||
format:
|
||||
cargo fmt --all --check
|
||||
@@ -58,8 +58,8 @@ test: format clippy machete test-cli test-workspace install-revive-runner
|
||||
test-integration: install-bin
|
||||
cargo test --package revive-integration
|
||||
|
||||
test-resolc: install
|
||||
cargo test --package resolc
|
||||
test-solidity: install
|
||||
cargo test --package revive-solidity
|
||||
|
||||
test-workspace: install
|
||||
cargo test --workspace --exclude revive-llvm-builder
|
||||
@@ -90,6 +90,6 @@ clean:
|
||||
cargo clean ; \
|
||||
revive-llvm clean ; \
|
||||
rm -rf node_modules ; \
|
||||
rm -rf crates/resolc/src/tests/cli-tests/artifacts ; \
|
||||
cargo uninstall resolc ; \
|
||||
rm -rf crates/solidity/src/tests/cli-tests/artifacts ; \
|
||||
cargo uninstall revive-solidity ; \
|
||||
cargo uninstall revive-llvm-builder ;
|
||||
|
||||
@@ -14,39 +14,7 @@ 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
|
||||
Building Solidity contracts for PolkaVM requires installing the following two compilers:
|
||||
- `resolc`: The revive Solidity compiler YUL frontend and PolkaVM code generator (provided by this repository).
|
||||
- `solc`: The [Ethereum Solidity reference compiler](https://github.com/ethereum/solidity/) implemenation.`resolc` uses `solc` during the compilation process, please refer to the [Ethereum Solidity documentation](https://docs.soliditylang.org/en/latest/installing-solidity.html) for installation instructions.
|
||||
|
||||
### `resolc` binary releases
|
||||
`resolc` is distributed as a standalone binary (with `solc` as the only external dependency). Please download one of our [binary releases](https://github.com/paritytech/revive/releases) for your target platform and mind the platform specific instructions below.
|
||||
|
||||
<details>
|
||||
<summary>MacOS users</summary>
|
||||
|
||||
> **MacOS** users need to clear the `downloaded` attribute from the binary and set the executable flag.
|
||||
> ```sh
|
||||
> xattr -rc resolc-universal-apple-darwin
|
||||
> chmod +x resolc-universal-apple-darwin
|
||||
> ```
|
||||
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary>Linux users</summary>
|
||||
|
||||
> **Linux** users need to set the executable flag.
|
||||
> ```sh
|
||||
> chmod +x resolc-x86_64-unknown-linux-musl
|
||||
> ```
|
||||
|
||||
</details>
|
||||
|
||||
|
||||
### `resolc` NPM package
|
||||
We distribute the revive compiler as [node.js module](https://www.npmjs.com/package/@parity/resolc) and [hardhat plugin](https://www.npmjs.com/package/@parity/hardhat-polkadot-resolc).
|
||||
|
||||
Note: The `solc` dependency is bundled via NPM packaging and defaults to the latest supported version.
|
||||
Please consult [the documentation](https://contracts.polkadot.io/revive_compiler/installation) for installation instructions.
|
||||
|
||||
## Building from source
|
||||
|
||||
@@ -131,6 +99,8 @@ Ensure that your branch passes `make test` locally when submitting a pull reques
|
||||
### 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).
|
||||
|
||||
### 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).
|
||||
@@ -139,8 +109,3 @@ Once Geth is installed, you can run the tests using the following command:
|
||||
```sh
|
||||
make test
|
||||
```
|
||||
# Acknowledgements
|
||||
|
||||
The revive compiler project, after some early experiments with EVM bytecode translations, decided to fork the `era-compiler` framework.
|
||||
[Frontend](https://github.com/matter-labs/era-compiler-solidity), [code generator](https://github.com/matter-labs/era-compiler-llvm-context) and some supporting libraries are based of ZKSync `zksolc`. I'd like to express my gratitude and thank the original authors for providing a useable code base under a generous license.
|
||||
|
||||
|
||||
+3
-7
@@ -4,15 +4,11 @@ Prior to the first stable release we neither have formal release processes nor d
|
||||
|
||||
To create a new pre-release:
|
||||
|
||||
1. Create a release PR which, if necessary:
|
||||
- Updates the versions in the workspace `Cargo.toml`
|
||||
- Updates the version in each crate `Cargo.toml`
|
||||
- Updates the version of the NPM package in `js/resolc/package.json`
|
||||
- Updates the `CHANGELOG.md` to reflect all observable changes
|
||||
1. Create a release PR which updates the `-dev.X` versions in the workspace `Cargo.toml` and updates the `CHANGELOG.md` accordingly.
|
||||
2. If the CI passes, merge the release PR.
|
||||
3. Push a `vX.Y.Z` tag that has the same version as in `Cargo.toml`
|
||||
3. Push a tag that has the same `-dev.X` version as in `Cargo.toml`
|
||||
4. The release workflow will attempt to build and publish a new pre-release if the latest tag does match the cargo package version.
|
||||
5. Wait for the `Release` workflow to finish. It should create the pre-release with the same name.
|
||||
5. Wait for the `Release` workflow to finish. It should create the pre-release with the same `-dev.X` name.
|
||||
6. Check that pre-release was created on the [Releases page](https://github.com/paritytech/revive/releases) with all artifacts.
|
||||
7. After the release is published, another workflow should start automatically and update json files in https://github.com/paritytech/resolc-bin. Check the changes.
|
||||
8. Update the [contract-docs](https://github.com/paritytech/contract-docs/) accordingly
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
[package]
|
||||
name = "revive-differential"
|
||||
description = "utilities for differential testing the revive compiler against EVM"
|
||||
version.workspace = true
|
||||
license.workspace = true
|
||||
edition.workspace = true
|
||||
@@ -14,4 +13,4 @@ serde = { workspace = true }
|
||||
serde_json = { workspace = true }
|
||||
alloy-primitives = { workspace = true, features = ["serde"] }
|
||||
alloy-genesis = { workspace = true }
|
||||
alloy-serde = { workspace = true }
|
||||
alloy-serde = { workspace = true }
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "revive-integration"
|
||||
version = "0.1.1"
|
||||
version.workspace = true
|
||||
license.workspace = true
|
||||
edition.workspace = true
|
||||
repository.workspace = true
|
||||
@@ -13,7 +13,7 @@ alloy-sol-types = { workspace = true }
|
||||
hex = { workspace = true }
|
||||
serde_json = { workspace = true }
|
||||
|
||||
resolc = { workspace = true }
|
||||
revive-solidity = { workspace = true }
|
||||
revive-runner = { workspace = true }
|
||||
revive-llvm-context = { workspace = true }
|
||||
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
// SPDX-License-Identifier: MIT
|
||||
pragma solidity ^0.8;
|
||||
|
||||
/* runner.json
|
||||
{
|
||||
"differential": true,
|
||||
"actions": [
|
||||
{
|
||||
"Instantiate": {
|
||||
"code": {
|
||||
"Solidity": {
|
||||
"contract": "SAR"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
*/
|
||||
|
||||
contract SAR {
|
||||
constructor() payable {
|
||||
assert(sar(0x03, 0x01) == 0x01);
|
||||
assert(
|
||||
sar(
|
||||
0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff,
|
||||
0x01
|
||||
) == 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
||||
);
|
||||
assert(
|
||||
sar(
|
||||
0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff,
|
||||
0xff
|
||||
) == 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
||||
);
|
||||
assert(
|
||||
sar(
|
||||
0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff,
|
||||
0x100
|
||||
) == 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
||||
);
|
||||
}
|
||||
|
||||
function sar(uint256 a, uint256 b) public pure returns (uint256 c) {
|
||||
assembly {
|
||||
c := sar(b, a)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,8 @@
|
||||
use alloy_primitives::{Address, Bytes, I256, U256};
|
||||
use alloy_sol_types::{sol, SolCall, SolConstructor};
|
||||
|
||||
use resolc::test_utils::*;
|
||||
use revive_llvm_context::OptimizerSettings;
|
||||
use revive_solidity::test_utils::*;
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct Contract {
|
||||
|
||||
@@ -60,7 +60,6 @@ test_spec!(mload, "MLoad", "MLoad.sol");
|
||||
test_spec!(delegate_no_contract, "DelegateCaller", "DelegateCaller.sol");
|
||||
test_spec!(function_type, "FunctionType", "FunctionType.sol");
|
||||
test_spec!(layout_at, "LayoutAt", "LayoutAt.sol");
|
||||
test_spec!(shift_arithmetic_right, "SAR", "SAR.sol");
|
||||
|
||||
fn instantiate(path: &str, contract: &str) -> Vec<SpecsAction> {
|
||||
vec![Instantiate {
|
||||
|
||||
@@ -6,7 +6,7 @@ authors = [
|
||||
"Anton Baliasnikov <aba@matterlabs.dev>",
|
||||
"Cyrill Leutwiler <cyrill@parity.io>",
|
||||
]
|
||||
version = "0.2.0"
|
||||
version.workspace = true
|
||||
license.workspace = true
|
||||
edition.workspace = true
|
||||
repository.workspace = true
|
||||
|
||||
@@ -22,7 +22,7 @@ impl std::str::FromStr for BuildType {
|
||||
"Release" => Ok(Self::Release),
|
||||
"RelWithDebInfo" => Ok(Self::RelWithDebInfo),
|
||||
"MinSizeRel" => Ok(Self::MinSizeRel),
|
||||
value => Err(format!("Unsupported build type: `{value}`")),
|
||||
value => Err(format!("Unsupported build type: `{}`", value)),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@ impl std::str::FromStr for CcacheVariant {
|
||||
match value {
|
||||
"ccache" => Ok(Self::Ccache),
|
||||
"sccache" => Ok(Self::Sccache),
|
||||
value => Err(format!("Unsupported ccache variant: `{value}`")),
|
||||
value => Err(format!("Unsupported ccache variant: `{}`", value)),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -127,22 +127,23 @@ pub fn build(
|
||||
sanitizer: Option<sanitizer::Sanitizer>,
|
||||
enable_valgrind: bool,
|
||||
) -> anyhow::Result<()> {
|
||||
log::trace!("build type: {build_type:?}");
|
||||
log::trace!("target env: {target_env:?}");
|
||||
log::trace!("targets: {targets:?}");
|
||||
log::trace!("llvm projects: {llvm_projects:?}");
|
||||
log::trace!("enable rtti: {enable_rtti:?}");
|
||||
log::trace!("default target: {default_target:?}");
|
||||
log::trace!("eneable tests: {enable_tests:?}");
|
||||
log::trace!("enable_coverage: {enable_coverage:?}");
|
||||
log::trace!("extra args: {extra_args:?}");
|
||||
log::trace!("sanitzer: {sanitizer:?}");
|
||||
log::trace!("enable valgrind: {enable_valgrind:?}");
|
||||
log::trace!("build type: {:?}", build_type);
|
||||
log::trace!("target env: {:?}", target_env);
|
||||
log::trace!("targets: {:?}", targets);
|
||||
log::trace!("llvm projects: {:?}", llvm_projects);
|
||||
log::trace!("enable rtti: {:?}", enable_rtti);
|
||||
log::trace!("default target: {:?}", default_target);
|
||||
log::trace!("eneable tests: {:?}", enable_tests);
|
||||
log::trace!("enable_coverage: {:?}", enable_coverage);
|
||||
log::trace!("extra args: {:?}", extra_args);
|
||||
log::trace!("sanitzer: {:?}", sanitizer);
|
||||
log::trace!("enable valgrind: {:?}", enable_valgrind);
|
||||
|
||||
if !PathBuf::from(LLVMPath::DIRECTORY_LLVM_SOURCE).exists() {
|
||||
log::error!(
|
||||
"LLVM project source directory {} does not exist (run `revive-llvm --target-env {target_env} clone`)",
|
||||
LLVMPath::DIRECTORY_LLVM_SOURCE
|
||||
"LLVM project source directory {} does not exist (run `revive-llvm --target-env {} clone`)",
|
||||
LLVMPath::DIRECTORY_LLVM_SOURCE,
|
||||
target_env
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ impl std::str::FromStr for LLVMProject {
|
||||
"lld" => Ok(Self::LLD),
|
||||
"lldb" => Ok(Self::LLDB),
|
||||
"mlir" => Ok(Self::MLIR),
|
||||
value => Err(format!("Unsupported LLVM project to enable: `{value}`")),
|
||||
value => Err(format!("Unsupported LLVM project to enable: `{}`", value)),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@ impl TryFrom<&PathBuf> for Lock {
|
||||
fn try_from(path: &PathBuf) -> Result<Self, Self::Error> {
|
||||
let mut config_str = String::new();
|
||||
let mut config_file =
|
||||
File::open(path).with_context(|| format!("Error opening {path:?} file"))?;
|
||||
File::open(path).with_context(|| format!("Error opening {:?} file", path))?;
|
||||
config_file.read_to_string(&mut config_str)?;
|
||||
Ok(toml::from_str(&config_str)?)
|
||||
}
|
||||
|
||||
@@ -29,7 +29,7 @@ impl FromStr for Platform {
|
||||
fn from_str(value: &str) -> Result<Self, Self::Err> {
|
||||
match value {
|
||||
"PolkaVM" => Ok(Self::PolkaVM),
|
||||
value => Err(format!("Unsupported platform: `{value}`")),
|
||||
value => Err(format!("Unsupported platform: `{}`", value)),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -69,8 +69,8 @@ fn main_inner() -> anyhow::Result<()> {
|
||||
})
|
||||
.collect();
|
||||
|
||||
log::debug!("extra_args: {extra_args:#?}");
|
||||
log::debug!("extra_args_unescaped: {extra_args_unescaped:#?}");
|
||||
log::debug!("extra_args: {:#?}", extra_args);
|
||||
log::debug!("extra_args_unescaped: {:#?}", extra_args_unescaped);
|
||||
|
||||
if let Some(ccache_variant) = ccache_variant {
|
||||
revive_llvm_builder::utils::check_presence(ccache_variant.to_string().as_str())?;
|
||||
|
||||
@@ -30,7 +30,7 @@ impl std::str::FromStr for Sanitizer {
|
||||
"thread" => Ok(Self::Thread),
|
||||
"dataflow" => Ok(Self::DataFlow),
|
||||
"address;undefined" => Ok(Self::AddressUndefined),
|
||||
value => Err(format!("Unsupported sanitizer: `{value}`")),
|
||||
value => Err(format!("Unsupported sanitizer: `{}`", value)),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ impl std::str::FromStr for TargetEnv {
|
||||
"gnu" => Ok(Self::GNU),
|
||||
"musl" => Ok(Self::MUSL),
|
||||
"emscripten" => Ok(Self::Emscripten),
|
||||
value => Err(format!("Unsupported target environment: `{value}`")),
|
||||
value => Err(format!("Unsupported target environment: `{}`", value)),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@ impl std::str::FromStr for TargetTriple {
|
||||
fn from_str(value: &str) -> Result<Self, Self::Err> {
|
||||
match value {
|
||||
"polkavm" => Ok(Self::PolkaVM),
|
||||
value => Err(format!("Unsupported target triple: `{value}`")),
|
||||
value => Err(format!("Unsupported target triple: `{}`", value)),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -92,7 +92,7 @@ pub fn unpack_tar(filename: PathBuf, path: &str) -> anyhow::Result<()> {
|
||||
pub fn download_musl(name: &str) -> anyhow::Result<()> {
|
||||
log::info!("downloading musl {name}");
|
||||
let tar_file_name = format!("{name}.tar.gz");
|
||||
let url = format!("{MUSL_SNAPSHOTS_URL}/{tar_file_name}");
|
||||
let url = format!("{}/{tar_file_name}", MUSL_SNAPSHOTS_URL);
|
||||
let target_path = crate::llvm_path::DIRECTORY_LLVM_TARGET
|
||||
.get()
|
||||
.unwrap()
|
||||
@@ -223,6 +223,6 @@ pub fn install_emsdk() -> anyhow::Result<()> {
|
||||
/// The LLVM target directory default path.
|
||||
pub fn directory_target_llvm(target_env: crate::target_env::TargetEnv) -> PathBuf {
|
||||
crate::llvm_path::DIRECTORY_LLVM_TARGET
|
||||
.get_or_init(|| PathBuf::from(format!("./target-llvm/{target_env}/")))
|
||||
.get_or_init(|| PathBuf::from(format!("./target-llvm/{}/", target_env)))
|
||||
.clone()
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "revive-llvm-context"
|
||||
version = "0.3.0"
|
||||
version.workspace = true
|
||||
license.workspace = true
|
||||
edition.workspace = true
|
||||
repository.workspace = true
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
//! The entry function.
|
||||
|
||||
use inkwell::types::BasicType;
|
||||
use revive_solc_json_interface::PolkaVMDefaultHeapMemorySize;
|
||||
|
||||
use crate::polkavm::context::address_space::AddressSpace;
|
||||
use crate::polkavm::context::function::runtime;
|
||||
@@ -39,12 +38,9 @@ impl Entry {
|
||||
context.xlen_type().const_zero(),
|
||||
);
|
||||
|
||||
let heap_memory_type = context.byte_type().array_type(
|
||||
context
|
||||
.memory_config
|
||||
.heap_size
|
||||
.unwrap_or(PolkaVMDefaultHeapMemorySize),
|
||||
);
|
||||
let heap_memory_type = context
|
||||
.byte_type()
|
||||
.array_type(context.memory_config.heap_size);
|
||||
context.set_global(
|
||||
crate::polkavm::GLOBAL_HEAP_MEMORY,
|
||||
heap_memory_type,
|
||||
|
||||
@@ -25,8 +25,6 @@ use inkwell::debug_info::AsDIScope;
|
||||
use inkwell::debug_info::DIScope;
|
||||
use inkwell::types::BasicType;
|
||||
use inkwell::values::BasicValue;
|
||||
use revive_solc_json_interface::PolkaVMDefaultHeapMemorySize;
|
||||
use revive_solc_json_interface::PolkaVMDefaultStackMemorySize;
|
||||
use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory;
|
||||
|
||||
use crate::optimizer::settings::Settings as OptimizerSettings;
|
||||
@@ -235,13 +233,7 @@ where
|
||||
Self::set_data_layout(llvm, &module);
|
||||
Self::link_stdlib_module(llvm, &module);
|
||||
Self::link_polkavm_imports(llvm, &module);
|
||||
Self::set_polkavm_stack_size(
|
||||
llvm,
|
||||
&module,
|
||||
memory_config
|
||||
.stack_size
|
||||
.unwrap_or(PolkaVMDefaultStackMemorySize),
|
||||
);
|
||||
Self::set_polkavm_stack_size(llvm, &module, memory_config.stack_size);
|
||||
Self::set_module_flags(llvm, &module);
|
||||
|
||||
let intrinsics = Intrinsics::new(llvm, &module);
|
||||
@@ -1451,11 +1443,7 @@ where
|
||||
}
|
||||
|
||||
pub fn heap_size(&self) -> inkwell::values::IntValue<'ctx> {
|
||||
self.xlen_type().const_int(
|
||||
self.memory_config
|
||||
.heap_size
|
||||
.unwrap_or(PolkaVMDefaultHeapMemorySize) as u64,
|
||||
false,
|
||||
)
|
||||
self.xlen_type()
|
||||
.const_int(self.memory_config.heap_size as u64, false)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
use inkwell::values::BasicValue;
|
||||
|
||||
//use crate::polkavm::context::runtime::RuntimeFunction;
|
||||
use crate::polkavm::context::runtime::RuntimeFunction;
|
||||
use crate::polkavm::context::Context;
|
||||
use crate::polkavm::Dependency;
|
||||
//use crate::PolkaVMDivisionFunction;
|
||||
//use crate::PolkaVMRemainderFunction;
|
||||
//use crate::PolkaVMSignedDivisionFunction;
|
||||
//use crate::PolkaVMSignedRemainderFunction;
|
||||
use crate::PolkaVMDivisionFunction;
|
||||
use crate::PolkaVMRemainderFunction;
|
||||
use crate::PolkaVMSignedDivisionFunction;
|
||||
use crate::PolkaVMSignedRemainderFunction;
|
||||
|
||||
/// Translates the arithmetic addition.
|
||||
pub fn addition<'ctx, D>(
|
||||
@@ -64,21 +64,11 @@ pub fn division<'ctx, D>(
|
||||
where
|
||||
D: Dependency + Clone,
|
||||
{
|
||||
let result_pointer = context.build_alloca_at_entry(context.word_type(), "div_result_pointer");
|
||||
let operand_1_pointer = context.build_alloca_at_entry(context.word_type(), "operand_1_pointer");
|
||||
let operand_2_pointer = context.build_alloca_at_entry(context.word_type(), "operand_2_pointer");
|
||||
|
||||
context.build_store(operand_1_pointer, operand_1)?;
|
||||
context.build_store(operand_2_pointer, operand_2)?;
|
||||
|
||||
let arguments = &[
|
||||
result_pointer.to_int(context).into(),
|
||||
operand_1_pointer.to_int(context).into(),
|
||||
operand_2_pointer.to_int(context).into(),
|
||||
];
|
||||
|
||||
context.build_runtime_call(revive_runtime_api::polkavm_imports::DIV, arguments);
|
||||
context.build_load(result_pointer, "div_result")
|
||||
let name = <PolkaVMDivisionFunction as RuntimeFunction<D>>::NAME;
|
||||
let declaration = <PolkaVMDivisionFunction as RuntimeFunction<D>>::declaration(context);
|
||||
Ok(context
|
||||
.build_call(declaration, &[operand_1.into(), operand_2.into()], "div")
|
||||
.unwrap_or_else(|| panic!("revive runtime function {name} should return a value",)))
|
||||
}
|
||||
|
||||
/// Translates the arithmetic remainder.
|
||||
@@ -90,21 +80,11 @@ pub fn remainder<'ctx, D>(
|
||||
where
|
||||
D: Dependency + Clone,
|
||||
{
|
||||
let result_pointer = context.build_alloca_at_entry(context.word_type(), "rem_result_pointer");
|
||||
let operand_1_pointer = context.build_alloca_at_entry(context.word_type(), "operand_1_pointer");
|
||||
let operand_2_pointer = context.build_alloca_at_entry(context.word_type(), "operand_2_pointer");
|
||||
|
||||
context.build_store(operand_1_pointer, operand_1)?;
|
||||
context.build_store(operand_2_pointer, operand_2)?;
|
||||
|
||||
let arguments = &[
|
||||
result_pointer.to_int(context).into(),
|
||||
operand_1_pointer.to_int(context).into(),
|
||||
operand_2_pointer.to_int(context).into(),
|
||||
];
|
||||
|
||||
context.build_runtime_call(revive_runtime_api::polkavm_imports::MOD, arguments);
|
||||
context.build_load(result_pointer, "rem_result")
|
||||
let name = <PolkaVMRemainderFunction as RuntimeFunction<D>>::NAME;
|
||||
let declaration = <PolkaVMRemainderFunction as RuntimeFunction<D>>::declaration(context);
|
||||
Ok(context
|
||||
.build_call(declaration, &[operand_1.into(), operand_2.into()], "rem")
|
||||
.unwrap_or_else(|| panic!("revive runtime function {name} should return a value",)))
|
||||
}
|
||||
|
||||
/// Translates the signed arithmetic division.
|
||||
@@ -119,21 +99,11 @@ pub fn division_signed<'ctx, D>(
|
||||
where
|
||||
D: Dependency + Clone,
|
||||
{
|
||||
let result_pointer = context.build_alloca_at_entry(context.word_type(), "sdiv_result_pointer");
|
||||
let operand_1_pointer = context.build_alloca_at_entry(context.word_type(), "operand_1_pointer");
|
||||
let operand_2_pointer = context.build_alloca_at_entry(context.word_type(), "operand_2_pointer");
|
||||
|
||||
context.build_store(operand_1_pointer, operand_1)?;
|
||||
context.build_store(operand_2_pointer, operand_2)?;
|
||||
|
||||
let arguments = &[
|
||||
result_pointer.to_int(context).into(),
|
||||
operand_1_pointer.to_int(context).into(),
|
||||
operand_2_pointer.to_int(context).into(),
|
||||
];
|
||||
|
||||
context.build_runtime_call(revive_runtime_api::polkavm_imports::SDIV, arguments);
|
||||
context.build_load(result_pointer, "sdiv_result")
|
||||
let name = <PolkaVMSignedDivisionFunction as RuntimeFunction<D>>::NAME;
|
||||
let declaration = <PolkaVMSignedDivisionFunction as RuntimeFunction<D>>::declaration(context);
|
||||
Ok(context
|
||||
.build_call(declaration, &[operand_1.into(), operand_2.into()], "sdiv")
|
||||
.unwrap_or_else(|| panic!("revive runtime function {name} should return a value",)))
|
||||
}
|
||||
|
||||
/// Translates the signed arithmetic remainder.
|
||||
@@ -145,19 +115,9 @@ pub fn remainder_signed<'ctx, D>(
|
||||
where
|
||||
D: Dependency + Clone,
|
||||
{
|
||||
let result_pointer = context.build_alloca_at_entry(context.word_type(), "srem_result_pointer");
|
||||
let operand_1_pointer = context.build_alloca_at_entry(context.word_type(), "operand_1_pointer");
|
||||
let operand_2_pointer = context.build_alloca_at_entry(context.word_type(), "operand_2_pointer");
|
||||
|
||||
context.build_store(operand_1_pointer, operand_1)?;
|
||||
context.build_store(operand_2_pointer, operand_2)?;
|
||||
|
||||
let arguments = &[
|
||||
result_pointer.to_int(context).into(),
|
||||
operand_1_pointer.to_int(context).into(),
|
||||
operand_2_pointer.to_int(context).into(),
|
||||
];
|
||||
|
||||
context.build_runtime_call(revive_runtime_api::polkavm_imports::SMOD, arguments);
|
||||
context.build_load(result_pointer, "rsem_result")
|
||||
let name = <PolkaVMSignedRemainderFunction as RuntimeFunction<D>>::NAME;
|
||||
let declaration = <PolkaVMSignedRemainderFunction as RuntimeFunction<D>>::declaration(context);
|
||||
Ok(context
|
||||
.build_call(declaration, &[operand_1.into(), operand_2.into()], "srem")
|
||||
.unwrap_or_else(|| panic!("revive runtime function {name} should return a value",)))
|
||||
}
|
||||
|
||||
@@ -204,7 +204,7 @@ where
|
||||
&context.word_type().const_all_ones(),
|
||||
overflow_negative_block,
|
||||
),
|
||||
(&context.word_const(0), overflow_positive_block),
|
||||
(&context.word_const(0), overflow_block),
|
||||
]);
|
||||
Ok(result.as_basic_value())
|
||||
}
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
//! Translates the mathematical operations.
|
||||
|
||||
use inkwell::values::BasicValue;
|
||||
|
||||
use crate::polkavm::context::Context;
|
||||
use crate::polkavm::Dependency;
|
||||
|
||||
@@ -13,26 +15,17 @@ pub fn add_mod<'ctx, D>(
|
||||
where
|
||||
D: Dependency + Clone,
|
||||
{
|
||||
let result_pointer =
|
||||
context.build_alloca_at_entry(context.word_type(), "addmod_result_pointer");
|
||||
let operand_1_pointer = context.build_alloca_at_entry(context.word_type(), "addmod_operand_1");
|
||||
let operand_2_pointer = context.build_alloca_at_entry(context.word_type(), "addmod_operand_2");
|
||||
let modulo_pointer =
|
||||
context.build_alloca_at_entry(context.word_type(), "addmod_modulo_operand");
|
||||
|
||||
context.build_store(operand_2_pointer, operand_2)?;
|
||||
context.build_store(operand_1_pointer, operand_1)?;
|
||||
context.build_store(modulo_pointer, modulo)?;
|
||||
|
||||
let arguments = &[
|
||||
result_pointer.to_int(context).into(),
|
||||
operand_1_pointer.to_int(context).into(),
|
||||
operand_2_pointer.to_int(context).into(),
|
||||
modulo_pointer.to_int(context).into(),
|
||||
];
|
||||
|
||||
context.build_runtime_call(revive_runtime_api::polkavm_imports::ADDMOD, arguments);
|
||||
context.build_load(result_pointer, "addmod_result")
|
||||
Ok(context
|
||||
.build_call(
|
||||
context.llvm_runtime().add_mod,
|
||||
&[
|
||||
operand_1.as_basic_value_enum(),
|
||||
operand_2.as_basic_value_enum(),
|
||||
modulo.as_basic_value_enum(),
|
||||
],
|
||||
"add_mod_call",
|
||||
)
|
||||
.expect("Always exists"))
|
||||
}
|
||||
|
||||
/// Translates the `mulmod` instruction.
|
||||
@@ -45,26 +38,17 @@ pub fn mul_mod<'ctx, D>(
|
||||
where
|
||||
D: Dependency + Clone,
|
||||
{
|
||||
let result_pointer =
|
||||
context.build_alloca_at_entry(context.word_type(), "mulmod_result_pointer");
|
||||
let operand_1_pointer = context.build_alloca_at_entry(context.word_type(), "mulmod_operand_1");
|
||||
let operand_2_pointer = context.build_alloca_at_entry(context.word_type(), "mulmod_operand_2");
|
||||
let modulo_pointer =
|
||||
context.build_alloca_at_entry(context.word_type(), "mulmod_modulo_operand");
|
||||
|
||||
context.build_store(operand_2_pointer, operand_2)?;
|
||||
context.build_store(operand_1_pointer, operand_1)?;
|
||||
context.build_store(modulo_pointer, modulo)?;
|
||||
|
||||
let arguments = &[
|
||||
result_pointer.to_int(context).into(),
|
||||
operand_1_pointer.to_int(context).into(),
|
||||
operand_2_pointer.to_int(context).into(),
|
||||
modulo_pointer.to_int(context).into(),
|
||||
];
|
||||
|
||||
context.build_runtime_call(revive_runtime_api::polkavm_imports::MULMOD, arguments);
|
||||
context.build_load(result_pointer, "addmod_result")
|
||||
Ok(context
|
||||
.build_call(
|
||||
context.llvm_runtime().mul_mod,
|
||||
&[
|
||||
operand_1.as_basic_value_enum(),
|
||||
operand_2.as_basic_value_enum(),
|
||||
modulo.as_basic_value_enum(),
|
||||
],
|
||||
"mul_mod_call",
|
||||
)
|
||||
.expect("Always exists"))
|
||||
}
|
||||
|
||||
/// Translates the `exp` instruction.
|
||||
@@ -76,22 +60,13 @@ pub fn exponent<'ctx, D>(
|
||||
where
|
||||
D: Dependency + Clone,
|
||||
{
|
||||
let result_pointer = context.build_alloca_at_entry(context.word_type(), "exp_result_pointer");
|
||||
let value_pointer = context.build_alloca_at_entry(context.word_type(), "exp_value_pointer");
|
||||
let exponent_pointer =
|
||||
context.build_alloca_at_entry(context.word_type(), "exp_exponent_pointer");
|
||||
|
||||
context.build_store(value_pointer, value)?;
|
||||
context.build_store(exponent_pointer, exponent)?;
|
||||
|
||||
let arguments = &[
|
||||
result_pointer.to_int(context).into(),
|
||||
value_pointer.to_int(context).into(),
|
||||
exponent_pointer.to_int(context).into(),
|
||||
];
|
||||
|
||||
context.build_runtime_call(revive_runtime_api::polkavm_imports::EXP, arguments);
|
||||
context.build_load(result_pointer, "exponent_result")
|
||||
Ok(context
|
||||
.build_call(
|
||||
context.llvm_runtime().exp,
|
||||
&[value.as_basic_value_enum(), exponent.as_basic_value_enum()],
|
||||
"exp_call",
|
||||
)
|
||||
.expect("Always exists"))
|
||||
}
|
||||
|
||||
/// Translates the `signextend` instruction.
|
||||
@@ -103,20 +78,11 @@ pub fn sign_extend<'ctx, D>(
|
||||
where
|
||||
D: Dependency + Clone,
|
||||
{
|
||||
let result_pointer =
|
||||
context.build_alloca_at_entry(context.word_type(), "signext_result_pointer");
|
||||
let bytes_pointer = context.build_alloca_at_entry(context.word_type(), "bytes_pointer");
|
||||
let value_pointer = context.build_alloca_at_entry(context.word_type(), "signext_value_pointer");
|
||||
|
||||
context.build_store(bytes_pointer, bytes)?;
|
||||
context.build_store(value_pointer, value)?;
|
||||
|
||||
let arguments = &[
|
||||
result_pointer.to_int(context).into(),
|
||||
bytes_pointer.to_int(context).into(),
|
||||
value_pointer.to_int(context).into(),
|
||||
];
|
||||
|
||||
context.build_runtime_call(revive_runtime_api::polkavm_imports::EXP, arguments);
|
||||
context.build_load(result_pointer, "signext_mod_result")
|
||||
Ok(context
|
||||
.build_call(
|
||||
context.llvm_runtime().sign_extend,
|
||||
&[bytes.as_basic_value_enum(), value.as_basic_value_enum()],
|
||||
"sign_extend_call",
|
||||
)
|
||||
.expect("Always exists"))
|
||||
}
|
||||
|
||||
@@ -37,7 +37,7 @@ pub fn build_assembly_text(
|
||||
let mut disassembled_code = Vec::new();
|
||||
disassembler
|
||||
.disassemble_into(&mut disassembled_code)
|
||||
.with_context(|| format!("Failed to disassemble contract: {contract_path}"))?;
|
||||
.with_context(|| format!("Failed to disassemble contract: {}", contract_path))?;
|
||||
|
||||
let assembly_text = String::from_utf8(disassembled_code).with_context(|| {
|
||||
format!("Failed to convert disassembled code to string for contract: {contract_path}")
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
fn main() {
|
||||
match git2::Repository::open("../..") {
|
||||
Ok(repo) => {
|
||||
let head = repo.head().expect("should have head");
|
||||
let commit = head.peel_to_commit().expect("should have commit");
|
||||
let id = &commit.id().to_string()[..7];
|
||||
println!("cargo:rustc-env=GIT_COMMIT_HASH={id}");
|
||||
}
|
||||
Err(_) => println!("cargo:rustc-env=GIT_COMMIT_HASH=unknown"),
|
||||
};
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
object "Test" {
|
||||
code {
|
||||
function allocate(size) -> ptr {
|
||||
ptr := mload(0x40)
|
||||
if iszero(ptr) { ptr := 0x60 }
|
||||
mstore(0x40, add(ptr, size))
|
||||
}
|
||||
let size := datasize("Test_deployed")
|
||||
let offset := allocate(size)
|
||||
datacopy(offset, dataoffset("Test_deployed"), size)
|
||||
return(offset, size)
|
||||
}
|
||||
object "Test_deployed" {
|
||||
code {
|
||||
{
|
||||
let test:=0x5
|
||||
mstore(2,signextend(0x8,0x0))
|
||||
mstore(8,lt(0xc,test))
|
||||
}
|
||||
|
||||
return(0, 65536)
|
||||
}}}
|
||||
@@ -1,18 +0,0 @@
|
||||
import { executeCommand } from '../src/helper'
|
||||
import { paths } from '../src/entities'
|
||||
|
||||
describe('tests for the memset builtin to be present', () => {
|
||||
// -O3 is required to reproduce.
|
||||
const command = `resolc ${paths.pathToMemsetYulContract} --yul -O3`
|
||||
const result = executeCommand(command)
|
||||
|
||||
it('Valid command exit code = 0', () => {
|
||||
expect(result.exitCode).toBe(0)
|
||||
})
|
||||
|
||||
it('--yul output is presented', () => {
|
||||
expect(result.output).toMatch(/(Compiler run successful)/i)
|
||||
expect(result.output).toMatch(/(No output requested)/i)
|
||||
})
|
||||
|
||||
})
|
||||
@@ -17,7 +17,7 @@ path = "src/main.rs"
|
||||
[features]
|
||||
std = ["polkadot-sdk/std"]
|
||||
default = ["solidity"]
|
||||
solidity = ["resolc", "revive-differential", "revive-llvm-context"]
|
||||
solidity = ["revive-solidity", "revive-differential", "revive-llvm-context"]
|
||||
|
||||
[dependencies]
|
||||
env_logger = { workspace = true }
|
||||
@@ -39,6 +39,6 @@ polkadot-sdk.features = [
|
||||
"pallet-timestamp"
|
||||
]
|
||||
|
||||
resolc = { workspace = true, optional = true }
|
||||
revive-solidity = { workspace = true, optional = true }
|
||||
revive-differential = { workspace = true, optional = true }
|
||||
revive-llvm-context = { workspace = true, optional = true }
|
||||
|
||||
@@ -44,7 +44,7 @@ pub use crate::specs::*;
|
||||
mod runtime;
|
||||
mod specs;
|
||||
|
||||
#[cfg(not(feature = "resolc"))]
|
||||
#[cfg(not(feature = "revive-solidity"))]
|
||||
pub(crate) const NO_SOLIDITY_FRONTEND: &str =
|
||||
"revive-runner was built without the solidity frontend; please enable the 'solidity' feature!";
|
||||
|
||||
@@ -234,7 +234,7 @@ impl CallResult {
|
||||
|
||||
#[derive(Clone, Debug, Serialize, Deserialize)]
|
||||
pub enum Code {
|
||||
#[cfg(feature = "resolc")]
|
||||
#[cfg(feature = "revive-solidity")]
|
||||
/// Compile a single solidity source and use the blob of `contract`
|
||||
Solidity {
|
||||
path: Option<std::path::PathBuf>,
|
||||
@@ -270,7 +270,7 @@ impl From<Code> for pallet_revive::Code {
|
||||
let Ok(source_code) = std::fs::read_to_string(&path) else {
|
||||
panic!("Failed to reead source code from {}", path.display());
|
||||
};
|
||||
pallet_revive::Code::Upload(resolc::test_utils::compile_blob_with_options(
|
||||
pallet_revive::Code::Upload(revive_solidity::test_utils::compile_blob_with_options(
|
||||
&contract,
|
||||
&source_code,
|
||||
solc_optimizer.unwrap_or(true),
|
||||
|
||||
@@ -4,12 +4,12 @@ use serde::{Deserialize, Serialize};
|
||||
|
||||
use crate::*;
|
||||
use alloy_primitives::keccak256;
|
||||
#[cfg(feature = "resolc")]
|
||||
#[cfg(feature = "revive-solidity")]
|
||||
use alloy_primitives::Address;
|
||||
#[cfg(feature = "resolc")]
|
||||
use resolc::test_utils::*;
|
||||
#[cfg(feature = "resolc")]
|
||||
#[cfg(feature = "revive-solidity")]
|
||||
use revive_differential::{Evm, EvmLog};
|
||||
#[cfg(feature = "revive-solidity")]
|
||||
use revive_solidity::test_utils::*;
|
||||
|
||||
const SPEC_MARKER_BEGIN: &str = "/* runner.json";
|
||||
const SPEC_MARKER_END: &str = "*/";
|
||||
@@ -256,7 +256,7 @@ impl Specs {
|
||||
};
|
||||
|
||||
match code {
|
||||
#[cfg(feature = "resolc")]
|
||||
#[cfg(feature = "revive-solidity")]
|
||||
Code::Bytes(bytes) if bytes.is_empty() => {
|
||||
let contract_source = match std::fs::read_to_string(contract_path) {
|
||||
Err(err) => panic!("unable to read {contract_path}: {err}"),
|
||||
@@ -264,9 +264,9 @@ impl Specs {
|
||||
};
|
||||
*bytes = compile_blob(contract_name, &contract_source)
|
||||
}
|
||||
#[cfg(not(feature = "resolc"))]
|
||||
#[cfg(not(feature = "revive-solidity"))]
|
||||
Code::Bytes(_) => panic!("{NO_SOLIDITY_FRONTEND}"),
|
||||
#[cfg(feature = "resolc")]
|
||||
#[cfg(feature = "revive-solidity")]
|
||||
Code::Solidity { path, .. } if path.is_none() => *path = Some(contract_path.into()),
|
||||
_ => continue,
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "revive-runtime-api"
|
||||
version = "0.2.0"
|
||||
version.workspace = true
|
||||
license.workspace = true
|
||||
edition.workspace = true
|
||||
repository.workspace = true
|
||||
|
||||
@@ -37,11 +37,12 @@ fn compile(source_path: &str, bitcode_path: &str) {
|
||||
source_path,
|
||||
])
|
||||
.output()
|
||||
.unwrap_or_else(|error| panic!("failed to execute clang: {error}"));
|
||||
.unwrap_or_else(|error| panic!("failed to execute clang: {}", error));
|
||||
|
||||
assert!(
|
||||
output.status.success(),
|
||||
"failed to compile the PolkaVM C API: {output:?}"
|
||||
"failed to compile the PolkaVM C API: {:?}",
|
||||
output
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -30,13 +30,6 @@ void * memmove(void *dst, const void *src, size_t n) {
|
||||
return dst;
|
||||
}
|
||||
|
||||
void * memset(void *b, int c, size_t len) {
|
||||
uint8_t *dest = b;
|
||||
uint8_t val = (uint8_t)c;
|
||||
while (len-- > 0) *dest++ = val;
|
||||
return b;
|
||||
}
|
||||
|
||||
// Imports
|
||||
|
||||
POLKAVM_IMPORT(void, address, uint32_t)
|
||||
@@ -104,19 +97,3 @@ POLKAVM_IMPORT(uint64_t, set_storage, uint32_t, uint32_t, uint32_t, uint32_t, ui
|
||||
POLKAVM_IMPORT(void, value_transferred, uint32_t)
|
||||
|
||||
POLKAVM_IMPORT(void, weight_to_fee, uint64_t, uint64_t, uint32_t);
|
||||
|
||||
POLKAVM_IMPORT(void, div, uint32_t, uint32_t, uint32_t);
|
||||
|
||||
POLKAVM_IMPORT(void, sdiv, uint32_t, uint32_t, uint32_t);
|
||||
|
||||
POLKAVM_IMPORT(void, addmod, uint32_t, uint32_t, uint32_t, uint32_t);
|
||||
|
||||
POLKAVM_IMPORT(void, mulmod, uint32_t, uint32_t, uint32_t, uint32_t);
|
||||
|
||||
POLKAVM_IMPORT(void, mod, uint32_t, uint32_t, uint32_t);
|
||||
|
||||
POLKAVM_IMPORT(void, smod, uint32_t, uint32_t, uint32_t);
|
||||
|
||||
POLKAVM_IMPORT(void, exp, uint32_t, uint32_t, uint32_t);
|
||||
|
||||
POLKAVM_IMPORT(void, signext, uint32_t, uint32_t, uint32_t);
|
||||
|
||||
@@ -68,27 +68,9 @@ pub static VALUE_TRANSFERRED: &str = "value_transferred";
|
||||
|
||||
pub static WEIGHT_TO_FEE: &str = "weight_to_fee";
|
||||
|
||||
pub static DIV: &str = "div";
|
||||
pub static SDIV: &str = "sdiv";
|
||||
pub static ADDMOD: &str = "addmod";
|
||||
pub static MULMOD: &str = "mulmod";
|
||||
pub static MOD: &str = "mod";
|
||||
pub static SMOD: &str = "smod";
|
||||
pub static EXP: &str = "exp";
|
||||
pub static SIGNEXT: &str = "signext";
|
||||
|
||||
/// All imported runtime API symbols.
|
||||
/// Useful for configuring common attributes and linkage.
|
||||
pub static IMPORTS: [&str; 41] = [
|
||||
DIV,
|
||||
SDIV,
|
||||
ADDMOD,
|
||||
MULMOD,
|
||||
MOD,
|
||||
SMOD,
|
||||
EXP,
|
||||
SIGNEXT,
|
||||
//
|
||||
pub static IMPORTS: [&str; 33] = [
|
||||
ADDRESS,
|
||||
BALANCE,
|
||||
BALANCE_OF,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "revive-solc-json-interface"
|
||||
version = "0.2.0"
|
||||
version.workspace = true
|
||||
authors.workspace = true
|
||||
license.workspace = true
|
||||
edition.workspace = true
|
||||
@@ -20,4 +20,4 @@ anyhow = { workspace = true }
|
||||
rayon = { workspace = true, optional = true }
|
||||
semver = { workspace = true }
|
||||
serde = { workspace = true }
|
||||
serde_json = { workspace = true }
|
||||
serde_json = { workspace = true }
|
||||
@@ -9,8 +9,6 @@ pub use self::standard_json::input::settings::metadata::Metadata as SolcStandard
|
||||
pub use self::standard_json::input::settings::metadata_hash::MetadataHash as SolcStandardJsonInputSettingsMetadataHash;
|
||||
pub use self::standard_json::input::settings::optimizer::Optimizer as SolcStandardJsonInputSettingsOptimizer;
|
||||
pub use self::standard_json::input::settings::polkavm::memory::MemoryConfig as SolcStandardJsonInputSettingsPolkaVMMemory;
|
||||
pub use self::standard_json::input::settings::polkavm::memory::DEFAULT_HEAP_SIZE as PolkaVMDefaultHeapMemorySize;
|
||||
pub use self::standard_json::input::settings::polkavm::memory::DEFAULT_STACK_SIZE as PolkaVMDefaultStackMemorySize;
|
||||
pub use self::standard_json::input::settings::polkavm::PolkaVM as SolcStandardJsonInputSettingsPolkaVM;
|
||||
pub use self::standard_json::input::settings::selection::file::flag::Flag as SolcStandardJsonInputSettingsSelectionFileFlag;
|
||||
pub use self::standard_json::input::settings::selection::file::File as SolcStandardJsonInputSettingsSelectionFile;
|
||||
|
||||
@@ -25,7 +25,7 @@ use self::settings::Settings;
|
||||
use self::source::Source;
|
||||
|
||||
/// The `solc --standard-json` input.
|
||||
#[derive(Clone, Debug, Serialize, Deserialize)]
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct Input {
|
||||
/// The input language.
|
||||
|
||||
@@ -6,7 +6,7 @@ use serde::Serialize;
|
||||
use crate::standard_json::input::settings::metadata_hash::MetadataHash;
|
||||
|
||||
/// The `solc --standard-json` input settings metadata.
|
||||
#[derive(Clone, Debug, Default, Serialize, Deserialize)]
|
||||
#[derive(Debug, Default, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct Metadata {
|
||||
/// The bytecode hash mode.
|
||||
|
||||
@@ -18,7 +18,7 @@ use self::polkavm::PolkaVM;
|
||||
use self::selection::Selection;
|
||||
|
||||
/// The `solc --standard-json` input settings.
|
||||
#[derive(Clone, Debug, Serialize, Deserialize)]
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct Settings {
|
||||
/// The target EVM version.
|
||||
@@ -46,7 +46,7 @@ pub struct Settings {
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub metadata: Option<Metadata>,
|
||||
/// The resolc custom PolkaVM settings.
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
#[serde(skip_serializing)]
|
||||
pub polkavm: Option<PolkaVM>,
|
||||
}
|
||||
|
||||
@@ -75,7 +75,6 @@ impl Settings {
|
||||
|
||||
/// Sets the necessary defaults.
|
||||
pub fn normalize(&mut self, version: &semver::Version) {
|
||||
self.polkavm = None;
|
||||
self.optimizer.normalize(version);
|
||||
}
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ use serde::Deserialize;
|
||||
use serde::Serialize;
|
||||
|
||||
/// The `solc --standard-json` input settings optimizer details.
|
||||
#[derive(Clone, Debug, Serialize, Deserialize)]
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct Details {
|
||||
/// Whether the pass is enabled.
|
||||
|
||||
@@ -8,19 +8,19 @@ use serde::Serialize;
|
||||
use self::details::Details;
|
||||
|
||||
/// The `solc --standard-json` input settings optimizer.
|
||||
#[derive(Clone, Debug, Serialize, Deserialize)]
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct Optimizer {
|
||||
/// Whether the optimizer is enabled.
|
||||
pub enabled: bool,
|
||||
/// The optimization mode string.
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
#[serde(skip_serializing)]
|
||||
pub mode: Option<char>,
|
||||
/// The `solc` optimizer details.
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub details: Option<Details>,
|
||||
/// Whether to try to recompile with -Oz if the bytecode is too large.
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
#[serde(skip_serializing)]
|
||||
pub fallback_to_optimizing_for_size: Option<bool>,
|
||||
}
|
||||
|
||||
@@ -42,8 +42,6 @@ impl Optimizer {
|
||||
|
||||
/// Sets the necessary defaults.
|
||||
pub fn normalize(&mut self, version: &semver::Version) {
|
||||
self.mode = None;
|
||||
self.fallback_to_optimizing_for_size = None;
|
||||
self.details = if version >= &semver::Version::new(0, 5, 5) {
|
||||
Some(Details::disabled(version))
|
||||
} else {
|
||||
|
||||
@@ -2,35 +2,20 @@
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
pub const DEFAULT_HEAP_SIZE: u32 = 64 * 1024;
|
||||
pub const DEFAULT_STACK_SIZE: u32 = 32 * 1024;
|
||||
|
||||
/// The PolkaVM memory configuration.
|
||||
#[derive(Clone, Copy, Debug, Deserialize, Serialize)]
|
||||
pub struct MemoryConfig {
|
||||
/// The emulated EVM linear heap memory size in bytes.
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub heap_size: Option<u32>,
|
||||
pub heap_size: u32,
|
||||
/// The PVM stack size in bytes.
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub stack_size: Option<u32>,
|
||||
}
|
||||
|
||||
impl MemoryConfig {
|
||||
/// A shorthand constructor.
|
||||
pub fn new(heap_size: Option<u32>, stack_size: Option<u32>) -> Self {
|
||||
Self {
|
||||
heap_size,
|
||||
stack_size,
|
||||
}
|
||||
}
|
||||
pub stack_size: u32,
|
||||
}
|
||||
|
||||
impl Default for MemoryConfig {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
heap_size: Some(DEFAULT_HEAP_SIZE),
|
||||
stack_size: Some(DEFAULT_STACK_SIZE),
|
||||
heap_size: 64 * 1024,
|
||||
stack_size: 32 * 1024,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,18 +11,16 @@ pub mod memory;
|
||||
#[derive(Clone, Copy, Default, Debug, Serialize, Deserialize)]
|
||||
pub struct PolkaVM {
|
||||
/// The PolkaVM target machine memory configuration settings.
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub memory_config: Option<MemoryConfig>,
|
||||
pub memory_config: MemoryConfig,
|
||||
/// Instruct LLVM to emit debug information.
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub debug_information: Option<bool>,
|
||||
pub debug_information: bool,
|
||||
}
|
||||
|
||||
impl PolkaVM {
|
||||
pub fn new(memory_config: Option<MemoryConfig>, debug_information: bool) -> Self {
|
||||
Self {
|
||||
memory_config,
|
||||
debug_information: Some(debug_information),
|
||||
memory_config: memory_config.unwrap_or_default(),
|
||||
debug_information,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ use serde::Serialize;
|
||||
use self::flag::Flag as SelectionFlag;
|
||||
|
||||
/// The `solc --standard-json` output file selection.
|
||||
#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq)]
|
||||
#[derive(Debug, Default, Serialize, Deserialize, PartialEq)]
|
||||
pub struct File {
|
||||
/// The per-file output selections.
|
||||
#[serde(rename = "", skip_serializing_if = "Option::is_none")]
|
||||
@@ -21,20 +21,8 @@ pub struct File {
|
||||
}
|
||||
|
||||
impl File {
|
||||
/// Creates the selection required for production compilation (excludes EVM bytecode).
|
||||
/// Creates the selection required by our compilation process.
|
||||
pub fn new_required() -> Self {
|
||||
Self {
|
||||
per_file: Some(HashSet::from_iter([SelectionFlag::AST])),
|
||||
per_contract: Some(HashSet::from_iter([
|
||||
SelectionFlag::MethodIdentifiers,
|
||||
SelectionFlag::Metadata,
|
||||
SelectionFlag::Yul,
|
||||
])),
|
||||
}
|
||||
}
|
||||
|
||||
/// Creates the selection required for test compilation (includes EVM bytecode).
|
||||
pub fn new_required_for_tests() -> Self {
|
||||
Self {
|
||||
per_file: Some(HashSet::from_iter([SelectionFlag::AST])),
|
||||
per_contract: Some(HashSet::from_iter([
|
||||
@@ -61,38 +49,3 @@ impl File {
|
||||
self
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn production_excludes_evm_bytecode() {
|
||||
let selection = File::new_required();
|
||||
let per_contract = selection.per_contract.unwrap();
|
||||
|
||||
// Production should NOT include EVM bytecode flags
|
||||
assert!(!per_contract.contains(&SelectionFlag::EVMBC));
|
||||
assert!(!per_contract.contains(&SelectionFlag::EVMDBC));
|
||||
|
||||
// But should include other required flags
|
||||
assert!(per_contract.contains(&SelectionFlag::MethodIdentifiers));
|
||||
assert!(per_contract.contains(&SelectionFlag::Metadata));
|
||||
assert!(per_contract.contains(&SelectionFlag::Yul));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn tests_include_evm_bytecode() {
|
||||
let selection = File::new_required_for_tests();
|
||||
let per_contract = selection.per_contract.unwrap();
|
||||
|
||||
// Tests should include EVM bytecode flags
|
||||
assert!(per_contract.contains(&SelectionFlag::EVMBC));
|
||||
assert!(per_contract.contains(&SelectionFlag::EVMDBC));
|
||||
|
||||
// And should also include other required flags
|
||||
assert!(per_contract.contains(&SelectionFlag::MethodIdentifiers));
|
||||
assert!(per_contract.contains(&SelectionFlag::Metadata));
|
||||
assert!(per_contract.contains(&SelectionFlag::Yul));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ use serde::Serialize;
|
||||
use self::file::File as FileSelection;
|
||||
|
||||
/// The `solc --standard-json` output selection.
|
||||
#[derive(Clone, Debug, Serialize, Deserialize, Default, PartialEq)]
|
||||
#[derive(Debug, Serialize, Deserialize, Default, PartialEq)]
|
||||
pub struct Selection {
|
||||
/// Only the 'all' wildcard is available for robustness reasons.
|
||||
#[serde(rename = "*", skip_serializing_if = "Option::is_none")]
|
||||
@@ -29,14 +29,6 @@ impl Selection {
|
||||
}
|
||||
}
|
||||
|
||||
/// Creates the selection required for test compilation (includes EVM bytecode).
|
||||
pub fn new_required_for_tests() -> Self {
|
||||
Self {
|
||||
all: Some(FileSelection::new_required_for_tests()),
|
||||
files: BTreeMap::new(),
|
||||
}
|
||||
}
|
||||
|
||||
/// Extends the user's output selection with flag required by our compilation process.
|
||||
pub fn extend_with_required(&mut self) -> &mut Self {
|
||||
self.all
|
||||
|
||||
@@ -7,7 +7,7 @@ use serde::Deserialize;
|
||||
use serde::Serialize;
|
||||
|
||||
/// The `solc --standard-json` input source.
|
||||
#[derive(Clone, Debug, Serialize, Deserialize)]
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct Source {
|
||||
/// The source code file content.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "resolc"
|
||||
version = "0.3.0"
|
||||
name = "revive-solidity"
|
||||
version.workspace = true
|
||||
license.workspace = true
|
||||
edition.workspace = true
|
||||
repository.workspace = true
|
||||
@@ -18,26 +18,29 @@ path = "src/resolc/main.rs"
|
||||
doctest = false
|
||||
|
||||
[dependencies]
|
||||
anyhow = { workspace = true }
|
||||
clap = { workspace = true }
|
||||
hex = { workspace = true }
|
||||
inkwell = { workspace = true }
|
||||
once_cell = { workspace = true }
|
||||
thiserror = { workspace = true }
|
||||
anyhow = { workspace = true }
|
||||
which = { workspace = true }
|
||||
path-slash = { workspace = true }
|
||||
rayon = { workspace = true, optional = true }
|
||||
semver = { workspace = true }
|
||||
|
||||
serde = { workspace = true }
|
||||
serde_json = { workspace = true }
|
||||
semver = { workspace = true }
|
||||
once_cell = { workspace = true }
|
||||
regex = { workspace = true }
|
||||
hex = { workspace = true }
|
||||
num = { workspace = true }
|
||||
sha3 = { workspace = true }
|
||||
which = { workspace = true }
|
||||
inkwell = { workspace = true }
|
||||
|
||||
revive-common = { workspace = true }
|
||||
revive-llvm-context = { workspace = true }
|
||||
revive-solc-json-interface = { workspace = true, features = ["resolc"] }
|
||||
revive-yul = { workspace = true }
|
||||
|
||||
[target.'cfg(target_env = "musl")'.dependencies]
|
||||
mimalloc = { version = "0.1.46", default-features = false }
|
||||
mimalloc = { version = "*", default-features = false }
|
||||
|
||||
[target.'cfg(target_os = "emscripten")'.dependencies]
|
||||
libc = { workspace = true }
|
||||
@@ -0,0 +1,7 @@
|
||||
fn main() {
|
||||
let repo = git2::Repository::open("../..").expect("should be a repository");
|
||||
let head = repo.head().expect("should have head");
|
||||
let commit = head.peel_to_commit().expect("should have commit");
|
||||
let id = &commit.id().to_string()[..7];
|
||||
println!("cargo:rustc-env=GIT_COMMIT_HASH={id}");
|
||||
}
|
||||
@@ -7,6 +7,7 @@ pub(crate) mod process;
|
||||
pub(crate) mod project;
|
||||
pub(crate) mod solc;
|
||||
pub(crate) mod version;
|
||||
pub(crate) mod yul;
|
||||
|
||||
pub use self::build::contract::Contract as ContractBuild;
|
||||
pub use self::build::Build;
|
||||
@@ -229,7 +230,7 @@ pub fn standard_json<T: Compiler>(
|
||||
revive_llvm_context::OptimizerSettings::try_from(&solc_input.settings.optimizer)?;
|
||||
|
||||
let polkavm_settings = solc_input.settings.polkavm.unwrap_or_default();
|
||||
debug_config.emit_debug_info = polkavm_settings.debug_information.unwrap_or_default();
|
||||
debug_config.emit_debug_info = polkavm_settings.debug_information;
|
||||
|
||||
let include_metadata_hash = match solc_input.settings.metadata {
|
||||
Some(ref metadata) => metadata.bytecode_hash != Some(MetadataHash::None),
|
||||
@@ -265,9 +266,7 @@ pub fn standard_json<T: Compiler>(
|
||||
include_metadata_hash,
|
||||
debug_config,
|
||||
llvm_arguments,
|
||||
polkavm_settings
|
||||
.memory_config
|
||||
.unwrap_or_else(SolcStandardJsonInputSettingsPolkaVMMemory::default),
|
||||
polkavm_settings.memory_config,
|
||||
)?;
|
||||
build.write_to_standard_json(&mut solc_output, &solc_version)?;
|
||||
}
|
||||
+1
-1
@@ -8,7 +8,7 @@ use std::collections::HashSet;
|
||||
use serde::Deserialize;
|
||||
use serde::Serialize;
|
||||
|
||||
use revive_yul::parser::statement::object::Object;
|
||||
use crate::yul::parser::statement::object::Object;
|
||||
|
||||
use self::llvm_ir::LLVMIR;
|
||||
use self::yul::Yul;
|
||||
+1
-1
@@ -5,7 +5,7 @@ use std::collections::HashSet;
|
||||
use serde::Deserialize;
|
||||
use serde::Serialize;
|
||||
|
||||
use revive_yul::parser::statement::object::Object;
|
||||
use crate::yul::parser::statement::object::Object;
|
||||
|
||||
/// The contract Yul source code.
|
||||
#[derive(Debug, Serialize, Deserialize, Clone)]
|
||||
@@ -9,14 +9,11 @@ use std::path::Path;
|
||||
|
||||
#[cfg(feature = "parallel")]
|
||||
use rayon::iter::{IntoParallelIterator, ParallelIterator};
|
||||
use revive_solc_json_interface::SolcStandardJsonOutput;
|
||||
use serde::Deserialize;
|
||||
use serde::Serialize;
|
||||
use sha3::Digest;
|
||||
|
||||
use revive_solc_json_interface::SolcStandardJsonOutput;
|
||||
use revive_yul::lexer::Lexer;
|
||||
use revive_yul::parser::statement::object::Object;
|
||||
|
||||
use crate::build::contract::Contract as ContractBuild;
|
||||
use crate::build::Build;
|
||||
use crate::missing_libraries::MissingLibraries;
|
||||
@@ -25,6 +22,8 @@ use crate::process::Process;
|
||||
use crate::project::contract::ir::IR;
|
||||
use crate::solc::version::Version as SolcVersion;
|
||||
use crate::solc::Compiler;
|
||||
use crate::yul::lexer::Lexer;
|
||||
use crate::yul::parser::statement::object::Object;
|
||||
|
||||
use self::contract::Contract;
|
||||
|
||||
@@ -155,8 +154,8 @@ impl Project {
|
||||
.iter()
|
||||
.flat_map(|(file, names)| {
|
||||
names
|
||||
.keys()
|
||||
.map(|name| format!("{file}:{name}"))
|
||||
.iter()
|
||||
.map(|(name, _address)| format!("{file}:{name}"))
|
||||
.collect::<HashSet<String>>()
|
||||
})
|
||||
.collect::<HashSet<String>>();
|
||||
@@ -23,6 +23,10 @@ pub struct Arguments {
|
||||
#[arg(long = "supported-solc-versions")]
|
||||
pub supported_solc_versions: bool,
|
||||
|
||||
/// Print the licence and exit.
|
||||
#[arg(long = "license")]
|
||||
pub license: bool,
|
||||
|
||||
/// Specify the input paths and remappings.
|
||||
/// If an argument contains a '=', it is considered a remapping.
|
||||
/// Multiple Solidity files can be passed in the default Solidity mode.
|
||||
@@ -5,7 +5,7 @@ pub mod arguments;
|
||||
use std::io::Write;
|
||||
use std::str::FromStr;
|
||||
|
||||
use resolc::Process;
|
||||
use revive_solidity::Process;
|
||||
|
||||
use self::arguments::Arguments;
|
||||
|
||||
@@ -36,7 +36,7 @@ fn main_inner() -> anyhow::Result<()> {
|
||||
std::io::stdout(),
|
||||
"{} version {}",
|
||||
env!("CARGO_PKG_DESCRIPTION"),
|
||||
resolc::ResolcVersion::default().long
|
||||
revive_solidity::ResolcVersion::default().long
|
||||
)?;
|
||||
return Ok(());
|
||||
}
|
||||
@@ -45,12 +45,20 @@ fn main_inner() -> anyhow::Result<()> {
|
||||
writeln!(
|
||||
std::io::stdout(),
|
||||
">={},<={}",
|
||||
resolc::SolcFirstSupportedVersion,
|
||||
resolc::SolcLastSupportedVersion,
|
||||
revive_solidity::SolcFirstSupportedVersion,
|
||||
revive_solidity::SolcLastSupportedVersion,
|
||||
)?;
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
if arguments.license {
|
||||
let license_mit = include_str!("../../../../LICENSE-MIT");
|
||||
let license_apache = include_str!("../../../../LICENSE-APACHE");
|
||||
|
||||
writeln!(std::io::stdout(), "{}\n{}\n", license_mit, license_apache)?;
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
#[cfg(feature = "parallel")]
|
||||
rayon::ThreadPoolBuilder::new()
|
||||
.stack_size(RAYON_WORKER_STACK_SIZE)
|
||||
@@ -63,20 +71,20 @@ fn main_inner() -> anyhow::Result<()> {
|
||||
let mut infile = std::fs::File::open(fname)?;
|
||||
#[cfg(target_os = "emscripten")]
|
||||
{
|
||||
return resolc::WorkerProcess::run(Some(&mut infile));
|
||||
return revive_solidity::WorkerProcess::run(Some(&mut infile));
|
||||
}
|
||||
#[cfg(not(target_os = "emscripten"))]
|
||||
{
|
||||
return resolc::NativeProcess::run(Some(&mut infile));
|
||||
return revive_solidity::NativeProcess::run(Some(&mut infile));
|
||||
}
|
||||
}
|
||||
#[cfg(target_os = "emscripten")]
|
||||
{
|
||||
return resolc::WorkerProcess::run(None);
|
||||
return revive_solidity::WorkerProcess::run(None);
|
||||
}
|
||||
#[cfg(not(target_os = "emscripten"))]
|
||||
{
|
||||
return resolc::NativeProcess::run(None);
|
||||
return revive_solidity::NativeProcess::run(None);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -103,16 +111,14 @@ fn main_inner() -> anyhow::Result<()> {
|
||||
let mut solc = {
|
||||
#[cfg(target_os = "emscripten")]
|
||||
{
|
||||
resolc::SoljsonCompiler
|
||||
revive_solidity::SoljsonCompiler
|
||||
}
|
||||
|
||||
#[cfg(not(target_os = "emscripten"))]
|
||||
{
|
||||
resolc::SolcCompiler::new(
|
||||
arguments
|
||||
.solc
|
||||
.unwrap_or_else(|| resolc::SolcCompiler::DEFAULT_EXECUTABLE_NAME.to_owned()),
|
||||
)?
|
||||
revive_solidity::SolcCompiler::new(arguments.solc.unwrap_or_else(|| {
|
||||
revive_solidity::SolcCompiler::DEFAULT_EXECUTABLE_NAME.to_owned()
|
||||
}))?
|
||||
}
|
||||
};
|
||||
|
||||
@@ -142,13 +148,17 @@ fn main_inner() -> anyhow::Result<()> {
|
||||
None => true,
|
||||
};
|
||||
|
||||
let memory_config = revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory::new(
|
||||
arguments.heap_size,
|
||||
arguments.stack_size,
|
||||
);
|
||||
let mut memory_config =
|
||||
revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory::default();
|
||||
if let Some(heap_size) = arguments.heap_size {
|
||||
memory_config.heap_size = heap_size
|
||||
}
|
||||
if let Some(stack_size) = arguments.stack_size {
|
||||
memory_config.stack_size = stack_size
|
||||
}
|
||||
|
||||
let build = if arguments.yul {
|
||||
resolc::yul(
|
||||
revive_solidity::yul(
|
||||
input_files.as_slice(),
|
||||
&mut solc,
|
||||
optimizer_settings,
|
||||
@@ -158,7 +168,7 @@ fn main_inner() -> anyhow::Result<()> {
|
||||
memory_config,
|
||||
)
|
||||
} else if arguments.llvm_ir {
|
||||
resolc::llvm_ir(
|
||||
revive_solidity::llvm_ir(
|
||||
input_files.as_slice(),
|
||||
optimizer_settings,
|
||||
include_metadata_hash,
|
||||
@@ -167,7 +177,7 @@ fn main_inner() -> anyhow::Result<()> {
|
||||
memory_config,
|
||||
)
|
||||
} else if arguments.standard_json {
|
||||
resolc::standard_json(
|
||||
revive_solidity::standard_json(
|
||||
&mut solc,
|
||||
arguments.detect_missing_libraries,
|
||||
arguments.base_path,
|
||||
@@ -178,7 +188,7 @@ fn main_inner() -> anyhow::Result<()> {
|
||||
)?;
|
||||
return Ok(());
|
||||
} else if let Some(format) = arguments.combined_json {
|
||||
resolc::combined_json(
|
||||
revive_solidity::combined_json(
|
||||
format,
|
||||
input_files.as_slice(),
|
||||
arguments.libraries,
|
||||
@@ -200,7 +210,7 @@ fn main_inner() -> anyhow::Result<()> {
|
||||
)?;
|
||||
return Ok(());
|
||||
} else {
|
||||
resolc::standard_output(
|
||||
revive_solidity::standard_output(
|
||||
input_files.as_slice(),
|
||||
arguments.libraries,
|
||||
&mut solc,
|
||||
@@ -240,7 +250,9 @@ fn main_inner() -> anyhow::Result<()> {
|
||||
|
||||
writeln!(
|
||||
std::io::stdout(),
|
||||
"Contract `{path}` assembly:\n\n{assembly_text}"
|
||||
"Contract `{}` assembly:\n\n{}",
|
||||
path,
|
||||
assembly_text
|
||||
)?;
|
||||
}
|
||||
if arguments.output_binary {
|
||||
@@ -89,7 +89,7 @@ pub fn build_solidity_with_options(
|
||||
sources.clone(),
|
||||
libraries.clone(),
|
||||
remappings,
|
||||
SolcStandardJsonInputSettingsSelection::new_required_for_tests(),
|
||||
SolcStandardJsonInputSettingsSelection::new_required(),
|
||||
SolcStandardJsonInputSettingsOptimizer::new(
|
||||
solc_optimizer_enabled,
|
||||
optimizer_settings.middle_end_as_string().chars().last(),
|
||||
@@ -154,7 +154,7 @@ pub fn build_solidity_with_options_evm(
|
||||
sources.clone(),
|
||||
libraries.clone(),
|
||||
remappings,
|
||||
SolcStandardJsonInputSettingsSelection::new_required_for_tests(),
|
||||
SolcStandardJsonInputSettingsSelection::new_required(),
|
||||
SolcStandardJsonInputSettingsOptimizer::new(
|
||||
solc_optimizer_enabled,
|
||||
None,
|
||||
@@ -211,7 +211,7 @@ pub fn build_solidity_and_detect_missing_libraries(
|
||||
sources.clone(),
|
||||
libraries.clone(),
|
||||
None,
|
||||
SolcStandardJsonInputSettingsSelection::new_required_for_tests(),
|
||||
SolcStandardJsonInputSettingsSelection::new_required(),
|
||||
SolcStandardJsonInputSettingsOptimizer::new(true, None, &solc_version.default, false),
|
||||
None,
|
||||
None,
|
||||
@@ -285,7 +285,7 @@ pub fn check_solidity_warning(
|
||||
sources.clone(),
|
||||
libraries,
|
||||
None,
|
||||
SolcStandardJsonInputSettingsSelection::new_required_for_tests(),
|
||||
SolcStandardJsonInputSettingsSelection::new_required(),
|
||||
SolcStandardJsonInputSettingsOptimizer::new(true, None, &solc_version.default, false),
|
||||
None,
|
||||
suppressed_warnings,
|
||||
@@ -361,7 +361,7 @@ fn compile_evm(
|
||||
.expect("source should compile");
|
||||
let object = &contracts
|
||||
.get(contract_name)
|
||||
.unwrap_or_else(|| panic!("contract '{contract_name}' didn't produce bin-runtime"));
|
||||
.unwrap_or_else(|| panic!("contract '{}' didn't produce bin-runtime", contract_name));
|
||||
let code = if runtime {
|
||||
object.1.object.as_str()
|
||||
} else {
|
||||
-6
@@ -15,11 +15,6 @@ const pathToBasicYulContract = path.join(
|
||||
'yul',
|
||||
contractYulFilename
|
||||
)
|
||||
const pathToMemsetYulContract = path.join(
|
||||
pathToContracts,
|
||||
'yul',
|
||||
'memset.yul'
|
||||
)
|
||||
const pathToBasicSolContract = path.join(
|
||||
pathToContracts,
|
||||
'solidity',
|
||||
@@ -47,7 +42,6 @@ export const paths = {
|
||||
pathToContracts: pathToContracts,
|
||||
pathToBasicSolContract: pathToBasicSolContract,
|
||||
pathToBasicYulContract: pathToBasicYulContract,
|
||||
pathToMemsetYulContract: pathToMemsetYulContract,
|
||||
pathToSolBinOutputFile: pathToSolBinOutputFile,
|
||||
pathToSolAsmOutputFile: pathToSolAsmOutputFile,
|
||||
}
|
||||
@@ -121,10 +121,10 @@ fn optimizer() {
|
||||
|
||||
assert!(
|
||||
size_when_optimized_for_cycles < size_when_unoptimized,
|
||||
"Expected the cycles-optimized bytecode to be smaller than the unoptimized. Optimized: {size_when_optimized_for_cycles}B, Unoptimized: {size_when_unoptimized}B",
|
||||
"Expected the cycles-optimized bytecode to be smaller than the unoptimized. Optimized: {}B, Unoptimized: {}B", size_when_optimized_for_cycles, size_when_unoptimized,
|
||||
);
|
||||
assert!(
|
||||
size_when_optimized_for_size < size_when_unoptimized,
|
||||
"Expected the size-optimized bytecode to be smaller than the unoptimized. Optimized: {size_when_optimized_for_size}B, Unoptimized: {size_when_unoptimized}B",
|
||||
"Expected the size-optimized bytecode to be smaller than the unoptimized. Optimized: {}B, Unoptimized: {}B", size_when_optimized_for_size, size_when_unoptimized,
|
||||
);
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user