diff --git a/libs/remix-lib/package.json b/libs/remix-lib/package.json index d8b0328a73..e611abe43c 100644 --- a/libs/remix-lib/package.json +++ b/libs/remix-lib/package.json @@ -57,4 +57,4 @@ "typings": "src/index.d.ts", "gitHead": "89e43672a629f3267cc1b9c1e6109798d5c91d20", "types": "./src/index.d.ts" -} +} \ No newline at end of file diff --git a/libs/remix-lib/src/hash.ts b/libs/remix-lib/src/hash.ts index 624154be99..47334c1ce6 100644 --- a/libs/remix-lib/src/hash.ts +++ b/libs/remix-lib/src/hash.ts @@ -158,7 +158,7 @@ export const ripemd160FromArray = function(a: number[], padded: boolean): Buffer * @param a The input data */ export const rlphash = function(a: Input): Buffer { - return keccak(encode(a)) + return keccak(Buffer.from(encode(a))) } /** diff --git a/libs/remix-simulator/package.json b/libs/remix-simulator/package.json index a566ec9a17..88fade749e 100644 --- a/libs/remix-simulator/package.json +++ b/libs/remix-simulator/package.json @@ -71,4 +71,4 @@ "typings": "src/index.d.ts", "gitHead": "89e43672a629f3267cc1b9c1e6109798d5c91d20", "types": "./src/index.d.ts" -} +} \ No newline at end of file diff --git a/libs/remix-simulator/src/methods/transactions.ts b/libs/remix-simulator/src/methods/transactions.ts index bdf26bfbc3..bbec179438 100644 --- a/libs/remix-simulator/src/methods/transactions.ts +++ b/libs/remix-simulator/src/methods/transactions.ts @@ -158,7 +158,7 @@ export class Transactions { this.vmContext.web3().flagNextAsDoNotRecordEvmSteps() processTx(this.txRunnerInstance, payload, true, (error, value: VMexecutionResult) => { if (error) return cb(error) - const result: RunTxResult = value.result + const result: any = value.result if (result.execResult && result.execResult.exceptionError && result.execResult.exceptionError.errorType === 'EvmError') { return cb(result.execResult.exceptionError.error) } diff --git a/libs/remix-simulator/src/vm-context.ts b/libs/remix-simulator/src/vm-context.ts index 224dbb96e5..fa9df3ef37 100644 --- a/libs/remix-simulator/src/vm-context.ts +++ b/libs/remix-simulator/src/vm-context.ts @@ -74,7 +74,7 @@ class StateManagerCommonStorageDump extends DefaultStateManager { const value = decode(val.value) storage['0x' + val.key.toString('hex')] = { key: this.keyHashes[val.key.toString('hex')], - value: '0x' + value.toString('hex') + value: '0x' + value.toString() } }) stream.on('end', () => {