Merge pull request zcash-hackworks#14 from sorpaas/master

0x50 to 0x5f, 0x80 to 0x9f opcode and a simple Account implementation

Cargo.toml

@@ -22,3 +22,5 @@ path = "./src/bin/gaslighter/mod.rs"
 clap = "2.22"
 log = "0.3"
 capnp = "0.8"
+ring = "^0.6.0"
+merkle = "1.1.0"

src/account.rs

@@ -0,0 +1,23 @@
+use utils::u256::U256;
+use ring::digest::{Algorithm, Context, SHA256};
+use merkle::{MerkleTree};
+
+pub struct Account {
+    nonce: usize,
+    balance: U256,
+    pub storageRoot: MerkleTree<U256>,
+    codeHash: U256,
+}
+
+static digest: &'static Algorithm = &SHA256;
+
+impl Default for Account {
+    fn default() -> Account {
+        Account {
+            nonce: 0,
+            balance: 0.into(),
+            storageRoot: MerkleTree::from_vec(digest, Vec::new()),
+            codeHash: 0.into()
+        }
+    }
+}

src/lib.rs

@@ -1,5 +1,8 @@
 #[macro_use]
 extern crate log;
+extern crate ring;
+extern crate merkle;
 
 pub mod vm;
+pub mod account;
 mod utils;

src/utils/u256.rs

@@ -33,7 +33,7 @@
 
 // #![no_std]
 
-use ::std::convert::{From, Into};
+use ::std::convert::{From, Into, AsRef};
 use ::std::ops::{Add, Sub, Not, Mul, Div, Shr, Shl, BitAnd, BitOr, BitXor};
 use ::std::cmp::Ordering;
 
@@ -112,6 +112,14 @@ impl U256 {
     }
 }
 
+impl AsRef<[u8]> for U256 {
+    fn as_ref(&self) -> &[u8] {
+        use std::mem::transmute;
+        let r: &[u8; 32] = unsafe { transmute(&self.0) };
+        r
+    }
+}
+
 impl From<u64> for U256 {
     fn from(val: u64) -> U256 {
         U256([val, 0, 0, 0])

src/vm/gas.rs

@@ -1,5 +1,6 @@
 use super::{Machine, Memory, Stack};
 use std::ops::{Add, AddAssign, Sub, SubAssign};
+use utils::u256::U256;
 
 #[derive(Clone, Copy, Debug)]
 pub struct Gas(isize);
@@ -13,6 +14,13 @@ impl From<isize> for Gas {
     fn from(val: isize) -> Gas { Gas(val) }
 }
 
+impl Into<U256> for Gas {
+    fn into(self) -> U256 {
+        assert!(self.is_valid());
+        (self.0 as u64).into()
+    }
+}
+
 impl Add for Gas {
     type Output = Gas;
 

src/vm/machine.rs

@@ -1,4 +1,5 @@
 use super::{Memory, VectorMemory, Stack, VectorStack, PC, Result, Gas};
+use ::account::Account;
 
 pub type VectorMachine<'p> = Machine<'p, VectorMemory, VectorStack>;
 
@@ -7,6 +8,7 @@ pub struct Machine<'p, M, S> {
     pub pc: PC<'p>,
     pub memory: M, // Contains i
     pub stack: S,
+    pub account: Account,
 }
 
 impl<'p, M, S> Machine<'p, M, S> where M: Memory, S: Stack {
@@ -16,6 +18,7 @@ impl<'p, M, S> Machine<'p, M, S> where M: Memory, S: Stack {
             pc: PC::new(code),
             memory: M::new(),
             stack: S::new(),
+            account: Account::default(),
         }
     }
 

src/vm/memory.rs

@@ -3,7 +3,7 @@ use utils::u256::U256;
 pub trait Memory {
     fn new() -> Self;
     fn write(&mut self, index: U256, value: U256);
-    fn read(&self, index: U256) -> U256;
+    fn read(&mut self, index: U256) -> U256;
     fn active_len(&self) -> usize;
 }
 
@@ -31,10 +31,16 @@ impl Memory for VectorMemory {
         self.memory[index] = value;
     }
 
-    fn read(&self, index: U256) -> U256 {
+    fn read(&mut self, index: U256) -> U256 {
+        // This is required to be &mut self because a read might modify u_i
+
         let index_u64: u64 = index.into();
         let index = index_u64 as usize;
 
+        if self.memory.len() <= index {
+            self.memory.resize(index, 0.into());
+        }
+
         match self.memory.get(index) {
             Some(&v) => v,
             None => 0.into()