Skip to content

feat: add origin context #16150

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

Closed
hexshire wants to merge 4 commits into from
Closed

feat: add origin context #16150

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3502c38
chore: add origin context
hexshire May 28, 2025
f061a6e
chore: address review comments
hexshire May 29, 2025
5052fd4
Merge branch 'develop' into chore/sync-develop
hexshire Jun 4, 2025
99d48e5
Merge pull request #407 from defi-wonderland/chore/sync-develop
hexshire Jun 4, 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
12 changes: 10 additions & 2 deletions packages/contracts-bedrock/interfaces/L2/IL2ToL2CrossDomainMessenger.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,14 @@ interface IL2ToL2CrossDomainMessenger {
/// @param messageNonce Nonce associated with the messsage sent
/// @param sender Address initiating this message call
/// @param message Message payload to call target with.
/// @param originContext Context of the message.
event SentMessage(
uint256 indexed destination, address indexed target, uint256 indexed messageNonce, address sender, bytes message
uint256 indexed destination,
address indexed target,
uint256 indexed messageNonce,
address sender,
bytes message,
bytes originContext
);

/// @notice Emitted whenever a message is successfully relayed on this chain.
Expand Down Expand Up @@ -116,13 +122,15 @@ interface IL2ToL2CrossDomainMessenger {
/// @param _sender Address that sent the message
/// @param _target Target contract or wallet address.
/// @param _message Message payload to call target with.
/// @param _originContext Context of the message.
/// @return messageHash_ The hash of the message being re-sent.
function resendMessage(
uint256 _destination,
uint256 _nonce,
address _sender,
address _target,
bytes calldata _message
bytes calldata _message,
bytes calldata _originContext
)
external
returns (bytes32 messageHash_);
Expand Down
42 changes: 42 additions & 0 deletions packages/contracts-bedrock/snapshots/abi/L2ToL2CrossDomainMessenger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
[
{
"inputs": [],
"name": "ORIGIN_CONTEXT_ENCODING_VERSION",
"outputs": [
{
"internalType": "uint8",
"name": "",
"type": "uint8"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "crossDomainMessageContext",
Expand All @@ -12,6 +25,24 @@
"internalType": "uint256",
"name": "source_",
"type": "uint256"
},
{
"internalType": "bytes",
"name": "originContext_",
"type": "bytes"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "crossDomainMessageOriginContext",
"outputs": [
{
"internalType": "bytes",
"name": "context_",
"type": "bytes"
}
],
"stateMutability": "view",
Expand Down Expand Up @@ -146,6 +177,11 @@
"internalType": "bytes",
"name": "_message",
"type": "bytes"
},
{
"internalType": "bytes",
"name": "_originContext",
"type": "bytes"
}
],
"name": "resendMessage",
Expand Down Expand Up @@ -302,6 +338,12 @@
"internalType": "bytes",
"name": "message",
"type": "bytes"
},
{
"indexed": false,
"internalType": "bytes",
"name": "originContext",
"type": "bytes"
}
],
"name": "SentMessage",
Expand Down
4 changes: 2 additions & 2 deletions packages/contracts-bedrock/snapshots/semver-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@
"sourceCodeHash": "0x83396cbd12a0c5c02e09a4d99c4b62ab4e9d9eb762745e63283e2e818a78a39c"
},
"src/L2/L2ToL2CrossDomainMessenger.sol:L2ToL2CrossDomainMessenger": {
"initCodeHash": "0xd997db3cb7c84c8c851719bcf561ef35eb660262b2f4093dd6a3d86c5426240f",
"sourceCodeHash": "0x33393a279f32ecd6641adf267b59413d86595357b4f50b8a09afb62b8fc7639c"
"initCodeHash": "0x909b075c03430827c7ce3bb69f688636b03ff2db3ca919a7789342fc449f79ea",
"sourceCodeHash": "0xde1b23bc36ea30461ad73e0d094d608d57bb61ad552e92fc6fadf212bc486055"
},
"src/L2/OperatorFeeVault.sol:OperatorFeeVault": {
"initCodeHash": "0x3d8c0d7736e8767f2f797da1c20c5fe30bd7f48a4cf75f376290481ad7c0f91f",
Expand Down
Loading