From 673b2a5bda9a6b132095b6a664606a7876146261 Mon Sep 17 00:00:00 2001
From: brockelmore <31553173+brockelmore@users.noreply.github.com>
Date: Fri, 21 Jun 2024 09:26:30 -0700
Subject: [PATCH] Restructure entire repo (#71)
* init restructure
* more restructuring
* range improvements
* dynamic -> reference refactor
* more restructing
* fix up some Cargo.toml's and delete old stuff
* graph improvements
* docs
* resolve cyclic package deps
* progress on moving structure over
* bring range into graph, get graph and analyzers compiling
* fix up solc-expressions
* pyrometer lib compiling
* its alive
* move tests
* lint
* Change storagelocation to include block and msg + fix benches
* lint
* fix mermaid graph
* lint
* fix issue 69
Cleans up wrapping subtraction and when an assign occurs, the assignee inherits tmp_of from assignor
* lint
* fix issue 66
When referencing a variable in yul, if the variable is memory based, convert it into the memory offset
* improve mistyped variable name error
* lint
* fixes #51
We were creating a recursive range, this fixes that by removing calls to `update_deps` which was pointless anyways
* lint
* fix #50
* lint
* performance improvements
* lint
* cleanup
* lint
* remove profile.json
* member access restructure
* lint
* rearchitect intrinsic calls
* lint
* improve error messages
* mostly documentation and some reorg
* split statement and expression parsers
* lint
* fully refactor dynamic types
adds rangeops for dynamic types
* works but needs perf improvement
* lint
* recursive caching
* refactor function call
* fixes
* higher support, still slow - need to convert ranges to arena style
* small fix
* add non-useful arena
* init arena
* arena works
* more arena work
* fix binop
* fix cast
* remove debug print
* lint
* simple pure func joining
* lint
* fix returns in pure func joins
* lint
* perf improvements
* dunno
* perf
* lint
* dl fix
* lint
* dl fix2
* lint
* fix(ranges): Clean up range executions (#76)
* idk
* lint
* begin range refactor
* lint
* add range exec tests
* lint
* more refactor
* lint
* refactor range execution
* lint
* further refactor of range exec
* more range work
* lint
* more tests
* lint
* remove commented code
* MOAR: mother of all refactors
* lint
* more improvements
* lint
---
.gitignore | 3 +-
Cargo.lock | 1014 ++++----
Cargo.toml | 96 +-
LICENSE | 674 -----
LICENSE-APACHE | 187 ++
LICENSE-MIT | 20 +
TODO.md | 2 +-
cli/Cargo.lock | 1616 ------------
cli/Cargo.toml | 23 -
crates/analyzers/Cargo.toml | 18 +
.../analyzers/src}/bounds.rs | 97 +-
.../analyzers/src}/func_analyzer/mod.rs | 87 +-
.../src}/func_analyzer/report_display.rs | 57 +-
.../mod.rs => crates/analyzers/src/lib.rs | 38 +-
.../analyzers/src}/var_analyzer/mod.rs | 100 +-
.../src}/var_analyzer/report_display.rs | 61 +-
crates/cli/Cargo.toml | 37 +
{cli => crates/cli}/src/main.rs | 292 ++-
crates/graph/Cargo.toml | 27 +
crates/graph/src/graph_elements.rs | 423 +++
crates/graph/src/lib.rs | 10 +
{shared => crates/graph}/src/nodes/block.rs | 23 +-
crates/graph/src/nodes/builtin.rs | 531 ++++
.../graph}/src/nodes/concrete.rs | 336 ++-
crates/graph/src/nodes/context/context_tys.rs | 88 +
.../graph/src/nodes}/context/expr_ret.rs | 79 +-
crates/graph/src/nodes/context/mod.rs | 18 +
crates/graph/src/nodes/context/node.rs | 141 +
crates/graph/src/nodes/context/querying.rs | 254 ++
crates/graph/src/nodes/context/solving.rs | 160 ++
crates/graph/src/nodes/context/typing.rs | 88 +
crates/graph/src/nodes/context/underlying.rs | 331 +++
crates/graph/src/nodes/context/var/mod.rs | 8 +
crates/graph/src/nodes/context/var/node.rs | 422 +++
crates/graph/src/nodes/context/var/ranging.rs | 450 ++++
crates/graph/src/nodes/context/var/typing.rs | 614 +++++
.../graph/src/nodes/context/var/underlying.rs | 720 ++++++
.../graph/src/nodes/context/var/versioning.rs | 237 ++
crates/graph/src/nodes/context/variables.rs | 323 +++
crates/graph/src/nodes/context/versioning.rs | 533 ++++
.../graph}/src/nodes/contract_ty.rs | 172 +-
{shared => crates/graph}/src/nodes/enum_ty.rs | 33 +-
{shared => crates/graph}/src/nodes/err_ty.rs | 26 +-
{shared => crates/graph}/src/nodes/func_ty.rs | 329 ++-
crates/graph/src/nodes/mod.rs | 41 +
{shared => crates/graph}/src/nodes/msg.rs | 35 +-
crates/graph/src/nodes/source_unit.rs | 146 ++
crates/graph/src/nodes/source_unit_part.rs | 151 ++
.../graph}/src/nodes/struct_ty.rs | 65 +-
{shared => crates/graph}/src/nodes/ty_ty.rs | 34 +-
{shared => crates/graph}/src/nodes/var_ty.rs | 83 +-
crates/graph/src/range/elem/concrete.rs | 284 +++
.../graph/src/range/elem/elem_enum/arena.rs | 216 ++
.../graph/src/range/elem/elem_enum/impls.rs | 686 +++++
crates/graph/src/range/elem/elem_enum/mod.rs | 28 +
crates/graph/src/range/elem/elem_enum/ops.rs | 93 +
.../src/range/elem/elem_enum/range_elem.rs | 617 +++++
.../graph/src/range/elem/elem_enum/traits.rs | 114 +
crates/graph/src/range/elem/elem_trait.rs | 126 +
crates/graph/src/range/elem/expr/collapse.rs | 633 +++++
crates/graph/src/range/elem/expr/mod.rs | 728 ++++++
.../graph/src/range/elem/expr/simplify/add.rs | 162 ++
.../graph/src/range/elem/expr/simplify/mod.rs | 55 +
.../src/range/elem/expr/simplify/ords.rs | 122 +
.../graph/src/range/elem/expr/simplify/sub.rs | 177 ++
crates/graph/src/range/elem/map_or_array.rs | 668 +++++
.../graph/src/range/elem/mod.rs | 174 +-
crates/graph/src/range/elem/reference.rs | 468 ++++
crates/graph/src/range/exec/bitwise.rs | 816 ++++++
crates/graph/src/range/exec/cast.rs | 262 ++
crates/graph/src/range/exec/exec_op.rs | 454 ++++
crates/graph/src/range/exec/math_ops/add.rs | 569 +++++
crates/graph/src/range/exec/math_ops/div.rs | 494 ++++
crates/graph/src/range/exec/math_ops/exp.rs | 201 ++
crates/graph/src/range/exec/math_ops/mod.rs | 12 +
.../graph/src/range/exec/math_ops/modulo.rs | 329 +++
crates/graph/src/range/exec/math_ops/mul.rs | 507 ++++
crates/graph/src/range/exec/math_ops/sub.rs | 567 +++++
crates/graph/src/range/exec/max.rs | 82 +
crates/graph/src/range/exec/mem_ops/concat.rs | 318 +++
.../graph/src/range/exec/mem_ops/mem_get.rs | 409 +++
.../graph/src/range/exec/mem_ops/mem_set.rs | 427 ++++
.../graph/src/range/exec/mem_ops/memcopy.rs | 25 +
crates/graph/src/range/exec/mem_ops/mod.rs | 9 +
crates/graph/src/range/exec/min.rs | 90 +
crates/graph/src/range/exec/mod.rs | 29 +
crates/graph/src/range/exec/shift.rs | 213 ++
.../src/range/exec/truthy_ops/logical.rs | 145 ++
crates/graph/src/range/exec/truthy_ops/mod.rs | 5 +
crates/graph/src/range/exec/truthy_ops/ord.rs | 333 +++
crates/graph/src/range/exec_traits.rs | 183 ++
crates/graph/src/range/mod.rs | 20 +
.../graph}/src/range/range_string.rs | 203 +-
crates/graph/src/range/range_trait.rs | 134 +
crates/graph/src/range/solc_range.rs | 887 +++++++
crates/graph/src/solvers/atoms.rs | 430 ++++
crates/graph/src/solvers/brute.rs | 941 +++++++
crates/graph/src/solvers/dl.rs | 1215 +++++++++
crates/graph/src/solvers/mod.rs | 6 +
crates/graph/src/var_type.rs | 821 ++++++
crates/pyrometer/Cargo.toml | 36 +
.../pyrometer/benches}/README.md | 0
.../pyrometer/benches}/flamegraphs/parse.svg | 0
.../pyrometer/benches}/parse.rs | 43 +-
crates/pyrometer/src/analyzer.rs | 1452 +++++++++++
crates/pyrometer/src/analyzer_backend.rs | 279 ++
{src => crates/pyrometer/src}/builtin_fns.rs | 17 +-
crates/pyrometer/src/graph_backend.rs | 698 +++++
crates/pyrometer/src/lib.rs | 6 +
.../tests}/benches/flat_comptroller.sol | 0
.../pyrometer/tests}/benches/flat_ctoken.sol | 0
.../pyrometer/tests}/challenges/apron.sol | 10 +-
.../tests}/challenges/func_stress.sol | 0
.../challenges/reverse_bound_propogation.sol | 0
crates/pyrometer/tests/helpers.rs | 112 +
.../pyrometer/tests}/no_killed_ctxs.rs | 15 +-
.../pyrometer/tests}/test_data/abstract.sol | 0
.../pyrometer/tests}/test_data/assembly.sol | 0
.../pyrometer/tests}/test_data/bitwise.sol | 2 +-
.../pyrometer/tests}/test_data/cast.sol | 24 +-
.../pyrometer/tests}/test_data/const_var.sol | 2 +-
.../tests}/test_data/constructor.sol | 4 +-
.../pyrometer/tests/test_data/dyn_types.sol | 81 +
.../pyrometer/tests}/test_data/env.sol | 0
.../tests}/test_data/func_override.sol | 0
.../tests}/test_data/function_calls.sol | 0
.../pyrometer/tests}/test_data/interface.sol | 0
.../pyrometer/tests}/test_data/intrinsics.sol | 3 +-
crates/pyrometer/tests/test_data/join.sol | 35 +
.../pyrometer/tests}/test_data/logical.sol | 0
crates/pyrometer/tests/test_data/loops.sol | 59 +
.../pyrometer/tests}/test_data/math.sol | 142 +-
.../pyrometer/tests}/test_data/modifier.sol | 13 +-
.../tests}/test_data/named_func_call.sol | 0
.../pyrometer/tests}/test_data/precedence.sol | 0
.../relative_imports/relative_import.sol | 0
.../tests}/test_data/remapping_import.sol | 0
.../pyrometer/tests}/test_data/remappings.txt | 0
.../tests/test_data/repros/issue50.sol | 12 +
.../tests/test_data/repros/issue66.sol | 14 +
.../tests/test_data/repros/issue69.sol | 19 +
.../tests/test_data/repros/overflow.sol | 37 +
.../tests/test_data/repros/overflow2.sol | 25 +
.../pyrometer/tests}/test_data/require.sol | 4 -
.../pyrometer/tests}/test_data/storage.sol | 2 +-
.../pyrometer/tests}/test_data/using.sol | 0
.../pyrometer/tests/test_data/viz/basic.sol | 12 +
.../tests/test_data/viz/func_call.sol | 32 +
crates/queries/Cargo.toml | 22 +
crates/queries/src/lib.rs | 1 +
crates/shared/Cargo.toml | 20 +
crates/shared/src/analyzer_like.rs | 186 ++
crates/shared/src/gas.rs | 12 +
crates/shared/src/graph_like.rs | 188 ++
crates/shared/src/lib.rs | 39 +
crates/shared/src/mermaidConfig.json | 3 +
crates/shared/src/search.rs | 605 +++++
crates/solc-expressions/Cargo.toml | 25 +
crates/solc-expressions/src/array.rs | 485 ++++
crates/solc-expressions/src/assign.rs | 269 ++
crates/solc-expressions/src/bin_op.rs | 747 ++++++
.../solc-expressions/src}/cmp.rs | 283 ++-
.../solc-expressions/src}/cond_op.rs | 138 +-
.../src/context_builder/expr.rs | 436 ++++
.../src/context_builder/fn_calls.rs | 322 +++
.../src/context_builder/mod.rs | 206 ++
.../src/context_builder/stmt.rs | 572 +++++
.../solc-expressions/src}/env.rs | 60 +-
.../src/func_call/func_caller.rs | 608 +++++
.../solc-expressions/src/func_call/helper.rs | 630 +++++
.../src/func_call/internal_call.rs | 335 +++
.../src/func_call/intrinsic_call/abi.rs | 135 +
.../src/func_call/intrinsic_call/address.rs | 80 +
.../src/func_call/intrinsic_call/array.rs | 357 +++
.../src/func_call/intrinsic_call/block.rs | 61 +
.../func_call/intrinsic_call/constructors.rs | 225 ++
.../func_call/intrinsic_call/dyn_builtin.rs | 265 ++
.../intrinsic_call/intrinsic_caller.rs | 320 +++
.../src/func_call/intrinsic_call/mod.rs | 24 +
.../src/func_call/intrinsic_call/msg.rs | 45 +
.../func_call/intrinsic_call/precompile.rs | 206 ++
.../src/func_call/intrinsic_call/solidity.rs | 130 +
.../src/func_call/intrinsic_call/types.rs | 228 ++
crates/solc-expressions/src/func_call/join.rs | 661 +++++
crates/solc-expressions/src/func_call/mod.rs | 7 +
.../src/func_call/modifier.rs | 283 +++
.../src/func_call/namespaced_call.rs | 555 ++++
.../solc-expressions/src/lib.rs | 96 +-
.../solc-expressions/src}/list.rs | 89 +-
.../solc-expressions/src}/literal.rs | 66 +-
.../solc-expressions/src}/loops.rs | 66 +-
.../src/member_access/builtin_access.rs | 298 +++
.../src/member_access/contract_access.rs | 164 ++
.../src/member_access/enum_access.rs | 57 +
.../src/member_access/func_access.rs | 0
.../src/member_access/library_access.rs | 66 +
.../src/member_access/list_access.rs | 299 +++
.../src/member_access/member_trait.rs | 330 +++
.../solc-expressions/src/member_access/mod.rs | 18 +
.../src/member_access/struct_access.rs | 74 +
.../src/pre_post_in_decrement.rs | 226 ++
.../solc-expressions/src}/require.rs | 1047 +++++---
crates/solc-expressions/src/variable.rs | 525 ++++
crates/solc-expressions/src/yul/mod.rs | 8 +
.../solc-expressions/src/yul/yul_builder.rs | 470 ++++
.../solc-expressions/src}/yul/yul_cond_op.rs | 207 +-
.../solc-expressions/src}/yul/yul_funcs.rs | 451 ++--
shared/Cargo.lock | 1427 -----------
shared/Cargo.toml | 15 -
shared/src/analyzer.rs | 810 ------
shared/src/context/mod.rs | 1663 ------------
shared/src/context/var.rs | 1506 -----------
shared/src/lib.rs | 136 -
shared/src/nodes/mod.rs | 1189 ---------
shared/src/range/elem_ty.rs | 2258 -----------------
shared/src/range/mod.rs | 749 ------
shared/src/range/range_ops.rs | 1792 -------------
src/context/exprs/array.rs | 183 --
src/context/exprs/bin_op.rs | 797 ------
src/context/exprs/member_access.rs | 1092 --------
src/context/exprs/variable.rs | 135 -
src/context/func_call/internal_call.rs | 287 ---
src/context/func_call/intrinsic_call.rs | 1060 --------
src/context/func_call/mod.rs | 1174 ---------
src/context/func_call/modifier.rs | 34 -
src/context/func_call/namespaced_call.rs | 372 ---
src/context/mod.rs | 1537 -----------
src/context/queries/mod.rs | 2 -
src/context/queries/storage_write/access.rs | 93 -
src/context/queries/storage_write/mod.rs | 5 -
src/context/queries/storage_write/target.rs | 156 --
src/context/queries/taint.rs | 68 -
src/context/yul/mod.rs | 343 ---
src/lib.rs | 1134 ---------
tests/helpers.rs | 84 -
tests/test_data/dyn_types.sol | 41 -
tests/test_data/loops.sol | 31 -
237 files changed, 40951 insertions(+), 24583 deletions(-)
delete mode 100644 LICENSE
create mode 100644 LICENSE-APACHE
create mode 100644 LICENSE-MIT
delete mode 100644 cli/Cargo.lock
delete mode 100644 cli/Cargo.toml
create mode 100644 crates/analyzers/Cargo.toml
rename {src/context/analyzers => crates/analyzers/src}/bounds.rs (77%)
rename {src/context/analyzers => crates/analyzers/src}/func_analyzer/mod.rs (87%)
rename {src/context/analyzers => crates/analyzers/src}/func_analyzer/report_display.rs (59%)
rename src/context/analyzers/mod.rs => crates/analyzers/src/lib.rs (79%)
rename {src/context/analyzers => crates/analyzers/src}/var_analyzer/mod.rs (73%)
rename {src/context/analyzers => crates/analyzers/src}/var_analyzer/report_display.rs (59%)
create mode 100644 crates/cli/Cargo.toml
rename {cli => crates/cli}/src/main.rs (54%)
create mode 100644 crates/graph/Cargo.toml
create mode 100644 crates/graph/src/graph_elements.rs
create mode 100644 crates/graph/src/lib.rs
rename {shared => crates/graph}/src/nodes/block.rs (73%)
create mode 100644 crates/graph/src/nodes/builtin.rs
rename {shared => crates/graph}/src/nodes/concrete.rs (71%)
create mode 100644 crates/graph/src/nodes/context/context_tys.rs
rename {shared/src => crates/graph/src/nodes}/context/expr_ret.rs (71%)
create mode 100644 crates/graph/src/nodes/context/mod.rs
create mode 100644 crates/graph/src/nodes/context/node.rs
create mode 100644 crates/graph/src/nodes/context/querying.rs
create mode 100644 crates/graph/src/nodes/context/solving.rs
create mode 100644 crates/graph/src/nodes/context/typing.rs
create mode 100644 crates/graph/src/nodes/context/underlying.rs
create mode 100644 crates/graph/src/nodes/context/var/mod.rs
create mode 100644 crates/graph/src/nodes/context/var/node.rs
create mode 100644 crates/graph/src/nodes/context/var/ranging.rs
create mode 100644 crates/graph/src/nodes/context/var/typing.rs
create mode 100644 crates/graph/src/nodes/context/var/underlying.rs
create mode 100644 crates/graph/src/nodes/context/var/versioning.rs
create mode 100644 crates/graph/src/nodes/context/variables.rs
create mode 100644 crates/graph/src/nodes/context/versioning.rs
rename {shared => crates/graph}/src/nodes/contract_ty.rs (58%)
rename {shared => crates/graph}/src/nodes/enum_ty.rs (78%)
rename {shared => crates/graph}/src/nodes/err_ty.rs (74%)
rename {shared => crates/graph}/src/nodes/func_ty.rs (70%)
create mode 100644 crates/graph/src/nodes/mod.rs
rename {shared => crates/graph}/src/nodes/msg.rs (89%)
create mode 100644 crates/graph/src/nodes/source_unit.rs
create mode 100644 crates/graph/src/nodes/source_unit_part.rs
rename {shared => crates/graph}/src/nodes/struct_ty.rs (71%)
rename {shared => crates/graph}/src/nodes/ty_ty.rs (61%)
rename {shared => crates/graph}/src/nodes/var_ty.rs (72%)
create mode 100644 crates/graph/src/range/elem/concrete.rs
create mode 100644 crates/graph/src/range/elem/elem_enum/arena.rs
create mode 100644 crates/graph/src/range/elem/elem_enum/impls.rs
create mode 100644 crates/graph/src/range/elem/elem_enum/mod.rs
create mode 100644 crates/graph/src/range/elem/elem_enum/ops.rs
create mode 100644 crates/graph/src/range/elem/elem_enum/range_elem.rs
create mode 100644 crates/graph/src/range/elem/elem_enum/traits.rs
create mode 100644 crates/graph/src/range/elem/elem_trait.rs
create mode 100644 crates/graph/src/range/elem/expr/collapse.rs
create mode 100644 crates/graph/src/range/elem/expr/mod.rs
create mode 100644 crates/graph/src/range/elem/expr/simplify/add.rs
create mode 100644 crates/graph/src/range/elem/expr/simplify/mod.rs
create mode 100644 crates/graph/src/range/elem/expr/simplify/ords.rs
create mode 100644 crates/graph/src/range/elem/expr/simplify/sub.rs
create mode 100644 crates/graph/src/range/elem/map_or_array.rs
rename shared/src/range/elem.rs => crates/graph/src/range/elem/mod.rs (50%)
create mode 100644 crates/graph/src/range/elem/reference.rs
create mode 100644 crates/graph/src/range/exec/bitwise.rs
create mode 100644 crates/graph/src/range/exec/cast.rs
create mode 100644 crates/graph/src/range/exec/exec_op.rs
create mode 100644 crates/graph/src/range/exec/math_ops/add.rs
create mode 100644 crates/graph/src/range/exec/math_ops/div.rs
create mode 100644 crates/graph/src/range/exec/math_ops/exp.rs
create mode 100644 crates/graph/src/range/exec/math_ops/mod.rs
create mode 100644 crates/graph/src/range/exec/math_ops/modulo.rs
create mode 100644 crates/graph/src/range/exec/math_ops/mul.rs
create mode 100644 crates/graph/src/range/exec/math_ops/sub.rs
create mode 100644 crates/graph/src/range/exec/max.rs
create mode 100644 crates/graph/src/range/exec/mem_ops/concat.rs
create mode 100644 crates/graph/src/range/exec/mem_ops/mem_get.rs
create mode 100644 crates/graph/src/range/exec/mem_ops/mem_set.rs
create mode 100644 crates/graph/src/range/exec/mem_ops/memcopy.rs
create mode 100644 crates/graph/src/range/exec/mem_ops/mod.rs
create mode 100644 crates/graph/src/range/exec/min.rs
create mode 100644 crates/graph/src/range/exec/mod.rs
create mode 100644 crates/graph/src/range/exec/shift.rs
create mode 100644 crates/graph/src/range/exec/truthy_ops/logical.rs
create mode 100644 crates/graph/src/range/exec/truthy_ops/mod.rs
create mode 100644 crates/graph/src/range/exec/truthy_ops/ord.rs
create mode 100644 crates/graph/src/range/exec_traits.rs
create mode 100644 crates/graph/src/range/mod.rs
rename {shared => crates/graph}/src/range/range_string.rs (53%)
create mode 100644 crates/graph/src/range/range_trait.rs
create mode 100644 crates/graph/src/range/solc_range.rs
create mode 100644 crates/graph/src/solvers/atoms.rs
create mode 100644 crates/graph/src/solvers/brute.rs
create mode 100644 crates/graph/src/solvers/dl.rs
create mode 100644 crates/graph/src/solvers/mod.rs
create mode 100644 crates/graph/src/var_type.rs
create mode 100644 crates/pyrometer/Cargo.toml
rename {benches => crates/pyrometer/benches}/README.md (100%)
rename {benches => crates/pyrometer/benches}/flamegraphs/parse.svg (100%)
rename {benches => crates/pyrometer/benches}/parse.rs (72%)
create mode 100644 crates/pyrometer/src/analyzer.rs
create mode 100644 crates/pyrometer/src/analyzer_backend.rs
rename {src => crates/pyrometer/src}/builtin_fns.rs (98%)
create mode 100644 crates/pyrometer/src/graph_backend.rs
create mode 100644 crates/pyrometer/src/lib.rs
rename {tests => crates/pyrometer/tests}/benches/flat_comptroller.sol (100%)
rename {tests => crates/pyrometer/tests}/benches/flat_ctoken.sol (100%)
rename {tests => crates/pyrometer/tests}/challenges/apron.sol (77%)
rename {tests => crates/pyrometer/tests}/challenges/func_stress.sol (100%)
rename {tests => crates/pyrometer/tests}/challenges/reverse_bound_propogation.sol (100%)
create mode 100644 crates/pyrometer/tests/helpers.rs
rename {tests => crates/pyrometer/tests}/no_killed_ctxs.rs (92%)
rename {tests => crates/pyrometer/tests}/test_data/abstract.sol (100%)
rename {tests => crates/pyrometer/tests}/test_data/assembly.sol (100%)
rename {tests => crates/pyrometer/tests}/test_data/bitwise.sol (99%)
rename {tests => crates/pyrometer/tests}/test_data/cast.sol (94%)
rename {tests => crates/pyrometer/tests}/test_data/const_var.sol (99%)
rename {tests => crates/pyrometer/tests}/test_data/constructor.sol (96%)
create mode 100644 crates/pyrometer/tests/test_data/dyn_types.sol
rename {tests => crates/pyrometer/tests}/test_data/env.sol (100%)
rename {tests => crates/pyrometer/tests}/test_data/func_override.sol (100%)
rename {tests => crates/pyrometer/tests}/test_data/function_calls.sol (100%)
rename {tests => crates/pyrometer/tests}/test_data/interface.sol (100%)
rename {tests => crates/pyrometer/tests}/test_data/intrinsics.sol (98%)
create mode 100644 crates/pyrometer/tests/test_data/join.sol
rename {tests => crates/pyrometer/tests}/test_data/logical.sol (100%)
create mode 100644 crates/pyrometer/tests/test_data/loops.sol
rename {tests => crates/pyrometer/tests}/test_data/math.sol (83%)
rename {tests => crates/pyrometer/tests}/test_data/modifier.sol (89%)
rename {tests => crates/pyrometer/tests}/test_data/named_func_call.sol (100%)
rename {tests => crates/pyrometer/tests}/test_data/precedence.sol (100%)
rename {tests => crates/pyrometer/tests}/test_data/relative_imports/relative_import.sol (100%)
rename {tests => crates/pyrometer/tests}/test_data/remapping_import.sol (100%)
rename {tests => crates/pyrometer/tests}/test_data/remappings.txt (100%)
create mode 100644 crates/pyrometer/tests/test_data/repros/issue50.sol
create mode 100644 crates/pyrometer/tests/test_data/repros/issue66.sol
create mode 100644 crates/pyrometer/tests/test_data/repros/issue69.sol
create mode 100644 crates/pyrometer/tests/test_data/repros/overflow.sol
create mode 100644 crates/pyrometer/tests/test_data/repros/overflow2.sol
rename {tests => crates/pyrometer/tests}/test_data/require.sol (99%)
rename {tests => crates/pyrometer/tests}/test_data/storage.sol (99%)
rename {tests => crates/pyrometer/tests}/test_data/using.sol (100%)
create mode 100644 crates/pyrometer/tests/test_data/viz/basic.sol
create mode 100644 crates/pyrometer/tests/test_data/viz/func_call.sol
create mode 100644 crates/queries/Cargo.toml
create mode 100644 crates/queries/src/lib.rs
create mode 100644 crates/shared/Cargo.toml
create mode 100644 crates/shared/src/analyzer_like.rs
create mode 100644 crates/shared/src/gas.rs
create mode 100644 crates/shared/src/graph_like.rs
create mode 100644 crates/shared/src/lib.rs
create mode 100644 crates/shared/src/mermaidConfig.json
create mode 100644 crates/shared/src/search.rs
create mode 100644 crates/solc-expressions/Cargo.toml
create mode 100644 crates/solc-expressions/src/array.rs
create mode 100644 crates/solc-expressions/src/assign.rs
create mode 100644 crates/solc-expressions/src/bin_op.rs
rename {src/context/exprs => crates/solc-expressions/src}/cmp.rs (70%)
rename {src/context/exprs => crates/solc-expressions/src}/cond_op.rs (58%)
create mode 100644 crates/solc-expressions/src/context_builder/expr.rs
create mode 100644 crates/solc-expressions/src/context_builder/fn_calls.rs
create mode 100644 crates/solc-expressions/src/context_builder/mod.rs
create mode 100644 crates/solc-expressions/src/context_builder/stmt.rs
rename {src/context/exprs => crates/solc-expressions/src}/env.rs (90%)
create mode 100644 crates/solc-expressions/src/func_call/func_caller.rs
create mode 100644 crates/solc-expressions/src/func_call/helper.rs
create mode 100644 crates/solc-expressions/src/func_call/internal_call.rs
create mode 100644 crates/solc-expressions/src/func_call/intrinsic_call/abi.rs
create mode 100644 crates/solc-expressions/src/func_call/intrinsic_call/address.rs
create mode 100644 crates/solc-expressions/src/func_call/intrinsic_call/array.rs
create mode 100644 crates/solc-expressions/src/func_call/intrinsic_call/block.rs
create mode 100644 crates/solc-expressions/src/func_call/intrinsic_call/constructors.rs
create mode 100644 crates/solc-expressions/src/func_call/intrinsic_call/dyn_builtin.rs
create mode 100644 crates/solc-expressions/src/func_call/intrinsic_call/intrinsic_caller.rs
create mode 100644 crates/solc-expressions/src/func_call/intrinsic_call/mod.rs
create mode 100644 crates/solc-expressions/src/func_call/intrinsic_call/msg.rs
create mode 100644 crates/solc-expressions/src/func_call/intrinsic_call/precompile.rs
create mode 100644 crates/solc-expressions/src/func_call/intrinsic_call/solidity.rs
create mode 100644 crates/solc-expressions/src/func_call/intrinsic_call/types.rs
create mode 100644 crates/solc-expressions/src/func_call/join.rs
create mode 100644 crates/solc-expressions/src/func_call/mod.rs
create mode 100644 crates/solc-expressions/src/func_call/modifier.rs
create mode 100644 crates/solc-expressions/src/func_call/namespaced_call.rs
rename src/context/exprs/mod.rs => crates/solc-expressions/src/lib.rs (56%)
rename {src/context/exprs => crates/solc-expressions/src}/list.rs (57%)
rename {src/context/exprs => crates/solc-expressions/src}/literal.rs (83%)
rename {src/context => crates/solc-expressions/src}/loops.rs (56%)
create mode 100644 crates/solc-expressions/src/member_access/builtin_access.rs
create mode 100644 crates/solc-expressions/src/member_access/contract_access.rs
create mode 100644 crates/solc-expressions/src/member_access/enum_access.rs
create mode 100644 crates/solc-expressions/src/member_access/func_access.rs
create mode 100644 crates/solc-expressions/src/member_access/library_access.rs
create mode 100644 crates/solc-expressions/src/member_access/list_access.rs
create mode 100644 crates/solc-expressions/src/member_access/member_trait.rs
create mode 100644 crates/solc-expressions/src/member_access/mod.rs
create mode 100644 crates/solc-expressions/src/member_access/struct_access.rs
create mode 100644 crates/solc-expressions/src/pre_post_in_decrement.rs
rename {src/context/exprs => crates/solc-expressions/src}/require.rs (59%)
create mode 100644 crates/solc-expressions/src/variable.rs
create mode 100644 crates/solc-expressions/src/yul/mod.rs
create mode 100644 crates/solc-expressions/src/yul/yul_builder.rs
rename {src/context => crates/solc-expressions/src}/yul/yul_cond_op.rs (60%)
rename {src/context => crates/solc-expressions/src}/yul/yul_funcs.rs (59%)
delete mode 100644 shared/Cargo.lock
delete mode 100644 shared/Cargo.toml
delete mode 100644 shared/src/analyzer.rs
delete mode 100644 shared/src/context/mod.rs
delete mode 100644 shared/src/context/var.rs
delete mode 100644 shared/src/lib.rs
delete mode 100644 shared/src/nodes/mod.rs
delete mode 100644 shared/src/range/elem_ty.rs
delete mode 100644 shared/src/range/mod.rs
delete mode 100644 shared/src/range/range_ops.rs
delete mode 100644 src/context/exprs/array.rs
delete mode 100644 src/context/exprs/bin_op.rs
delete mode 100644 src/context/exprs/member_access.rs
delete mode 100644 src/context/exprs/variable.rs
delete mode 100644 src/context/func_call/internal_call.rs
delete mode 100644 src/context/func_call/intrinsic_call.rs
delete mode 100644 src/context/func_call/mod.rs
delete mode 100644 src/context/func_call/modifier.rs
delete mode 100644 src/context/func_call/namespaced_call.rs
delete mode 100644 src/context/mod.rs
delete mode 100644 src/context/queries/mod.rs
delete mode 100644 src/context/queries/storage_write/access.rs
delete mode 100644 src/context/queries/storage_write/mod.rs
delete mode 100644 src/context/queries/storage_write/target.rs
delete mode 100644 src/context/queries/taint.rs
delete mode 100644 src/context/yul/mod.rs
delete mode 100644 src/lib.rs
delete mode 100644 tests/helpers.rs
delete mode 100644 tests/test_data/dyn_types.sol
delete mode 100644 tests/test_data/loops.sol
diff --git a/.gitignore b/.gitignore
index 9ba2a3b7..113d56e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+**/profile.json
**/target
**/.DS_Store
**/out
@@ -6,4 +7,4 @@
**/dot.svg
**/dot.dot
**/flamegraph.svg
-**/.swp
\ No newline at end of file
+**/.swp
diff --git a/Cargo.lock b/Cargo.lock
index c89c6964..bd01078d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,15 +2,38 @@
# It is not intended for manual editing.
version = 3
+[[package]]
+name = "ahash"
+version = "0.8.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b79b82693f705137f8fb9b37871d99e4f9a7df12b917eed79c3d3954830a60b"
+dependencies = [
+ "cfg-if",
+ "getrandom",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
[[package]]
name = "aho-corasick"
-version = "0.7.20"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
dependencies = [
"memchr",
]
+[[package]]
+name = "analyzers"
+version = "0.2.0"
+dependencies = [
+ "ariadne",
+ "graph",
+ "shared",
+ "solang-parser",
+]
+
[[package]]
name = "anes"
version = "0.1.6"
@@ -19,42 +42,50 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
[[package]]
name = "anstream"
-version = "0.2.6"
+version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f"
+checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44"
dependencies = [
"anstyle",
"anstyle-parse",
+ "anstyle-query",
"anstyle-wincon",
- "concolor-override",
- "concolor-query",
- "is-terminal",
+ "colorchoice",
"utf8parse",
]
[[package]]
name = "anstyle"
-version = "0.3.5"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2"
+checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
[[package]]
name = "anstyle-parse"
-version = "0.1.1"
+version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116"
+checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
dependencies = [
"utf8parse",
]
+[[package]]
+name = "anstyle-query"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3a318f1f38d2418400f8209655bfd825785afd25aa30bb7ba6cc792e4596748"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
[[package]]
name = "anstyle-wincon"
-version = "0.2.0"
+version = "3.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa"
+checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
dependencies = [
"anstyle",
- "windows-sys 0.45.0",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -68,9 +99,9 @@ dependencies = [
[[package]]
name = "arrayvec"
-version = "0.7.2"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
[[package]]
name = "ascii-canvas"
@@ -94,9 +125,9 @@ dependencies = [
[[package]]
name = "auto_impl"
-version = "1.0.1"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a8c1df849285fbacd587de7818cc7d13be6cd2cbcd47a04fb1801b0e2706e33"
+checksum = "fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89"
dependencies = [
"proc-macro-error",
"proc-macro2",
@@ -143,6 +174,12 @@ version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+[[package]]
+name = "bitflags"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+
[[package]]
name = "bitvec"
version = "1.0.1"
@@ -166,9 +203,9 @@ dependencies = [
[[package]]
name = "bumpalo"
-version = "3.12.0"
+version = "3.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
[[package]]
name = "byte-slice-cast"
@@ -178,15 +215,15 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c"
[[package]]
name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "bytes"
-version = "1.4.0"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
dependencies = [
"serde",
]
@@ -197,12 +234,6 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
-[[package]]
-name = "cc"
-version = "1.0.79"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
-
[[package]]
name = "cfg-if"
version = "1.0.0"
@@ -211,11 +242,10 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chrono"
-version = "0.4.24"
+version = "0.4.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b"
+checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
dependencies = [
- "num-integer",
"num-traits",
]
@@ -252,46 +282,44 @@ version = "3.2.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"clap_lex 0.2.4",
- "indexmap",
+ "indexmap 1.9.3",
"textwrap",
]
[[package]]
name = "clap"
-version = "4.2.1"
+version = "4.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3"
+checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2"
dependencies = [
"clap_builder",
"clap_derive",
- "once_cell",
]
[[package]]
name = "clap_builder"
-version = "4.2.1"
+version = "4.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f"
+checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb"
dependencies = [
"anstream",
"anstyle",
- "bitflags",
- "clap_lex 0.4.1",
+ "clap_lex 0.6.0",
"strsim",
]
[[package]]
name = "clap_derive"
-version = "4.2.0"
+version = "4.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4"
+checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 2.0.13",
+ "syn 2.0.39",
]
[[package]]
@@ -305,49 +333,57 @@ dependencies = [
[[package]]
name = "clap_lex"
-version = "0.4.1"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1"
+checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
[[package]]
name = "cli"
-version = "0.1.0"
+version = "0.2.0"
dependencies = [
+ "analyzers",
"ariadne",
- "clap 4.2.1",
+ "clap 4.4.11",
+ "ethers-core",
+ "graph",
"petgraph",
"pyrometer",
"shared",
"tracing",
"tracing-subscriber",
+ "tracing-tree",
]
[[package]]
-name = "concolor-override"
+name = "colorchoice"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
[[package]]
-name = "concolor-query"
-version = "0.3.3"
+name = "const-hex"
+version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf"
+checksum = "a5104de16b218eddf8e34ffe2f86f74bfa4e61e95a1b89732fccf6325efd0557"
dependencies = [
- "windows-sys 0.45.0",
+ "cfg-if",
+ "cpufeatures",
+ "hex",
+ "proptest",
+ "serde",
]
[[package]]
name = "const-oid"
-version = "0.9.2"
+version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913"
+checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
[[package]]
name = "cpufeatures"
-version = "0.2.6"
+version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181"
+checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0"
dependencies = [
"libc",
]
@@ -388,16 +424,6 @@ dependencies = [
"itertools",
]
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
-]
-
[[package]]
name = "crossbeam-deque"
version = "0.8.3"
@@ -411,9 +437,9 @@ dependencies = [
[[package]]
name = "crossbeam-epoch"
-version = "0.9.14"
+version = "0.9.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695"
+checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
dependencies = [
"autocfg",
"cfg-if",
@@ -424,9 +450,9 @@ dependencies = [
[[package]]
name = "crossbeam-utils"
-version = "0.8.15"
+version = "0.8.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b"
+checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
dependencies = [
"cfg-if",
]
@@ -439,9 +465,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
[[package]]
name = "crypto-bigint"
-version = "0.5.1"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c2538c4e68e52548bacb3e83ac549f903d44f011ac9d5abb5e132e67d0808f7"
+checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
dependencies = [
"generic-array",
"rand_core",
@@ -461,9 +487,9 @@ dependencies = [
[[package]]
name = "der"
-version = "0.7.3"
+version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82b10af9f9f9f2134a42d3f8aa74658660f2e0234b0eb81bd171df8aa32779ed"
+checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c"
dependencies = [
"const-oid",
"zeroize",
@@ -488,9 +514,9 @@ checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
[[package]]
name = "digest"
-version = "0.10.6"
+version = "0.10.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
dependencies = [
"block-buffer",
"const-oid",
@@ -521,28 +547,29 @@ dependencies = [
[[package]]
name = "ecdsa"
-version = "0.16.4"
+version = "0.16.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "106401dadc137d05cb0d4ab4d42be089746aefdfe8992df4d0edcf351c16ddca"
+checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
dependencies = [
"der",
"digest",
"elliptic-curve",
"rfc6979",
"signature",
+ "spki",
]
[[package]]
name = "either"
-version = "1.8.1"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
[[package]]
name = "elliptic-curve"
-version = "0.13.3"
+version = "0.13.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22cdacd4d6ed3f9b98680b679c0e52a823b8a2c7a97358d508fe247f2180c282"
+checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
dependencies = [
"base16ct",
"crypto-bigint",
@@ -567,24 +594,19 @@ dependencies = [
]
[[package]]
-name = "errno"
-version = "0.3.0"
+name = "equivalent"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "windows-sys 0.45.0",
-]
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
+name = "errno"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
dependencies = [
- "cc",
"libc",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -637,18 +659,17 @@ dependencies = [
[[package]]
name = "ethers-core"
-version = "2.0.2"
+version = "2.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40bf114f1017ace0f622f1652f59c2c5e1abfe7d88891cca0c43da979b351de0"
+checksum = "2f03e0bdc216eeb9e355b90cf610ef6c5bb8aca631f97b5ae9980ce34ea7878d"
dependencies = [
"arrayvec",
"bytes",
"chrono",
+ "const-hex",
"elliptic-curve",
"ethabi",
"generic-array",
- "getrandom",
- "hex",
"k256",
"num_enum",
"open-fastrlp",
@@ -665,12 +686,9 @@ dependencies = [
[[package]]
name = "fastrand"
-version = "1.9.0"
+version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
-dependencies = [
- "instant",
-]
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
[[package]]
name = "ff"
@@ -719,15 +737,29 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.2.9"
+version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
+checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
dependencies = [
"cfg-if",
- "js-sys",
"libc",
"wasi",
- "wasm-bindgen",
+]
+
+[[package]]
+name = "graph"
+version = "0.2.0"
+dependencies = [
+ "ethers-core",
+ "hex",
+ "itertools",
+ "lazy_static",
+ "petgraph",
+ "pretty_assertions",
+ "shared",
+ "solang-parser",
+ "tracing",
+ "tracing-subscriber",
]
[[package]]
@@ -753,6 +785,12 @@ version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+[[package]]
+name = "hashbrown"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+
[[package]]
name = "heck"
version = "0.4.1"
@@ -770,18 +808,9 @@ dependencies = [
[[package]]
name = "hermit-abi"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.1"
+version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
[[package]]
name = "hex"
@@ -843,37 +872,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
dependencies = [
"autocfg",
- "hashbrown",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if",
+ "hashbrown 0.12.3",
]
[[package]]
-name = "io-lifetimes"
-version = "1.0.10"
+name = "indexmap"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
+checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
dependencies = [
- "hermit-abi 0.3.1",
- "libc",
- "windows-sys 0.48.0",
+ "equivalent",
+ "hashbrown 0.14.3",
]
[[package]]
name = "is-terminal"
-version = "0.4.7"
+version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
+checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
dependencies = [
- "hermit-abi 0.3.1",
- "io-lifetimes",
+ "hermit-abi 0.3.3",
"rustix",
"windows-sys 0.48.0",
]
@@ -889,24 +907,24 @@ dependencies = [
[[package]]
name = "itoa"
-version = "1.0.6"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
[[package]]
name = "js-sys"
-version = "0.3.63"
+version = "0.3.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790"
+checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca"
dependencies = [
"wasm-bindgen",
]
[[package]]
name = "k256"
-version = "0.13.0"
+version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955890845095ccf31ef83ad41a05aabb4d8cc23dc3cac5a9f5c89cf26dd0da75"
+checksum = "3f01b677d82ef7a676aa37e099defd83a28e15687112cafdd112d60236b6115b"
dependencies = [
"cfg-if",
"ecdsa",
@@ -917,18 +935,28 @@ dependencies = [
[[package]]
name = "keccak"
-version = "0.1.3"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768"
+checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940"
dependencies = [
"cpufeatures",
]
+[[package]]
+name = "keccak-hash"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b286e6b663fb926e1eeb68528e69cb70ed46c6d65871a21b2215ae8154c6d3c"
+dependencies = [
+ "primitive-types",
+ "tiny-keccak",
+]
+
[[package]]
name = "lalrpop"
-version = "0.19.9"
+version = "0.19.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f34313ec00c2eb5c3c87ca6732ea02dcf3af99c3ff7a8fb622ffb99c9d860a87"
+checksum = "0a1cbf952127589f2851ab2046af368fd20645491bb4b376f04b7f94d7a9837b"
dependencies = [
"ascii-canvas",
"bit-set",
@@ -938,9 +966,8 @@ dependencies = [
"itertools",
"lalrpop-util",
"petgraph",
- "pico-args",
"regex",
- "regex-syntax",
+ "regex-syntax 0.6.29",
"string_cache",
"term",
"tiny-keccak",
@@ -949,9 +976,9 @@ dependencies = [
[[package]]
name = "lalrpop-util"
-version = "0.19.9"
+version = "0.19.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5c1f7869c94d214466c5fd432dfed12c379fd87786768d36455892d46b18edd"
+checksum = "d3c48237b9604c5a4702de6b824e02006c3214327564636aef27c1028a8fa0ed"
dependencies = [
"regex",
]
@@ -964,21 +991,38 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
-version = "0.2.141"
+version = "0.2.150"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
+checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
+
+[[package]]
+name = "libm"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+
+[[package]]
+name = "libredox"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
+dependencies = [
+ "bitflags 2.4.1",
+ "libc",
+ "redox_syscall",
+]
[[package]]
name = "linux-raw-sys"
-version = "0.3.1"
+version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f"
+checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"
[[package]]
name = "lock_api"
-version = "0.4.9"
+version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
dependencies = [
"autocfg",
"scopeguard",
@@ -986,12 +1030,9 @@ dependencies = [
[[package]]
name = "log"
-version = "0.4.17"
+version = "0.4.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if",
-]
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
[[package]]
name = "matchers"
@@ -999,20 +1040,20 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
dependencies = [
- "regex-automata",
+ "regex-automata 0.1.10",
]
[[package]]
name = "memchr"
-version = "2.5.0"
+version = "2.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
[[package]]
name = "memoffset"
-version = "0.8.0"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
dependencies = [
"autocfg",
]
@@ -1034,60 +1075,50 @@ dependencies = [
]
[[package]]
-name = "num-integer"
-version = "0.1.45"
+name = "nu-ansi-term"
+version = "0.49.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+checksum = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68"
dependencies = [
- "autocfg",
- "num-traits",
+ "windows-sys 0.48.0",
]
[[package]]
name = "num-traits"
-version = "0.2.15"
+version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
dependencies = [
"autocfg",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
-dependencies = [
- "hermit-abi 0.2.6",
- "libc",
+ "libm",
]
[[package]]
name = "num_enum"
-version = "0.5.11"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+checksum = "683751d591e6d81200c39fb0d1032608b77724f34114db54f571ff1317b337c0"
dependencies = [
"num_enum_derive",
]
[[package]]
name = "num_enum_derive"
-version = "0.5.11"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e"
dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 2.0.1",
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.39",
]
[[package]]
name = "once_cell"
-version = "1.17.1"
+version = "1.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
[[package]]
name = "oorandom"
@@ -1122,9 +1153,9 @@ dependencies = [
[[package]]
name = "os_str_bytes"
-version = "6.5.0"
+version = "6.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267"
+checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
[[package]]
name = "overload"
@@ -1134,9 +1165,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]]
name = "parity-scale-codec"
-version = "3.4.0"
+version = "3.6.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "637935964ff85a605d114591d4d2c13c5d1ba2806dae97cea6bf180238a749ac"
+checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe"
dependencies = [
"arrayvec",
"bitvec",
@@ -1148,11 +1179,11 @@ dependencies = [
[[package]]
name = "parity-scale-codec-derive"
-version = "3.1.4"
+version = "3.6.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b26a931f824dd4eca30b3e43bb4f31cd5f0d3a403c5f5ff27106b805bfde7b"
+checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b"
dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 2.0.1",
"proc-macro2",
"quote",
"syn 1.0.109",
@@ -1170,58 +1201,58 @@ dependencies = [
[[package]]
name = "parking_lot_core"
-version = "0.9.7"
+version = "0.9.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
+checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall 0.2.16",
+ "redox_syscall",
"smallvec",
- "windows-sys 0.45.0",
+ "windows-targets 0.48.5",
]
[[package]]
name = "petgraph"
-version = "0.6.3"
+version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4"
+checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
dependencies = [
"fixedbitset",
- "indexmap",
+ "indexmap 2.1.0",
]
[[package]]
name = "phf"
-version = "0.11.1"
+version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c"
+checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
dependencies = [
"phf_macros",
- "phf_shared 0.11.1",
+ "phf_shared 0.11.2",
]
[[package]]
name = "phf_generator"
-version = "0.11.1"
+version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf"
+checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
dependencies = [
- "phf_shared 0.11.1",
+ "phf_shared 0.11.2",
"rand",
]
[[package]]
name = "phf_macros"
-version = "0.11.1"
+version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66"
+checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
dependencies = [
"phf_generator",
- "phf_shared 0.11.1",
+ "phf_shared 0.11.2",
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.39",
]
[[package]]
@@ -1235,24 +1266,18 @@ dependencies = [
[[package]]
name = "phf_shared"
-version = "0.11.1"
+version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676"
+checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
dependencies = [
"siphasher",
]
-[[package]]
-name = "pico-args"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468"
-
[[package]]
name = "pin-project-lite"
-version = "0.2.9"
+version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
[[package]]
name = "pkcs8"
@@ -1266,9 +1291,9 @@ dependencies = [
[[package]]
name = "plotters"
-version = "0.3.4"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97"
+checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45"
dependencies = [
"num-traits",
"plotters-backend",
@@ -1279,15 +1304,15 @@ dependencies = [
[[package]]
name = "plotters-backend"
-version = "0.3.4"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142"
+checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609"
[[package]]
name = "plotters-svg"
-version = "0.3.3"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f"
+checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab"
dependencies = [
"plotters-backend",
]
@@ -1304,11 +1329,21 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
+[[package]]
+name = "pretty_assertions"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66"
+dependencies = [
+ "diff",
+ "yansi",
+]
+
[[package]]
name = "primitive-types"
-version = "0.12.1"
+version = "0.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66"
+checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2"
dependencies = [
"fixed-hash",
"impl-codec",
@@ -1325,7 +1360,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
dependencies = [
"once_cell",
- "toml_edit",
+ "toml_edit 0.19.15",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a"
+dependencies = [
+ "toml_datetime",
+ "toml_edit 0.20.2",
]
[[package]]
@@ -1354,33 +1399,67 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.56"
+version = "1.0.70"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
dependencies = [
"unicode-ident",
]
+[[package]]
+name = "proptest"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf"
+dependencies = [
+ "bitflags 2.4.1",
+ "lazy_static",
+ "num-traits",
+ "rand",
+ "rand_chacha",
+ "rand_xorshift",
+ "regex-syntax 0.8.2",
+ "unarray",
+]
+
[[package]]
name = "pyrometer"
-version = "0.1.0"
+version = "0.2.0"
dependencies = [
+ "ahash",
+ "analyzers",
"ariadne",
"criterion",
"ethers-core",
- "hex",
+ "graph",
"petgraph",
+ "serde_json",
"shared",
"solang-parser",
+ "solc-expressions",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "queries"
+version = "0.2.0"
+dependencies = [
+ "analyzers",
+ "ariadne",
+ "ethers-core",
+ "graph",
+ "solang-parser",
+ "solc-expressions",
"tracing",
"tracing-subscriber",
]
[[package]]
name = "quote"
-version = "1.0.26"
+version = "1.0.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
dependencies = [
"proc-macro2",
]
@@ -1421,11 +1500,20 @@ dependencies = [
"getrandom",
]
+[[package]]
+name = "rand_xorshift"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
+dependencies = [
+ "rand_core",
+]
+
[[package]]
name = "rayon"
-version = "1.7.0"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
+checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
dependencies = [
"either",
"rayon-core",
@@ -1433,54 +1521,44 @@ dependencies = [
[[package]]
name = "rayon-core"
-version = "1.11.0"
+version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
+checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
dependencies = [
- "crossbeam-channel",
"crossbeam-deque",
"crossbeam-utils",
- "num_cpus",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags",
]
[[package]]
name = "redox_syscall"
-version = "0.3.5"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
]
[[package]]
name = "redox_users"
-version = "0.4.3"
+version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4"
dependencies = [
"getrandom",
- "redox_syscall 0.2.16",
+ "libredox",
"thiserror",
]
[[package]]
name = "regex"
-version = "1.7.3"
+version = "1.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d"
+checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
dependencies = [
"aho-corasick",
"memchr",
- "regex-syntax",
+ "regex-automata 0.4.3",
+ "regex-syntax 0.8.2",
]
[[package]]
@@ -1489,7 +1567,18 @@ version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
dependencies = [
- "regex-syntax",
+ "regex-syntax 0.6.29",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.8.2",
]
[[package]]
@@ -1498,6 +1587,12 @@ version = "0.6.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+[[package]]
+name = "regex-syntax"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+
[[package]]
name = "rfc6979"
version = "0.4.0"
@@ -1538,29 +1633,28 @@ checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6"
[[package]]
name = "rustix"
-version = "0.37.8"
+version = "0.38.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aef160324be24d31a62147fae491c14d2204a3865c7ca8c3b0d7f7bcb3ea635"
+checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a"
dependencies = [
- "bitflags",
+ "bitflags 2.4.1",
"errno",
- "io-lifetimes",
"libc",
"linux-raw-sys",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
]
[[package]]
name = "rustversion"
-version = "1.0.12"
+version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
+checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
[[package]]
name = "ryu"
-version = "1.0.13"
+version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
[[package]]
name = "same-file"
@@ -1573,9 +1667,9 @@ dependencies = [
[[package]]
name = "scale-info"
-version = "2.5.0"
+version = "2.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cfdffd972d76b22f3d7f81c8be34b2296afd3a25e0a547bd9abe340a4dbbe97"
+checksum = "7f7d66a1128282b7ef025a8ead62a4a9fcf017382ec53b8ffbf4d7bf77bd3c60"
dependencies = [
"cfg-if",
"derive_more",
@@ -1585,11 +1679,11 @@ dependencies = [
[[package]]
name = "scale-info-derive"
-version = "2.5.0"
+version = "2.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61fa974aea2d63dd18a4ec3a49d59af9f34178c73a4f56d2f18205628d00681e"
+checksum = "abf2c68b89cafb3b8d918dd07b42be0da66ff202cf1155c5739a4e0c1ea0dc19"
dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 1.3.1",
"proc-macro2",
"quote",
"syn 1.0.109",
@@ -1597,15 +1691,15 @@ dependencies = [
[[package]]
name = "scopeguard"
-version = "1.1.0"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "sec1"
-version = "0.7.1"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48518a2b5775ba8ca5b46596aae011caa431e6ce7e4a67ead66d92f08884220e"
+checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
dependencies = [
"base16ct",
"der",
@@ -1617,29 +1711,29 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.159"
+version = "1.0.193"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065"
+checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.159"
+version = "1.0.193"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"
+checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.13",
+ "syn 2.0.39",
]
[[package]]
name = "serde_json"
-version = "1.0.95"
+version = "1.0.108"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744"
+checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
dependencies = [
"itoa",
"ryu",
@@ -1648,9 +1742,9 @@ dependencies = [
[[package]]
name = "sha2"
-version = "0.10.6"
+version = "0.10.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
dependencies = [
"cfg-if",
"cpufeatures",
@@ -1659,9 +1753,9 @@ dependencies = [
[[package]]
name = "sha3"
-version = "0.10.6"
+version = "0.10.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9"
+checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
dependencies = [
"digest",
"keccak",
@@ -1669,20 +1763,20 @@ dependencies = [
[[package]]
name = "sharded-slab"
-version = "0.1.4"
+version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
dependencies = [
"lazy_static",
]
[[package]]
name = "shared"
-version = "0.1.0"
+version = "0.2.0"
dependencies = [
+ "ahash",
"ethers-core",
"hex",
- "lazy_static",
"petgraph",
"solang-parser",
"tracing",
@@ -1691,9 +1785,9 @@ dependencies = [
[[package]]
name = "signature"
-version = "2.1.0"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
dependencies = [
"digest",
"rand_core",
@@ -1701,15 +1795,15 @@ dependencies = [
[[package]]
name = "siphasher"
-version = "0.3.10"
+version = "0.3.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
[[package]]
name = "smallvec"
-version = "1.10.0"
+version = "1.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
[[package]]
name = "solang-parser"
@@ -1726,11 +1820,27 @@ dependencies = [
"unicode-xid",
]
+[[package]]
+name = "solc-expressions"
+version = "0.2.0"
+dependencies = [
+ "analyzers",
+ "ethers-core",
+ "graph",
+ "hex",
+ "keccak-hash",
+ "petgraph",
+ "shared",
+ "solang-parser",
+ "tracing",
+ "tracing-subscriber",
+]
+
[[package]]
name = "spki"
-version = "0.7.1"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37a5be806ab6f127c3da44b7378837ebf01dadca8510a0e572460216b228bd0e"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
dependencies = [
"base64ct",
"der",
@@ -1763,31 +1873,31 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
name = "strum"
-version = "0.24.1"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
+checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
dependencies = [
"strum_macros",
]
[[package]]
name = "strum_macros"
-version = "0.24.3"
+version = "0.25.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
+checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
dependencies = [
"heck",
"proc-macro2",
"quote",
"rustversion",
- "syn 1.0.109",
+ "syn 2.0.39",
]
[[package]]
name = "subtle"
-version = "2.4.1"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
+checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
[[package]]
name = "syn"
@@ -1802,9 +1912,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.13"
+version = "2.0.39"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
dependencies = [
"proc-macro2",
"quote",
@@ -1819,15 +1929,15 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
[[package]]
name = "tempfile"
-version = "3.5.0"
+version = "3.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998"
+checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
dependencies = [
"cfg-if",
"fastrand",
- "redox_syscall 0.3.5",
+ "redox_syscall",
"rustix",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -1849,22 +1959,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
[[package]]
name = "thiserror"
-version = "1.0.40"
+version = "1.0.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.40"
+version = "1.0.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.13",
+ "syn 2.0.39",
]
[[package]]
@@ -1898,28 +2008,38 @@ dependencies = [
[[package]]
name = "toml_datetime"
-version = "0.6.1"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
+checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap 2.1.0",
+ "toml_datetime",
+ "winnow",
+]
[[package]]
name = "toml_edit"
-version = "0.19.8"
+version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"
+checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
dependencies = [
- "indexmap",
+ "indexmap 2.1.0",
"toml_datetime",
"winnow",
]
[[package]]
name = "tracing"
-version = "0.1.37"
+version = "0.1.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
dependencies = [
- "cfg-if",
"pin-project-lite",
"tracing-attributes",
"tracing-core",
@@ -1927,20 +2047,20 @@ dependencies = [
[[package]]
name = "tracing-attributes"
-version = "0.1.23"
+version = "0.1.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.39",
]
[[package]]
name = "tracing-core"
-version = "0.1.30"
+version = "0.1.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
dependencies = [
"once_cell",
"valuable",
@@ -1948,23 +2068,23 @@ dependencies = [
[[package]]
name = "tracing-log"
-version = "0.1.3"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
dependencies = [
- "lazy_static",
"log",
+ "once_cell",
"tracing-core",
]
[[package]]
name = "tracing-subscriber"
-version = "0.3.16"
+version = "0.3.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
dependencies = [
"matchers",
- "nu-ansi-term",
+ "nu-ansi-term 0.46.0",
"once_cell",
"regex",
"sharded-slab",
@@ -1975,11 +2095,23 @@ dependencies = [
"tracing-log",
]
+[[package]]
+name = "tracing-tree"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65139ecd2c3f6484c3b99bc01c77afe21e95473630747c7aca525e78b0666675"
+dependencies = [
+ "nu-ansi-term 0.49.0",
+ "tracing-core",
+ "tracing-log",
+ "tracing-subscriber",
+]
+
[[package]]
name = "typenum"
-version = "1.16.0"
+version = "1.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
[[package]]
name = "uint"
@@ -1993,17 +2125,23 @@ dependencies = [
"static_assertions",
]
+[[package]]
+name = "unarray"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
+
[[package]]
name = "unicode-ident"
-version = "1.0.8"
+version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
[[package]]
name = "unicode-width"
-version = "0.1.10"
+version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
[[package]]
name = "unicode-xid"
@@ -2031,9 +2169,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]]
name = "walkdir"
-version = "2.3.3"
+version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
+checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
dependencies = [
"same-file",
"winapi-util",
@@ -2047,9 +2185,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.86"
+version = "0.2.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73"
+checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e"
dependencies = [
"cfg-if",
"wasm-bindgen-macro",
@@ -2057,24 +2195,24 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.86"
+version = "0.2.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb"
+checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826"
dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.13",
+ "syn 2.0.39",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.86"
+version = "0.2.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258"
+checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -2082,28 +2220,28 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.86"
+version = "0.2.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8"
+checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.13",
+ "syn 2.0.39",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.86"
+version = "0.2.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93"
+checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f"
[[package]]
name = "web-sys"
-version = "0.3.63"
+version = "0.3.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2"
+checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -2127,9 +2265,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-util"
-version = "0.1.5"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
dependencies = [
"winapi",
]
@@ -2142,141 +2280,141 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows-sys"
-version = "0.45.0"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
dependencies = [
- "windows-targets 0.42.2",
+ "windows-targets 0.48.5",
]
[[package]]
name = "windows-sys"
-version = "0.48.0"
+version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
dependencies = [
- "windows-targets 0.48.0",
+ "windows-targets 0.52.0",
]
[[package]]
name = "windows-targets"
-version = "0.42.2"
+version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
]
[[package]]
name = "windows-targets"
-version = "0.48.0"
+version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
dependencies = [
- "windows_aarch64_gnullvm 0.48.0",
- "windows_aarch64_msvc 0.48.0",
- "windows_i686_gnu 0.48.0",
- "windows_i686_msvc 0.48.0",
- "windows_x86_64_gnu 0.48.0",
- "windows_x86_64_gnullvm 0.48.0",
- "windows_x86_64_msvc 0.48.0",
+ "windows_aarch64_gnullvm 0.52.0",
+ "windows_aarch64_msvc 0.52.0",
+ "windows_i686_gnu 0.52.0",
+ "windows_i686_msvc 0.52.0",
+ "windows_x86_64_gnu 0.52.0",
+ "windows_x86_64_gnullvm 0.52.0",
+ "windows_x86_64_msvc 0.52.0",
]
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.42.2"
+version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.48.0"
+version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.42.2"
+version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.48.0"
+version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
[[package]]
name = "windows_i686_gnu"
-version = "0.42.2"
+version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
[[package]]
name = "windows_i686_gnu"
-version = "0.48.0"
+version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
[[package]]
name = "windows_i686_msvc"
-version = "0.42.2"
+version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
[[package]]
name = "windows_i686_msvc"
-version = "0.48.0"
+version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.42.2"
+version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.48.0"
+version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.42.2"
+version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.48.0"
+version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.42.2"
+version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.48.0"
+version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
[[package]]
name = "winnow"
-version = "0.4.1"
+version = "0.5.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28"
+checksum = "b67b5f0a4e7a27a64c651977932b9dc5667ca7fc31ac44b03ed37a0cf42fdfff"
dependencies = [
"memchr",
]
@@ -2296,8 +2434,28 @@ version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
+[[package]]
+name = "zerocopy"
+version = "0.7.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.39",
+]
+
[[package]]
name = "zeroize"
-version = "1.6.0"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
+checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
diff --git a/Cargo.toml b/Cargo.toml
index 09ad9588..5bc8a535 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,50 +1,74 @@
-[package]
-name = "pyrometer"
-version = "0.1.0"
-edition = "2021"
-autobenches = false # turns off autodiscovery of benchmarks in ./benches
-exclude = ["benches"] # exclude the benches directory from the build
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-petgraph = "0.6.2"
-solang-parser = { version = "0.2.4", features = ["pt-serde"] }
-ethers-core = "*"
-ariadne = "0.2.0"
-shared = { path = "./shared" }
-hex = "0.4.3"
-tracing = { version = "0.1", features = ["attributes"] }
-tracing-subscriber = "0.3"
-
-[dev-dependencies]
-criterion = { version = "0.4"} # benching
-
[workspace]
-members = ["cli", "shared"]
+members = [
+ "crates/analyzers",
+ "crates/cli",
+ "crates/graph",
+ "crates/pyrometer",
+ "crates/queries",
+ "crates/shared",
+ "crates/solc-expressions",
+]
+resolver = "2"
-# we patch ariadne to allow for counting by bytes because solang uses byte locations not char locations
-[patch.crates-io]
-ariadne = {git = "https://github.com/brockelmore/ariadne"}
+[workspace.package]
+version = "0.2.0"
+edition = "2021"
+authors = ["Brock Elmore"]
+license = "MIT OR Apache-2.0"
+homepage = "https://github.com/nascentxyz/pyrometer"
+repository = "https://github.com/nascentxyz/pyrometer"
+exclude = [
+ "benches/",
+ "tests/",
+ "examples/",
+] # exclude the benches directory from the build
+rust-version = "1.74"
[profile.release]
debug = true
[profile.dev]
-opt-level = 1 # Enable some optimizations like tail call
+# opt-level = 1 # Enable some optimizations like tail call
inline = true
[profile.bench]
debug = true
+[workspace.dependencies]
+analyzers = { path = "crates/analyzers" }
+graph = { path = "crates/graph" }
+pyrometer = { path = "crates/pyrometer" }
+queries = { path = "crates/queries" }
+shared = { path = "crates/shared" }
+solc-expressions = { path = "crates/solc-expressions" }
+
+solang-parser = { version = "0.2.4", features = ["pt-serde"] }
+tracing = { version = "0.1", features = ["attributes"] }
+tracing-subscriber = { version = "0.3", features = [
+ "registry",
+ "env-filter",
+ "fmt",
+] }
+tracing-tree = "0.3.0"
+ethers-core = "*"
+hex = "0.4.3"
+ariadne = "0.2.0"
+petgraph = "0.6.2"
+ahash = "0.8.10"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+# [workspace]
+# members = ["cli", "shared"]
+
+# we patch ariadne to allow for counting by bytes because solang uses byte locations not char locations
+[patch.crates-io]
+ariadne = { git = "https://github.com/brockelmore/ariadne" }
-######################################
-# Benchmarks
-######################################
-[[example]]
-name = "parse"
-path = "examples/parse.rs"
+# ######################################
+# # Benchmarks
+# ######################################
-[[bench]]
-name = "parse"
-harness = false
\ No newline at end of file
+# [[bench]]
+# name = "parse"
+# harness = false
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index f6f0bf49..00000000
--- a/LICENSE
+++ /dev/null
@@ -1,674 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc.
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- Pyrometer
- Copyright (C) 2023 Nascent
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see .
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- Pyrometer Copyright (C) 2023 Nascent
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-.
\ No newline at end of file
diff --git a/LICENSE-APACHE b/LICENSE-APACHE
new file mode 100644
index 00000000..a7b8b5e6
--- /dev/null
+++ b/LICENSE-APACHE
@@ -0,0 +1,187 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
\ No newline at end of file
diff --git a/LICENSE-MIT b/LICENSE-MIT
new file mode 100644
index 00000000..dc2b8972
--- /dev/null
+++ b/LICENSE-MIT
@@ -0,0 +1,20 @@
+Copyright (c) 2022-2023 Nascent
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/TODO.md b/TODO.md
index 450b4281..c63b9fb8 100644
--- a/TODO.md
+++ b/TODO.md
@@ -3,7 +3,7 @@
- [x] Cleanup repo (remove unnecessary files, automate testing, etc.)
- [x] Graceful error handling
- [ ] `join` operations between contexts
- - [ ] Trait/Lang separation cleanup
+ - [x] Trait/Lang separation cleanup
- [ ] Propogate requirements across variables (i.e. `y = x;` & `x != 0;` therefore `y != 0;`)
- [ ] Language
- [x] Better import handling (`foundry.toml` reading?)
diff --git a/cli/Cargo.lock b/cli/Cargo.lock
deleted file mode 100644
index 16ae4bf4..00000000
--- a/cli/Cargo.lock
+++ /dev/null
@@ -1,1616 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "aho-corasick"
-version = "0.7.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "ariadne"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "367fd0ad87307588d087544707bc5fbf4805ded96c7db922b70d368fa1cb5702"
-dependencies = [
- "unicode-width",
- "yansi",
-]
-
-[[package]]
-name = "arrayvec"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
-
-[[package]]
-name = "ascii-canvas"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6"
-dependencies = [
- "term",
-]
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "auto_impl"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a8c1df849285fbacd587de7818cc7d13be6cd2cbcd47a04fb1801b0e2706e33"
-dependencies = [
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "base16ct"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
-
-[[package]]
-name = "base64ct"
-version = "1.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf"
-
-[[package]]
-name = "bit-set"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
-dependencies = [
- "bit-vec",
-]
-
-[[package]]
-name = "bit-vec"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitvec"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
-dependencies = [
- "funty",
- "radium",
- "tap",
- "wyz",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "byte-slice-cast"
-version = "1.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c"
-
-[[package]]
-name = "byteorder"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-
-[[package]]
-name = "bytes"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "cc"
-version = "1.0.79"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "chrono"
-version = "0.4.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
-dependencies = [
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "clap"
-version = "4.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76"
-dependencies = [
- "bitflags",
- "clap_derive",
- "clap_lex",
- "is-terminal",
- "once_cell",
- "strsim",
- "termcolor",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8"
-dependencies = [
- "heck",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade"
-dependencies = [
- "os_str_bytes",
-]
-
-[[package]]
-name = "cli"
-version = "0.1.0"
-dependencies = [
- "ariadne",
- "clap",
- "pyrometer",
- "shared",
-]
-
-[[package]]
-name = "const-oid"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b"
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crunchy"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
-
-[[package]]
-name = "crypto-bigint"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
-dependencies = [
- "generic-array",
- "rand_core",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "typenum",
-]
-
-[[package]]
-name = "der"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de"
-dependencies = [
- "const-oid",
- "zeroize",
-]
-
-[[package]]
-name = "derive_more"
-version = "0.99.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "diff"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
-
-[[package]]
-name = "digest"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
-dependencies = [
- "block-buffer",
- "crypto-common",
- "subtle",
-]
-
-[[package]]
-name = "dirs-next"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
-dependencies = [
- "cfg-if",
- "dirs-sys-next",
-]
-
-[[package]]
-name = "dirs-sys-next"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
-
-[[package]]
-name = "ecdsa"
-version = "0.14.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c"
-dependencies = [
- "der",
- "elliptic-curve",
- "rfc6979",
- "signature",
-]
-
-[[package]]
-name = "either"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
-
-[[package]]
-name = "elliptic-curve"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
-dependencies = [
- "base16ct",
- "crypto-bigint",
- "der",
- "digest",
- "ff",
- "generic-array",
- "group",
- "rand_core",
- "sec1",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "ena"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7402b94a93c24e742487327a7cd839dc9d36fec9de9fb25b09f2dae459f36c3"
-dependencies = [
- "log",
-]
-
-[[package]]
-name = "errno"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "ethabi"
-version = "18.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7413c5f74cc903ea37386a8965a936cbeb334bd270862fdece542c1b2dcbc898"
-dependencies = [
- "ethereum-types",
- "hex",
- "once_cell",
- "regex",
- "serde",
- "serde_json",
- "sha3",
- "thiserror",
- "uint",
-]
-
-[[package]]
-name = "ethbloom"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60"
-dependencies = [
- "crunchy",
- "fixed-hash",
- "impl-codec",
- "impl-rlp",
- "impl-serde",
- "scale-info",
- "tiny-keccak",
-]
-
-[[package]]
-name = "ethereum-types"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02d215cbf040552efcbe99a38372fe80ab9d00268e20012b79fcd0f073edd8ee"
-dependencies = [
- "ethbloom",
- "fixed-hash",
- "impl-codec",
- "impl-rlp",
- "impl-serde",
- "primitive-types",
- "scale-info",
- "uint",
-]
-
-[[package]]
-name = "ethers-core"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ade3e9c97727343984e1ceada4fdab11142d2ee3472d2c67027d56b1251d4f15"
-dependencies = [
- "arrayvec",
- "bytes",
- "chrono",
- "elliptic-curve",
- "ethabi",
- "generic-array",
- "hex",
- "k256",
- "open-fastrlp",
- "rand",
- "rlp",
- "rlp-derive",
- "serde",
- "serde_json",
- "strum",
- "thiserror",
- "tiny-keccak",
- "unicode-xid",
-]
-
-[[package]]
-name = "ff"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
-dependencies = [
- "rand_core",
- "subtle",
-]
-
-[[package]]
-name = "fixed-hash"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534"
-dependencies = [
- "byteorder",
- "rand",
- "rustc-hex",
- "static_assertions",
-]
-
-[[package]]
-name = "fixedbitset"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
-
-[[package]]
-name = "funty"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
-
-[[package]]
-name = "generic-array"
-version = "0.14.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "group"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
-dependencies = [
- "ff",
- "rand_core",
- "subtle",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
-[[package]]
-name = "heck"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
-[[package]]
-name = "hmac"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
-dependencies = [
- "digest",
-]
-
-[[package]]
-name = "impl-codec"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f"
-dependencies = [
- "parity-scale-codec",
-]
-
-[[package]]
-name = "impl-rlp"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808"
-dependencies = [
- "rlp",
-]
-
-[[package]]
-name = "impl-serde"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "impl-trait-for-tuples"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "indexmap"
-version = "1.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
-dependencies = [
- "autocfg",
- "hashbrown",
-]
-
-[[package]]
-name = "io-lifetimes"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
-dependencies = [
- "libc",
- "windows-sys",
-]
-
-[[package]]
-name = "is-terminal"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189"
-dependencies = [
- "hermit-abi 0.2.6",
- "io-lifetimes",
- "rustix",
- "windows-sys",
-]
-
-[[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
-
-[[package]]
-name = "k256"
-version = "0.11.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b"
-dependencies = [
- "cfg-if",
- "ecdsa",
- "elliptic-curve",
- "sha2",
- "sha3",
-]
-
-[[package]]
-name = "keccak"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768"
-dependencies = [
- "cpufeatures",
-]
-
-[[package]]
-name = "lalrpop"
-version = "0.19.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b30455341b0e18f276fa64540aff54deafb54c589de6aca68659c63dd2d5d823"
-dependencies = [
- "ascii-canvas",
- "atty",
- "bit-set",
- "diff",
- "ena",
- "itertools",
- "lalrpop-util",
- "petgraph",
- "pico-args",
- "regex",
- "regex-syntax",
- "string_cache",
- "term",
- "tiny-keccak",
- "unicode-xid",
-]
-
-[[package]]
-name = "lalrpop-util"
-version = "0.19.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcf796c978e9b4d983414f4caedc9273aa33ee214c5b887bd55fde84c85d2dc4"
-dependencies = [
- "regex",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "libc"
-version = "0.2.139"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
-
-[[package]]
-name = "lock_api"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "memchr"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-
-[[package]]
-name = "new_debug_unreachable"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
-
-[[package]]
-name = "nom8"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
-dependencies = [
- "autocfg",
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
-
-[[package]]
-name = "open-fastrlp"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "786393f80485445794f6043fd3138854dd109cc6c4bd1a6383db304c9ce9b9ce"
-dependencies = [
- "arrayvec",
- "auto_impl",
- "bytes",
- "ethereum-types",
- "open-fastrlp-derive",
-]
-
-[[package]]
-name = "open-fastrlp-derive"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "003b2be5c6c53c1cfeb0a238b8a1c3915cd410feb684457a36c10038f764bb1c"
-dependencies = [
- "bytes",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "os_str_bytes"
-version = "6.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
-
-[[package]]
-name = "parity-scale-codec"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3840933452adf7b3b9145e27086a5a3376c619dca1a21b1e5a5af0d54979bed"
-dependencies = [
- "arrayvec",
- "bitvec",
- "byte-slice-cast",
- "impl-trait-for-tuples",
- "parity-scale-codec-derive",
- "serde",
-]
-
-[[package]]
-name = "parity-scale-codec-derive"
-version = "3.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b26a931f824dd4eca30b3e43bb4f31cd5f0d3a403c5f5ff27106b805bfde7b"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-sys",
-]
-
-[[package]]
-name = "petgraph"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143"
-dependencies = [
- "fixedbitset",
- "indexmap",
-]
-
-[[package]]
-name = "phf"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c"
-dependencies = [
- "phf_macros",
- "phf_shared 0.11.1",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf"
-dependencies = [
- "phf_shared 0.11.1",
- "rand",
-]
-
-[[package]]
-name = "phf_macros"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66"
-dependencies = [
- "phf_generator",
- "phf_shared 0.11.1",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "pico-args"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468"
-
-[[package]]
-name = "pkcs8"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
-dependencies = [
- "der",
- "spki",
-]
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-
-[[package]]
-name = "precomputed-hash"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
-
-[[package]]
-name = "primitive-types"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66"
-dependencies = [
- "fixed-hash",
- "impl-codec",
- "impl-rlp",
- "impl-serde",
- "scale-info",
- "uint",
-]
-
-[[package]]
-name = "proc-macro-crate"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66618389e4ec1c7afe67d51a9bf34ff9236480f8d51e7489b7d5ab0303c13f34"
-dependencies = [
- "once_cell",
- "toml_edit",
-]
-
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "pyrometer"
-version = "0.1.0"
-dependencies = [
- "ariadne",
- "ethers-core",
- "hex",
- "petgraph",
- "shared",
- "solang-parser",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "radium"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "redox_users"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
-dependencies = [
- "getrandom",
- "redox_syscall",
- "thiserror",
-]
-
-[[package]]
-name = "regex"
-version = "1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
-
-[[package]]
-name = "rfc6979"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
-dependencies = [
- "crypto-bigint",
- "hmac",
- "zeroize",
-]
-
-[[package]]
-name = "rlp"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec"
-dependencies = [
- "bytes",
- "rustc-hex",
-]
-
-[[package]]
-name = "rlp-derive"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e33d7b2abe0c340d8797fe2907d3f20d3b5ea5908683618bfe80df7f621f672a"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "rustc-hex"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6"
-
-[[package]]
-name = "rustix"
-version = "0.36.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03"
-dependencies = [
- "bitflags",
- "errno",
- "io-lifetimes",
- "libc",
- "linux-raw-sys",
- "windows-sys",
-]
-
-[[package]]
-name = "rustversion"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70"
-
-[[package]]
-name = "ryu"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
-
-[[package]]
-name = "scale-info"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "001cf62ece89779fd16105b5f515ad0e5cedcd5440d3dd806bb067978e7c3608"
-dependencies = [
- "cfg-if",
- "derive_more",
- "parity-scale-codec",
- "scale-info-derive",
-]
-
-[[package]]
-name = "scale-info-derive"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "303959cf613a6f6efd19ed4b4ad5bf79966a13352716299ad532cfb115f4205c"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "sec1"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
-dependencies = [
- "base16ct",
- "der",
- "generic-array",
- "pkcs8",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "serde"
-version = "1.0.152"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.152"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.91"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sha3"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9"
-dependencies = [
- "digest",
- "keccak",
-]
-
-[[package]]
-name = "shared"
-version = "0.1.0"
-dependencies = [
- "ethers-core",
- "hex",
- "lazy_static",
- "petgraph",
- "solang-parser",
-]
-
-[[package]]
-name = "signature"
-version = "1.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
-dependencies = [
- "digest",
- "rand_core",
-]
-
-[[package]]
-name = "siphasher"
-version = "0.3.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
-
-[[package]]
-name = "smallvec"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
-
-[[package]]
-name = "solang-parser"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff87dae6cdccacdbf3b19e99b271083556e808de0f59c74a01482f64fdbc61fc"
-dependencies = [
- "itertools",
- "lalrpop",
- "lalrpop-util",
- "phf",
- "serde",
- "unicode-xid",
-]
-
-[[package]]
-name = "spki"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
-dependencies = [
- "base64ct",
- "der",
-]
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "string_cache"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08"
-dependencies = [
- "new_debug_unreachable",
- "once_cell",
- "parking_lot",
- "phf_shared 0.10.0",
- "precomputed-hash",
-]
-
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
-[[package]]
-name = "strum"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
-dependencies = [
- "strum_macros",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.24.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn",
-]
-
-[[package]]
-name = "subtle"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
-
-[[package]]
-name = "syn"
-version = "1.0.107"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "tap"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
-
-[[package]]
-name = "term"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f"
-dependencies = [
- "dirs-next",
- "rustversion",
- "winapi",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tiny-keccak"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
-dependencies = [
- "crunchy",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5"
-
-[[package]]
-name = "toml_edit"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b"
-dependencies = [
- "indexmap",
- "nom8",
- "toml_datetime",
-]
-
-[[package]]
-name = "typenum"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
-
-[[package]]
-name = "uint"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52"
-dependencies = [
- "byteorder",
- "crunchy",
- "hex",
- "static_assertions",
-]
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows-sys"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
-dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
-
-[[package]]
-name = "wyz"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
-dependencies = [
- "tap",
-]
-
-[[package]]
-name = "yansi"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
-
-[[package]]
-name = "zeroize"
-version = "1.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
deleted file mode 100644
index 9ac847ea..00000000
--- a/cli/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-name = "cli"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-clap = { version = "4.1.4", features = ["derive"] }
-pyrometer = { path = "../" }
-shared = { path = "../shared" }
-ariadne = "0.2.0"
-tracing = "0.1"
-tracing-subscriber = { version = "0.3", features = ["registry", "env-filter", "fmt"] }
-petgraph = "0.6.2"
-
-[[bin]]
-name = "pyrometer"
-path = "src/main.rs"
-
-
-[profile.release]
-debug = true
\ No newline at end of file
diff --git a/crates/analyzers/Cargo.toml b/crates/analyzers/Cargo.toml
new file mode 100644
index 00000000..136ace93
--- /dev/null
+++ b/crates/analyzers/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "analyzers"
+description = "Pyrometer's builtin analyzers"
+
+version.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+authors.workspace = true
+license.workspace = true
+homepage.workspace = true
+repository.workspace = true
+
+[dependencies]
+graph.workspace = true
+shared.workspace = true
+
+solang-parser.workspace = true
+ariadne.workspace = true
\ No newline at end of file
diff --git a/src/context/analyzers/bounds.rs b/crates/analyzers/src/bounds.rs
similarity index 77%
rename from src/context/analyzers/bounds.rs
rename to crates/analyzers/src/bounds.rs
index 2ea3d72a..636147a9 100644
--- a/src/context/analyzers/bounds.rs
+++ b/crates/analyzers/src/bounds.rs
@@ -1,17 +1,14 @@
-use crate::analyzers::FunctionVarsBoundAnalysis;
-use crate::analyzers::VarBoundAnalysis;
+use crate::{FunctionVarsBoundAnalysis, LocSpan, LocStrSpan, ReportConfig, VarBoundAnalysis};
-use crate::analyzers::LocSpan;
-use crate::analyzers::{LocStrSpan, ReportConfig};
-
-use shared::analyzer::GraphLike;
-use shared::{
- context::*,
- range::{range_string::*, Range, RangeEval, SolcRange},
+use graph::{
+ elem::Elem,
+ nodes::{Concrete, ContextNode},
+ range_string::ToRangeString,
+ GraphBackend, Range, RangeEval, SolcRange,
};
+use shared::{RangeArena, StorageLocation};
use ariadne::{Color, Fmt, Label, Span};
-use solang_parser::pt::StorageLocation;
use std::collections::{BTreeMap, BTreeSet};
pub static MIN_COLOR: Color = Color::Fixed(111);
@@ -77,9 +74,13 @@ pub struct OrderedAnalysis {
}
impl OrderedAnalysis {
- pub fn from_bound_analysis(ba: VarBoundAnalysis, analyzer: &impl GraphLike) -> Self {
+ pub fn from_bound_analysis(
+ ba: VarBoundAnalysis,
+ analyzer: &impl GraphBackend,
+ arena: &mut RangeArena>,
+ ) -> Self {
let mut analyses: BTreeMap> = Default::default();
- if let Some(init) = ba.init_item(analyzer) {
+ if let Some(init) = ba.init_item(analyzer, arena) {
let source: usize = *LocSpan(init.loc.1).source();
let mut set = BTreeSet::new();
set.insert(init.into());
@@ -88,16 +89,17 @@ impl OrderedAnalysis {
ba.bound_changes
.iter()
.enumerate()
- .for_each(|(i, bound_change)| {
- let (parts, unsat) = range_parts(analyzer, &ba.report_config, &bound_change.1);
+ .for_each(|(_i, bound_change)| {
+ let (parts, unsat) =
+ range_parts(analyzer, arena, &ba.report_config, &bound_change.1);
let item = StrippedAnalysisItem {
init: false,
name: ba.var_display_name.clone(),
loc: LocSpan(bound_change.0 .1),
- order: i as i32,
+ order: (bound_change.0.end() - bound_change.0.start()) as i32, //i as i32,
// storage: ba.storage.clone(),
ctx: ba.ctx,
- ctx_conditionals: ba.conditionals(analyzer),
+ ctx_conditionals: ba.conditionals(analyzer, arena),
parts,
unsat,
};
@@ -110,11 +112,15 @@ impl OrderedAnalysis {
Self { analyses }
}
- pub fn from_func_analysis(fvba: FunctionVarsBoundAnalysis, analyzer: &impl GraphLike) -> Self {
+ pub fn from_func_analysis(
+ fvba: FunctionVarsBoundAnalysis,
+ analyzer: &impl GraphBackend,
+ arena: &mut RangeArena>,
+ ) -> Self {
let mut analyses = Self::default();
fvba.vars_by_ctx.iter().for_each(|(_ctx, bas)| {
bas.iter().for_each(|ba| {
- analyses.extend(Self::from_bound_analysis(ba.clone(), analyzer));
+ analyses.extend(Self::from_bound_analysis(ba.clone(), analyzer, arena));
})
});
analyses
@@ -164,39 +170,43 @@ impl RangePart {
}
}
-impl Into> for AnalysisItem {
- fn into(self) -> ariadne::Label {
- let (color, order, priority) = if self.init {
- (Color::Magenta, self.order, -1)
+impl From for Label {
+ fn from(val: AnalysisItem) -> Self {
+ let (color, order, priority) = if val.init {
+ (Color::Magenta, val.order, -1)
} else {
(
- match self.storage {
+ match val.storage {
Some(StorageLocation::Memory(..)) => Color::Blue,
Some(StorageLocation::Storage(..)) => Color::Green,
Some(StorageLocation::Calldata(..)) => Color::White,
+ Some(StorageLocation::Block(..)) => Color::Magenta,
+ Some(StorageLocation::Msg(..)) => Color::Cyan,
None => Color::Cyan,
},
- self.order,
+ val.order,
0,
)
};
- Label::new(self.loc)
+ Label::new(val.loc)
.with_message(format!(
"{}\"{}\"{}{}",
- match self.storage {
+ match val.storage {
Some(StorageLocation::Memory(..)) => "Memory var ",
Some(StorageLocation::Storage(..)) => "Storage var ",
Some(StorageLocation::Calldata(..)) => "Calldata var ",
+ Some(StorageLocation::Block(..)) => "Block var ",
+ Some(StorageLocation::Msg(..)) => "Msg var ",
None => "",
},
- self.name,
- self.parts
+ val.name,
+ val.parts
.into_iter()
.map(|part| part.to_cli_string())
.collect::>()
.join(" "),
- if self.unsat {
+ if val.unsat {
" - unsatisfiable range, unreachable".fg(Color::Red)
} else {
"".fg(Color::Red)
@@ -252,40 +262,41 @@ impl ToString for RangePart {
/// Creates an Vec<[RangePart]> from a range based on the current [ReportConfig]
pub fn range_parts(
- analyzer: &impl GraphLike,
+ analyzer: &impl GraphBackend,
+ arena: &mut RangeArena>,
report_config: &ReportConfig,
range: &SolcRange,
) -> (Vec, bool) {
let mut parts = vec![];
let min = if report_config.eval_bounds {
range
- .evaled_range_min(analyzer)
+ .evaled_range_min(analyzer, arena)
.unwrap()
- .to_range_string(false, analyzer)
+ .to_range_string(false, analyzer, arena)
.s
} else if report_config.simplify_bounds {
range
- .simplified_range_min(analyzer)
+ .simplified_range_min(analyzer, arena)
.unwrap()
- .to_range_string(false, analyzer)
+ .to_range_string(false, analyzer, arena)
.s
} else {
- range.range_min().to_range_string(false, analyzer).s
+ range.range_min().to_range_string(false, analyzer, arena).s
};
let max = if report_config.eval_bounds {
range
- .evaled_range_max(analyzer)
+ .evaled_range_max(analyzer, arena)
.unwrap()
- .to_range_string(true, analyzer)
+ .to_range_string(true, analyzer, arena)
.s
} else if report_config.simplify_bounds {
range
- .simplified_range_max(analyzer)
+ .simplified_range_max(analyzer, arena)
.unwrap()
- .to_range_string(true, analyzer)
+ .to_range_string(true, analyzer, arena)
.s
} else {
- range.range_max().to_range_string(true, analyzer).s
+ range.range_max().to_range_string(true, analyzer, arena).s
};
if min == max {
@@ -300,8 +311,8 @@ pub fn range_parts(
let mut excls = range_excl
.iter()
.map(|range| {
- let min = range.to_range_string(false, analyzer).s;
- let max = range.to_range_string(true, analyzer).s;
+ let min = range.to_range_string(false, analyzer, arena).s;
+ let max = range.to_range_string(true, analyzer, arena).s;
if min == max {
RangePart::Equal(min)
} else {
@@ -313,6 +324,6 @@ pub fn range_parts(
excls
}));
}
- let unsat = range.unsat(analyzer);
+ let unsat = range.unsat(analyzer, arena);
(parts, unsat)
}
diff --git a/src/context/analyzers/func_analyzer/mod.rs b/crates/analyzers/src/func_analyzer/mod.rs
similarity index 87%
rename from src/context/analyzers/func_analyzer/mod.rs
rename to crates/analyzers/src/func_analyzer/mod.rs
index 3ff556b1..dc3c5bcf 100644
--- a/src/context/analyzers/func_analyzer/mod.rs
+++ b/crates/analyzers/src/func_analyzer/mod.rs
@@ -1,20 +1,18 @@
-use crate::analyzers::range_parts;
-use crate::analyzers::VarBoundAnalysis;
-use crate::analyzers::VarBoundAnalyzer;
-
-use crate::analyzers::{LocStrSpan, ReportConfig, ReportDisplay};
-use ariadne::ReportKind;
-use std::collections::BTreeSet;
+use crate::{
+ bounds::range_parts, LocStrSpan, ReportConfig, ReportDisplay, ReportKind, VarBoundAnalysis,
+ VarBoundAnalyzer,
+};
-use shared::analyzer::GraphLike;
-use shared::{
- analyzer::{AnalyzerLike, Search},
- context::*,
+use graph::{
+ elem::Elem,
+ nodes::{Concrete, ContextNode, KilledKind},
+ AnalyzerBackend, GraphBackend,
};
+use shared::{RangeArena, Search};
use ariadne::{Color, Config, Fmt, Label, Report, Span};
use solang_parser::pt::CodeLocation;
-use std::collections::BTreeMap;
+use std::collections::{BTreeMap, BTreeSet};
mod report_display;
pub use report_display::*;
@@ -48,7 +46,8 @@ impl<'a> FunctionVarsBoundAnalysis {
pub fn reports_for_forks(
&self,
file_mapping: &'a BTreeMap,
- analyzer: &impl GraphLike,
+ analyzer: &impl GraphBackend,
+ arena: &mut RangeArena>,
) -> Vec> {
let mut handled_ctx_switches = BTreeSet::default();
let reports = self
@@ -58,20 +57,35 @@ impl<'a> FunctionVarsBoundAnalysis {
// sort by display name instead of normal name
let deps = ctx.ctx_deps(analyzer).unwrap();
let deps = deps
- .values()
- .map(|var| (var.display_name(analyzer).unwrap(), var))
+ .iter()
+ .map(|var| (var.as_controllable_name(analyzer, arena).unwrap(), var))
.collect::>();
// create the bound strings
+ // let atoms = ctx.dep_atoms(analyzer).unwrap();
+ // println!("had {} atoms", atoms.len());
+ // let mut handled_atom = vec![];
+ // let mut bounds_string: Vec = vec![];
+ // atoms.iter().enumerate().for_each(|(i, atom)| {
+ // let atom_str = atom.to_range_string(true, analyzer, arena).s;
+ // if !handled_atom.contains(&atom_str) {
+ // handled_atom.push(atom_str.clone());
+ // bounds_string.push(format!("{}. {}", i + 1, atom_str))
+ // }
+ // });
+ // let bounds_string = bounds_string.into_iter().collect::>().join("\n");
+
let bounds_string = deps
.iter()
.enumerate()
.filter_map(|(i, (name, cvar))| {
let range = cvar.ref_range(analyzer).unwrap()?;
- let (parts, _unsat) = range_parts(analyzer, &self.report_config, &range);
+
+ let (parts, _unsat) =
+ range_parts(analyzer, arena, &self.report_config, &range);
let ret = parts.into_iter().fold(
format!("{}. {name}", i + 1),
- |mut acc, part| {
- acc = format!("{acc}{}", part.to_cli_string());
+ |mut acc, _part| {
+ acc = acc.to_string();
acc
},
);
@@ -108,7 +122,7 @@ impl<'a> FunctionVarsBoundAnalysis {
let mut labels: Vec<_> = analyses
.iter()
.flat_map(|analysis| {
- let mut labels = analysis.labels(analyzer);
+ let mut labels = analysis.labels(analyzer, arena);
labels.extend(
analysis
.spanned_ctx_info
@@ -186,6 +200,7 @@ impl<'a> FunctionVarsBoundAnalysis {
let range = var.ref_range(analyzer).unwrap()?;
let (parts, _unsat) = range_parts(
analyzer,
+ arena,
&self.report_config,
&range,
);
@@ -244,7 +259,7 @@ impl<'a> FunctionVarsBoundAnalysis {
.filter_map(|(loc, var)| {
let range = var.ref_range(analyzer).unwrap()?;
let (parts, _unsat) =
- range_parts(analyzer, &self.report_config, &range);
+ range_parts(analyzer, arena, &self.report_config, &range);
Some(
Label::new(LocStrSpan::new(file_mapping, loc))
.with_message(
@@ -291,18 +306,16 @@ impl<'a> FunctionVarsBoundAnalysis {
}
}
-impl FunctionVarsBoundAnalyzer for T where T: VarBoundAnalyzer + Search + AnalyzerLike + Sized {}
-pub trait FunctionVarsBoundAnalyzer: VarBoundAnalyzer + Search + AnalyzerLike + Sized {
- fn bounds_for_all<'a>(
+impl FunctionVarsBoundAnalyzer for T where T: VarBoundAnalyzer + Search + AnalyzerBackend + Sized {}
+pub trait FunctionVarsBoundAnalyzer: VarBoundAnalyzer + Search + AnalyzerBackend + Sized {
+ fn bounds_for_lineage<'a>(
&'a self,
+ arena: &mut RangeArena>,
file_mapping: &'a BTreeMap,
ctx: ContextNode,
+ edges: Vec,
report_config: ReportConfig,
) -> FunctionVarsBoundAnalysis {
- let mut edges = ctx.all_edges(self).unwrap();
- if edges.is_empty() {
- edges.push(ctx);
- }
let lineage_analyses = edges
.iter()
.filter_map(|fork| {
@@ -314,8 +327,7 @@ pub trait FunctionVarsBoundAnalyzer: VarBoundAnalyzer + Search + AnalyzerLike +
{
return None;
}
- if !report_config.show_nonreverts
- && matches!(fork.underlying(self).unwrap().killed, None)
+ if !report_config.show_nonreverts && fork.underlying(self).unwrap().killed.is_none()
{
return None;
}
@@ -346,10 +358,11 @@ pub trait FunctionVarsBoundAnalyzer: VarBoundAnalyzer + Search + AnalyzerLike +
let is_ret = var.is_return_node_in_any(&parents, self);
if is_ret
| report_config.show_tmps
- | (report_config.show_consts && var.is_const(self).unwrap())
+ | (report_config.show_consts && var.is_const(self, arena).unwrap())
| (report_config.show_symbolics && var.is_symbolic(self).unwrap())
{
Some(self.bounds_for_var_in_family_tree(
+ arena,
file_mapping,
parents.clone(),
var.name(self).unwrap(),
@@ -375,4 +388,18 @@ pub trait FunctionVarsBoundAnalyzer: VarBoundAnalyzer + Search + AnalyzerLike +
report_config,
}
}
+
+ fn bounds_for_all<'a>(
+ &'a self,
+ arena: &mut RangeArena>,
+ file_mapping: &'a BTreeMap,
+ ctx: ContextNode,
+ report_config: ReportConfig,
+ ) -> FunctionVarsBoundAnalysis {
+ let mut edges = ctx.all_edges(self).unwrap();
+ if edges.is_empty() {
+ edges.push(ctx);
+ }
+ self.bounds_for_lineage(arena, file_mapping, ctx, edges, report_config)
+ }
}
diff --git a/src/context/analyzers/func_analyzer/report_display.rs b/crates/analyzers/src/func_analyzer/report_display.rs
similarity index 59%
rename from src/context/analyzers/func_analyzer/report_display.rs
rename to crates/analyzers/src/func_analyzer/report_display.rs
index 0f54d0c1..be106ff4 100644
--- a/src/context/analyzers/func_analyzer/report_display.rs
+++ b/crates/analyzers/src/func_analyzer/report_display.rs
@@ -1,7 +1,11 @@
-use crate::analyzers::func_analyzer::*;
-use crate::analyzers::{LocStrSpan, ReportDisplay};
-use ariadne::{Cache, Color, Config, Fmt, Label, Report, ReportKind, Span};
-use shared::analyzer::GraphLike;
+use crate::{FunctionVarsBoundAnalysis, LocStrSpan, ReportDisplay, ReportKind};
+
+use graph::{elem::Elem, nodes::Concrete, GraphBackend};
+
+use shared::RangeArena;
+
+use ariadne::{Cache, Color, Config, Fmt, Label, Report, Span};
+
use std::collections::BTreeMap;
pub struct CLIFunctionVarsBoundAnalysis<'a> {
@@ -25,7 +29,7 @@ impl<'a> ReportDisplay for CLIFunctionVarsBoundAnalysis<'a> {
fn report_kind(&self) -> ReportKind {
ReportKind::Custom("Bounds", Color::Cyan)
}
- fn msg(&self, analyzer: &impl GraphLike) -> String {
+ fn msg(&self, analyzer: &impl GraphBackend, _arena: &mut RangeArena>) -> String {
format!(
"Bounds for function: {}",
format!(
@@ -39,17 +43,25 @@ impl<'a> ReportDisplay for CLIFunctionVarsBoundAnalysis<'a> {
)
}
- fn labels(&self, _analyzer: &impl GraphLike) -> Vec> {
+ fn labels(
+ &self,
+ _analyzer: &impl GraphBackend,
+ _arena: &mut RangeArena>,
+ ) -> Vec> {
vec![]
}
- fn reports(&self, analyzer: &impl GraphLike) -> Vec> {
+ fn reports(
+ &self,
+ analyzer: &impl GraphBackend,
+ arena: &mut RangeArena>,
+ ) -> Vec> {
let mut report = Report::build(
self.report_kind(),
self.func_var_bound_analysis.ctx_loc.source(),
self.func_var_bound_analysis.ctx_loc.start(),
)
- .with_message(self.msg(analyzer))
+ .with_message(self.msg(analyzer, arena))
.with_config(
Config::default()
.with_cross_gap(false)
@@ -57,7 +69,7 @@ impl<'a> ReportDisplay for CLIFunctionVarsBoundAnalysis<'a> {
.with_tab_width(4),
);
- report.add_labels(self.labels(analyzer));
+ report.add_labels(self.labels(analyzer, arena));
if let Some((killed_span, kind)) = &self.func_var_bound_analysis.ctx_killed {
report = report.with_label(
Label::new(killed_span.clone())
@@ -68,23 +80,34 @@ impl<'a> ReportDisplay for CLIFunctionVarsBoundAnalysis<'a> {
let mut reports = vec![report.finish()];
- reports.extend(
- self.func_var_bound_analysis
- .reports_for_forks(self.file_mapping, analyzer),
- );
+ reports.extend(self.func_var_bound_analysis.reports_for_forks(
+ self.file_mapping,
+ analyzer,
+ arena,
+ ));
reports
}
- fn print_reports(&self, mut src: &mut impl Cache, analyzer: &impl GraphLike) {
- let reports = &self.reports(analyzer);
+ fn print_reports(
+ &self,
+ mut src: &mut impl Cache,
+ analyzer: &impl GraphBackend,
+ arena: &mut RangeArena>,
+ ) {
+ let reports = &self.reports(analyzer, arena);
for report in reports.iter() {
report.print(&mut src).unwrap();
}
}
- fn eprint_reports(&self, mut src: &mut impl Cache, analyzer: &impl GraphLike) {
- let reports = &self.reports(analyzer);
+ fn eprint_reports(
+ &self,
+ mut src: &mut impl Cache,
+ analyzer: &impl GraphBackend,
+ arena: &mut RangeArena>,
+ ) {
+ let reports = &self.reports(analyzer, arena);
reports.iter().for_each(|report| {
report.eprint(&mut src).unwrap();
});
diff --git a/src/context/analyzers/mod.rs b/crates/analyzers/src/lib.rs
similarity index 79%
rename from src/context/analyzers/mod.rs
rename to crates/analyzers/src/lib.rs
index 9414cbc3..f469f356 100644
--- a/src/context/analyzers/mod.rs
+++ b/crates/analyzers/src/lib.rs
@@ -1,10 +1,8 @@
pub mod bounds;
-use crate::AnalyzerLike;
-use crate::GraphLike;
use ariadne::{Cache, Label, Report, ReportKind, Span};
-use bounds::*;
-use shared::analyzer::Search;
+use graph::{elem::Elem, nodes::Concrete, AnalyzerBackend, GraphBackend};
+use shared::{RangeArena, Search};
use solang_parser::pt::Loc;
use std::collections::BTreeMap;
@@ -14,11 +12,11 @@ mod var_analyzer;
pub use var_analyzer::*;
pub trait ContextAnalyzer:
- AnalyzerLike + Search + VarBoundAnalyzer + FunctionVarsBoundAnalyzer
+ AnalyzerBackend + Search + VarBoundAnalyzer + FunctionVarsBoundAnalyzer
{
}
impl ContextAnalyzer for T where
- T: AnalyzerLike + Search + VarBoundAnalyzer + FunctionVarsBoundAnalyzer
+ T: AnalyzerBackend + Search + VarBoundAnalyzer + FunctionVarsBoundAnalyzer
{
}
@@ -168,9 +166,27 @@ impl Default for ReportConfig {
pub trait ReportDisplay {
fn report_kind(&self) -> ReportKind;
- fn msg(&self, analyzer: &impl GraphLike) -> String;
- fn labels(&self, analyzer: &impl GraphLike) -> Vec>;
- fn reports(&self, analyzer: &impl GraphLike) -> Vec>;
- fn print_reports(&self, src: &mut impl Cache, analyzer: &impl GraphLike);
- fn eprint_reports(&self, src: &mut impl Cache, analyzer: &impl GraphLike);
+ fn msg(&self, analyzer: &impl GraphBackend, arena: &mut RangeArena>) -> String;
+ fn labels(
+ &self,
+ analyzer: &impl GraphBackend,
+ arena: &mut RangeArena>,
+ ) -> Vec>;
+ fn reports(
+ &self,
+ analyzer: &impl GraphBackend,
+ arena: &mut RangeArena>,
+ ) -> Vec>;
+ fn print_reports(
+ &self,
+ src: &mut impl Cache,
+ analyzer: &impl GraphBackend,
+ arena: &mut RangeArena>,
+ );
+ fn eprint_reports(
+ &self,
+ src: &mut impl Cache,
+ analyzer: &impl GraphBackend,
+ arena: &mut RangeArena>,
+ );
}
diff --git a/src/context/analyzers/var_analyzer/mod.rs b/crates/analyzers/src/var_analyzer/mod.rs
similarity index 73%
rename from src/context/analyzers/var_analyzer/mod.rs
rename to crates/analyzers/src/var_analyzer/mod.rs
index 0f0fb23f..26399012 100644
--- a/src/context/analyzers/var_analyzer/mod.rs
+++ b/crates/analyzers/src/var_analyzer/mod.rs
@@ -1,20 +1,21 @@
-use crate::analyzers::range_parts;
-use crate::analyzers::AnalysisItem;
-use crate::analyzers::RangePart;
-use crate::analyzers::{LocStrSpan, ReportConfig};
-use shared::analyzer::GraphLike;
-use shared::{
- analyzer::{AnalyzerLike, Search},
- context::*,
- range::{Range, SolcRange},
+use crate::{
+ bounds::{range_parts, AnalysisItem, RangePart},
+ LocStrSpan, ReportConfig,
};
+
+use graph::{
+ elem::Elem,
+ nodes::{Concrete, ContextNode, ContextVarNode, KilledKind},
+ AnalyzerBackend, GraphBackend, Range, SolcRange,
+};
+use shared::{RangeArena, Search, StorageLocation};
+
use std::collections::BTreeSet;
-use solang_parser::pt::{CodeLocation, StorageLocation};
+use solang_parser::pt::CodeLocation;
use std::collections::BTreeMap;
mod report_display;
-pub use report_display::*;
#[derive(PartialOrd, Eq, PartialEq, Ord, Clone, Debug)]
pub struct CtxSwitch {
@@ -66,10 +67,14 @@ impl Default for VarBoundAnalysis {
}
impl VarBoundAnalysis {
- pub fn conditionals(&self, analyzer: &impl GraphLike) -> Vec<(String, Vec)> {
+ pub fn conditionals(
+ &self,
+ analyzer: &impl GraphBackend,
+ arena: &mut RangeArena>,
+ ) -> Vec<(String, Vec)> {
let deps = self.ctx.ctx_deps(analyzer).unwrap();
let deps = deps
- .values()
+ .iter()
.map(|var| (var.display_name(analyzer).unwrap(), var))
.collect::>();
// create the bound strings
@@ -77,18 +82,22 @@ impl VarBoundAnalysis {
.enumerate()
.filter_map(|(_i, (_name, cvar))| {
let range = cvar.ref_range(analyzer).unwrap()?;
- let parts = range_parts(analyzer, &self.report_config, &range).0;
+ let parts = range_parts(analyzer, arena, &self.report_config, &range).0;
Some((cvar.display_name(analyzer).unwrap(), parts))
})
.collect()
}
/// Creates an [AnalysisItem] if there is a initial bound for a variable
- pub fn init_item(&self, analyzer: &impl GraphLike) -> Option {
+ pub fn init_item(
+ &self,
+ analyzer: &impl GraphBackend,
+ arena: &mut RangeArena>,
+ ) -> Option {
let mut parts = vec![];
let mut unsat = false;
if let Some(init_range) = &self.var_def.1 {
- (parts, unsat) = range_parts(analyzer, &self.report_config, init_range)
+ (parts, unsat) = range_parts(analyzer, arena, &self.report_config, init_range)
}
if parts.is_empty() {
None
@@ -98,9 +107,9 @@ impl VarBoundAnalysis {
order: -1,
name: self.var_display_name.clone(),
loc: self.var_def.0.clone(),
- storage: self.storage.clone(),
+ storage: self.storage,
ctx: self.ctx,
- ctx_conditionals: self.conditionals(analyzer),
+ ctx_conditionals: self.conditionals(analyzer, arena),
parts,
unsat,
})
@@ -108,12 +117,13 @@ impl VarBoundAnalysis {
}
}
-impl VarBoundAnalyzer for T where T: Search + AnalyzerLike + Sized {}
-pub trait VarBoundAnalyzer: Search + AnalyzerLike + Sized {
+impl VarBoundAnalyzer for T where T: Search + AnalyzerBackend + Sized {}
+pub trait VarBoundAnalyzer: Search + AnalyzerBackend + Sized {
/// Given a lineage of a context (first element being the youngest, last element being the oldest),
/// generate a bound analysis for a variable throughout the lineage
fn bounds_for_var_in_family_tree(
&self,
+ arena: &mut RangeArena>,
file_mapping: &'_ BTreeMap,
ordered_ctxs: Vec,
var_name: String,
@@ -125,6 +135,7 @@ pub trait VarBoundAnalyzer: Search + AnalyzerLike + Sized {
.filter_map(|ctx| Some((ctx, ctx.var_by_name(self, &var_name)?)))
.for_each(|(_ctx, cvar)| {
let analysis = self.bounds_for_var_node(
+ arena,
&inherited,
file_mapping,
&var_name,
@@ -140,6 +151,7 @@ pub trait VarBoundAnalyzer: Search + AnalyzerLike + Sized {
/// Analyzes the bounds for a variable up to the provided node
fn bounds_for_var_node(
&self,
+ arena: &mut RangeArena>,
inherited: &Option,
file_mapping: &'_ BTreeMap,
var_name: &str,
@@ -215,7 +227,7 @@ pub trait VarBoundAnalyzer: Search + AnalyzerLike + Sized {
),
bound_changes: vec![],
report_config,
- storage: curr.underlying(self).unwrap().storage.clone(),
+ storage: curr.underlying(self).unwrap().storage,
ctx_killed: ctx
.killed_loc(self)
.unwrap()
@@ -224,15 +236,49 @@ pub trait VarBoundAnalyzer: Search + AnalyzerLike + Sized {
}
};
- if let Some(curr_range) = curr.ref_range(self).unwrap() {
- let mut cr_min = curr_range.evaled_range_min(self).unwrap();
- let mut cr_max = curr_range.evaled_range_max(self).unwrap();
+ let (comparator, needs_curr) =
+ if let Some(inherited) = curr.previous_or_inherited_version(self) {
+ (inherited, true)
+ } else {
+ (curr, false)
+ };
+
+ if let Some(curr_range) = comparator.ref_range(self).unwrap() {
+ let mut cr_min = curr_range.evaled_range_min(self, arena).unwrap();
+ let mut cr_max = curr_range.evaled_range_max(self, arena).unwrap();
let mut cr_excl = curr_range.range_exclusions();
+
+ if needs_curr {
+ if let Some(next_range) = curr.ref_range(self).unwrap() {
+ let nr_min = next_range.evaled_range_min(self, arena).unwrap();
+ let nr_max = next_range.evaled_range_max(self, arena).unwrap();
+ let nr_excl = &next_range.range_exclusions();
+
+ // check if there was a bound change
+ if report_config.show_all_lines
+ || nr_min != cr_min
+ || nr_max != cr_max
+ || nr_excl != &cr_excl
+ {
+ cr_min = nr_min;
+ cr_max = nr_max;
+ cr_excl = nr_excl.to_vec();
+ let new = (
+ LocStrSpan::new(file_mapping, curr.loc(self).unwrap()),
+ next_range.into_owned(),
+ );
+ if !ba.bound_changes.contains(&new) {
+ ba.bound_changes.push(new);
+ }
+ }
+ }
+ }
+
while let Some(next) = curr.next_version(self) {
if let Some(next_range) = next.ref_range(self).unwrap() {
- let nr_min = next_range.evaled_range_min(self).unwrap();
- let nr_max = next_range.evaled_range_max(self).unwrap();
- let nr_excl = &next_range.exclusions;
+ let nr_min = next_range.evaled_range_min(self, arena).unwrap();
+ let nr_max = next_range.evaled_range_max(self, arena).unwrap();
+ let nr_excl = &next_range.range_exclusions();
// check if there was a bound change
if report_config.show_all_lines
diff --git a/src/context/analyzers/var_analyzer/report_display.rs b/crates/analyzers/src/var_analyzer/report_display.rs
similarity index 59%
rename from src/context/analyzers/var_analyzer/report_display.rs
rename to crates/analyzers/src/var_analyzer/report_display.rs
index 66210180..a4b1e48a 100644
--- a/src/context/analyzers/var_analyzer/report_display.rs
+++ b/crates/analyzers/src/var_analyzer/report_display.rs
@@ -1,23 +1,32 @@
-use crate::analyzers::{LocStrSpan, ReportDisplay};
-use ariadne::{Cache, Color, Config, Fmt, Label, Report, ReportKind, Span};
-use shared::analyzer::GraphLike;
+use crate::{
+ bounds::{range_parts, AnalysisItem},
+ LocStrSpan, ReportDisplay, ReportKind, VarBoundAnalysis,
+};
-use crate::analyzers::var_analyzer::*;
+use graph::{elem::Elem, nodes::Concrete, GraphBackend};
+
+use shared::RangeArena;
+
+use ariadne::{Cache, Color, Config, Fmt, Label, Report, Span};
impl ReportDisplay for VarBoundAnalysis {
fn report_kind(&self) -> ReportKind {
ReportKind::Custom("Bounds", Color::Cyan)
}
- fn msg(&self, analyzer: &impl GraphLike) -> String {
+ fn msg(&self, analyzer: &impl GraphBackend, _arena: &mut RangeArena>) -> String {
format!(
"Bounds for {} in {}:",
self.var_display_name,
self.ctx.underlying(analyzer).unwrap().path
)
}
- fn labels(&self, analyzer: &impl GraphLike) -> Vec> {
+ fn labels(
+ &self,
+ analyzer: &impl GraphBackend,
+ arena: &mut RangeArena>,
+ ) -> Vec> {
let mut labels = if self.report_config.show_initial_bounds {
- if let Some(init_item) = self.init_item(analyzer) {
+ if let Some(init_item) = self.init_item(analyzer, arena) {
vec![init_item.into()]
} else {
vec![]
@@ -30,17 +39,17 @@ impl ReportDisplay for VarBoundAnalysis {
self.bound_changes
.iter()
.enumerate()
- .map(|(i, bound_change)| {
+ .map(|(_i, bound_change)| {
let (parts, unsat) =
- range_parts(analyzer, &self.report_config, &bound_change.1);
+ range_parts(analyzer, arena, &self.report_config, &bound_change.1);
AnalysisItem {
init: false,
name: self.var_display_name.clone(),
loc: bound_change.0.clone(),
- order: i as i32,
- storage: self.storage.clone(),
+ order: (bound_change.0.end() - bound_change.0.start()) as i32,
+ storage: self.storage,
ctx: self.ctx,
- ctx_conditionals: self.conditionals(analyzer),
+ ctx_conditionals: self.conditionals(analyzer, arena),
parts,
unsat,
}
@@ -52,13 +61,17 @@ impl ReportDisplay for VarBoundAnalysis {
labels
}
- fn reports(&self, analyzer: &impl GraphLike) -> Vec> {
+ fn reports(
+ &self,
+ analyzer: &impl GraphBackend,
+ arena: &mut RangeArena>,
+ ) -> Vec> {
let mut report = Report::build(
self.report_kind(),
self.var_def.0.source(),
self.var_def.0.start(),
)
- .with_message(self.msg(analyzer))
+ .with_message(self.msg(analyzer, arena))
.with_config(
Config::default()
.with_cross_gap(false)
@@ -66,7 +79,7 @@ impl ReportDisplay for VarBoundAnalysis {
.with_tab_width(4),
);
- report.add_labels(self.labels(analyzer));
+ report.add_labels(self.labels(analyzer, arena));
if let Some((killed_span, kind)) = &self.ctx_killed {
report = report.with_label(
@@ -90,15 +103,25 @@ impl ReportDisplay for VarBoundAnalysis {
reports
}
- fn print_reports(&self, mut src: &mut impl Cache, analyzer: &impl GraphLike) {
- let reports = self.reports(analyzer);
+ fn print_reports(
+ &self,
+ mut src: &mut impl Cache,
+ analyzer: &impl GraphBackend,
+ arena: &mut RangeArena>,
+ ) {
+ let reports = self.reports(analyzer, arena);
reports.into_iter().for_each(|report| {
report.print(&mut src).unwrap();
});
}
- fn eprint_reports(&self, mut src: &mut impl Cache, analyzer: &impl GraphLike) {
- let reports = self.reports(analyzer);
+ fn eprint_reports(
+ &self,
+ mut src: &mut impl Cache,
+ analyzer: &impl GraphBackend,
+ arena: &mut RangeArena>,
+ ) {
+ let reports = self.reports(analyzer, arena);
reports.into_iter().for_each(|report| {
report.eprint(&mut src).unwrap();
});
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
new file mode 100644
index 00000000..5029e551
--- /dev/null
+++ b/crates/cli/Cargo.toml
@@ -0,0 +1,37 @@
+[package]
+name = "cli"
+
+version.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+authors.workspace = true
+license.workspace = true
+homepage.workspace = true
+repository.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+analyzers.workspace = true
+shared.workspace = true
+pyrometer.workspace = true
+graph.workspace = true
+# queries.workspace = true
+
+ariadne.workspace = true
+tracing.workspace = true
+tracing-subscriber.workspace = true
+tracing-tree.workspace = true
+petgraph.workspace = true
+ethers-core.workspace = true
+
+
+clap = { version = "4.1.4", features = ["derive"] }
+
+[[bin]]
+name = "pyrometer"
+path = "src/main.rs"
+
+
+# [profile.release]
+# debug = true
\ No newline at end of file
diff --git a/cli/src/main.rs b/crates/cli/src/main.rs
similarity index 54%
rename from cli/src/main.rs
rename to crates/cli/src/main.rs
index 5449ab71..a55d8426 100644
--- a/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -1,26 +1,24 @@
-use crate::analyzers::ReportConfig;
+use analyzers::{FunctionVarsBoundAnalyzer, ReportConfig, ReportDisplay};
+use graph::{
+ nodes::{ContractNode, FunctionNode},
+ solvers::{AtomicSolveStatus, BruteBinSearchSolver, SolcSolver},
+ Edge,
+};
+use pyrometer::{Analyzer, Root, SourcePath};
+use shared::GraphDot;
+use shared::Search;
+
use ariadne::sources;
use clap::{ArgAction, Parser, ValueHint};
-use pyrometer::context::analyzers::FunctionVarsBoundAnalyzer;
-use pyrometer::{
- context::{analyzers::ReportDisplay, *},
- Analyzer,
-};
-use shared::nodes::FunctionNode;
+use tracing_subscriber::{prelude::*, Registry};
-use shared::Edge;
-use shared::{
- analyzer::{GraphLike, Search},
- nodes::ContractNode,
+use std::{
+ collections::{BTreeMap, HashMap},
+ env::{self},
+ fs,
+ path::PathBuf,
};
-use tracing_subscriber::prelude::*;
-
-use std::collections::{BTreeMap, HashMap};
-use std::path::PathBuf;
-
-use std::env::{self};
-use std::fs;
#[derive(Parser, Debug)]
#[command(author, version, about, long_about = None)]
@@ -58,10 +56,16 @@ struct Args {
pub verbosity: u8,
/// Whether to print out a dot string of the analyzed contracts
#[clap(long, short, default_value = "false")]
+ pub mermaid: bool,
+ /// Whether to print out a dot string of the analyzed contracts
+ #[clap(long, short, default_value = "false")]
pub dot: bool,
/// Whether to generate and open a dot visualization of the analyzed contracts
#[clap(long, short, default_value = "false")]
pub open_dot: bool,
+ /// Whether to generate and open a mermaid visualization of the analyzed contracts
+ #[clap(long, default_value = "false")]
+ pub open_mermaid: bool,
/// Whether to evaluate variables down to their intervals or to keep them symbolic/relational to other variables
#[clap(long, short)]
pub eval: Option,
@@ -80,16 +84,22 @@ struct Args {
/// Show non-revert paths
#[clap(long)]
pub show_nonreverts: Option,
- // #[clap(long, short)]
- // pub access_query: Vec,
- // #[clap(long, short)]
- // pub query: Vec,
- // #[clap(long, short)]
- // pub write_query: Vec,
/// A debugging command to prevent bound analysis printing. Useful for debugging parse errors during development. Only prints out parse errors
/// then ends the program
#[clap(long)]
pub debug: bool,
+
+ /// Forces a panic on first error encountered
+ #[clap(long)]
+ pub debug_panic: bool,
+
+ /// Max stack depth to evaluate to
+ #[clap(long, default_value = "200")]
+ pub max_stack_depth: usize,
+
+ /// Print stats about the IR
+ #[clap(long)]
+ pub stats: bool,
}
pub fn subscriber() {
@@ -99,10 +109,24 @@ pub fn subscriber() {
.init()
}
+pub fn tree_subscriber() {
+ let subscriber = Registry::default()
+ .with(
+ tracing_tree::HierarchicalLayer::default()
+ .with_indent_lines(true)
+ .with_indent_amount(2)
+ .with_thread_names(true), // .with_thread_ids(true)
+ // .with_verbose_exit(true)
+ // .with_verbose_entry(true)
+ // .with_targets(true)
+ )
+ .with(tracing_subscriber::filter::EnvFilter::from_default_env());
+ tracing::subscriber::set_global_default(subscriber).unwrap();
+}
+
fn main() {
- subscriber();
+ tree_subscriber();
let args = Args::parse();
- let path_str = args.path.to_string();
let verbosity = args.verbosity;
let config = match verbosity {
0 => ReportConfig {
@@ -202,62 +226,152 @@ fn main() {
show_nonreverts: args.show_nonreverts.unwrap_or(true),
},
};
-
- let sol = fs::read_to_string(args.path.clone()).expect("Could not find file");
-
let mut analyzer = Analyzer {
- root: env::current_dir().unwrap(),
+ max_depth: args.max_stack_depth,
+ root: Root::RemappingsDirectory(env::current_dir().unwrap()),
..Default::default()
};
- if args.remappings.is_some() {
- let remappings = args.remappings.unwrap();
- analyzer.set_remappings_and_root(remappings);
- }
+ println!("debug panic: {}", args.debug_panic);
+ analyzer.debug_panic = args.debug_panic;
+
+ let (current_path, sol) = if args.path.ends_with(".sol") {
+ let sol = fs::read_to_string(args.path.clone()).expect("Could not find file");
+ // Remappings file only required for Solidity files
+ if args.remappings.is_some() {
+ let remappings = args.remappings.unwrap();
+ analyzer.set_remappings_and_root(remappings);
+ }
+
+ (
+ SourcePath::SolidityFile(PathBuf::from(args.path.clone())),
+ sol,
+ )
+ } else if args.path.ends_with(".json") {
+ let json_path_buf = PathBuf::from(args.path.clone());
+ analyzer.update_with_solc_json(&json_path_buf);
+ let (current_path, sol, _, _) = analyzer.sources.first().unwrap().clone();
+ (current_path, sol)
+ } else {
+ panic!("Unsupported file type")
+ };
+
+ let mut arena_base = Default::default();
+ let arena = &mut arena_base;
let t0 = std::time::Instant::now();
- let (maybe_entry, mut all_sources) =
- analyzer.parse(&sol, &PathBuf::from(args.path.clone()), true);
- let parse_time = t0.elapsed().as_millis();
+ let maybe_entry = analyzer.parse(arena, &sol, ¤t_path, true);
+ let t_end = t0.elapsed();
+ let parse_time = t_end.as_millis();
println!("DONE ANALYZING IN: {parse_time}ms. Writing to cli...");
- all_sources.push((maybe_entry, args.path, sol, 0));
- let entry = maybe_entry.unwrap();
+ if args.stats {
+ println!("{}", analyzer.stats(t_end, arena));
+ }
+ // println!("Arena: {:#?}", analyzer.range_arena);
- let mut file_mapping: BTreeMap<_, _> = vec![(0usize, path_str)].into_iter().collect();
- file_mapping.extend(
- all_sources
- .iter()
- .map(|(_entry, name, _src, num)| (*num, name.clone()))
- .collect::>(),
- );
+ // use self.sources to fill a BTreeMap with the file_no and SourcePath.path_to_solidity_file
+ let mut file_mapping: BTreeMap = BTreeMap::new();
+ let mut src_map: HashMap = HashMap::new();
+ for (source_path, sol, o_file_no, _o_entry) in analyzer.sources.iter() {
+ if let Some(file_no) = o_file_no {
+ file_mapping.insert(
+ *file_no,
+ source_path.path_to_solidity_source().display().to_string(),
+ );
+ }
+ src_map.insert(
+ source_path.path_to_solidity_source().display().to_string(),
+ sol.to_string(),
+ );
+ }
+ let mut source_map = sources(src_map);
- let mut source_map = sources(
- all_sources
- .iter()
- .map(|(_entry, name, src, _num)| (name.clone(), src))
- .collect::>(),
- );
+ let entry = maybe_entry.unwrap();
+
+ // analyzer.print_errors(&file_mapping, &mut source_map);
// let t = petgraph::algo::toposort(&analyzer.graph, None);
analyzer.print_errors(&file_mapping, &mut source_map);
if args.open_dot {
- analyzer.open_dot()
+ analyzer.open_dot(arena)
}
if args.dot {
- println!("{}", analyzer.dot_str_no_tmps());
+ println!("{}", analyzer.dot_str_no_tmps(arena));
+ }
+
+ if args.mermaid {
+ println!("{}", analyzer.mermaid_str(arena));
}
+ if args.open_mermaid {
+ analyzer.open_mermaid(arena);
+ }
+
+ // println!("{}", analyzer.range_arena.ranges.iter().map(|i| {
+ // let j = i.borrow();
+ // let (min_cached, max_cached) = j.is_min_max_cached(&analyzer);
+ // format!("\t{j}, is cached: {min_cached}, {max_cached}\n")
+ // }).collect::>().join(""));
+ // println!("{}", analyzer.range_arena.map.iter().map(|(k, v)| {
+ // format!("\t{}: {}\n", k, v)
+ // }).collect::>().join(""));
+
if args.debug {
return;
}
+ // println!("getting contracts");
let all_contracts = analyzer
.search_children(entry, &Edge::Contract)
.into_iter()
.map(ContractNode::from)
.collect::>();
+
+ // TODO: clean this up to actually run on all contracts
+ // if args.swq {
+ // println!("Creating SWQ graph for {} contracts", all_contracts.len());
+ // let mut cond_graph: Option = None;
+ // for i in 0..all_contracts.len() {
+ // match (&mut cond_graph, analyzer.func_query(all_contracts[i])) {
+ // (Some(ref mut existing), Some(new)) => {
+ // existing.append_graph(new);
+ // }
+ // (None, Some(new)) => {
+ // cond_graph = Some(new);
+ // }
+ // _ => {}
+ // }
+ // }
+
+ // if let Some(graph) = cond_graph {
+ // println!("{}", graph.dot_str());
+ // graph.open_dot();
+ // } else {
+ // println!("no graph");
+ // }
+ // } else if args.swq_mermaid {
+ // println!("Creating SWQ graph for {} contracts", all_contracts.len());
+ // let mut cond_graph: Option = None;
+ // for i in 0..all_contracts.len() {
+ // match (&mut cond_graph, analyzer.func_query(all_contracts[i])) {
+ // (Some(ref mut existing), Some(new)) => {
+ // existing.append_graph(new);
+ // }
+ // (None, Some(new)) => {
+ // cond_graph = Some(new);
+ // }
+ // _ => {}
+ // }
+ // }
+
+ // if let Some(graph) = cond_graph {
+ // println!("{}", graph.mermaid_str());
+ // } else {
+ // println!("no graph");
+ // }
+ // } else {
let _t1 = std::time::Instant::now();
if args.contracts.is_empty() {
let funcs = analyzer.search_children(entry, &Edge::Func);
@@ -265,22 +379,67 @@ fn main() {
if !args.funcs.is_empty() {
if args.funcs.iter().any(|analyze_for| {
FunctionNode::from(func)
- .name(&analyzer)
+ .name(&mut analyzer)
.unwrap()
.starts_with(analyze_for)
}) {
if let Some(ctx) = FunctionNode::from(func).maybe_body_ctx(&mut analyzer) {
- let analysis = analyzer
- .bounds_for_all(&file_mapping, ctx, config)
- .as_cli_compat(&file_mapping);
- analysis.print_reports(&mut source_map, &analyzer);
+ let mut all_edges = ctx.all_edges(&analyzer).unwrap();
+ all_edges.push(ctx);
+ all_edges.iter().for_each(|c| {
+ let _rets = c.return_nodes(&analyzer).unwrap();
+ // if c.path(&analyzer).starts_with(r#"step(uint64, uint64, uint64, uint64, uint64, uint64, uint64, uint64, uint64, uint64)"#)
+ // && rets.iter().take(1).any(|ret| {
+ // let range = ret.1.ref_range(&analyzer).unwrap().unwrap();
+ // range.evaled_range_min(&analyzer).unwrap().range_eq(&Elem::from(Concrete::from(I256::from(-1))))
+ // })
+ {
+ // step(uint64, uint64, uint64, uint64, uint64, uint64, uint64, uint64).fork{ false }.fork{ true }.fork{ true }.fork{ false }"#.to_string()) {
+ // println!("{:#?}", c.ctx_deps_as_controllables_str(&analyzer).unwrap());
+ if let Some(mut solver) = BruteBinSearchSolver::maybe_new(
+ c.ctx_deps(&analyzer).unwrap(),
+ &mut analyzer,
+ arena,
+ )
+ .unwrap()
+ {
+ match solver.solve(&mut analyzer, arena).unwrap() {
+ AtomicSolveStatus::Unsat => {
+ println!("TRUE UNSAT: {}", c.path(&analyzer));
+ }
+ AtomicSolveStatus::Sat(ranges) => {
+ // println!("-----------------------");
+ // println!("sat for: {}", c.path(&analyzer));
+ ranges.iter().for_each(|(atomic, conc)| {
+ println!(
+ "{}: {}",
+ atomic.idxs[0].display_name(&analyzer).unwrap(),
+ conc.as_human_string()
+ );
+ });
+ }
+ AtomicSolveStatus::Indeterminate => {
+ // println!("-----------------------");
+ // println!("sat for: {}", c.path(&analyzer));
+ // println!("MAYBE UNSAT");
+ }
+ }
+ }
+ // println!("-----------------------");
+ let analysis = analyzer
+ .bounds_for_lineage(arena, &file_mapping, *c, vec![*c], config)
+ .as_cli_compat(&file_mapping);
+ analysis.print_reports(&mut source_map, &analyzer, arena);
+ // return;
+ }
+ });
}
}
} else if let Some(ctx) = FunctionNode::from(func).maybe_body_ctx(&mut analyzer) {
let analysis = analyzer
- .bounds_for_all(&file_mapping, ctx, config)
+ .bounds_for_all(arena, &file_mapping, ctx, config)
.as_cli_compat(&file_mapping);
- analysis.print_reports(&mut source_map, &analyzer);
+ analysis.print_reports(&mut source_map, &analyzer, arena);
}
}
} else {
@@ -296,23 +455,24 @@ fn main() {
let funcs = contract.funcs(&analyzer);
for func in funcs.into_iter() {
if !args.funcs.is_empty() {
- if args.funcs.contains(&func.name(&analyzer).unwrap()) {
+ if args.funcs.contains(&func.name(&mut analyzer).unwrap()) {
let ctx = func.body_ctx(&mut analyzer);
let analysis = analyzer
- .bounds_for_all(&file_mapping, ctx, config)
+ .bounds_for_all(arena, &file_mapping, ctx, config)
.as_cli_compat(&file_mapping);
- analysis.print_reports(&mut source_map, &analyzer);
+ analysis.print_reports(&mut source_map, &analyzer, arena);
}
} else {
let ctx = func.body_ctx(&mut analyzer);
let analysis = analyzer
- .bounds_for_all(&file_mapping, ctx, config)
+ .bounds_for_all(arena, &file_mapping, ctx, config)
.as_cli_compat(&file_mapping);
- analysis.print_reports(&mut source_map, &analyzer);
+ analysis.print_reports(&mut source_map, &analyzer, arena);
}
}
});
}
+ // }
// args.query.iter().for_each(|query| {
// analyzer.taint_query(entry, query.to_string());
diff --git a/crates/graph/Cargo.toml b/crates/graph/Cargo.toml
new file mode 100644
index 00000000..af3dff3a
--- /dev/null
+++ b/crates/graph/Cargo.toml
@@ -0,0 +1,27 @@
+[package]
+name = "graph"
+description = "Pyrometer's internal graph"
+
+version.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+authors.workspace = true
+license.workspace = true
+homepage.workspace = true
+repository.workspace = true
+
+[dependencies]
+shared.workspace = true
+solang-parser.workspace = true
+
+petgraph.workspace = true
+ethers-core.workspace = true
+hex.workspace = true
+tracing.workspace = true
+tracing-subscriber.workspace = true
+
+itertools = "0.10.5"
+lazy_static = "1.4.0"
+
+[dev-dependencies]
+pretty_assertions = "1.4.0"
diff --git a/crates/graph/src/graph_elements.rs b/crates/graph/src/graph_elements.rs
new file mode 100644
index 00000000..652d643d
--- /dev/null
+++ b/crates/graph/src/graph_elements.rs
@@ -0,0 +1,423 @@
+use crate::elem::Elem;
+use crate::{nodes::*, VarType};
+
+use shared::{AnalyzerLike, GraphLike, Heirarchical, NodeIdx, RangeArena};
+
+use lazy_static::lazy_static;
+use petgraph::{Directed, Graph};
+use solang_parser::pt::{Identifier, Loc};
+
+use std::collections::HashMap;
+
+pub trait GraphBackend: GraphLike> {}
+pub trait AnalyzerBackend:
+ AnalyzerLike<
+ Builtin = Builtin,
+ MsgNode = MsgNode,
+ BlockNode = BlockNode,
+ FunctionNode = FunctionNode,
+ FunctionParam = FunctionParam,
+ FunctionReturn = FunctionReturn,
+ Function = Function,
+ > + GraphBackend
+{
+ fn add_concrete_var(
+ &mut self,
+ ctx: ContextNode,
+ concrete: Concrete,
+ loc: Loc,
+ ) -> Result;
+}
+
+pub trait AsDotStr {
+ fn as_dot_str(
+ &self,
+ analyzer: &impl GraphBackend,
+ arena: &mut RangeArena>,
+ ) -> String;
+}
+
+#[derive(Debug, Clone, Ord, Eq, PartialEq, PartialOrd)]
+pub enum GraphError {
+ /// The analyzer thought the node was suppose to be one type, but it was a different one
+ NodeConfusion(String),
+ /// Call depth limit reached
+ MaxStackDepthReached(String),
+ /// Fork width limit reached
+ MaxStackWidthReached(String),
+ /// Tried to set the subcontext of a context that already had a subcontext
+ ChildRedefinition(String),
+ /// Tried to update a variable that is in an old context
+ VariableUpdateInOldContext(String),
+ /// Variable is detached from all contexts
+ DetachedVariable(String),
+ /// Expected a single element, found multiple
+ ExpectedSingle(String),
+ /// Expected a vector with a certain number of elements, but it was a different number of elements
+ StackLengthMismatch(String),
+ /// A variable had a cyclic reference to another variable and we were unable to break the cycle
+ UnbreakableRecursion(String),
+ /// The analyzer thought the node was suppose to be one type, but it was a different one
+ UnknownVariable(String),
+}
+
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub enum Node {
+ /// An analyzed function body/context
+ Context(Context),
+ /// A variable attached to a context or the previous version of this variable (akin to SSA form)
+ ContextVar(ContextVar),
+ /// A fork in execution caused by an if-like statement
+ ContextFork,
+ /// A call to another function, either public or internal
+ FunctionCall,
+ /// A builtin solidity type (i.e. Address, Uint, Bytes, etc)
+ Builtin(Builtin),
+ /// A node that represents whether a variable's type is a User-defined type, builtin type or a concrete
+ VarType(VarType),
+ /// The entry node in the graph
+ Entry,
+ /// A source unit (i.e. a source file)
+ SourceUnit(SourceUnit),
+ /// A subcomponent of the source unit
+ SourceUnitPart(SourceUnitPart),
+ /// A contract
+ Contract(Contract),
+ /// A solidity-based function
+ Function(Function),
+ /// A solidity-based function parameter
+ FunctionParam(FunctionParam),
+ /// A solidity-based function return parameter
+ FunctionReturn(FunctionReturn),
+ /// A solidity-based struct
+ Struct(Struct),
+ /// A solidity-based enum
+ Enum(Enum),
+ /// A solidity-based error
+ Error(Error),
+ /// A solidity-based error parameter
+ ErrorParam(ErrorParam),
+ /// A solidity-based struct or contract field
+ Field(Field),
+ /// A storage or constant variable on a contract
+ Var(Var),
+ /// A solidity-based type alias
+ Ty(Ty),
+ /// An unresolved type
+ Unresolved(Identifier),
+ /// A concrete value (i.e. '1' or '0x111')
+ Concrete(Concrete),
+ /// The `msg` global in solidity
+ Msg(Msg),
+ /// The `block` global in solidity
+ Block(Block),
+}
+
+pub fn as_dot_str(
+ idx: NodeIdx,
+ analyzer: &impl GraphBackend,
+ arena: &mut RangeArena>,
+) -> String {
+ use crate::Node::*;
+ match analyzer.node(idx) {
+ Context(_) => ContextNode::from(idx).as_dot_str(analyzer, arena),
+ ContextVar(_) => ContextVarNode::from(idx).as_dot_str(analyzer, arena),
+ ContextFork => "Context Fork".to_string(),
+ FunctionCall => "Function Call".to_string(),
+ Builtin(bi) => bi.as_string(analyzer).unwrap(),
+ VarType(v_ty) => v_ty.as_string(analyzer).unwrap(),
+ Contract(_c) => ContractNode::from(idx).as_dot_str(analyzer, arena),
+ Function(_f) => FunctionNode::from(idx).as_dot_str(analyzer, arena),
+ FunctionParam(_fp) => FunctionParamNode::from(idx).as_dot_str(analyzer, arena),
+ FunctionReturn(_fr) => FunctionReturnNode::from(idx).as_dot_str(analyzer, arena),
+ Struct(_s) => StructNode::from(idx).as_dot_str(analyzer, arena),
+ Enum(_e) => EnumNode::from(idx).as_dot_str(analyzer, arena),
+ Field(_f) => FieldNode::from(idx).as_dot_str(analyzer, arena),
+ Var(_v) => VarNode::from(idx).as_dot_str(analyzer, arena),
+ Ty(_t) => TyNode::from(idx).as_dot_str(analyzer, arena),
+ // Concrete(c) => c.as_human_string(),
+ e => format!("{e:?}"),
+ }
+}
+
+impl Node {
+ pub fn dot_str_color(&self) -> String {
+ use crate::Node::*;
+ let c = match self {
+ Context(_) => TOKYO_NIGHT_COLORS.get("purple").unwrap(),
+ ContextVar(_) => TOKYO_NIGHT_COLORS.get("orange").unwrap(),
+ FunctionCall => TOKYO_NIGHT_COLORS.get("cyan").unwrap(),
+ Contract(_c) => TOKYO_NIGHT_COLORS.get("green").unwrap(),
+ Function(_f) => TOKYO_NIGHT_COLORS.get("cyan").unwrap(),
+ Struct(_s) => TOKYO_NIGHT_COLORS.get("yellow").unwrap(),
+ Enum(_e) => TOKYO_NIGHT_COLORS.get("yellow").unwrap(),
+ _ => TOKYO_NIGHT_COLORS.get("default").unwrap(),
+ };
+ c.to_string()
+ }
+}
+
+pub fn num_to_color(x: usize) -> String {
+ let c = match x % 29 {
+ 0 => TOKYO_NIGHT_COLORS.get("default").unwrap(),
+ 1 => TOKYO_NIGHT_COLORS.get("font").unwrap(),
+ 2 => TOKYO_NIGHT_COLORS.get("bg_highlight").unwrap(),
+ 3 => TOKYO_NIGHT_COLORS.get("terminal_black").unwrap(),
+ 4 => TOKYO_NIGHT_COLORS.get("fg_dark").unwrap(),
+ 5 => TOKYO_NIGHT_COLORS.get("fg_gutter").unwrap(),
+ 6 => TOKYO_NIGHT_COLORS.get("dark3").unwrap(),
+ 7 => TOKYO_NIGHT_COLORS.get("dark5").unwrap(),
+ 8 => TOKYO_NIGHT_COLORS.get("blue0").unwrap(),
+ 9 => TOKYO_NIGHT_COLORS.get("cyan").unwrap(),
+ 10 => TOKYO_NIGHT_COLORS.get("blue2").unwrap(),
+ 11 => TOKYO_NIGHT_COLORS.get("blue5").unwrap(),
+ 12 => TOKYO_NIGHT_COLORS.get("blue6").unwrap(),
+ 13 => TOKYO_NIGHT_COLORS.get("blue7").unwrap(),
+ 14 => TOKYO_NIGHT_COLORS.get("magenta2").unwrap(),
+ 15 => TOKYO_NIGHT_COLORS.get("purple").unwrap(),
+ 16 => TOKYO_NIGHT_COLORS.get("orange").unwrap(),
+ 17 => TOKYO_NIGHT_COLORS.get("yellow").unwrap(),
+ 18 => TOKYO_NIGHT_COLORS.get("green").unwrap(),
+ 19 => TOKYO_NIGHT_COLORS.get("green1").unwrap(),
+ 20 => TOKYO_NIGHT_COLORS.get("teal").unwrap(),
+ 21 => TOKYO_NIGHT_COLORS.get("red").unwrap(),
+ 22 => TOKYO_NIGHT_COLORS.get("red1").unwrap(),
+ 23 => TOKYO_NIGHT_COLORS.get("cyan").unwrap(),
+ 24 => TOKYO_NIGHT_COLORS.get("teal").unwrap(),
+ 25 => TOKYO_NIGHT_COLORS.get("darkblue").unwrap(),
+ 26 => TOKYO_NIGHT_COLORS.get("purple").unwrap(),
+ 27 => TOKYO_NIGHT_COLORS.get("bg1").unwrap(),
+ 28 => TOKYO_NIGHT_COLORS.get("deepred").unwrap(),
+ _ => unreachable!(),
+ };
+ c.to_string()
+}
+
+lazy_static! {
+ pub static ref TOKYO_NIGHT_COLORS: HashMap<&'static str, &'static str> = {
+ let mut m = HashMap::new();
+ m.insert("bg_dark", "#1f2335");
+ m.insert("bg1", "#24283b");
+ m.insert("bg_highlight", "#292e42");
+ m.insert("terminal_black", "#414868");
+ m.insert("fg_dark", "#a9b1d6");
+ m.insert("fg_gutter", "#3b4261");
+ m.insert("dark3", "#545c7e");
+ m.insert("dark5", "#737aa2");
+ m.insert("blue0", "#3d59a1");
+ m.insert("cyan", "#7dcfff");
+ m.insert("blue2", "#0db9d7");
+ m.insert("blue5", "#89ddff");
+ m.insert("blue6", "#b4f9f8");
+ m.insert("blue7", "#394b70");
+ m.insert("magenta2", "#ff007c");
+ m.insert("purple", "#9d7cd8");
+ m.insert("orange", "#ff9e64");
+ m.insert("yellow", "#e0af68");
+ m.insert("green", "#9ece6a");
+ m.insert("green1", "#41a6b5");
+ m.insert("teal", "#1abc9c");
+ m.insert("red", "#f7768e");
+ m.insert("red1", "#db4b4b");
+ m.insert("cyan", "#73daca");
+ m.insert("teal", "#2ac3de");
+ m.insert("darkblue", "#7aa2f7");
+ m.insert("purple", "#bb9af7");
+ m.insert("bg", "#1a1b26");
+ m.insert("font", "#c0caf5");
+ m.insert("deepred", "#703440");
+ m.insert("default", "#565f89");
+ m
+ };
+}
+
+#[derive(Debug, Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash)]
+pub enum Edge {
+ /// A connection between a Source and the Entry
+ Source,
+ /// A connection between a SourceUnitPart and a Source
+ Part,
+ /// An edge indicating that a source or contract was imported
+ Import,
+ /// An edge that contains a subtype of edge corresponding to some
+ /// kind of context-based relationship
+ Context(ContextEdge),
+ /// A connection for a contract to it's parent
+ Contract,
+ /// A connection for a contract to it's parent contract
+ InheritedContract,
+ /// A connection for a field to it's parent
+ Field,
+ /// A connection for an enum to it's parent
+ Enum,
+ /// A connection for a struct to it's parent
+ Struct,
+ /// A connection for an error to it's parent
+ Error,
+ /// A connection for an error parameter to it's parent error
+ ErrorParam,
+ /// A connection for an event to it's parent
+ Event,
+ /// A connection for a storage/constant variable to it's parent
+ Var,
+ Ty,
+ /// A connection for a function to it's parent
+ Func,
+ /// A connection for a function parameter to it's parent function
+ FunctionParam,
+ /// A connection for a function return to it's parent function
+ FunctionReturn,
+ /// A connection for a function modifier to it's parent function, with its order
+ FuncModifier(usize),
+ /// A connection for a modifier to it's parent
+ Modifier,
+ /// A connection for a fallback function to it's parent contract
+ FallbackFunc,
+ /// A connection for a contract constructor function to it's parent contract
+ Constructor,
+ /// A connection for a receive function to it's parent contract
+ ReceiveFunc,
+ /// A connection for a library-based function to a contract
+ LibraryFunction(NodeIdx),
+ /// A connection for a builtin function
+ BuiltinFunction,
+}
+
+impl Heirarchical for Edge {
+ fn heirarchical_num(&self) -> usize {
+ use crate::Edge::*;
+ match self {
+ Source => 0,
+ Part | Import => 1,
+
+ Contract | Ty | Field | Enum | Struct | Error | Event | Var | InheritedContract
+ | Modifier | FallbackFunc | Constructor | ReceiveFunc | LibraryFunction(_)
+ | BuiltinFunction | Func => 2,
+
+ Context(_) | ErrorParam | FunctionParam | FunctionReturn | FuncModifier(_) => 3,
+ }
+ }
+}
+
+/// An enum denoting either a call or a fork
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Ord, PartialOrd)]
+pub enum CallFork {
+ Call(ContextNode),
+ Fork(ContextNode, ContextNode),
+}
+
+impl CallFork {
+ pub fn maybe_call(&self) -> Option {
+ match self {
+ CallFork::Call(c) => Some(*c),
+ _ => None,
+ }
+ }
+
+ pub fn maybe_fork(&self) -> Option<(ContextNode, ContextNode)> {
+ match self {
+ CallFork::Fork(w1, w2) => Some((*w1, *w2)),
+ _ => None,
+ }
+ }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Ord, PartialOrd)]
+pub enum ContextEdge {
+ // Control flow
+ /// A connection for a context to a function
+ Context,
+ /// A connection for a subcontext to it's parent context
+ Subcontext,
+ /// A connection for a context to another context in which the source is the new
+ /// context and the target is the original context. That is:
+ /// ContextA -subcontext-> ContextB -subcontext> ContextAPrime
+ /// ^-----------------------ReturningContext--------|
+ ReturningContext,
+ /// A connection to a ContextFork to denote a fork in execution
+ ContextFork,
+ /// Currently unused
+ ContextMerge,
+ /// A call to a function, a connection from a context to a `FuncCall` node
+ Call,
+ /// A loop
+ Loop,
+
+ // Context Variables
+ /// A new variable in cotext
+ Variable,
+ /// A connection between a variable in a new context and that variable in a parent context denoting
+ /// that it is inherited from a parent scope
+ InheritedVariable,
+ /// A connection between a `Var` and a context variable denoting that the variable reads from storage
+ InheritedStorageVariable,
+ /// A connection to the calldata variable
+ CalldataVariable,
+
+ /// A connection between a variable and a parent variable where the child is some attribute on the parent
+ /// (i.e. `.length`)
+ AttrAccess(&'static str),
+ /// A connection between a variable and the index that was used to create the variable from an IndexAccess
+ Index,
+ /// A connection between a variable and a parent variable where the child is some index into the parent
+ /// (i.e. `x[1]`)
+ IndexAccess,
+ /// A connection between a variable and a parent variable where the child is some field of the parent
+ StructAccess,
+ /// A connection between a function-as-a-variable and the contract that holds that function
+ FuncAccess,
+ /// A write to a storage variable, connecting the variable that is written to the variable and the storage variable itself
+ StorageWrite,
+ /// An access to a storage slot
+ SlotAccess,
+
+ // Variable incoming edges
+ /// Unused
+ Assign,
+ /// Unused
+ StorageAssign,
+ /// Unused
+ MemoryAssign,
+ /// A connection of a variable to the previous version of that variable
+ Prev,
+
+ // Control flow
+ /// A connection between a variable and the context denoting that the variable is returned
+ Return,
+ /// A continuation of a context
+ Continue(&'static str),
+ /// A connection between a brand new created variable for a function's context and the variable
+ InputVariable,
+ /// A connection to a return variable that should be assigned
+ ReturnAssign(bool),
+
+ // Range analysis
+ /// Unused
+ Range,
+}
+
+#[derive(Default)]
+pub(crate) struct DummyGraph {
+ pub range_arena: RangeArena>,
+}
+
+impl GraphLike for DummyGraph {
+ type Node = Node;
+ type Edge = Edge;
+ type RangeElem = Elem;
+ fn graph_mut(&mut self) -> &mut Graph {
+ panic!("Dummy Graph")
+ }
+
+ fn graph(&self) -> &Graph {
+ panic!("Dummy Graph")
+ }
+ fn range_arena(&self) -> &RangeArena> {
+ &self.range_arena
+ }
+ fn range_arena_mut(&mut self) -> &mut RangeArena> {
+ &mut self.range_arena
+ }
+}
+
+impl GraphBackend for DummyGraph {}
diff --git a/crates/graph/src/lib.rs b/crates/graph/src/lib.rs
new file mode 100644
index 00000000..2f35381d
--- /dev/null
+++ b/crates/graph/src/lib.rs
@@ -0,0 +1,10 @@
+mod graph_elements;
+mod range;
+mod var_type;
+
+pub mod nodes;
+pub mod solvers;
+
+pub use graph_elements::*;
+pub use range::*;
+pub use var_type::*;
diff --git a/shared/src/nodes/block.rs b/crates/graph/src/nodes/block.rs
similarity index 73%
rename from shared/src/nodes/block.rs
rename to crates/graph/src/nodes/block.rs
index e5cd8201..4ac5bf6a 100644
--- a/shared/src/nodes/block.rs
+++ b/crates/graph/src/nodes/block.rs
@@ -1,12 +1,7 @@
-use crate::analyzer::AsDotStr;
-use crate::analyzer::GraphError;
-use crate::analyzer::GraphLike;
+use crate::{nodes::Concrete, range::elem::Elem, AsDotStr, GraphBackend, GraphError, Node};
+use shared::{NodeIdx, RangeArena};
-use crate::Node;
-use crate::NodeIdx;
-use ethers_core::types::Address;
-use ethers_core::types::H256;
-use ethers_core::types::U256;
+use ethers_core::types::{Address, H256, U256};
/// An index in the graph that references a Block node
#[derive(Debug, Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash)]
@@ -14,9 +9,13 @@ pub struct BlockNode(pub usize);
impl BlockNode {
/// Gets the underlying node data for the block environment
- pub fn underlying<'a>(&self, analyzer: &'a impl GraphLike) -> Result<&'a Block, GraphError> {
+ pub fn underlying<'a>(&self, analyzer: &'a impl GraphBackend) -> Result<&'a Block, GraphError> {
match analyzer.node(*self) {
Node::Block(st) => Ok(st),
+ Node::Unresolved(ident) => Err(GraphError::UnknownVariable(format!(
+ "Could not find variable: {}",
+ ident.name
+ ))),
e => Err(GraphError::NodeConfusion(format!(
"Node type confusion: expected node to be Msg but it was: {e:?}"
))),
@@ -25,7 +24,11 @@ impl BlockNode {
}
impl AsDotStr for BlockNode {
- fn as_dot_str(&self, analyzer: &impl GraphLike) -> String {
+ fn as_dot_str(
+ &self,
+ analyzer: &impl GraphBackend,
+ _arena: &mut RangeArena>,
+ ) -> String {
format!("block {{ {:?} }}", self.underlying(analyzer).unwrap())
}
}
diff --git a/crates/graph/src/nodes/builtin.rs b/crates/graph/src/nodes/builtin.rs
new file mode 100644
index 00000000..757ca985
--- /dev/null
+++ b/crates/graph/src/nodes/builtin.rs
@@ -0,0 +1,531 @@
+use crate::{nodes::Concrete, AnalyzerBackend, GraphBackend, GraphError, Node, SolcRange, VarType};
+
+use crate::range::elem::*;
+use shared::{NodeIdx, RangeArena};
+
+use ethers_core::types::{Address, H256, I256, U256};
+use solang_parser::pt::{Expression, Loc, Type};
+
+/// A builtin node
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Ord, PartialOrd)]
+pub struct BuiltInNode(pub usize);
+
+impl BuiltInNode {
+ /// Gets the underlying builtin from the graph
+ pub fn underlying<'a>(
+ &self,
+ analyzer: &'a impl GraphBackend,
+ ) -> Result<&'a Builtin, GraphError> {
+ match analyzer.node(*self) {
+ Node::Builtin(b) => Ok(b),
+ Node::Unresolved(ident) => Err(GraphError::UnknownVariable(format!(
+ "Could not find variable: {}",
+ ident.name
+ ))),
+ e => Err(GraphError::NodeConfusion(format!(
+ "Node type confusion: expected node to be Builtin but it was: {e:?}"
+ ))),
+ }
+ }
+
+ /// Gets the size of the builtin
+ pub fn num_size(&self, analyzer: &impl GraphBackend) -> Result, GraphError> {
+ let underlying = self.underlying(analyzer)?;
+ Ok(underlying.num_size())
+ }
+
+ /// Checks if this builtin is implicitly castable to another builtin
+ pub fn implicitly_castable_to(
+ &self,
+ other: &Self,
+ analyzer: &impl GraphBackend,
+ ) -> Result {
+ Ok(self
+ .underlying(analyzer)?
+ .implicitly_castable_to(other.underlying(analyzer)?))
+ }
+
+ /// Gets the maximum size version of this builtin, i.e. uint16 -> uint256
+ pub fn max_size(&self, analyzer: &mut impl AnalyzerBackend) -> Result {
+ let m = self.underlying(analyzer)?.max_size();
+ Ok(analyzer.builtin_or_add(m).into())
+ }
+
+ /// Gets the underlying type of the dynamic builtin backing it. i.e. uint256[] -> uint256
+ pub fn dynamic_underlying_ty(
+ &self,
+ analyzer: &mut impl AnalyzerBackend,
+ ) -> Result {
+ match self.underlying(analyzer)? {
+ Builtin::Array(v_ty) | Builtin::SizedArray(_, v_ty) => {
+ v_ty.unresolved_as_resolved(analyzer)
+ }
+ Builtin::Mapping(_, v_ty) => v_ty.unresolved_as_resolved(analyzer),
+ Builtin::DynamicBytes | Builtin::Bytes(_) => Ok(VarType::BuiltIn(
+ analyzer.builtin_or_add(Builtin::Bytes(1)).into(),
+ Some(SolcRange::new(
+ Elem::from(Concrete::from(vec![0x00])),
+ Elem::from(Concrete::from(vec![0xff])),
+ vec![],
+ )),
+ )),
+ e => Err(GraphError::NodeConfusion(format!(
+ "Node type confusion: expected node to be Builtin::Array but it was: {e:?}"
+ ))),
+ }
+ }
+
+ /// Returns whether the builtin is a mapping
+ pub fn is_mapping(&self, analyzer: &impl GraphBackend) -> Result {
+ Ok(matches!(self.underlying(analyzer)?, Builtin::Mapping(_, _)))
+ }
+
+ /// Returns whether the builtin is a sized array
+ pub fn is_sized_array(&self, analyzer: &impl GraphBackend) -> Result {
+ Ok(matches!(
+ self.underlying(analyzer)?,
+ Builtin::SizedArray(_, _)
+ ))
+ }
+
+ /// Returns whether the builtin is a sized array or bytes
+ pub fn maybe_array_size(
+ &self,
+ analyzer: &impl GraphBackend,
+ ) -> Result, GraphError> {
+ match self.underlying(analyzer)? {
+ Builtin::SizedArray(s, _) => Ok(Some(*s)),
+ Builtin::Bytes(s) => Ok(Some(U256::from(*s))),
+ _ => Ok(None),
+ }
+ }
+
+ /// Returns whether the builtin is a dynamic type
+ pub fn is_dyn(&self, analyzer: &impl GraphBackend) -> Result {
+ Ok(self.underlying(analyzer)?.is_dyn())
+ }
+
+ /// Returns whether the builtin is indexable
+ pub fn is_indexable(&self, analyzer: &impl GraphBackend) -> Result {
+ Ok(self.underlying(analyzer)?.is_indexable())
+ }
+
+ /// Returns the zero range for this builtin type, i.e. uint256 -> [0, 0]
+ pub fn zero_range(
+ &self,
+ analyzer: &impl GraphBackend,
+ ) -> Result, GraphError> {
+ Ok(self.underlying(analyzer)?.zero_range())
+ }
+}
+
+impl From for BuiltInNode {
+ fn from(idx: NodeIdx) -> Self {
+ BuiltInNode(idx.index())
+ }
+}
+
+impl From for NodeIdx {
+ fn from(val: BuiltInNode) -> Self {
+ val.0.into()
+ }
+}
+
+/// A fundamental builtin type
+#[derive(Debug, Clone, Eq, PartialEq, Hash, Ord, PartialOrd)]
+pub enum Builtin {
+ /// An address
+ Address,
+ /// A payable address
+ AddressPayable,
+ /// A payable address, differentiated in Solang so we differentiate
+ Payable,
+ /// A boolean
+ Bool,
+ /// A string - TODO: we should represent this as bytes internally
+ String,
+ /// A signed integer that has a size
+ Int(u16),
+ /// An unsigned integer that has a size
+ Uint(u16),
+ /// A bytes that has a size, i.e. bytes8
+ Bytes(u8),
+ /// A rational. Rarely used in practice
+ Rational,
+ /// A byte array, i.e. bytes
+ DynamicBytes,
+ /// An array that has an internal type, i.e. uint256[]
+ Array(VarType),
+ /// An array that has an internal type and is sized, i.e. uint256[5]
+ SizedArray(U256, VarType),
+ /// A mapping, i.e. `mapping (address => uint)`
+ Mapping(VarType, VarType),
+ /// A function pointer that takes a vector of types and returns a vector of types
+ Func(Vec, Vec),
+}
+
+impl Builtin {
+ /// Resolves the `VarType` in dynamic builtins due to parse order - i.e. we could
+ /// `mapping (uint => MyType)`, we may not have parsed `MyType`, so we now try to resolve it
+ pub fn unresolved_as_resolved(
+ &self,
+ analyzer: &mut impl AnalyzerBackend,
+ ) -> Result {
+ match self {
+ Builtin::Array(n) => Ok(Builtin::Array(n.unresolved_as_resolved(analyzer)?)),
+ Builtin::SizedArray(s, n) => {
+ Ok(Builtin::SizedArray(*s, n.unresolved_as_resolved(analyzer)?))
+ }
+ Builtin::Mapping(k, v) => Ok(Builtin::Mapping(
+ k.unresolved_as_resolved(analyzer)?,
+ v.unresolved_as_resolved(analyzer)?,
+ )),
+ _ => Ok(self.clone()),
+ }
+ }
+
+ /// Possible types that this type could have been had a literal been parsed differently - i.e. a `1`
+ /// could be uint8 to uint256.
+ pub fn possible_builtins_from_ty_inf(&self) -> Vec {
+ let mut builtins = vec![];
+ match self {
+ Builtin::Uint(size) => {
+ let mut s = *size;
+ while s > 0 {
+ builtins.push(Builtin::Uint(s));
+ s -= 8;
+ }
+ }
+ Builtin::Int(size) => {
+ let mut s = *size;
+ while s > 0 {
+ builtins.push(Builtin::Int(s));
+ s -= 8;
+ }
+ }
+ Builtin::Bytes(size) => {
+ let mut s = *size;
+ while s > 0 {
+ builtins.push(Builtin::Bytes(s));
+ s -= 1;
+ }
+ }
+ _ => {}
+ }
+ builtins
+ }
+
+ /// Construct a [`SolcRange`] that is zero
+ pub fn zero_range(&self) -> Option {
+ match self {
+ Builtin::Address | Builtin::AddressPayable | Builtin::Payable => {
+ let zero = Concrete::Address(Address::from_slice(&[0x00; 20]));
+ Some(SolcRange::new(zero.clone().into(), zero.into(), vec![]))
+ }
+ Builtin::Bool => SolcRange::from(Concrete::from(false)),
+ Builtin::String => SolcRange::from(Concrete::from("".to_string())),
+ Builtin::Int(_) => SolcRange::from(Concrete::from(I256::from(0))),
+ Builtin::Uint(_) => SolcRange::from(Concrete::from(U256::from(0))),
+ Builtin::Bytes(s) => SolcRange::from(Concrete::Bytes(*s, H256::zero())),
+ Builtin::DynamicBytes | Builtin::Array(_) | Builtin::Mapping(_, _) => {
+ let zero = Elem::ConcreteDyn(RangeDyn::new(
+ Elem::from(Concrete::from(U256::zero())),
+ Default::default(),
+ Loc::Implicit,
+ ));
+ Some(SolcRange::new(zero.clone(), zero, vec![]))
+ }
+ Builtin::SizedArray(s, _) => {
+ let sized = Elem::ConcreteDyn(RangeDyn::new(
+ Elem::from(Concrete::from(*s)),
+ Default::default(),
+ Loc::Implicit,
+ ));
+ Some(SolcRange::new(sized.clone(), sized, vec![]))
+ }
+ Builtin::Rational | Builtin::Func(_, _) => None,
+ }
+ }
+
+ /// Try to convert from a [`Type`] to a Builtin
+ pub fn try_from_ty(
+ ty: Type,
+ analyzer: &mut impl AnalyzerBackend,
+ arena: &mut RangeArena>,
+ ) -> Option {
+ use Type::*;
+ match ty {
+ Address => Some(Builtin::Address),
+ AddressPayable => Some(Builtin::AddressPayable),
+ Payable => Some(Builtin::Payable),
+ Bool => Some(Builtin::Bool),
+ String => Some(Builtin::String),
+ Int(size) => Some(Builtin::Int(size)),
+ Uint(size) => Some(Builtin::Uint(size)),
+ Bytes(size) => Some(Builtin::Bytes(size)),
+ Rational => Some(Builtin::Rational),
+ DynamicBytes => Some(Builtin::DynamicBytes),
+ Mapping { key, value, .. } => {
+ let key_idx = analyzer.parse_expr(arena, &key, None);
+ let val_idx = analyzer.parse_expr(arena, &value, None);
+ let key_var_ty = VarType::try_from_idx(analyzer, key_idx)?;
+ let val_var_ty = VarType::try_from_idx(analyzer, val_idx)?;
+ Some(Builtin::Mapping(key_var_ty, val_var_ty))
+ }
+ Function {
+ params,
+ attributes: _,
+ returns,
+ } => {
+ let inputs = params
+ .iter()
+ .filter_map(|(_, param)| param.as_ref())
+ .map(|param| analyzer.parse_expr(arena, ¶m.ty, None))
+ .collect::>();
+ let inputs = inputs
+ .iter()
+ .map(|idx| VarType::try_from_idx(analyzer, *idx).expect("Couldn't parse param"))
+ .collect::>();
+ let mut outputs = vec![];
+ if let Some((params, _attrs)) = returns {
+ let tmp_outputs = params
+ .iter()
+ .filter_map(|(_, param)| param.as_ref())
+ .map(|param| analyzer.parse_expr(arena, ¶m.ty, None))
+ .collect::>();
+ outputs = tmp_outputs
+ .iter()
+ .map(|idx| {
+ VarType::try_from_idx(analyzer, *idx)
+ .expect("Couldn't parse output param")
+ })
+ .collect::>();
+ }
+ Some(Builtin::Func(inputs, outputs))
+ }
+ }
+ }
+
+ /// Returns whether the builtin is dynamic
+ pub fn is_dyn(&self) -> bool {
+ matches!(
+ self,
+ Builtin::DynamicBytes
+ | Builtin::Array(..)
+ | Builtin::SizedArray(..)
+ | Builtin::Mapping(..)
+ | Builtin::String
+ )
+ }
+
+ /// Returns whether the builtin requires input to perform an operation on (like addition)
+ pub fn requires_input(&self) -> bool {
+ matches!(
+ self,
+ Builtin::Array(..) | Builtin::SizedArray(..) | Builtin::Mapping(..)
+ )
+ }
+
+ /// Returns the size of the integer if it is an integer (signed or unsigned)
+ pub fn num_size(&self) -> Option {
+ match self {
+ Builtin::Uint(size) => Some(*size),
+ Builtin::Int(size) => Some(*size),
+ _ => None,
+ }
+ }
+
+ /// Returns whether the builtin is a signed integer
+ pub fn is_int(&self) -> bool {
+ matches!(self, Builtin::Int(_))
+ }
+
+ /// Returns whether the builtin is indexable (bytes, array[], array[5], mapping(..), bytes32, string)
+ pub fn is_indexable(&self) -> bool {
+ matches!(
+ self,
+ Builtin::DynamicBytes
+ | Builtin::Array(..)
+ | Builtin::SizedArray(..)
+ | Builtin::Mapping(..)
+ | Builtin::Bytes(..)
+ | Builtin::String
+ )
+ }
+
+ /// Checks if self is implicitly castable to another builtin
+ pub fn implicitly_castable_to(&self, other: &Self) -> bool {
+ use Builtin::*;
+ match (self, other) {
+ (Address, Address) => true,
+ (Address, AddressPayable) => true,
+ (Address, Payable) => true,
+ (AddressPayable, Address) => true,
+ (AddressPayable, Payable) => true,
+ (AddressPayable, AddressPayable) => true,
+ (Payable, Address) => true,
+ (Payable, AddressPayable) => true,
+ (Payable, Payable) => true,
+ (Bool, Bool) => true,
+ (Rational, Rational) => true,
+ (DynamicBytes, DynamicBytes) => true,
+ (String, String) => true,
+ (Uint(from_size), Uint(to_size)) => from_size <= to_size,
+ (Uint(from_size), Address) => *from_size == 160,
+ (Int(from_size), Int(to_size)) => from_size <= to_size,
+ (Bytes(from_size), Bytes(to_size)) => from_size <= to_size,
+ _ => false,
+ }
+ }
+
+ /// Returns the max size version of this builtin
+ pub fn max_size(&self) -> Self {
+ use Builtin::*;
+ match self {
+ Uint(_) => Uint(256),
+ Int(_from_size) => Uint(256),
+ Bytes(_from_size) => Uint(32),
+ _ => self.clone(),
+ }
+ }
+
+ pub fn zero_concrete(&self) -> Option {
+ match self {
+ Builtin::Uint(size) => Some(Concrete::Uint(*size, U256::zero())),
+ Builtin::Int(size) => Some(Concrete::Int(*size, I256::from_raw(U256::zero()))),
+ Builtin::Bytes(size) => {
+ let h = H256::default();
+ Some(Concrete::Bytes(*size, h))
+ }
+ Builtin::Address => Some(Concrete::Address(Address::from_slice(&[0x00; 20]))),
+ Builtin::Bool => Some(Concrete::Bool(false)),
+ _ => None,
+ }
+ }
+
+ pub fn max_concrete(&self) -> Option {
+ match self {
+ Builtin::Uint(size) => {
+ let max = if *size == 256 {
+ U256::MAX
+ } else {
+ U256::from(2).pow(U256::from(*size)) - 1
+ };
+ Some(Concrete::Uint(*size, max))
+ }
+ Builtin::Int(size) => {
+ let max: I256 =
+ I256::from_raw((U256::from(1u8) << U256::from(*size - 1)) - U256::from(1));
+ Some(Concrete::Int(*size, max))
+ }
+ Builtin::Bytes(size) => {
+ let size = *size as u16 * 8;
+ let max = if size == 256 {
+ U256::MAX
+ } else {
+ U256::from(2).pow(U256::from(size)) - 1
+ };
+
+ let mut h = H256::default();
+ max.to_big_endian(h.as_mut());
+ Some(Concrete::Bytes((size / 8) as u8, h))
+ }
+ Builtin::Address => Some(Concrete::Address(Address::from_slice(&[0xff; 20]))),
+ Builtin::Bool => Some(Concrete::Bool(true)),
+ _ => None,
+ }
+ }
+
+ pub fn min_concrete(&self) -> Option {
+ match self {
+ Builtin::Uint(size) => Some(Concrete::Uint(*size, U256::zero())),
+ Builtin::Int(size) => Some(Concrete::Int(*size, I256::MIN)),
+ Builtin::Bytes(size) => {
+ let h = H256::default();
+ Some(Concrete::Bytes(*size, h))
+ }
+ Builtin::Address => Some(Concrete::Address(Address::from_slice(&[0x00; 20]))),
+ Builtin::Bool => Some(Concrete::Bool(false)),
+ _ => None,
+ }
+ }
+
+ /// Converts the builtin to a string
+ pub fn as_string(&self, analyzer: &impl GraphBackend) -> Result {
+ use Builtin::*;
+ match self {
+ Address => Ok("address".to_string()),
+ AddressPayable => Ok("address".to_string()),
+ Payable => Ok("address".to_string()),
+ Bool => Ok("bool".to_string()),
+ String => Ok("string".to_string()),
+ Int(size) => Ok(format!("int{size}")),
+ Uint(size) => Ok(format!("uint{size}")),
+ Bytes(size) => Ok(format!("bytes{size}")),
+ Rational => Ok("rational".to_string()),
+ DynamicBytes => Ok("bytes".to_string()),
+ Array(v_ty) => Ok(format!(
+ "{}[]",
+ v_ty.unresolved_as_resolved(analyzer)?.as_string(analyzer)?
+ )),
+ SizedArray(s, v_ty) => Ok(format!(
+ "{}[{}]",
+ v_ty.unresolved_as_resolved(analyzer)?.as_string(analyzer)?,
+ s
+ )),
+ Mapping(key_ty, v_ty) => Ok(format!(
+ "mapping ({} => {})",
+ key_ty
+ .unresolved_as_resolved(analyzer)?
+ .as_string(analyzer)?,
+ v_ty.unresolved_as_resolved(analyzer)?.as_string(analyzer)?
+ )),
+ Func(inputs, outputs) => Ok(format!(
+ "function({}) returns ({})",
+ inputs
+ .iter()
+ .map(|input| input.as_string(analyzer).unwrap())
+ .collect::>()
+ .join(", "),
+ outputs
+ .iter()
+ .map(|output| output.as_string(analyzer).unwrap())
+ .collect::>()
+ .join(", ")
+ )),
+ }
+ }
+
+ /// Converts the builtin to a string if it is not dynamic
+ pub fn basic_as_string(&self) -> String {
+ use Builtin::*;
+ match self {
+ Address => "address".to_string(),
+ AddressPayable => "address".to_string(),
+ Payable => "address".to_string(),
+ Bool => "bool".to_string(),
+ String => "string".to_string(),
+ Int(size) => format!("int{size}"),
+ Uint(size) => format!("uint{size}"),
+ Bytes(size) => format!("bytes{size}"),
+ Rational => "rational".to_string(),
+ DynamicBytes => "bytes".to_string(),
+ Array(_v_ty) => "[]".to_string(),
+ SizedArray(s, _v_ty) => format!("[{}]", s),
+ Mapping(_key_ty, _v_ty) => "mapping ( => )".to_string(),
+ Func(inputs, outputs) => format!(
+ "function({}) returns ({})",
+ inputs
+ .iter()
+ .map(|_input| "")
+ .collect::>()
+ .join(", "),
+ outputs
+ .iter()
+ .map(|_output| "")
+ .collect::>()
+ .join(", ")
+ ),
+ }
+ }
+}
diff --git a/shared/src/nodes/concrete.rs b/crates/graph/src/nodes/concrete.rs
similarity index 71%
rename from shared/src/nodes/concrete.rs
rename to crates/graph/src/nodes/concrete.rs
index 542c83f6..eeafe272 100644
--- a/shared/src/nodes/concrete.rs
+++ b/crates/graph/src/nodes/concrete.rs
@@ -1,8 +1,6 @@
-use crate::analyzer::GraphError;
-use crate::analyzer::{AnalyzerLike, GraphLike};
-use crate::Builtin;
-use crate::VarType;
-use crate::{Node, NodeIdx};
+use crate::{nodes::Builtin, AnalyzerBackend, GraphBackend, GraphError, Node, VarType};
+use shared::NodeIdx;
+
use ethers_core::types::{Address, H256, I256, U256};
/// An index in the graph that references a [`Concrete`] node
@@ -11,26 +9,32 @@ pub struct ConcreteNode(pub usize);
impl ConcreteNode {
/// Gets the underlying node data for the [`Concrete`]
- pub fn underlying<'a>(&self, analyzer: &'a impl GraphLike) -> Result<&'a Concrete, GraphError> {
+ pub fn underlying<'a>(
+ &self,
+ analyzer: &'a impl GraphBackend,
+ ) -> Result<&'a Concrete, GraphError> {
match analyzer.node(*self) {
Node::Concrete(c) => Ok(c),
+ Node::Unresolved(ident) => Err(GraphError::UnknownVariable(format!(
+ "Could not find variable: {}",
+ ident.name
+ ))),
e => Err(GraphError::NodeConfusion(format!(
"Node type confusion: expected node to be Concrete but it was: {e:?}"
))),
}
}
- pub fn max_size(
- &self,
- analyzer: &mut (impl GraphLike + AnalyzerLike),
- ) -> Result {
+ /// Creates a version of this concrete that is max size
+ pub fn max_size(&self, analyzer: &mut impl AnalyzerBackend) -> Result {
let c = self.underlying(analyzer)?.max_size();
Ok(analyzer.add_node(Node::Concrete(c)).into())
}
+ /// Gets the internal type of the dynamic that backs this. Panics if this is not a dynamic concrete
pub fn dynamic_underlying_ty(
&self,
- analyzer: &mut (impl GraphLike + AnalyzerLike),
+ analyzer: &mut impl AnalyzerBackend,
) -> Result {
let builtin = self.underlying(analyzer)?.dynamic_underlying_ty().unwrap();
let bn = analyzer.builtin_or_add(builtin);
@@ -38,19 +42,26 @@ impl ConcreteNode {
Ok(v_ty)
}
- pub fn is_dyn(&self, analyzer: &impl GraphLike) -> Result {
+ /// Returns whether this is a dynamic concrete
+ pub fn is_dyn(&self, analyzer: &impl GraphBackend) -> Result {
Ok(self.underlying(analyzer)?.is_dyn())
}
- pub fn is_sized_array(&self, analyzer: &impl GraphLike) -> Result {
+ /// Returns whether this is a concrete sized array
+ pub fn is_sized_array(&self, analyzer: &impl GraphBackend) -> Result {
Ok(self.underlying(analyzer)?.is_sized_array())
}
- pub fn maybe_array_size(&self, analyzer: &impl GraphLike) -> Result, GraphError> {
+ /// Returns the size of the array size if it is an array-like concrete
+ pub fn maybe_array_size(
+ &self,
+ analyzer: &impl GraphBackend,
+ ) -> Result, GraphError> {
Ok(self.underlying(analyzer)?.maybe_array_size())
}
- pub fn is_indexable(&self, analyzer: &impl GraphLike) -> Result {
+ /// Returns whether this concrete is indexable
+ pub fn is_indexable(&self, analyzer: &impl GraphBackend) -> Result {
Ok(self.underlying(analyzer)?.is_indexable())
}
}
@@ -67,12 +78,6 @@ impl From for NodeIdx {
}
}
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
-pub enum DynCapacity {
- Cap(U256),
- Unlimited,
-}
-
/// EVM/Solidity basic concrete types
#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
pub enum Concrete {
@@ -95,6 +100,12 @@ pub enum Concrete {
Array(Vec),
}
+impl Default for Concrete {
+ fn default() -> Self {
+ Concrete::Uint(0, U256::zero())
+ }
+}
+
impl From for Concrete {
fn from(u: U256) -> Self {
Concrete::Uint(256, u)
@@ -113,6 +124,14 @@ impl From> for Concrete {
}
}
+impl From for Concrete {
+ fn from(u: u8) -> Self {
+ let mut h = H256::default();
+ h.0[0] = u;
+ Concrete::Bytes(1, h)
+ }
+}
+
impl From for Concrete {
fn from(u: H256) -> Self {
Concrete::Bytes(32, u)
@@ -146,13 +165,86 @@ impl From for Concrete {
}
}
-impl> From> for Concrete {
- fn from(u: Vec) -> Self {
- Concrete::Array(u.into_iter().map(|t| t.into()).collect())
+impl From<&str> for Concrete {
+ fn from(u: &str) -> Self {
+ Concrete::String(u.to_string())
}
}
+// impl> From> for Concrete {
+// fn from(u: Vec) -> Self {
+// Concrete::Array(u.into_iter().map(|t| t.into()).collect())
+// }
+// }
+
impl Concrete {
+ pub fn raw_bits_u256(&self) -> Option {
+ match self {
+ Concrete::Int(_, val) => Some(val.into_raw()),
+ _ => self.into_u256(),
+ }
+ }
+
+ pub fn set_indices(&mut self, other: &Self) {
+ match (self, other) {
+ (Concrete::DynBytes(s), Concrete::DynBytes(o)) => {
+ o.iter().enumerate().for_each(|(i, b)| {
+ s[i] = *b;
+ });
+ }
+ (Concrete::Array(s), Concrete::Array(o)) => {
+ o.iter().enumerate().for_each(|(i, b)| {
+ s[i] = b.clone();
+ });
+ }
+ (Concrete::String(s), Concrete::String(o)) => {
+ o.chars().enumerate().for_each(|(i, b)| {
+ s.replace_range(i..i + 1, &b.to_string());
+ });
+ }
+ (Concrete::Bytes(size, s), Concrete::Bytes(cap, o)) => {
+ let mut bytes = [0u8; 32];
+ s.0.into_iter()
+ .take((*size).into())
+ .enumerate()
+ .for_each(|(i, b)| bytes[i] = b);
+ o.0.into_iter()
+ .take((*cap).into())
+ .enumerate()
+ .for_each(|(i, b)| bytes[i] = b);
+ *s = H256(bytes);
+ }
+ _ => {}
+ }
+ }
+
+ pub fn get_index(&self, other: &Self) -> Option {
+ match (self, other) {
+ (Concrete::DynBytes(s), Concrete::Uint(_, o)) => {
+ let index = o.as_usize();
+ let mut bytes = [0u8; 32];
+ bytes[0] = s[index];
+ Some(Concrete::Bytes(1, H256(bytes)))
+ }
+ (Concrete::Array(s), Concrete::Uint(_, o)) => {
+ let index = o.as_usize();
+ Some(s[index].clone())
+ }
+ (Concrete::String(s), Concrete::Uint(_, o)) => {
+ let index = o.as_usize();
+ Some(Concrete::String(s[index..index + 1].to_string()))
+ }
+ (Concrete::Bytes(_size, s), Concrete::Uint(_, o)) => {
+ let index = o.as_usize();
+ let mut bytes = [0u8; 32];
+ bytes[0] = s[index];
+ Some(Concrete::Bytes(1, H256(bytes)))
+ }
+ _ => None,
+ }
+ }
+
+ /// Returns whether this concrete is a dynamic type
pub fn is_dyn(&self) -> bool {
matches!(
self,
@@ -160,10 +252,12 @@ impl Concrete {
)
}
+ /// Returns whether this concrete is a sized array
pub fn is_sized_array(&self) -> bool {
matches!(self, Concrete::DynBytes(..) | Concrete::Array(..))
}
+ /// Returns the internal type of this dynamic concrete
pub fn dynamic_underlying_ty(&self) -> Option {
match self {
Concrete::DynBytes(_v) => Some(Builtin::Bytes(1)),
@@ -174,6 +268,7 @@ impl Concrete {
}
}
+ /// Returns the length of the array if it is an array
pub fn maybe_array_size(&self) -> Option {
match self {
Concrete::DynBytes(v) => Some(U256::from(v.len())),
@@ -184,6 +279,7 @@ impl Concrete {
}
}
+ /// Returns whether this concrete is indexable
pub fn is_indexable(&self) -> bool {
self.is_dyn() || matches!(self, Concrete::Bytes(..))
}
@@ -194,12 +290,16 @@ impl Concrete {
/// be fine.
pub fn u256_as_original(&self, uint: U256) -> Self {
match self {
- Concrete::Uint(size, _) => Concrete::Uint(*size, uint),
- Concrete::Int(size, _) => Concrete::Int(*size, I256::from_raw(uint)),
+ Concrete::Uint(size, _) => Concrete::Uint(256, uint)
+ .cast(Builtin::Uint(*size))
+ .unwrap(),
+ Concrete::Int(size, _) => Concrete::Int(256, I256::from_raw(uint))
+ .cast(Builtin::Int(*size))
+ .unwrap(),
Concrete::Bytes(size, _) => {
let mut h = H256::default();
uint.to_big_endian(h.as_mut());
- Concrete::Bytes(*size, h)
+ Concrete::Bytes(32, h).cast(Builtin::Bytes(*size)).unwrap()
}
Concrete::Address(_) => {
let mut bytes = [0u8; 32];
@@ -213,12 +313,33 @@ impl Concrete {
Concrete::Bool(false)
}
}
+ Concrete::DynBytes(v) => {
+ let mut bytes = [0u8; 32];
+ uint.to_big_endian(&mut bytes);
+ let new_vec = &bytes.to_vec()[0..v.len()];
+ Concrete::DynBytes(new_vec.to_vec())
+ }
e => todo!("Unsupported: {e:?}"),
}
}
+ pub fn is_zero(&self) -> bool {
+ self.into_u256() == Some(U256::zero())
+ }
+
+ pub fn is_one(&self) -> bool {
+ self.into_u256() == Some(U256::from(1))
+ }
+
/// Cast from one concrete variant given another concrete variant
pub fn cast_from(self, other: &Self) -> Option {
+ if let (Concrete::DynBytes(s), Concrete::DynBytes(o)) = (&self, other) {
+ if s.len() < o.len() {
+ let mut t = s.clone();
+ t.resize(o.len(), 0);
+ return Some(Concrete::DynBytes(t));
+ }
+ }
self.cast(other.as_builtin())
}
@@ -250,10 +371,19 @@ impl Concrete {
}
}
+ /// Returns whether this concrete is an unsigned integer
pub fn is_int(&self) -> bool {
matches!(self, Concrete::Int(_, _))
}
+ pub fn size_wrap(self) -> Self {
+ match self {
+ Concrete::Int(size, val) => Concrete::Int(256, val).cast(Builtin::Int(size)).unwrap(),
+ _ => self,
+ }
+ }
+
+ /// Performs a literal cast to another type
pub fn literal_cast(self, builtin: Builtin) -> Option {
match self {
Concrete::Uint(_, val) => match builtin {
@@ -279,6 +409,7 @@ impl Concrete {
}
}
+ /// Concatenate two concretes together
pub fn concat(self, other: &Self) -> Option {
match (self, other) {
(Concrete::String(a), Concrete::String(b)) => Some(Concrete::from(format!("{a}{b}"))),
@@ -290,6 +421,22 @@ impl Concrete {
}
}
+ pub fn bit_representation(&self) -> Option {
+ match self {
+ Concrete::Int(size, val) => {
+ let mut bytes = [0u8; 32];
+ val.to_big_endian(&mut bytes);
+ Some(Concrete::Uint(*size, U256::from_big_endian(&bytes)))
+ }
+ Concrete::Bytes(size, _) => {
+ Some(Concrete::Uint(*size as u16 / 8, self.into_u256().unwrap()))
+ }
+ Concrete::Bool(_val) => Some(Concrete::Uint(8, self.into_u256().unwrap())),
+ Concrete::Address(_val) => Some(Concrete::Uint(20, self.into_u256().unwrap())),
+ _ => None,
+ }
+ }
+
/// Cast the concrete to another type as denoted by a [`Builtin`].
pub fn cast(self, builtin: Builtin) -> Option {
match self {
@@ -313,7 +460,7 @@ impl Concrete {
if val < mask {
Some(Concrete::Uint(size, val))
} else {
- Some(Concrete::Uint(size, mask))
+ Some(Concrete::Uint(size, val & mask))
}
}
}
@@ -347,33 +494,44 @@ impl Concrete {
val.to_big_endian(&mut bytes);
Some(Concrete::Address(Address::from_slice(&bytes[12..])))
}
- Builtin::Uint(size) => {
- let mask = if size == 256 {
- U256::MAX
- } else {
- U256::from(2).pow(size.into()) - 1
- };
- Some(Concrete::Uint(size, val.into_raw() & mask))
+ Builtin::Uint(_size) => {
+ let bit_repr = self.bit_representation().unwrap();
+ bit_repr.cast(builtin)
}
Builtin::Int(size) => {
- // no op
- if r_size == size {
- Some(self)
- } else {
- let mask = if size == 256 {
- U256::MAX / 2
- } else {
- U256::from(2).pow((size - 1).into()) - 1
- };
-
- let (sign, abs) = val.into_sign_and_abs();
- if abs < mask {
+ match r_size.cmp(&size) {
+ std::cmp::Ordering::Less => {
+ // upcast
Some(Concrete::Int(size, val))
- } else {
- Some(Concrete::Int(
- size,
- I256::checked_from_sign_and_abs(sign, mask).unwrap(),
- ))
+ }
+ std::cmp::Ordering::Equal => {
+ // noop
+ Some(self)
+ }
+ std::cmp::Ordering::Greater => {
+ // downcast
+ let mask = if size == 256 {
+ U256::MAX / 2
+ } else {
+ U256::from(2).pow((size).into()) - 1
+ };
+
+ let raw = val.into_raw();
+
+ if raw < mask / U256::from(2) {
+ Some(Concrete::Int(size, val))
+ } else {
+ let base_value = raw & mask;
+ let res =
+ if base_value >> (size - 1) & U256::from(1) == U256::from(1) {
+ let top = U256::MAX << size;
+ base_value | top
+ } else {
+ base_value
+ };
+
+ Some(Concrete::Int(size, I256::from_raw(res)))
+ }
}
}
}
@@ -545,6 +703,10 @@ impl Concrete {
}
}
Concrete::Bytes(_, b) => Some(U256::from_big_endian(b.as_bytes())),
+ Concrete::DynBytes(v) if v.len() <= 32 => self
+ .clone()
+ .cast(Builtin::Bytes(v.len() as u8))?
+ .into_u256(),
Concrete::Address(a) => Some(U256::from_big_endian(a.as_bytes())),
Concrete::Bool(b) => {
if *b {
@@ -557,6 +719,7 @@ impl Concrete {
}
}
+ /// Returns this concrete as a max-sized version
pub fn max_size(&self) -> Self {
match self {
Concrete::Uint(_, val) => Concrete::Uint(256, *val),
@@ -567,7 +730,7 @@ impl Concrete {
}
/// Gets the default max for a given concrete variant.
- pub fn max(&self) -> Option {
+ pub fn max_of_type(&self) -> Option {
match self {
Concrete::Uint(size, _) => {
let max = if *size == 256 {
@@ -678,7 +841,7 @@ impl Concrete {
}
/// Gets the default min for a given concrete variant.
- pub fn min(&self) -> Option {
+ pub fn min_of_type(&self) -> Option {
match self {
Concrete::Uint(size, _) => Some(Concrete::Uint(*size, 0.into())),
Concrete::Int(size, _) => {
@@ -731,6 +894,49 @@ impl Concrete {
}
}
+ pub fn is_negative(&self) -> bool {
+ matches!(self, Concrete::Int(_, val) if *val < I256::from(0))
+ }
+
+ pub fn as_hex_string(&self) -> String {
+ match self {
+ Concrete::Uint(_, val) => {
+ let mut bytes = [0u8; 32];
+ val.to_big_endian(&mut bytes);
+ format!("0x{}", hex::encode(bytes))
+ }
+ Concrete::Int(_, val) => {
+ let mut bytes = [0u8; 32];
+ val.to_big_endian(&mut bytes);
+ format!("0x{}", hex::encode(bytes))
+ }
+ Concrete::Bytes(size, b) => format!(
+ "0x{}",
+ b.0.iter()
+ .take(*size as usize)
+ .map(|byte| format!("{byte:02x}"))
+ .collect::>()
+ .join("")
+ ),
+ Concrete::String(s) => hex::encode(s),
+ Concrete::Bool(_b) => self.bit_representation().unwrap().as_hex_string(),
+ Concrete::Address(_a) => self.bit_representation().unwrap().as_hex_string(),
+ Concrete::DynBytes(a) => {
+ if a.is_empty() {
+ "0x".to_string()
+ } else {
+ hex::encode(a)
+ }
+ }
+ Concrete::Array(arr) => format!(
+ "0x{}",
+ arr.iter()
+ .map(|i| i.as_hex_string()[2..].to_string())
+ .collect::>()
+ .join("")
+ ),
+ }
+ }
/// Converts to a string
pub fn as_string(&self) -> String {
match self {
@@ -764,6 +970,28 @@ impl Concrete {
}
}
+ pub fn as_bytes(&self) -> Vec {
+ match self {
+ Concrete::Uint(_, val) => {
+ let mut bytes = [0; 32];
+ val.to_big_endian(&mut bytes);
+ bytes.to_vec()
+ }
+ Concrete::Int(_, val) => {
+ let mut bytes = [0; 32];
+ val.to_big_endian(&mut bytes);
+ bytes.to_vec()
+ }
+ Concrete::Bytes(size, val) => val[0..(*size as usize)].to_vec(),
+ Concrete::Address(_) | Concrete::Bool(_) => {
+ Concrete::Uint(256, self.into_u256().unwrap()).as_bytes()
+ }
+ Concrete::DynBytes(inner) => inner.clone(),
+ Concrete::String(inner) => inner.as_bytes().to_vec(),
+ Concrete::Array(inner) => inner.iter().flat_map(|i| i.as_bytes()).collect(),
+ }
+ }
+
/// Converts to a human readable string. For integers, this means trying to find a
/// power of 2 that is close to the value.
pub fn as_human_string(&self) -> String {
diff --git a/crates/graph/src/nodes/context/context_tys.rs b/crates/graph/src/nodes/context/context_tys.rs
new file mode 100644
index 00000000..b7b6789c
--- /dev/null
+++ b/crates/graph/src/nodes/context/context_tys.rs
@@ -0,0 +1,88 @@
+use crate::nodes::{ContextNode, ContextVarNode, ContractNode, FunctionNode, StructNode};
+use shared::NodeIdx;
+
+use solang_parser::pt::Loc;
+
+use std::collections::BTreeMap;
+
+/// An enum that denotes either a call or a fork of a context
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Ord, PartialOrd)]
+pub enum CallFork {
+ Call(ContextNode),
+ Fork(ContextNode, ContextNode),
+}
+
+impl CallFork {
+ /// Returns an option of the call context
+ pub fn maybe_call(&self) -> Option {
+ match self {
+ CallFork::Call(c) => Some(*c),
+ _ => None,
+ }
+ }
+
+ /// Returns an option of the two fork contexts
+ pub fn maybe_fork(&self) -> Option<(ContextNode, ContextNode)> {
+ match self {
+ CallFork::Fork(w1, w2) => Some((*w1, *w2)),
+ _ => None,
+ }
+ }
+}
+
+/// Holds the current modifier state
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub struct ModifierState {
+ /// The number of the current modifier being evaluated
+ pub num: usize,
+ /// The location in source
+ pub loc: Loc,
+ /// The calling function
+ pub parent_fn: FunctionNode,
+ /// The context of the caller to the function that had this modifier
+ pub parent_caller_ctx: ContextNode,
+ /// The parent context
+ pub parent_ctx: ContextNode,
+ /// Renamed inputs based on the modifier
+ pub renamed_inputs: BTreeMap,
+}
+
+impl ModifierState {
+ /// Constructs a modifier state
+ pub fn new(
+ num: usize,
+ loc: Loc,
+ parent_fn: FunctionNode,
+ parent_ctx: ContextNode,
+ parent_caller_ctx: ContextNode,
+ renamed_inputs: BTreeMap,
+ ) -> Self {
+ Self {
+ num,
+ loc,
+ parent_fn,
+ parent_ctx,
+ parent_caller_ctx,
+ renamed_inputs,
+ }
+ }
+}
+
+/// Holds cached information about the context to speed up lookups
+#[derive(Default, Debug, Clone, Eq, PartialEq)]
+pub struct ContextCache {
+ /// Variables in this context
+ pub vars: BTreeMap,
+ /// Temporary variables in this context
+ pub tmp_vars: BTreeMap,
+ /// Visible functions from this context
+ pub visible_funcs: Option>,
+ /// Visible structs from this context
+ pub visible_structs: Option>,
+ /// First ancestor of this context
+ pub first_ancestor: Option,
+ /// Associated source of this context
+ pub associated_source: Option,
+ /// Associated contract of this context
+ pub associated_contract: Option,
+}
diff --git a/shared/src/context/expr_ret.rs b/crates/graph/src/nodes/context/expr_ret.rs
similarity index 71%
rename from shared/src/context/expr_ret.rs
rename to crates/graph/src/nodes/context/expr_ret.rs
index 00640a60..2195fef9 100644
--- a/shared/src/context/expr_ret.rs
+++ b/crates/graph/src/nodes/context/expr_ret.rs
@@ -1,16 +1,25 @@
-use crate::analyzer::AsDotStr;
-use crate::context::GraphError;
-use crate::{ContextVarNode, GraphLike, Node, NodeIdx, VarType};
+use crate::{
+ nodes::{context::ContextVarNode, Concrete},
+ range::elem::Elem,
+ AsDotStr, GraphBackend, GraphError, Node, VarType,
+};
+use shared::{NodeIdx, RangeArena};
+/// The reason a context was killed
#[derive(Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, Hash)]
pub enum KilledKind {
+ /// Execution ended here successfully
Ended,
+ /// Unsatisifiable bounds, therefore dead code
Unreachable,
+ /// Execution guaranteed to revert here!
Revert,
+ /// Unexpected parse error. This is likely a bug or invalid solidity. See the `errors` section of the CLI output or rerun with `--debug` for more information
ParseError,
}
impl KilledKind {
+ /// Returns a string explanation of the KilledKind
pub fn analysis_str(&self) -> &str {
use KilledKind::*;
match self {
@@ -22,21 +31,32 @@ impl KilledKind {
}
}
+/// A representation of the evaluation of an expression
#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
pub enum ExprRet {
+ /// The expression resulted in a killing of the context
CtxKilled(KilledKind),
+ /// The expression resulted in nothing
Null,
+ /// The expression resulted in a single element
Single(NodeIdx),
+ /// The expression resulted in a single element that was a literal
SingleLiteral(NodeIdx),
+ /// The expression resulted in multiple elements
Multi(Vec),
}
impl ExprRet {
- pub fn debug_str(&self, analyzer: &impl GraphLike) -> String {
+ /// Converts the expression return into a debug string
+ pub fn debug_str(&self, analyzer: &impl GraphBackend) -> String {
match self {
ExprRet::Single(inner) | ExprRet::SingleLiteral(inner) => match analyzer.node(*inner) {
- Node::ContextVar(_) => ContextVarNode::from(*inner).display_name(analyzer).unwrap(),
- e => format!("{:?}", e),
+ Node::ContextVar(_) => format!(
+ "idx_{}: {}",
+ inner.index(),
+ ContextVarNode::from(*inner).display_name(analyzer).unwrap()
+ ),
+ e => format!("idx_{}: {:?}", inner.index(), e),
},
ExprRet::Multi(inner) => {
format!(
@@ -53,6 +73,7 @@ impl ExprRet {
}
}
+ /// Take one element from the expression return.
pub fn take_one(&mut self) -> Result, GraphError> {
match self {
ExprRet::Single(..) | ExprRet::SingleLiteral(..) => {
@@ -70,6 +91,8 @@ impl ExprRet {
}
}
+ /// Checks if the expression return is a `SingleLiteral`. It returns
+ /// a list of bools that match if each is a literal
pub fn literals_list(&self) -> Result, GraphError> {
match self {
ExprRet::SingleLiteral(..) => Ok(vec![true]),
@@ -88,6 +111,7 @@ impl ExprRet {
}
}
+ /// Expect the expression result to be the Single variant
pub fn expect_single(&self) -> Result {
match self {
ExprRet::Single(inner) => Ok(*inner),
@@ -99,6 +123,7 @@ impl ExprRet {
}
}
+ /// Expect the expression result to be some length
pub fn expect_length(&self, len: usize) -> Result<(), GraphError> {
match self {
ExprRet::Single(_) | ExprRet::SingleLiteral(_) => {
@@ -130,6 +155,7 @@ impl ExprRet {
}
}
+ /// Return whether the expression return is a Single or SingleLiteral
pub fn is_single(&self) -> bool {
match self {
ExprRet::Single(_inner) => true,
@@ -139,10 +165,12 @@ impl ExprRet {
}
}
+ /// Return whether the expression return resulted in the Context being killed
pub fn is_killed(&self) -> bool {
matches!(self, ExprRet::CtxKilled(_))
}
+ /// Return the kind of the killed context if it was killed
pub fn killed_kind(&self) -> Option {
match self {
ExprRet::CtxKilled(k) => Some(*k),
@@ -151,10 +179,7 @@ impl ExprRet {
}
}
- pub fn has_fork(&self) -> bool {
- false
- }
-
+ /// Check if any of the expression returns are killed
pub fn has_killed(&self) -> bool {
match self {
ExprRet::CtxKilled(_) => true,
@@ -163,6 +188,7 @@ impl ExprRet {
}
}
+ /// Check if any of the expression returns are literals
pub fn has_literal(&self) -> bool {
match self {
ExprRet::SingleLiteral(..) => true,
@@ -171,6 +197,7 @@ impl ExprRet {
}
}
+ /// Expect the return to be a multi, and return the inner list. Panics if not mulit
pub fn expect_multi(self) -> Vec {
match self {
ExprRet::Multi(inner) => inner,
@@ -178,14 +205,19 @@ impl ExprRet {
}
}
- pub fn try_as_func_input_str(&self, analyzer: &impl GraphLike) -> String {
+ /// Try to convert to a solidity-like function input string, i.e. `(uint256, uint256, bytes32)`
+ pub fn try_as_func_input_str(
+ &self,
+ analyzer: &impl GraphBackend,
+ arena: &mut RangeArena>,
+ ) -> String {
match self {
ExprRet::Single(inner) | ExprRet::SingleLiteral(inner) => {
let idx = inner;
match VarType::try_from_idx(analyzer, *idx) {
Some(var_ty) => {
if let Ok(ty) = var_ty.unresolved_as_resolved(analyzer) {
- format!("({})", ty.as_dot_str(analyzer))
+ format!("({})", ty.as_dot_str(analyzer, arena))
} else {
"".to_string()
}
@@ -193,10 +225,13 @@ impl ExprRet {
None => "".to_string(),
}
}
- ExprRet::Multi(inner) if !self.has_fork() => {
+ ExprRet::Multi(inner) => {
let mut strs = vec![];
for ret in inner.iter() {
- strs.push(ret.try_as_func_input_str(analyzer).replace(['(', ')'], ""));
+ strs.push(
+ ret.try_as_func_input_str(analyzer, arena)
+ .replace(['(', ')'], ""),
+ );
}
format!("({})", strs.join(", "))
}
@@ -204,6 +239,7 @@ impl ExprRet {
}
}
+ /// Flatten the expression returns recursively into a single list of node indices
pub fn as_flat_vec(&self) -> Vec {
let mut idxs = vec![];
match self {
@@ -221,6 +257,7 @@ impl ExprRet {
idxs
}
+ /// Convert to a normal vector, does not recurse
pub fn as_vec(&self) -> Vec {
match self {
s @ ExprRet::Single(_) | s @ ExprRet::SingleLiteral(_) => vec![s.clone()],
@@ -231,6 +268,7 @@ impl ExprRet {
}
}
+ /// Flatten into a single ExprRet
pub fn flatten(self) -> Self {
match self {
ExprRet::Single(_) | ExprRet::SingleLiteral(_) => self,
@@ -244,4 +282,17 @@ impl ExprRet {
_ => self,
}
}
+
+ pub fn len(&self) -> usize {
+ match self {
+ ExprRet::Single(_) | ExprRet::SingleLiteral(_) => 1,
+ ExprRet::Multi(inner) => inner.len(),
+ ExprRet::CtxKilled(..) => 0,
+ ExprRet::Null => 0,
+ }
+ }
+
+ pub fn is_empty(&self) -> bool {
+ self.len() == 0
+ }
}
diff --git a/crates/graph/src/nodes/context/mod.rs b/crates/graph/src/nodes/context/mod.rs
new file mode 100644
index 00000000..4e8ac1ac
--- /dev/null
+++ b/crates/graph/src/nodes/context/mod.rs
@@ -0,0 +1,18 @@
+mod context_tys;
+mod expr_ret;
+mod node;
+mod underlying;
+mod var;
+
+pub use context_tys::{CallFork, ContextCache, ModifierState};
+pub use expr_ret::{ExprRet, KilledKind};
+pub use node::ContextNode;
+pub use underlying::Context;
+pub use var::{ContextVar, ContextVarNode, TmpConstruction};
+
+// ContextNode implementations are split to ease in maintainability
+mod querying;
+mod solving;
+mod typing;
+mod variables;
+mod versioning;
diff --git a/crates/graph/src/nodes/context/node.rs b/crates/graph/src/nodes/context/node.rs
new file mode 100644
index 00000000..6c4bb8d5
--- /dev/null
+++ b/crates/graph/src/nodes/context/node.rs
@@ -0,0 +1,141 @@
+use crate::{
+ nodes::{Concrete, Context, ContextVarNode, KilledKind},
+ range::elem::Elem,
+ AnalyzerBackend, AsDotStr, GraphBackend, GraphError, Node,
+};
+
+use shared::{NodeIdx, RangeArena};
+
+use solang_parser::pt::Loc;
+
+#[derive(Debug, Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash)]
+/// A wrapper of a node index that corresponds to a [`Context`]
+pub struct ContextNode(pub usize);
+
+impl AsDotStr for ContextNode {
+ fn as_dot_str(
+ &self,
+ analyzer: &impl GraphBackend,
+ _arena: &mut RangeArena>,
+ ) -> String {
+ format!("Context {{ {} }}", self.path(analyzer))
+ }
+}
+
+impl ContextNode {
+ pub fn add_gas_cost(
+ &self,
+ analyzer: &mut impl GraphBackend,
+ cost: u64,
+ ) -> Result<(), GraphError> {
+ self.associated_fn(analyzer)?.add_gas_cost(analyzer, cost)
+ }
+
+ /// Gets the total context width
+ pub fn total_width(&self, analyzer: &mut impl AnalyzerBackend) -> Result {
+ self.first_ancestor(analyzer)?
+ .number_of_live_edges(analyzer)
+ }
+
+ /// Gets the total context depth
+ pub fn depth(&self, analyzer: &impl GraphBackend) -> usize {
+ self.underlying(analyzer).unwrap().depth
+ }
+
+ /// The path of the underlying context
+ pub fn path(&self, analyzer: &impl GraphBackend) -> String {
+ self.underlying(analyzer).unwrap().path.clone()
+ }
+
+ /// Gets a mutable reference to the underlying context in the graph
+ pub fn underlying_mut<'a>(
+ &self,
+ analyzer: &'a mut impl AnalyzerBackend,
+ ) -> Result<&'a mut Context, GraphError> {
+ match analyzer.node_mut(*self) {
+ Node::Context(c) => Ok(c),
+ Node::Unresolved(ident) => Err(GraphError::UnknownVariable(format!(
+ "Could not find variable: {}",
+ ident.name
+ ))),
+ e => Err(GraphError::NodeConfusion(format!(
+ "Node type confusion: expected node to be Context but it was: {e:?}"
+ ))),
+ }
+ }
+
+ /// Gets an immutable reference to the underlying context in the graph
+ pub fn underlying<'a>(
+ &self,
+ analyzer: &'a impl GraphBackend,
+ ) -> Result<&'a Context, GraphError> {
+ match analyzer.node(*self) {
+ Node::Context(c) => Ok(c),
+ Node::Unresolved(ident) => Err(GraphError::UnknownVariable(format!(
+ "Could not find variable: {}",
+ ident.name
+ ))),
+ e => Err(GraphError::NodeConfusion(format!(
+ "Node type confusion: expected node to be Context but it was: {e:?}"
+ ))),
+ }
+ }
+
+ /// Returns an option to where the context was killed
+ pub fn killed_loc(
+ &self,
+ analyzer: &impl GraphBackend,
+ ) -> Result, GraphError> {
+ Ok(self.underlying(analyzer)?.killed)
+ }
+
+ /// Add a return node to the context
+ pub fn add_return_node(
+ &self,
+ ret_stmt_loc: Loc,
+ ret: ContextVarNode,
+ analyzer: &mut impl AnalyzerBackend,
+ ) -> Result<(), GraphError> {
+ self.underlying_mut(analyzer)?.ret.push((ret_stmt_loc, ret));
+ self.propogate_end(analyzer)?;
+ Ok(())
+ }
+
+ /// Propogate that this context has ended up the context graph
+ pub fn propogate_end(&self, analyzer: &mut impl AnalyzerBackend) -> Result<(), GraphError> {
+ let underlying = &mut self.underlying_mut(analyzer)?;
+ let curr_live = underlying.number_of_live_edges;
+ underlying.number_of_live_edges = 0;
+ if let Some(parent) = self.underlying(analyzer)?.parent_ctx {
+ let live_edges = &mut parent.underlying_mut(analyzer)?.number_of_live_edges;
+ *live_edges = live_edges.saturating_sub(1 + curr_live);
+ parent.propogate_end(analyzer)?;
+ }
+ Ok(())
+ }
+
+ /// Gets the return nodes for this context
+ pub fn return_nodes(
+ &self,
+ analyzer: &impl GraphBackend,
+ ) -> Result, GraphError> {
+ Ok(self.underlying(analyzer)?.ret.clone())
+ }
+
+ /// Returns a string for dot-string things
+ pub fn as_string(&mut self) -> String {
+ "Context".to_string()
+ }
+}
+
+impl From for NodeIdx {
+ fn from(val: ContextNode) -> Self {
+ val.0.into()
+ }
+}
+
+impl From for ContextNode {
+ fn from(idx: NodeIdx) -> Self {
+ ContextNode(idx.index())
+ }
+}
diff --git a/crates/graph/src/nodes/context/querying.rs b/crates/graph/src/nodes/context/querying.rs
new file mode 100644
index 00000000..16fd28a9
--- /dev/null
+++ b/crates/graph/src/nodes/context/querying.rs
@@ -0,0 +1,254 @@
+use crate::{
+ nodes::{
+ ContextNode, ContractNode, FunctionNode, SourceUnitNode, SourceUnitPartNode, StructNode,
+ },
+ AnalyzerBackend, ContextEdge, Edge, GraphBackend, GraphError,
+};
+
+use shared::Search;
+use std::collections::{BTreeMap, BTreeSet};
+
+impl ContextNode {
+ /// Gets the associated contract for the function for the context
+ pub fn associated_contract(
+ &self,
+ analyzer: &mut impl AnalyzerBackend,
+ ) -> Result {
+ Ok(self
+ .associated_fn(analyzer)?
+ .maybe_associated_contract(analyzer)
+ .expect("No associated contract for context"))
+ }
+
+ /// Tries to get the associated function for the context
+ pub fn maybe_associated_contract(
+ &self,
+ analyzer: &mut impl AnalyzerBackend,
+ ) -> Result, GraphError> {
+ Ok(self
+ .associated_fn(analyzer)?
+ .maybe_associated_contract(analyzer))
+ }
+
+ /// Tries to get the associated source for the context
+ pub fn maybe_associated_source(
+ &self,
+ analyzer: &mut impl AnalyzerBackend,
+ ) -> Option {
+ let context = self.underlying(analyzer).unwrap();
+ if let Some(src) = context.cache.associated_source {
+ Some(src.into())
+ } else if let Some(parent_ctx) = context.parent_ctx {
+ let src = parent_ctx.maybe_associated_source(analyzer)?;
+ self.underlying_mut(analyzer)
+ .unwrap()
+ .cache
+ .associated_source = Some(src.into());
+ Some(src)
+ } else {
+ let func = self.associated_fn(analyzer).unwrap();
+ func.maybe_associated_source(analyzer)
+ }
+ }
+
+ /// Tries to get the associated source unit part for the context
+ pub fn associated_source_unit_part(
+ &self,
+ analyzer: &mut impl AnalyzerBackend,
+ ) -> Result {
+ if let Some(sup) = self
+ .associated_fn(analyzer)?
+ .maybe_associated_source_unit_part(analyzer)
+ {
+ Ok(sup)
+ } else {
+ Err(GraphError::NodeConfusion(
+ "Expected context to have an associated source but didnt".to_string(),
+ ))
+ }
+ }
+
+ /// Gets visible functions
+ pub fn visible_modifiers(
+ &self,
+ analyzer: &mut impl AnalyzerBackend,
+ ) -> Result, GraphError> {
+ // TODO: filter privates
+ let Some(source) = self.maybe_associated_source(analyzer) else {
+ return Err(GraphError::NodeConfusion(
+ "Expected context to have an associated source but didnt".to_string(),
+ ));
+ };
+ if let Some(contract) = self.maybe_associated_contract(analyzer)? {
+ let mut modifiers = contract.modifiers(analyzer);
+ // extend with free floating functions
+ modifiers.extend(
+ analyzer
+ .search_children_depth(source.into(), &Edge::Modifier, 1, 0)
+ .into_iter()
+ .map(FunctionNode::from)
+ .collect::>(),
+ );
+
+ // extend with inherited functions
+ let inherited_contracts = analyzer.search_children_exclude_via(
+ contract.0.into(),
+ &Edge::InheritedContract,
+ &[Edge::Func],
+ );
+ modifiers.extend(
+ inherited_contracts
+ .into_iter()
+ .flat_map(|inherited_contract| {
+ ContractNode::from(inherited_contract).modifiers(analyzer)
+ })
+ .collect::>(),
+ );
+
+ let mut mapping: BTreeMap> = BTreeMap::new();
+ for modifier in modifiers.iter() {
+ let entry = mapping.entry(modifier.name(analyzer)?).or_default();
+ entry.insert(*modifier);
+ }
+ mapping
+ .into_values()
+ .map(|modifier_set| {
+ let as_vec = modifier_set.iter().collect::>();
+
+ match as_vec.len() {
+ 2 => {
+ as_vec[0].get_overriding(as_vec[1], analyzer)
+ }
+ 3.. => {
+ panic!("3+ visible functions with the same name. This is invalid solidity, {as_vec:#?}")
+ }
+ _ => Ok(*as_vec[0])
+ }
+ })
+ .collect()
+ } else {
+ // we are in a free floating function, only look at free floating functions
+ let Some(source) = self.maybe_associated_source(analyzer) else {
+ return Err(GraphError::NodeConfusion(
+ "Expected context to have an associated source but didnt".to_string(),
+ ));
+ };
+ Ok(analyzer
+ .search_children_depth(source.into(), &Edge::Modifier, 1, 0)
+ .into_iter()
+ .map(FunctionNode::from)
+ .collect::>())
+ }
+ }
+
+ /// Gets visible functions
+ pub fn visible_funcs(
+ &self,
+ analyzer: &mut impl AnalyzerBackend,
+ ) -> Result, GraphError> {
+ // TODO: filter privates
+ if let Some(vis) = &self.underlying(analyzer)?.cache.visible_funcs {
+ return Ok(vis.clone());
+ }
+ if let Some(contract) = self.maybe_associated_contract(analyzer)? {
+ let mut mapping = contract.linearized_functions(analyzer)?;
+ // extend with free floating functions
+ mapping.extend(
+ analyzer
+ .search_children_depth(analyzer.entry(), &Edge::Func, 2, 0)
+ .into_iter()
+ .filter_map(|i| {
+ let fn_node = FunctionNode::from(i);
+ if let Ok(name) = fn_node.name(analyzer) {
+ if !mapping.contains_key(&name) {
+ Some((name, fn_node))
+ } else {
+ None
+ }
+ } else {
+ None
+ }
+ })
+ .collect::>(),
+ );
+ let funcs: Vec<_> = mapping.values().copied().collect();
+ self.underlying_mut(analyzer)?.cache.visible_funcs = Some(funcs.clone());
+ Ok(funcs)
+ } else {
+ // we are in a free floating function, only look at free floating functions
+ let funcs = analyzer
+ .search_children_depth(analyzer.entry(), &Edge::Func, 2, 0)
+ .into_iter()
+ .map(FunctionNode::from)
+ .collect::>();
+
+ self.underlying_mut(analyzer)?.cache.visible_funcs = Some(funcs.clone());
+ Ok(funcs)
+ }
+ }
+
+ /// Gets all visible functions
+ pub fn source_funcs(
+ &self,
+ analyzer: &mut impl AnalyzerBackend,
+ ) -> Vec {
+ // TODO: filter privates
+ let Some(source) = self.maybe_associated_source(analyzer) else {
+ return vec![];
+ };
+ analyzer
+ .search_children_exclude_via(
+ source.into(),
+ &Edge::Func,
+ &[
+ Edge::Context(ContextEdge::Context),
+ Edge::Context(ContextEdge::Variable),
+ ],
+ )
+ .into_iter()
+ .map(FunctionNode::from)
+ .collect::>()
+ }
+
+ /// Gets all visible structs
+ pub fn visible_structs(
+ &self,
+ analyzer: &mut impl AnalyzerBackend,
+ ) -> Result, GraphError> {
+ // TODO: filter privates
+ if let Some(vis) = &self.underlying(analyzer)?.cache.visible_structs {
+ return Ok(vis.clone());
+ }
+
+ let Some(source) = self.maybe_associated_source(analyzer) else {
+ return Ok(vec![]);
+ };
+
+ let mut structs = source.visible_structs(analyzer)?;
+ let contract = self.associated_contract(analyzer)?;
+ structs.extend(contract.visible_structs(analyzer));
+
+ structs.sort();
+ structs.dedup();
+
+ self.underlying_mut(analyzer)?.cache.visible_structs = Some(structs.clone());
+ Ok(structs)
+ }
+
+ /// Gets the associated function for the context
+ pub fn associated_fn(&self, analyzer: &impl GraphBackend) -> Result {
+ let underlying = self.underlying(analyzer)?;
+ if let Some(fn_call) = underlying.fn_call {
+ Ok(fn_call)
+ } else if let Some(ext_fn_call) = underlying.ext_fn_call {
+ Ok(ext_fn_call)
+ } else {
+ Ok(underlying.parent_fn)
+ }
+ }
+
+ /// Gets the associated function name for the context
+ pub fn associated_fn_name(&self, analyzer: &impl GraphBackend) -> Result {
+ self.associated_fn(analyzer)?.name(analyzer)
+ }
+}
diff --git a/crates/graph/src/nodes/context/solving.rs b/crates/graph/src/nodes/context/solving.rs
new file mode 100644
index 00000000..af834be9
--- /dev/null
+++ b/crates/graph/src/nodes/context/solving.rs
@@ -0,0 +1,160 @@
+use crate::elem::Elem;
+
+use crate::{
+ nodes::{Concrete, ContextNode, ContextVarNode},
+ range::Range,
+ solvers::{
+ dl::{DLSolver, SolveStatus},
+ Atomize, SolverAtom,
+ },
+ AnalyzerBackend, GraphBackend, GraphError,
+};
+use std::borrow::Cow;
+
+use shared::RangeArena;
+
+use std::collections::BTreeMap;
+
+impl ContextNode {
+ /// Use a Difference Logic solver to see if it is unreachable
+ pub fn unreachable(
+ &self,
+ analyzer: &mut impl GraphBackend,
+ arena: &mut RangeArena>,
+ ) -> Result {
+ // println!("checking unreachable: {}", self.path(analyzer));
+ let mut solver = self.dl_solver(analyzer)?.clone();
+ match solver.solve_partial(analyzer, arena)? {
+ SolveStatus::Unsat => {
+ tracing::trace!("{} is unreachable via UNSAT", self.path(analyzer));
+ Ok(true)
+ }
+ _e => {
+ // println!("other: {e:?}");
+ Ok(false)
+ }
+ }
+ }
+
+ /// Get the dependencies as normalized solver atoms
+ pub fn dep_atoms(
+ &self,
+ analyzer: &mut impl GraphBackend,
+ arena: &mut RangeArena>,
+ ) -> Result, GraphError> {
+ let deps: Vec<_> = self.ctx_deps(analyzer)?;
+ let mut ranges = BTreeMap::default();
+ deps.iter().try_for_each(|dep| {
+ let mut range = dep.range(analyzer)?.unwrap();
+ let r: Cow<'_, _> = range.flattened_range(analyzer, arena)?;
+ ranges.insert(*dep, r.into_owned());
+ Ok(())
+ })?;
+
+ Ok(ranges
+ .iter()
+ .filter_map(|(_dep, range)| {
+ if let Some(atom) = Elem::Arena(range.min).atomize(analyzer, arena) {
+ Some(atom)
+ } else {
+ Elem::Arena(range.max).atomize(analyzer, arena)
+ }
+ })
+ .collect::>())
+ }
+
+ /// Get the difference logic solver associated with this context
+ pub fn dl_solver<'a>(
+ &self,
+ analyzer: &'a impl GraphBackend,
+ ) -> Result<&'a DLSolver, GraphError> {
+ Ok(&self.underlying(analyzer)?.dl_solver)
+ }
+
+ /// Returns a map of variable dependencies for this context
+ pub fn ctx_deps(
+ &self,
+ analyzer: &impl GraphBackend,
+ ) -> Result, GraphError> {
+ let deps = self
+ .underlying(analyzer)?
+ .ctx_deps
+ .clone()
+ .into_iter()
+ .collect::>();
+ Ok(deps)
+ }
+
+ pub fn debug_ctx_deps(
+ &self,
+ analyzer: &impl GraphBackend,
+ arena: &mut RangeArena>,
+ ) -> Result<(), GraphError> {
+ let deps = self.ctx_deps(analyzer)?;
+ deps.iter().enumerate().for_each(|(i, var)| {
+ println!(
+ "{i}. {}",
+ var.as_controllable_name(analyzer, arena).unwrap()
+ )
+ });
+ Ok(())
+ }
+
+ /// Adds a dependency for this context to exit successfully
+ pub fn add_ctx_dep(
+ &self,
+ dep: ContextVarNode,
+ analyzer: &mut impl AnalyzerBackend,
+ arena: &mut RangeArena>,
+ ) -> Result<(), GraphError> {
+ tracing::trace!(
+ "Adding ctx ({}) dependency: {}, is_controllable: {}",
+ self.path(analyzer),
+ dep.display_name(analyzer)?,
+ dep.is_controllable(analyzer)?
+ );
+ if dep.is_controllable(analyzer)? {
+ // let underlying = self.underlying_mut(analyzer)?;
+ if !self.underlying(analyzer)?.ctx_deps.contains(&dep) {
+ // dep.cache_flattened_range(analyzer)?;
+ let mut range = dep.range(analyzer)?.unwrap();
+
+ let min = range.simplified_range_min(analyzer, arena)?;
+ let max = range.simplified_range_max(analyzer, arena)?;
+
+ let true_elem = Elem::from(true);
+ let trivial_sat = min == true_elem && max == true_elem;
+ if trivial_sat || min == Elem::Null || max == Elem::Null {
+ return Ok(());
+ }
+
+ let r = range.flattened_range(analyzer, arena)?.into_owned();
+
+ // add the atomic constraint
+ if let Some(atom) = Elem::Arena(r.min).atomize(analyzer, arena) {
+ let mut solver = std::mem::take(&mut self.underlying_mut(analyzer)?.dl_solver);
+ let constraints = solver.add_constraints(vec![atom], analyzer, arena);
+ constraints
+ .into_iter()
+ .for_each(|(constraint, normalized)| {
+ solver.add_constraint(constraint, normalized);
+ });
+ self.underlying_mut(analyzer)?.dl_solver = solver;
+ } else if let Some(atom) = Elem::Arena(r.max).atomize(analyzer, arena) {
+ let mut solver = std::mem::take(&mut self.underlying_mut(analyzer)?.dl_solver);
+ let constraints = solver.add_constraints(vec![atom], analyzer, arena);
+ constraints
+ .into_iter()
+ .for_each(|(constraint, normalized)| {
+ solver.add_constraint(constraint, normalized);
+ });
+ self.underlying_mut(analyzer)?.dl_solver = solver;
+ }
+
+ let underlying = self.underlying_mut(analyzer)?;
+ underlying.ctx_deps.insert(dep);
+ }
+ }
+ Ok(())
+ }
+}
diff --git a/crates/graph/src/nodes/context/typing.rs b/crates/graph/src/nodes/context/typing.rs
new file mode 100644
index 00000000..e8a56bda
--- /dev/null
+++ b/crates/graph/src/nodes/context/typing.rs
@@ -0,0 +1,88 @@
+use crate::{
+ nodes::{ContextNode, FunctionNode},
+ AnalyzerBackend, GraphBackend, GraphError,
+};
+
+impl ContextNode {
+ /// Checks if its an anonymous function call (i.e. loop)
+ pub fn is_anonymous_fn_call(&self, analyzer: &impl GraphBackend) -> Result {
+ let underlying = self.underlying(analyzer)?;
+
+ Ok(underlying.fn_call.is_none() && underlying.ext_fn_call.is_none() && !underlying.is_fork)
+ }
+
+ pub fn has_continuation(&self, analyzer: &mut impl GraphBackend) -> Result {
+ Ok(self.underlying(analyzer)?.continuation_of.is_some())
+ }
+
+ /// Returns whether this context is killed or returned
+ pub fn killed_or_ret(&self, analyzer: &impl GraphBackend) -> Result {
+ let underlying = self.underlying(analyzer)?;
+ Ok(underlying.killed.is_some()
+ || (!underlying.ret.is_empty() && underlying.modifier_state.is_none()))
+ }
+
+ /// Returns whether the context is killed
+ pub fn is_returned(&self, analyzer: &impl GraphBackend) -> Result {
+ Ok(!self.underlying(analyzer)?.ret.is_empty())
+ }
+
+ /// Returns whether the context is killed
+ pub fn is_killed(&self, analyzer: &impl GraphBackend) -> Result {
+ Ok(self.underlying(analyzer)?.killed.is_some())
+ }
+
+ /// Returns whether the context is killed
+ pub fn is_ended(&self, analyzer: &impl GraphBackend) -> Result {
+ let underlying = self.underlying(analyzer)?;
+ Ok(underlying.child.is_some() || underlying.killed.is_some() || !underlying.ret.is_empty())
+ }
+
+ /// Check if this context is in an external function call
+ pub fn is_ext_fn(&self, analyzer: &impl GraphBackend) -> Result {
+ Ok(self.underlying(analyzer)?.ext_fn_call.is_some())
+ }
+
+ /// Checks whether a function is external to the current context
+ pub fn is_fn_ext(
+ &self,
+ fn_node: FunctionNode,
+ analyzer: &mut impl AnalyzerBackend,
+ ) -> Result {
+ match fn_node.maybe_associated_contract(analyzer) {
+ None => Ok(false),
+ Some(fn_ctrt) => {
+ if let Some(self_ctrt) = self
+ .associated_fn(analyzer)?
+ .maybe_associated_contract(analyzer)
+ {
+ Ok(Some(self_ctrt) != Some(fn_ctrt)
+ && !self_ctrt
+ .underlying(analyzer)?
+ .inherits
+ .iter()
+ .any(|inherited| *inherited == fn_ctrt))
+ } else {
+ Ok(false)
+ }
+ }
+ }
+ }
+
+ /// Returns whether this context *currently* uses unchecked math
+ pub fn unchecked(&self, analyzer: &impl GraphBackend) -> Result {
+ Ok(self.underlying(analyzer)?.unchecked)
+ }
+
+ /// Sets the context to use unchecked math
+ pub fn set_unchecked(&self, analyzer: &mut impl AnalyzerBackend) -> Result<(), GraphError> {
+ self.underlying_mut(analyzer)?.unchecked = true;
+ Ok(())
+ }
+
+ /// Sets the context to use checked math
+ pub fn unset_unchecked(&self, analyzer: &mut impl AnalyzerBackend) -> Result<(), GraphError> {
+ self.underlying_mut(analyzer)?.unchecked = false;
+ Ok(())
+ }
+}
diff --git a/crates/graph/src/nodes/context/underlying.rs b/crates/graph/src/nodes/context/underlying.rs
new file mode 100644
index 00000000..5008c0b6
--- /dev/null
+++ b/crates/graph/src/nodes/context/underlying.rs
@@ -0,0 +1,331 @@
+use crate::{
+ nodes::{
+ CallFork, ContextCache, ContextNode, ContextVarNode, ExprRet, FunctionNode, KilledKind,
+ ModifierState,
+ },
+ solvers::dl::DLSolver,
+ AnalyzerBackend, GraphError,
+};
+
+use solang_parser::pt::Loc;
+use std::collections::BTreeSet;
+
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub struct Context {
+ /// The function associated with this context
+ pub parent_fn: FunctionNode,
+ /// Whether this function call is actually a modifier call
+ pub modifier_state: Option