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

Jump to bottom

refactor: rename src to contracts #314

Merged
merged 25 commits into from
Aug 16, 2024
Merged

refactor: rename src to contracts #314

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
baca1c5
refactor: rename src to contracts
fadeev Aug 12, 2024
3ac2f8e
slither
fadeev Aug 12, 2024
fd1a844
slither
fadeev Aug 12, 2024
cef10b9
yarn generate
fadeev Aug 12, 2024
748c709
replace src with contracts
fadeev Aug 13, 2024
8d13b25
yarn generate
fadeev Aug 13, 2024
eb14efd
yarn generate
fadeev Aug 13, 2024
2caf5ae
make import paths compatible with hardhat
fadeev Aug 13, 2024
ed3ef6f
add hardhat config
fadeev Aug 13, 2024
37b6923
forge fmt
fadeev Aug 13, 2024
09e1417
yarn generate
fadeev Aug 13, 2024
9c8cdbf
import path
fadeev Aug 13, 2024
7de5d7e
removed typechain-types dir
fadeev Aug 13, 2024
2273d3b
foundry config point to abi
fadeev Aug 13, 2024
1ff355e
revert back to out
fadeev Aug 14, 2024
d39e4a8
yarn generate
fadeev Aug 14, 2024
0b0f060
change import paths in tests from src to contracts
fadeev Aug 15, 2024
75a2ae1
yarn generate
fadeev Aug 15, 2024
d1e2746
pkg
fadeev Aug 15, 2024
6c765f7
merge main
fadeev Aug 15, 2024
0144685
yarn generate
fadeev Aug 15, 2024
d38b727
remove hardhat
fadeev Aug 15, 2024
4b88aa6
merge main
fadeev Aug 16, 2024
ce1f6f5
yarn generate
fadeev Aug 16, 2024
3ee9939
yarn generate
fadeev Aug 16, 2024
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
0 v2/src/Revert.sol → v2/contracts/Revert.sol
View file
Open in desktop
File renamed without changes.
0 v2/src/evm/ERC20Custody.sol → v2/contracts/evm/ERC20Custody.sol
View file
Open in desktop
File renamed without changes.
0 v2/src/evm/GatewayEVM.sol → v2/contracts/evm/GatewayEVM.sol
View file
Open in desktop
File renamed without changes.
0 v2/src/evm/ZetaConnectorBase.sol → v2/contracts/evm/ZetaConnectorBase.sol
View file
Open in desktop
File renamed without changes.
0 v2/src/evm/ZetaConnectorNative.sol → v2/contracts/evm/ZetaConnectorNative.sol
View file
Open in desktop
File renamed without changes.
0 v2/src/evm/ZetaConnectorNonNative.sol → v2/contracts/evm/ZetaConnectorNonNative.sol
View file
Open in desktop
File renamed without changes.
0 v2/src/evm/interfaces/IERC20Custody.sol → ...ontracts/evm/interfaces/IERC20Custody.sol
View file
Open in desktop
File renamed without changes.
0 v2/src/evm/interfaces/IGatewayEVM.sol → v2/contracts/evm/interfaces/IGatewayEVM.sol
View file
Open in desktop
File renamed without changes.
0 v2/src/evm/interfaces/IZetaConnector.sol → ...ntracts/evm/interfaces/IZetaConnector.sol
View file
Open in desktop
File renamed without changes.
0 v2/src/evm/interfaces/IZetaNonEthNew.sol → ...ntracts/evm/interfaces/IZetaNonEthNew.sol
View file
Open in desktop
File renamed without changes.
0 v2/src/zevm/GatewayZEVM.sol → v2/contracts/zevm/GatewayZEVM.sol
View file
Open in desktop
File renamed without changes.
0 v2/src/zevm/ZRC20.sol → v2/contracts/zevm/ZRC20.sol
View file
Open in desktop
File renamed without changes.
0 v2/src/zevm/interfaces/IGatewayZEVM.sol → ...ontracts/zevm/interfaces/IGatewayZEVM.sol
View file
Open in desktop
File renamed without changes.
0 v2/src/zevm/interfaces/ISystem.sol → v2/contracts/zevm/interfaces/ISystem.sol
View file
Open in desktop
File renamed without changes.
0 v2/src/zevm/interfaces/IWZETA.sol → v2/contracts/zevm/interfaces/IWZETA.sol
View file
Open in desktop
File renamed without changes.
0 v2/src/zevm/interfaces/IZRC20.sol → v2/contracts/zevm/interfaces/IZRC20.sol
View file
Open in desktop
File renamed without changes.
0 v2/src/zevm/interfaces/UniversalContract.sol → ...cts/zevm/interfaces/UniversalContract.sol
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions v2/foundry.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[profile.default]
src = "src"
src = "contracts"
out = "out"
libs = ["lib"]

remappings = [
"ds-test/=node_modules/ds-test/src",
"src/=src",
"src/=contracts",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this remapping needed if src is set to contracts above?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right. I've removed the remapping and also changed the import paths in tests from src to contracts: 0b0f060

"test/=test",
"forge-std/=lib/forge-std/src/",
"@openzeppelin/contracts/=lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts/contracts/",
Expand Down
5 changes: 3 additions & 2 deletions v2/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"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/",
Expand Down Expand Up @@ -36,4 +37,4 @@
"ethers": "^6.13.1"
},
"packageManager": "[email protected]+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
}
}
2 changes: 1 addition & 1 deletion v2/pkg/address.sol/address.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion v2/pkg/beaconproxy.sol/beaconproxy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion v2/pkg/console.sol/console.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion v2/pkg/core.sol/core.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion v2/pkg/defender.sol/defender.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion v2/pkg/defenderdeploy.sol/defenderdeploy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion v2/pkg/erc1967proxy.sol/erc1967proxy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion v2/pkg/erc1967utils.sol/erc1967utils.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading