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

update tx decoding #155

Merged
merged 3 commits into from
Apr 15, 2024
Merged

update tx decoding #155

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
74f6dd2
update tx decoding
kstoykov Mar 27, 2024
e535e38
update eslint
kstoykov Apr 3, 2024
cd301e4
fix eslint
kstoykov Apr 11, 2024
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
28 changes: 18 additions & 10 deletions src/processor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ module.exports = class Processor {
// check is changeL2Block transaction
if (rawTx.startsWith(`0x${Constants.TX_CHANGE_L2_BLOCK.toString(16).padStart(2, '0')}`)) {
txDecoded = await decodeChangeL2BlockTx(rawTx);
this.decodedTxs.push({ isInvalid: false, reason: '', tx: txDecoded });
this._pushToDecodedTxs(false, '', txDecoded);
continue;
}

Expand All @@ -209,7 +209,7 @@ module.exports = class Processor {
txDecoded = decodedObject.txDecoded;
rlpSignData = decodedObject.rlpSignData;
} catch (error) {
this.decodedTxs.push({ isInvalid: true, reason: 'TX INVALID: Failed to RLP decode signing data', tx: txDecoded });
this._pushToDecodedTxs(true, 'TX INVALID: Failed to RLP decode signing data', txDecoded);
this.isInvalid = true;
continue;
}
Expand All @@ -219,7 +219,7 @@ module.exports = class Processor {
this.isLegacyTx = typeof txDecoded.chainID === 'undefined';
txDecoded.chainID = this.isLegacyTx ? txDecoded.chainID : Number(txDecoded.chainID);
if (!this.isLegacyTx && txDecoded.chainID !== this.chainID) {
this.decodedTxs.push({ isInvalid: true, reason: 'TX INVALID: Chain ID does not match', tx: txDecoded });
this._pushToDecodedTxs(true, 'TX INVALID: Chain ID does not match', txDecoded);
continue;
}

Expand All @@ -232,23 +232,31 @@ module.exports = class Processor {
v: txDecoded.v,
});
} catch (error) {
this.decodedTxs.push({ isInvalid: true, reason: 'TX INVALID: Failed signature', tx: txDecoded });
this._pushToDecodedTxs(true, 'TX INVALID: Failed signature', txDecoded);
continue;
}

/*
* The RLP encoding, encodes the 0 integer as "0x" ( empty byte array),
* In order to be compatible with Scalar or Number we will update the 0x integer cases with 0x00
*/
const txParams = Object.keys(txDecoded);
this._pushToDecodedTxs(false, '', txDecoded);
}
}

/**
* The RLP encoding, encodes the 0 integer as "0x" ( empty byte array),
* In order to be compatible with Scalar or Number we will update the 0x integer cases with 0x00
* @param {bool} isInvalid
* @param {String} reason
* @param {Object} txDecoded
*/
_pushToDecodedTxs(isInvalid, reason, txDecoded) {
if (txDecoded) {
const txParams = Object.keys(txDecoded);
txParams.forEach((key) => {
if (txDecoded[key] === '0x' && key !== 'data' && key !== 'to') {
txDecoded[key] = '0x00';
}
});
this.decodedTxs.push({ isInvalid: false, reason: '', tx: txDecoded });
}
this.decodedTxs.push({ isInvalid, reason, tx: txDecoded });
}

/**
Expand Down