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(taiko-client): changes based on the protocol forced inclusion feature #18909

Merged
merged 82 commits into from
Feb 19, 2025
Merged
Changes from 1 commit
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
91869d0
Update TaikoInbox.sol
dantaik Feb 6, 2025
b8e7eb1
Update ForkRouter.sol
dantaik Feb 6, 2025
1ebc3cb
feat(protocol): support delayed forced inclusion of txs (#18826)
dantaik Feb 6, 2025
aa1b637
fix
dantaik Feb 7, 2025
f15921e
Update TaikoWrapper.sol
dantaik Feb 7, 2025
2f88a5c
Update TaikoWrapper.sol
dantaik Feb 7, 2025
85ece24
Update TaikoWrapper.sol
dantaik Feb 7, 2025
4bf26db
Update ForcedInclusionStore.sol
dantaik Feb 7, 2025
5b90706
ITaikoProposerEntryPoint
dantaik Feb 7, 2025
8c1adfe
Merge branch 'main' into chore_protocol
dantaik Feb 7, 2025
2f3d5a6
rename
dantaik Feb 7, 2025
c7e4c35
Update PreconfRouter.sol
dantaik Feb 7, 2025
2f4a20e
Update TaikoWrapper.sol
dantaik Feb 7, 2025
a8d8ca2
Update TaikoWrapper.sol
dantaik Feb 7, 2025
0e71e12
Update TaikoInbox.sol
dantaik Feb 7, 2025
15a2de4
Merge branch 'main' into chore_protocol
dantaik Feb 10, 2025
60a0d2e
minor
dantaik Feb 10, 2025
e20ba24
minor
dantaik Feb 10, 2025
227ec08
Update IForcedInclusionStore.sol
dantaik Feb 10, 2025
1b3fc4e
fix
dantaik Feb 10, 2025
1998f9f
more
dantaik Feb 10, 2025
c82b3b6
fix
dantaik Feb 10, 2025
cb19f92
Update gen-layouts.sh
dantaik Feb 10, 2025
e0b5bd2
forge fmt & update contract layout tables
dantaik Feb 10, 2025
c4f042e
Merge branch 'main' into chore_protocol
dantaik Feb 10, 2025
cca8b8c
Merge branch 'main' into chore_protocol
dantaik Feb 10, 2025
0ea76f2
fix(protocol): fee recipient in taiko wrapper (#18907)
AnshuJalan Feb 10, 2025
9e8b988
Update TaikoWrapper.sol
dantaik Feb 10, 2025
4389bc9
rename
dantaik Feb 10, 2025
d59720d
Merge branch 'main' into chore_protocol
davidtaikocha Feb 10, 2025
aaa5a5c
feat(taiko-client): changes based on the protocol force inclusion fea…
davidtaikocha Feb 10, 2025
7c85902
Merge branch 'main' into chore_protocol_client
davidtaikocha Feb 11, 2025
a61b9db
chore: update deployment scripts
davidtaikocha Feb 11, 2025
7315699
feat: update bindings
davidtaikocha Feb 11, 2025
7490346
feat: update proposer
davidtaikocha Feb 11, 2025
1bdfeb1
Merge branch 'main' into chore_protocol_client
davidtaikocha Feb 11, 2025
d6a3dcf
feat: update tests
davidtaikocha Feb 11, 2025
8cc2cec
Merge branch 'main' into chore_protocol_client
davidtaikocha Feb 13, 2025
42e3e1b
Merge branch 'main' into chore_protocol_client
davidtaikocha Feb 13, 2025
afc292c
feat: update upgrade script
davidtaikocha Feb 14, 2025
fe51ab2
feat: update deployment script
davidtaikocha Feb 14, 2025
e891dc2
feat: update logs
davidtaikocha Feb 14, 2025
a90c1b4
Merge branch 'main' into chore_protocol_client
davidtaikocha Feb 14, 2025
aac3a16
test: improve tests
davidtaikocha Feb 14, 2025
6914ee3
feat: update deployment script
davidtaikocha Feb 14, 2025
2de6a42
Merge branch 'main' into chore_protocol_client
davidtaikocha Feb 14, 2025
7a04d8b
feat: update tx builder
davidtaikocha Feb 14, 2025
201be2f
feat: update scripts
davidtaikocha Feb 14, 2025
873fa3b
feat: update scripts
davidtaikocha Feb 14, 2025
7b76d64
test: update some tests
davidtaikocha Feb 14, 2025
53b8a85
feat: update tests
davidtaikocha Feb 15, 2025
14fc730
feat: update builder
davidtaikocha Feb 15, 2025
b29de4a
Merge branch 'main' into chore_protocol_client
davidtaikocha Feb 15, 2025
494b9c5
feat: update tests
davidtaikocha Feb 15, 2025
7cbb9c7
chore: update logs
davidtaikocha Feb 15, 2025
4510ff9
feat: update bindings
davidtaikocha Feb 15, 2025
bb57e1d
build
cyberhorsey Feb 17, 2025
3eede43
Merge branch 'chore_protocol_client' of github.com:taikoxyz/taiko-mon…
cyberhorsey Feb 17, 2025
4c3126b
merge main + bugfix for TaikoToken address instead of TaikoWrapper
cyberhorsey Feb 17, 2025
f03a8ce
stack too deep
cyberhorsey Feb 17, 2025
a6d4566
resolver
cyberhorsey Feb 17, 2025
bf5be07
add missing forced inclusion store address
cyberhorsey Feb 17, 2025
e9601e1
param
cyberhorsey Feb 17, 2025
b0ce6bf
Merge branch 'main' into chore_protocol_client
mask-pp Feb 18, 2025
50f7a35
Merge branch 'main' into chore_protocol_client
davidtaikocha Feb 18, 2025
7d838a2
Merge branch 'main' into chore_protocol_client
YoGhurt111 Feb 18, 2025
cadad73
Merge branch 'main' into chore_protocol_client
cyberhorsey Feb 18, 2025
5df4949
feat(protocol): update devnet configuration for preconfirmation (#18948)
cyberhorsey Feb 18, 2025
46ecf4a
upgrade script
cyberhorsey Feb 19, 2025
74d8b37
forge fmt & update contract layout tables
cyberhorsey Feb 19, 2025
6e96f4f
merge main, update bindings
cyberhorsey Feb 19, 2025
6571ee2
Merge branch 'chore_protocol_client' of github.com:taikoxyz/taiko-mon…
cyberhorsey Feb 19, 2025
332681c
remove repeat struct
mask-pp Feb 19, 2025
d28b79c
Merge branch 'main' into chore_protocol_client
mask-pp Feb 19, 2025
bb1ec13
Merge branch 'main' into chore_protocol_client
mask-pp Feb 19, 2025
a359914
fix lint
mask-pp Feb 19, 2025
2613a45
add TEST_ACCOUNT_PRIVATE_KEY in shell script
mask-pp Feb 19, 2025
1c4e3af
Merge branch 'main' into chore_protocol_client
davidtaikocha Feb 19, 2025
16dedce
feat: update bindings
davidtaikocha Feb 19, 2025
05dc5d2
Merge branch 'main' into chore_protocol_client
davidtaikocha Feb 19, 2025
6e07a99
Merge branch 'main' into chore_protocol_client
davidtaikocha Feb 19, 2025
2d9ebdc
fix: fix deplpoyment scripts
davidtaikocha Feb 19, 2025
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
rename
dantaik committed Feb 10, 2025

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
commit 4389bc9605c5270be759bb7ff04074589d128542
2 changes: 1 addition & 1 deletion packages/protocol/contracts/layer1/based/ITaikoInbox.sol
Original file line number Diff line number Diff line change
@@ -279,7 +279,7 @@ interface ITaikoInbox {
error MsgValueNotZero();
error NoBlocksToProve();
error NotFirstProposal();
error NotInboxOperator();
error NotInboxWrapper();
error ParentMetaHashMismatch();
error SameTransition();
error SignalNotSent();
6 changes: 3 additions & 3 deletions packages/protocol/contracts/layer1/based/TaikoInbox.sol
Original file line number Diff line number Diff line change
@@ -70,15 +70,15 @@ abstract contract TaikoInbox is EssentialContract, ITaikoInbox, IProposeBatch, I
BatchParams memory params = abi.decode(_params, (BatchParams));

{
address operator = resolve(LibStrings.B_INBOX_WRAPPER, true);
if (operator == address(0)) {
address wrapper = resolve(LibStrings.B_INBOX_WRAPPER, true);
if (wrapper == address(0)) {
require(params.proposer == address(0), CustomProposerNotAllowed());
params.proposer = msg.sender;

// blob hashes are only accepted if the caller is trusted.
require(params.blobParams.blobHashes.length == 0, InvalidBlobParams());
} else {
require(msg.sender == operator, NotInboxOperator());
require(msg.sender == wrapper, NotInboxWrapper());
require(params.proposer != address(0), CustomProposerMissing());
}

Original file line number Diff line number Diff line change
@@ -525,7 +525,7 @@ contract InboxTest_ProposeAndProve is InboxTestBase {

vm.startPrank(Alice);
params.proposer = operator;
vm.expectRevert(ITaikoInbox.NotInboxOperator.selector);
vm.expectRevert(ITaikoInbox.NotInboxWrapper.selector);
inbox.proposeBatch(abi.encode(params), "txList");
vm.stopPrank();