Skip to content

Commit 2a958a1

Browse files
MichaelKorchaginMichaelKorchagin
committed
Revert "Types upgrade after PROVIDER removal"
This reverts commit ae74c06.
1 parent ae74c06 commit 2a958a1

19 files changed

+141
-88
lines changed

‎contracts/registrar/IZNSSubRegistrar.sol‎

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity 0.8.26;
33

4-
import {IDistributionConfig} from "../types/IDistributionConfig.sol";
5-
import {PaymentConfig} from "../treasury/IZNSTreasury.sol";
6-
import {IZNSPricer} from "../types/IZNSPricer.sol";
4+
import { IDistributionConfig } from "../types/IDistributionConfig.sol";
5+
import { PaymentConfig } from "../treasury/IZNSTreasury.sol";
6+
import { IZNSPricer } from "../types/IZNSPricer.sol";
7+
78

89
/**
910
* @title IZNSSubRegistrar.sol - Interface for the ZNSSubRegistrar contract responsible for registering subdomains.
10-
*/
11+
*/
1112
interface IZNSSubRegistrar is IDistributionConfig {
1213
/**
13-
* @notice Reverted when someone other than parent owner is trying to buy
14-
a subdomain under the parent that is locked\
14+
* @notice Reverted when someone other than parent owner is trying to buy a subdomain under the parent that is locked\
1515
* or when the parent provided does not exist.
1616
*/
1717
error ParentLockedOrDoesntExist(bytes32 parentHash);
@@ -23,25 +23,22 @@ interface IZNSSubRegistrar is IDistributionConfig {
2323

2424
/**
2525
* @notice Emitted when a new `DistributionConfig.pricerContract` is set for a domain.
26-
*/
27-
event PricerContractSet(
28-
bytes32 indexed domainHash,
29-
address indexed pricerContract
30-
);
26+
*/
27+
event PricerContractSet(bytes32 indexed domainHash, address indexed pricerContract);
3128

3229
/**
3330
* @notice Emitted when a new `DistributionConfig.paymentType` is set for a domain.
34-
*/
31+
*/
3532
event PaymentTypeSet(bytes32 indexed domainHash, PaymentType paymentType);
3633

3734
/**
3835
* @notice Emitted when a new `DistributionConfig.accessType` is set for a domain.
39-
*/
36+
*/
4037
event AccessTypeSet(bytes32 indexed domainHash, AccessType accessType);
4138

4239
/**
4340
* @notice Emitted when a new full `DistributionConfig` is set for a domain at once.
44-
*/
41+
*/
4542
event DistributionConfigSet(
4643
bytes32 indexed domainHash,
4744
IZNSPricer pricerContract,
@@ -51,7 +48,7 @@ interface IZNSSubRegistrar is IDistributionConfig {
5148

5249
/**
5350
* @notice Emitted when a `mintlist` is updated for a domain.
54-
*/
51+
*/
5552
event MintlistUpdated(
5653
bytes32 indexed domainHash,
5754
uint256 indexed ownerIndex,
@@ -67,19 +64,16 @@ interface IZNSSubRegistrar is IDistributionConfig {
6764

6865
/**
6966
* @notice Emitted when the ZNSRootRegistrar address is set in state.
70-
*/
67+
*/
7168
event RootRegistrarSet(address registrar);
7269

7370
function distrConfigs(
7471
bytes32 domainHash
75-
)
76-
external
77-
view
78-
returns (
79-
IZNSPricer pricerContract,
80-
PaymentType paymentType,
81-
AccessType accessType
82-
);
72+
) external view returns (
73+
IZNSPricer pricerContract,
74+
PaymentType paymentType,
75+
AccessType accessType
76+
);
8377

8478
function isMintlistedForDomain(
8579
bytes32 domainHash,

‎contracts/types/IZNSPricer.sol‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity 0.8.26;
33

4+
45
/**
56
* @title IZNSPricer.sol
67
* @notice Base interface required to be inherited by all Pricing contracts to work with zNS
@@ -13,8 +14,7 @@ interface IZNSPricer {
1314
error ParentPriceConfigNotSet(bytes32 parentHash);
1415

1516
/**
16-
* @notice Reverted when domain owner is trying to set it's stake fee percentage higher than 100%
17-
(uint256 "10,000").
17+
* @notice Reverted when domain owner is trying to set it's stake fee percentage higher than 100% (uint256 "10,000").
1818
*/
1919
error FeePercentageValueTooLarge(uint256 feePercentage, uint256 maximum);
2020

@@ -49,7 +49,7 @@ interface IZNSPricer {
4949
/**
5050
* @notice Returns the fee for a given price.
5151
* @dev Fees are only supported for PaymentType.STAKE !
52-
*/
52+
*/
5353
function getFeeForPrice(
5454
bytes32 parentHash,
5555
uint256 price

‎hardhat.config.ts‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -150,20 +150,6 @@ const config : HardhatUserConfig = {
150150
"oz-proxies/",
151151
],
152152
},
153-
// meowtestnet: {
154-
// url: `${process.env.MEOWTESTNET_RPC_URL}`,
155-
// chainId: 883424730,
156-
// accounts: [ // Comment out for CI, uncomment this when using Sepolia
157-
// `${process.env.DEPLOYER_PRIVATE_KEY}`,
158-
// `${process.env.ZERO_VAULT_PRIVATE_KEY}`,
159-
// `${process.env.TESTNET_PRIVATE_KEY_A}`,
160-
// `${process.env.TESTNET_PRIVATE_KEY_B}`,
161-
// `${process.env.TESTNET_PRIVATE_KEY_C}`,
162-
// `${process.env.TESTNET_PRIVATE_KEY_D}`,
163-
// `${process.env.TESTNET_PRIVATE_KEY_E}`,
164-
// `${process.env.TESTNET_PRIVATE_KEY_F}`,
165-
// ],
166-
// },
167153
};
168154

169155
export default config;

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@
7575
"typescript": "^5.0.2"
7676
},
7777
"dependencies": {
78-
"@zero-tech/zdc": "0.1.6",
78+
"@zero-tech/zdc": "0.1.3",
7979
"axios": "^1.4.0",
8080
"dotenv": "16.0.3",
8181
"mongodb": "^6.1.0",
8282
"winston": "^3.11.0"
8383
}
84-
}
84+
}

‎src/deploy/missions/contracts/access-controller.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ import {
44
import { znsNames } from "./names";
55
import { HardhatRuntimeEnvironment } from "hardhat/types";
66
import { SignerWithAddress } from "@nomicfoundation/hardhat-ethers/signers";
7-
import { IZNSCampaignConfig, IZNSContracts } from "../../campaign/types";
7+
import { DefenderRelayProvider } from "@openzeppelin/defender-sdk-relay-signer-client/lib/ethers";
8+
import { IZNSContracts } from "../../campaign/types";
89

910

1011
export class ZNSAccessControllerDM extends BaseDeployMission<
1112
HardhatRuntimeEnvironment,
1213
SignerWithAddress,
13-
IZNSCampaignConfig<SignerWithAddress>,
14+
DefenderRelayProvider,
1415
IZNSContracts
1516
> {
1617
proxyData = {
@@ -26,6 +27,6 @@ IZNSContracts
2627
adminAddresses,
2728
} = this.config;
2829

29-
return [governorAddresses, adminAddresses];
30+
return [ governorAddresses, adminAddresses ];
3031
}
3132
}

‎src/deploy/missions/contracts/address-resolver.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ import {
55
import { ProxyKinds, ResolverTypes } from "../../constants";
66
import { znsNames } from "./names";
77
import { HardhatRuntimeEnvironment } from "hardhat/types";
8-
import { IZNSCampaignConfig, IZNSContracts } from "../../campaign/types";
8+
import { DefenderRelayProvider } from "@openzeppelin/defender-sdk-relay-signer-client/lib/ethers";
9+
import { IZNSContracts } from "../../campaign/types";
910
import { SignerWithAddress } from "@nomicfoundation/hardhat-ethers/signers";
1011

1112

1213
export class ZNSAddressResolverDM extends BaseDeployMission<
1314
HardhatRuntimeEnvironment,
1415
SignerWithAddress,
15-
IZNSCampaignConfig<SignerWithAddress>,
16+
DefenderRelayProvider,
1617
IZNSContracts
1718
> {
1819
proxyData = {

‎src/deploy/missions/contracts/curve-pricer.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ import { ProxyKinds } from "../../constants";
66
import { znsNames } from "./names";
77
import { HardhatRuntimeEnvironment } from "hardhat/types";
88
import { SignerWithAddress } from "@nomicfoundation/hardhat-ethers/signers";
9-
import { IZNSCampaignConfig, IZNSContracts } from "../../campaign/types";
9+
import { DefenderRelayProvider } from "@openzeppelin/defender-sdk-relay-signer-client/lib/ethers";
10+
import { IZNSContracts } from "../../campaign/types";
1011

1112

1213
export class ZNSCurvePricerDM extends BaseDeployMission<
1314
HardhatRuntimeEnvironment,
1415
SignerWithAddress,
15-
IZNSCampaignConfig<SignerWithAddress>,
16+
DefenderRelayProvider,
1617
IZNSContracts
1718
> {
1819
proxyData = {

‎src/deploy/missions/contracts/domain-token.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ import { ProxyKinds } from "../../constants";
66
import { znsNames } from "./names";
77
import { HardhatRuntimeEnvironment } from "hardhat/types";
88
import { SignerWithAddress } from "@nomicfoundation/hardhat-ethers/signers";
9+
import { DefenderRelayProvider } from "@openzeppelin/defender-sdk-relay-signer-client/lib/ethers";
910
import { IZNSCampaignConfig, IZNSContracts } from "../../campaign/types";
1011

1112

1213
export class ZNSDomainTokenDM extends BaseDeployMission<
1314
HardhatRuntimeEnvironment,
1415
SignerWithAddress,
15-
IZNSCampaignConfig<SignerWithAddress>,
16+
DefenderRelayProvider,
1617
IZNSContracts
1718
> {
1819
proxyData = {
@@ -32,7 +33,7 @@ IZNSContracts
3233
defaultRoyaltyReceiver,
3334
defaultRoyaltyFraction,
3435
},
35-
} = this.config ;
36+
} = this.config as IZNSCampaignConfig<SignerWithAddress>;
3637

3738
return [ await accessController.getAddress(), name, symbol, defaultRoyaltyReceiver, defaultRoyaltyFraction ];
3839
}

‎src/deploy/missions/contracts/fixed-pricer.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ import {
66
import { znsNames } from "./names";
77
import { HardhatRuntimeEnvironment } from "hardhat/types";
88
import { SignerWithAddress } from "@nomicfoundation/hardhat-ethers/signers";
9-
import { IZNSCampaignConfig, IZNSContracts } from "../../campaign/types";
9+
import { DefenderRelayProvider } from "@openzeppelin/defender-sdk-relay-signer-client/lib/ethers";
10+
import { IZNSContracts } from "../../campaign/types";
1011

1112

1213
export class ZNSFixedPricerDM extends BaseDeployMission<
1314
HardhatRuntimeEnvironment,
1415
SignerWithAddress,
15-
IZNSCampaignConfig<SignerWithAddress>,
16+
DefenderRelayProvider,
1617
IZNSContracts
1718
> {
1819
proxyData = {

‎src/deploy/missions/contracts/meow-token/meow-token.ts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import { ethers } from "ethers";
88
import { znsNames } from "../names";
99
import { HardhatRuntimeEnvironment } from "hardhat/types";
1010
import { SignerWithAddress } from "@nomicfoundation/hardhat-ethers/signers";
11-
import { IZNSCampaignConfig, IZNSContracts } from "../../../campaign/types";
11+
import { DefenderRelayProvider } from "@openzeppelin/defender-sdk-relay-signer-client/lib/ethers";
12+
import { IZNSContracts } from "../../../campaign/types";
1213
import { MeowToken__factory } from "@zero-tech/ztoken/typechain-js";
1314
import meowArtifact from "@zero-tech/ztoken/artifacts/contracts/MeowToken.sol/MeowToken.json";
1415

@@ -20,7 +21,7 @@ export const meowTokenSymbol = "MEOW";
2021
export class MeowTokenDM extends BaseDeployMission<
2122
HardhatRuntimeEnvironment,
2223
SignerWithAddress,
23-
IZNSCampaignConfig<SignerWithAddress>,
24+
DefenderRelayProvider,
2425
IZNSContracts
2526
> {
2627
proxyData = {
@@ -34,7 +35,7 @@ IZNSContracts
3435
constructor (args : IDeployMissionArgs<
3536
HardhatRuntimeEnvironment,
3637
SignerWithAddress,
37-
IZNSCampaignConfig<SignerWithAddress>,
38+
DefenderRelayProvider,
3839
IZNSContracts
3940
>) {
4041
super(args);
@@ -67,7 +68,7 @@ IZNSContracts
6768
this.logger.debug(`Writing ${this.contractName} to DB...`);
6869

6970
const factory = new MeowToken__factory(this.config.deployAdmin);
70-
const baseContract = factory.attach(this.config.stakingTokenAddress);
71+
const baseContract = factory.attach(this.config.stakingTokenAddress as string);
7172
// TODO remove!
7273
// const baseContract = await this.campaign.deployer.getContractObject(
7374
// this.contractName,
@@ -98,7 +99,7 @@ IZNSContracts
9899

99100
this.logger.debug(`${this.contractName} ${msg} post deploy sequence`);
100101

101-
return this.config.mockMeowToken ;
102+
return this.config.mockMeowToken as boolean;
102103
}
103104

104105
async postDeploy () {

0 commit comments

Comments
 (0)