|
|
@ -58,81 +58,81 @@ pub fn new_opcodes() -> HashMap { |
|
|
|
opcodes.insert(0x02, new_opcode("MUL", 2, 1, 5));
|
|
|
|
opcodes.insert(0x03, new_opcode("SUB", 2, 1, 3));
|
|
|
|
opcodes.insert(0x04, new_opcode("DIV", 2, 1, 5));
|
|
|
|
// opcodes.insert(0x05, new_opcode("SDIV", 2, 1, 5));
|
|
|
|
opcodes.insert(0x05, new_opcode("SDIV", 2, 1, 5));
|
|
|
|
opcodes.insert(0x06, new_opcode("MOD", 2, 1, 5));
|
|
|
|
// opcodes.insert(0x07, new_opcode("SMOD", 2, 1, 5));
|
|
|
|
opcodes.insert(0x07, new_opcode("SMOD", 2, 1, 5));
|
|
|
|
opcodes.insert(0x08, new_opcode("ADDMOD", 3, 1, 8));
|
|
|
|
opcodes.insert(0x09, new_opcode("MULMOD", 3, 1, 8));
|
|
|
|
opcodes.insert(0x0a, new_opcode("EXP", 2, 1, 10));
|
|
|
|
// opcodes.insert(0x0b, new_opcode("SIGNEXTEND", 2, 1, 5));
|
|
|
|
opcodes.insert(0x0b, new_opcode("SIGNEXTEND", 2, 1, 5));
|
|
|
|
|
|
|
|
// boolean
|
|
|
|
// opcodes.insert(0x10, new_opcode("LT", 2, 1, 3));
|
|
|
|
// opcodes.insert(0x11, new_opcode("GT", 2, 1, 3));
|
|
|
|
// opcodes.insert(0x12, new_opcode("SLT", 2, 1, 3));
|
|
|
|
// opcodes.insert(0x13, new_opcode("SGT", 2, 1, 3));
|
|
|
|
// opcodes.insert(0x14, new_opcode("EQ", 2, 1, 3));
|
|
|
|
// opcodes.insert(0x15, new_opcode("ISZERO", 1, 1, 3));
|
|
|
|
// opcodes.insert(0x16, new_opcode("AND", 2, 1, 3));
|
|
|
|
// opcodes.insert(0x17, new_opcode("OR", 2, 1, 3));
|
|
|
|
// opcodes.insert(0x18, new_opcode("XOR", 2, 1, 3));
|
|
|
|
// opcodes.insert(0x19, new_opcode("NOT", 1, 1, 3));
|
|
|
|
// opcodes.insert(0x1a, new_opcode("BYTE", 2, 1, 3));
|
|
|
|
opcodes.insert(0x10, new_opcode("LT", 2, 1, 3));
|
|
|
|
opcodes.insert(0x11, new_opcode("GT", 2, 1, 3));
|
|
|
|
opcodes.insert(0x12, new_opcode("SLT", 2, 1, 3));
|
|
|
|
opcodes.insert(0x13, new_opcode("SGT", 2, 1, 3));
|
|
|
|
opcodes.insert(0x14, new_opcode("EQ", 2, 1, 3));
|
|
|
|
opcodes.insert(0x15, new_opcode("ISZERO", 1, 1, 3));
|
|
|
|
opcodes.insert(0x16, new_opcode("AND", 2, 1, 3));
|
|
|
|
opcodes.insert(0x17, new_opcode("OR", 2, 1, 3));
|
|
|
|
opcodes.insert(0x18, new_opcode("XOR", 2, 1, 3));
|
|
|
|
opcodes.insert(0x19, new_opcode("NOT", 1, 1, 3));
|
|
|
|
opcodes.insert(0x1a, new_opcode("BYTE", 2, 1, 3));
|
|
|
|
|
|
|
|
// crypto
|
|
|
|
// opcodes.insert(0x20, new_opcode("SHA3", 2, 1, 30));
|
|
|
|
opcodes.insert(0x20, new_opcode("SHA3", 2, 1, 30));
|
|
|
|
|
|
|
|
// contract context
|
|
|
|
// opcodes.insert(0x30, new_opcode("ADDRESS", 0, 1, 2));
|
|
|
|
// opcodes.insert(0x31, new_opcode("BALANCE", 1, 1, 20));
|
|
|
|
// opcodes.insert(0x32, new_opcode("ORIGIN", 0, 1, 2));
|
|
|
|
// opcodes.insert(0x33, new_opcode("CALLER", 0, 1, 2));
|
|
|
|
// opcodes.insert(0x34, new_opcode("CALLVALUE", 0, 1, 2));
|
|
|
|
opcodes.insert(0x30, new_opcode("ADDRESS", 0, 1, 2));
|
|
|
|
opcodes.insert(0x31, new_opcode("BALANCE", 1, 1, 20));
|
|
|
|
opcodes.insert(0x32, new_opcode("ORIGIN", 0, 1, 2));
|
|
|
|
opcodes.insert(0x33, new_opcode("CALLER", 0, 1, 2));
|
|
|
|
opcodes.insert(0x34, new_opcode("CALLVALUE", 0, 1, 2));
|
|
|
|
opcodes.insert(0x35, new_opcode("CALLDATALOAD", 1, 1, 3));
|
|
|
|
opcodes.insert(0x36, new_opcode("CALLDATASIZE", 0, 1, 2));
|
|
|
|
// opcodes.insert(0x37, new_opcode("CALLDATACOPY", 3, 0, 3));
|
|
|
|
// opcodes.insert(0x38, new_opcode("CODESIZE", 0, 1, 2));
|
|
|
|
opcodes.insert(0x37, new_opcode("CALLDATACOPY", 3, 0, 3));
|
|
|
|
opcodes.insert(0x38, new_opcode("CODESIZE", 0, 1, 2));
|
|
|
|
opcodes.insert(0x39, new_opcode("CODECOPY", 3, 0, 3));
|
|
|
|
// opcodes.insert(0x3a, new_opcode("GASPRICE", 0, 1, 2));
|
|
|
|
// opcodes.insert(0x3b, new_opcode("EXTCODESIZE", 1, 1, 20));
|
|
|
|
// opcodes.insert(0x3c, new_opcode("EXTCODECOPY", 4, 0, 20));
|
|
|
|
opcodes.insert(0x3a, new_opcode("GASPRICE", 0, 1, 2));
|
|
|
|
opcodes.insert(0x3b, new_opcode("EXTCODESIZE", 1, 1, 20));
|
|
|
|
opcodes.insert(0x3c, new_opcode("EXTCODECOPY", 4, 0, 20));
|
|
|
|
|
|
|
|
// blockchain context
|
|
|
|
// opcodes.insert(0x40, new_opcode("BLOCKHASH", 1, 1, 20));
|
|
|
|
// opcodes.insert(0x41, new_opcode("COINBASE", 0, 1, 2));
|
|
|
|
// opcodes.insert(0x42, new_opcode("TIMESTAMP", 0, 1, 2));
|
|
|
|
// opcodes.insert(0x43, new_opcode("NUMBER", 0, 1, 2));
|
|
|
|
// opcodes.insert(0x44, new_opcode("DIFFICULTY", 0, 1, 2));
|
|
|
|
// opcodes.insert(0x45, new_opcode("GASLIMIT", 0, 1, 2));
|
|
|
|
opcodes.insert(0x40, new_opcode("BLOCKHASH", 1, 1, 20));
|
|
|
|
opcodes.insert(0x41, new_opcode("COINBASE", 0, 1, 2));
|
|
|
|
opcodes.insert(0x42, new_opcode("TIMESTAMP", 0, 1, 2));
|
|
|
|
opcodes.insert(0x43, new_opcode("NUMBER", 0, 1, 2));
|
|
|
|
opcodes.insert(0x44, new_opcode("DIFFICULTY", 0, 1, 2));
|
|
|
|
opcodes.insert(0x45, new_opcode("GASLIMIT", 0, 1, 2));
|
|
|
|
|
|
|
|
// storage and execution
|
|
|
|
// opcodes.insert(0x50, new_opcode("POP", 1, 0, 2));
|
|
|
|
opcodes.insert(0x50, new_opcode("POP", 1, 0, 2));
|
|
|
|
opcodes.insert(0x51, new_opcode("MLOAD", 1, 1, 3));
|
|
|
|
opcodes.insert(0x52, new_opcode("MSTORE", 2, 0, 3));
|
|
|
|
// opcodes.insert(0x53, new_opcode("MSTORE8", 2, 0, 3));
|
|
|
|
// opcodes.insert(0x54, new_opcode("SLOAD", 1, 1, 50));
|
|
|
|
opcodes.insert(0x53, new_opcode("MSTORE8", 2, 0, 3));
|
|
|
|
opcodes.insert(0x54, new_opcode("SLOAD", 1, 1, 50));
|
|
|
|
opcodes.insert(0x55, new_opcode("SSTORE", 2, 0, 0));
|
|
|
|
opcodes.insert(0x56, new_opcode("JUMP", 1, 0, 8));
|
|
|
|
opcodes.insert(0x57, new_opcode("JUMPI", 2, 0, 10));
|
|
|
|
// opcodes.insert(0x58, new_opcode("PC", 0, 1, 2));
|
|
|
|
// opcodes.insert(0x59, new_opcode("MSIZE", 0, 1, 2));
|
|
|
|
// opcodes.insert(0x5a, new_opcode("GAS", 0, 1, 2));
|
|
|
|
opcodes.insert(0x58, new_opcode("PC", 0, 1, 2));
|
|
|
|
opcodes.insert(0x59, new_opcode("MSIZE", 0, 1, 2));
|
|
|
|
opcodes.insert(0x5a, new_opcode("GAS", 0, 1, 2));
|
|
|
|
opcodes.insert(0x5b, new_opcode("JUMPDEST", 0, 0, 1));
|
|
|
|
|
|
|
|
// logging
|
|
|
|
// opcodes.insert(0xa0, new_opcode("LOG0", 2, 0, 375));
|
|
|
|
// opcodes.insert(0xa1, new_opcode("LOG1", 3, 0, 750));
|
|
|
|
// opcodes.insert(0xa2, new_opcode("LOG2", 4, 0, 1125));
|
|
|
|
// opcodes.insert(0xa3, new_opcode("LOG3", 5, 0, 1500));
|
|
|
|
// opcodes.insert(0xa4, new_opcode("LOG4", 6, 0, 1875));
|
|
|
|
opcodes.insert(0xa0, new_opcode("LOG0", 2, 0, 375));
|
|
|
|
opcodes.insert(0xa1, new_opcode("LOG1", 3, 0, 750));
|
|
|
|
opcodes.insert(0xa2, new_opcode("LOG2", 4, 0, 1125));
|
|
|
|
opcodes.insert(0xa3, new_opcode("LOG3", 5, 0, 1500));
|
|
|
|
opcodes.insert(0xa4, new_opcode("LOG4", 6, 0, 1875));
|
|
|
|
|
|
|
|
// closures
|
|
|
|
// opcodes.insert(0xf0, new_opcode("CREATE", 3, 1, 32000));
|
|
|
|
// opcodes.insert(0xf1, new_opcode("CALL", 7, 1, 40));
|
|
|
|
// opcodes.insert(0xf2, new_opcode("CALLCODE", 7, 1, 40));
|
|
|
|
opcodes.insert(0xf0, new_opcode("CREATE", 3, 1, 32000));
|
|
|
|
opcodes.insert(0xf1, new_opcode("CALL", 7, 1, 40));
|
|
|
|
opcodes.insert(0xf2, new_opcode("CALLCODE", 7, 1, 40));
|
|
|
|
opcodes.insert(0xf3, new_opcode("RETURN", 2, 0, 0));
|
|
|
|
// opcodes.insert(0xf4, new_opcode("DELEGATECALL", 6, 0, 40));
|
|
|
|
// opcodes.insert(0xff, new_opcode("SUICIDE", 1, 0, 0));
|
|
|
|
opcodes.insert(0xf4, new_opcode("DELEGATECALL", 6, 0, 40));
|
|
|
|
opcodes.insert(0xff, new_opcode("SUICIDE", 1, 0, 0));
|
|
|
|
|
|
|
|
for i in 1..33 {
|
|
|
|
let name = format!("PUSH{}", i);
|
|
|
@ -154,19 +154,21 @@ impl Stack { |
|
|
|
// arithmetic
|
|
|
|
// TODO instead of [u8;32] converted to BigUint, use custom type uint256 that implements all
|
|
|
|
// the arithmetic
|
|
|
|
pub fn add(&mut self) {
|
|
|
|
let b0 = BigUint::from_bytes_be(&self.pop()[..]);
|
|
|
|
let b1 = BigUint::from_bytes_be(&self.pop()[..]);
|
|
|
|
pub fn add(&mut self) -> Result<(), String> {
|
|
|
|
let b0 = BigUint::from_bytes_be(&self.pop()?[..]);
|
|
|
|
let b1 = BigUint::from_bytes_be(&self.pop()?[..]);
|
|
|
|
self.push_arbitrary(&(b0 + b1).to_bytes_be());
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
pub fn mul(&mut self) {
|
|
|
|
let b0 = BigUint::from_bytes_be(&self.pop()[..]);
|
|
|
|
let b1 = BigUint::from_bytes_be(&self.pop()[..]);
|
|
|
|
pub fn mul(&mut self) -> Result<(), String> {
|
|
|
|
let b0 = BigUint::from_bytes_be(&self.pop()?[..]);
|
|
|
|
let b1 = BigUint::from_bytes_be(&self.pop()?[..]);
|
|
|
|
self.push_arbitrary(&(b0 * b1).to_bytes_be());
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
pub fn sub(&mut self) {
|
|
|
|
let b0 = BigUint::from_bytes_be(&self.pop()[..]);
|
|
|
|
let b1 = BigUint::from_bytes_be(&self.pop()[..]);
|
|
|
|
pub fn sub(&mut self) -> Result<(), String> {
|
|
|
|
let b0 = BigUint::from_bytes_be(&self.pop()?[..]);
|
|
|
|
let b1 = BigUint::from_bytes_be(&self.pop()?[..]);
|
|
|
|
if b0 >= b1 {
|
|
|
|
self.push_arbitrary(&(b0 - b1).to_bytes_be());
|
|
|
|
} else {
|
|
|
@ -177,38 +179,43 @@ impl Stack { |
|
|
|
.unwrap();
|
|
|
|
self.push_arbitrary(&(max + b0 - b1).to_bytes_be());
|
|
|
|
}
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
pub fn div(&mut self) {
|
|
|
|
let b0 = BigUint::from_bytes_be(&self.pop()[..]);
|
|
|
|
let b1 = BigUint::from_bytes_be(&self.pop()[..]);
|
|
|
|
pub fn div(&mut self) -> Result<(), String> {
|
|
|
|
let b0 = BigUint::from_bytes_be(&self.pop()?[..]);
|
|
|
|
let b1 = BigUint::from_bytes_be(&self.pop()?[..]);
|
|
|
|
self.push_arbitrary(&(b0 / b1).to_bytes_be());
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
pub fn sdiv(&mut self) {
|
|
|
|
panic!("unimplemented");
|
|
|
|
pub fn sdiv(&mut self) -> Result<(), String> {
|
|
|
|
Err(format!("unimplemented"))
|
|
|
|
}
|
|
|
|
pub fn modulus(&mut self) {
|
|
|
|
let b0 = BigUint::from_bytes_be(&self.pop()[..]);
|
|
|
|
let b1 = BigUint::from_bytes_be(&self.pop()[..]);
|
|
|
|
pub fn modulus(&mut self) -> Result<(), String> {
|
|
|
|
let b0 = BigUint::from_bytes_be(&self.pop()?[..]);
|
|
|
|
let b1 = BigUint::from_bytes_be(&self.pop()?[..]);
|
|
|
|
self.push_arbitrary(&(b0 % b1).to_bytes_be());
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
pub fn smod(&mut self) {
|
|
|
|
panic!("unimplemented");
|
|
|
|
pub fn smod(&mut self) -> Result<(), String> {
|
|
|
|
Err(format!("unimplemented"))
|
|
|
|
}
|
|
|
|
pub fn add_mod(&mut self) {
|
|
|
|
let b0 = BigUint::from_bytes_be(&self.pop()[..]);
|
|
|
|
let b1 = BigUint::from_bytes_be(&self.pop()[..]);
|
|
|
|
let b2 = BigUint::from_bytes_be(&self.pop()[..]);
|
|
|
|
pub fn add_mod(&mut self) -> Result<(), String> {
|
|
|
|
let b0 = BigUint::from_bytes_be(&self.pop()?[..]);
|
|
|
|
let b1 = BigUint::from_bytes_be(&self.pop()?[..]);
|
|
|
|
let b2 = BigUint::from_bytes_be(&self.pop()?[..]);
|
|
|
|
self.push_arbitrary(&(b0 + b1 % b2).to_bytes_be());
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
pub fn mul_mod(&mut self) {
|
|
|
|
let b0 = BigUint::from_bytes_be(&self.pop()[..]);
|
|
|
|
let b1 = BigUint::from_bytes_be(&self.pop()[..]);
|
|
|
|
let b2 = BigUint::from_bytes_be(&self.pop()[..]);
|
|
|
|
pub fn mul_mod(&mut self) -> Result<(), String> {
|
|
|
|
let b0 = BigUint::from_bytes_be(&self.pop()?[..]);
|
|
|
|
let b1 = BigUint::from_bytes_be(&self.pop()?[..]);
|
|
|
|
let b2 = BigUint::from_bytes_be(&self.pop()?[..]);
|
|
|
|
self.push_arbitrary(&(b0 * b1 % b2).to_bytes_be());
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
pub fn exp(&mut self) {
|
|
|
|
let b = BigUint::from_bytes_be(&self.pop()[..]);
|
|
|
|
let e = BigUint::from_bytes_be(&self.pop()[..]);
|
|
|
|
pub fn exp(&mut self) -> Result<(), String> {
|
|
|
|
let b = BigUint::from_bytes_be(&self.pop()?[..]);
|
|
|
|
let e = BigUint::from_bytes_be(&self.pop()?[..]);
|
|
|
|
|
|
|
|
let mut r = "1".parse::<BigUint>().unwrap();
|
|
|
|
let zero = "0".parse::<BigUint>().unwrap();
|
|
|
@ -233,6 +240,7 @@ impl Stack { |
|
|
|
let mut exp_fee = n_bytes * GEXPONENTBYTE;
|
|
|
|
exp_fee += EXP_SUPPLEMENTAL_GAS * n_bytes;
|
|
|
|
self.gas -= exp_fee as u64;
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
|
|
|
// boolean
|
|
|
@ -251,10 +259,10 @@ impl Stack { |
|
|
|
let length32 = upper_multiple_of_32(length);
|
|
|
|
self.gas -= ((GCOPY * length32) / 32) as u64;
|
|
|
|
}
|
|
|
|
pub fn code_copy(&mut self, code: &[u8]) {
|
|
|
|
let dest_offset = u256::u256_to_u64(self.pop()) as usize;
|
|
|
|
let offset = u256::u256_to_u64(self.pop()) as usize;
|
|
|
|
let length = u256::u256_to_u64(self.pop()) as usize;
|
|
|
|
pub fn code_copy(&mut self, code: &[u8]) -> Result<(), String> {
|
|
|
|
let dest_offset = u256::u256_to_u64(self.pop()?) as usize;
|
|
|
|
let offset = u256::u256_to_u64(self.pop()?) as usize;
|
|
|
|
let length = u256::u256_to_u64(self.pop()?) as usize;
|
|
|
|
|
|
|
|
self.extend_mem(dest_offset, length);
|
|
|
|
self.spend_gas_data_copy(length);
|
|
|
@ -267,6 +275,7 @@ impl Stack { |
|
|
|
}
|
|
|
|
}
|
|
|
|
// self.mem[dest_offset..dest_offset+length] =
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
|
|
|
// blockchain context
|
|
|
@ -285,27 +294,29 @@ impl Stack { |
|
|
|
let mut new_bytes: Vec<u8> = vec![0; (new_size - old_size) * 32];
|
|
|
|
self.mem.append(&mut new_bytes);
|
|
|
|
}
|
|
|
|
pub fn mload(&mut self) {
|
|
|
|
let pos = u256::u256_to_u64(self.pop()) as usize;
|
|
|
|
pub fn mload(&mut self) -> Result<(), String> {
|
|
|
|
let pos = u256::u256_to_u64(self.pop()?) as usize;
|
|
|
|
self.extend_mem(pos as usize, 32);
|
|
|
|
let mem32 = self.mem[pos..pos + 32].to_vec();
|
|
|
|
self.push_arbitrary(&mem32);
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
pub fn mstore(&mut self) {
|
|
|
|
let pos = u256::u256_to_u64(self.pop());
|
|
|
|
let val = self.pop();
|
|
|
|
pub fn mstore(&mut self) -> Result<(), String> {
|
|
|
|
let pos = u256::u256_to_u64(self.pop()?);
|
|
|
|
let val = self.pop()?;
|
|
|
|
self.extend_mem(pos as usize, 32);
|
|
|
|
|
|
|
|
self.mem[pos as usize..].copy_from_slice(&val);
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
pub fn sstore(&mut self) {
|
|
|
|
let key = self.pop();
|
|
|
|
let value = self.pop();
|
|
|
|
pub fn sstore(&mut self) -> Result<(), String> {
|
|
|
|
let key = self.pop()?;
|
|
|
|
let value = self.pop()?;
|
|
|
|
if self.storage.contains_key(&key) {
|
|
|
|
let old_value = self.storage.get(&key).unwrap();
|
|
|
|
if &value.to_vec() == old_value {
|
|
|
|
// if the new value is the same as the old one, do not set
|
|
|
|
return;
|
|
|
|
return Ok(());
|
|
|
|
}
|
|
|
|
// if value (from self.pop()) does not exist in the stack, is a STORAGEKILL TODO
|
|
|
|
println!("mingas {:?}", GSTORAGEMOD);
|
|
|
@ -321,24 +332,28 @@ impl Stack { |
|
|
|
vec_u8_to_hex(value.to_vec())
|
|
|
|
);
|
|
|
|
self.storage.insert(key, value.to_vec());
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
pub fn jump(&mut self) {
|
|
|
|
pub fn jump(&mut self) -> Result<(), String> {
|
|
|
|
// TODO that jump destination is valid
|
|
|
|
self.pc = u256::u256_to_u64(self.pop()) as usize;
|
|
|
|
self.pc = u256::u256_to_u64(self.pop()?) as usize;
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
pub fn jump_i(&mut self) {
|
|
|
|
let new_pc = u256::u256_to_u64(self.pop()) as usize;
|
|
|
|
pub fn jump_i(&mut self) -> Result<(), String> {
|
|
|
|
let new_pc = u256::u256_to_u64(self.pop()?) as usize;
|
|
|
|
if !self.stack.is_empty() {
|
|
|
|
let cond = u256::u256_to_u64(self.pop()) as usize;
|
|
|
|
let cond = u256::u256_to_u64(self.pop()?) as usize;
|
|
|
|
if cond != 0 {
|
|
|
|
self.pc = new_pc;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// let cont = self.pop();
|
|
|
|
// if cont {} // TODO depends on having impl Err in pop()
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
pub fn jump_dest(&mut self) {
|
|
|
|
pub fn jump_dest(&mut self) -> Result<(), String> {
|
|
|
|
// TODO
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|