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

fix(protocol): fix Bridge bug in retrying message #15403

Merged
merged 9 commits into from
Dec 19, 2023
Merged

fix(protocol): fix Bridge bug in retrying message #15403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c75158f
Update Bridge.sol
dantaik Dec 18, 2023
1b913bc
Update Bridge.t.sol
dantaik Dec 18, 2023
314266a
Merge branch 'alpha-6' into improve_recall_message
dantaik Dec 18, 2023
8004606
Update Bridge.sol
dantaik Dec 18, 2023
92ed551
Merge branch 'improve_recall_message' of https://github.com/taikoxyz/…
dantaik Dec 18, 2023
4115651
fix(bridge): fix multiple retry
dantaik Dec 19, 2023
29d44d8
Update Bridge.t.sol
dantaik Dec 19, 2023
9d60e2d
fix
dantaik Dec 19, 2023
515b47e
Merge branch 'alpha-6' into fix_bridge_retry_bug
dantaik Dec 19, 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
12 changes: 7 additions & 5 deletions packages/protocol/contracts/bridge/Bridge.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,15 +270,17 @@ contract Bridge is EssentialContract, IBridge {
revert B_NON_RETRIABLE();
}

ISignalService signalService = ISignalService(resolve("signal_service", false));

// Attempt to invoke the messageCall.
if (_invokeMessageCall(message, msgHash, gasleft())) {
// Update the message status to "DONE" on successful invocation.
_updateMessageStatus(signalService, msgHash, Status.DONE);
} else {
_updateMessageStatus(
ISignalService(resolve("signal_service", false)), msgHash, Status.DONE
);
} else if (isLastAttempt) {
// Update the message status to "FAILED"
_updateMessageStatus(signalService, msgHash, Status.FAILED);
_updateMessageStatus(
ISignalService(resolve("signal_service", false)), msgHash, Status.FAILED
);
}
}

Expand Down
9 changes: 6 additions & 3 deletions packages/protocol/test/bridge/Bridge.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,12 +420,15 @@ contract BridgeTest is TaikoTest {
assertEq(status == Bridge.Status.RETRIABLE, true);

vm.stopPrank();
vm.prank(message.owner);

destChainBridge.retryMessage(message, true);

vm.prank(message.owner);
destChainBridge.retryMessage(message, false);
Bridge.Status postRetryStatus = destChainBridge.messageStatus(msgHash);
assertEq(postRetryStatus == Bridge.Status.RETRIABLE, true);

vm.prank(message.owner);
destChainBridge.retryMessage(message, true);
postRetryStatus = destChainBridge.messageStatus(msgHash);
assertEq(postRetryStatus == Bridge.Status.FAILED, true);
}

Expand Down
Loading