Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(protocol): fix issue introduced by short-imports #14972

Closed
wants to merge 2 commits into from
Closed

refactor(protocol): fix issue introduced by short-imports #14972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b3345c
long import form
dong77 Oct 16, 2023
776c92c
Update SignalService.sol
dong77 Oct 16, 2023
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
3 changes: 2 additions & 1 deletion packages/protocol/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,5 @@ broadcast
.vscode

#coverage
lcov.info
lcov.info
typechain-types
14 changes: 8 additions & 6 deletions packages/protocol/contracts/L1/TaikoToken.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,20 @@
pragma solidity ^0.8.20;

import { ERC20BurnableUpgradeable } from
"@ozu/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";
"lib/openzeppelin-contracts-upgradeable/contracts/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";
import { ERC20PermitUpgradeable } from
"@ozu/token/ERC20/extensions/draft-ERC20PermitUpgradeable.sol";
"lib/openzeppelin-contracts-upgradeable/contracts/token/ERC20/extensions/draft-ERC20PermitUpgradeable.sol";
import { ERC20SnapshotUpgradeable } from
"@ozu/token/ERC20/extensions/ERC20SnapshotUpgradeable.sol";
"lib/openzeppelin-contracts-upgradeable/contracts/token/ERC20/extensions/ERC20SnapshotUpgradeable.sol";
import {
ERC20Upgradeable,
IERC20Upgradeable
} from "@ozu/token/ERC20/ERC20Upgradeable.sol";
} from
"lib/openzeppelin-contracts-upgradeable/contracts/token/ERC20/ERC20Upgradeable.sol";
import { ERC20VotesUpgradeable } from
"@ozu/token/ERC20/extensions/ERC20VotesUpgradeable.sol";
import { PausableUpgradeable } from "@ozu/security/PausableUpgradeable.sol";
"lib/openzeppelin-contracts-upgradeable/contracts/token/ERC20/extensions/ERC20VotesUpgradeable.sol";
import { PausableUpgradeable } from
"lib/openzeppelin-contracts-upgradeable/contracts/security/PausableUpgradeable.sol";

import { EssentialContract } from "../common/EssentialContract.sol";
import { IMintableERC20 } from "../common/IMintableERC20.sol";
Expand Down
3 changes: 2 additions & 1 deletion packages/protocol/contracts/L1/libs/LibProposing.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

pragma solidity ^0.8.20;

import { ERC20Upgradeable } from "@ozu/token/ERC20/ERC20Upgradeable.sol";
import { ERC20Upgradeable } from
"lib/openzeppelin-contracts-upgradeable/contracts/token/ERC20/ERC20Upgradeable.sol";

import { AddressResolver } from "../../common/AddressResolver.sol";
import { LibAddress } from "../../libs/LibAddress.sol";
Expand Down
3 changes: 2 additions & 1 deletion packages/protocol/contracts/common/AddressManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

pragma solidity ^0.8.20;

import { OwnableUpgradeable } from "@ozu/access/OwnableUpgradeable.sol";
import { OwnableUpgradeable } from
"lib/openzeppelin-contracts-upgradeable/contracts/access/OwnableUpgradeable.sol";

import { Proxied } from "./Proxied.sol";

Expand Down
5 changes: 3 additions & 2 deletions packages/protocol/contracts/common/EssentialContract.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@

pragma solidity ^0.8.20;

import { OwnableUpgradeable } from "@ozu/access/OwnableUpgradeable.sol";
import { OwnableUpgradeable } from
"lib/openzeppelin-contracts-upgradeable/contracts/access/OwnableUpgradeable.sol";
import { ReentrancyGuardUpgradeable } from
"@ozu/security/ReentrancyGuardUpgradeable.sol";
"lib/openzeppelin-contracts-upgradeable/contracts/security/ReentrancyGuardUpgradeable.sol";

import { AddressResolver } from "./AddressResolver.sol";

Expand Down
3 changes: 2 additions & 1 deletion packages/protocol/contracts/common/IMintableERC20.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

pragma solidity ^0.8.20;

import { IERC20Upgradeable } from "@ozu/token/ERC20/IERC20Upgradeable.sol";
import { IERC20Upgradeable } from
"lib/openzeppelin-contracts-upgradeable/contracts/token/ERC20/IERC20Upgradeable.sol";

/// @title IMintableERC20
/// @notice Interface for ERC20 tokens with mint and burn functionality.
Expand Down
3 changes: 2 additions & 1 deletion packages/protocol/contracts/common/Proxied.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

