Updated solc to 0.5.8. Implemented SHR, SHL, SAR

Author: fergarrui

package-lock.json

@@ -83,7 +83,7 @@
     "recursive-readdir": "^2.2.2",
     "redux-thunk": "^2.3.0",
     "reflect-metadata": "^0.1.12",
-    "solc": "^0.4.25",
+    "solc": "^0.5.8",
     "terser": "3.14.1",
     "tsoa": "2.1.8",
     "web3": "^1.0.0-beta.36",

package.json

@@ -11,15 +11,6 @@ describe('Disassembler test', () => {
     disass = new EVMDisassembler()
   })
 
-  it('Test disassemble source code', () => {
-    const source = 'pragma solidity ^0.4.24; contract x { function g() public pure {} }'
-    const expectedBytecode =
-      '6080604052348015600f57600080fd5b5060868061001e6000396000f300608060405260043610603f576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063e2179b8e146044575b600080fd5b348015604f57600080fd5b5060566058565b005b5600a165627a7a72305820de849d569d048f89ffebd7f6effc7d64288fafe19e086e000f7fa42e5e894a1d0029'
-    const disassembled: DisassembledContract = disass.disassembleSourceCode('x', source, '/')
-    expect(disassembled.hasConstructor).toBeTruthy()
-    expect(disassembled.bytecode).toEqual(expectedBytecode)
-  })
-
   it('Test disassembler bytecode', async () => {
     const bytecode = '0x161718'
     const expectedOpcodes = [
@@ -77,7 +68,7 @@ describe('Disassembler test', () => {
 
   it('Test disassemble contract', () => {
     const bytecode =
-      '608060405234801561001057600080fd5b50610150806100206000396000f300608060405260043610610041576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063550e833a14610046575b600080fd5b34801561005257600080fd5b50610091600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610093565b005b60008290508073ffffffffffffffffffffffffffffffffffffffff1663e73620c3836040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050600060405180830381600087803b15801561010757600080fd5b505af115801561011b573d6000803e3d6000fd5b505050505050505600a165627a7a7230582023d934aceda66b58be34ed6504f47898d0260cfb00ddc47f6b0a54f108013c7f0029'
+      '608060405234801561001057600080fd5b50610150806100206000396000f3fe608060405260043610610041576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063550e833a14610046575b600080fd5b34801561005257600080fd5b50610091600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610093565b005b60008290508073ffffffffffffffffffffffffffffffffffffffff1663e73620c3836040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050600060405180830381600087803b15801561010757600080fd5b505af115801561011b573d6000803e3d6000fd5b505050505050505600a165627a7a7230582023d934aceda66b58be34ed6504f47898d0260cfb00ddc47f6b0a54f108013c7f0029'
     const contract: DisassembledContract = disass.disassembleContract(bytecode)
     const constructor = contract.constructor
     const runtime = contract.runtime
@@ -87,7 +78,7 @@ describe('Disassembler test', () => {
     const lastRuntime = runtime[runtime.length - 1]
     expect(contract.hasConstructor).toBeTruthy()
     expect(firstConstructor.opcode.name).toEqual('PUSH1')
-    expect(lastConstructor.opcode.name).toEqual('STOP')
+    expect(lastConstructor.opcode.name).toEqual('INVALID')
     expect(firstRuntime.opcode.name).toEqual('PUSH1')
     expect(lastRuntime.opcode.name).toEqual('STOP')
     expect(firstConstructor.offset).toEqual(0)

src/api/bytecode/EVMDisassembler.test.ts

@@ -56,7 +56,8 @@ export class EVMDisassembler implements Disassembler {
     let constructor = []
     let runtime = operations
     if (hasConstructor) {
-      const firstStopIndex = operations.findIndex(op => op.opcode.name === 'STOP')
+      // pre- 0.5.* the opcode we are searching is 'STOP'
+      const firstStopIndex = operations.findIndex(op => op.opcode.name === 'INVALID')
       constructor = operations.slice(0, firstStopIndex + 1)
       runtime = this.adjustRuntimeOffset(operations.slice(firstStopIndex + 1, operations.length))
     }
@@ -117,7 +118,11 @@ export class EVMDisassembler implements Disassembler {
     const constructor = disassembledCode.constructor
     const runtime = disassembledCode.runtime
     if (constructor.length !== asmConstructor.length + 1 || runtime.length !== asmRuntime.length + 1) {
-      throw new Error('Source mappings do not match with bytecode')
+      console.log(constructor)
+      console.log('================')
+      console.log(asmConstructor)
+      logger.error(`Source mappings do not match with bytecode, constructorLength=${constructor.length}, asmConstructorLength=${asmConstructor.length}, runtimeLength=${runtime.length}, asmRuntimeLength=${asmRuntime.length}`)
+      throw new Error(`Source mappings do not match with bytecode`)
     }
 
     if (disassembledCode.hasConstructor) {

src/api/bytecode/EVMDisassembler.ts

@@ -5,7 +5,6 @@ export class Opcodes {
 
   static populate() {
     this.opcodes[-1] = { name: 'UNKNOWN', opcode: 0x00, parameters: 0 } as Opcode
-    // TODO SHL, SHR, SAR
     this.opcodes[0x00] = { name: 'STOP', opcode: 0x00, parameters: 0 } as Opcode
     this.opcodes[0x01] = { name: 'ADD', opcode: 0x01, parameters: 0 } as Opcode
     this.opcodes[0x02] = { name: 'MUL', opcode: 0x02, parameters: 0 } as Opcode
@@ -29,6 +28,9 @@ export class Opcodes {
     this.opcodes[0x18] = { name: 'XOR', opcode: 0x18, parameters: 0 } as Opcode
     this.opcodes[0x19] = { name: 'NOT', opcode: 0x19, parameters: 0 } as Opcode
     this.opcodes[0x1a] = { name: 'BYTE', opcode: 0x1a, parameters: 0 } as Opcode
+    this.opcodes[0x1b] = { name: 'SHL', opcode: 0x1b, parameters: 0 } as Opcode
+    this.opcodes[0x1c] = { name: 'SHR', opcode: 0x1c, parameters: 0 } as Opcode
+    this.opcodes[0x1d] = { name: 'SAR', opcode: 0x1d, parameters: 0 } as Opcode
     this.opcodes[0x20] = { name: 'SHA3', opcode: 0x20, parameters: 0 } as Opcode
     this.opcodes[0x30] = { name: 'ADDRESS', opcode: 0x30, parameters: 0 } as Opcode
     this.opcodes[0x31] = { name: 'BALANCE', opcode: 0x31, parameters: 0 } as Opcode

src/api/bytecode/Opcodes.ts

@@ -69,7 +69,7 @@ describe('EVMExecutor', () => {
 
   it('Test real contract binary - constructor', () => {
     const bytecode =
-      '6080604052348015600f57600080fd5b5060868061001e6000396000f300608060405260043610603f576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063e2179b8e146044575b600080fd5b348015604f57600080fd5b5060566058565b005b5600a165627a7a723058202b2566218088bf32ca5a2f029f04a425067ebe1770872a7b06934044a63a81630029'
+      '6080604052348015600f57600080fd5b5060868061001e6000396000f3fe608060405260043610603f576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063e2179b8e146044575b600080fd5b348015604f57600080fd5b5060566058565b005b5600a165627a7a723058202b2566218088bf32ca5a2f029f04a425067ebe1770872a7b06934044a63a81630029'
     const contract: DisassembledContract = disassembler.disassembleContract(bytecode)
     const constructor = contract.constructor
     const executor = new EVMExecutor(cfgCreator.divideBlocks(constructor), opcodeExecutor)
@@ -95,7 +95,7 @@ describe('EVMExecutor', () => {
 
   it('Test real contract binary - runtime', () => {
     const bytecode =
-      '6080604052348015600f57600080fd5b5060868061001e6000396000f300608060405260043610603f576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063e2179b8e146044575b600080fd5b348015604f57600080fd5b5060566058565b005b5600a165627a7a723058202b2566218088bf32ca5a2f029f04a425067ebe1770872a7b06934044a63a81630029'
+      '6080604052348015600f57600080fd5b5060868061001e6000396000f3fe608060405260043610603f576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063e2179b8e146044575b600080fd5b348015604f57600080fd5b5060566058565b005b5600a165627a7a723058202b2566218088bf32ca5a2f029f04a425067ebe1770872a7b06934044a63a81630029'
     const contract: DisassembledContract = disassembler.disassembleContract(bytecode)
     const constructor = contract.runtime
     const executor = new EVMExecutor(cfgCreator.divideBlocks(constructor), opcodeExecutor)

src/api/symbolic/evm/EVMExecutor.test.ts

@@ -4,4 +4,5 @@ export class UintUtils {
   static TWO_POW_256 = new BN('10000000000000000000000000000000000000000000000000000000000000000', 16)
   static ZERO = new BN('00', 16)
   static ONE = new BN('01', 16)
+  static MAX_INTEGER = new BN('ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', 16)
 }

src/api/symbolic/evm/UintUtils.ts

@@ -66,6 +66,9 @@ import { Byte } from './Byte'
 import { Sha3 } from './Sha3'
 import { Msize } from './Msize'
 import { Selfdestruct } from './Selfdestruct';
+import { Shr } from './Shr';
+import { Shl } from './Shl';
+import { Sar } from './Sar';
 
 @injectable()
 export class OpcodeExecutor {
@@ -167,6 +170,9 @@ export class OpcodeExecutor {
     this.ops['XOR'] = new Xor()
     this.ops['NOT'] = new Not()
     this.ops['BYTE'] = new Byte()
+    this.ops['SHR'] = new Shr()
+    this.ops['SHL'] = new Shl()
+    this.ops['SAR'] = new Sar()
 
     this.ops['SHA3'] = new Sha3()