mirror
/
remix-project
mirror of https://github.com/ethereum/remix-project.git
2
0
Fork 0
Code Issues Releases Wiki Activity

fix debugger e2e

Browse Source
pull/5370/head
yann300 2 years ago committed by Aniket
parent bb1650ef05
commit 7d1ddbd6f5
1 changed files with 68 additions and 73 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 141
      libs/remix-simulator/src/VmProxy.ts

141
libs/remix-simulator/src/VmProxy.ts
Unescape View File

@ -28,7 +28,6 @@ export class VmProxy {
providers providers
currentProvider currentProvider
storageCache storageCache
lastProcessedStorageTxHash
sha3Preimages sha3Preimages
sha3 sha3
toHex toHex
@ -69,7 +68,6 @@ export class VmProxy {
this.providers = { HttpProvider: function (url) {} } this.providers = { HttpProvider: function (url) {} }
this.currentProvider = { host: 'vm provider' } this.currentProvider = { host: 'vm provider' }
this.storageCache = {} this.storageCache = {}
this.lastProcessedStorageTxHash = {}
this.sha3Preimages = {} this.sha3Preimages = {}
// util // util
this.sha3 = (...args) => utils.sha3.apply(this, args) this.sha3 = (...args) => utils.sha3.apply(this, args)
@ -136,7 +134,6 @@ export class VmProxy {
try { try {
const storage = await this.vm.stateManager.dumpStorage(data.to) const storage = await this.vm.stateManager.dumpStorage(data.to)
this.storageCache[this.processingHash][tx['to']] = storage this.storageCache[this.processingHash][tx['to']] = storage
this.lastProcessedStorageTxHash[tx['to']] = this.processingHash
} catch (e) { } catch (e) {
console.log(e) console.log(e)
} }
@ -201,84 +198,82 @@ export class VmProxy {
} }
async pushTrace (data: InterpreterStep) { async pushTrace (data: InterpreterStep) {
const depth = data.depth + 1 // geth starts the depth from 1 try {
if (!this.processingHash) { const depth = data.depth + 1 // geth starts the depth from 1
console.log('no tx processing') if (!this.processingHash) {
return console.log('no tx processing')
} return
let previousopcode }
if (this.vmTraces[this.processingHash] && this.vmTraces[this.processingHash].structLogs[this.processingIndex - 1]) { let previousopcode
previousopcode = this.vmTraces[this.processingHash].structLogs[this.processingIndex - 1] if (this.vmTraces[this.processingHash] && this.vmTraces[this.processingHash].structLogs[this.processingIndex - 1]) {
} previousopcode = this.vmTraces[this.processingHash].structLogs[this.processingIndex - 1]
}
if (this.previousDepth > depth && previousopcode) { if (this.previousDepth > depth && previousopcode) {
// returning from context, set error it is not STOP, RETURN // returning from context, set error it is not STOP, RETURN
previousopcode.invalidDepthChange = previousopcode.op !== 'RETURN' && previousopcode.op !== 'STOP' previousopcode.invalidDepthChange = previousopcode.op !== 'RETURN' && previousopcode.op !== 'STOP'
} }
const step = { const step = {
stack: hexListFromBNs(data.stack), stack: hexListFromBNs(data.stack),
memory: formatMemory(data.memory), memory: formatMemory(data.memory),
storage: {}, storage: {},
op: data.opcode.name, op: data.opcode.name,
pc: data.pc, pc: data.pc,
gasCost: data.opcode.fee.toString(), gasCost: data.opcode.fee.toString(),
gas: data.gasLeft.toString(), gas: data.gasLeft.toString(),
depth: depth depth: depth
} }
this.vmTraces[this.processingHash].structLogs.push(step) this.vmTraces[this.processingHash].structLogs.push(step)
// Track hardhat console.log call // Track hardhat console.log call
if (step.op === 'STATICCALL' && step.stack[step.stack.length - 2] === '0x000000000000000000000000000000000000000000636f6e736f6c652e6c6f67') { if (step.op === 'STATICCALL' && step.stack[step.stack.length - 2] === '0x000000000000000000000000000000000000000000636f6e736f6c652e6c6f67') {
const stackLength = step.stack.length const stackLength = step.stack.length
const payloadStart = parseInt(step.stack[stackLength - 3], 16) const payloadStart = parseInt(step.stack[stackLength - 3], 16)
const memory = step.memory.join('') const memory = step.memory.join('')
let payload = memory.substring(payloadStart * 2, memory.length) let payload = memory.substring(payloadStart * 2, memory.length)
const fnselectorStr = payload.substring(0, 8) const fnselectorStr = payload.substring(0, 8)
const fnselectorStrInHex = '0x' + fnselectorStr const fnselectorStrInHex = '0x' + fnselectorStr
const fnselector = parseInt(fnselectorStrInHex) const fnselector = parseInt(fnselectorStrInHex)
const fnArgs = ConsoleLogs[fnselector] const fnArgs = ConsoleLogs[fnselector]
const iface = new ethers.utils.Interface([`function log${fnArgs} view`]) const iface = new ethers.utils.Interface([`function log${fnArgs} view`])
const functionDesc = iface.getFunction(`log${fnArgs}`) const functionDesc = iface.getFunction(`log${fnArgs}`)
const sigHash = iface.getSighash(`log${fnArgs}`) const sigHash = iface.getSighash(`log${fnArgs}`)
if (fnArgs.includes('uint') && sigHash !== fnselectorStrInHex) { if (fnArgs.includes('uint') && sigHash !== fnselectorStrInHex) {
payload = payload.replace(fnselectorStr, sigHash) payload = payload.replace(fnselectorStr, sigHash)
} else { } else {
payload = '0x' + payload payload = '0x' + payload
}
const consoleArgs = iface.decodeFunctionData(functionDesc, payload)
this.hhLogs[this.processingHash] = this.hhLogs[this.processingHash] ? this.hhLogs[this.processingHash] : []
this.hhLogs[this.processingHash].push(consoleArgs)
} }
const consoleArgs = iface.decodeFunctionData(functionDesc, payload)
this.hhLogs[this.processingHash] = this.hhLogs[this.processingHash] ? this.hhLogs[this.processingHash] : []
this.hhLogs[this.processingHash].push(consoleArgs)
}
if (step.op === 'CREATE' || step.op === 'CALL') { if (step.op === 'CREATE' || step.op === 'CALL') {
if (step.op === 'CREATE') { if (step.op === 'CREATE') {
this.processingAddress = '(Contract Creation - Step ' + this.processingIndex + ')' this.processingAddress = '(Contract Creation - Step ' + this.processingIndex + ')'
this.storageCache[this.processingHash][this.processingAddress] = {} this.storageCache[this.processingHash][this.processingAddress] = {}
this.lastProcessedStorageTxHash[this.processingAddress] = this.processingHash } else {
} else { this.processingAddress = normalizeHexAddress(step.stack[step.stack.length - 2])
this.processingAddress = normalizeHexAddress(step.stack[step.stack.length - 2]) this.processingAddress = toChecksumAddress(this.processingAddress)
this.processingAddress = toChecksumAddress(this.processingAddress) if (!this.storageCache[this.processingHash][this.processingAddress]) {
if (!this.storageCache[this.processingHash][this.processingAddress]) { const account = Address.fromString(this.processingAddress)
const account = Address.fromString(this.processingAddress) this.vm.stateManager.dumpStorage(account).then((storage) => {
try { this.storageCache[this.processingHash][this.processingAddress] = storage
const storage = await this.vm.stateManager.dumpStorage(account) }).catch(console.log)
this.storageCache[this.processingHash][this.processingAddress] = storage
this.lastProcessedStorageTxHash[this.processingAddress] = this.processingHash
} catch (e) {
console.log(e)
} }
} }
} }
} if (previousopcode && previousopcode.op === 'SHA3') {
if (previousopcode && previousopcode.op === 'SHA3') { const preimage = this.getSha3Input(previousopcode.stack, previousopcode.memory)
const preimage = this.getSha3Input(previousopcode.stack, previousopcode.memory) const imageHash = step.stack[step.stack.length - 1].replace('0x', '')
const imageHash = step.stack[step.stack.length - 1].replace('0x', '') this.sha3Preimages[imageHash] = {
this.sha3Preimages[imageHash] = { preimage: preimage
preimage: preimage }
} }
this.processingIndex++
this.previousDepth = depth
} catch (e) {
console.log(e)
} }
this.processingIndex++
this.previousDepth = depth
} }
getCode (address, cb) { getCode (address, cb) {

Write Preview
Loading…
Cancel
Save