fix tokenIn and tokenOut positional args. Add tokenLock.setTokenSale to deploy script

Author: MrToph

scripts/config.ts

@@ -51,7 +51,7 @@ export const allConfigs: {[key: number]: Config} = {
     VEST_DURATION: 4 * ONE_DAY,
     MERKLE_ROOT: '0xd97c9a423833d78e0562b8ed2d14752b54e7ef9b52314cafb197e3a339299901',
     TIMELOCK_DELAY: 1800, // 30 mins
-    TOKEN_SALE_START: Math.floor(new Date(`2021-12-27T12:00:00.000Z`).getTime() / 1000),
+    TOKEN_SALE_START: Math.floor(new Date(`2021-12-27T13:16:00.000Z`).getTime() / 1000),
     TOKEN_SALE_DURATION: 14 * ONE_DAY,
     TOKEN_SALE_USDC: '0x2791bca1f2de4661ed88a30c99a7a9449aa84174', // USDC 6 decimals
     TOKEN_SALE_ARENA_PRICE: BN.from(30_000).mul(ONE_18).div(ONE_18), // 0.03 USDC * 1e18 / 1.0 ARENA
@@ -68,7 +68,7 @@ export const allConfigs: {[key: number]: Config} = {
     VEST_DURATION: 4 * ONE_YEAR,
     MERKLE_ROOT: '0x0', // TODO: edit value
     TIMELOCK_DELAY: 2 * ONE_DAY, // 2 days (same as ENS)
-    TOKEN_SALE_START: Math.floor(new Date(`2021-12-27T12:00:00.000Z`).getTime() / 1000),
+    TOKEN_SALE_START: Math.floor(new Date(`2021-12-27T13:50:00.000Z`).getTime() / 1000),
     TOKEN_SALE_DURATION: 14 * ONE_DAY,
     TOKEN_SALE_USDC: '0x2791bca1f2de4661ed88a30c99a7a9449aa84174',
     TOKEN_SALE_ARENA_PRICE: BN.from(30_000).mul(ONE_18).div(ONE_18), // 0.03 USDC * 1e18 / 1.0 ARENA

scripts/deploy.ts

@@ -84,8 +84,8 @@ task('deploy', 'deploy contracts').setAction(async (taskArgs, hre) => {
   console.log(`deploying tokensale...`);
   const TokenSaleFactory = (await hre.ethers.getContractFactory('TokenSale')) as TokenSale__factory;
   tokenSale = await TokenSaleFactory.deploy(
-    token.address,
     config.TOKEN_SALE_USDC,
+    token.address,
     config.TOKEN_SALE_START,
     config.TOKEN_SALE_DURATION,
     config.TOKEN_SALE_ARENA_PRICE,
@@ -111,6 +111,8 @@ task('deploy', 'deploy contracts').setAction(async (taskArgs, hre) => {
 
   // set revoker role in TokenLock to timelock
   await revokableTokenLock.setRevoker(timelock.address);
+  // set token sale in TokenLock
+  await revokableTokenLock.setTokenSale(tokenSale.address);
 
   // transfer tokenlock admin role to timelock
   await revokableTokenLock.transferOwnership(timelock.address);
@@ -167,6 +169,9 @@ task('deploy', 'deploy contracts').setAction(async (taskArgs, hre) => {
   // TokenLock revoker should be timelock
   expect(await revokableTokenLock.revoker()).to.be.eq(timelock.address);
 
+  // TokenLock token sale should be set
+  expect(await revokableTokenLock.tokenSale()).to.be.eq(tokenSale.address);
+
   // TokenLock owner should be timelock
   expect(await revokableTokenLock.owner()).to.be.eq(timelock.address);
 

scripts/verify.ts

@@ -38,8 +38,8 @@ task('verifyContracts', 'verify deployed contracts')
     await verifyContract(hre, timelock.address, [config.TIMELOCK_DELAY, [], []]);
     await verifyContract(hre, governor.address, [token.address, timelock.address]);
     await verifyContract(hre, tokenSale.address, [
-      token.address,
       config.TOKEN_SALE_USDC,
+      token.address,
       config.TOKEN_SALE_START,
       config.TOKEN_SALE_DURATION,
       config.TOKEN_SALE_ARENA_PRICE,