@@ -509,14 +509,6 @@ abstract contract EvmHost is IIsmpHost, IHostManager, Context {
509509 return _hostParams.stateCommitmentFee;
510510 }
511511
512- /**
513- * @dev Returns the fisherman responsible for vetoing the given state machine height.
514- * @return the `fisherman` address
515- */
516- function vetoes (uint256 paraId , uint256 height ) external view returns (address ) {
517- return _vetoes[paraId][height];
518- }
519-
520512 /**
521513 * @dev Returns the nonce immediately available for requests
522514 * @return the `nonce`
@@ -525,51 +517,6 @@ abstract contract EvmHost is IIsmpHost, IHostManager, Context {
525517 return _nonce;
526518 }
527519
528- /**
529- * @notice Charges the stateCommitmentFee to 3rd party applications.
530- * If native tokens are provided, will attempt to swap them for the stateCommitmentFee.
531- * If not enough native tokens are supplied, will revert.
532- *
533- * If no native tokens are provided then it will try to collect payment from the calling contract in
534- * the IIsmpHost.feeToken.
535- *
536- * @param height - state machine height
537- * @return the state commitment at `height`
538- */
539- function stateMachineCommitment (
540- StateMachineHeight memory height
541- ) external payable returns (StateCommitment memory ) {
542- address caller = _msgSender ();
543- if (caller != _hostParams.handler) {
544- uint256 fee = _hostParams.stateCommitmentFee;
545- if (msg .value > 0 ) {
546- address [] memory path = new address [](2 );
547- address uniswapV2 = _hostParams.uniswapV2;
548- path[0 ] = IUniswapV2Router02 (uniswapV2).WETH ();
549- path[1 ] = feeToken ();
550- IUniswapV2Router02 (uniswapV2).swapETHForExactTokens {value: msg .value }(
551- fee,
552- path,
553- address (this ),
554- block .timestamp
555- );
556- } else {
557- SafeERC20.safeTransferFrom (IERC20 (feeToken ()), caller, address (this ), fee);
558- }
559- emit StateCommitmentRead ({caller: caller, fee: fee});
560- }
561-
562- return _stateCommitments[height.stateMachineId][height.height];
563- }
564-
565- /**
566- * @param height - state machine height
567- * @return the state machine update time at `height`
568- */
569- function stateMachineCommitmentUpdateTime (StateMachineHeight memory height ) external view returns (uint256 ) {
570- return _stateCommitmentsUpdateTime[height.stateMachineId][height.height];
571- }
572-
573520 /**
574521 * @dev Should return a handle to the consensus client based on the id
575522 * @return the consensus client contract
@@ -599,6 +546,13 @@ abstract contract EvmHost is IIsmpHost, IHostManager, Context {
599546 return _hostParams.challengePeriod;
600547 }
601548
549+ /**
550+ * @return the unstaking period
551+ */
552+ function unStakingPeriod () external view returns (uint256 ) {
553+ return _hostParams.unStakingPeriod;
554+ }
555+
602556 /**
603557 * @dev Check the response status for a given request.
604558 * @param commitment - commitment to the request
@@ -615,13 +569,6 @@ abstract contract EvmHost is IIsmpHost, IHostManager, Context {
615569 return _latestStateMachineHeight[id];
616570 }
617571
618- /**
619- * @return the unstaking period
620- */
621- function unStakingPeriod () external view returns (uint256 ) {
622- return _hostParams.unStakingPeriod;
623- }
624-
625572 /**
626573 * @param commitment - commitment to the request
627574 * @return existence status of an incoming request commitment
@@ -654,6 +601,59 @@ abstract contract EvmHost is IIsmpHost, IHostManager, Context {
654601 return _responseCommitments[commitment];
655602 }
656603
604+ /**
605+ * @dev Returns the fisherman responsible for vetoing the given state machine height.
606+ * @return the `fisherman` address
607+ */
608+ function vetoes (uint256 paraId , uint256 height ) external view returns (address ) {
609+ return _vetoes[paraId][height];
610+ }
611+
612+ /**
613+ * @param height - state machine height
614+ * @return the state machine update time at `height`
615+ */
616+ function stateMachineCommitmentUpdateTime (StateMachineHeight memory height ) external view returns (uint256 ) {
617+ return _stateCommitmentsUpdateTime[height.stateMachineId][height.height];
618+ }
619+
620+ /**
621+ * @notice Charges the stateCommitmentFee to 3rd party applications.
622+ * If native tokens are provided, will attempt to swap them for the stateCommitmentFee.
623+ * If not enough native tokens are supplied, will revert.
624+ *
625+ * If no native tokens are provided then it will try to collect payment from the calling contract in
626+ * the IIsmpHost.feeToken.
627+ *
628+ * @param height - state machine height
629+ * @return the state commitment at `height`
630+ */
631+ function stateMachineCommitment (
632+ StateMachineHeight memory height
633+ ) external payable returns (StateCommitment memory ) {
634+ address caller = _msgSender ();
635+ if (caller != _hostParams.handler) {
636+ uint256 fee = _hostParams.stateCommitmentFee;
637+ if (msg .value > 0 ) {
638+ address [] memory path = new address [](2 );
639+ address uniswapV2 = _hostParams.uniswapV2;
640+ path[0 ] = IUniswapV2Router02 (uniswapV2).WETH ();
641+ path[1 ] = feeToken ();
642+ IUniswapV2Router02 (uniswapV2).swapETHForExactTokens {value: msg .value }(
643+ fee,
644+ path,
645+ address (this ),
646+ block .timestamp
647+ );
648+ } else {
649+ SafeERC20.safeTransferFrom (IERC20 (feeToken ()), caller, address (this ), fee);
650+ }
651+ emit StateCommitmentRead ({caller: caller, fee: fee});
652+ }
653+
654+ return _stateCommitments[height.stateMachineId][height.height];
655+ }
656+
657657 /**
658658 * @dev Updates the HostParams, can only be called by cross-chain governance
659659 * @param params, the new host params.
@@ -705,7 +705,7 @@ abstract contract EvmHost is IIsmpHost, IHostManager, Context {
705705 address (params.consensusClient).code.length == 0 ||
706706 ! IERC165 (params.consensusClient).supportsInterface (type (IConsensusClient).interfaceId)
707707 ) {
708- // otherwise cannot process new datagrams
708+ // otherwise cannot process new consensus datagrams
709709 revert InvalidConsensusClient ();
710710 }
711711 uint256 stateMachinesLen = params.stateMachines.length ;
@@ -1189,6 +1189,18 @@ abstract contract EvmHost is IIsmpHost, IHostManager, Context {
11891189 * @return commitment - the request commitment
11901190 */
11911191 function dispatch (DispatchPostResponse memory post ) external payable notFrozen returns (bytes32 commitment ) {
1192+ bytes32 receipt = post.request.hash ();
1193+ address caller = _msgSender ();
1194+
1195+ // known request?
1196+ if (_requestReceipts[receipt] == address (0 )) revert UnknownRequest ();
1197+
1198+ // check that the authorized application is issuing this response
1199+ if (_bytesToAddress (post.request.to) != caller) revert UnauthorizedResponse ();
1200+
1201+ // check that request has not already been respond to
1202+ if (_responded[receipt]) revert DuplicateResponse ();
1203+
11921204 // minimum charge is the size of one word
11931205 uint256 length = 32 > post.response.length ? 32 : post.response.length ;
11941206 uint256 fee = (_hostParams.perByteFee * length) + post.fee;
@@ -1208,18 +1220,6 @@ abstract contract EvmHost is IIsmpHost, IHostManager, Context {
12081220 SafeERC20.safeTransferFrom (IERC20 (feeToken ()), _msgSender (), address (this ), fee);
12091221 }
12101222
1211- bytes32 receipt = post.request.hash ();
1212- address caller = _msgSender ();
1213-
1214- // known request?
1215- if (_requestReceipts[receipt] == address (0 )) revert UnknownRequest ();
1216-
1217- // check that the authorized application is issuing this response
1218- if (_bytesToAddress (post.request.to) != caller) revert UnauthorizedResponse ();
1219-
1220- // check that request has not already been respond to
1221- if (_responded[receipt]) revert DuplicateResponse ();
1222-
12231223 // adjust the timeout
12241224 uint256 timeout = _hostParams.defaultTimeout > post.timeout ? _hostParams.defaultTimeout : post.timeout;
12251225 uint64 timeoutTimestamp = post.timeout == 0 ? 0 : uint64 (block .timestamp ) + uint64 (timeout);
0 commit comments