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

feat(protocol): also add rewardPerGas into BlockProposedEvent #14124

Merged
merged 8 commits into from
Jul 8, 2023
Merged

feat(protocol): also add rewardPerGas into BlockProposedEvent #14124

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1ca0fcb
change events
dong77 Jul 7, 2023
93c8120
change events
dong77 Jul 7, 2023
5a8b466
additional changes
dong77 Jul 7, 2023
3506905
Merge branch 'alpha-4' into alpha-4-events2
dantaik Jul 7, 2023
0dd3f02
additional changes
dong77 Jul 7, 2023
602e79a
additional changes
dong77 Jul 7, 2023
db54a87
additional changes
dong77 Jul 7, 2023
fbfccdf
additional changes
dong77 Jul 7, 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
1 change: 1 addition & 0 deletions packages/protocol/contracts/L1/TaikoEvents.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ abstract contract TaikoEvents {
uint256 indexed id,
address indexed assignedProver,
uint64 blockFee,
uint32 rewardPerGas,
TaikoData.BlockMetadata meta
);

Expand Down
9 changes: 8 additions & 1 deletion packages/protocol/contracts/L1/libs/LibProposing.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ library LibProposing {
uint256 indexed id,
address indexed assignedProver,
uint64 blockFee,
uint32 rewardPerGas,
TaikoData.BlockMetadata meta
);

Expand Down Expand Up @@ -139,7 +140,13 @@ library LibProposing {
revert L1_INSUFFICIENT_TOKEN();
}

emit BlockProposed(state.numBlocks, blk.assignedProver, blockFee, meta);
emit BlockProposed(
state.numBlocks,
blk.assignedProver,
blockFee,
blk.rewardPerGas,
meta
);

unchecked {
++state.numBlocks;
Expand Down
2 changes: 1 addition & 1 deletion packages/website/pages/docs/reference/contract-documentation/L1/TaikoEvents.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ title: TaikoEvents
### BlockProposed

```solidity
event BlockProposed(uint256 id, address assignedProver, uint64 blockFee, struct TaikoData.BlockMetadata meta)
event BlockProposed(uint256 id, address assignedProver, uint64 blockFee, uint32 rewardPerGas, struct TaikoData.BlockMetadata meta)
```

### BlockProven
Expand Down