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

[Multi ZNS] fix: ZDC integration of upgrade functionality #102

Open
wants to merge 16 commits into
base: rc/zns-meowchain
Choose a base branch
from
Open

[Multi ZNS] fix: ZDC integration of upgrade functionality #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b21ea74
rename getconflict helper
Whytecrowe Feb 8, 2024
ca27cf8
switch contract missions to inherit BaseUpgradeMission
Whytecrowe Feb 9, 2024
cfc5c2a
add UPGRADE env var check to the ENV validator
Whytecrowe Feb 9, 2024
b95c106
adapt to the new type changes from zDC
Whytecrowe Feb 13, 2024
1f88cd0
remove compilation errors
Whytecrowe Feb 15, 2024
f269514
extend types for registration helpers
Whytecrowe Feb 15, 2024
56fa4f6
update DMs to inherit from the new Upgrade one
Whytecrowe Feb 20, 2024
3be7351
make env vars setting utils
Whytecrowe Feb 20, 2024
09360c8
make smoke test to run with zDC to find what's missing
Whytecrowe Feb 20, 2024
1343fcd
install zDC from local package and update upgrades
Whytecrowe Feb 20, 2024
7e13b4a
Merge branch 'rc/zns-meowchain' into zdc-integration-upgrade
Whytecrowe Sep 12, 2024
55e332d
update packages
Whytecrowe Sep 12, 2024
1d4ea0b
fix leftover errors in tests
Whytecrowe Sep 12, 2024
8108e72
update eslint config
Whytecrowe Sep 26, 2024
aa47d98
fix naming for all upgrade mock files
Whytecrowe Oct 1, 2024
d47495c
fix mock DMs for upgrade testing and add mongo adapter reset to the test
Whytecrowe Oct 1, 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
5 changes: 3 additions & 2 deletions .eslintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
"no-console": "off",
"no-shadow": "warn",
"@typescript-eslint/no-shadow": "warn",
"no-invalid-this": "off"
"no-invalid-this": "off",
"jsdoc/newline-after-description": "off"
// "@typescript-eslint/no-unused-vars": "off" // For debugging
}
}
]
}
}
0 ...mocks/distribution/ZNSCurvePricerMock.sol → ...istribution/ZNSCurvePricerUpgradeMock.sol
View file
Open in desktop
File renamed without changes.
0 ...mocks/distribution/ZNSFixedPricerMock.sol → ...istribution/ZNSFixedPricerUpgradeMock.sol
View file
Open in desktop
File renamed without changes.
0 ...cks/distribution/ZNSRootRegistrarMock.sol → ...tribution/ZNSRootRegistrarUpgradeMock.sol
View file
Open in desktop
File renamed without changes.
0 ...ocks/distribution/ZNSSubRegistrarMock.sol → ...stribution/ZNSSubRegistrarUpgradeMock.sol
View file
Open in desktop
File renamed without changes.
0 ...st-mocks/distribution/ZNSTreasuryMock.sol → ...s/distribution/ZNSTreasuryUpgradeMock.sol
View file
Open in desktop
File renamed without changes.
0 ...e-test-mocks/registry/ZNSRegistryMock.sol → ...mocks/registry/ZNSRegistryUpgradeMock.sol
View file
Open in desktop
File renamed without changes.
0 ...mocks/resolver/ZNSAddressResolverMock.sol → ...esolver/ZNSAddressResolverUpgradeMock.sol
View file
Open in desktop
File renamed without changes.
0 ...e-test-mocks/token/ZNSDomainTokenMock.sol → ...mocks/token/ZNSDomainTokenUpgradeMock.sol
View file
Open in desktop
File renamed without changes.
20 changes: 9 additions & 11 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,15 @@
"mongo:stop": "docker-compose stop",
"mongo:down": "docker-compose down",
"mongo:drop": "ts-node src/utils/drop-db.ts",
"run-sepolia": "hardhat run src/deploy/run-campaign.ts --network sepolia",
"run-hardhat": "hardhat run src/deploy/run-campaign.ts --network hardhat",
"run-meowtestnet": "hardhat run src/deploy/run-campaign.ts --network meowtestnet"
"run-sepolia": "hardhat run src/deploy/run-campaign.ts --network sepolia"
},
"pre-commit": [
"lint"
],
"devDependencies": {
"@ensdomains/ensjs": "2.1.0",
"@nomicfoundation/hardhat-chai-matchers": "^2.0.2",
"@nomicfoundation/hardhat-ethers": "^3.0.6",
"@nomicfoundation/hardhat-ethers": "^3.0.8",
"@nomicfoundation/hardhat-network-helpers": "^1.0.11",
"@nomicfoundation/hardhat-toolbox": "^4.0.0",
"@nomicfoundation/hardhat-verify": "^2.0.8",
Expand All @@ -53,20 +51,20 @@
"@openzeppelin/contracts-upgradeable": "^5.0.2",
"@openzeppelin/contracts-upgradeable-400": "npm:@openzeppelin/[email protected]",
"@openzeppelin/defender-sdk": "^1.7.0",
"@openzeppelin/hardhat-upgrades": "^3.1.1",
"@openzeppelin/hardhat-upgrades": "^3.2.1",
"@semantic-release/git": "^10.0.1",
"@tenderly/hardhat-tenderly": "^2.0.1",
"@typechain/ethers-v6": "^0.5.1",
"@typechain/hardhat": "^9.1.0",
"@types/chai": "^4.3.11",
"@types/mocha": "^9.1.0",
"@types/node": "^18.15.11",
"@zero-tech/eslint-config-cpt": "0.2.7",
"@zero-tech/eslint-config-cpt": "0.2.8",
"@zero-tech/ztoken": "2.1.0",
"chai": "^4.3.10",
"eslint": "^8.37.0",
"ethers": "^6.9.0",
"hardhat": "^2.22.6",
"eslint": "^8.56.0",
"ethers": "^6.13.2",
"hardhat": "^2.22.10",
"hardhat-gas-reporter": "^1.0.9",
"semantic-release": "^21.0.1",
"solhint": "^5.0.1",
Expand All @@ -77,10 +75,10 @@
"typescript": "^5.0.2"
},
"dependencies": {
"@zero-tech/zdc": "0.1.6",
"@zero-tech/zdc": "../zDC/zero-tech-zdc-0.1.7.tgz",
"axios": "^1.4.0",
"dotenv": "16.0.3",
"mongodb": "^6.1.0",
"winston": "^3.11.0"
}
}
}
Loading