Skip to content

Commit

Permalink
lint: run lint
Browse files Browse the repository at this point in the history
  • Loading branch information
QEDK committed Jan 11, 2024
1 parent 96149cd commit 3362f45
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 7 deletions.
4 changes: 3 additions & 1 deletion script/Deploy.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ contract GetProofMockScript is Script {
address impl = address(new AvailBridge());
AvailBridge bridge = AvailBridge(address(new TransparentUpgradeableProxy(impl, address(proxyAdmin), "")));
WrappedAvail avail = new WrappedAvail(address(bridge));
bridge.initialize(IWrappedAvail(address(avail)), admin, admin, IVectorx(0x5ac10644a873AAcd288775A90d6D0303496A4304));
bridge.initialize(
IWrappedAvail(address(avail)), admin, admin, IVectorx(0x5ac10644a873AAcd288775A90d6D0303496A4304)
);
vm.stopBroadcast();
}
}
26 changes: 21 additions & 5 deletions src/AvailBridge.sol
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,21 @@ import {Merkle} from "src/lib/Merkle.sol";
import {IWrappedAvail} from "src/interfaces/IWrappedAvail.sol";
import {IMessageReceiver} from "src/interfaces/IMessageReceiver.sol";
import {PausableUpgradeable} from "lib/openzeppelin-contracts-upgradeable/contracts/utils/PausableUpgradeable.sol";
import {AccessControlDefaultAdminRulesUpgradeable} from "lib/openzeppelin-contracts-upgradeable/contracts/access/extensions/AccessControlDefaultAdminRulesUpgradeable.sol";
import {AccessControlDefaultAdminRulesUpgradeable} from
"lib/openzeppelin-contracts-upgradeable/contracts/access/extensions/AccessControlDefaultAdminRulesUpgradeable.sol";

/**
* @author @QEDK (Avail)
* @title AvailBridge
* @notice An arbitrary message bridge between Avail <-> Ethereum
* @custom:security security@availproject.org
*/
contract AvailBridge is Initializable, ReentrancyGuardUpgradeable, PausableUpgradeable, AccessControlDefaultAdminRulesUpgradeable {
contract AvailBridge is
Initializable,
ReentrancyGuardUpgradeable,
PausableUpgradeable,
AccessControlDefaultAdminRulesUpgradeable
{
using Merkle for bytes32[];
using SafeERC20 for IERC20;

Expand Down Expand Up @@ -98,7 +104,10 @@ contract AvailBridge is Initializable, ReentrancyGuardUpgradeable, PausableUpgra
_;
}

function initialize(IWrappedAvail newAvail, address governance, address pauser, IVectorx newVectorx) external initializer {
function initialize(IWrappedAvail newAvail, address governance, address pauser, IVectorx newVectorx)
external
initializer
{
vectorx = newVectorx;
avail = newAvail;
__AccessControlDefaultAdminRules_init(0, governance);
Expand Down Expand Up @@ -133,7 +142,10 @@ contract AvailBridge is Initializable, ReentrancyGuardUpgradeable, PausableUpgra
* @param assetIds Asset IDs to update
* @param tokenAddresses Token addresses to update
*/
function updateTokens(bytes32[] calldata assetIds, address[] calldata tokenAddresses) external onlyRole(DEFAULT_ADMIN_ROLE) {
function updateTokens(bytes32[] calldata assetIds, address[] calldata tokenAddresses)
external
onlyRole(DEFAULT_ADMIN_ROLE)
{
if (assetIds.length != tokenAddresses.length) {
revert ArrayLengthMismatch();
}
Expand Down Expand Up @@ -306,7 +318,11 @@ contract AvailBridge is Initializable, ReentrancyGuardUpgradeable, PausableUpgra
* @param recipient Recipient of the asset on Avail
* @param amount Amount of ERC20 tokens to bridge
*/
function sendERC20(bytes32 assetId, bytes32 recipient, uint256 amount) external whenNotPaused checkDestAmt(recipient, amount) {
function sendERC20(bytes32 assetId, bytes32 recipient, uint256 amount)
external
whenNotPaused
checkDestAmt(recipient, amount)
{
address token = tokens[assetId];
if (token == address(0)) {
revert InvalidAssetId();
Expand Down
6 changes: 5 additions & 1 deletion test/AvailBridgeTest.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,11 @@ contract AvailBridgeTest is Test, MurkyBase {
}

function testRevertOnlyPauser_setPaused(bool status) external {
vm.expectRevert(abi.encodeWithSelector((IAccessControl.AccessControlUnauthorizedAccount.selector), msg.sender, keccak256("PAUSER_ROLE")));
vm.expectRevert(
abi.encodeWithSelector(
(IAccessControl.AccessControlUnauthorizedAccount.selector), msg.sender, keccak256("PAUSER_ROLE")
)
);
vm.prank(msg.sender);
bridge.setPaused(status);
}
Expand Down

0 comments on commit 3362f45

Please sign in to comment.