Skip to content

Commit

Permalink
make protocol buildable
Browse files Browse the repository at this point in the history
  • Loading branch information
Keszey Dániel authored and Keszey Dániel committed Jul 2, 2024
1 parent e19abba commit 576ddfd
Show file tree
Hide file tree
Showing 38 changed files with 1,887 additions and 11,788 deletions.
2 changes: 1 addition & 1 deletion packages/protocol/contracts/L1/BasedOperator.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

pragma solidity ^0.8.20;

import "lib/openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
import "../common/AddressResolver.sol";
import "../common/EssentialContract.sol";
import "../libs/LibAddress.sol";
Expand Down
6 changes: 3 additions & 3 deletions packages/protocol/contracts/L1/TaikoToken.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

pragma solidity ^0.8.20;

import "lib/openzeppelin-contracts-upgradeable/contracts/token/ERC20/ERC20Upgradeable.sol";
import "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";
import
"lib/openzeppelin-contracts-upgradeable/contracts/token/ERC20/extensions/ERC20SnapshotUpgradeable.sol";
"@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20SnapshotUpgradeable.sol";
import
"lib/openzeppelin-contracts-upgradeable/contracts/token/ERC20/extensions/ERC20VotesUpgradeable.sol";
"@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";
import "../common/EssentialContract.sol";

/// @title TaikoToken
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/contracts/L1/VerifierBattleRoyale.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import "./verifiers/IVerifier.sol";
import "./VerifierRegistry.sol";
import "./TaikoData.sol";

import "lib/openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
import "@openzeppelin/contracts/token/ERC20/IERC20.sol";

/// @title VerifierBattleRoyale
/// @notice A permissionless bounty to claim a reward for breaking a prover
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/contracts/L1/actors/PBSActor.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

pragma solidity ^0.8.20;

import "lib/openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
import "../../common/AddressResolver.sol";
import "../../libs/LibAddress.sol";
import "../TaikoData.sol";
Expand Down
125 changes: 0 additions & 125 deletions packages/protocol/contracts/L1/gov/TaikoGovernor.sol
View file

This file was deleted.

26 changes: 0 additions & 26 deletions packages/protocol/contracts/L1/gov/TaikoTimelockController.sol
View file

This file was deleted.

2 changes: 1 addition & 1 deletion packages/protocol/contracts/L1/verifiers/SgxVerifier.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

pragma solidity ^0.8.20;

import "lib/openzeppelin-contracts/contracts/utils/cryptography/ECDSA.sol";
import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
import "../../common/EssentialContract.sol";
import "../../thirdparty/LibBytesUtils.sol";

Check failure on line 11 in packages/protocol/contracts/L1/verifiers/SgxVerifier.sol

View workflow job for this annotation

GitHub Actions / codespell 

thirdparty ==> third party, third-party
import "../TaikoData.sol";
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/contracts/common/AddressResolver.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

pragma solidity ^0.8.20;

import "lib/openzeppelin-contracts/contracts/utils/Strings.sol";
import "@openzeppelin/contracts/utils/Strings.sol";
import "./AddressManager.sol";

/// @title AddressResolver
Expand Down
4 changes: 2 additions & 2 deletions packages/protocol/contracts/common/OwnerUUPSUpgradable.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

pragma solidity ^0.8.20;

import "lib/openzeppelin-contracts/contracts/proxy/utils/UUPSUpgradeable.sol";
import "lib/openzeppelin-contracts-upgradeable/contracts/access/OwnableUpgradeable.sol";
import "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";

/// @title OwnerUUPSUpgradable
/// @notice This contract serves as the base contract for many core components.
Expand Down
8 changes: 4 additions & 4 deletions packages/protocol/contracts/libs/LibAddress.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@

pragma solidity ^0.8.20;

import "lib/openzeppelin-contracts/contracts/utils/Address.sol";
import "lib/openzeppelin-contracts/contracts/utils/cryptography/ECDSA.sol";
import "lib/openzeppelin-contracts/contracts/utils/introspection/IERC165.sol";
import "lib/openzeppelin-contracts/contracts/interfaces/IERC1271.sol";
import "@openzeppelin/contracts/utils/Address.sol";
import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
import "@openzeppelin/contracts/utils/introspection/IERC165.sol";
import "@openzeppelin/contracts/interfaces/IERC1271.sol";

/// @title LibAddress
/// @dev Provides utilities for address-related operations.
Expand Down
4 changes: 2 additions & 2 deletions packages/protocol/contracts/libs/LibDeploy.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

pragma solidity ^0.8.20;

import "lib/openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Proxy.sol";
import "lib/openzeppelin-contracts-upgradeable/contracts/access/OwnableUpgradeable.sol";
import "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";

/// @title LibDeploy
/// @dev Provides utilities for deploying contracts
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/contracts/signal/SignalService.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

pragma solidity ^0.8.20;

import "lib/openzeppelin-contracts/contracts/utils/math/SafeCast.sol";
import "@openzeppelin/contracts/utils/math/SafeCast.sol";
import "../common/AuthorizableContract.sol";
import "../common/ICrossChainSync.sol";
import "../thirdparty/LibSecureMerkleTrie.sol";
Expand Down
6 changes: 3 additions & 3 deletions packages/protocol/contracts/team/TimelockTokenPool.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

pragma solidity ^0.8.20;

import "lib/openzeppelin-contracts/contracts/utils/cryptography/ECDSA.sol";
import "lib/openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
import "lib/openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
import "../common/EssentialContract.sol";

