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.

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

update L1 data fee for curie #1293

Merged
merged 40 commits into from
May 30, 2024
Merged
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
5645e46
add new fields
DreamWuGit May 27, 2024
1de93d4
Merge branch 'develop' into l1fee_curie
DreamWuGit May 27, 2024
aa0efcb
update get_committed_values_from_state_db
DreamWuGit May 27, 2024
37e71c0
Merge branch 'l1fee_curie' of https://github.com/scroll-tech/zkevm-ci…
DreamWuGit May 27, 2024
6e52f58
add curies field into TxL1FeeGadget
DreamWuGit May 28, 2024
0bf279f
add curie fields reads
DreamWuGit May 28, 2024
b4b62be
assign curie fields
DreamWuGit May 28, 2024
a9113a9
update raw_construct helper
DreamWuGit May 28, 2024
af080ae
update l1fee formula
DreamWuGit May 28, 2024
7047e47
rename
DreamWuGit May 28, 2024
4295cff
use upper case
DreamWuGit May 28, 2024
2e787c4
fix build
DreamWuGit May 28, 2024
8ebf7e9
resolve conflict & merge to develop
DreamWuGit May 28, 2024
fa0f99b
fmt align
DreamWuGit May 28, 2024
a7062e4
Merge branch 'develop' into l1fee_curie
DreamWuGit May 28, 2024
830bb91
fix test build
DreamWuGit May 28, 2024
5a2048a
Merge branch 'l1fee_curie' of https://github.com/scroll-tech/zkevm-ci…
DreamWuGit May 28, 2024
e9bf085
fix ci test
DreamWuGit May 29, 2024
49a9459
Merge branch 'develop' into l1fee_curie
DreamWuGit May 29, 2024
0cd77fa
add get_rlp_signed
DreamWuGit May 29, 2024
c8355b1
Merge branch 'l1fee_curie' of https://github.com/scroll-tech/zkevm-ci…
DreamWuGit May 29, 2024
e3e7af7
update end_tx etc
DreamWuGit May 29, 2024
76faebc
update TxL1FeeGadgetTestContainer
DreamWuGit May 29, 2024
63cf7a0
fix l1fee_curie feature build err
DreamWuGit May 29, 2024
fc5acf9
add debug log
DreamWuGit May 29, 2024
b4dc8c9
change gen_tx_l1_fee_ops in buss
DreamWuGit May 29, 2024
2dceeba
add blob_scalar
DreamWuGit May 29, 2024
38c8978
correct l1BaseFee
DreamWuGit May 29, 2024
0941e1e
begin_tx adjust rw offset when curie
DreamWuGit May 29, 2024
da53bc2
upgrade l2geth (with latest l1 fee)
lispc May 29, 2024
5af852d
update tx_signed_length
DreamWuGit May 29, 2024
d6e9b5f
update committed assign
DreamWuGit May 29, 2024
de28405
fix build
DreamWuGit May 29, 2024
705622c
debug log
DreamWuGit May 29, 2024
7f115d6
minor fix
DreamWuGit May 29, 2024
e3cae39
some cleanup
DreamWuGit May 29, 2024
43e1200
update link
DreamWuGit May 30, 2024
5e0d566
try eth_tx.rlp
DreamWuGit May 30, 2024
ec016bd
remove get_rlp_signed
DreamWuGit May 30, 2024
deb6d5c
[FIX #1307] (#1308)
noel2004 May 30, 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
4 changes: 2 additions & 2 deletions bus-mapping/src/circuit_input_builder/transaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -516,11 +516,11 @@ impl TxL1Fee {
(tx_l1_fee % TX_L1_FEE_PRECISION as u128) as u64,
)
}

#[cfg(feature = "l1_fee_curie")]
{
// "commitScalar * l1BaseFee + blobScalar * _data.length * l1BlobBaseFee",
let tx_l1_fee = self.commit_scalar as u128 * self.l1_blob_basefee as u128
let tx_l1_fee = self.commit_scalar as u128 * self.base_fee as u128
lispc marked this conversation as resolved.
Show resolved Hide resolved
+ self.blob_scalar as u128 * tx_rlp_signed_len as u128 * self.l1_blob_basefee as u128;
(
(tx_l1_fee / TX_L1_FEE_PRECISION as u128) as u64,
Expand Down
Loading