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

Address #183 #492 #688 #869 #16

Closed
wants to merge 9 commits into from
Closed

Address #183 #492 #688 #869 #16

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
2ba4644
Address #183
0xBugsy Jul 22, 2023
135473d
Adding Tests
0xBugsy Jul 22, 2023
184a907
Mirrorring changes for Branch
0xBugsy Jul 22, 2023
da7bacb
Adding Tests and Updating Router to feature hasFallback
0xBugsy Jul 22, 2023
565bcf7
Adding retrieve for unexecuted tx
0xBugsy Jul 24, 2023
91de230
Address #492
0xBugsy Jul 31, 2023
2f758fe
Address #688
0xBugsy Aug 2, 2023
9bec916
Address #869
0xBugsy Aug 2, 2023
1615ed0
Cleaning up interfaces and setting fallback to default (#183)
0xBugsy Aug 12, 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
4 changes: 4 additions & 0 deletions src/ulysses-omnichain/ArbitrumBranchBridgeAgent.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,10 @@ contract ArbitrumBranchBridgeAgent is BranchBridgeAgent {
IArbPort(localPortAddress).withdrawFromPort(msg.sender, msg.sender, localAddress, amount);
}

/// @inheritdoc IBranchBridgeAgent
/// @dev This functionality should be accessed from Root environment
function retrySettlement(uint32 _settlementNonce, uint128 _gasToBoostSettlement) external payable override lock {}

/*///////////////////////////////////////////////////////////////
INTERNAL FUNCTIONS
//////////////////////////////////////////////////////////////*/
Expand Down
4 changes: 2 additions & 2 deletions src/ulysses-omnichain/ArbitrumCoreBranchRouter.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ contract ArbitrumCoreBranchRouter is CoreBranchRouter {
bytes memory packedData = abi.encodePacked(bytes1(0x02), data);

//Send Cross-Chain request (System Response/Request)
IBridgeAgent(localBridgeAgentAddress).performCallOut(msg.sender, packedData, 0, 0);
IBridgeAgent(localBridgeAgentAddress).performCallOut(msg.sender, packedData, 0, 0, false);
}

/*///////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -101,7 +101,7 @@ contract ArbitrumCoreBranchRouter is CoreBranchRouter {
bytes memory packedData = abi.encodePacked(bytes1(0x04), data);

//Send Cross-Chain request
IBridgeAgent(localBridgeAgentAddress).performSystemCallOut(address(this), packedData, 0, 0);
IBridgeAgent(localBridgeAgentAddress).performSystemCallOut(address(this), packedData, 0, 0, false);
}

/*///////////////////////////////////////////////////////////////
Expand Down
6 changes: 3 additions & 3 deletions src/ulysses-omnichain/BaseBranchRouter.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ contract BaseBranchRouter is IBranchRouter, Ownable {
/// @inheritdoc IBranchRouter
function callOut(bytes calldata params, uint128 remoteExecutionGas) external payable lock {
IBridgeAgent(localBridgeAgentAddress).performCallOut{value: msg.value}(
msg.sender, params, 0, remoteExecutionGas
msg.sender, params, 0, remoteExecutionGas, true
);
}

Expand All @@ -68,7 +68,7 @@ contract BaseBranchRouter is IBranchRouter, Ownable {
lock
{
IBridgeAgent(localBridgeAgentAddress).performCallOutAndBridge{value: msg.value}(
msg.sender, params, dParams, 0, remoteExecutionGas
msg.sender, params, dParams, 0, remoteExecutionGas, true
);
}

Expand All @@ -79,7 +79,7 @@ contract BaseBranchRouter is IBranchRouter, Ownable {
uint128 remoteExecutionGas
) external payable lock {
IBridgeAgent(localBridgeAgentAddress).performCallOutAndBridgeMultiple{value: msg.value}(
msg.sender, params, dParams, 0, remoteExecutionGas
msg.sender, params, dParams, 0, remoteExecutionGas, true
);
}

Expand Down
Loading