status-im
/
ethereumj-personal
mirror of https://github.com/status-im/ethereumj-personal.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

VM impl: SHA3 op implemented and unit tested

This commit is contained in:
romanman 2014-06-03 20:07:10 +03:00
parent da62dfd514
commit 2a3a548339
2 changed files with 85 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ethereumj-core/src/main/java/org/ethereum/vm/VM.java
View File

@ -1,5 +1,6 @@
package org.ethereum.vm;
import org.ethereum.crypto.HashUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -204,8 +205,18 @@ public class VM {
* SHA3
*/
case SHA3:
break;
case SHA3:{
DataWord memOffsetData = program.stackPop();
DataWord lengthData = program.stackPop();
ByteBuffer buffer = program.memoryChunk(memOffsetData, lengthData);
byte[] encoded = HashUtil.sha3(buffer.array());
DataWord word = new DataWord(encoded);
program.stackPush(word);
program.step();
}
break;
/**
* Environmental Information

76
ethereumj-core/src/test/java/org/ethereum/vm/VMTest.java
View File

@ -1,5 +1,6 @@
package org.ethereum.vm;
import org.ethereum.crypto.HashUtil;
import org.junit.Test;
import org.spongycastle.util.encoders.Hex;
@ -2417,6 +2418,70 @@ public class VMTest {
}
@Test // SHA3 OP
public void testSHA3_1(){
VM vm = new VM();
Program program =
new Program(Hex.decode("60016000556001600020"),
createProgramInvoke_1());
String s_expected_1 = "5FE7F977E71DBA2EA1A68E21057BEEBB9BE2AC30C6410AA38D4F3FBE41DCFFD2";
vm.step(program);
vm.step(program);
vm.step(program);
vm.step(program);
vm.step(program);
vm.step(program);
DataWord item1 = program.stack.pop();
assertEquals(s_expected_1, Hex.toHexString(item1.data).toUpperCase());
}
@Test // SHA3 OP
public void testSHA3_2(){
VM vm = new VM();
Program program =
new Program(Hex.decode("6102016000546002601E20"),
createProgramInvoke_1());
String s_expected_1 = "114A3FE82A0219FCC31ABD15617966A125F12B0FD3409105FC83B487A9D82DE4";
vm.step(program);
vm.step(program);
vm.step(program);
vm.step(program);
vm.step(program);
vm.step(program);
DataWord item1 = program.stack.pop();
assertEquals(s_expected_1, Hex.toHexString(item1.data).toUpperCase());
}
@Test // SHA3 OP mal
public void testSHA3_3(){
VM vm = new VM();
Program program =
new Program(Hex.decode("610201600054600220"),
createProgramInvoke_1());
try {
vm.step(program);
vm.step(program);
vm.step(program);
vm.step(program);
vm.step(program);
} catch (RuntimeException e) {
assertTrue(program.isStopped());
return;
}
fail();
}
/* TEST CASE LIST END */
@ -2434,6 +2499,9 @@ public class VMTest {
}
/**
* todo:
*
@ -2442,7 +2510,6 @@ public class VMTest {
* 3) SMOD
* 4) SLT
* 5) SGT
* 6) SHA3
* 15) PREVHASH:
@ -2450,9 +2517,10 @@ public class VMTest {
* 17) TIMESTAMP:
* 18) NUMBER:
* 19) DIFFICULTY:
* 20) GASLIMIT:
*
* 21) GAS:
* 20) GASPRICE
* 20) GASLIMIT
* 20) GAS
*
* 22) CREATE:
* 23) CALL: