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

Remove limit from requests/responses #18

Merged
merged 1 commit into from
Apr 3, 2024
Merged

Remove limit from requests/responses #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 0 additions & 6 deletions src/IDispatcher.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ struct DispatchPost {
bytes body;
// timeout for this request in seconds
uint64 timeout;
// gas limit for executing this request on destination & its response (if any) on the source.
uint64 gaslimit;
// the amount put up to be paid to the relayer, this is in $DAI and charged to tx.origin
uint256 fee;
// who pays for this request?
Expand All @@ -32,8 +30,6 @@ struct DispatchGet {
bytes[] keys;
// timeout for this request in seconds
uint64 timeout;
// gas limit for executing this request on destination & its response (if any) on the source.
uint64 gaslimit;
// the amount put up to be paid to the relayer, this is in $DAI and charged to tx.origin
uint256 fee;
// who pays for this request?
Expand All @@ -47,8 +43,6 @@ struct DispatchPostResponse {
bytes response;
// timeout for this response in seconds
uint64 timeout;
// gas limit for executing this response on destination which is the source of the request.
uint64 gaslimit;
// the amount put up to be paid to the relayer, this is in $DAI and charged to tx.origin
uint256 fee;
// who pays for this request?
Expand Down
12 changes: 3 additions & 9 deletions src/Message.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ struct PostRequest {
uint64 timeoutTimestamp;
// request body
bytes body;
// gas limit for executing this request on destination & its response (if any) on the source.
uint64 gaslimit;
}

struct GetRequest {
Expand All @@ -38,8 +36,6 @@ struct GetRequest {
bytes[] keys;
// height at which to read destination state machine
uint64 height;
// gas limit for executing this request on destination
uint64 gaslimit;
}

struct GetResponse {
Expand All @@ -56,8 +52,6 @@ struct PostResponse {
bytes response;
// timestamp by which this response times out.
uint64 timeoutTimestamp;
// gas limit for executing this response on destination which is the source of the request.
uint64 gaslimit;
}

// A post request as a leaf in a merkle tree
Expand Down Expand Up @@ -170,13 +164,13 @@ library Message {

function encodeRequest(PostRequest memory req) internal pure returns (bytes memory) {
return abi.encodePacked(
req.source, req.dest, req.nonce, req.timeoutTimestamp, req.from, req.to, req.body, req.gaslimit
req.source, req.dest, req.nonce, req.timeoutTimestamp, req.from, req.to, req.body
);
}

function hash(PostResponse memory res) internal pure returns (bytes32) {
return keccak256(
bytes.concat(encodeRequest(res.request), abi.encodePacked(res.response, res.timeoutTimestamp, res.gaslimit))
bytes.concat(encodeRequest(res.request), abi.encodePacked(res.response, res.timeoutTimestamp))
);
}

Expand All @@ -193,7 +187,7 @@ library Message {

return keccak256(
abi.encodePacked(
req.source, req.dest, req.nonce, req.height, req.timeoutTimestamp, req.from, keysEncoding, req.gaslimit
req.source, req.dest, req.nonce, req.height, req.timeoutTimestamp, req.from, keysEncoding
)
);
}
Expand Down
Loading