mirror of
https://github.com/pezkuwichain/revive.git
synced 2026-06-14 18:01:05 +00:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Omar Abdulla
|
425e970eb1 |
@@ -7,8 +7,6 @@ on:
|
||||
- 'LLVM.lock'
|
||||
- 'crates/llvm-builder/**'
|
||||
- '.github/workflows/test-llvm-builder.yml'
|
||||
paths-ignore:
|
||||
- "**.md"
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
|
||||
|
||||
@@ -2,13 +2,9 @@ name: Test Wasm Version
|
||||
on:
|
||||
push:
|
||||
branches: ["main"]
|
||||
paths-ignore:
|
||||
- "**.md"
|
||||
pull_request:
|
||||
branches: ["main"]
|
||||
types: [opened, synchronize]
|
||||
paths-ignore:
|
||||
- "**.md"
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
|
||||
|
||||
@@ -2,13 +2,9 @@ name: Test
|
||||
on:
|
||||
push:
|
||||
branches: ["main"]
|
||||
paths-ignore:
|
||||
- "**.md"
|
||||
pull_request:
|
||||
branches: ["main"]
|
||||
types: [opened, synchronize]
|
||||
paths-ignore:
|
||||
- "**.md"
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
|
||||
@@ -56,3 +52,6 @@ jobs:
|
||||
|
||||
- name: Test cargo workspace
|
||||
run: make test-workspace
|
||||
|
||||
- name: Test CLI
|
||||
run: make test-cli
|
||||
|
||||
@@ -17,7 +17,6 @@ Supported `polkadot-sdk` rev: `2503.0.1`
|
||||
- Column numbers in debug information.
|
||||
- Support for the YUL optimizer details in the standard json input definition.
|
||||
- The `revive-explorer` compiler utility.
|
||||
- `revive-yul`: The AST visitor interface.
|
||||
|
||||
### Fixed
|
||||
- The debug info source file matches the YUL path in `--debug-output-dir`, allowing tools to display the source line.
|
||||
|
||||
Generated
+45
-151
@@ -105,26 +105,13 @@ version = "0.8.25"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9d8bcce99ad10fe02640cfaec1c6bc809b837c783c1d52906aa5af66e2a196f6"
|
||||
dependencies = [
|
||||
"alloy-dyn-abi 0.8.25",
|
||||
"alloy-dyn-abi",
|
||||
"alloy-json-abi 0.8.25",
|
||||
"alloy-primitives 0.8.25",
|
||||
"alloy-rlp",
|
||||
"alloy-sol-types 0.8.25",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "alloy-core"
|
||||
version = "1.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bfe6c56d58fbfa9f0f6299376e8ce33091fc6494239466814c3f54b55743cb09"
|
||||
dependencies = [
|
||||
"alloy-dyn-abi 1.3.1",
|
||||
"alloy-json-abi 1.3.1",
|
||||
"alloy-primitives 1.3.1",
|
||||
"alloy-rlp",
|
||||
"alloy-sol-types 1.3.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "alloy-dyn-abi"
|
||||
version = "0.8.25"
|
||||
@@ -142,29 +129,13 @@ dependencies = [
|
||||
"winnow",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "alloy-dyn-abi"
|
||||
version = "1.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a3f56873f3cac7a2c63d8e98a4314b8311aa96adb1a0f82ae923eb2119809d2c"
|
||||
dependencies = [
|
||||
"alloy-json-abi 1.3.1",
|
||||
"alloy-primitives 1.3.1",
|
||||
"alloy-sol-type-parser 1.3.1",
|
||||
"alloy-sol-types 1.3.1",
|
||||
"itoa",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"winnow",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "alloy-eip2124"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "741bdd7499908b3aa0b159bba11e71c8cddd009a2c2eb7a06e825f1ec87900a5"
|
||||
dependencies = [
|
||||
"alloy-primitives 1.3.1",
|
||||
"alloy-primitives 1.1.2",
|
||||
"alloy-rlp",
|
||||
"crc",
|
||||
"serde",
|
||||
@@ -177,7 +148,7 @@ version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7b82752a889170df67bbb36d42ca63c531eb16274f0d7299ae2a680facba17bd"
|
||||
dependencies = [
|
||||
"alloy-primitives 1.3.1",
|
||||
"alloy-primitives 1.1.2",
|
||||
"alloy-rlp",
|
||||
"serde",
|
||||
]
|
||||
@@ -188,7 +159,7 @@ version = "0.6.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9d4769c6ffddca380b0070d71c8b7f30bed375543fe76bb2f74ec0acf4b7cd16"
|
||||
dependencies = [
|
||||
"alloy-primitives 1.3.1",
|
||||
"alloy-primitives 1.1.2",
|
||||
"alloy-rlp",
|
||||
"serde",
|
||||
"thiserror 2.0.12",
|
||||
@@ -203,7 +174,7 @@ dependencies = [
|
||||
"alloy-eip2124",
|
||||
"alloy-eip2930",
|
||||
"alloy-eip7702",
|
||||
"alloy-primitives 1.3.1",
|
||||
"alloy-primitives 1.1.2",
|
||||
"alloy-rlp",
|
||||
"alloy-serde",
|
||||
"auto_impl",
|
||||
@@ -221,7 +192,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c98fb40f07997529235cc474de814cd7bd9de561e101716289095696c0e4639d"
|
||||
dependencies = [
|
||||
"alloy-eips",
|
||||
"alloy-primitives 1.3.1",
|
||||
"alloy-primitives 1.1.2",
|
||||
"alloy-serde",
|
||||
"alloy-trie",
|
||||
"serde",
|
||||
@@ -241,12 +212,12 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "alloy-json-abi"
|
||||
version = "1.3.1"
|
||||
version = "1.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "125a1c373261b252e53e04d6e92c37d881833afc1315fceab53fd46045695640"
|
||||
checksum = "3ccaa79753d7bf15f06399ea76922afbfaf8d18bebed9e8fc452984b4a90dcc9"
|
||||
dependencies = [
|
||||
"alloy-primitives 1.3.1",
|
||||
"alloy-sol-type-parser 1.3.1",
|
||||
"alloy-primitives 1.1.2",
|
||||
"alloy-sol-type-parser 1.1.2",
|
||||
"serde",
|
||||
"serde_json",
|
||||
]
|
||||
@@ -280,9 +251,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "alloy-primitives"
|
||||
version = "1.3.1"
|
||||
version = "1.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bc9485c56de23438127a731a6b4c87803d49faf1a7068dcd1d8768aca3a9edb9"
|
||||
checksum = "18c35fc4b03ace65001676358ffbbaefe2a2b27ee50fe777c345082c7c888be8"
|
||||
dependencies = [
|
||||
"alloy-rlp",
|
||||
"bytes",
|
||||
@@ -333,7 +304,7 @@ version = "1.0.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "730e8f2edf2fc224cabd1c25d090e1655fa6137b2e409f92e5eec735903f1507"
|
||||
dependencies = [
|
||||
"alloy-primitives 1.3.1",
|
||||
"alloy-primitives 1.1.2",
|
||||
"serde",
|
||||
"serde_json",
|
||||
]
|
||||
@@ -354,12 +325,12 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "alloy-sol-macro"
|
||||
version = "1.3.1"
|
||||
version = "1.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d20d867dcf42019d4779519a1ceb55eba8d7f3d0e4f0a89bcba82b8f9eb01e48"
|
||||
checksum = "8612e0658964d616344f199ab251a49d48113992d81b92dab93ed855faa66383"
|
||||
dependencies = [
|
||||
"alloy-sol-macro-expander 1.3.1",
|
||||
"alloy-sol-macro-input 1.3.1",
|
||||
"alloy-sol-macro-expander 1.1.2",
|
||||
"alloy-sol-macro-input 1.1.2",
|
||||
"proc-macro-error2",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -386,11 +357,11 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "alloy-sol-macro-expander"
|
||||
version = "1.3.1"
|
||||
version = "1.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b74e91b0b553c115d14bd0ed41898309356dc85d0e3d4b9014c4e7715e48c8ad"
|
||||
checksum = "7a384edac7283bc4c010a355fb648082860c04b826bb7a814c45263c8f304c74"
|
||||
dependencies = [
|
||||
"alloy-sol-macro-input 1.3.1",
|
||||
"alloy-sol-macro-input 1.1.2",
|
||||
"const-hex",
|
||||
"heck",
|
||||
"indexmap 2.9.0",
|
||||
@@ -398,7 +369,7 @@ dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.101",
|
||||
"syn-solidity 1.3.1",
|
||||
"syn-solidity 1.1.2",
|
||||
"tiny-keccak",
|
||||
]
|
||||
|
||||
@@ -420,9 +391,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "alloy-sol-macro-input"
|
||||
version = "1.3.1"
|
||||
version = "1.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "84194d31220803f5f62d0a00f583fd3a062b36382e2bea446f1af96727754565"
|
||||
checksum = "0dd588c2d516da7deb421b8c166dc60b7ae31bca5beea29ab6621fcfa53d6ca5"
|
||||
dependencies = [
|
||||
"const-hex",
|
||||
"dunce",
|
||||
@@ -431,7 +402,7 @@ dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.101",
|
||||
"syn-solidity 1.3.1",
|
||||
"syn-solidity 1.1.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -446,9 +417,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "alloy-sol-type-parser"
|
||||
version = "1.3.1"
|
||||
version = "1.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fe8c27b3cf6b2bb8361904732f955bc7c05e00be5f469cec7e2280b6167f3ff0"
|
||||
checksum = "e86ddeb70792c7ceaad23e57d52250107ebbb86733e52f4a25d8dc1abc931837"
|
||||
dependencies = [
|
||||
"serde",
|
||||
"winnow",
|
||||
@@ -469,13 +440,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "alloy-sol-types"
|
||||
version = "1.3.1"
|
||||
version = "1.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f5383d34ea00079e6dd89c652bcbdb764db160cef84e6250926961a0b2295d04"
|
||||
checksum = "584cb97bfc5746cb9dcc4def77da11694b5d6d7339be91b7480a6a68dc129387"
|
||||
dependencies = [
|
||||
"alloy-json-abi 1.3.1",
|
||||
"alloy-primitives 1.3.1",
|
||||
"alloy-sol-macro 1.3.1",
|
||||
"alloy-json-abi 1.1.2",
|
||||
"alloy-primitives 1.1.2",
|
||||
"alloy-sol-macro 1.1.2",
|
||||
"serde",
|
||||
]
|
||||
|
||||
@@ -485,7 +456,7 @@ version = "0.8.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "983d99aa81f586cef9dae38443245e585840fcf0fc58b09aee0b1f27aed1d500"
|
||||
dependencies = [
|
||||
"alloy-primitives 1.3.1",
|
||||
"alloy-primitives 1.1.2",
|
||||
"alloy-rlp",
|
||||
"arrayvec",
|
||||
"derive_more 2.0.1",
|
||||
@@ -6519,7 +6490,7 @@ version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "895fe6f50f621a69132697b8b43d29d1db4d9ff445eec410bf1fc98cd7e9412c"
|
||||
dependencies = [
|
||||
"alloy-core 0.8.25",
|
||||
"alloy-core",
|
||||
"derive_more 0.99.20",
|
||||
"environmental",
|
||||
"ethabi-decode",
|
||||
@@ -6534,8 +6505,8 @@ dependencies = [
|
||||
"num-integer",
|
||||
"num-traits",
|
||||
"pallet-revive-fixtures",
|
||||
"pallet-revive-proc-macro 0.3.0",
|
||||
"pallet-revive-uapi 0.4.0",
|
||||
"pallet-revive-proc-macro",
|
||||
"pallet-revive-uapi",
|
||||
"pallet-transaction-payment",
|
||||
"parity-scale-codec",
|
||||
"paste",
|
||||
@@ -6568,7 +6539,7 @@ checksum = "dc1df19ca809f036d6ddf1632039e9db312f92dbe8f9390e6722ad808cd95377"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"cargo_metadata",
|
||||
"pallet-revive-uapi 0.4.0",
|
||||
"pallet-revive-uapi",
|
||||
"polkavm-linker 0.21.0",
|
||||
"sp-core",
|
||||
"sp-io",
|
||||
@@ -6587,7 +6558,7 @@ dependencies = [
|
||||
"pallet-balances",
|
||||
"pallet-message-queue",
|
||||
"pallet-revive",
|
||||
"pallet-revive-uapi 0.4.0",
|
||||
"pallet-revive-uapi",
|
||||
"pallet-timestamp",
|
||||
"pallet-xcm",
|
||||
"parity-scale-codec",
|
||||
@@ -6616,17 +6587,6 @@ dependencies = [
|
||||
"syn 2.0.101",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pallet-revive-proc-macro"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "feb9c42c125790dd4bb0132312bb1a9d3a890b4720c7696d636194311f948e36"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.101",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pallet-revive-uapi"
|
||||
version = "0.4.0"
|
||||
@@ -6634,25 +6594,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0cb8f45102c6279f59f55e0051fc6c26b996619d7842800dfaf3a2583459a1c7"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"pallet-revive-proc-macro 0.3.0",
|
||||
"pallet-revive-proc-macro",
|
||||
"parity-scale-codec",
|
||||
"polkavm-derive 0.21.0",
|
||||
"scale-info",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pallet-revive-uapi"
|
||||
version = "0.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e340813d94f380bc531d4cd5f28685065a14dbbff87ab23507f72c7d2792b82c"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"pallet-revive-proc-macro 0.4.0",
|
||||
"parity-scale-codec",
|
||||
"polkavm-derive 0.27.0",
|
||||
"scale-info",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pallet-root-offences"
|
||||
version = "37.0.0"
|
||||
@@ -7980,12 +7927,6 @@ dependencies = [
|
||||
"polkavm-assembler 0.24.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "polkavm-common"
|
||||
version = "0.27.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a19805789e7bf778ac5855f6fe9350353f6a1697c2aab9bfb6fc7c831be54fad"
|
||||
|
||||
[[package]]
|
||||
name = "polkavm-derive"
|
||||
version = "0.18.0"
|
||||
@@ -8004,15 +7945,6 @@ dependencies = [
|
||||
"polkavm-derive-impl-macro 0.21.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "polkavm-derive"
|
||||
version = "0.27.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4eea46a17d87cbf3c0f3f6156f6300f60cec67cf9eaca296c770e0873f8389d6"
|
||||
dependencies = [
|
||||
"polkavm-derive-impl-macro 0.27.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "polkavm-derive-impl"
|
||||
version = "0.18.1"
|
||||
@@ -8037,18 +7969,6 @@ dependencies = [
|
||||
"syn 2.0.101",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "polkavm-derive-impl"
|
||||
version = "0.27.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8abdd1210d96b1dda9ac21199ec469448fd628cea102e2ff0e0df1667c4c3b5f"
|
||||
dependencies = [
|
||||
"polkavm-common 0.27.0",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.101",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "polkavm-derive-impl-macro"
|
||||
version = "0.18.0"
|
||||
@@ -8069,16 +7989,6 @@ dependencies = [
|
||||
"syn 2.0.101",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "polkavm-derive-impl-macro"
|
||||
version = "0.27.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8a45173d70138aa1879892c50777ed0d8b0c8556f7678372f09fa1d89bbbddb4"
|
||||
dependencies = [
|
||||
"polkavm-derive-impl 0.27.0",
|
||||
"syn 2.0.101",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "polkavm-disassembler"
|
||||
version = "0.24.0"
|
||||
@@ -8663,7 +8573,7 @@ dependencies = [
|
||||
name = "revive-benchmarks"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"alloy-primitives 1.3.1",
|
||||
"alloy-primitives 1.1.2",
|
||||
"criterion",
|
||||
"hex",
|
||||
"revive-differential",
|
||||
@@ -8697,7 +8607,7 @@ name = "revive-differential"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"alloy-genesis",
|
||||
"alloy-primitives 1.3.1",
|
||||
"alloy-primitives 1.1.2",
|
||||
"alloy-serde",
|
||||
"hex",
|
||||
"serde",
|
||||
@@ -8719,8 +8629,8 @@ dependencies = [
|
||||
name = "revive-integration"
|
||||
version = "0.1.1"
|
||||
dependencies = [
|
||||
"alloy-primitives 1.3.1",
|
||||
"alloy-sol-types 1.3.1",
|
||||
"alloy-primitives 1.1.2",
|
||||
"alloy-sol-types 1.1.2",
|
||||
"hex",
|
||||
"rayon",
|
||||
"resolc",
|
||||
@@ -8787,27 +8697,11 @@ dependencies = [
|
||||
"sha3",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "revive-rul"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"pallet-revive-uapi 0.7.0",
|
||||
"polkavm-linker 0.24.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "revive-rul-runtime-library"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"alloy-core 1.3.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "revive-runner"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"alloy-primitives 1.3.1",
|
||||
"alloy-primitives 1.1.2",
|
||||
"anyhow",
|
||||
"clap",
|
||||
"env_logger 0.11.8",
|
||||
@@ -10858,9 +10752,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "syn-solidity"
|
||||
version = "1.3.1"
|
||||
version = "1.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a0b198d366dbec045acfcd97295eb653a7a2b40e4dc764ef1e79aafcad439d3c"
|
||||
checksum = "1b5d879005cc1b5ba4e18665be9e9501d9da3a9b95f625497c4cb7ee082b532e"
|
||||
dependencies = [
|
||||
"paste",
|
||||
"proc-macro2",
|
||||
|
||||
@@ -58,7 +58,6 @@ alloy-primitives = { version = "1.1", features = ["serde"] }
|
||||
alloy-sol-types = "1.1"
|
||||
alloy-genesis = "1.0"
|
||||
alloy-serde = "1.0"
|
||||
alloy-core = "1.3"
|
||||
env_logger = { version = "0.11.8", default-features = false }
|
||||
serde_stacker = "0.1.12"
|
||||
criterion = { version = "0.6", features = ["html_reports"] }
|
||||
@@ -72,7 +71,6 @@ tar = "0.4"
|
||||
toml = "0.8"
|
||||
assert_cmd = "2.0"
|
||||
assert_fs = "1.1"
|
||||
pallet-revive-uapi = "0.7.0"
|
||||
|
||||
# polkadot-sdk and friends
|
||||
codec = { version = "3.7.5", default-features = false, package = "parity-scale-codec" }
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
test-integration \
|
||||
test-resolc \
|
||||
test-workspace \
|
||||
test-cli \
|
||||
test-wasm \
|
||||
test-llvm-builder
|
||||
bench \
|
||||
@@ -56,7 +57,7 @@ machete:
|
||||
cargo install cargo-machete
|
||||
cargo machete
|
||||
|
||||
test: format clippy machete test-workspace install-revive-runner install-revive-explorer
|
||||
test: format clippy machete test-cli test-workspace install-revive-runner install-revive-explorer
|
||||
|
||||
test-integration: install-bin
|
||||
cargo test --package revive-integration
|
||||
@@ -67,6 +68,9 @@ test-resolc: install
|
||||
test-workspace: install
|
||||
cargo test --workspace --exclude revive-llvm-builder
|
||||
|
||||
test-cli: install
|
||||
npm run test:cli
|
||||
|
||||
test-wasm: install-wasm
|
||||
npm run test:wasm
|
||||
|
||||
@@ -90,6 +94,6 @@ clean:
|
||||
cargo clean ; \
|
||||
revive-llvm clean ; \
|
||||
rm -rf node_modules ; \
|
||||
rm -rf crates/resolc/src/tests/cli/artifacts ; \
|
||||
rm -rf crates/resolc/src/tests/cli-tests/artifacts ; \
|
||||
cargo uninstall resolc ; \
|
||||
cargo uninstall revive-llvm-builder ;
|
||||
|
||||
@@ -76,7 +76,9 @@ export LLVM_SYS_181_PREFIX=</path/to/the/extracted/archive>/target-llvm/gnu/targ
|
||||
<details>
|
||||
<summary>Building from source</summary>
|
||||
|
||||
The `Makefile` provides a shortcut target to obtain a compatible LLVM build, using the provided [revive-llvm](crates/llvm-builder/README.md) utility. Once installed, point `$LLVM_SYS_181_PREFIX` to the installation afterwards:
|
||||
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
|
||||
make install-llvm
|
||||
|
||||
@@ -29,16 +29,7 @@ pub fn source_file(
|
||||
dwarfdump_executable: &Option<PathBuf>,
|
||||
) -> anyhow::Result<PathBuf> {
|
||||
let output = dwarfdump(shared_object, dwarfdump_executable, &SOURCE_FILE_ARGUMENTS)?;
|
||||
let output = output.trim();
|
||||
|
||||
if output.is_empty() {
|
||||
anyhow::bail!(
|
||||
"the shared object at path `{}` doesn't contain the source file name. Hint: compile with debug information (-g)?",
|
||||
shared_object.display()
|
||||
);
|
||||
}
|
||||
|
||||
Ok(output.into())
|
||||
Ok(output.trim().into())
|
||||
}
|
||||
|
||||
/// The internal `llvm-dwarfdump` helper function.
|
||||
|
||||
@@ -7,7 +7,34 @@ use std::{
|
||||
|
||||
use revive_yul::lexer::token::location::Location;
|
||||
|
||||
use crate::location_mapper::{self, LocationMapper};
|
||||
use crate::location_mapper::{self, map_locations, LocationMap};
|
||||
|
||||
/// Unknwon code.
|
||||
pub const OTHER: &str = "other";
|
||||
/// Compiler internal code.
|
||||
pub const INTERNAL: &str = "internal";
|
||||
/// YUL block code.
|
||||
pub const BLOCK: &str = "block";
|
||||
/// YUL function call code.
|
||||
pub const FUNCTION_CALL: &str = "function_call";
|
||||
/// YUL conditional code.
|
||||
pub const IF: &str = "if";
|
||||
/// YUL loop code.
|
||||
pub const FOR: &str = "for";
|
||||
/// YUL loop continue code.
|
||||
pub const CONTINUE: &str = "continue";
|
||||
/// YUL loop break code.
|
||||
pub const BREAK: &str = "break";
|
||||
/// YUL switch code.
|
||||
pub const SWITCH: &str = "switch";
|
||||
/// YUL variable declaration code.
|
||||
pub const DECLARATION: &str = "let";
|
||||
/// YUL variable assignment code.
|
||||
pub const ASSIGNMENT: &str = "assignment";
|
||||
/// YUL function definition code.
|
||||
pub const FUNCTION_DEFINITION: &str = "function_definition";
|
||||
/// YUL function leave code.
|
||||
pub const LEAVE: &str = "leave";
|
||||
|
||||
/// The dwarf dump analyzer.
|
||||
///
|
||||
@@ -21,7 +48,7 @@ pub struct DwarfdumpAnalyzer {
|
||||
source: PathBuf,
|
||||
|
||||
/// The YUL location to statements map.
|
||||
location_map: HashMap<Location, String>,
|
||||
location_map: LocationMap,
|
||||
|
||||
/// The `llvm-dwarfdump --debug-lines` output.
|
||||
debug_lines: String,
|
||||
@@ -54,7 +81,7 @@ impl DwarfdumpAnalyzer {
|
||||
|
||||
/// Populate the maps so that we can always unwrap later.
|
||||
fn map_locations(&mut self) -> anyhow::Result<()> {
|
||||
self.location_map = LocationMapper::map_locations(&self.source)?;
|
||||
self.location_map = map_locations(&self.source)?;
|
||||
|
||||
self.statements_count = HashMap::with_capacity(self.location_map.len());
|
||||
self.statements_size = HashMap::with_capacity(self.location_map.len());
|
||||
@@ -149,12 +176,13 @@ impl DwarfdumpAnalyzer {
|
||||
location_mapper::BLOCK => "--block-cost",
|
||||
location_mapper::FUNCTION_CALL => "--function-call-cost",
|
||||
location_mapper::IF => "--if-cost",
|
||||
location_mapper::CONTINUE => "--continue-cost",
|
||||
location_mapper::BREAK => "--break-cost",
|
||||
location_mapper::LEAVE => "--leave-cost",
|
||||
location_mapper::SWITCH => "--switch-cost",
|
||||
location_mapper::DECLARATION => "--variable-declaration-cost",
|
||||
location_mapper::ASSIGNMENT => "--assignment-cost",
|
||||
location_mapper::FUNCTION_DEFINITION => "--function-definition-cost",
|
||||
location_mapper::IDENTIFIER => "--identifier-cost",
|
||||
location_mapper::LITERAL => "--literal-cost",
|
||||
_ => "--expression-statement-cost",
|
||||
};
|
||||
|
||||
|
||||
@@ -1,123 +1,158 @@
|
||||
//! The location mapper utility maps YUL source locations to AST statements.
|
||||
//!
|
||||
//! TODO: Refactor when the AST visitor is implemented.
|
||||
|
||||
use std::{collections::HashMap, path::Path};
|
||||
|
||||
use revive_yul::{
|
||||
lexer::{token::location::Location, Lexer},
|
||||
parser::{
|
||||
identifier::Identifier,
|
||||
statement::{
|
||||
assignment::Assignment,
|
||||
block::Block,
|
||||
expression::{function_call::FunctionCall, literal::Literal},
|
||||
for_loop::ForLoop,
|
||||
function_definition::FunctionDefinition,
|
||||
if_conditional::IfConditional,
|
||||
object::Object,
|
||||
switch::Switch,
|
||||
variable_declaration::VariableDeclaration,
|
||||
},
|
||||
parser::statement::{
|
||||
block::Block,
|
||||
expression::{function_call::name::Name, Expression},
|
||||
object::Object,
|
||||
Statement,
|
||||
},
|
||||
visitor::{AstNode, AstVisitor},
|
||||
};
|
||||
|
||||
/// Code attributed to an unknown location.
|
||||
pub const OTHER: &str = "other";
|
||||
/// Code attributed to a compiler internal location.
|
||||
pub const INTERNAL: &str = "internal";
|
||||
/// Code attributed to a block.
|
||||
/// Code attributed to a
|
||||
pub const BLOCK: &str = "block";
|
||||
/// Code attributed to a function call.
|
||||
pub const FUNCTION_CALL: &str = "function_call";
|
||||
/// Code attributed to a for loop.
|
||||
pub const FOR: &str = "for";
|
||||
/// Code attributed to an if statement.
|
||||
pub const IF: &str = "if";
|
||||
/// Code attributed to a switch statement.
|
||||
pub const CONTINUE: &str = "continue";
|
||||
pub const BREAK: &str = "break";
|
||||
pub const LEAVE: &str = "leave";
|
||||
pub const SWITCH: &str = "switch";
|
||||
/// Code attributed to a variable declaration.
|
||||
pub const DECLARATION: &str = "let";
|
||||
/// Code attributed to a variable assignement.
|
||||
pub const ASSIGNMENT: &str = "assignment";
|
||||
/// Code attributed to a function definition.
|
||||
pub const FUNCTION_DEFINITION: &str = "function_definition";
|
||||
/// Code attributed to an identifier.
|
||||
pub const IDENTIFIER: &str = "identifier";
|
||||
/// Code attributed to a literal.
|
||||
pub const LITERAL: &str = "literal";
|
||||
|
||||
/// The location to statements mapper.
|
||||
pub struct LocationMapper(HashMap<Location, String>);
|
||||
/// The location to statements map type alias.
|
||||
pub type LocationMap = HashMap<Location, String>;
|
||||
|
||||
impl LocationMapper {
|
||||
/// Construct a node location map from the given YUL `source` file.
|
||||
pub fn map_locations(source: &Path) -> anyhow::Result<HashMap<Location, String>> {
|
||||
let mut lexer = Lexer::new(std::fs::read_to_string(source)?);
|
||||
let ast = Object::parse(&mut lexer, None).map_err(|error| {
|
||||
anyhow::anyhow!("Contract `{}` parsing error: {:?}", source.display(), error)
|
||||
})?;
|
||||
/// Construct a [LocationMap] from the given YUL `source` file.
|
||||
pub fn map_locations(source: &Path) -> anyhow::Result<LocationMap> {
|
||||
let mut lexer = Lexer::new(std::fs::read_to_string(source)?);
|
||||
let ast = Object::parse(&mut lexer, None).map_err(|error| {
|
||||
anyhow::anyhow!("Contract `{}` parsing error: {:?}", source.display(), error)
|
||||
})?;
|
||||
|
||||
let mut location_map = Self(Default::default());
|
||||
ast.accept(&mut location_map);
|
||||
location_map.0.insert(Location::new(0, 0), OTHER.into());
|
||||
location_map.0.insert(Location::new(1, 0), INTERNAL.into());
|
||||
let mut location_map = HashMap::with_capacity(1024);
|
||||
crate::location_mapper::object_mapper(&mut location_map, &ast);
|
||||
location_map.insert(Location::new(0, 0), OTHER.to_string());
|
||||
location_map.insert(Location::new(1, 0), INTERNAL.to_string());
|
||||
|
||||
Ok(location_map.0)
|
||||
Ok(location_map)
|
||||
}
|
||||
|
||||
/// Map the [Block].
|
||||
fn block_mapper(map: &mut LocationMap, block: &Block) {
|
||||
map.insert(block.location, BLOCK.to_string());
|
||||
|
||||
for statement in &block.statements {
|
||||
statement_mapper(map, statement);
|
||||
}
|
||||
}
|
||||
|
||||
impl AstVisitor for LocationMapper {
|
||||
fn visit(&mut self, node: &impl AstNode) {
|
||||
node.visit_children(self);
|
||||
}
|
||||
/// Map the [Expression].
|
||||
fn expression_mapper(map: &mut LocationMap, expression: &Expression) {
|
||||
if let Expression::FunctionCall(call) = expression {
|
||||
let id = match call.name {
|
||||
Name::UserDefined(_) => FUNCTION_CALL.to_string(),
|
||||
_ => format!("{:?}", call.name),
|
||||
};
|
||||
map.insert(expression.location(), id);
|
||||
|
||||
fn visit_block(&mut self, node: &Block) {
|
||||
node.visit_children(self);
|
||||
self.0.insert(node.location, BLOCK.into());
|
||||
}
|
||||
|
||||
fn visit_assignment(&mut self, node: &Assignment) {
|
||||
node.visit_children(self);
|
||||
self.0.insert(node.location, ASSIGNMENT.into());
|
||||
}
|
||||
|
||||
fn visit_if_conditional(&mut self, node: &IfConditional) {
|
||||
node.visit_children(self);
|
||||
self.0.insert(node.location, IF.into());
|
||||
}
|
||||
|
||||
fn visit_variable_declaration(&mut self, node: &VariableDeclaration) {
|
||||
node.visit_children(self);
|
||||
self.0.insert(node.location, DECLARATION.into());
|
||||
}
|
||||
|
||||
fn visit_function_call(&mut self, node: &FunctionCall) {
|
||||
node.visit_children(self);
|
||||
self.0.insert(node.location, node.name.to_string());
|
||||
}
|
||||
|
||||
fn visit_function_definition(&mut self, node: &FunctionDefinition) {
|
||||
node.visit_children(self);
|
||||
self.0.insert(node.location, FUNCTION_DEFINITION.into());
|
||||
}
|
||||
|
||||
fn visit_identifier(&mut self, node: &Identifier) {
|
||||
node.visit_children(self);
|
||||
self.0.insert(node.location, IDENTIFIER.into());
|
||||
}
|
||||
|
||||
fn visit_literal(&mut self, node: &Literal) {
|
||||
node.visit_children(self);
|
||||
self.0.insert(node.location, LITERAL.into());
|
||||
}
|
||||
|
||||
fn visit_for_loop(&mut self, node: &ForLoop) {
|
||||
node.visit_children(self);
|
||||
self.0.insert(node.location, FOR.into());
|
||||
}
|
||||
|
||||
fn visit_switch(&mut self, node: &Switch) {
|
||||
node.visit_children(self);
|
||||
self.0.insert(node.location, SWITCH.into());
|
||||
for expression in &call.arguments {
|
||||
expression_mapper(map, expression);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Map the [Statement].
|
||||
fn statement_mapper(map: &mut LocationMap, statement: &Statement) {
|
||||
match statement {
|
||||
Statement::Object(object) => object_mapper(map, object),
|
||||
|
||||
Statement::Code(code) => block_mapper(map, &code.block),
|
||||
|
||||
Statement::Block(block) => block_mapper(map, block),
|
||||
|
||||
Statement::ForLoop(for_loop) => {
|
||||
map.insert(for_loop.location, FOR.to_string());
|
||||
|
||||
expression_mapper(map, &for_loop.condition);
|
||||
block_mapper(map, &for_loop.body);
|
||||
block_mapper(map, &for_loop.initializer);
|
||||
block_mapper(map, &for_loop.finalizer);
|
||||
}
|
||||
|
||||
Statement::IfConditional(if_conditional) => {
|
||||
map.insert(if_conditional.location, IF.to_string());
|
||||
|
||||
expression_mapper(map, &if_conditional.condition);
|
||||
block_mapper(map, &if_conditional.block);
|
||||
}
|
||||
|
||||
Statement::Expression(expression) => expression_mapper(map, expression),
|
||||
|
||||
Statement::Continue(location) => {
|
||||
map.insert(*location, CONTINUE.to_string());
|
||||
}
|
||||
|
||||
Statement::Leave(location) => {
|
||||
map.insert(*location, LEAVE.to_string());
|
||||
}
|
||||
|
||||
Statement::Break(location) => {
|
||||
map.insert(*location, BREAK.to_string());
|
||||
}
|
||||
|
||||
Statement::Switch(switch) => {
|
||||
map.insert(switch.expression.location(), SWITCH.to_string());
|
||||
|
||||
expression_mapper(map, &switch.expression);
|
||||
for case in &switch.cases {
|
||||
block_mapper(map, &case.block);
|
||||
}
|
||||
if let Some(block) = switch.default.as_ref() {
|
||||
block_mapper(map, block);
|
||||
}
|
||||
}
|
||||
|
||||
Statement::Assignment(assignment) => {
|
||||
map.insert(assignment.location, ASSIGNMENT.to_string());
|
||||
|
||||
expression_mapper(map, &assignment.initializer);
|
||||
}
|
||||
|
||||
Statement::VariableDeclaration(declaration) => {
|
||||
map.insert(declaration.location, DECLARATION.to_string());
|
||||
|
||||
if let Some(expression) = declaration.expression.as_ref() {
|
||||
expression_mapper(map, expression);
|
||||
}
|
||||
}
|
||||
|
||||
Statement::FunctionDefinition(definition) => {
|
||||
map.insert(definition.location, FUNCTION_DEFINITION.to_string());
|
||||
|
||||
block_mapper(map, &definition.body);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Map the [Object].
|
||||
fn object_mapper(map: &mut LocationMap, object: &Object) {
|
||||
map.insert(object.location, object.identifier.clone());
|
||||
|
||||
block_mapper(map, &object.code.block);
|
||||
|
||||
if let Some(object) = object.inner_object.as_ref() {
|
||||
object_mapper(map, object);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,8 +10,6 @@ use revive_explorer::{dwarfdump, dwarfdump_analyzer::DwarfdumpAnalyzer, yul_phas
|
||||
/// - The count of each YUL statement translated.
|
||||
/// - A per YUL statement break-down of bytecode size contributed per.
|
||||
/// - Estimated `yul-phaser` cost parameters.
|
||||
///
|
||||
/// Note: This tool might not be fully accurate, especially when the code was optimized.
|
||||
#[derive(Parser, Debug)]
|
||||
#[command(version, about, long_about = None)]
|
||||
struct Args {
|
||||
@@ -28,7 +26,6 @@ struct Args {
|
||||
yul_phaser: Option<PathBuf>,
|
||||
|
||||
/// Path of the shared object to analyze.
|
||||
/// It must have been compiled with debug info (-g).
|
||||
file: PathBuf,
|
||||
}
|
||||
|
||||
|
||||
@@ -59,7 +59,7 @@ Obtain a compatible build for your host platform from the release section of thi
|
||||
|
||||
* Install the builder using `cargo`:
|
||||
```shell
|
||||
cargo install --force --locked --path crates/llvm-builder
|
||||
cargo install --git https://github.com/paritytech/revive-llvm-builder --force --locked
|
||||
```
|
||||
|
||||
> The builder is not the LLVM framework itself, but a tool that clones its repository and runs a sequence of build commands. By default it is installed in `~/.cargo/bin/`, which is recommended to be added to your `$PATH`.
|
||||
@@ -88,12 +88,7 @@ Obtain a compatible build for your host platform from the release section of thi
|
||||
|
||||
Build artifacts end up in the `./target-llvm/gnu/target-final/` directory by default.
|
||||
The `gnu` directory depends on the supported archticture and will either be `gnu`, `musl` or `emscripten`.
|
||||
You now need to export the final target directory `$LLVM_SYS_181_PREFIX`:
|
||||
|
||||
```shell
|
||||
export LLVM_SYS_181_PREFIX=${PWD}/target-llvm/gnu/target-final
|
||||
```
|
||||
|
||||
You now need to export the final target directory `$LLVM_SYS_181_PREFIX`: `export LLVM_SYS_181_PREFIX=${PWD}/target-llvm/gnu/target-final`
|
||||
If built with the `--enable-tests` option, test tools will be in the `./target-llvm/gnu/build-final/` directory, along with copies of the build artifacts. For all supported build options, run `revive-llvm build --help`.
|
||||
|
||||
</details>
|
||||
|
||||
@@ -9,7 +9,7 @@ use crate::polkavm::DummyDependency;
|
||||
pub fn create_context(
|
||||
llvm: &inkwell::context::Context,
|
||||
optimizer_settings: OptimizerSettings,
|
||||
) -> Context<'_, DummyDependency> {
|
||||
) -> Context<DummyDependency> {
|
||||
crate::initialize_llvm(crate::Target::PVM, "resolc", Default::default());
|
||||
|
||||
let module = llvm.create_module("test");
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
module.exports = {
|
||||
preset: "ts-jest",
|
||||
testEnvironment: "node",
|
||||
};
|
||||
@@ -0,0 +1,66 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<testsuites name="jest tests" tests="27" failures="0" errors="0" time="2.146">
|
||||
<testsuite name="Run with --yul by default" errors="0" failures="0" skipped="1" timestamp="2024-10-24T17:08:50" time="1.508" tests="6">
|
||||
<testcase classname="Run with --yul by default Valid command exit code = 0" name="Run with --yul by default Valid command exit code = 0" time="0.003">
|
||||
</testcase>
|
||||
<testcase classname="Run with --yul by default --yul output is presented" name="Run with --yul by default --yul output is presented" time="0">
|
||||
</testcase>
|
||||
<testcase classname="Run with --yul by default solc exit code == resolc exit code" name="Run with --yul by default solc exit code == resolc exit code" time="0">
|
||||
<skipped/>
|
||||
</testcase>
|
||||
<testcase classname="Run with --yul by default run invalid: resolc --yul" name="Run with --yul by default run invalid: resolc --yul" time="0.001">
|
||||
</testcase>
|
||||
<testcase classname="Run with --yul by default Invalid command exit code = 1" name="Run with --yul by default Invalid command exit code = 1" time="0">
|
||||
</testcase>
|
||||
<testcase classname="Run with --yul by default Invalid solc exit code == Invalid resolc exit code" name="Run with --yul by default Invalid solc exit code == Invalid resolc exit code" time="0.041">
|
||||
</testcase>
|
||||
</testsuite>
|
||||
<testsuite name="Run with --asm by default" errors="0" failures="0" skipped="0" timestamp="2024-10-24T17:08:50" time="1.512" tests="6">
|
||||
<testcase classname="Run with --asm by default Valid command exit code = 0" name="Run with --asm by default Valid command exit code = 0" time="0.002">
|
||||
</testcase>
|
||||
<testcase classname="Run with --asm by default --asm output is presented" name="Run with --asm by default --asm output is presented" time="0.001">
|
||||
</testcase>
|
||||
<testcase classname="Run with --asm by default solc exit code == resolc exit code" name="Run with --asm by default solc exit code == resolc exit code" time="0.044">
|
||||
</testcase>
|
||||
<testcase classname="Run with --asm by default run invalid: resolc --asm" name="Run with --asm by default run invalid: resolc --asm" time="0">
|
||||
</testcase>
|
||||
<testcase classname="Run with --asm by default Invalid command exit code = 1" name="Run with --asm by default Invalid command exit code = 1" time="0.001">
|
||||
</testcase>
|
||||
<testcase classname="Run with --asm by default Invalid solc exit code == Invalid resolc exit code" name="Run with --asm by default Invalid solc exit code == Invalid resolc exit code" time="0.04">
|
||||
</testcase>
|
||||
</testsuite>
|
||||
<testsuite name="Run resolc without any options" errors="0" failures="0" skipped="2" timestamp="2024-10-24T17:08:50" time="2.016" tests="15">
|
||||
<testcase classname="Run resolc without any options Info with help is presented" name="Run resolc without any options Info with help is presented" time="0.002">
|
||||
</testcase>
|
||||
<testcase classname="Run resolc without any options Exit code = 1" name="Run resolc without any options Exit code = 1" time="0">
|
||||
</testcase>
|
||||
<testcase classname="Run resolc without any options solc exit code == resolc exit code" name="Run resolc without any options solc exit code == resolc exit code" time="0.044">
|
||||
</testcase>
|
||||
<testcase classname="Default run a command from the help Compiler run successful" name="Default run a command from the help Compiler run successful" time="0">
|
||||
</testcase>
|
||||
<testcase classname="Default run a command from the help Exit code = 0" name="Default run a command from the help Exit code = 0" time="0.001">
|
||||
</testcase>
|
||||
<testcase classname="Default run a command from the help Output dir is created" name="Default run a command from the help Output dir is created" time="0">
|
||||
</testcase>
|
||||
<testcase classname="Default run a command from the help Output file is created" name="Default run a command from the help Output file is created" time="0">
|
||||
<skipped/>
|
||||
</testcase>
|
||||
<testcase classname="Default run a command from the help the output file is not empty" name="Default run a command from the help the output file is not empty" time="0">
|
||||
</testcase>
|
||||
<testcase classname="Default run a command from the help No 'Error'/'Warning'/'Fail' in the output" name="Default run a command from the help No 'Error'/'Warning'/'Fail' in the output" time="0">
|
||||
</testcase>
|
||||
<testcase classname="Default run a command from the help Compiler run successful" name="Default run a command from the help Compiler run successful" time="0.001">
|
||||
</testcase>
|
||||
<testcase classname="Default run a command from the help Exit code = 0" name="Default run a command from the help Exit code = 0" time="0">
|
||||
</testcase>
|
||||
<testcase classname="Default run a command from the help Output dir is created" name="Default run a command from the help Output dir is created" time="0">
|
||||
</testcase>
|
||||
<testcase classname="Default run a command from the help Output files are created" name="Default run a command from the help Output files are created" time="0">
|
||||
<skipped/>
|
||||
</testcase>
|
||||
<testcase classname="Default run a command from the help the output files are not empty" name="Default run a command from the help the output files are not empty" time="0.003">
|
||||
</testcase>
|
||||
<testcase classname="Default run a command from the help No 'Error'/'Warning'/'Fail' in the output" name="Default run a command from the help No 'Error'/'Warning'/'Fail' in the output" time="0">
|
||||
</testcase>
|
||||
</testsuite>
|
||||
</testsuites>
|
||||
+3812
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,26 @@
|
||||
{
|
||||
"name": "cli-tests",
|
||||
"version": "1.0.0",
|
||||
"title": "resolc CLI Tests",
|
||||
"description": "Auto tests for verifying resolc CLI",
|
||||
"repository": "https://github.com/paritytech/revive",
|
||||
"main": "index.js",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"test": "npx jest --verbose --testPathPattern="
|
||||
},
|
||||
"keywords": [],
|
||||
"author": "Matter Labs",
|
||||
"contributors": [
|
||||
"cyrill@parity.io"
|
||||
],
|
||||
"license": "MIT",
|
||||
"devDependencies": {
|
||||
"@types/jest": "^29.5.14",
|
||||
"@types/shelljs": "^0.8.15",
|
||||
"jest": "^29.7.0",
|
||||
"shelljs": "^0.8.5",
|
||||
"ts-jest": "^29.2.5",
|
||||
"typescript": "^5.7.3"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
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)
|
||||
}}}
|
||||
@@ -0,0 +1,53 @@
|
||||
import * as path from 'path'
|
||||
|
||||
const outputDir = 'artifacts'
|
||||
const binExtension = ':C.pvm'
|
||||
const asmExtension = ':C.pvmasm'
|
||||
const llvmExtension = '.ll'
|
||||
const contractSolFilename = 'contract.sol'
|
||||
const contractYulFilename = 'contract.yul'
|
||||
const contractOptimizedLLVMFilename = contractSolFilename + '.C.optimized'
|
||||
const contractUnoptimizedLLVMFilename = contractSolFilename + '.C.unoptimized'
|
||||
const pathToOutputDir = path.join(__dirname, '..', outputDir)
|
||||
const pathToContracts = path.join(__dirname, '..', 'src', 'contracts')
|
||||
const pathToBasicYulContract = path.join(
|
||||
pathToContracts,
|
||||
'yul',
|
||||
contractYulFilename
|
||||
)
|
||||
const pathToMemsetYulContract = path.join(
|
||||
pathToContracts,
|
||||
'yul',
|
||||
'memset.yul'
|
||||
)
|
||||
const pathToBasicSolContract = path.join(
|
||||
pathToContracts,
|
||||
'solidity',
|
||||
contractSolFilename
|
||||
)
|
||||
const pathToSolBinOutputFile = path.join(
|
||||
pathToOutputDir,
|
||||
contractSolFilename + binExtension
|
||||
)
|
||||
const pathToSolAsmOutputFile = path.join(
|
||||
pathToOutputDir,
|
||||
contractSolFilename + asmExtension
|
||||
)
|
||||
|
||||
export const paths = {
|
||||
outputDir: outputDir,
|
||||
binExtension: binExtension,
|
||||
asmExtension: asmExtension,
|
||||
llvmExtension: llvmExtension,
|
||||
contractSolFilename: contractSolFilename,
|
||||
contractYulFilename: contractYulFilename,
|
||||
contractOptimizedLLVMFilename: contractOptimizedLLVMFilename,
|
||||
contractUnoptimizedLLVMFilename: contractUnoptimizedLLVMFilename,
|
||||
pathToOutputDir: pathToOutputDir,
|
||||
pathToContracts: pathToContracts,
|
||||
pathToBasicSolContract: pathToBasicSolContract,
|
||||
pathToBasicYulContract: pathToBasicYulContract,
|
||||
pathToMemsetYulContract: pathToMemsetYulContract,
|
||||
pathToSolBinOutputFile: pathToSolBinOutputFile,
|
||||
pathToSolAsmOutputFile: pathToSolAsmOutputFile,
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
import * as shell from 'shelljs'
|
||||
import * as fs from 'fs'
|
||||
import { spawnSync } from 'child_process'
|
||||
|
||||
interface CommandResult {
|
||||
output: string
|
||||
exitCode: number
|
||||
}
|
||||
|
||||
export const executeCommand = (
|
||||
command: string,
|
||||
stdin?: string
|
||||
): CommandResult => {
|
||||
if (stdin) {
|
||||
const process = spawnSync(command, [], {
|
||||
input: stdin,
|
||||
shell: true,
|
||||
encoding: 'utf8',
|
||||
maxBuffer: 30 * 1024 * 1024,
|
||||
})
|
||||
|
||||
return {
|
||||
exitCode: process.status || 0,
|
||||
output: (process.stdout || process.stderr || '').toString(),
|
||||
}
|
||||
}
|
||||
|
||||
const result = shell.exec(command, { silent: true, async: false })
|
||||
return {
|
||||
exitCode: result.code,
|
||||
output: result.stdout || result.stderr || '',
|
||||
}
|
||||
}
|
||||
|
||||
export const isFolderExist = (folder: string): boolean => {
|
||||
return shell.test('-d', folder)
|
||||
}
|
||||
|
||||
export const isFileExist = (
|
||||
pathToFileDir: string,
|
||||
fileName: string,
|
||||
fileExtension: string
|
||||
): boolean => {
|
||||
return shell.ls(pathToFileDir).stdout.includes(fileName + fileExtension)
|
||||
}
|
||||
|
||||
export const isFileEmpty = (file: string): boolean => {
|
||||
if (fs.existsSync(file)) {
|
||||
return fs.readFileSync(file).length === 0
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
import { executeCommand } from '../src/helper'
|
||||
import { paths } from '../src/entities'
|
||||
|
||||
//id1746
|
||||
describe('Run with --asm by default', () => {
|
||||
const command = `resolc ${paths.pathToBasicSolContract} --asm`
|
||||
const result = executeCommand(command)
|
||||
const commandInvalid = 'resolc --asm'
|
||||
const resultInvalid = executeCommand(commandInvalid)
|
||||
|
||||
it('Valid command exit code = 0', () => {
|
||||
expect(result.exitCode).toBe(0)
|
||||
})
|
||||
|
||||
it('--asm output is presented', () => {
|
||||
const expectedPatterns = [/(deploy)/i, /(call)/i, /(seal_return)/i]
|
||||
|
||||
for (const pattern of expectedPatterns) {
|
||||
expect(result.output).toMatch(pattern)
|
||||
}
|
||||
})
|
||||
|
||||
it('solc exit code == resolc exit code', () => {
|
||||
const command = `solc ${paths.pathToBasicSolContract} --asm`
|
||||
const solcResult = executeCommand(command)
|
||||
expect(solcResult.exitCode).toBe(result.exitCode)
|
||||
})
|
||||
|
||||
it('run invalid: resolc --asm', () => {
|
||||
expect(resultInvalid.output).toMatch(
|
||||
/(No input sources specified|Compilation aborted)/i
|
||||
)
|
||||
})
|
||||
|
||||
it('Invalid command exit code = 1', () => {
|
||||
expect(resultInvalid.exitCode).toBe(1)
|
||||
})
|
||||
|
||||
it('Invalid solc exit code == Invalid resolc exit code', () => {
|
||||
const command = 'solc --asm'
|
||||
const solcResult = executeCommand(command)
|
||||
expect(solcResult.exitCode).toBe(resultInvalid.exitCode)
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,241 @@
|
||||
import {
|
||||
executeCommand,
|
||||
isFolderExist,
|
||||
isFileExist,
|
||||
isFileEmpty,
|
||||
} from '../src/helper'
|
||||
import { paths } from '../src/entities'
|
||||
import * as shell from 'shelljs'
|
||||
import * as path from 'path'
|
||||
|
||||
//id1762
|
||||
describe('Run resolc without any options', () => {
|
||||
const command = 'resolc'
|
||||
const result = executeCommand(command)
|
||||
|
||||
it('Info with help is presented', () => {
|
||||
expect(result.output).toMatch(/(Usage: resolc)/i)
|
||||
})
|
||||
|
||||
it('Exit code = 1', () => {
|
||||
expect(result.exitCode).toBe(1)
|
||||
})
|
||||
|
||||
it('solc exit code == resolc exit code', () => {
|
||||
const command = 'solc'
|
||||
const solcResult = executeCommand(command)
|
||||
expect(solcResult.exitCode).toBe(result.exitCode)
|
||||
})
|
||||
})
|
||||
|
||||
//#1713
|
||||
describe('Default run a command from the help', () => {
|
||||
const command = `resolc ${paths.pathToBasicSolContract} --overwrite -O3 --bin --output-dir "${paths.pathToOutputDir}"` // potential issue on resolc with full path on Windows cmd
|
||||
const result = executeCommand(command)
|
||||
|
||||
it('Compiler run successful', () => {
|
||||
expect(result.output).toMatch(/(Compiler run successful.)/i)
|
||||
})
|
||||
it('Exit code = 0', () => {
|
||||
expect(result.exitCode).toBe(0)
|
||||
})
|
||||
it('Output dir is created', () => {
|
||||
expect(isFolderExist(paths.pathToOutputDir)).toBe(true)
|
||||
})
|
||||
xit('Output file is created', () => {
|
||||
// a bug on windows
|
||||
expect(
|
||||
isFileExist(
|
||||
paths.pathToOutputDir,
|
||||
paths.contractSolFilename,
|
||||
paths.binExtension
|
||||
)
|
||||
).toBe(true)
|
||||
})
|
||||
it('the output file is not empty', () => {
|
||||
expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false)
|
||||
})
|
||||
it("No 'Error'/'Warning'/'Fail' in the output", () => {
|
||||
expect(result.output).not.toMatch(/([Ee]rror|[Ww]arning|[Ff]ail)/i)
|
||||
})
|
||||
})
|
||||
|
||||
//#1818
|
||||
describe('Default run a command from the help', () => {
|
||||
const command = `resolc ${paths.pathToBasicSolContract} --overwrite -O3 --bin --asm --output-dir "${paths.pathToOutputDir}"` // potential issue on resolc with full path on Windows cmd
|
||||
const result = executeCommand(command)
|
||||
|
||||
it('Compiler run successful', () => {
|
||||
expect(result.output).toMatch(/(Compiler run successful.)/i)
|
||||
})
|
||||
it('Exit code = 0', () => {
|
||||
expect(result.exitCode).toBe(0)
|
||||
})
|
||||
it('Output dir is created', () => {
|
||||
expect(isFolderExist(paths.pathToOutputDir)).toBe(true)
|
||||
})
|
||||
xit('Output files are created', () => {
|
||||
// a bug on windows
|
||||
expect(
|
||||
isFileExist(
|
||||
paths.pathToOutputDir,
|
||||
paths.contractSolFilename,
|
||||
paths.binExtension
|
||||
)
|
||||
).toBe(true)
|
||||
expect(
|
||||
isFileExist(
|
||||
paths.pathToOutputDir,
|
||||
paths.contractSolFilename,
|
||||
paths.asmExtension
|
||||
)
|
||||
).toBe(true)
|
||||
})
|
||||
it('the output files are not empty', () => {
|
||||
expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false)
|
||||
expect(isFileEmpty(paths.pathToSolAsmOutputFile)).toBe(false)
|
||||
})
|
||||
it("No 'Error'/'Warning'/'Fail' in the output", () => {
|
||||
expect(result.output).not.toMatch(/([Ee]rror|[Ww]arning|[Ff]ail)/i)
|
||||
})
|
||||
})
|
||||
|
||||
describe('Run resolc with source debug information', () => {
|
||||
const commands = [
|
||||
`resolc -g ${paths.pathToBasicSolContract} --overwrite --bin --asm --output-dir "${paths.pathToOutputDir}"`,
|
||||
`resolc --disable-solc-optimizer -g ${paths.pathToBasicSolContract} --overwrite --bin --asm --output-dir "${paths.pathToOutputDir}"`,
|
||||
] // potential issue on resolc with full path on Windows cmd`;
|
||||
|
||||
for (var idx in commands) {
|
||||
const command = commands[idx]
|
||||
const result = executeCommand(command)
|
||||
|
||||
it('Compiler run successful', () => {
|
||||
expect(result.output).toMatch(/(Compiler run successful.)/i)
|
||||
})
|
||||
it('Exit code = 0', () => {
|
||||
expect(result.exitCode).toBe(0)
|
||||
})
|
||||
it('Output dir is created', () => {
|
||||
expect(isFolderExist(paths.pathToOutputDir)).toBe(true)
|
||||
})
|
||||
it('Output files are created', () => {
|
||||
// a bug on windows
|
||||
expect(
|
||||
isFileExist(
|
||||
paths.pathToOutputDir,
|
||||
paths.contractSolFilename,
|
||||
paths.binExtension
|
||||
)
|
||||
).toBe(true)
|
||||
expect(
|
||||
isFileExist(
|
||||
paths.pathToOutputDir,
|
||||
paths.contractSolFilename,
|
||||
paths.asmExtension
|
||||
)
|
||||
).toBe(true)
|
||||
})
|
||||
it('the output files are not empty', () => {
|
||||
expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false)
|
||||
expect(isFileEmpty(paths.pathToSolAsmOutputFile)).toBe(false)
|
||||
})
|
||||
it("No 'Error'/'Fail' in the output", () => {
|
||||
expect(result.output).not.toMatch(/([Ee]rror|[Ff]ail)/i)
|
||||
})
|
||||
}
|
||||
})
|
||||
|
||||
describe('Run resolc with source debug information, check LLVM debug-info', () => {
|
||||
const commands = [
|
||||
`resolc -g ${paths.pathToBasicSolContract} --overwrite --debug-output-dir="${paths.pathToOutputDir}"`,
|
||||
`resolc -g --disable-solc-optimizer ${paths.pathToBasicSolContract} --overwrite --debug-output-dir="${paths.pathToOutputDir}"`,
|
||||
] // potential issue on resolc with full path on Windows cmd`;
|
||||
|
||||
for (var idx in commands) {
|
||||
const command = commands[idx]
|
||||
const result = executeCommand(command)
|
||||
|
||||
it('Compiler run successful', () => {
|
||||
expect(result.output).toMatch(/(Compiler run successful.)/i)
|
||||
})
|
||||
it('Exit code = 0', () => {
|
||||
expect(result.exitCode).toBe(0)
|
||||
})
|
||||
it('Output dir is created', () => {
|
||||
expect(isFolderExist(paths.pathToOutputDir)).toBe(true)
|
||||
})
|
||||
it('Output files are created', () => {
|
||||
// a bug on windows
|
||||
expect(
|
||||
isFileExist(
|
||||
paths.pathToOutputDir,
|
||||
paths.contractOptimizedLLVMFilename,
|
||||
paths.llvmExtension
|
||||
)
|
||||
).toBe(true)
|
||||
expect(
|
||||
isFileExist(
|
||||
paths.pathToOutputDir,
|
||||
paths.contractUnoptimizedLLVMFilename,
|
||||
paths.llvmExtension
|
||||
)
|
||||
).toBe(true)
|
||||
})
|
||||
it('the output files are not empty', () => {
|
||||
expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false)
|
||||
expect(isFileEmpty(paths.pathToSolAsmOutputFile)).toBe(false)
|
||||
})
|
||||
it("No 'Error'/'Fail' in the output", () => {
|
||||
expect(result.output).not.toMatch(/([Ee]rror|[Ff]ail)/i)
|
||||
})
|
||||
}
|
||||
})
|
||||
|
||||
describe('Standard JSON compilation with path options', () => {
|
||||
const contractsDir = path.join(shell.tempdir(), 'contracts-test')
|
||||
const inputFile = path.join(__dirname, '..', 'src/contracts/compiled/1.json')
|
||||
|
||||
beforeAll(() => {
|
||||
shell.mkdir('-p', contractsDir)
|
||||
|
||||
const input = JSON.parse(shell.cat(inputFile).toString())
|
||||
|
||||
Object.entries(input.sources).forEach(
|
||||
([sourcePath, source]: [string, any]) => {
|
||||
const filePath = path.join(contractsDir, sourcePath)
|
||||
shell.mkdir('-p', path.dirname(filePath))
|
||||
shell.ShellString(source.content).to(filePath)
|
||||
}
|
||||
)
|
||||
})
|
||||
|
||||
afterAll(() => {
|
||||
shell.rm('-rf', contractsDir)
|
||||
})
|
||||
|
||||
describe('Output with all path options', () => {
|
||||
let result: { exitCode: number; output: string }
|
||||
|
||||
beforeAll(() => {
|
||||
const tempInputFile = path.join(contractsDir, 'temp-input.json')
|
||||
shell.cp(inputFile, tempInputFile)
|
||||
const inputContent = shell.cat(inputFile).toString()
|
||||
|
||||
const command = `resolc --standard-json --base-path "${contractsDir}" --include-path "${contractsDir}" --allow-paths "${contractsDir}"`
|
||||
|
||||
result = executeCommand(command, inputContent)
|
||||
|
||||
shell.rm(tempInputFile)
|
||||
})
|
||||
|
||||
it('Compiler run successful without emiting warnings', () => {
|
||||
const parsedResults = JSON.parse(result.output)
|
||||
expect(
|
||||
parsedResults.errors.filter(
|
||||
(error: { type: string }) => error.type != 'Warning'
|
||||
)
|
||||
).toEqual([])
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,18 @@
|
||||
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)
|
||||
})
|
||||
|
||||
})
|
||||
@@ -0,0 +1,39 @@
|
||||
import { executeCommand } from '../src/helper'
|
||||
import { paths } from '../src/entities'
|
||||
|
||||
//id1743
|
||||
describe('Run with --yul by default', () => {
|
||||
const command = `resolc ${paths.pathToBasicYulContract} --yul`
|
||||
const result = executeCommand(command)
|
||||
const commandInvalid = 'resolc --yul'
|
||||
const resultInvalid = executeCommand(commandInvalid)
|
||||
|
||||
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)
|
||||
})
|
||||
|
||||
xit('solc exit code == resolc exit code', () => {
|
||||
// unknown solc issue for datatype of the contract
|
||||
const command = `solc ${paths.pathToBasicSolContract} --yul`
|
||||
const solcResult = executeCommand(command)
|
||||
expect(solcResult.exitCode).toBe(result.exitCode)
|
||||
})
|
||||
|
||||
it('run invalid: resolc --yul', () => {
|
||||
expect(resultInvalid.output).toMatch(/(The input file is missing)/i)
|
||||
})
|
||||
it('Invalid command exit code = 1', () => {
|
||||
expect(resultInvalid.exitCode).toBe(1)
|
||||
})
|
||||
|
||||
it('Invalid solc exit code == Invalid resolc exit code', () => {
|
||||
const command = 'solc --yul'
|
||||
const solcResult = executeCommand(command)
|
||||
expect(solcResult.exitCode).toBe(resultInvalid.exitCode)
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"target": "ES6",
|
||||
"module": "CommonJS",
|
||||
"outDir": "./dist",
|
||||
}
|
||||
}
|
||||
@@ -1,40 +0,0 @@
|
||||
//! The tests for running resolc with asm option.
|
||||
|
||||
#![cfg(test)]
|
||||
|
||||
use crate::tests::cli::utils;
|
||||
|
||||
const ASM_OPTION: &str = "--asm";
|
||||
|
||||
#[test]
|
||||
fn runs_with_valid_input_file() {
|
||||
let arguments = &[utils::SOLIDITY_CONTRACT_PATH, ASM_OPTION];
|
||||
let resolc_result = utils::execute_resolc(arguments);
|
||||
utils::assert_command_success(&resolc_result, "Providing a valid input file");
|
||||
|
||||
for pattern in &["deploy", "call", "seal_return"] {
|
||||
assert!(
|
||||
resolc_result.stdout.contains(pattern),
|
||||
"Expected the output to contain `{pattern}`."
|
||||
);
|
||||
}
|
||||
|
||||
let solc_result = utils::execute_solc(arguments);
|
||||
utils::assert_equal_exit_codes(&solc_result, &resolc_result);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn fails_without_input_file() {
|
||||
let arguments = &[ASM_OPTION];
|
||||
let resolc_result = utils::execute_resolc(arguments);
|
||||
utils::assert_command_failure(&resolc_result, "Omitting an input file");
|
||||
|
||||
let output = resolc_result.stderr.to_lowercase();
|
||||
assert!(
|
||||
output.contains("no input sources specified") || output.contains("compilation aborted"),
|
||||
"Expected the output to contain a specific error message."
|
||||
);
|
||||
|
||||
let solc_result = utils::execute_solc(arguments);
|
||||
utils::assert_equal_exit_codes(&solc_result, &resolc_result);
|
||||
}
|
||||
@@ -1,137 +0,0 @@
|
||||
//! The tests for running resolc with combined JSON option.
|
||||
|
||||
#![cfg(test)]
|
||||
|
||||
use revive_common;
|
||||
|
||||
use crate::tests::cli::utils;
|
||||
|
||||
const JSON_OPTION: &str = "--combined-json";
|
||||
const JSON_ARGUMENTS: &[&str] = &[
|
||||
"abi",
|
||||
"hashes",
|
||||
"metadata",
|
||||
"devdoc",
|
||||
"userdoc",
|
||||
"storage-layout",
|
||||
"ast",
|
||||
"asm",
|
||||
"bin",
|
||||
"bin-runtime",
|
||||
];
|
||||
|
||||
#[test]
|
||||
fn runs_with_valid_json_argument() {
|
||||
for json_argument in JSON_ARGUMENTS {
|
||||
let arguments = &[utils::SOLIDITY_CONTRACT_PATH, JSON_OPTION, json_argument];
|
||||
let resolc_result = utils::execute_resolc(arguments);
|
||||
assert!(
|
||||
resolc_result.success,
|
||||
"Providing the `{json_argument}` argument should succeed with exit code {}, got {}.\nDetails: {}",
|
||||
revive_common::EXIT_CODE_SUCCESS,
|
||||
resolc_result.code,
|
||||
resolc_result.stderr
|
||||
);
|
||||
|
||||
assert!(
|
||||
resolc_result.stdout.contains("contracts"),
|
||||
"Expected the output to contain a `contracts` field when using the `{json_argument}` argument."
|
||||
);
|
||||
|
||||
let solc_result = utils::execute_solc(arguments);
|
||||
utils::assert_equal_exit_codes(&solc_result, &resolc_result);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn fails_with_invalid_json_argument() {
|
||||
let arguments = &[
|
||||
utils::SOLIDITY_CONTRACT_PATH,
|
||||
JSON_OPTION,
|
||||
"invalid-argument",
|
||||
];
|
||||
let resolc_result = utils::execute_resolc(arguments);
|
||||
utils::assert_command_failure(&resolc_result, "Providing an invalid json argument");
|
||||
|
||||
assert!(
|
||||
resolc_result.stdout.contains("Invalid option"),
|
||||
"Expected the output to contain a specific error message."
|
||||
);
|
||||
|
||||
let solc_result = utils::execute_solc(arguments);
|
||||
utils::assert_equal_exit_codes(&solc_result, &resolc_result);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn fails_with_multiple_json_arguments() {
|
||||
let arguments = &[
|
||||
utils::SOLIDITY_CONTRACT_PATH,
|
||||
JSON_OPTION,
|
||||
JSON_ARGUMENTS[0],
|
||||
JSON_ARGUMENTS[1],
|
||||
];
|
||||
let resolc_result = utils::execute_resolc(arguments);
|
||||
utils::assert_command_failure(&resolc_result, "Providing multiple json arguments");
|
||||
|
||||
assert!(
|
||||
resolc_result
|
||||
.stderr
|
||||
.contains("reading error: No such file or directory"),
|
||||
"Expected the output to contain a specific error message."
|
||||
);
|
||||
|
||||
// FIX: Resolc exit code == 101
|
||||
// let solc_result = utils::execute_solc(arguments);
|
||||
// utils::assert_equal_exit_codes(&solc_result, &resolc_result);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn fails_without_json_argument() {
|
||||
let arguments = &[utils::SOLIDITY_CONTRACT_PATH, JSON_OPTION];
|
||||
let resolc_result = utils::execute_resolc(arguments);
|
||||
utils::assert_command_failure(&resolc_result, "Omitting a JSON argument");
|
||||
|
||||
assert!(
|
||||
resolc_result.stderr.contains(
|
||||
"a value is required for '--combined-json <COMBINED_JSON>' but none was supplied"
|
||||
),
|
||||
"Expected the output to contain a specific error message."
|
||||
);
|
||||
|
||||
let solc_result = utils::execute_solc(arguments);
|
||||
utils::assert_equal_exit_codes(&solc_result, &resolc_result);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn fails_without_solidity_input_file() {
|
||||
let arguments = &[JSON_OPTION, JSON_ARGUMENTS[0]];
|
||||
let resolc_result = utils::execute_resolc(arguments);
|
||||
utils::assert_command_failure(&resolc_result, "Omitting a Solidity input file");
|
||||
|
||||
assert!(
|
||||
resolc_result.stderr.contains("No input sources specified"),
|
||||
"Expected the output to contain a specific error message."
|
||||
);
|
||||
|
||||
let solc_result = utils::execute_solc(arguments);
|
||||
utils::assert_equal_exit_codes(&solc_result, &resolc_result);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn fails_with_yul_input_file() {
|
||||
for json_argument in JSON_ARGUMENTS {
|
||||
let arguments = &[utils::YUL_CONTRACT_PATH, JSON_OPTION, json_argument];
|
||||
let resolc_result = utils::execute_resolc(arguments);
|
||||
utils::assert_command_failure(&resolc_result, "Providing a Yul input file");
|
||||
|
||||
assert!(
|
||||
resolc_result
|
||||
.stderr
|
||||
.contains("ParserError: Expected identifier"),
|
||||
"Expected the output to contain a specific error message."
|
||||
);
|
||||
|
||||
let solc_result = utils::execute_solc(arguments);
|
||||
utils::assert_equal_exit_codes(&solc_result, &resolc_result);
|
||||
}
|
||||
}
|
||||
@@ -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,12 +0,0 @@
|
||||
//! The CLI tests.
|
||||
|
||||
#![cfg(test)]
|
||||
|
||||
mod asm;
|
||||
mod combined_json;
|
||||
mod optimization;
|
||||
mod output_dir;
|
||||
mod standard_json;
|
||||
mod usage;
|
||||
mod utils;
|
||||
mod yul;
|
||||
@@ -1,53 +0,0 @@
|
||||
//! The tests for running resolc with explicit optimization.
|
||||
|
||||
#![cfg(test)]
|
||||
|
||||
use revive_common;
|
||||
|
||||
use crate::tests::cli::{utils, yul};
|
||||
|
||||
const LEVELS: &[char] = &['0', '1', '2', '3', 's', 'z'];
|
||||
|
||||
#[test]
|
||||
fn runs_with_valid_level() {
|
||||
for level in LEVELS {
|
||||
let optimization_argument = format!("-O{level}");
|
||||
let arguments = &[
|
||||
utils::YUL_MEMSET_CONTRACT_PATH,
|
||||
yul::YUL_OPTION,
|
||||
&optimization_argument,
|
||||
];
|
||||
let resolc_result = utils::execute_resolc(arguments);
|
||||
assert!(
|
||||
resolc_result.success,
|
||||
"Providing the level `{optimization_argument}` should succeed with exit code {}, got {}.\nDetails: {}",
|
||||
revive_common::EXIT_CODE_SUCCESS,
|
||||
resolc_result.code,
|
||||
resolc_result.stderr
|
||||
);
|
||||
|
||||
assert!(
|
||||
resolc_result
|
||||
.stderr
|
||||
.contains("Compiler run successful. No output requested"),
|
||||
"Expected the output to contain a success message when providing the level `{optimization_argument}`."
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn fails_with_invalid_level() {
|
||||
let arguments = &[utils::YUL_MEMSET_CONTRACT_PATH, yul::YUL_OPTION, "-O9"];
|
||||
let resolc_result = utils::execute_resolc(arguments);
|
||||
utils::assert_command_failure(&resolc_result, "Providing an invalid optimization level");
|
||||
|
||||
assert!(
|
||||
resolc_result
|
||||
.stderr
|
||||
.contains("Unexpected optimization option"),
|
||||
"Expected the output to contain a specific error message."
|
||||
);
|
||||
|
||||
let solc_result = utils::execute_solc(arguments);
|
||||
utils::assert_equal_exit_codes(&solc_result, &resolc_result);
|
||||
}
|
||||
@@ -1,122 +0,0 @@
|
||||
//! The tests for running resolc with output directory option.
|
||||
|
||||
#![cfg(test)]
|
||||
|
||||
use std::path::Path;
|
||||
|
||||
use crate::tests::cli::utils;
|
||||
|
||||
const OUTPUT_DIRECTORY: &str = "src/tests/cli/artifacts";
|
||||
const OUTPUT_BIN_FILE_PATH: &str = "src/tests/cli/artifacts/contract.sol:C.pvm";
|
||||
const OUTPUT_ASM_FILE_PATH: &str = "src/tests/cli/artifacts/contract.sol:C.pvmasm";
|
||||
const OUTPUT_LLVM_OPTIMIZED_FILE_PATH: &str =
|
||||
"src/tests/cli/artifacts/src_tests_cli_contracts_solidity_contract.sol.C.optimized.ll";
|
||||
const OUTPUT_LLVM_UNOPTIMIZED_FILE_PATH: &str =
|
||||
"src/tests/cli/artifacts/src_tests_cli_contracts_solidity_contract.sol.C.unoptimized.ll";
|
||||
|
||||
fn file_exists(path: &str) -> bool {
|
||||
Path::new(path).try_exists().unwrap()
|
||||
}
|
||||
|
||||
fn file_is_empty(path: &str) -> bool {
|
||||
Path::new(path).metadata().unwrap().len() == 0
|
||||
}
|
||||
|
||||
fn assert_valid_output_file(
|
||||
result: &utils::CommandResult,
|
||||
output_file_type: &str,
|
||||
output_file_path: &str,
|
||||
) {
|
||||
utils::assert_command_success(result, "Providing an output directory");
|
||||
|
||||
assert!(
|
||||
result.stderr.contains("Compiler run successful"),
|
||||
"Expected the compiler output to contain a success message.",
|
||||
);
|
||||
|
||||
assert!(
|
||||
file_exists(output_file_path),
|
||||
"Expected the {output_file_type} output file `{output_file_path}` to exist."
|
||||
);
|
||||
|
||||
assert!(
|
||||
!file_is_empty(output_file_path),
|
||||
"Expected the {output_file_type} output file `{output_file_path}` to not be empty."
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn writes_to_file() {
|
||||
let arguments = &[
|
||||
utils::SOLIDITY_CONTRACT_PATH,
|
||||
"--overwrite",
|
||||
"-O3",
|
||||
"--bin",
|
||||
"--asm",
|
||||
"--output-dir",
|
||||
OUTPUT_DIRECTORY,
|
||||
];
|
||||
let result = utils::execute_resolc(arguments);
|
||||
assert_valid_output_file(&result, "--bin", OUTPUT_BIN_FILE_PATH);
|
||||
assert_valid_output_file(&result, "--asm", OUTPUT_ASM_FILE_PATH);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn writes_debug_info_to_file_unoptimized() {
|
||||
let arguments = &[
|
||||
utils::SOLIDITY_CONTRACT_PATH,
|
||||
"-g",
|
||||
"--disable-solc-optimizer",
|
||||
"--overwrite",
|
||||
"--bin",
|
||||
"--asm",
|
||||
"--output-dir",
|
||||
OUTPUT_DIRECTORY,
|
||||
];
|
||||
let result = utils::execute_resolc(arguments);
|
||||
assert_valid_output_file(&result, "--bin", OUTPUT_BIN_FILE_PATH);
|
||||
assert_valid_output_file(&result, "--asm", OUTPUT_ASM_FILE_PATH);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn writes_debug_info_to_file_optimized() {
|
||||
let arguments = &[
|
||||
utils::SOLIDITY_CONTRACT_PATH,
|
||||
"-g",
|
||||
"--overwrite",
|
||||
"--bin",
|
||||
"--asm",
|
||||
"--output-dir",
|
||||
OUTPUT_DIRECTORY,
|
||||
];
|
||||
let result = utils::execute_resolc(arguments);
|
||||
assert_valid_output_file(&result, "--bin", OUTPUT_BIN_FILE_PATH);
|
||||
assert_valid_output_file(&result, "--asm", OUTPUT_ASM_FILE_PATH);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn writes_llvm_debug_info_to_file_unoptimized() {
|
||||
let arguments = &[
|
||||
utils::SOLIDITY_CONTRACT_PATH,
|
||||
"-g",
|
||||
"--disable-solc-optimizer",
|
||||
"--overwrite",
|
||||
"--debug-output-dir",
|
||||
OUTPUT_DIRECTORY,
|
||||
];
|
||||
let result = utils::execute_resolc(arguments);
|
||||
assert_valid_output_file(&result, "llvm", OUTPUT_LLVM_UNOPTIMIZED_FILE_PATH);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn writes_llvm_debug_info_to_file_optimized() {
|
||||
let arguments = &[
|
||||
utils::SOLIDITY_CONTRACT_PATH,
|
||||
"-g",
|
||||
"--overwrite",
|
||||
"--debug-output-dir",
|
||||
OUTPUT_DIRECTORY,
|
||||
];
|
||||
let result = utils::execute_resolc(arguments);
|
||||
assert_valid_output_file(&result, "llvm", OUTPUT_LLVM_OPTIMIZED_FILE_PATH);
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
//! The tests for running resolc with standard JSON option.
|
||||
|
||||
#![cfg(test)]
|
||||
|
||||
use crate::tests::cli::utils;
|
||||
|
||||
const JSON_OPTION: &str = "--standard-json";
|
||||
|
||||
#[test]
|
||||
fn runs_with_valid_input_file() {
|
||||
let arguments = &[JSON_OPTION];
|
||||
let resolc_result =
|
||||
utils::execute_resolc_with_stdin_input(arguments, utils::STANDARD_JSON_CONTRACTS_PATH);
|
||||
utils::assert_command_success(&resolc_result, "Providing a valid input file to stdin");
|
||||
|
||||
assert!(
|
||||
resolc_result.stdout.contains("contracts"),
|
||||
"Expected the output to contain a `contracts` field."
|
||||
);
|
||||
|
||||
let solc_result =
|
||||
utils::execute_solc_with_stdin_input(arguments, utils::STANDARD_JSON_CONTRACTS_PATH);
|
||||
utils::assert_equal_exit_codes(&solc_result, &resolc_result);
|
||||
}
|
||||
@@ -1,35 +0,0 @@
|
||||
//! The tests for running resolc when expecting usage output.
|
||||
|
||||
#![cfg(test)]
|
||||
|
||||
use crate::tests::cli::utils;
|
||||
|
||||
#[test]
|
||||
#[ignore = "Fix: 'resolc --help' should exit with success exit code"]
|
||||
fn shows_usage_with_help() {
|
||||
let arguments = &["--help"];
|
||||
let resolc_result = utils::execute_resolc(arguments);
|
||||
utils::assert_command_success(&resolc_result, "Providing the `--help` option");
|
||||
|
||||
assert!(
|
||||
resolc_result.stdout.contains("Usage: resolc"),
|
||||
"Expected the output to contain usage information."
|
||||
);
|
||||
|
||||
let solc_result = utils::execute_solc(arguments);
|
||||
utils::assert_equal_exit_codes(&solc_result, &resolc_result);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn fails_without_options() {
|
||||
let resolc_result = utils::execute_resolc(&[]);
|
||||
utils::assert_command_failure(&resolc_result, "Omitting options");
|
||||
|
||||
assert!(
|
||||
resolc_result.stderr.contains("Usage: resolc"),
|
||||
"Expected the output to contain usage information."
|
||||
);
|
||||
|
||||
let solc_result = utils::execute_solc(&[]);
|
||||
utils::assert_equal_exit_codes(&solc_result, &resolc_result);
|
||||
}
|
||||
@@ -1,99 +0,0 @@
|
||||
//! Common utilities used for CLI tests.
|
||||
|
||||
use std::{
|
||||
fs::File,
|
||||
process::{Command, Stdio},
|
||||
};
|
||||
|
||||
use revive_common;
|
||||
|
||||
use crate::SolcCompiler;
|
||||
|
||||
pub const SOLIDITY_CONTRACT_PATH: &str = "src/tests/cli/contracts/solidity/contract.sol";
|
||||
pub const YUL_CONTRACT_PATH: &str = "src/tests/cli/contracts/yul/contract.yul";
|
||||
pub const YUL_MEMSET_CONTRACT_PATH: &str = "src/tests/cli/contracts/yul/memset.yul";
|
||||
pub const STANDARD_JSON_CONTRACTS_PATH: &str =
|
||||
"src/tests/cli/contracts/standard_json/solidity_contracts.json";
|
||||
|
||||
/// The result of executing a command.
|
||||
pub struct CommandResult {
|
||||
/// The data written to `stdout`.
|
||||
pub stdout: String,
|
||||
/// The data written to `stderr`.
|
||||
pub stderr: String,
|
||||
/// Whether termination was successful.
|
||||
pub success: bool,
|
||||
/// The exit code of the process.
|
||||
pub code: i32,
|
||||
}
|
||||
|
||||
pub fn execute_resolc(arguments: &[&str]) -> CommandResult {
|
||||
execute_command("resolc", arguments, None)
|
||||
}
|
||||
|
||||
pub fn execute_resolc_with_stdin_input(arguments: &[&str], stdin_file_path: &str) -> CommandResult {
|
||||
execute_command("resolc", arguments, Some(stdin_file_path))
|
||||
}
|
||||
|
||||
pub fn execute_solc(arguments: &[&str]) -> CommandResult {
|
||||
execute_command(SolcCompiler::DEFAULT_EXECUTABLE_NAME, arguments, None)
|
||||
}
|
||||
|
||||
pub fn execute_solc_with_stdin_input(arguments: &[&str], stdin_file_path: &str) -> CommandResult {
|
||||
execute_command(
|
||||
SolcCompiler::DEFAULT_EXECUTABLE_NAME,
|
||||
arguments,
|
||||
Some(stdin_file_path),
|
||||
)
|
||||
}
|
||||
|
||||
fn execute_command(
|
||||
command: &str,
|
||||
arguments: &[&str],
|
||||
stdin_file_path: Option<&str>,
|
||||
) -> CommandResult {
|
||||
let stdin_config = match stdin_file_path {
|
||||
Some(path) => Stdio::from(File::open(path).unwrap()),
|
||||
None => Stdio::null(),
|
||||
};
|
||||
let result = Command::new(command)
|
||||
.args(arguments)
|
||||
.stdin(stdin_config)
|
||||
.stdout(Stdio::piped())
|
||||
.stderr(Stdio::piped())
|
||||
.output()
|
||||
.unwrap();
|
||||
|
||||
CommandResult {
|
||||
stdout: String::from_utf8_lossy(&result.stdout).to_string(),
|
||||
stderr: String::from_utf8_lossy(&result.stderr).to_string(),
|
||||
success: result.status.success(),
|
||||
code: result.status.code().unwrap(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn assert_equal_exit_codes(solc_result: &CommandResult, resolc_result: &CommandResult) {
|
||||
assert_eq!(
|
||||
solc_result.code, resolc_result.code,
|
||||
"Expected solc and resolc to have the same exit code."
|
||||
);
|
||||
}
|
||||
|
||||
pub fn assert_command_success(result: &CommandResult, error_message_prefix: &str) {
|
||||
assert!(
|
||||
result.success,
|
||||
"{error_message_prefix} should succeed with exit code {}, got {}.\nDetails: {}",
|
||||
revive_common::EXIT_CODE_SUCCESS,
|
||||
result.code,
|
||||
result.stderr
|
||||
);
|
||||
}
|
||||
|
||||
pub fn assert_command_failure(result: &CommandResult, error_message_prefix: &str) {
|
||||
assert!(
|
||||
!result.success,
|
||||
"{error_message_prefix} should fail with exit code {}, got {}.",
|
||||
revive_common::EXIT_CODE_FAILURE,
|
||||
result.code
|
||||
);
|
||||
}
|
||||
@@ -1,44 +0,0 @@
|
||||
//! The tests for running resolc with yul option.
|
||||
|
||||
#![cfg(test)]
|
||||
|
||||
use crate::tests::cli::utils;
|
||||
|
||||
pub const YUL_OPTION: &str = "--yul";
|
||||
/// The `--yul` option was deprecated in Solidity 0.8.27 in favor of `--strict-assembly`.
|
||||
/// See section `--strict-assembly vs. --yul` in https://soliditylang.org/blog/2024/09/04/solidity-0.8.27-release-announcement/
|
||||
const SOLC_YUL_OPTION: &str = "--strict-assembly";
|
||||
|
||||
#[test]
|
||||
fn runs_with_valid_input_file() {
|
||||
let arguments = &[utils::YUL_CONTRACT_PATH, YUL_OPTION];
|
||||
let resolc_result = utils::execute_resolc(arguments);
|
||||
utils::assert_command_success(&resolc_result, "Providing a valid input file");
|
||||
|
||||
assert!(
|
||||
resolc_result
|
||||
.stderr
|
||||
.contains("Compiler run successful. No output requested"),
|
||||
"Expected the output to contain a success message."
|
||||
);
|
||||
|
||||
let solc_arguments = &[utils::YUL_CONTRACT_PATH, SOLC_YUL_OPTION];
|
||||
let solc_result = utils::execute_solc(solc_arguments);
|
||||
utils::assert_equal_exit_codes(&solc_result, &resolc_result);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn fails_without_input_file() {
|
||||
let arguments = &[YUL_OPTION];
|
||||
let resolc_result = utils::execute_resolc(arguments);
|
||||
utils::assert_command_failure(&resolc_result, "Omitting an input file");
|
||||
|
||||
assert!(
|
||||
resolc_result.stderr.contains("The input file is missing"),
|
||||
"Expected the output to contain a specific error message."
|
||||
);
|
||||
|
||||
let solc_arguments = &[SOLC_YUL_OPTION];
|
||||
let solc_result = utils::execute_solc(solc_arguments);
|
||||
utils::assert_equal_exit_codes(&solc_result, &resolc_result);
|
||||
}
|
||||
@@ -0,0 +1,188 @@
|
||||
import { executeCommand } from '../src/helper'
|
||||
import { paths } from '../src/entities'
|
||||
|
||||
describe('Set of --combined-json tests', () => {
|
||||
const zksolcCommand = 'zksolc'
|
||||
const solcCommand = 'solc'
|
||||
const json_args: string[] = [
|
||||
`abi`,
|
||||
`hashes`,
|
||||
`metadata`,
|
||||
`devdoc`,
|
||||
`userdoc`,
|
||||
`storage-layout`,
|
||||
`ast`,
|
||||
`asm`,
|
||||
`bin`,
|
||||
`bin-runtime`,
|
||||
]
|
||||
|
||||
//id1742:I
|
||||
describe(`Run ${zksolcCommand} with just --combined-json`, () => {
|
||||
const args = [`--combined-json`]
|
||||
const result = executeCommand(zksolcCommand, args)
|
||||
|
||||
it('Valid command exit code = 1', () => {
|
||||
expect(result.exitCode).toBe(1)
|
||||
})
|
||||
|
||||
it('--combined-json error is presented', () => {
|
||||
expect(result.output).toMatch(/(requires a value but none was supplied)/i)
|
||||
})
|
||||
|
||||
it('solc exit code == zksolc exit code', () => {
|
||||
const solcResult = executeCommand(solcCommand, args)
|
||||
expect(solcResult.exitCode).toBe(result.exitCode)
|
||||
})
|
||||
})
|
||||
|
||||
//id1742:II
|
||||
describe(`Run ${zksolcCommand} with Sol contract and --combined-json`, () => {
|
||||
const args = [`${paths.pathToBasicSolContract}`, `--combined-json`]
|
||||
const result = executeCommand(zksolcCommand, args)
|
||||
|
||||
it('Valid command exit code = 1', () => {
|
||||
expect(result.exitCode).toBe(1)
|
||||
})
|
||||
|
||||
it('--combined-json error is presented', () => {
|
||||
expect(result.output).toMatch(/(requires a value but none was supplied)/i)
|
||||
})
|
||||
|
||||
it('solc exit code == zksolc exit code', () => {
|
||||
const solcResult = executeCommand(solcCommand, args)
|
||||
expect(solcResult.exitCode).toBe(result.exitCode)
|
||||
})
|
||||
})
|
||||
|
||||
//id1742:III
|
||||
for (let i = 0; i < json_args.length; i++) {
|
||||
describe(`Run ${zksolcCommand} with Sol, --combined-json and ARG: ${json_args[i]}`, () => {
|
||||
const args = [
|
||||
`${paths.pathToBasicSolContract}`,
|
||||
`--combined-json`,
|
||||
`${json_args[i]}`,
|
||||
]
|
||||
const result = executeCommand(zksolcCommand, args)
|
||||
|
||||
it('Valid command exit code = 0', () => {
|
||||
expect(result.exitCode).toBe(0)
|
||||
})
|
||||
|
||||
it('--combined-json error is presented', () => {
|
||||
expect(result.output).toMatch(/(contracts)/i)
|
||||
})
|
||||
|
||||
it('solc exit code == zksolc exit code', () => {
|
||||
const solcResult = executeCommand(solcCommand, args)
|
||||
expect(solcResult.exitCode).toBe(result.exitCode)
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
//id1829:I
|
||||
for (let i = 0; i < json_args.length; i++) {
|
||||
describe(`Run ${zksolcCommand} with Sol, --combined-json and wrong ARG: --${json_args[i]}`, () => {
|
||||
const args = [
|
||||
`${paths.pathToBasicSolContract}`,
|
||||
`--combined-json`,
|
||||
`--${json_args[i]}`,
|
||||
]
|
||||
const result = executeCommand(zksolcCommand, args)
|
||||
|
||||
it('Valid command exit code = 1', () => {
|
||||
expect(result.exitCode).toBe(1)
|
||||
})
|
||||
|
||||
it('--combined-json error is presented', () => {
|
||||
expect(result.output).toMatch(/(Invalid option|error)/i)
|
||||
})
|
||||
|
||||
it('solc exit code == zksolc exit code', () => {
|
||||
const solcResult = executeCommand(solcCommand, args)
|
||||
expect(solcResult.exitCode).toBe(result.exitCode)
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
//id1829:II
|
||||
for (let i = 0; i < json_args.length; i++) {
|
||||
describe(`Run ${zksolcCommand} with Sol, --combined-json and multiple ARG: ${json_args[i]} ${json_args[i]}`, () => {
|
||||
const args = [
|
||||
`${paths.pathToBasicSolContract}`,
|
||||
`--combined-json`,
|
||||
`${json_args[i]}`,
|
||||
`${json_args[i]}`,
|
||||
]
|
||||
const result = executeCommand(zksolcCommand, args)
|
||||
|
||||
xit('Valid command exit code = 1', () => {
|
||||
expect(result.exitCode).toBe(1)
|
||||
})
|
||||
|
||||
it('--combined-json error is presented', () => {
|
||||
expect(result.output).toMatch(
|
||||
/(No such file or directory|cannot find the file specified)/i
|
||||
) // Hopefully we should have more precise message here!
|
||||
})
|
||||
|
||||
xit('solc exit code == zksolc exit code', () => {
|
||||
const solcResult = executeCommand(solcCommand, args)
|
||||
expect(solcResult.exitCode).toBe(result.exitCode)
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
//id1829:III
|
||||
for (let i = 0; i < json_args.length; i++) {
|
||||
describe(`Run ${zksolcCommand} with Sol, and multiple (--combined-json ${json_args[i]})`, () => {
|
||||
const args = [
|
||||
`${paths.pathToBasicSolContract}`,
|
||||
`--combined-json`,
|
||||
`${json_args[i]}`,
|
||||
`--combined-json`,
|
||||
`${json_args[i]}`,
|
||||
]
|
||||
const result = executeCommand(zksolcCommand, args)
|
||||
|
||||
it('Valid command exit code = 1', () => {
|
||||
expect(result.exitCode).toBe(1)
|
||||
})
|
||||
|
||||
it('--combined-json error is presented', () => {
|
||||
expect(result.output).toMatch(/(cannot be used multiple times)/i)
|
||||
})
|
||||
|
||||
it('solc exit code == zksolc exit code', () => {
|
||||
const solcResult = executeCommand(solcCommand, args)
|
||||
expect(solcResult.exitCode).toBe(result.exitCode)
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
//id1830
|
||||
for (let i = 0; i < json_args.length; i++) {
|
||||
describe(`Run ${zksolcCommand} with Yul, and --combined-json ${json_args[i]}`, () => {
|
||||
const args = [
|
||||
`${paths.pathToBasicYulContract}`,
|
||||
`--combined-json`,
|
||||
`${json_args[i]}`,
|
||||
]
|
||||
const result = executeCommand(zksolcCommand, args)
|
||||
|
||||
it('Valid command exit code = 1', () => {
|
||||
expect(result.exitCode).toBe(1)
|
||||
})
|
||||
|
||||
it('--combined-json error is presented', () => {
|
||||
expect(result.output).toMatch(/(ParserError: Expected identifier)/i)
|
||||
})
|
||||
asd
|
||||
|
||||
it('solc exit code == zksolc exit code', () => {
|
||||
const solcResult = executeCommand(solcCommand, args)
|
||||
expect(solcResult.exitCode).toBe(result.exitCode)
|
||||
})
|
||||
})
|
||||
}
|
||||
})
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
#![cfg(test)]
|
||||
|
||||
mod cli;
|
||||
mod factory_dependency;
|
||||
mod ir_artifacts;
|
||||
mod libraries;
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
[package]
|
||||
name = "revive-rul-runtime-library"
|
||||
version.workspace = true
|
||||
license.workspace = true
|
||||
edition.workspace = true
|
||||
repository.workspace = true
|
||||
authors.workspace = true
|
||||
description = "revive compiler rust backend runtime library"
|
||||
|
||||
[dependencies]
|
||||
alloy-core = { workspace = true, default-features = false }
|
||||
@@ -1,4 +0,0 @@
|
||||
//! The revive Rust backend contract runtime library configuration.
|
||||
|
||||
/// The Ethereum Virtual Machine word size in bytes.
|
||||
pub const EVM_WORD_SIZE_BYTES: usize = 32;
|
||||
@@ -1,6 +0,0 @@
|
||||
//! The revive Rust backend contract runtime library.
|
||||
|
||||
#![no_std]
|
||||
|
||||
pub mod configuration;
|
||||
pub mod memory;
|
||||
@@ -1,13 +0,0 @@
|
||||
//! The revive Rust backend contract runtime emulated linear EVM heap memory.
|
||||
|
||||
/// The emulated linear EVM heap memory size.
|
||||
pub const MEMORY_SIZE: usize = 1024 * 64;
|
||||
|
||||
/// The emulated linear EVM heap memory size.
|
||||
pub const MEMORY: [u8; MEMORY_SIZE] = [0; MEMORY_SIZE];
|
||||
|
||||
pub struct Function<const VARIABLES: usize> {
|
||||
pub variables: [u8; VARIABLES],
|
||||
}
|
||||
|
||||
impl<const VARIABLES: usize> Function<VARIABLES> {}
|
||||
@@ -1,14 +0,0 @@
|
||||
[package]
|
||||
name = "revive-rul"
|
||||
version.workspace = true
|
||||
license.workspace = true
|
||||
edition.workspace = true
|
||||
repository.workspace = true
|
||||
authors.workspace = true
|
||||
description = "revive compiler rust backend"
|
||||
|
||||
[dependencies]
|
||||
anyhow = { workspace = true }
|
||||
pallet-revive-uapi = { workspace = true }
|
||||
polkavm-linker = { workspace = true }
|
||||
|
||||
@@ -1,79 +0,0 @@
|
||||
//! The revive rust backend builder module.
|
||||
|
||||
const CARGO_TOML: &str = r#"
|
||||
[package]
|
||||
name = "contracts"
|
||||
publish = false
|
||||
version = "1.0.0"
|
||||
edition = "2021"
|
||||
|
||||
# Make sure this is not included into the workspace
|
||||
[workspace]
|
||||
|
||||
# Binary targets are injected dynamically by the build script.
|
||||
[[bin]]
|
||||
|
||||
# All paths are injected dynamically by the build script.
|
||||
[dependencies]
|
||||
uapi = { version = "0.7.0", package = 'pallet-revive-uapi', features = ["unstable-hostfn"], default-features = false }
|
||||
hex-literal = { version = "0.4.1", default-features = false }
|
||||
polkavm-derive = { version = "0.27.0" }
|
||||
|
||||
[profile.release]
|
||||
opt-level = z
|
||||
lto = true
|
||||
codegen-units = 1
|
||||
"#;
|
||||
|
||||
const HEADER: &str = r#"
|
||||
#![no_std]
|
||||
#![no_main]
|
||||
include!("../panic_handler.rs");
|
||||
|
||||
use uapi::{HostFn, HostFnImpl as api, ReturnFlags};
|
||||
|
||||
#[panic_handler]
|
||||
fn panic(_info: &core::panic::PanicInfo) -> ! {
|
||||
// SAFETY: The unimp instruction is guaranteed to trap
|
||||
unsafe {
|
||||
core::arch::asm!("unimp");
|
||||
core::hint::unreachable_unchecked();
|
||||
}
|
||||
}
|
||||
|
||||
/// The emulated linear EVM heap memory size.
|
||||
pub const MEMORY_SIZE: usize = 1024 * 64;
|
||||
|
||||
/// The emulated linear EVM heap memory size.
|
||||
pub const MEMORY: [u8; MEMORY_SIZE] = [0; MEMORY_SIZE];
|
||||
"#;
|
||||
|
||||
const EXPORT_FUNCTION: &str = r#"
|
||||
#[no_mangle]
|
||||
#[polkavm_derive::polkavm_export]
|
||||
pub extern "C" fn "#;
|
||||
|
||||
fn emit(constructor_code: &str, runtime_code: &str) -> String {
|
||||
let mut buffer = String::from(HEADER);
|
||||
buffer.reserve(
|
||||
constructor_code.len() + runtime_code.len() + HEADER.len() + EXPORT_FUNCTION.len() * 2,
|
||||
);
|
||||
|
||||
buffer.push_str(EXPORT_FUNCTION);
|
||||
buffer.push_str("deploy() {");
|
||||
buffer.push_str(constructor_code);
|
||||
buffer.push_str("\n}");
|
||||
|
||||
buffer.push_str(EXPORT_FUNCTION);
|
||||
buffer.push_str("call() {");
|
||||
buffer.push_str(runtime_code);
|
||||
buffer.push_str("\n}");
|
||||
|
||||
buffer
|
||||
}
|
||||
|
||||
/// Build a PVM blob.
|
||||
pub fn build(constructor_code: &str, runtime_code: &str) -> Vec<u8> {
|
||||
let code = emit(constructor_code, runtime_code);
|
||||
todo!();
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
//! The revive rust backend library.
|
||||
|
||||
pub mod builder;
|
||||
pub mod yul_library;
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
//! The revive rust backend YUL auxilliary library functions module.
|
||||
@@ -26,19 +26,19 @@ pub static GLOBAL_IMMUTABLE_DATA_SIZE: &str = "__immutable_data_size";
|
||||
pub static IMMUTABLE_DATA_MAX_SIZE: u32 = 4 * 1024;
|
||||
|
||||
/// Returns the immutable data global type.
|
||||
pub fn data_type(context: &inkwell::context::Context, size: u32) -> inkwell::types::ArrayType<'_> {
|
||||
pub fn data_type(context: &inkwell::context::Context, size: u32) -> inkwell::types::ArrayType {
|
||||
context
|
||||
.custom_width_int_type(revive_common::BIT_LENGTH_WORD as u32)
|
||||
.array_type(size)
|
||||
}
|
||||
|
||||
/// Returns the immutable data size global type.
|
||||
pub fn size_type(context: &inkwell::context::Context) -> inkwell::types::IntType<'_> {
|
||||
pub fn size_type(context: &inkwell::context::Context) -> inkwell::types::IntType {
|
||||
context.custom_width_int_type(revive_common::BIT_LENGTH_X32 as u32)
|
||||
}
|
||||
|
||||
/// Creates a LLVM module with the immutable data and its `size` in bytes.
|
||||
pub fn module(context: &inkwell::context::Context, size: u32) -> inkwell::module::Module<'_> {
|
||||
pub fn module(context: &inkwell::context::Context, size: u32) -> inkwell::module::Module {
|
||||
let module = context.create_module(MODULE_NAME);
|
||||
let length = size / revive_common::BYTE_LENGTH_WORD as u32;
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ use self::file::File as FileSelection;
|
||||
pub struct Selection {
|
||||
/// Only the 'all' wildcard is available for robustness reasons.
|
||||
#[serde(rename = "*", skip_serializing_if = "Option::is_none")]
|
||||
all: Option<FileSelection>,
|
||||
pub all: Option<FileSelection>,
|
||||
|
||||
#[serde(skip_serializing_if = "BTreeMap::is_empty", flatten)]
|
||||
pub files: BTreeMap<String, FileSelection>,
|
||||
|
||||
@@ -27,7 +27,7 @@ impl std::fmt::Display for Literal {
|
||||
match self {
|
||||
Self::Boolean(inner) => write!(f, "{inner}"),
|
||||
Self::Integer(inner) => write!(f, "{inner}"),
|
||||
Self::String(inner) => write!(f, "\"{inner}\""),
|
||||
Self::String(inner) => write!(f, "{inner}"),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,4 +3,3 @@
|
||||
pub mod error;
|
||||
pub mod lexer;
|
||||
pub mod parser;
|
||||
pub mod visitor;
|
||||
|
||||
@@ -10,8 +10,6 @@ use crate::lexer::token::location::Location;
|
||||
use crate::lexer::token::Token;
|
||||
use crate::lexer::Lexer;
|
||||
use crate::parser::r#type::Type;
|
||||
use crate::visitor::AstNode;
|
||||
use crate::visitor::AstVisitor;
|
||||
|
||||
/// The YUL source code identifier.
|
||||
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
|
||||
@@ -115,15 +113,3 @@ impl Identifier {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl AstNode for Identifier {
|
||||
fn accept(&self, ast_visitor: &mut impl AstVisitor) {
|
||||
ast_visitor.visit_identifier(self);
|
||||
}
|
||||
|
||||
fn visit_children(&self, _ast_visitor: &mut impl AstVisitor) {}
|
||||
|
||||
fn location(&self) -> Location {
|
||||
self.location
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,8 +15,6 @@ use crate::lexer::Lexer;
|
||||
use crate::parser::error::Error as ParserError;
|
||||
use crate::parser::identifier::Identifier;
|
||||
use crate::parser::statement::expression::Expression;
|
||||
use crate::visitor::AstNode;
|
||||
use crate::visitor::AstVisitor;
|
||||
|
||||
/// The Yul assignment expression statement.
|
||||
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
|
||||
@@ -186,20 +184,3 @@ where
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
impl AstNode for Assignment {
|
||||
fn accept(&self, ast_visitor: &mut impl AstVisitor) {
|
||||
ast_visitor.visit_assignment(self);
|
||||
}
|
||||
|
||||
fn visit_children(&self, ast_visitor: &mut impl AstVisitor) {
|
||||
for binding in &self.bindings {
|
||||
binding.accept(ast_visitor);
|
||||
}
|
||||
self.initializer.accept(ast_visitor);
|
||||
}
|
||||
|
||||
fn location(&self) -> Location {
|
||||
self.location
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,8 +17,6 @@ use crate::parser::error::Error as ParserError;
|
||||
use crate::parser::statement::assignment::Assignment;
|
||||
use crate::parser::statement::expression::Expression;
|
||||
use crate::parser::statement::Statement;
|
||||
use crate::visitor::AstNode;
|
||||
use crate::visitor::AstVisitor;
|
||||
|
||||
/// The Yul source code block.
|
||||
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
|
||||
@@ -228,22 +226,6 @@ where
|
||||
}
|
||||
}
|
||||
|
||||
impl AstNode for Block {
|
||||
fn accept(&self, ast_visitor: &mut impl AstVisitor) {
|
||||
ast_visitor.visit_block(self);
|
||||
}
|
||||
|
||||
fn visit_children(&self, ast_visitor: &mut impl AstVisitor) {
|
||||
for statement in &self.statements {
|
||||
statement.accept(ast_visitor);
|
||||
}
|
||||
}
|
||||
|
||||
fn location(&self) -> Location {
|
||||
self.location
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::lexer::token::location::Location;
|
||||
|
||||
@@ -13,8 +13,6 @@ use crate::lexer::token::Token;
|
||||
use crate::lexer::Lexer;
|
||||
use crate::parser::error::Error as ParserError;
|
||||
use crate::parser::statement::block::Block;
|
||||
use crate::visitor::AstNode;
|
||||
use crate::visitor::AstVisitor;
|
||||
|
||||
/// The YUL code entity, which is the first block of the object.
|
||||
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
|
||||
@@ -68,20 +66,6 @@ where
|
||||
}
|
||||
}
|
||||
|
||||
impl AstNode for Code {
|
||||
fn accept(&self, ast_visitor: &mut impl AstVisitor) {
|
||||
ast_visitor.visit_code(self);
|
||||
}
|
||||
|
||||
fn visit_children(&self, ast_visitor: &mut impl AstVisitor) {
|
||||
self.block.accept(ast_visitor);
|
||||
}
|
||||
|
||||
fn location(&self) -> Location {
|
||||
self.location
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::lexer::token::location::Location;
|
||||
|
||||
@@ -19,8 +19,6 @@ use crate::lexer::Lexer;
|
||||
use crate::parser::error::Error as ParserError;
|
||||
use crate::parser::statement::expression::literal::Literal;
|
||||
use crate::parser::statement::expression::Expression;
|
||||
use crate::visitor::AstNode;
|
||||
use crate::visitor::AstVisitor;
|
||||
|
||||
use self::name::Name;
|
||||
|
||||
@@ -1023,19 +1021,3 @@ impl FunctionCall {
|
||||
Ok(arguments.try_into().expect("Always successful"))
|
||||
}
|
||||
}
|
||||
|
||||
impl AstNode for FunctionCall {
|
||||
fn accept(&self, ast_visitor: &mut impl AstVisitor) {
|
||||
ast_visitor.visit_function_call(self);
|
||||
}
|
||||
|
||||
fn visit_children(&self, ast_visitor: &mut impl AstVisitor) {
|
||||
for argument in &self.arguments {
|
||||
argument.accept(ast_visitor);
|
||||
}
|
||||
}
|
||||
|
||||
fn location(&self) -> Location {
|
||||
self.location
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,13 +1,10 @@
|
||||
//! The function name.
|
||||
|
||||
use std::fmt;
|
||||
|
||||
use serde::Deserialize;
|
||||
use serde::Serialize;
|
||||
|
||||
/// The function name.
|
||||
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
|
||||
#[serde(rename_all = "lowercase")]
|
||||
pub enum Name {
|
||||
/// The user-defined function.
|
||||
UserDefined(String),
|
||||
@@ -359,130 +356,3 @@ impl From<&str> for Name {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl fmt::Display for Name {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
if let Self::Verbatim {
|
||||
input_size,
|
||||
output_size,
|
||||
} = self
|
||||
{
|
||||
return write!(f, "verbatim_{input_size}i_{output_size}o");
|
||||
}
|
||||
|
||||
let token = match self {
|
||||
Self::Add => "add",
|
||||
Self::Sub => "sub",
|
||||
Self::Mul => "mul",
|
||||
Self::Div => "div",
|
||||
Self::Mod => "mod",
|
||||
Self::Sdiv => "sdiv",
|
||||
Self::Smod => "smod",
|
||||
|
||||
Self::Lt => "lt",
|
||||
Self::Gt => "gt",
|
||||
Self::Eq => "eq",
|
||||
Self::IsZero => "iszero",
|
||||
Self::Slt => "slt",
|
||||
Self::Sgt => "sgt",
|
||||
|
||||
Self::Or => "or",
|
||||
Self::Xor => "xor",
|
||||
Self::Not => "not",
|
||||
Self::And => "and",
|
||||
Self::Shl => "shl",
|
||||
Self::Shr => "shr",
|
||||
Self::Sar => "sar",
|
||||
Self::Byte => "byte",
|
||||
Self::Pop => "pop",
|
||||
|
||||
Self::AddMod => "addmod",
|
||||
Self::MulMod => "mulmod",
|
||||
Self::Exp => "exp",
|
||||
Self::SignExtend => "signextend",
|
||||
|
||||
Self::Keccak256 => "keccak256",
|
||||
|
||||
Self::MLoad => "mload",
|
||||
Self::MStore => "mstore",
|
||||
Self::MStore8 => "mstore8",
|
||||
Self::MCopy => "mcopy",
|
||||
|
||||
Self::SLoad => "sload",
|
||||
Self::SStore => "sstore",
|
||||
Self::TLoad => "tload",
|
||||
Self::TStore => "tstore",
|
||||
Self::LoadImmutable => "loadimmutable",
|
||||
Self::SetImmutable => "setimmutable",
|
||||
|
||||
Self::CallDataLoad => "calldataload",
|
||||
Self::CallDataSize => "calldatasize",
|
||||
Self::CallDataCopy => "calldatacopy",
|
||||
Self::CodeSize => "codesize",
|
||||
Self::CodeCopy => "codecopy",
|
||||
Self::ReturnDataSize => "returndatasize",
|
||||
Self::ReturnDataCopy => "returndatacopy",
|
||||
Self::ExtCodeSize => "extcodesize",
|
||||
Self::ExtCodeHash => "extcodehash",
|
||||
|
||||
Self::Return => "return",
|
||||
Self::Revert => "revert",
|
||||
|
||||
Self::Log0 => "log0",
|
||||
Self::Log1 => "log1",
|
||||
Self::Log2 => "log2",
|
||||
Self::Log3 => "log3",
|
||||
Self::Log4 => "log4",
|
||||
|
||||
Self::Call => "call",
|
||||
Self::DelegateCall => "delegatecall",
|
||||
Self::StaticCall => "staticcall",
|
||||
Self::Create => "create",
|
||||
Self::Create2 => "create2",
|
||||
|
||||
Self::DataSize => "datasize",
|
||||
Self::DataOffset => "dataoffset",
|
||||
Self::DataCopy => "datacopy",
|
||||
|
||||
Self::Stop => "stop",
|
||||
Self::Invalid => "invalid",
|
||||
|
||||
Self::LinkerSymbol => "linkersymbol",
|
||||
Self::MemoryGuard => "memoryguard",
|
||||
|
||||
Self::Address => "address",
|
||||
Self::Caller => "caller",
|
||||
|
||||
Self::CallValue => "callvalue",
|
||||
Self::Gas => "gas",
|
||||
Self::Balance => "balance",
|
||||
Self::SelfBalance => "selfbalance",
|
||||
|
||||
Self::GasLimit => "gaslimit",
|
||||
Self::GasPrice => "gasprice",
|
||||
Self::Origin => "origin",
|
||||
Self::ChainId => "chainid",
|
||||
Self::Timestamp => "timestamp",
|
||||
Self::Number => "number",
|
||||
Self::BlockHash => "blockhash",
|
||||
Self::BlobHash => "blobhash",
|
||||
Self::Difficulty => "difficulty",
|
||||
Self::Prevrandao => "prevrandao",
|
||||
Self::CoinBase => "coinbase",
|
||||
Self::BaseFee => "basefee",
|
||||
Self::BlobBaseFee => "blobbasefee",
|
||||
Self::MSize => "msize",
|
||||
|
||||
Self::CallCode => "callcode",
|
||||
Self::Pc => "pc",
|
||||
Self::ExtCodeCopy => "extcodecopy",
|
||||
Self::SelfDestruct => "selfdestruct",
|
||||
|
||||
Self::UserDefined(s) => s.as_str(),
|
||||
|
||||
Self::Verbatim { .. } => unreachable!(),
|
||||
};
|
||||
|
||||
write!(f, "{token}")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,8 +18,6 @@ use crate::lexer::token::Token;
|
||||
use crate::lexer::Lexer;
|
||||
use crate::parser::error::Error as ParserError;
|
||||
use crate::parser::r#type::Type;
|
||||
use crate::visitor::AstNode;
|
||||
use crate::visitor::AstVisitor;
|
||||
|
||||
/// Represents a literal in YUL without differentiating its type.
|
||||
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
|
||||
@@ -223,15 +221,3 @@ impl Literal {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl AstNode for Literal {
|
||||
fn accept(&self, ast_visitor: &mut impl AstVisitor) {
|
||||
ast_visitor.visit_literal(self);
|
||||
}
|
||||
|
||||
fn visit_children(&self, _ast_visitor: &mut impl AstVisitor) {}
|
||||
|
||||
fn location(&self) -> Location {
|
||||
self.location
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,8 +16,6 @@ use crate::lexer::token::Token;
|
||||
use crate::lexer::Lexer;
|
||||
use crate::parser::error::Error as ParserError;
|
||||
use crate::parser::identifier::Identifier;
|
||||
use crate::visitor::AstNode;
|
||||
use crate::visitor::AstVisitor;
|
||||
|
||||
use self::function_call::FunctionCall;
|
||||
use self::literal::Literal;
|
||||
@@ -146,21 +144,3 @@ impl Expression {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl AstNode for Expression {
|
||||
fn accept(&self, ast_visitor: &mut impl AstVisitor) {
|
||||
ast_visitor.visit_expression(self);
|
||||
}
|
||||
|
||||
fn visit_children(&self, ast_visitor: &mut impl AstVisitor) {
|
||||
match self {
|
||||
Self::FunctionCall(inner) => inner.accept(ast_visitor),
|
||||
Self::Identifier(inner) => inner.accept(ast_visitor),
|
||||
Self::Literal(inner) => inner.accept(ast_visitor),
|
||||
}
|
||||
}
|
||||
|
||||
fn location(&self) -> Location {
|
||||
self.location()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,8 +11,6 @@ use crate::lexer::token::Token;
|
||||
use crate::lexer::Lexer;
|
||||
use crate::parser::statement::block::Block;
|
||||
use crate::parser::statement::expression::Expression;
|
||||
use crate::visitor::AstNode;
|
||||
use crate::visitor::AstVisitor;
|
||||
|
||||
/// The Yul for-loop statement.
|
||||
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
|
||||
@@ -115,20 +113,3 @@ where
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
impl AstNode for ForLoop {
|
||||
fn accept(&self, ast_visitor: &mut impl AstVisitor) {
|
||||
ast_visitor.visit_for_loop(self);
|
||||
}
|
||||
|
||||
fn visit_children(&self, ast_visitor: &mut impl AstVisitor) {
|
||||
self.initializer.accept(ast_visitor);
|
||||
self.condition.accept(ast_visitor);
|
||||
self.finalizer.accept(ast_visitor);
|
||||
self.body.accept(ast_visitor);
|
||||
}
|
||||
|
||||
fn location(&self) -> Location {
|
||||
self.location
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,8 +18,6 @@ use crate::parser::error::Error as ParserError;
|
||||
use crate::parser::identifier::Identifier;
|
||||
use crate::parser::statement::block::Block;
|
||||
use crate::parser::statement::expression::function_call::name::Name as FunctionName;
|
||||
use crate::visitor::AstNode;
|
||||
use crate::visitor::AstVisitor;
|
||||
|
||||
/// The function definition statement.
|
||||
/// All functions are translated in two steps:
|
||||
@@ -331,28 +329,6 @@ where
|
||||
}
|
||||
}
|
||||
|
||||
impl AstNode for FunctionDefinition {
|
||||
fn accept(&self, ast_visitor: &mut impl AstVisitor) {
|
||||
ast_visitor.visit_function_definition(self);
|
||||
}
|
||||
|
||||
fn visit_children(&self, ast_visitor: &mut impl AstVisitor) {
|
||||
for argument in &self.arguments {
|
||||
argument.accept(ast_visitor);
|
||||
}
|
||||
|
||||
self.body.accept(ast_visitor);
|
||||
|
||||
for result in &self.result {
|
||||
result.accept(ast_visitor);
|
||||
}
|
||||
}
|
||||
|
||||
fn location(&self) -> Location {
|
||||
self.location
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use std::collections::BTreeSet;
|
||||
|
||||
@@ -11,8 +11,6 @@ use crate::lexer::token::Token;
|
||||
use crate::lexer::Lexer;
|
||||
use crate::parser::statement::block::Block;
|
||||
use crate::parser::statement::expression::Expression;
|
||||
use crate::visitor::AstNode;
|
||||
use crate::visitor::AstVisitor;
|
||||
|
||||
/// The Yul if-conditional statement.
|
||||
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
|
||||
@@ -84,18 +82,3 @@ where
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
impl AstNode for IfConditional {
|
||||
fn accept(&self, ast_visitor: &mut impl AstVisitor) {
|
||||
ast_visitor.visit_if_conditional(self);
|
||||
}
|
||||
|
||||
fn visit_children(&self, ast_visitor: &mut impl AstVisitor) {
|
||||
self.condition.accept(ast_visitor);
|
||||
self.block.accept(ast_visitor);
|
||||
}
|
||||
|
||||
fn location(&self) -> Location {
|
||||
self.location
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,8 +23,6 @@ use crate::lexer::token::location::Location;
|
||||
use crate::lexer::token::Token;
|
||||
use crate::lexer::Lexer;
|
||||
use crate::parser::error::Error as ParserError;
|
||||
use crate::visitor::AstNode;
|
||||
use crate::visitor::AstVisitor;
|
||||
|
||||
use self::assignment::Assignment;
|
||||
use self::block::Block;
|
||||
@@ -179,31 +177,3 @@ impl Statement {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl AstNode for Statement {
|
||||
fn accept(&self, ast_visitor: &mut impl AstVisitor) {
|
||||
ast_visitor.visit_statement(self);
|
||||
}
|
||||
|
||||
fn visit_children(&self, ast_visitor: &mut impl AstVisitor) {
|
||||
match self {
|
||||
Self::Object(inner) => inner.accept(ast_visitor),
|
||||
Self::Code(inner) => inner.accept(ast_visitor),
|
||||
Self::Block(inner) => inner.accept(ast_visitor),
|
||||
Self::Expression(inner) => inner.accept(ast_visitor),
|
||||
Self::FunctionDefinition(inner) => inner.accept(ast_visitor),
|
||||
Self::VariableDeclaration(inner) => inner.accept(ast_visitor),
|
||||
Self::Assignment(inner) => inner.accept(ast_visitor),
|
||||
Self::IfConditional(inner) => inner.accept(ast_visitor),
|
||||
Self::Switch(inner) => inner.accept(ast_visitor),
|
||||
Self::ForLoop(inner) => inner.accept(ast_visitor),
|
||||
Self::Continue(_location) => {}
|
||||
Self::Break(_location) => {}
|
||||
Self::Leave(_location) => {}
|
||||
}
|
||||
}
|
||||
|
||||
fn location(&self) -> Location {
|
||||
self.location()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,8 +17,6 @@ use crate::lexer::token::Token;
|
||||
use crate::lexer::Lexer;
|
||||
use crate::parser::error::Error as ParserError;
|
||||
use crate::parser::statement::code::Code;
|
||||
use crate::visitor::AstNode;
|
||||
use crate::visitor::AstVisitor;
|
||||
|
||||
/// The upper-level YUL object, representing the deploy code.
|
||||
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
|
||||
@@ -299,24 +297,6 @@ where
|
||||
}
|
||||
}
|
||||
|
||||
impl AstNode for Object {
|
||||
fn accept(&self, ast_visitor: &mut impl AstVisitor) {
|
||||
ast_visitor.visit_object(self);
|
||||
}
|
||||
|
||||
fn visit_children(&self, ast_visitor: &mut impl AstVisitor) {
|
||||
self.code.accept(ast_visitor);
|
||||
|
||||
if let Some(inner_object) = &self.inner_object {
|
||||
inner_object.accept(ast_visitor);
|
||||
}
|
||||
}
|
||||
|
||||
fn location(&self) -> Location {
|
||||
self.location
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::lexer::token::location::Location;
|
||||
|
||||
@@ -13,8 +13,6 @@ use crate::lexer::Lexer;
|
||||
use crate::parser::error::Error as ParserError;
|
||||
use crate::parser::statement::block::Block;
|
||||
use crate::parser::statement::expression::literal::Literal;
|
||||
use crate::visitor::AstNode;
|
||||
use crate::visitor::AstVisitor;
|
||||
|
||||
/// The Yul switch statement case.
|
||||
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
|
||||
@@ -63,21 +61,6 @@ impl Case {
|
||||
}
|
||||
}
|
||||
|
||||
impl AstNode for Case {
|
||||
fn accept(&self, ast_visitor: &mut impl AstVisitor) {
|
||||
ast_visitor.visit_case(self);
|
||||
}
|
||||
|
||||
fn visit_children(&self, ast_visitor: &mut impl AstVisitor) {
|
||||
self.literal.accept(ast_visitor);
|
||||
self.block.accept(ast_visitor);
|
||||
}
|
||||
|
||||
fn location(&self) -> Location {
|
||||
self.location
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::lexer::token::location::Location;
|
||||
|
||||
@@ -16,8 +16,6 @@ use crate::lexer::Lexer;
|
||||
use crate::parser::error::Error as ParserError;
|
||||
use crate::parser::statement::block::Block;
|
||||
use crate::parser::statement::expression::Expression;
|
||||
use crate::visitor::AstNode;
|
||||
use crate::visitor::AstVisitor;
|
||||
|
||||
use self::case::Case;
|
||||
|
||||
@@ -181,28 +179,6 @@ where
|
||||
}
|
||||
}
|
||||
|
||||
impl AstNode for Switch {
|
||||
fn accept(&self, ast_visitor: &mut impl AstVisitor) {
|
||||
ast_visitor.visit_switch(self);
|
||||
}
|
||||
|
||||
fn visit_children(&self, ast_visitor: &mut impl AstVisitor) {
|
||||
self.expression.accept(ast_visitor);
|
||||
|
||||
for case in &self.cases {
|
||||
case.accept(ast_visitor);
|
||||
}
|
||||
|
||||
if let Some(default) = self.default.as_ref() {
|
||||
default.accept(ast_visitor);
|
||||
}
|
||||
}
|
||||
|
||||
fn location(&self) -> Location {
|
||||
self.location
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::lexer::token::location::Location;
|
||||
|
||||
@@ -17,8 +17,6 @@ use crate::parser::error::Error as ParserError;
|
||||
use crate::parser::identifier::Identifier;
|
||||
use crate::parser::statement::expression::function_call::name::Name as FunctionName;
|
||||
use crate::parser::statement::expression::Expression;
|
||||
use crate::visitor::AstNode;
|
||||
use crate::visitor::AstVisitor;
|
||||
|
||||
/// The Yul variable declaration statement.
|
||||
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
|
||||
@@ -220,26 +218,6 @@ where
|
||||
}
|
||||
}
|
||||
|
||||
impl AstNode for VariableDeclaration {
|
||||
fn accept(&self, ast_visitor: &mut impl AstVisitor) {
|
||||
ast_visitor.visit_variable_declaration(self);
|
||||
}
|
||||
|
||||
fn visit_children(&self, ast_visitor: &mut impl AstVisitor) {
|
||||
for binding in &self.bindings {
|
||||
binding.accept(ast_visitor);
|
||||
}
|
||||
|
||||
if let Some(initializer) = self.expression.as_ref() {
|
||||
initializer.accept(ast_visitor);
|
||||
}
|
||||
}
|
||||
|
||||
fn location(&self) -> Location {
|
||||
self.location
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::lexer::token::location::Location;
|
||||
|
||||
@@ -1,768 +0,0 @@
|
||||
//! The YUL AST visitor interface definitions.
|
||||
|
||||
use crate::{
|
||||
lexer::token::location::Location,
|
||||
parser::{
|
||||
identifier::Identifier,
|
||||
statement::{
|
||||
assignment::Assignment,
|
||||
block::Block,
|
||||
code::Code,
|
||||
expression::{function_call::FunctionCall, literal::Literal, Expression},
|
||||
for_loop::ForLoop,
|
||||
function_definition::FunctionDefinition,
|
||||
if_conditional::IfConditional,
|
||||
object::Object,
|
||||
switch::{case::Case, Switch},
|
||||
variable_declaration::VariableDeclaration,
|
||||
Statement,
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
/// This trait is implemented by all AST node types.
|
||||
///
|
||||
/// It allows to define how the AST is visited on a per-node basis.
|
||||
pub trait AstNode: std::fmt::Debug {
|
||||
/// Accept the given [AstVisitor].
|
||||
///
|
||||
/// This is supposed to call the corresponding `AstVisitor::visit_*` method.
|
||||
fn accept(&self, ast_visitor: &mut impl AstVisitor);
|
||||
|
||||
/// Let any child nodes accept the given [AstVisitor].
|
||||
///
|
||||
/// This is supposed visit child nodes in the correct order.
|
||||
///
|
||||
/// Visitor implementations call this method for traversing.
|
||||
fn visit_children(&self, _ast_visitor: &mut impl AstVisitor) {}
|
||||
|
||||
/// Returns the lexer (source) location of the node.
|
||||
fn location(&self) -> Location;
|
||||
}
|
||||
|
||||
/// This trait allows implementing custom AST visitor logic for each node type.
|
||||
///
|
||||
/// The visitor can call the nodes [AstNode::visit_children] method (from any
|
||||
/// other trait method). This simplifies the implementation of AST visitors.
|
||||
///
|
||||
/// Default implementations which do nothing except accepting the visitor via the
|
||||
/// [AstVisitor::visit] method are provided for each node type.
|
||||
///
|
||||
/// The [AstVisitor::visit] method is the generic visitor method, seen by all
|
||||
/// nodes.
|
||||
///
|
||||
/// Visited nodes are given read only access (non-mutable references); it's a
|
||||
/// compiler design practice to not mutate the AST after parsing.
|
||||
/// Instead, mutable access to the [AstVisitor] instance itself is provided,
|
||||
/// allowing to build a new representation if needed.
|
||||
///
|
||||
/// # Example
|
||||
///
|
||||
/// ```rust
|
||||
/// use revive_yul::visitor::*;
|
||||
///
|
||||
/// /// A very simple visitor that counts all nodes in the AST.
|
||||
/// #[derive(Default, Debug)]
|
||||
/// pub struct CountVisitor(usize);
|
||||
///
|
||||
/// impl AstVisitor for CountVisitor {
|
||||
/// /// Increment the counter for ech node we visit.
|
||||
/// fn visit(&mut self, node: &impl AstNode) {
|
||||
/// node.visit_children(self);
|
||||
/// self.0 += 1;
|
||||
/// }
|
||||
///
|
||||
/// /*
|
||||
///
|
||||
/// /// If we were interested in a per-statement breakdown of the AST,
|
||||
/// /// we would implement `visit_*` methods to cover each node like this:
|
||||
/// fn visit_block(&mut self, node: &Block) {
|
||||
/// self.visit_children(node);
|
||||
/// self.block_count += 1;
|
||||
/// }
|
||||
///
|
||||
/// */
|
||||
/// }
|
||||
///
|
||||
/// ```
|
||||
pub trait AstVisitor {
|
||||
/// The generic visitor logic for all node types is executed upon visiting any statement.
|
||||
fn visit(&mut self, node: &impl AstNode);
|
||||
|
||||
/// The logic to execute upon visiting [Assignment] statements.
|
||||
fn visit_assignment(&mut self, node: &Assignment) {
|
||||
self.visit(node);
|
||||
}
|
||||
|
||||
/// The logic to execute upon visiting any [Block].
|
||||
fn visit_block(&mut self, node: &Block) {
|
||||
self.visit(node);
|
||||
}
|
||||
|
||||
/// The logic to execute upon visiting [Case] statements.
|
||||
fn visit_case(&mut self, node: &Case) {
|
||||
self.visit(node);
|
||||
}
|
||||
|
||||
/// The logic to execute upon visiting [Code] statements.
|
||||
fn visit_code(&mut self, node: &Code) {
|
||||
self.visit(node);
|
||||
}
|
||||
|
||||
/// The logic to execute upon visiting any [Expression].
|
||||
fn visit_expression(&mut self, node: &Expression) {
|
||||
self.visit(node);
|
||||
}
|
||||
|
||||
/// The logic to execute upon visiting [ForLoop] statements.
|
||||
fn visit_for_loop(&mut self, node: &ForLoop) {
|
||||
self.visit(node);
|
||||
}
|
||||
|
||||
/// The logic to execute upon visiting [FunctionCall] statements.
|
||||
fn visit_function_call(&mut self, node: &FunctionCall) {
|
||||
self.visit(node);
|
||||
}
|
||||
|
||||
/// The logic to execute upon visiting any [FunctionDefinition].
|
||||
fn visit_function_definition(&mut self, node: &FunctionDefinition) {
|
||||
self.visit(node);
|
||||
}
|
||||
|
||||
/// The logic to execute upon visiting any [Identifier].
|
||||
fn visit_identifier(&mut self, node: &Identifier) {
|
||||
self.visit(node);
|
||||
}
|
||||
|
||||
/// The logic to execute upon visiting [IfConditional] statements.
|
||||
fn visit_if_conditional(&mut self, node: &IfConditional) {
|
||||
self.visit(node);
|
||||
}
|
||||
|
||||
/// The logic to execute upon visiting any [Literal].
|
||||
fn visit_literal(&mut self, node: &Literal) {
|
||||
self.visit(node);
|
||||
}
|
||||
|
||||
/// The logic to execute upon visiting [Object] definitions.
|
||||
fn visit_object(&mut self, node: &Object) {
|
||||
self.visit(node);
|
||||
}
|
||||
|
||||
/// The logic to execute upon visiting any YUL [Statement].
|
||||
fn visit_statement(&mut self, node: &Statement) {
|
||||
self.visit(node);
|
||||
}
|
||||
|
||||
/// The logic to execute upon visiting [Switch] statements.
|
||||
fn visit_switch(&mut self, node: &Switch) {
|
||||
self.visit(node);
|
||||
}
|
||||
|
||||
/// The logic to execute upon visiting any [VariableDeclaration].
|
||||
fn visit_variable_declaration(&mut self, node: &VariableDeclaration) {
|
||||
self.visit(node);
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::{
|
||||
lexer::Lexer,
|
||||
parser::{
|
||||
identifier::Identifier,
|
||||
statement::{
|
||||
assignment::Assignment,
|
||||
block::Block,
|
||||
code::Code,
|
||||
expression::{function_call::FunctionCall, literal::Literal, Expression},
|
||||
for_loop::ForLoop,
|
||||
function_definition::FunctionDefinition,
|
||||
if_conditional::IfConditional,
|
||||
object::Object,
|
||||
switch::{case::Case, Switch},
|
||||
variable_declaration::VariableDeclaration,
|
||||
Statement,
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
use super::{AstNode, AstVisitor};
|
||||
|
||||
/// The [Printer] visitor builds the AST back into its textual representation.
|
||||
#[derive(Default)]
|
||||
struct Printer {
|
||||
/// The print buffer.
|
||||
buffer: String,
|
||||
/// The current indentation level.
|
||||
indentation: usize,
|
||||
}
|
||||
|
||||
impl Printer {
|
||||
/// Append a newline with the current identation to the print buffer.
|
||||
fn newline(&mut self) {
|
||||
self.buffer.push('\n');
|
||||
self.indent();
|
||||
}
|
||||
|
||||
/// Append the current identation to the print buffer.
|
||||
fn indent(&mut self) {
|
||||
for _ in 0..self.indentation {
|
||||
self.buffer.push_str(" ");
|
||||
}
|
||||
}
|
||||
|
||||
/// Append the given `nodes` comma-separated.
|
||||
fn separate(&mut self, nodes: &[impl AstNode]) {
|
||||
for (index, argument) in nodes.iter().enumerate() {
|
||||
argument.accept(self);
|
||||
|
||||
if index < nodes.len() - 1 {
|
||||
self.buffer.push_str(", ");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl AstVisitor for Printer {
|
||||
fn visit(&mut self, node: &impl AstNode) {
|
||||
node.accept(self);
|
||||
}
|
||||
|
||||
fn visit_assignment(&mut self, node: &Assignment) {
|
||||
self.separate(&node.bindings);
|
||||
|
||||
self.buffer.push_str(" := ");
|
||||
|
||||
node.initializer.visit_children(self);
|
||||
}
|
||||
|
||||
fn visit_block(&mut self, node: &Block) {
|
||||
self.newline();
|
||||
self.buffer.push('{');
|
||||
self.indentation += 1;
|
||||
|
||||
node.visit_children(self);
|
||||
|
||||
self.indentation -= 1;
|
||||
self.newline();
|
||||
self.buffer.push('}');
|
||||
}
|
||||
|
||||
fn visit_case(&mut self, node: &Case) {
|
||||
self.newline();
|
||||
self.buffer.push_str("case ");
|
||||
node.visit_children(self);
|
||||
}
|
||||
|
||||
fn visit_code(&mut self, node: &Code) {
|
||||
self.buffer.push_str("code ");
|
||||
node.visit_children(self);
|
||||
}
|
||||
|
||||
fn visit_expression(&mut self, node: &Expression) {
|
||||
node.visit_children(self);
|
||||
}
|
||||
|
||||
fn visit_for_loop(&mut self, node: &ForLoop) {
|
||||
self.buffer.push_str("for ");
|
||||
node.visit_children(self);
|
||||
}
|
||||
|
||||
fn visit_function_call(&mut self, node: &FunctionCall) {
|
||||
self.buffer.push_str(&format!("{}", node.name));
|
||||
self.buffer.push('(');
|
||||
|
||||
self.separate(&node.arguments);
|
||||
|
||||
self.buffer.push(')');
|
||||
}
|
||||
|
||||
fn visit_function_definition(&mut self, node: &FunctionDefinition) {
|
||||
self.buffer
|
||||
.push_str(&format!("function {}", node.identifier));
|
||||
|
||||
self.buffer.push('(');
|
||||
self.separate(&node.arguments);
|
||||
self.buffer.push(')');
|
||||
|
||||
self.buffer.push_str(" -> ");
|
||||
self.separate(&node.result);
|
||||
|
||||
node.body.accept(self);
|
||||
}
|
||||
|
||||
fn visit_identifier(&mut self, node: &Identifier) {
|
||||
self.buffer.push_str(&node.inner);
|
||||
}
|
||||
|
||||
fn visit_if_conditional(&mut self, node: &IfConditional) {
|
||||
self.buffer.push_str("if ");
|
||||
node.visit_children(self);
|
||||
}
|
||||
|
||||
fn visit_literal(&mut self, node: &Literal) {
|
||||
self.buffer.push_str(&format!("{}", node.inner));
|
||||
}
|
||||
|
||||
fn visit_object(&mut self, node: &Object) {
|
||||
self.newline();
|
||||
self.buffer.push_str("object \"");
|
||||
self.buffer.push_str(&node.identifier);
|
||||
self.buffer.push_str("\" {");
|
||||
self.indentation += 1;
|
||||
self.newline();
|
||||
|
||||
node.visit_children(self);
|
||||
|
||||
self.indentation -= 1;
|
||||
self.newline();
|
||||
self.buffer.push('}');
|
||||
}
|
||||
|
||||
fn visit_statement(&mut self, node: &Statement) {
|
||||
self.newline();
|
||||
node.visit_children(self);
|
||||
}
|
||||
|
||||
fn visit_switch(&mut self, node: &Switch) {
|
||||
self.buffer.push_str("switch ");
|
||||
node.visit_children(self);
|
||||
}
|
||||
|
||||
fn visit_variable_declaration(&mut self, node: &VariableDeclaration) {
|
||||
self.buffer.push_str("let ");
|
||||
self.separate(&node.bindings);
|
||||
|
||||
if let Some(initializer) = node.expression.as_ref() {
|
||||
self.buffer.push_str(" := ");
|
||||
initializer.visit_children(self);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const ERC20: &str = r#"/// @use-src 0:"crates/integration/contracts/ERC20.sol"
|
||||
object "ERC20_247" {
|
||||
code {
|
||||
{
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
mstore(64, memoryguard(0x80))
|
||||
if callvalue() { revert(0, 0) }
|
||||
let oldLen := extract_byte_array_length(sload(/** @src 0:1542:1563 "\"Solidity by Example\"" */ 0x03))
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
if gt(oldLen, 31)
|
||||
{
|
||||
mstore(/** @src -1:-1:-1 */ 0, /** @src 0:1542:1563 "\"Solidity by Example\"" */ 0x03)
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
let data := keccak256(/** @src -1:-1:-1 */ 0, /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ 0x20)
|
||||
let deleteStart := add(data, 1)
|
||||
deleteStart := data
|
||||
let _1 := add(data, shr(5, add(oldLen, 31)))
|
||||
let start := data
|
||||
for { } lt(start, _1) { start := add(start, 1) }
|
||||
{
|
||||
sstore(start, /** @src -1:-1:-1 */ 0)
|
||||
}
|
||||
}
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
sstore(/** @src 0:1542:1563 "\"Solidity by Example\"" */ 0x03, /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ add("Solidity by Example", 38))
|
||||
let oldLen_1 := extract_byte_array_length(sload(/** @src 0:1592:1601 "\"SOLBYEX\"" */ 0x04))
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
if gt(oldLen_1, 31)
|
||||
{
|
||||
mstore(/** @src -1:-1:-1 */ 0, /** @src 0:1592:1601 "\"SOLBYEX\"" */ 0x04)
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
let data_1 := keccak256(/** @src -1:-1:-1 */ 0, /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ 0x20)
|
||||
let deleteStart_1 := add(data_1, 1)
|
||||
deleteStart_1 := data_1
|
||||
let _2 := add(data_1, shr(5, add(oldLen_1, 31)))
|
||||
let start_1 := data_1
|
||||
for { } lt(start_1, _2) { start_1 := add(start_1, 1) }
|
||||
{
|
||||
sstore(start_1, /** @src -1:-1:-1 */ 0)
|
||||
}
|
||||
}
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
sstore(/** @src 0:1592:1601 "\"SOLBYEX\"" */ 0x04, /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ add("SOLBYEX", 14))
|
||||
sstore(/** @src 0:1631:1633 "18" */ 0x05, /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ or(and(sload(/** @src 0:1631:1633 "18" */ 0x05), /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ not(255)), /** @src 0:1631:1633 "18" */ 0x12))
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
let _3 := mload(64)
|
||||
let _4 := datasize("ERC20_247_deployed")
|
||||
codecopy(_3, dataoffset("ERC20_247_deployed"), _4)
|
||||
return(_3, _4)
|
||||
}
|
||||
function extract_byte_array_length(data) -> length
|
||||
{
|
||||
length := shr(1, data)
|
||||
let outOfPlaceEncoding := and(data, 1)
|
||||
if iszero(outOfPlaceEncoding) { length := and(length, 0x7f) }
|
||||
if eq(outOfPlaceEncoding, lt(length, 32))
|
||||
{
|
||||
mstore(0, shl(224, 0x4e487b71))
|
||||
mstore(4, 0x22)
|
||||
revert(0, 0x24)
|
||||
}
|
||||
}
|
||||
}
|
||||
/// @use-src 0:"crates/integration/contracts/ERC20.sol"
|
||||
object "ERC20_247_deployed" {
|
||||
code {
|
||||
{
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
mstore(64, memoryguard(0x80))
|
||||
if iszero(lt(calldatasize(), 4))
|
||||
{
|
||||
switch shr(224, calldataload(0))
|
||||
case 0x06fdde03 {
|
||||
if callvalue() { revert(0, 0) }
|
||||
if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
|
||||
/// @src 0:1521:1563 "string public name = \"Solidity by Example\""
|
||||
let value := /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ 0
|
||||
let offset := 0
|
||||
offset := 0
|
||||
let memPtr := mload(64)
|
||||
let ret := 0
|
||||
let slotValue := sload(/** @src 0:1521:1563 "string public name = \"Solidity by Example\"" */ 3)
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
let length := 0
|
||||
length := shr(1, slotValue)
|
||||
let outOfPlaceEncoding := and(slotValue, 1)
|
||||
if iszero(outOfPlaceEncoding) { length := and(length, 0x7f) }
|
||||
if eq(outOfPlaceEncoding, lt(length, 32))
|
||||
{
|
||||
mstore(0, shl(224, 0x4e487b71))
|
||||
mstore(4, 0x22)
|
||||
revert(0, 0x24)
|
||||
}
|
||||
mstore(memPtr, length)
|
||||
switch outOfPlaceEncoding
|
||||
case 0 {
|
||||
mstore(add(memPtr, 32), and(slotValue, not(255)))
|
||||
ret := add(add(memPtr, shl(5, iszero(iszero(length)))), 32)
|
||||
}
|
||||
case 1 {
|
||||
mstore(0, /** @src 0:1521:1563 "string public name = \"Solidity by Example\"" */ 3)
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
let dataPos := keccak256(0, 32)
|
||||
let i := 0
|
||||
for { } lt(i, length) { i := add(i, 32) }
|
||||
{
|
||||
mstore(add(add(memPtr, i), 32), sload(dataPos))
|
||||
dataPos := add(dataPos, 1)
|
||||
}
|
||||
ret := add(add(memPtr, i), 32)
|
||||
}
|
||||
let newFreePtr := add(memPtr, and(add(sub(ret, memPtr), 31), not(31)))
|
||||
if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, memPtr))
|
||||
{
|
||||
mstore(0, shl(224, 0x4e487b71))
|
||||
mstore(4, 0x41)
|
||||
revert(0, 0x24)
|
||||
}
|
||||
mstore(64, newFreePtr)
|
||||
value := memPtr
|
||||
let memPos := mload(64)
|
||||
return(memPos, sub(abi_encode_string(memPos, memPtr), memPos))
|
||||
}
|
||||
case 0x095ea7b3 {
|
||||
if callvalue() { revert(0, 0) }
|
||||
if slt(add(calldatasize(), not(3)), 64) { revert(0, 0) }
|
||||
let value0 := abi_decode_address_3473()
|
||||
let value_1 := calldataload(36)
|
||||
mstore(0, /** @src 0:1974:1984 "msg.sender" */ caller())
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
mstore(32, /** @src 0:1964:1973 "allowance" */ 0x02)
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
let dataSlot := keccak256(0, 64)
|
||||
/// @src 0:1964:1994 "allowance[msg.sender][spender]"
|
||||
let dataSlot_1 := /** @src -1:-1:-1 */ 0
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
mstore(/** @src -1:-1:-1 */ 0, /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ and(/** @src 0:1964:1994 "allowance[msg.sender][spender]" */ value0, /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ sub(shl(160, 1), 1)))
|
||||
mstore(0x20, /** @src 0:1964:1985 "allowance[msg.sender]" */ dataSlot)
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
dataSlot_1 := keccak256(/** @src -1:-1:-1 */ 0, /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ 0x40)
|
||||
sstore(/** @src 0:1964:1994 "allowance[msg.sender][spender]" */ dataSlot_1, /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ value_1)
|
||||
/// @src 0:2018:2055 "Approval(msg.sender, spender, amount)"
|
||||
let _1 := /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ mload(64)
|
||||
mstore(_1, value_1)
|
||||
/// @src 0:2018:2055 "Approval(msg.sender, spender, amount)"
|
||||
log3(_1, /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ 32, /** @src 0:2018:2055 "Approval(msg.sender, spender, amount)" */ 0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925, /** @src 0:1974:1984 "msg.sender" */ caller(), /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ and(/** @src 0:2018:2055 "Approval(msg.sender, spender, amount)" */ value0, /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ sub(shl(160, 1), 1)))
|
||||
let memPos_1 := mload(64)
|
||||
mstore(memPos_1, 1)
|
||||
return(memPos_1, 32)
|
||||
}
|
||||
case 0x18160ddd {
|
||||
if callvalue() { revert(0, 0) }
|
||||
if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
|
||||
let _2 := sload(0)
|
||||
let memPos_2 := mload(64)
|
||||
mstore(memPos_2, _2)
|
||||
return(memPos_2, 32)
|
||||
}
|
||||
case 0x23b872dd {
|
||||
if callvalue() { revert(0, 0) }
|
||||
if slt(add(calldatasize(), not(3)), 96) { revert(0, 0) }
|
||||
let value0_1 := abi_decode_address_3473()
|
||||
let value1 := abi_decode_address()
|
||||
let value_2 := calldataload(68)
|
||||
let _3 := and(value0_1, sub(shl(160, 1), 1))
|
||||
mstore(0, _3)
|
||||
mstore(32, /** @src 0:2223:2232 "allowance" */ 0x02)
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
let dataSlot_2 := keccak256(0, 64)
|
||||
/// @src 0:2223:2252 "allowance[sender][msg.sender]"
|
||||
let dataSlot_3 := /** @src -1:-1:-1 */ 0
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
mstore(/** @src -1:-1:-1 */ 0, /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ and(/** @src 0:2241:2251 "msg.sender" */ caller(), /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ sub(shl(160, 1), 1)))
|
||||
mstore(0x20, /** @src 0:2223:2252 "allowance[sender][msg.sender]" */ dataSlot_2)
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
dataSlot_3 := keccak256(/** @src -1:-1:-1 */ 0, /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ 0x40)
|
||||
sstore(/** @src 0:2223:2252 "allowance[sender][msg.sender]" */ dataSlot_3, /** @src 0:2223:2262 "allowance[sender][msg.sender] -= amount" */ checked_sub_uint256(/** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ sload(/** @src 0:2223:2252 "allowance[sender][msg.sender]" */ dataSlot_3), /** @src 0:2223:2262 "allowance[sender][msg.sender] -= amount" */ value_2))
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
mstore(0, _3)
|
||||
mstore(32, 1)
|
||||
let dataSlot_4 := keccak256(0, 64)
|
||||
sstore(dataSlot_4, /** @src 0:2272:2299 "balanceOf[sender] -= amount" */ checked_sub_uint256(/** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ sload(/** @src 0:2272:2299 "balanceOf[sender] -= amount" */ dataSlot_4), value_2))
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
let _4 := and(value1, sub(shl(160, 1), 1))
|
||||
mstore(0, _4)
|
||||
mstore(32, 1)
|
||||
let dataSlot_5 := keccak256(0, 64)
|
||||
sstore(dataSlot_5, /** @src 0:2309:2339 "balanceOf[recipient] += amount" */ checked_add_uint256(/** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ sload(/** @src 0:2309:2339 "balanceOf[recipient] += amount" */ dataSlot_5), value_2))
|
||||
/// @src 0:2354:2389 "Transfer(sender, recipient, amount)"
|
||||
let _5 := /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ mload(64)
|
||||
mstore(_5, value_2)
|
||||
/// @src 0:2354:2389 "Transfer(sender, recipient, amount)"
|
||||
log3(_5, /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ 32, /** @src 0:2354:2389 "Transfer(sender, recipient, amount)" */ 0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef, _3, _4)
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
let memPos_3 := mload(64)
|
||||
mstore(memPos_3, 1)
|
||||
return(memPos_3, 32)
|
||||
}
|
||||
case 0x313ce567 {
|
||||
if callvalue() { revert(0, 0) }
|
||||
if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
|
||||
let value_3 := and(sload(/** @src 0:1607:1633 "uint8 public decimals = 18" */ 5), /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ 0xff)
|
||||
let memPos_4 := mload(64)
|
||||
mstore(memPos_4, value_3)
|
||||
return(memPos_4, 32)
|
||||
}
|
||||
case 0x42966c68 {
|
||||
if callvalue() { revert(0, 0) }
|
||||
if slt(add(calldatasize(), not(3)), 32) { revert(0, 0) }
|
||||
let value_4 := calldataload(4)
|
||||
mstore(0, /** @src 0:2655:2665 "msg.sender" */ caller())
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
mstore(32, 1)
|
||||
let dataSlot_6 := keccak256(0, 64)
|
||||
sstore(dataSlot_6, /** @src 0:2645:2676 "balanceOf[msg.sender] -= amount" */ checked_sub_uint256(/** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ sload(/** @src 0:2645:2676 "balanceOf[msg.sender] -= amount" */ dataSlot_6), value_4))
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
sstore(0, /** @src 0:2686:2707 "totalSupply -= amount" */ checked_sub_uint256(/** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ sload(0), /** @src 0:2686:2707 "totalSupply -= amount" */ value_4))
|
||||
/// @src 0:2722:2762 "Transfer(msg.sender, address(0), amount)"
|
||||
let _6 := /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ mload(64)
|
||||
mstore(_6, value_4)
|
||||
/// @src 0:2722:2762 "Transfer(msg.sender, address(0), amount)"
|
||||
log3(_6, /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ 32, /** @src 0:2722:2762 "Transfer(msg.sender, address(0), amount)" */ 0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef, /** @src 0:2655:2665 "msg.sender" */ caller(), /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ 0)
|
||||
return(0, 0)
|
||||
}
|
||||
case 0x70a08231 {
|
||||
if callvalue() { revert(0, 0) }
|
||||
if slt(add(calldatasize(), not(3)), 32) { revert(0, 0) }
|
||||
mstore(0, and(abi_decode_address_3473(), sub(shl(160, 1), 1)))
|
||||
mstore(32, /** @src 0:1407:1448 "mapping(address => uint) public balanceOf" */ 1)
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
let _7 := sload(keccak256(0, 64))
|
||||
let memPos_5 := mload(64)
|
||||
mstore(memPos_5, _7)
|
||||
return(memPos_5, 32)
|
||||
}
|
||||
case 0x95d89b41 {
|
||||
if callvalue() { revert(0, 0) }
|
||||
if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
|
||||
/// @src 0:1569:1601 "string public symbol = \"SOLBYEX\""
|
||||
let value_5 := /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ 0
|
||||
let offset_1 := 0
|
||||
offset_1 := 0
|
||||
let memPtr_1 := mload(64)
|
||||
let ret_1 := 0
|
||||
let slotValue_1 := sload(4)
|
||||
let length_1 := 0
|
||||
length_1 := shr(1, slotValue_1)
|
||||
let outOfPlaceEncoding_1 := and(slotValue_1, 1)
|
||||
if iszero(outOfPlaceEncoding_1)
|
||||
{
|
||||
length_1 := and(length_1, 0x7f)
|
||||
}
|
||||
if eq(outOfPlaceEncoding_1, lt(length_1, 32))
|
||||
{
|
||||
mstore(0, shl(224, 0x4e487b71))
|
||||
mstore(4, 0x22)
|
||||
revert(0, 0x24)
|
||||
}
|
||||
mstore(memPtr_1, length_1)
|
||||
switch outOfPlaceEncoding_1
|
||||
case 0 {
|
||||
mstore(add(memPtr_1, 32), and(slotValue_1, not(255)))
|
||||
ret_1 := add(add(memPtr_1, shl(5, iszero(iszero(length_1)))), 32)
|
||||
}
|
||||
case 1 {
|
||||
mstore(0, 4)
|
||||
let dataPos_1 := keccak256(0, 32)
|
||||
let i_1 := 0
|
||||
for { } lt(i_1, length_1) { i_1 := add(i_1, 32) }
|
||||
{
|
||||
mstore(add(add(memPtr_1, i_1), 32), sload(dataPos_1))
|
||||
dataPos_1 := add(dataPos_1, 1)
|
||||
}
|
||||
ret_1 := add(add(memPtr_1, i_1), 32)
|
||||
}
|
||||
let newFreePtr_1 := add(memPtr_1, and(add(sub(ret_1, memPtr_1), 31), not(31)))
|
||||
if or(gt(newFreePtr_1, 0xffffffffffffffff), lt(newFreePtr_1, memPtr_1))
|
||||
{
|
||||
mstore(0, shl(224, 0x4e487b71))
|
||||
mstore(4, 0x41)
|
||||
revert(0, 0x24)
|
||||
}
|
||||
mstore(64, newFreePtr_1)
|
||||
value_5 := memPtr_1
|
||||
let memPos_6 := mload(64)
|
||||
return(memPos_6, sub(abi_encode_string(memPos_6, memPtr_1), memPos_6))
|
||||
}
|
||||
case 0xa0712d68 {
|
||||
if callvalue() { revert(0, 0) }
|
||||
if slt(add(calldatasize(), not(3)), 32) { revert(0, 0) }
|
||||
let value_6 := calldataload(4)
|
||||
mstore(0, /** @src 0:2479:2489 "msg.sender" */ caller())
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
mstore(32, 1)
|
||||
let dataSlot_7 := keccak256(0, 64)
|
||||
sstore(dataSlot_7, /** @src 0:2469:2500 "balanceOf[msg.sender] += amount" */ checked_add_uint256(/** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ sload(/** @src 0:2469:2500 "balanceOf[msg.sender] += amount" */ dataSlot_7), value_6))
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
sstore(0, /** @src 0:2510:2531 "totalSupply += amount" */ checked_add_uint256(/** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ sload(0), /** @src 0:2510:2531 "totalSupply += amount" */ value_6))
|
||||
/// @src 0:2546:2586 "Transfer(address(0), msg.sender, amount)"
|
||||
let _8 := /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ mload(64)
|
||||
mstore(_8, value_6)
|
||||
/// @src 0:2546:2586 "Transfer(address(0), msg.sender, amount)"
|
||||
log3(_8, /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ 32, /** @src 0:2546:2586 "Transfer(address(0), msg.sender, amount)" */ 0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef, /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ 0, /** @src 0:2479:2489 "msg.sender" */ caller())
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
return(0, 0)
|
||||
}
|
||||
case 0xa9059cbb {
|
||||
if callvalue() { revert(0, 0) }
|
||||
if slt(add(calldatasize(), not(3)), 64) { revert(0, 0) }
|
||||
let value0_2 := abi_decode_address_3473()
|
||||
let value_7 := calldataload(36)
|
||||
mstore(0, /** @src 0:1734:1744 "msg.sender" */ caller())
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
mstore(32, 1)
|
||||
let dataSlot_8 := keccak256(0, 64)
|
||||
sstore(dataSlot_8, /** @src 0:1724:1755 "balanceOf[msg.sender] -= amount" */ checked_sub_uint256(/** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ sload(/** @src 0:1724:1755 "balanceOf[msg.sender] -= amount" */ dataSlot_8), value_7))
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
let _9 := and(value0_2, sub(shl(160, 1), 1))
|
||||
mstore(0, _9)
|
||||
mstore(32, 1)
|
||||
let dataSlot_9 := keccak256(0, 64)
|
||||
sstore(dataSlot_9, /** @src 0:1765:1795 "balanceOf[recipient] += amount" */ checked_add_uint256(/** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ sload(/** @src 0:1765:1795 "balanceOf[recipient] += amount" */ dataSlot_9), value_7))
|
||||
/// @src 0:1810:1849 "Transfer(msg.sender, recipient, amount)"
|
||||
let _10 := /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ mload(64)
|
||||
mstore(_10, value_7)
|
||||
/// @src 0:1810:1849 "Transfer(msg.sender, recipient, amount)"
|
||||
log3(_10, /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ 32, /** @src 0:1810:1849 "Transfer(msg.sender, recipient, amount)" */ 0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef, /** @src 0:1734:1744 "msg.sender" */ caller(), /** @src 0:1810:1849 "Transfer(msg.sender, recipient, amount)" */ _9)
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
let memPos_7 := mload(64)
|
||||
mstore(memPos_7, 1)
|
||||
return(memPos_7, 32)
|
||||
}
|
||||
case 0xdd62ed3e {
|
||||
if callvalue() { revert(0, 0) }
|
||||
if slt(add(calldatasize(), not(3)), 64) { revert(0, 0) }
|
||||
let value0_3 := abi_decode_address_3473()
|
||||
let value1_1 := abi_decode_address()
|
||||
mstore(0, and(value0_3, sub(shl(160, 1), 1)))
|
||||
mstore(32, /** @src 0:1454:1515 "mapping(address => mapping(address => uint)) public allowance" */ 2)
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
let dataSlot_10 := keccak256(0, 64)
|
||||
/// @src 0:1454:1515 "mapping(address => mapping(address => uint)) public allowance"
|
||||
let dataSlot_11 := /** @src -1:-1:-1 */ 0
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
mstore(/** @src -1:-1:-1 */ 0, /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ and(/** @src 0:1454:1515 "mapping(address => mapping(address => uint)) public allowance" */ value1_1, /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ sub(shl(160, 1), 1)))
|
||||
mstore(0x20, /** @src 0:1454:1515 "mapping(address => mapping(address => uint)) public allowance" */ dataSlot_10)
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
dataSlot_11 := keccak256(/** @src -1:-1:-1 */ 0, /** @src 0:1347:2771 "contract ERC20 is IERC20 {..." */ 0x40)
|
||||
let _11 := sload(/** @src 0:1454:1515 "mapping(address => mapping(address => uint)) public allowance" */ dataSlot_11)
|
||||
/// @src 0:1347:2771 "contract ERC20 is IERC20 {..."
|
||||
let memPos_8 := mload(64)
|
||||
mstore(memPos_8, _11)
|
||||
return(memPos_8, 32)
|
||||
}
|
||||
}
|
||||
revert(0, 0)
|
||||
}
|
||||
function abi_encode_string(headStart, value0) -> tail
|
||||
{
|
||||
mstore(headStart, 32)
|
||||
let length := mload(value0)
|
||||
mstore(add(headStart, 32), length)
|
||||
mcopy(add(headStart, 64), add(value0, 32), length)
|
||||
mstore(add(add(headStart, length), 64), 0)
|
||||
tail := add(add(headStart, and(add(length, 31), not(31))), 64)
|
||||
}
|
||||
function abi_decode_address_3473() -> value
|
||||
{
|
||||
value := calldataload(4)
|
||||
if iszero(eq(value, and(value, sub(shl(160, 1), 1)))) { revert(0, 0) }
|
||||
}
|
||||
function abi_decode_address() -> value
|
||||
{
|
||||
value := calldataload(36)
|
||||
if iszero(eq(value, and(value, sub(shl(160, 1), 1)))) { revert(0, 0) }
|
||||
}
|
||||
function checked_sub_uint256(x, y) -> diff
|
||||
{
|
||||
diff := sub(x, y)
|
||||
if gt(diff, x)
|
||||
{
|
||||
mstore(0, shl(224, 0x4e487b71))
|
||||
mstore(4, 0x11)
|
||||
revert(0, 0x24)
|
||||
}
|
||||
}
|
||||
function checked_add_uint256(x, y) -> sum
|
||||
{
|
||||
sum := add(x, y)
|
||||
if gt(x, sum)
|
||||
{
|
||||
mstore(0, shl(224, 0x4e487b71))
|
||||
mstore(4, 0x11)
|
||||
revert(0, 0x24)
|
||||
}
|
||||
}
|
||||
}
|
||||
data ".metadata" hex"a264697066735822122050b3876a7c06489a119481ba2b8611bfb9d92d0624a61503d2b86a77af8e277164736f6c634300081c0033"
|
||||
}
|
||||
}"#;
|
||||
|
||||
/// Parsing the output of the print visitor as a basic integration test.
|
||||
#[test]
|
||||
fn print_visitor_works() {
|
||||
let mut printer = Printer::default();
|
||||
Object::parse(&mut Lexer::new(ERC20.into()), None)
|
||||
.unwrap()
|
||||
.accept(&mut printer);
|
||||
|
||||
let mut printer2 = Printer::default();
|
||||
Object::parse(&mut Lexer::new(printer.buffer.clone()), None)
|
||||
.unwrap()
|
||||
.accept(&mut printer2);
|
||||
|
||||
assert_eq!(
|
||||
printer.buffer, printer2.buffer,
|
||||
"the output from the printers must converge immediately"
|
||||
);
|
||||
|
||||
assert!(
|
||||
!printer.buffer.is_empty(),
|
||||
"the printer must produce output"
|
||||
);
|
||||
}
|
||||
}
|
||||
Generated
+3291
-3
File diff suppressed because it is too large
Load Diff
@@ -2,12 +2,14 @@
|
||||
"name": "root",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"test:cli": "npm run test -w crates/resolc/src/tests/cli-tests",
|
||||
"test:wasm": "npm run test:node -w js/emscripten",
|
||||
"build:package": "npm run build:package -w js/emscripten",
|
||||
"lint": "npx eslint 'js/**/*.{cjs,mjs,ts}' && npx prettier --check '**/*.{mjs,cjs,ts}'",
|
||||
"lint:fix": "npx prettier --write '**/*.{mjs,cjs,ts}'"
|
||||
},
|
||||
"workspaces": [
|
||||
"crates/resolc/src/tests/cli-tests",
|
||||
"js/emscripten",
|
||||
"js/resolc"
|
||||
],
|
||||
|
||||
Reference in New Issue
Block a user