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

feat(contracts-rfq): save destination chain ID for requested bridges [SLT-423] #3356

Merged
merged 4 commits into from
Nov 4, 2024
Merged

feat(contracts-rfq): save destination chain ID for requested bridges [SLT-423] #3356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
13313ac
feat: don't save `proofBlockNumber`
ChiTimesChi Oct 31, 2024
9901332
test: refactor status/proof checks
ChiTimesChi Oct 31, 2024
453f25d
feat: add `destChainId`, tests
ChiTimesChi Oct 31, 2024
c417fce
feat: make sure BridgeTxDetails is exactly 256 bits
ChiTimesChi Oct 31, 2024
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
20 changes: 10 additions & 10 deletions packages/contracts-rfq/contracts/FastBridgeV2.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ contract FastBridgeV2 is Admin, MulticallTarget, IFastBridgeV2, IFastBridgeV2Err
// Aggregate the read operations from the same storage slot
address disputedRelayer = $.proofRelayer;
BridgeStatus status = $.status;
uint40 proofBlockTimestamp = $.proofBlockTimestamp;
uint56 proofBlockTimestamp = $.proofBlockTimestamp;
// Can only dispute a RELAYER_PROVED transaction within the dispute period
if (status != BridgeStatus.RELAYER_PROVED) revert StatusIncorrect();
if (_timeSince(proofBlockTimestamp) > DISPUTE_PERIOD) {
Expand All @@ -100,7 +100,6 @@ contract FastBridgeV2 is Admin, MulticallTarget, IFastBridgeV2, IFastBridgeV2Err
$.status = BridgeStatus.REQUESTED;
$.proofRelayer = address(0);
$.proofBlockTimestamp = 0;
$.proofBlockNumber = 0;

emit BridgeProofDisputed(transactionId, disputedRelayer);
}
Expand Down Expand Up @@ -221,7 +220,9 @@ contract FastBridgeV2 is Admin, MulticallTarget, IFastBridgeV2, IFastBridgeV2Err
})
);
bytes32 transactionId = keccak256(request);
// Note: the tx status will be updated throughout the tx lifecycle, while destChainId is set once here
bridgeTxDetails[transactionId].status = BridgeStatus.REQUESTED;
bridgeTxDetails[transactionId].destChainId = params.dstChainId;

emit BridgeRequested({
transactionId: transactionId,
Expand Down Expand Up @@ -313,8 +314,7 @@ contract FastBridgeV2 is Admin, MulticallTarget, IFastBridgeV2, IFastBridgeV2Err
// Update status to RELAYER_PROVED and store the proof details
// Note: these are storage writes
$.status = BridgeStatus.RELAYER_PROVED;
$.proofBlockTimestamp = uint40(block.timestamp);
$.proofBlockNumber = uint48(block.number);
$.proofBlockTimestamp = uint56(block.timestamp);
$.proofRelayer = relayer;

emit BridgeProofProvided(transactionId, relayer, destTxHash);
Expand All @@ -328,7 +328,7 @@ contract FastBridgeV2 is Admin, MulticallTarget, IFastBridgeV2, IFastBridgeV2Err
// Aggregate the read operations from the same storage slot
address proofRelayer = $.proofRelayer;
BridgeStatus status = $.status;
uint40 proofBlockTimestamp = $.proofBlockTimestamp;
uint56 proofBlockTimestamp = $.proofBlockTimestamp;

// Can only claim a RELAYER_PROVED transaction after the dispute period
if (status != BridgeStatus.RELAYER_PROVED) revert StatusIncorrect();
Expand Down Expand Up @@ -425,14 +425,14 @@ contract FastBridgeV2 is Admin, MulticallTarget, IFastBridgeV2, IFastBridgeV2Err
}

/// @notice Calculates time since proof submitted
/// @dev proof.timestamp stores casted uint40(block.timestamp) block timestamps for gas optimization
/// _timeSince(proof) can accomodate rollover case when block.timestamp > type(uint40).max but
/// proof.timestamp < type(uint40).max via unchecked statement
/// @dev proof.timestamp stores casted uint56(block.timestamp) block timestamps for gas optimization
/// _timeSince(proof) can accomodate rollover case when block.timestamp > type(uint56).max but
/// proof.timestamp < type(uint56).max via unchecked statement
/// @param proofBlockTimestamp The bridge proof block timestamp
/// @return delta Time delta since proof submitted
function _timeSince(uint40 proofBlockTimestamp) internal view returns (uint256 delta) {
function _timeSince(uint56 proofBlockTimestamp) internal view returns (uint256 delta) {
unchecked {
delta = uint40(block.timestamp) - proofBlockTimestamp;
delta = uint56(block.timestamp) - proofBlockTimestamp;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/contracts-rfq/contracts/interfaces/IFastBridgeV2.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ interface IFastBridgeV2 is IFastBridge {

struct BridgeTxDetails {
ChiTimesChi marked this conversation as resolved.
Show resolved Hide resolved
BridgeStatus status;
uint40 proofBlockTimestamp;
uint48 proofBlockNumber;
uint32 destChainId;
uint56 proofBlockTimestamp;
address proofRelayer;
}

Expand Down
Loading
Loading