pragma solidity ^0.8.20;

import { Initializable } from "@ozu/proxy/utils/Initializable.sol";
import { Initializable } from
"lib/openzeppelin-contracts-upgradeable/contracts/proxy/utils/Initializable.sol";

/// @title Proxied
/// @dev This abstract contract extends Initializable from OpenZeppelin's
Expand Down
11 changes: 7 additions & 4 deletions packages/protocol/contracts/libs/LibAddress.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@

pragma solidity ^0.8.20;

import { AddressUpgradeable } from "@ozu/utils/AddressUpgradeable.sol";
import { ECDSAUpgradeable } from "@ozu/utils/cryptography/ECDSAUpgradeable.sol";
import { AddressUpgradeable } from
"lib/openzeppelin-contracts-upgradeable/contracts/utils/AddressUpgradeable.sol";
import { ECDSAUpgradeable } from
"lib/openzeppelin-contracts-upgradeable/contracts/utils/cryptography/ECDSAUpgradeable.sol";
import { IERC165Upgradeable } from
"@ozu/utils/introspection/IERC165Upgradeable.sol";
import { IERC1271Upgradeable } from "@ozu/interfaces/IERC1271Upgradeable.sol";
"lib/openzeppelin-contracts-upgradeable/contracts/utils/introspection/IERC165Upgradeable.sol";
import { IERC1271Upgradeable } from
"lib/openzeppelin-contracts-upgradeable/contracts/interfaces/IERC1271Upgradeable.sol";

