Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug Fix #174

Closed
wants to merge 3 commits into from
Closed

Bug Fix #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e995620
cargo clippy
0xAWM Aug 20, 2023
6378a47
fix bug
0xAWM Aug 20, 2023
489d238
fix bug: The file suffix generated by solc is '.abi' instead of '.abis'
0xAWM Aug 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@
/*bench
bin
corpus
.idea
.vscode
node_modules
cache
cache
*.bin
*.abi
output
work_dir
.z3-trace
*.code-workspace
43 changes: 32 additions & 11 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ name = "ityfuzz"
harness = false

[features]
default = ["cmp", "dataflow", "evm", "print_txn_corpus", "full_trace", ]
default = ["cmp", "dataflow", "evm", "print_txn_corpus", "full_trace"]
evm = []
cmp = []
dataflow = []
Expand All @@ -29,14 +29,32 @@ force_cache = []
use_presets = []
print_logs = []
z3_debug = []
sui_support = ["dep:move-binary-format", "dep:move-core-types", "dep:move-stdlib", "dep:move-vm-runtime", "dep:move-vm-types", "dep:sui-move-natives-latest", "dep:sui-protocol-config", "dep:sui-types"]
sui_support = [
"dep:move-binary-format",
"dep:move-core-types",
"dep:move-stdlib",
"dep:move-vm-runtime",
"dep:move-vm-types",
"dep:sui-move-natives-latest",
"dep:sui-protocol-config",
"dep:sui-types",
]
debug = []

[dependencies]
bytes = { version = "1.2.1", features = ["serde"] }
revm = { path = "./externals/revm/crates/revm", features = ["no_gas_measuring", "serde"] }
revm-primitives = { path = "./externals/revm/crates/primitives", features = ["no_gas_measuring", "serde"] }
revm-interpreter = { path = "./externals/revm/crates/interpreter", features = ["no_gas_measuring", "serde"] }
revm = { path = "./externals/revm/crates/revm", features = [
"no_gas_measuring",
"serde",
] }
revm-primitives = { path = "./externals/revm/crates/primitives", features = [
"no_gas_measuring",
"serde",
] }
revm-interpreter = { path = "./externals/revm/crates/interpreter", features = [
"no_gas_measuring",
"serde",
] }
hex = "0.4"
primitive-types = { version = "0.12.1", features = ["rlp", "serde"] }
libafl = "0.8.2"
Expand All @@ -45,7 +63,7 @@ nix = "0.24"
serde = "1.0.147"
serde_traitobject = "0.2.7"
serde_json = "1.0.73"
z3 = {version="0.11.2", features = ["static-link-z3"]}
z3 = { version = "0.11.2", features = ["static-link-z3"] }
z3-sys = "0.7.1"
glob = "0.3.0"
rust-crypto = "0.2"
Expand All @@ -61,14 +79,17 @@ heimdall = { path = "./externals/heimdall-rs/heimdall" }

# from https://github.com/aptos-labs/aptos-core/blob/main/Cargo.toml#L452
move-binary-format = { path = "./externals/sui/external-crates/move/move-binary-format", optional = true }
move-core-types = { path = "./externals/sui/external-crates/move/move-core/types", features = ["address32"], optional = true }
move-core-types = { path = "./externals/sui/external-crates/move/move-core/types", features = [
"address32",
], optional = true }
move-stdlib = { path = "./externals/sui/external-crates/move/move-stdlib", optional = true }
move-vm-runtime = { path = "./externals/sui/external-crates/move/move-vm/runtime", features = ["lazy_natives"], optional = true }
move-vm-runtime = { path = "./externals/sui/external-crates/move/move-vm/runtime", features = [
"lazy_natives",
], optional = true }
move-vm-types = { path = "./externals/sui/external-crates/move/move-vm/types", optional = true }
sui-move-natives-latest = { path = "./externals/sui/sui-execution/latest/sui-move-natives", optional = true }
sui-protocol-config = { path = "./externals/sui/crates/sui-protocol-config", optional = true }
sui-types = { path = "./externals/sui/crates/sui-types", optional = true }

sui-protocol-config = { path = "./externals/sui/crates/sui-protocol-config", optional = true }
sui-types = { path = "./externals/sui/crates/sui-types", optional = true }


retry = "2.0.0"
Expand Down
86 changes: 40 additions & 46 deletions cli/src/evm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
use clap::Parser;
use ethers::types::Transaction;
use hex::{decode, encode};
use ityfuzz::evm::config::{Config, FuzzerTypes, StorageFetchingMode};
use ityfuzz::evm::contract_utils::{set_hash, ContractLoader};
use ityfuzz::evm::host::PANIC_ON_BUG;
use ityfuzz::evm::contract_utils::ContractLoader;
use ityfuzz::evm::input::{ConciseEVMInput, EVMInput};
use ityfuzz::evm::middlewares::middleware::Middleware;
use ityfuzz::evm::onchain::endpoints::{Chain, OnChainConfig};
use ityfuzz::evm::onchain::flashloan::{DummyPriceOracle, Flashloan};
use ityfuzz::evm::oracles::echidna::EchidnaOracle;
use ityfuzz::evm::onchain::flashloan::DummyPriceOracle;
use ityfuzz::evm::oracles::erc20::IERC20OracleFlashloan;
use ityfuzz::evm::oracles::function::FunctionHarnessOracle;
use ityfuzz::evm::oracles::selfdestruct::SelfdestructOracle;
use ityfuzz::evm::oracles::typed_bug::TypedBugOracle;
use ityfuzz::evm::oracles::v2_pair::PairBalanceOracle;
Expand All @@ -20,21 +15,18 @@ use ityfuzz::evm::types::{EVMAddress, EVMFuzzState, EVMU256};
use ityfuzz::evm::vm::EVMState;
use ityfuzz::fuzzers::evm_fuzzer::evm_fuzzer;
use ityfuzz::oracle::{Oracle, Producer};
use ityfuzz::r#const;
use ityfuzz::state::FuzzState;
use serde::Deserialize;
use std::cell::RefCell;
use std::collections::HashMap;
use std::collections::HashSet;
use std::env;
use std::rc::Rc;
use std::str::FromStr;


pub fn parse_constructor_args_string(input: String) -> HashMap<String, Vec<String>> {
let mut map = HashMap::new();

if input.len() == 0 {
if input.is_empty() {
return map;
}

Expand All @@ -50,6 +42,7 @@ pub fn parse_constructor_args_string(input: String) -> HashMap<String, Vec<Strin
map
}

#[allow(dead_code)]
#[derive(Deserialize)]
struct Data {
body: RPCCall,
Expand All @@ -62,29 +55,32 @@ struct RPCCall {
params: Option<serde_json::Value>,
}

#[allow(dead_code)]
#[derive(Deserialize)]
struct Response {
data: ResponseData,
}

#[allow(dead_code)]
#[derive(Deserialize)]
struct ResponseData {
id: u16,
result: TXResult,
}

#[allow(dead_code)]
#[derive(Deserialize)]
struct TXResult {
input: String,
}

/// CLI for ItyFuzz for EVM smart contracts
#[derive(Parser, Debug)]
#[derive(Parser, Debug, Default)]
#[command(author, version, about, long_about = None)]
pub struct EvmArgs {
/// Glob pattern / address to find contracts
#[arg(short, long)]
target: String,
pub(crate) target: String,

#[arg(long, default_value = "false")]
fetch_tx_data: bool,
Expand Down Expand Up @@ -226,7 +222,6 @@ pub struct EvmArgs {
///spec id
#[arg(long, default_value = "Latest")]
spec_id: String,

}

enum EVMTargetType {
Expand Down Expand Up @@ -288,7 +283,7 @@ pub fn evm_main(args: EvmArgs) {
let pair_producer = Rc::new(RefCell::new(PairProducer::new()));
let erc20_producer = Rc::new(RefCell::new(ERC20Producer::new()));

let mut flashloan_oracle = Rc::new(RefCell::new({
let flashloan_oracle = Rc::new(RefCell::new({
IERC20OracleFlashloan::new(pair_producer.clone(), erc20_producer.clone())
}));

Expand All @@ -297,7 +292,7 @@ pub fn evm_main(args: EvmArgs) {
// set_hash(harness_code, &mut harness_hash);
// let mut function_oracle =
// FunctionHarnessOracle::new_no_condition(EVMAddress::zero(), Vec::from(harness_hash));

#[allow(clippy::type_complexity)]
let mut oracles: Vec<
Rc<
RefCell<
Expand All @@ -311,12 +306,13 @@ pub fn evm_main(args: EvmArgs) {
Vec<u8>,
EVMInput,
EVMFuzzState,
ConciseEVMInput
ConciseEVMInput,
>,
>,
>,
> = vec![];

#[allow(clippy::type_complexity)]
let mut producers: Vec<
Rc<
RefCell<
Expand All @@ -330,7 +326,7 @@ pub fn evm_main(args: EvmArgs) {
Vec<u8>,
EVMInput,
EVMFuzzState,
ConciseEVMInput
ConciseEVMInput,
>,
>,
>,
Expand All @@ -352,7 +348,6 @@ pub fn evm_main(args: EvmArgs) {

if args.typed_bug_oracle {
oracles.push(Rc::new(RefCell::new(TypedBugOracle::new())));

}

if args.ierc20_oracle || args.pair_oracle {
Expand Down Expand Up @@ -386,8 +381,8 @@ pub fn evm_main(args: EvmArgs) {

let data = params[0].clone();

let data = if data.starts_with("0x") {
&data[2..]
let data = if let Some(stripped) = data.strip_prefix("0x") {
stripped
} else {
&data
};
Expand All @@ -407,14 +402,12 @@ pub fn evm_main(args: EvmArgs) {
let config = Config {
fuzzer_type: FuzzerTypes::from_str(args.fuzzer_type.as_str()).expect("unknown fuzzer"),
contract_loader: match target_type {
EVMTargetType::Glob => {
ContractLoader::from_glob(
args.target.as_str(),
&mut state,
&proxy_deploy_codes,
&constructor_args_map,
)
}
EVMTargetType::Glob => ContractLoader::from_glob(
args.target.as_str(),
&mut state,
&proxy_deploy_codes,
&constructor_args_map,
),
EVMTargetType::Address => {
if onchain.is_none() {
panic!("Onchain is required for address target type");
Expand All @@ -425,29 +418,32 @@ pub fn evm_main(args: EvmArgs) {
const ETH_ADDRESS: &str = "0x7a250d5630b4cf539739df2c5dacb4c659f2488d";
const BSC_ADDRESS: &str = "0x10ed43c718714eb63d5aa57b78b54704e256024e";
if "bsc" == onchain.as_ref().unwrap().chain_name {
if args_target.find(BSC_ADDRESS) == None {
args_target.push_str(",");
if !args_target.contains(BSC_ADDRESS) {
args_target.push(',');
args_target.push_str(BSC_ADDRESS);
}
} else if "eth" == onchain.as_ref().unwrap().chain_name {
if args_target.find(ETH_ADDRESS) == None {
args_target.push_str(",");
args_target.push_str(ETH_ADDRESS);
}
} else if "eth" == onchain.as_ref().unwrap().chain_name
&& !args_target.contains(ETH_ADDRESS)
{
args_target.push(',');
args_target.push_str(ETH_ADDRESS);
}
}
let addresses: Vec<EVMAddress> = args_target
.split(",")
.split(',')
.map(|s| EVMAddress::from_str(s).unwrap())
.collect();
ContractLoader::from_address(
&mut onchain.as_mut().unwrap(),
onchain.as_mut().unwrap(),
HashSet::from_iter(addresses),
)
}
},
only_fuzz: if args.only_fuzz.len() > 0 {
args.only_fuzz.split(",").map(|s| EVMAddress::from_str(s).expect("failed to parse only fuzz")).collect()
only_fuzz: if !args.only_fuzz.is_empty() {
args.only_fuzz
.split(',')
.map(|s| EVMAddress::from_str(s).expect("failed to parse only fuzz"))
.collect()
} else {
HashSet::new()
},
Expand All @@ -474,12 +470,12 @@ pub fn evm_main(args: EvmArgs) {
replay_file: args.replay_file,
flashloan_oracle,
selfdestruct_oracle: args.selfdestruct_oracle,
state_comp_matching: if args.state_comp_oracle.len() > 0 {
state_comp_matching: if !args.state_comp_oracle.is_empty() {
Some(args.state_comp_matching)
} else {
None
},
state_comp_oracle: if args.state_comp_oracle.len() > 0 {
state_comp_oracle: if !args.state_comp_oracle.is_empty() {
Some(args.state_comp_oracle)
} else {
None
Expand All @@ -494,10 +490,8 @@ pub fn evm_main(args: EvmArgs) {
spec_id: args.spec_id,
};

match config.fuzzer_type {
FuzzerTypes::CMP => evm_fuzzer(config, &mut state),
// FuzzerTypes::BASIC => basic_fuzzer(config)
_ => {}
if let FuzzerTypes::CMP = config.fuzzer_type {
evm_fuzzer(config, &mut state)
}
//
// Some(v) => {
Expand Down
36 changes: 3 additions & 33 deletions cli/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,11 @@
mod evm;
mod r#move;

use clap::Parser;
use ethers::types::Transaction;
use hex::{decode, encode};
use ityfuzz::evm::config::{Config, FuzzerTypes, StorageFetchingMode};
use ityfuzz::evm::contract_utils::{set_hash, ContractLoader};
use ityfuzz::evm::host::PANIC_ON_BUG;
use ityfuzz::evm::input::{ConciseEVMInput, EVMInput};
use ityfuzz::evm::middlewares::middleware::Middleware;
use ityfuzz::evm::onchain::endpoints::{Chain, OnChainConfig};
use ityfuzz::evm::onchain::flashloan::{DummyPriceOracle, Flashloan};
use ityfuzz::evm::oracles::echidna::EchidnaOracle;
use ityfuzz::evm::oracles::erc20::IERC20OracleFlashloan;
use ityfuzz::evm::oracles::function::FunctionHarnessOracle;
use ityfuzz::evm::oracles::selfdestruct::SelfdestructOracle;
use ityfuzz::evm::oracles::typed_bug::TypedBugOracle;
use ityfuzz::evm::oracles::v2_pair::PairBalanceOracle;
use ityfuzz::evm::producers::erc20::ERC20Producer;
use ityfuzz::evm::producers::pair::PairProducer;
use ityfuzz::evm::types::{EVMAddress, EVMFuzzState, EVMU256};
use ityfuzz::evm::vm::EVMState;
use ityfuzz::fuzzers::evm_fuzzer::evm_fuzzer;
use ityfuzz::oracle::{Oracle, Producer};
use ityfuzz::r#const;
use ityfuzz::state::FuzzState;
use serde::Deserialize;
use std::cell::RefCell;
use std::collections::HashMap;
use std::collections::HashSet;
use std::env;
use std::rc::Rc;
use std::str::FromStr;
use crate::evm::{evm_main, EvmArgs};
use crate::r#move::{move_main, MoveArgs};
use clap::Parser;
use clap::Subcommand;
use std::env;

pub fn init_sentry() {
let _guard = sentry::init(("https://96f3517bd77346ea835d28f956a84b9d@o4504503751344128.ingest.sentry.io/4504503752523776", sentry::ClientOptions {
Expand All @@ -61,7 +32,7 @@ struct Cli {
#[derive(Subcommand, Debug)]
enum Commands {
EVM(EvmArgs),
MOVE(MoveArgs)
MOVE(MoveArgs),
}

fn main() {
Expand All @@ -75,5 +46,4 @@ fn main() {
move_main(args);
}
}

}
Loading