Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/l1 info tree last #224

Merged
merged 2 commits into from
Oct 25, 2023
Merged

Feature/l1 info tree last #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f8b5b0
fix helpers
laisolizq Oct 13, 2023
a14c503
add errors change l2 blocks
krlosMata Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions src/sm/sm_main/debug/full-tracer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,13 @@ const opIncContext = ['CALL', 'STATICCALL', 'DELEGATECALL', 'CALLCODE', 'CREATE'
const opCall = ['CALL', 'STATICCALL', 'DELEGATECALL', 'CALLCODE'];
const opCreate = ['CREATE', 'CREATE2'];
const zeroCostOp = ['STOP', 'REVERT', 'RETURN'];
const responseErrors = ['OOCS', 'OOCK', 'OOCB', 'OOCM', 'OOCA', 'OOCPA', 'OOCPO', 'intrinsic_invalid_signature', 'intrinsic_invalid_chain_id', 'intrinsic_invalid_nonce', 'intrinsic_invalid_gas_limit', 'intrinsic_invalid_gas_overflow', 'intrinsic_invalid_balance', 'intrinsic_invalid_batch_gas_limit', 'intrinsic_invalid_sender_code', 'invalid_change_l2_block', 'invalidRLP'];
const responseErrors = [
'OOCS', 'OOCK', 'OOCB', 'OOCM', 'OOCA', 'OOCPA', 'OOCPO',
'intrinsic_invalid_signature', 'intrinsic_invalid_chain_id', 'intrinsic_invalid_nonce',
'intrinsic_invalid_gas_limit', 'intrinsic_invalid_gas_overflow', 'intrinsic_invalid_balance',
'intrinsic_invalid_batch_gas_limit', 'intrinsic_invalid_sender_code', 'invalid_change_l2_block',
'invalidRLP', 'invalidDecodeChangeL2Block', 'invalidNotFirstTxChangeL2Block',
];

/**
* Tracer service to output the logs of a batch of transactions. A complete log is created with all the transactions embedded
Expand Down Expand Up @@ -201,12 +207,15 @@ class FullTracer {
if (this.currentBlock.parent_hash) {
this.onFinishBlock(ctx);
}

this.currentBlock = {
parent_hash: ethers.utils.hexlify(fea2scalar(ctx.Fr, ctx.SR)),
coinbase: ethers.utils.hexlify(getVarFromCtx(ctx, true, 'sequencerAddr')),
gas_limit: Constants.BLOCK_GAS_LIMIT,
responses: [],
};

this.verbose.printBlock(`start ${1 + Number(getVarFromCtx(ctx, true, 'blockNum'))}`);
}

/**
Expand Down Expand Up @@ -255,6 +264,8 @@ class FullTracer {
this.txIndex = 0;
// Reset logs
this.logs = [];

this.verbose.printBlock(`finish ${this.currentBlock.block_number}`);
}

/**
Expand Down Expand Up @@ -721,13 +732,14 @@ class FullTracer {
singleInfo.state_root = bnToPaddedHex(fea2scalar(ctx.Fr, ctx.SR), 64);

// Get prev step
const prevStep = this.full_trace[this.full_trace.length - 2];
const prevStep = this.call_trace[this.call_trace.length - 1];

// Add contract info
singleInfo.contract = {};
singleInfo.contract.address = bnToPaddedHex(getVarFromCtx(ctx, false, 'txDestAddr'), 40);
singleInfo.contract.caller = bnToPaddedHex(getVarFromCtx(ctx, false, 'txSrcAddr'), 40);
singleInfo.contract.value = getVarFromCtx(ctx, false, 'txValue').toString();

// Only set contract data param if it has changed (new context created or context terminated) to not overflow the trace
if (prevStep && (opIncContext.includes(prevStep.opcode) || zeroCostOp.includes(prevStep.opcode))) {
const calldataCTX = getVarFromCtx(ctx, false, 'calldataCTX');
Expand Down Expand Up @@ -802,6 +814,7 @@ class FullTracer {
singleCallTrace.contract.gas = this.txGAS[this.depth]; // execute_trace does not have contracts property
// take gas when a new context is created
}

// Set contract params depending on current call type
singleCallTrace.contract.type = this.callData[ctx.CTX].type;
if (singleCallTrace.contract.type === 'DELEGATECALL') {
Expand Down Expand Up @@ -832,6 +845,11 @@ class FullTracer {

const keyType = fea2scalar(_fieldElement, _keyType);

// not take into account keys tha tdo not belong to the touched tree or state tree
if (Scalar.gt(keyType, Constants.SMT_KEY_TOUCHED_SLOTS)) {
return;
}

if (Scalar.eq(keyType, Constants.SMT_KEY_TOUCHED_SLOTS) || Scalar.eq(keyType, Constants.SMT_KEY_SC_STORAGE)) {
const slotStorage = fea2scalar(_fieldElement, _slot);
slotStorageHex = `0x${Scalar.toString(slotStorage, 16).padStart(64, '0')}`;
Expand Down
16 changes: 12 additions & 4 deletions src/sm/sm_main/debug/verbose-tracer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,18 +65,26 @@ class VerboseTracer {
}
}

printTx(message) {
printBatch(message) {
if (this.enable !== true) return;

let info = `${chalk.yellowBright('TX'.padEnd(7))} | `;
let info = `${chalk.blue('BATCH'.padEnd(7))} | `;
info += `${message}`;
console.log(info);
}

printBatch(message) {
printBlock(message) {
if (this.enable !== true) return;

let info = `${chalk.blue('BATCH'.padEnd(7))} | `;
let info = `${chalk.magenta('BLOCK'.padEnd(7))} | `;
info += `${message}`;
console.log(info);
}

printTx(message) {
if (this.enable !== true) return;

let info = `${chalk.yellowBright('TX'.padEnd(7))} | `;
info += `${message}`;
console.log(info);
}
Expand Down
Loading