/// @title LibAddress
/// @dev Provides utilities for address-related operations.
Expand Down
5 changes: 4 additions & 1 deletion packages/protocol/contracts/signal/SignalService.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,10 @@ contract SignalService is EssentialContract, ISignalService {
{
if (skipProofCheck()) return true;

if (app == address(0) || signal == 0 || srcChainId == 0 || srcChainId == block.chainid) {
if (
app == address(0) || signal == 0 || srcChainId == 0
|| srcChainId == block.chainid
) {
return false;
}

Expand Down
3 changes: 2 additions & 1 deletion packages/protocol/contracts/test/erc20/FreeMintERC20.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

pragma solidity ^0.8.20;

import { ERC20 } from "@oz/token/ERC20/ERC20.sol";
import { ERC20 } from
"lib/openzeppelin-contracts/contracts/token/ERC20/ERC20.sol";

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

pragma solidity ^0.8.20;

import { ERC20 } from "@oz/token/ERC20/ERC20.sol";
import { ERC20 } from
"lib/openzeppelin-contracts/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
3 changes: 2 additions & 1 deletion packages/protocol/contracts/test/erc20/RegularERC20.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

pragma solidity ^0.8.20;

import { ERC20 } from "@oz/token/ERC20/ERC20.sol";
import { ERC20 } from
"lib/openzeppelin-contracts/contracts/token/ERC20/ERC20.sol";

contract RegularERC20 is ERC20 {
constructor(uint256 initialSupply) ERC20("RegularERC20", "RGL") {
Expand Down
11 changes: 7 additions & 4 deletions packages/protocol/contracts/tokenvault/BridgedERC1155.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@

pragma solidity ^0.8.20;

import { ERC1155Upgradeable } from "@ozu/token/ERC1155/ERC1155Upgradeable.sol";
import { ERC1155Upgradeable } from
"lib/openzeppelin-contracts-upgradeable/contracts/token/ERC1155/ERC1155Upgradeable.sol";
import { IERC1155MetadataURIUpgradeable } from
"@ozu/token/ERC1155/extensions/IERC1155MetadataURIUpgradeable.sol";
import { IERC1155Upgradeable } from "@ozu/token/ERC1155/IERC1155Upgradeable.sol";
import { StringsUpgradeable } from "@ozu/utils/StringsUpgradeable.sol";
"lib/openzeppelin-contracts-upgradeable/contracts/token/ERC1155/extensions/IERC1155MetadataURIUpgradeable.sol";
import { IERC1155Upgradeable } from
"lib/openzeppelin-contracts-upgradeable/contracts/token/ERC1155/IERC1155Upgradeable.sol";
import { StringsUpgradeable } from
"lib/openzeppelin-contracts-upgradeable/contracts/utils/StringsUpgradeable.sol";

import { EssentialContract } from "../common/EssentialContract.sol";
import { Proxied } from "../common/Proxied.sol";
Expand Down
8 changes: 5 additions & 3 deletions packages/protocol/contracts/tokenvault/BridgedERC20.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@ pragma solidity ^0.8.20;
import {
ERC20Upgradeable,
IERC20Upgradeable
} from "@ozu/token/ERC20/ERC20Upgradeable.sol";
} from
"lib/openzeppelin-contracts-upgradeable/contracts/token/ERC20/ERC20Upgradeable.sol";
import { IERC20MetadataUpgradeable } from
"@ozu/token/ERC20/extensions/IERC20MetadataUpgradeable.sol";
import { StringsUpgradeable } from "@ozu/utils/StringsUpgradeable.sol";
"lib/openzeppelin-contracts-upgradeable/contracts/token/ERC20/extensions/IERC20MetadataUpgradeable.sol";
import { StringsUpgradeable } from
"lib/openzeppelin-contracts-upgradeable/contracts/utils/StringsUpgradeable.sol";

import { EssentialContract } from "../common/EssentialContract.sol";
import { IMintableERC20 } from "../common/IMintableERC20.sol";
Expand Down
6 changes: 4 additions & 2 deletions packages/protocol/contracts/tokenvault/BridgedERC721.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@

pragma solidity ^0.8.20;

import { ERC721Upgradeable } from "@ozu/token/ERC721/ERC721Upgradeable.sol";
import { StringsUpgradeable } from "@ozu/utils/StringsUpgradeable.sol";
import { ERC721Upgradeable } from
"lib/openzeppelin-contracts-upgradeable/contracts/token/ERC721/ERC721Upgradeable.sol";
import { StringsUpgradeable } from
"lib/openzeppelin-contracts-upgradeable/contracts/utils/StringsUpgradeable.sol";

import { EssentialContract } from "../common/EssentialContract.sol";
import { Proxied } from "../common/Proxied.sol";
Expand Down
9 changes: 6 additions & 3 deletions packages/protocol/contracts/tokenvault/ERC1155Vault.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,18 @@

pragma solidity ^0.8.20;

import { Create2Upgradeable } from "@ozu/utils/Create2Upgradeable.sol";
import { Create2Upgradeable } from
"lib/openzeppelin-contracts-upgradeable/contracts/utils/Create2Upgradeable.sol";
import {
ERC1155ReceiverUpgradeable,
IERC1155ReceiverUpgradeable
} from "@ozu/token/ERC1155/utils/ERC1155ReceiverUpgradeable.sol";
} from
"lib/openzeppelin-contracts-upgradeable/contracts/token/ERC1155/utils/ERC1155ReceiverUpgradeable.sol";
import {
ERC1155Upgradeable,
IERC1155Upgradeable
} from "@ozu/token/ERC1155/ERC1155Upgradeable.sol";
} from
"lib/openzeppelin-contracts-upgradeable/contracts/token/ERC1155/ERC1155Upgradeable.sol";

import { Proxied } from "../common/Proxied.sol";
import { IBridge, IRecallableSender } from "../bridge/IBridge.sol";
Expand Down
10 changes: 6 additions & 4 deletions packages/protocol/contracts/tokenvault/ERC20Vault.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@

pragma solidity ^0.8.20;

import { Create2Upgradeable } from "@ozu/utils/Create2Upgradeable.sol";
import { ERC20Upgradeable } from "@ozu/token/ERC20/ERC20Upgradeable.sol";
import { Create2Upgradeable } from
"lib/openzeppelin-contracts-upgradeable/contracts/utils/Create2Upgradeable.sol";
import { ERC20Upgradeable } from
"lib/openzeppelin-contracts-upgradeable/contracts/token/ERC20/ERC20Upgradeable.sol";
import { SafeERC20Upgradeable } from
"@ozu/token/ERC20/utils/SafeERC20Upgradeable.sol";
"lib/openzeppelin-contracts-upgradeable/contracts/token/ERC20/utils/SafeERC20Upgradeable.sol";
import { IERC165Upgradeable } from
"@ozu/utils/introspection/IERC165Upgradeable.sol";
"lib/openzeppelin-contracts-upgradeable/contracts/utils/introspection/IERC165Upgradeable.sol";

import { EssentialContract } from "../common/EssentialContract.sol";
import { IMintableERC20 } from "../common/IMintableERC20.sol";
Expand Down
10 changes: 6 additions & 4 deletions packages/protocol/contracts/tokenvault/ERC721Vault.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,17 @@

pragma solidity ^0.8.20;

import { Create2Upgradeable } from "@ozu/utils/Create2Upgradeable.sol";
import { Create2Upgradeable } from
"lib/openzeppelin-contracts-upgradeable/contracts/utils/Create2Upgradeable.sol";
import {
ERC721Upgradeable,
IERC721Upgradeable
} from "@ozu/token/ERC721/ERC721Upgradeable.sol";
} from
"lib/openzeppelin-contracts-upgradeable/contracts/token/ERC721/ERC721Upgradeable.sol";
import { IERC165Upgradeable } from
"@ozu/utils/introspection/IERC165Upgradeable.sol";
"lib/openzeppelin-contracts-upgradeable/contracts/utils/introspection/IERC165Upgradeable.sol";
import { IERC721ReceiverUpgradeable } from
"@ozu/token/ERC721/IERC721ReceiverUpgradeable.sol";
"lib/openzeppelin-contracts-upgradeable/contracts/token/ERC721/IERC721ReceiverUpgradeable.sol";

import { IBridge, IRecallableSender } from "../bridge/IBridge.sol";
import { LibAddress } from "../libs/LibAddress.sol";
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/contracts/tokenvault/libs/LibVaultUtils.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
pragma solidity ^0.8.20;

import { TransparentUpgradeableProxy } from
"@oz/proxy/transparent/TransparentUpgradeableProxy.sol";
"lib/openzeppelin-contracts/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";

import { AddressResolver } from "../../common/AddressResolver.sol";
import { IBridge } from "../../bridge/IBridge.sol";
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/genesis/GenerateGenesis.g.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { console2 } from "forge-std/console2.sol";
import { stdJson } from "forge-std/StdJson.sol";
import { Test } from "forge-std/Test.sol";

import { TransparentUpgradeableProxy } from "@oz/proxy/transparent/TransparentUpgradeableProxy.sol";
import { TransparentUpgradeableProxy } from "lib/openzeppelin-contracts/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";

import { AddressManager } from "../contracts/common/AddressManager.sol";
import { AddressResolver } from "../contracts/common/AddressResolver.sol";
Expand Down
2 changes: 0 additions & 2 deletions packages/protocol/remappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
forge-std/=lib/forge-std/src/
solmate/=lib/solmate/src/
ds-test/=lib/forge-std/lib/ds-test/src/
@oz/=lib/openzeppelin-contracts/contracts/
@ozu/=lib/openzeppelin-contracts-upgradeable/contracts/
5 changes: 3 additions & 2 deletions packages/protocol/script/DeployOnL1.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ pragma solidity ^0.8.20;

import "forge-std/Script.sol";
import "forge-std/console2.sol";
import "@oz/proxy/transparent/TransparentUpgradeableProxy.sol";
import "@oz/utils/Strings.sol";
import
"lib/openzeppelin-contracts/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
import "lib/openzeppelin-contracts/contracts/utils/Strings.sol";
import "../contracts/L1/TaikoToken.sol";
import "../contracts/L1/TaikoL1.sol";
import "../contracts/L1/verifiers/PseZkVerifier.sol";
Expand Down
3 changes: 2 additions & 1 deletion packages/protocol/script/upgrade/UpgradeScript.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ pragma solidity ^0.8.20;

import "forge-std/Script.sol";
import "forge-std/console2.sol";
import "@oz/proxy/transparent/TransparentUpgradeableProxy.sol";
import
"lib/openzeppelin-contracts/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";

contract UpgradeScript is Script {
uint256 public deployerPrivateKey = vm.envUint("PRIVATE_KEY");
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/test/L1/TaikoL1TestBase.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { OptimisticRollupConfigProvider } from
import { PseZkVerifier } from "../../contracts/L1/verifiers/PseZkVerifier.sol";
import { SignalService } from "../../contracts/signal/SignalService.sol";
import { StringsUpgradeable as Strings } from
"@ozu/utils/StringsUpgradeable.sol";
"lib/openzeppelin-contracts-upgradeable/contracts/utils/StringsUpgradeable.sol";
import { AddressResolver } from "../../contracts/common/AddressResolver.sol";
import { LibTiers } from "../../contracts/L1/tiers/ITierProvider.sol";

Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/test/L1/TaikoToken.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { AddressManager } from "../../contracts/common/AddressManager.sol";
import { AddressResolver } from "../../contracts/common/AddressResolver.sol";
import { TaikoToken } from "../../contracts/L1/TaikoToken.sol";
import { TransparentUpgradeableProxy } from
"@oz/proxy/transparent/TransparentUpgradeableProxy.sol";
"lib/openzeppelin-contracts/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";

contract TaikoTokenTest is TestBase {
bytes32 GENESIS_BLOCK_HASH;
Expand Down
5 changes: 3 additions & 2 deletions packages/protocol/test/L2/TaikoL2.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ pragma solidity ^0.8.20;
import { console2 } from "forge-std/console2.sol";
import { AddressManager } from "../../contracts/common/AddressManager.sol";
import { SignalService } from "../../contracts/signal/SignalService.sol";
import { Strings } from "@oz/utils/Strings.sol";
import { SafeCastUpgradeable } from "@ozu/utils/math/SafeCastUpgradeable.sol";
import { Strings } from "lib/openzeppelin-contracts/contracts/utils/Strings.sol";
import { SafeCastUpgradeable } from
"lib/openzeppelin-contracts-upgradeable/contracts/utils/math/SafeCastUpgradeable.sol";
import { TestBase } from "../TestBase.sol";
import { TaikoL2 } from "../../contracts/L2/TaikoL2.sol";

Expand Down
8 changes: 5 additions & 3 deletions packages/protocol/test/tokenvault/ERC1155Vault.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ import { BridgedERC1155 } from "../../contracts/tokenvault/BridgedERC1155.sol";
import { EtherVault } from "../../contracts/bridge/EtherVault.sol";
import { SignalService } from "../../contracts/signal/SignalService.sol";
import { ICrossChainSync } from "../../contracts/common/ICrossChainSync.sol";
import { ERC1155 } from "@oz/token/ERC1155/ERC1155.sol";
import { ERC1155 } from
"lib/openzeppelin-contracts/contracts/token/ERC1155/ERC1155.sol";
import { TransparentUpgradeableProxy } from
"@oz/proxy/transparent/TransparentUpgradeableProxy.sol";
"lib/openzeppelin-contracts/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";

contract TestTokenERC1155 is ERC1155 {
constructor(string memory baseURI) ERC1155(baseURI) { }
Expand Down Expand Up @@ -122,7 +123,8 @@ contract ERC1155VaultTest is TestBase {
uint256 destChainId = 19_389;

//Need +1 bc. and Amelia is the proxied bridge contracts owner
//Change will cause onMessageRecall() test fails, because of getPreDeterminedDataBytes
//Change will cause onMessageRecall() test fails, because of
// getPreDeterminedDataBytes
address public Amelia = 0x60081b12838240B1ba02B3177153Bca678a86081;

function setUp() public {
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/test/tokenvault/ERC20Vault.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { TaikoToken } from "../../contracts/L1/TaikoToken.sol";
import { Test } from "forge-std/Test.sol";
import { ERC20Vault } from "../../contracts/tokenvault/ERC20Vault.sol";
import { TransparentUpgradeableProxy } from
"@oz/proxy/transparent/TransparentUpgradeableProxy.sol";
"lib/openzeppelin-contracts/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";

// PrankDestBridge lets us simulate a transaction to the ERC20Vault
// from a named Bridge, without having to test/run through the real Bridge code,
Expand Down
8 changes: 5 additions & 3 deletions packages/protocol/test/tokenvault/ERC721Vault.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ import { BridgedERC721 } from "../../contracts/tokenvault/BridgedERC721.sol";
import { EtherVault } from "../../contracts/bridge/EtherVault.sol";
import { SignalService } from "../../contracts/signal/SignalService.sol";
import { ICrossChainSync } from "../../contracts/common/ICrossChainSync.sol";
import { ERC721 } from "@oz/token/ERC721/ERC721.sol";
import { ERC721 } from
"lib/openzeppelin-contracts/contracts/token/ERC721/ERC721.sol";
import { TransparentUpgradeableProxy } from
"@oz/proxy/transparent/TransparentUpgradeableProxy.sol";
"lib/openzeppelin-contracts/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";

contract TestTokenERC721 is ERC721 {
string _baseTokenURI;
Expand Down Expand Up @@ -142,7 +143,8 @@ contract ERC721VaultTest is TestBase {
uint256 destChainId = 19_389;

//Need +1 bc. and Amelia is the proxied bridge contracts owner
//Change will cause onMessageRecall() test fails, because of getPreDeterminedDataBytes
//Change will cause onMessageRecall() test fails, because of
// getPreDeterminedDataBytes
address public constant Amelia = 0x60081B12838240B1BA02b3177153BCa678A86080;

function setUp() public {
Expand Down
Loading