hotfix js bug, v0.3.6

README.md

@@ -294,7 +294,7 @@ See [examples](./examples) for more
 
 See [benchmark/README.md](./benchmark/) for the methodology and commands to reproduce these results
 
-<i>versions: evmole v0.3.5; <a href="https://github.com/shazow/whatsabi">whatsabi</a> v0.12.0; <a href="https://github.com/acuarica/evm">sevm</a> v0.6.17; <a href="https://github.com/g00dv1n/evm-hound-rs">evm-hound-rs</a> v0.1.4; <a href="https://github.com/Jon-Becker/heimdall-rs">heimdall-rs</a> v0.7.3</i>
+<i>versions: evmole v0.3.6; <a href="https://github.com/shazow/whatsabi">whatsabi</a> v0.12.0; <a href="https://github.com/acuarica/evm">sevm</a> v0.6.17; <a href="https://github.com/g00dv1n/evm-hound-rs">evm-hound-rs</a> v0.1.4; <a href="https://github.com/Jon-Becker/heimdall-rs">heimdall-rs</a> v0.7.3</i>
 
 <sup>(*)</sup>: <b>sevm</b> and <b>heimdall-rs</b> are full decompilers, not limited to extracting function selectors
 

dev.sh

@@ -4,11 +4,14 @@ DS=$2
 
 BDIR=`pwd`/benchmark
 
+# MODE=selectors
+MODE=arguments
+
 case $1 in
     js)
         ln -s `pwd`/js ${BDIR}/providers/evmole-js 2>/dev/null || true
         node ${BDIR}/providers/evmole-js/main.mjs \
-            arguments \
+            ${MODE} \
             ${BDIR}/datasets/${2} \
             out.json \
             ${BDIR}/results/etherscan.selectors_${2}.json \
@@ -21,7 +24,7 @@ case $1 in
         cargo run \
             --manifest-path benchmark/providers/evmole-rs/Cargo.toml \
             --features "evmole/trace" \
-            arguments \
+            ${MODE} \
             ${BDIR}/datasets/${2} \
             out.json \
             ${BDIR}/results/etherscan.selectors_${2}.json \
@@ -33,7 +36,7 @@ case $1 in
         PYTHONPATH=`pwd` \
             python3.12 \
             ${BDIR}/providers/evmole-py/main.py \
-            arguments \
+            ${MODE} \
             ${BDIR}/datasets/${2} \
             out.json \
             ${BDIR}/results/etherscan.selectors_${2}.json \

js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evmole",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "description": "Extracts function selectors and arguments from EVM bytecode",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",

js/src/arguments.js

@@ -351,7 +351,13 @@ export function functionArguments(code, selector, gas_limit = 5e4) {
 
             const E256M1 = (1n << 256n) - 1n
 
-            if (rl.offset == 0 && rl.add_val == 0 && rl.path.length != 0 && uint8ArrayToBigInt(r.data) === 0n && ot_val == E256M1) {
+            if (
+              rl.offset == 0 &&
+              rl.add_val == 0 &&
+              rl.path.length != 0 &&
+              uint8ArrayToBigInt(r.data) === 0n &&
+              ot_val == E256M1
+            ) {
               vm.stack.peek().data = bigIntToUint8Array(0n)
             }
             const add = (ot_val + BigInt(rl.add_val)) & E256M1

js/src/selectors.js

@@ -9,6 +9,7 @@ function process(vm, gasLimit) {
   let gasUsed = 0
 
   while (!vm.stopped) {
+    // console.log('selectors', selectors)
     // console.log(vm.toString())
     let ret
     try {
@@ -82,9 +83,12 @@ function process(vm, gasLimit) {
           const p = vm.stack.peek()
           if (p.data.slice(-4).every((v, i) => v === vm.calldata.data[i])) {
             p.label = 'signature'
-          } else if (r1.label === 'mulsig') {
+          } else {
             p.label = 'mulsig'
           }
+        } else if (r1.label === 'mulsig') {
+          const p = vm.stack.peek()
+          p.label = 'mulsig'
         }
         break
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "evmole"
-version = "0.3.5"
+version = "0.3.6"
 description = "Extracts function selectors and arguments from EVM bytecode"
 authors = ["Maxim Andreev <[email protected]>"]
 license = "MIT"

rust/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "evmole"
-version = "0.3.5"
+version = "0.3.6"
 edition = "2021"
 description = "Extracts function selectors and arguments from EVM bytecode"
 authors = ["Maxim Andreev <[email protected]>"]