refactor: rename src to contracts

v2/src/evm/ERC20Custody.sol → v2/contracts/evm/ERC20Custody.sol

@@ -4,7 +4,7 @@ pragma solidity 0.8.26;
 import { IERC20Custody } from "./interfaces/IERC20Custody.sol";
 import { IGatewayEVM } from "./interfaces/IGatewayEVM.sol";
 
-import { RevertContext } from "src/Revert.sol";
+import { RevertContext } from "../../contracts/Revert.sol";
 
 import "@openzeppelin/contracts/access/AccessControl.sol";
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";

v2/src/evm/GatewayEVM.sol → v2/contracts/evm/GatewayEVM.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
+import { RevertContext, RevertOptions, Revertable } from "../../contracts/Revert.sol";
 import { ZetaConnectorBase } from "./ZetaConnectorBase.sol";
 import { IERC20Custody } from "./interfaces/IERC20Custody.sol";
 import { IGatewayEVM } from "./interfaces/IGatewayEVM.sol";
-import { RevertContext, RevertOptions, Revertable } from "src/Revert.sol";
 
 import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";

v2/src/evm/ZetaConnectorBase.sol → v2/contracts/evm/ZetaConnectorBase.sol

@@ -7,9 +7,9 @@ import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import "@openzeppelin/contracts/utils/Pausable.sol";
 import "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
 
-import { RevertContext } from "src/Revert.sol";
-import { IGatewayEVM, IGatewayEVMErrors, IGatewayEVMEvents } from "src/evm/interfaces/IGatewayEVM.sol";
-import "src/evm/interfaces/IZetaConnector.sol";
+import { RevertContext } from "../../contracts/Revert.sol";
+import { IGatewayEVM, IGatewayEVMErrors, IGatewayEVMEvents } from "../../contracts/evm/interfaces/IGatewayEVM.sol";
+import "../../contracts/evm/interfaces/IZetaConnector.sol";
 
 /// @title ZetaConnectorBase
 /// @notice Abstract base contract for ZetaConnector.

v2/src/evm/interfaces/IERC20Custody.sol → v2/contracts/evm/interfaces/IERC20Custody.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import { RevertContext } from "src/Revert.sol";
+import { RevertContext } from "../../../contracts/Revert.sol";
 
 /// @title IERC20CustodyEvents
 /// @notice Interface for the events emitted by the ERC20 custody contract.

v2/src/evm/interfaces/IGatewayEVM.sol → v2/contracts/evm/interfaces/IGatewayEVM.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import "src/Revert.sol";
+import "../../../contracts/Revert.sol";
 
 /// @title IGatewayEVMEvents
 /// @notice Interface for the events emitted by the GatewayEVM contract.

v2/src/evm/interfaces/IZetaConnector.sol → v2/contracts/evm/interfaces/IZetaConnector.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import { RevertContext } from "src/Revert.sol";
+import { RevertContext } from "../../../contracts/Revert.sol";
 
 /// @title IZetaConnectorEvents
 /// @notice Interface for the events emitted by the ZetaConnector contracts.

v2/src/zevm/GatewayZEVM.sol → v2/contracts/zevm/GatewayZEVM.sol

@@ -3,13 +3,13 @@ pragma solidity 0.8.26;
 
 import { IGatewayZEVM } from "./interfaces/IGatewayZEVM.sol";
 
+import { RevertContext, RevertOptions } from "../../contracts/Revert.sol";
 import "./interfaces/IWZETA.sol";
 import { IZRC20 } from "./interfaces/IZRC20.sol";
 import { UniversalContract, zContext } from "./interfaces/UniversalContract.sol";
 import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
-import { RevertContext, RevertOptions } from "src/Revert.sol";
 
 import "@openzeppelin/contracts-upgradeable/utils/PausableUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/utils/ReentrancyGuardUpgradeable.sol";

