[Multi ZNS] Replacing the meowToken with zToken #117

MichaelKorchagin · 2024-09-12T20:33:39Z

MERGED TO: rc/multi-zns-main

package.json

openzeppelin-code · 2024-09-12T20:37:12Z

Replacing the meowToken with zToken

Generated at commit: 76182b30799f969601a7cb96014159e297500929

🚨 Report Summary

	Severity Level	Results
Contracts	Critical High Medium Low Note Total	1 1 0 2 17 21
Dependencies	Critical High Medium Low Note Total	0 0 0 0 0 0

For more details view the full report in OpenZeppelin Code Inspector

…n config + types for this. Some testing fixes.

…from beneficiary. Removed old ZToken from dependencies.

codecov · 2024-09-19T22:26:45Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 99.80%. Comparing base (8513869) to head (76182b3).

Additional details and impacted files

@@                Coverage Diff                @@
##           rc/zns-meowchain     #117   +/-   ##
=================================================
  Coverage             99.80%   99.80%           
=================================================
  Files                    11       11           
  Lines                   525      525           
  Branches                117      117           
=================================================
  Hits                    524      524           
  Misses                    1        1

contracts/token/mocks/ZTokenMock.sol

hardhat.config.ts

src/deploy/campaign/environments.ts

src/deploy/campaign/types.ts

src/deploy/missions/contracts/z-token/z-token.ts

src/utils/compare-bytecode.ts

test/ZNSCurvePricer.test.ts

test/ZNSTreasury.test.ts

JamesEarle

Just the last few comments, otherwise looks good 👍

src/deploy/campaign/environments.ts

src/deploy/missions/contracts/z-token/z-token.ts

Whytecrowe · 2024-09-24T21:45:38Z

src/deploy/missions/contracts/z-token/z-token.ts

@@ -39,16 +39,16 @@ IZNSContracts
  >) {
    super(args);

-    if (this.config.mockMeowToken) {
-      this.contractName = znsNames.meowToken.contractMock;
+    if (this.config.mockZToken) {


now here it is a boolean already, so you can check it like this without problems. no change is needed here, just wanted to point out an example

src/deploy/missions/contracts/z-token/z-token.ts

Whytecrowe · 2024-09-24T21:48:46Z

src/deploy/missions/contracts/z-token/z-token.ts

  }

+  // it will choose the governon as `admin` argument
+  // and deployAdmin as `minter` and first passed admin as `mintBeneficiary`.


no. all these addresses should be parts of the config. we need to be able to specify these addresses as needed.

src/deploy/missions/contracts/z-token/z-token.ts

Whytecrowe · 2024-09-24T21:50:37Z

src/deploy/missions/types.ts

+  initialAdminDelay : bigint;
+  initialSupplyBase : bigint;
+  inflationRates : Array<bigint>;
+  finalInflationRate : bigint;


add all the constructor arguments for the contract here

test/DeployCampaignInt.test.ts

test/ZNSCurvePricer.test.ts

test/ZNSSubRegistrar.test.ts

test/ZNSTreasury.test.ts

Whytecrowe · 2024-09-24T22:05:16Z

test/ZNSTreasury.test.ts

@@ -628,6 +633,8 @@ describe("ZNSTreasury", () => {
      const newHash = hashSubdomainName(newLabel);
      const { expectedPrice, stakeFee } = getPriceObject(newLabel, DEFAULT_PRICE_CONFIG);

+      await zns.zToken.connect(deployer).approve(await zns.treasury.getAddress(), ethers.MaxInt256);


We need an approval here, because the deployer is the participant of stakeForDomain function

test/gas/TransactionGasCosts.test.ts

Whytecrowe

some more comments for you

…anged. Deleted redundant approvals. Mock token fix.

Connect zToken to zNS

a335e6b

Whytecrowe changed the base branch from development to rc/zns-meowchain September 12, 2024 20:34

Whytecrowe reviewed Sep 12, 2024

View reviewed changes

package.json Outdated Show resolved Hide resolved

MichaelKorchagin and others added 9 commits September 12, 2024 15:42

Mock added

951d05a

fix errors

86e766f

Replaced Meow-Token variables with Z-Token

6f3ae07

Continued token name replacement. New arguments for ZToken in campaig…

c11f696

…n config + types for this. Some testing fixes.

Tests fixes. New deploy of zToken in tests

ceee4f9

More test fixes. Changed mintBulk helper function to transferBulk.

22ec8f6

ZToken package connected

ad4e75f

Test fixes. Different deploy in some tests. Mint changed to transfer …

1d97890

…from beneficiary. Removed old ZToken from dependencies.

ZTokenConfig types fixes

95c99bc

MichaelKorchagin requested review from JamesEarle and Whytecrowe September 19, 2024 22:57

JamesEarle reviewed Sep 20, 2024

View reviewed changes

contracts/token/mocks/ZTokenMock.sol Show resolved Hide resolved

JamesEarle reviewed Sep 20, 2024

View reviewed changes

hardhat.config.ts Outdated Show resolved Hide resolved

JamesEarle reviewed Sep 20, 2024

View reviewed changes

src/deploy/campaign/environments.ts Outdated Show resolved Hide resolved

JamesEarle reviewed Sep 20, 2024

View reviewed changes

src/deploy/campaign/environments.ts Outdated Show resolved Hide resolved

JamesEarle reviewed Sep 20, 2024

View reviewed changes

src/deploy/campaign/environments.ts Outdated Show resolved Hide resolved

JamesEarle reviewed Sep 20, 2024

View reviewed changes

src/deploy/campaign/types.ts Outdated Show resolved Hide resolved

JamesEarle reviewed Sep 20, 2024

View reviewed changes

src/deploy/missions/contracts/z-token/z-token.ts Outdated Show resolved Hide resolved

JamesEarle reviewed Sep 20, 2024

View reviewed changes

src/deploy/missions/contracts/z-token/z-token.ts Show resolved Hide resolved

JamesEarle reviewed Sep 20, 2024

View reviewed changes

src/utils/compare-bytecode.ts Show resolved Hide resolved

Minor fixes

53ab216

JamesEarle reviewed Sep 20, 2024

View reviewed changes

test/ZNSCurvePricer.test.ts Outdated Show resolved Hide resolved

JamesEarle reviewed Sep 20, 2024

View reviewed changes

test/ZNSCurvePricer.test.ts Outdated Show resolved Hide resolved

Minor fixes

561d44c

JamesEarle reviewed Sep 21, 2024

View reviewed changes

test/ZNSTreasury.test.ts Outdated Show resolved Hide resolved

JamesEarle requested changes Sep 21, 2024

View reviewed changes