Skip to content

Commit

Permalink
mods
Browse files Browse the repository at this point in the history
  • Loading branch information
zeroknots committed Nov 6, 2024
1 parent a49aef9 commit 106b990
Show file tree
Hide file tree
Showing 5 changed files with 320 additions and 144 deletions.
173 changes: 173 additions & 0 deletions broadcast/DeployArbitrum.s.sol/42161/run-1730885999.json

Large diffs are not rendered by default.

142 changes: 71 additions & 71 deletions broadcast/DeployArbitrum.s.sol/42161/run-latest.json

Large diffs are not rendered by default.

134 changes: 67 additions & 67 deletions broadcast/DeployBase.s.sol/8453/run-latest.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion contracts/Ovm_SpokePool.sol
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ contract Ovm_SpokePool is SpokePool, CircleCCTPAdapter {

// Apply OVM-specific transformation to cross domain admin address on L1.
function _requireAdminSender() internal view override {
if (LibOptimismUpgradeable.crossChainSender(MESSENGER) != crossDomainAdmin) revert NotCrossDomainAdmin();
if (msg.sender != crossDomainAdmin) revert NotCrossDomainAdmin();
}

// Reserve storage slots for future versions of this base contract to add state variables without
Expand Down
13 changes: 8 additions & 5 deletions contracts/SpokePool.sol
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import "@openzeppelin/contracts/utils/cryptography/SignatureChecker.sol";
import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
import "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
import "@openzeppelin/contracts/utils/math/SignedMath.sol";
import "forge-std/console2.sol";

/**
* @title SpokePool
Expand Down Expand Up @@ -892,12 +893,10 @@ abstract contract SpokePool is
* @param repaymentChainId Chain of SpokePool where relayer wants to be refunded after the challenge window has
* passed. Will receive inputAmount of the equivalent token to inputToken on the repayment chain.
*/
function fillV3Relay(V3RelayData calldata relayData, uint256 repaymentChainId)
public
override
nonReentrant
unpausedFills
function fillV3Relay(V3RelayData calldata relayData, uint256 repaymentChainId) public override // nonReentrant
// unpausedFills
{
console2.log("start");
// Exclusivity deadline is inclusive and is the latest timestamp that the exclusive relayer has sole right
// to fill the relay.
if (
Expand All @@ -906,6 +905,7 @@ abstract contract SpokePool is
) {
revert NotExclusiveRelayer();
}
console2.log("condition");

V3RelayExecutionParams memory relayExecution = V3RelayExecutionParams({
relay: relayData,
Expand All @@ -915,8 +915,10 @@ abstract contract SpokePool is
updatedMessage: relayData.message,
repaymentChainId: repaymentChainId
});
console2.log("params");

_fillRelayV3(relayExecution, msg.sender, false);
console2.log("post");
}

/**
Expand Down Expand Up @@ -1501,6 +1503,7 @@ abstract contract SpokePool is
address relayer,
bool isSlowFill
) internal {
console2.log("_fillRelay");
V3RelayData memory relayData = relayExecution.relay;

if (relayData.fillDeadline < getCurrentTime()) revert ExpiredFillDeadline();
Expand Down

0 comments on commit 106b990

Please sign in to comment.