v2/src/zevm/ZRC20.sol → v2/contracts/zevm/ZRC20.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import "src/zevm/interfaces/ISystem.sol";
-import "src/zevm/interfaces/IZRC20.sol";
+import "../../contracts/zevm/interfaces/ISystem.sol";
+import "../../contracts/zevm/interfaces/IZRC20.sol";
 
 /**
  * @dev Custom errors for ZRC20

v2/src/zevm/interfaces/IGatewayZEVM.sol → v2/contracts/zevm/interfaces/IGatewayZEVM.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
+import "../../../contracts/Revert.sol";
 import "./UniversalContract.sol";
-import "src/Revert.sol";
 
 /// @title IGatewayZEVMEvents
 /// @notice Interface for the events emitted by the GatewayZEVM contract.

v2/src/zevm/interfaces/UniversalContract.sol → v2/contracts/zevm/interfaces/UniversalContract.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import { RevertContext } from "src/Revert.sol";
+import { RevertContext } from "../../../contracts/Revert.sol";
 
 struct zContext {
     bytes origin;

v2/foundry.toml

@@ -1,11 +1,10 @@
 [profile.default]
-src = "src"
+src = "contracts"
 out = "out"
 libs = ["lib"]
 
 remappings = [
   "ds-test/=node_modules/ds-test/src",
-  "src/=src",
   "test/=test",
   "forge-std/=lib/forge-std/src/",
   "@openzeppelin/contracts/=lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts/contracts/",

v2/package.json

@@ -4,16 +4,18 @@
   "author": "zetachain",
   "files": [
     "abi",
-    "types"
+    "types",
+    "contracts"
   ],
   "scripts": {
-    "lint": "npx eslint . --ignore-pattern coverage/ --ignore-pattern coverage.json --ignore-pattern lib/ --ignore-pattern abi --ignore-pattern cache_forge/",
-    "lint:fix": "npx eslint . --fix --ignore-pattern coverage/ --ignore-pattern coverage.json --ignore-pattern lib/ --ignore-pattern abi --ignore-pattern cache_forge/",
+    "lint": "npx eslint . --ignore-pattern coverage/ --ignore-pattern coverage.json --ignore-pattern lib/ --ignore-pattern out --ignore-pattern cache_forge/",
+    "lint:fix": "npx eslint . --fix --ignore-pattern coverage/ --ignore-pattern coverage.json --ignore-pattern lib/ --ignore-pattern out --ignore-pattern cache_forge/",
     "localnet": "concurrently --names \"NODE,WORKER\" --prefix-colors \"blue.bold,green.bold\" \"anvil --auto-impersonate\" \"wait-on tcp:8545 && npx ts-node scripts/localnet/worker.ts\"",
     "test": "forge clean && forge test -vvv",
     "coverage": "forge clean && forge coverage --no-match-coverage \"(script|test)\" --report lcov",
-    "typechain": "npx typechain --target ethers-v6 \"abi/**/!(*.t|test).sol/!(*.abi).json\" --out-dir types",
-    "generate": "del-cli abi && forge clean && forge build --out abi && forge fmt && ./scripts/generate_go.sh || true && yarn lint:fix && yarn typechain"
+    "typechain": "npx typechain --target ethers-v6 \"out/**/!(*.t|test).sol/!(*.abi).json\" --out-dir types",
+    "generate": "forge clean && forge build && forge fmt && ./scripts/generate_go.sh || true && yarn lint:fix && yarn typechain",
+    "prepublishOnly": "copyfiles -u 1 'out/**/*' 'abi'"
   },
   "devDependencies": {
     "@eslint/js": "^9.7.0",
@@ -23,6 +25,7 @@
     "@typescript-eslint/eslint-plugin": "^8.0.1",
     "@typescript-eslint/parser": "^8.0.1",
     "concurrently": "^8.2.2",
+    "copyfiles": "^2.4.1",
     "del-cli": "^5.1.0",
     "eslint": "^9.8.0",
     "ts-node": "^10.9.2",
@@ -33,7 +36,9 @@
   },
   "license": "MIT",
   "dependencies": {
+    "@openzeppelin/contracts": "^5.0.2",
+    "@openzeppelin/contracts-upgradeable": "^5.0.2",
     "ethers": "^6.13.1"
   },
   "packageManager": "[email protected]+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
-}
+}