@@ -1418,20 +1418,16 @@ TEST_F(AvmExecutionTests, kernelInputOpcodes)
1418
1418
+ to_hex (OpCode::TIMESTAMP) + // opcode TIMESTAMP
1419
1419
" 00" // Indirect flag
1420
1420
" 00000009" // dst_offset
1421
- // Not in simulator
1422
- // + to_hex(OpCode::COINBASE) + // opcode COINBASE
1423
- // "00" // Indirect flag
1424
- // "00000009" // dst_offset
1425
- + to_hex (OpCode::FEEPERL2GAS) + // opcode FEEPERL2GAS
1426
- " 00" // Indirect flag
1427
- " 0000000a" // dst_offset
1428
- + to_hex (OpCode::FEEPERDAGAS) + // opcode FEEPERDAGAS
1429
- " 00" // Indirect flag
1430
- " 0000000b" // dst_offset
1431
- + to_hex (OpCode::RETURN) + // opcode RETURN
1432
- " 00" // Indirect flag
1433
- " 00000001" // ret offset 1
1434
- " 0000000b" ; // ret size 11
1421
+ + to_hex (OpCode::FEEPERL2GAS) + // opcode FEEPERL2GAS
1422
+ " 00" // Indirect flag
1423
+ " 0000000a" // dst_offset
1424
+ + to_hex (OpCode::FEEPERDAGAS) + // opcode FEEPERDAGAS
1425
+ " 00" // Indirect flag
1426
+ " 0000000b" // dst_offset
1427
+ + to_hex (OpCode::RETURN) + // opcode RETURN
1428
+ " 00" // Indirect flag
1429
+ " 00000001" // ret offset 1
1430
+ " 0000000b" ; // ret size 11
1435
1431
1436
1432
auto bytecode = hex_to_bytes (bytecode_hex);
1437
1433
auto instructions = Deserialization::parse (bytecode);
@@ -1483,13 +1479,6 @@ TEST_F(AvmExecutionTests, kernelInputOpcodes)
1483
1479
AllOf (Field (&Instruction::op_code, OpCode::TIMESTAMP),
1484
1480
Field (&Instruction::operands, ElementsAre (VariantWith<uint8_t >(0 ), VariantWith<uint32_t >(9 )))));
1485
1481
1486
- // COINBASE
1487
- // Not in simulator
1488
- // EXPECT_THAT(instructions.at(8),
1489
- // AllOf(Field(&Instruction::op_code, OpCode::COINBASE),
1490
- // Field(&Instruction::operands, ElementsAre(VariantWith<uint8_t>(0),
1491
- // VariantWith<uint32_t>(10)))));
1492
-
1493
1482
// FEEPERL2GAS
1494
1483
EXPECT_THAT (instructions.at (9 ),
1495
1484
AllOf (Field (&Instruction::op_code, OpCode::FEEPERL2GAS),
@@ -1514,15 +1503,14 @@ TEST_F(AvmExecutionTests, kernelInputOpcodes)
1514
1503
FF version = 7 ;
1515
1504
FF blocknumber = 8 ;
1516
1505
FF timestamp = 9 ;
1517
- // FF coinbase = 10; // Not in simulator
1518
1506
FF feeperl2gas = 10 ;
1519
1507
FF feeperdagas = 11 ;
1520
1508
1521
1509
// The return data for this test should be a the opcodes in sequence, as the opcodes dst address lines up with
1522
1510
// this array The returndata call above will then return this array
1523
1511
std::vector<FF> const expected_returndata = {
1524
- address, storage_address, sender, function_selector, transaction_fee, chainid, version ,
1525
- blocknumber, /* coinbase, */ timestamp, feeperl2gas, feeperdagas,
1512
+ address, storage_address, sender, function_selector, transaction_fee, chainid,
1513
+ version, blocknumber, timestamp, feeperl2gas, feeperdagas,
1526
1514
};
1527
1515
1528
1516
// Set up public inputs to contain the above values
@@ -1540,8 +1528,6 @@ TEST_F(AvmExecutionTests, kernelInputOpcodes)
1540
1528
public_inputs_vec[VERSION_OFFSET] = version;
1541
1529
public_inputs_vec[BLOCK_NUMBER_OFFSET] = blocknumber;
1542
1530
public_inputs_vec[TIMESTAMP_OFFSET] = timestamp;
1543
- // Not in the simulator yet
1544
- // public_inputs_vec[COINBASE_OFFSET] = coinbase;
1545
1531
// Global variables - Gas
1546
1532
public_inputs_vec[FEE_PER_DA_GAS_OFFSET] = feeperdagas;
1547
1533
public_inputs_vec[FEE_PER_L2_GAS_OFFSET] = feeperl2gas;
@@ -1597,12 +1583,6 @@ TEST_F(AvmExecutionTests, kernelInputOpcodes)
1597
1583
std::ranges::find_if (trace.begin (), trace.end (), [](Row r) { return r.main_sel_op_timestamp == 1 ; });
1598
1584
EXPECT_EQ (timestamp_row->main_ia , timestamp);
1599
1585
1600
- // // Check coinbase
1601
- // Not in simulator
1602
- // auto coinbase_row =
1603
- // std::ranges::find_if(trace.begin(), trace.end(), [](Row r) { return r.main_sel_op_coinbase == 1; });
1604
- // EXPECT_EQ(coinbase_row->main_ia, coinbase);
1605
-
1606
1586
// Check feeperdagas
1607
1587
auto feeperdagas_row =
1608
1588
std::ranges::find_if (trace.begin (), trace.end (), [](Row r) { return r.main_sel_op_fee_per_da_gas == 1 ; });
0 commit comments