Skip to content

fix(avm): fix SendL2ToL1Message implementation #4367

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

Merged
fcarreiro merged 2 commits into from
Feb 1, 2024
Merged

fix(avm): fix SendL2ToL1Message implementation #4367

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
ce3cb52
fix(avm): fix SendL2ToL1Message implementation
fcarreiro Feb 1, 2024
bc6ca64
Merge remote-tracking branch 'origin' into fc/fix-l2-l1
fcarreiro Feb 1, 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
2 changes: 1 addition & 1 deletion yarn-project/acir-simulator/src/avm/opcodes/accrued_substate.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ describe('Accrued Substate', () => {

const journalState = journal.flush();
const expected = values.map(v => v.toFr());
expect(journalState.newLogs).toEqual([expected]);
expect(journalState.newL1Messages).toEqual([expected]);
});
});

Expand Down
4 changes: 2 additions & 2 deletions yarn-project/acir-simulator/src/avm/opcodes/accrued_substate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export class EmitUnencryptedLog extends Instruction {
}

export class SendL2ToL1Message extends Instruction {
static type: string = 'EMITUNENCRYPTEDLOG';
static type: string = 'SENDL2TOL1MSG';
static readonly opcode: Opcode = Opcode.SENDL2TOL1MSG;
// Informs (de)serialization. See Instruction.deserialize.
static readonly wireFormat = [OperandType.UINT8, OperandType.UINT8, OperandType.UINT32, OperandType.UINT32];
Expand All @@ -86,7 +86,7 @@ export class SendL2ToL1Message extends Instruction {
}

const msg = machineState.memory.getSlice(this.msgOffset, this.msgSize).map(f => f.toFr());
journal.writeLog(msg);
journal.writeL1Message(msg);

this.incrementPc(machineState);
}
Expand Down