Skip to content

Commit c5b8a68

Browse files
committed
format contracts
Signed-off-by: Ihor Farion <ihor@umaproject.org>
1 parent 547ac31 commit c5b8a68

File tree

5 files changed

+25
-8
lines changed

5 files changed

+25
-8
lines changed

contracts/chain-adapters/Arbitrum_CustomGasToken_Adapter.sol

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ import { IERC20 } from "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol";
77
import { SafeERC20 } from "@openzeppelin/contracts-v4/token/ERC20/utils/SafeERC20.sol";
88
import { ITokenMessenger as ICCTPTokenMessenger } from "../external/interfaces/CCTPInterfaces.sol";
99
import { CircleCCTPAdapter, CircleDomainIds } from "../libraries/CircleCCTPAdapter.sol";
10-
import { ArbitrumERC20Bridge as ArbitrumL1ERC20Bridge, ArbitrumCustomGasTokenInbox as ArbitrumL1InboxLike, ArbitrumL1ERC20GatewayLike } from "../interfaces/ArbitrumBridge.sol";
10+
import {
11+
ArbitrumERC20Bridge as ArbitrumL1ERC20Bridge,
12+
ArbitrumCustomGasTokenInbox as ArbitrumL1InboxLike,
13+
ArbitrumL1ERC20GatewayLike
14+
} from "../interfaces/ArbitrumBridge.sol";
1115

1216
/**
1317
* @notice Interface for funder contract that this contract pulls from to pay for relayMessage()/relayTokens()

contracts/erc7683/ERC7683OrderDepositor.sol

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,20 @@ import "@openzeppelin/contracts-v4/utils/math/SafeCast.sol";
77
import "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol";
88
import "@openzeppelin/contracts-v4/token/ERC20/utils/SafeERC20.sol";
99

10-
import { Output, GaslessCrossChainOrder, OnchainCrossChainOrder, ResolvedCrossChainOrder, IOriginSettler, FillInstruction } from "./ERC7683.sol";
11-
import { AcrossOrderData, AcrossOriginFillerData, ERC7683Permit2Lib, ACROSS_ORDER_DATA_TYPE_HASH } from "./ERC7683Permit2Lib.sol";
10+
import {
11+
Output,
12+
GaslessCrossChainOrder,
13+
OnchainCrossChainOrder,
14+
ResolvedCrossChainOrder,
15+
IOriginSettler,
16+
FillInstruction
17+
} from "./ERC7683.sol";
18+
import {
19+
AcrossOrderData,
20+
AcrossOriginFillerData,
21+
ERC7683Permit2Lib,
22+
ACROSS_ORDER_DATA_TYPE_HASH
23+
} from "./ERC7683Permit2Lib.sol";
1224
import { AddressToBytes32, Bytes32ToAddress } from "../libraries/AddressConverters.sol";
1325

1426
/**

contracts/external/uma/core/contracts/merkle-distributor/implementation/MerkleDistributor.sol

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,7 @@ contract MerkleDistributor is MerkleDistributorInterface, Ownable {
196196
uint256 claimedWordIndex = accountIndex / 256;
197197
uint256 claimedBitIndex = accountIndex % 256;
198198
claimedBitMap[windowIndex][claimedWordIndex] =
199-
claimedBitMap[windowIndex][claimedWordIndex] |
200-
(1 << claimedBitIndex);
199+
claimedBitMap[windowIndex][claimedWordIndex] | (1 << claimedBitIndex);
201200
}
202201

203202
// Store new Merkle root at `windowindex`. Pull `rewardsDeposited` from caller to seed distribution for this root.

contracts/periphery/mintburn/ArbitraryEVMFlowExecutor.sol

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,7 @@ abstract contract ArbitraryEVMFlowExecutor {
171171
// Apply the bps to sponsor to the final amount to get the amount to sponsor, ceiling division.
172172
uint256 bpsToSponsorAdjusted = BPS_PRECISION_SCALAR - bpsToSponsor;
173173
extraFeesToSponsorFinalToken =
174-
(((finalAmount * BPS_PRECISION_SCALAR) + bpsToSponsorAdjusted - 1) / bpsToSponsorAdjusted) -
175-
finalAmount;
174+
(((finalAmount * BPS_PRECISION_SCALAR) + bpsToSponsorAdjusted - 1) / bpsToSponsorAdjusted) - finalAmount;
176175
}
177176

178177
/// @notice Allow contract to receive native tokens for arbitrary action execution

script/DeployArbitrumAdapter.s.sol

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ import { Arbitrum_Adapter } from "../contracts/chain-adapters/Arbitrum_Adapter.s
99
import { Constants } from "./utils/Constants.sol";
1010

1111
import { ITokenMessenger } from "../contracts/external/interfaces/CCTPInterfaces.sol";
12-
import { ArbitrumInboxLike as ArbitrumL1InboxLike, ArbitrumL1ERC20GatewayLike } from "../contracts/interfaces/ArbitrumBridge.sol";
12+
import {
13+
ArbitrumInboxLike as ArbitrumL1InboxLike,
14+
ArbitrumL1ERC20GatewayLike
15+
} from "../contracts/interfaces/ArbitrumBridge.sol";
1316

1417
// How to run:
1518
// 1. `source .env` where `.env` has MNEMONIC="x x x ... x" and ETHERSCAN_API_KEY="x" entries

0 commit comments

Comments
 (0)