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

feat(protocol): prepare ontake fork to support new params & metadata #17679

Merged
merged 92 commits into from
Jul 4, 2024
Merged
Changes from 1 commit
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
d8d670b
allow contract propoers to use calldata as well.
dantaik Jun 21, 2024
0b0c50f
Merge branch 'main' into support_calldata_for_contract_proposer
dantaik Jun 24, 2024
42897f5
rename
dantaik Jun 24, 2024
10d81d8
emit CalldataTxList
dantaik Jun 24, 2024
0206ff6
Merge branch 'emit_CalldataTxList' into support_calldata_for_contract…
dantaik Jun 24, 2024
27ada28
Update LibProposing.sol
dantaik Jun 24, 2024
0594f0e
more
dantaik Jun 26, 2024
429d39e
refactor TaikoL1 code
dantaik Jun 26, 2024
220cc29
Update LibProposing.sol
dantaik Jun 26, 2024
f0256d4
Merge branch 'refactor_taikoL1' into plan_for_a_hard_fork
dantaik Jun 26, 2024
46bf716
Update TaikoEvents.sol
dantaik Jun 26, 2024
644457f
more
dantaik Jun 26, 2024
f6ed532
Update TaikoL1.sol
dantaik Jun 26, 2024
b0a1205
more
dantaik Jun 26, 2024
f6e6011
more
dantaik Jun 26, 2024
31ada4a
more
dantaik Jun 26, 2024
ba1d6bb
forge fmt & update contract layout table
dantaik Jun 26, 2024
711c733
more
dantaik Jun 26, 2024
8409a8f
more
dantaik Jun 26, 2024
2a82410
Update LibProposing.sol
dantaik Jun 26, 2024
194ac8e
Update LibProving.sol
dantaik Jun 26, 2024
1719bb9
Update LibVerifying.sol
dantaik Jun 26, 2024
3f5b385
more
dantaik Jun 26, 2024
b33fe9d
Update LibProposing.sol
dantaik Jun 26, 2024
b94839e
Update LibProposing.sol
dantaik Jun 26, 2024
ef4be90
Update LibProposing.sol
dantaik Jun 26, 2024
e67aee0
more
dantaik Jun 27, 2024
f37aab8
more
dantaik Jun 27, 2024
fd2456f
more
dantaik Jun 27, 2024
5abd944
Update TaikoL1TestGroupBase.sol
dantaik Jun 27, 2024
280cd14
more
dantaik Jun 27, 2024
27faf96
more
dantaik Jun 27, 2024
7828f9e
more
dantaik Jun 27, 2024
a713fe8
Update LibProposing.sol
dantaik Jun 27, 2024
548f497
Update LibProposing.sol
dantaik Jun 27, 2024
3d987aa
Update LibProposing.sol
dantaik Jun 27, 2024
2da7fda
Update LibProposing.sol
dantaik Jun 27, 2024
bc8f67e
Update TaikoL2.sol
dantaik Jun 27, 2024
8a52cbe
Update TaikoL2.sol
dantaik Jun 27, 2024
309fd92
Update TaikoData.sol
dantaik Jun 27, 2024
3668636
Merge branch 'main' into plan_for_a_hard_fork
dantaik Jun 27, 2024
d1a755b
Update LibProposing.sol
dantaik Jun 27, 2024
950daf5
comment
dantaik Jun 27, 2024
b2e0b86
rename
dantaik Jun 27, 2024
11353ef
Merge branch 'main' into plan_for_a_hard_fork
dantaik Jun 27, 2024
d9b3851
rename
dantaik Jun 27, 2024
bd41b24
one more test
dantaik Jun 27, 2024
0225104
improve test
dantaik Jun 28, 2024
a4e98c9
test
dantaik Jun 28, 2024
448d443
one more test
dantaik Jun 28, 2024
2437559
one more test
dantaik Jun 28, 2024
985e6d7
feat(protocol): enable AddressManager to cache address(0) without rea…
dantaik Jun 28, 2024
714691e
fix
dantaik Jun 28, 2024
6b198f4
Merge branch 'main' into plan_for_a_hard_fork
dantaik Jun 28, 2024
b359ae2
Update TaikoL1.sol
dantaik Jun 26, 2024
0519245
fix lint
dantaik Jun 28, 2024
22b8cbd
feat(protocol): add IProposerAccess (#17696)
dantaik Jun 28, 2024
38b1794
TierProviderV3
dantaik Jun 30, 2024
cba1735
Update TierRouter.sol
dantaik Jun 30, 2024
b718d7a
do not write proposedAt in Block
dantaik Jun 30, 2024
d959d95
Update TaikoL1testGroupA2.t.sol
dantaik Jun 30, 2024
4f92f94
do not write proposedIn in Block
dantaik Jun 30, 2024
bca4cf8
Update TaikoData.sol
dantaik Jun 30, 2024
57fbd0d
more
dantaik Jun 30, 2024
b134442
Update LibProposing.sol
dantaik Jun 30, 2024
cc60ace
fix tests
dantaik Jul 1, 2024
d79e9cb
Merge branch 'main' into plan_for_a_hard_fork
dantaik Jul 1, 2024
ed2a817
Update LibProving.sol
dantaik Jul 1, 2024
fe197da
Update LibProposing.sol
dantaik Jul 1, 2024
5c5bb37
fuji
dantaik Jul 1, 2024
5297c24
Merge branch 'ontake_fork' into plan_for_a_hard_fork
dantaik Jul 2, 2024
e543f6d
rename
dantaik Jul 2, 2024
10d633e
Allow bonds deposits and withdrawal
dantaik Jul 3, 2024
9febe80
Merge branch 'main' into bond_alt
dantaik Jul 3, 2024
9fdd6b9
Update LibBonds.sol
dantaik Jul 3, 2024
7bec257
pnpm test
dantaik Jul 3, 2024
307f8a0
Update TaikoEvents.sol
dantaik Jul 3, 2024
5fe7f36
Merge branch 'main' into bond_alt
dantaik Jul 3, 2024
509e8a8
Update LibBonds.sol
dantaik Jul 3, 2024
47e9fdc
Update TaikoToken.sol
dantaik Jul 4, 2024
92c7041
Update TaikoL1.sol
dantaik Jul 4, 2024
55b5f2b
Update TaikoL1.sol
dantaik Jul 4, 2024
9f84826
Update TaikoL1.sol
dantaik Jul 4, 2024
94747e8
Update LibBonds.sol
dantaik Jul 4, 2024
266c5dc
more
dantaik Jul 4, 2024
7cfb159
Update TaikoL1TestGroupBase.sol
dantaik Jul 4, 2024
37f7267
Merge branch 'main' into bond_alt
dantaik Jul 4, 2024
6d132c1
Merge branch 'bond_alt' into plan_for_a_hard_fork
dantaik Jul 4, 2024
3012e94
Update LibProving.sol
dantaik Jul 4, 2024
7a47857
fix tests
dantaik Jul 4, 2024
c70d6dd
Merge branch 'ontake_fork' into plan_for_a_hard_fork
dantaik Jul 4, 2024
548d811
resolve conflicts
dantaik Jul 4, 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
Prev Previous commit
Next Next commit
Update LibProposing.sol
  • Loading branch information
dantaik committed Jun 26, 2024
commit b33fe9d2db7a3caf61c67640ddcef45a701c9679
4 changes: 2 additions & 2 deletions packages/protocol/contracts/L1/libs/LibProposing.sol
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@ library LibProposing {
local.params.coinbase = msg.sender;
}

if (local.params.anchorBlockId == 0) {
if (!local.postFork || local.params.anchorBlockId == 0) {
local.params.anchorBlockId = uint64(block.number - 1);
}

if (local.params.anchorTimestamp == 0) {
if (!local.postFork || local.params.anchorTimestamp == 0) {
local.params.anchorTimestamp = uint64(block.timestamp);
}

Expand Down
Loading