Skip to content

Commit

Permalink
Minor audit fixes (#245)
Browse files Browse the repository at this point in the history
* Minor fixes

* Replace `Ownable` with `Ownable2StepUpgradeable`
  • Loading branch information
karim-en authored May 30, 2024
1 parent 34ab34f commit 7dfa6bf
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 7 deletions.
4 changes: 2 additions & 2 deletions erc20-bridge-token/contracts/BridgeToken.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
pragma solidity ^0.8.24;

import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";
import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol";
import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";

contract BridgeToken is
Initializable,
UUPSUpgradeable,
ERC20Upgradeable,
OwnableUpgradeable
Ownable2StepUpgradeable
{
string private _name;
string private _symbol;
Expand Down
2 changes: 1 addition & 1 deletion erc20-bridge-token/contracts/BridgeTokenFactory.sol
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ contract BridgeTokenFactory is

function withdraw(
string memory token,
uint256 amount,
uint128 amount,
string memory recipient
) external whenNotPaused(PAUSED_WITHDRAW) {
_checkWhitelistedToken(token, msg.sender);
Expand Down
2 changes: 0 additions & 2 deletions erc20-bridge-token/contracts/ProofConsumer.sol
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// SPDX-License-Identifier: GPL-3.0-or-later
pragma solidity ^0.8.24;

import "@openzeppelin/contracts/access/Ownable.sol";

import "rainbow-bridge-sol/nearprover/contracts/INearProver.sol";
import "rainbow-bridge-sol/nearprover/contracts/ProofDecoder.sol";
import "rainbow-bridge-sol/nearbridge/contracts/Borsh.sol";
Expand Down
2 changes: 0 additions & 2 deletions erc20-bridge-token/contracts/SelectivePausableUpgradable.sol
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ abstract contract SelectivePausableUpgradable is Initializable, ContextUpgradeab
*/
event Paused(address account, uint flags);

uint private _pausedFlags;

/**
* @dev Initializes the contract in unpaused state.
*/
Expand Down

0 comments on commit 7dfa6bf

Please sign in to comment.