Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion contracts/HubPool.sol
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,7 @@ contract HubPool is HubPoolInterface, Testable, Lockable, MultiCaller, Ownable {

// Calculate the unallocated accumulatedFees from the last time the contract was called.
function _getAccumulatedFees(uint256 undistributedLpFees, uint256 lastLpFeeUpdate) internal view returns (uint256) {
// accumulatedFees := min(undistributedLpFees * lpFeeRatePerSecond * timeFromLastInteraction ,undistributedLpFees)
// accumulatedFees := min(undistributedLpFees * lpFeeRatePerSecond * timeFromLastInteraction, undistributedLpFees)
// The min acts to pay out all fees in the case the equation returns more than the remaining a fees.
uint256 timeFromLastInteraction = getCurrentTime() - lastLpFeeUpdate;
uint256 maxUndistributedLpFees = (undistributedLpFees * lpFeeRatePerSecond * timeFromLastInteraction) / (1e18);
Expand Down
14 changes: 7 additions & 7 deletions contracts/SpokePool.sol
Original file line number Diff line number Diff line change
Expand Up @@ -105,40 +105,40 @@ abstract contract SpokePool is SpokePoolInterface, Testable, Lockable, MultiCall
uint256 amount,
uint256 totalFilledAmount,
uint256 fillAmount,
uint256 indexed repaymentChainId,
uint256 repaymentChainId,
uint256 originChainId,
uint64 relayerFeePct,
uint64 realizedLpFeePct,
uint32 depositId,
address destinationToken,
address indexed relayer,
address depositor,
address indexed depositor,
address recipient
);
event ExecutedSlowRelayRoot(
bytes32 indexed relayHash,
uint256 amount,
uint256 totalFilledAmount,
uint256 fillAmount,
uint256 originChainId,
uint256 indexed originChainId,
uint64 relayerFeePct,
uint64 realizedLpFeePct,
uint32 depositId,
address destinationToken,
address indexed caller,
address depositor,
address caller,
address indexed depositor,
address recipient
);
event RelayedRootBundle(uint32 indexed rootBundleId, bytes32 relayerRefundRoot, bytes32 slowRelayRoot);
event ExecutedRelayerRefundRoot(
uint256 amountToReturn,
uint256 chainId,
uint256 indexed chainId,
uint256[] refundAmounts,
uint32 indexed rootBundleId,
uint32 indexed leafId,
address l2TokenAddress,
address[] refundAddresses,
address indexed caller
address caller
);
event TokensBridged(
uint256 amountToReturn,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "across-smart-contracts-v2",
"name": "@across-protocol/contracts-v2",
"version": "0.0.1",
"main": "index.js",
"author": "UMA Team",
Expand Down