/// @title TimelockTokenPool
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/contracts/team/airdrop/ERC20Airdrop.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

pragma solidity ^0.8.20;

import "lib/openzeppelin-contracts-upgradeable/contracts/token/ERC20/ERC20Upgradeable.sol";
import "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";
import "./MerkleClaimable.sol";

/// @title ERC20Airdrop
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/contracts/team/airdrop/ERC20Airdrop2.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

pragma solidity ^0.8.20;

import "lib/openzeppelin-contracts-upgradeable/contracts/token/ERC20/ERC20Upgradeable.sol";
import "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";
import "../../libs/LibMath.sol";
import "./MerkleClaimable.sol";

Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/contracts/team/airdrop/ERC721Airdrop.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

pragma solidity ^0.8.20;

import "lib/openzeppelin-contracts-upgradeable/contracts/token/ERC721/ERC721Upgradeable.sol";
import "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";
import "./MerkleClaimable.sol";

/// @title ERC721Airdrop
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/contracts/team/airdrop/MerkleClaimable.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
pragma solidity ^0.8.20;

import { MerkleProofUpgradeable } from
"lib/openzeppelin-contracts-upgradeable/contracts/utils/cryptography/MerkleProofUpgradeable.sol";
"@openzeppelin/contracts-upgradeable/utils/cryptography/MerkleProofUpgradeable.sol";
import "../../common/EssentialContract.sol";

/// @title MerkleClaimable
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/contracts/test/erc20/FreeMintERC20.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

pragma solidity ^0.8.20;

import "lib/openzeppelin-contracts/contracts/token/ERC20/ERC20.sol";
import "@openzeppelin/contracts/token/ERC20/ERC20.sol";

// An ERC20 Token with a mint function anyone can call, for free, to receive
// 5 tokens.
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/contracts/test/erc20/MayFailFreeMintERC20.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

pragma solidity ^0.8.20;

import "lib/openzeppelin-contracts/contracts/token/ERC20/ERC20.sol";
import "@openzeppelin/contracts/token/ERC20/ERC20.sol";

// An ERC20 token for testing the Taiko Bridge on testnets.
// This token has 50% of failure on transfers so we can
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/contracts/test/erc20/RegularERC20.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pragma solidity ^0.8.20;

import "lib/openzeppelin-contracts/contracts/token/ERC20/ERC20.sol";
import "@openzeppelin/contracts/token/ERC20/ERC20.sol";

contract RegularERC20 is ERC20 {
constructor(uint256 initialSupply) ERC20("RegularERC20", "RGL") {
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/contracts/tokenvault/BaseVault.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// |_|\__,_|_|_\_\___/ |____\__,_|_.__/__/
pragma solidity ^0.8.20;

import "lib/openzeppelin-contracts-upgradeable/contracts/utils/introspection/IERC165Upgradeable.sol";
import "@openzeppelin/contracts-upgradeable/utils/introspection/IERC165Upgradeable.sol";
import "../bridge/IBridge.sol";
import "../common/EssentialContract.sol";
import "../libs/LibAddress.sol";
Expand Down
8 changes: 4 additions & 4 deletions packages/protocol/contracts/tokenvault/BridgedERC1155.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

pragma solidity ^0.8.20;

import "lib/openzeppelin-contracts/contracts/utils/Strings.sol";
import "lib/openzeppelin-contracts-upgradeable/contracts/token/ERC1155/ERC1155Upgradeable.sol";
import "@openzeppelin/contracts/utils/Strings.sol";
import "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";
import
"lib/openzeppelin-contracts-upgradeable/contracts/token/ERC1155/extensions/IERC1155MetadataURIUpgradeable.sol";
import "lib/openzeppelin-contracts-upgradeable/contracts/token/ERC1155/IERC1155Upgradeable.sol";
"@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/IERC1155MetadataURIUpgradeable.sol";
import "@openzeppelin/contracts-upgradeable/token/ERC1155/IERC1155Upgradeable.sol";
import "../common/EssentialContract.sol";
import "./LibBridgedToken.sol";

Expand Down
4 changes: 2 additions & 2 deletions packages/protocol/contracts/tokenvault/BridgedERC20.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
pragma solidity ^0.8.20;

import
"lib/openzeppelin-contracts-upgradeable/contracts/token/ERC20/extensions/IERC20MetadataUpgradeable.sol";
import "lib/openzeppelin-contracts/contracts/utils/Strings.sol";
"@openzeppelin/contracts-upgradeable/token/ERC20/extensions/IERC20MetadataUpgradeable.sol";
import "@openzeppelin/contracts/utils/Strings.sol";

import "./LibBridgedToken.sol";
import "./BridgedERC20Base.sol";
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/contracts/tokenvault/BridgedERC20Base.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

pragma solidity ^0.8.20;

import "lib/openzeppelin-contracts-upgradeable/contracts/token/ERC20/ERC20Upgradeable.sol";
import "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";
import "../common/EssentialContract.sol";
import "./IBridgedERC20.sol";

Expand Down
4 changes: 2 additions & 2 deletions packages/protocol/contracts/tokenvault/BridgedERC721.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

pragma solidity ^0.8.20;

import "lib/openzeppelin-contracts-upgradeable/contracts/token/ERC721/ERC721Upgradeable.sol";
import "lib/openzeppelin-contracts/contracts/utils/Strings.sol";
import "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";
import "@openzeppelin/contracts/utils/Strings.sol";
import "../common/EssentialContract.sol";
import "./LibBridgedToken.sol";

Expand Down
Loading

0 comments on commit 576ddfd

Please sign in to comment.