[Calad Release]

.github/workflows/audit_lint_build.yml

@@ -3,73 +3,32 @@ name: Aelin CI
 on:
   push:
   pull_request:
-    branches: [main, dev, dev-fork, aelip-19]
+    branches: [main, dev]
 
 jobs:
   audit:
-    # run only on main/dev branch and pull requests
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.event_name == 'pull_request'
     runs-on: ubuntu-latest
-
-    container:
-      image: synthetixio/docker-sec-tools:16.17-alpine
-
     steps:
-      - name: Checkout
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # pin@v2
-
-      - name: Audit dependencies
-        run: npm audit --audit-level=critical
-
-      - name: Lockfile lint
-        run: lockfile-lint -p package-lock.json --type npm --allowed-hosts npm --allowed-schemes "https:" "npm:"
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: "18"
+          cache: "yarn"
+      - run: yarn install --immutable --immutable-cache --check-cache
 
   lint:
     needs: audit
     # run only on audit success or audit skipped
     if: always() && (needs.audit.result == 'success' || needs.audit.result == 'skipped')
     runs-on: ubuntu-latest
-
-    container:
-      image: synthetixio/docker-node:16.17-alpine
-
     steps:
-      - name: Checkout
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # pin@v2
-
-      - name: Set npm cache directory
-        run: npm config set cache .npm-cache --global
-        continue-on-error: true
-
-      - uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353 # pin@v2
-        with:
-          path: |
-            .npm-cache
-            node_modules
-          key: ${{ runner.os }}-alpine-node-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-alpine-node-
-        continue-on-error: true
-
-      # fixes permission issues on gh actions + docker + npm@8
-      - name: Chown workspace
-        run: chown -R $(whoami) .
-
-      # mkdir -p node_modules fixes https://github.com/npm/cli/issues/3208 starting from npm@7
-      - name: Install dependencies
-        run: |
-          mkdir -p node_modules
-          npm install --prefer-offline --no-audit --legacy-peer-deps
-
-      - name: Lint
-        run: npm run lint:sarif
-
-      - name: Upload lint results
-        if: always()
-        uses: github/codeql-action/upload-sarif@21830ef0c1f0f06f2d82ba3f1f07cb3ffe543ed7 # pin@codeql-bundle-20210517
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          sarif_file: lint-results.sarif
-        continue-on-error: true
+          node-version: "18"
+          cache: "yarn"
+      - run: yarn install --immutable --immutable-cache --check-cache
+      - run: yarn lint
 
   foundry-tests:
     runs-on: ubuntu-latest
@@ -80,10 +39,10 @@ jobs:
         with:
           submodules: recursive
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
 
-      - name: Install dependecies
-        run: npm install
+      - name: Install dependencies
+        run: yarn install --immutable --immutable-cache --check-cache
 
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
@@ -94,126 +53,7 @@ jobs:
         run: forge install
 
       - name: Run Tests without fork
-        run: forge test --no-match-contract NftCheck --no-match-test testPunksPurchasePool
+        run: forge test --no-match-contract NftCheck
 
       - name: Run NftCheck tests with fork
         run: forge test --match-contract NftCheck --fork-url ${ALCHEMY_URL}
-
-      - name: Run Punks tests with fork
-        run: forge test --match-contract AelinPoolPurchase --match-test testPunksPurchasePool --fork-url ${ALCHEMY_URL}
-
-  test:
-    needs: lint
-    if: always()
-    runs-on: ubuntu-latest
-    env:
-      KOVAN_PRIVATE_KEY: ${{ secrets.KOVAN_PRIVATE_KEY }}
-      ALCHEMY_URL: ${{ secrets.ALCHEMY_URL }}
-      ALCHEMY_API_KEY: ${{ secrets.ALCHEMY_API_KEY }}
-      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-      OP_API_KEY: ${{ secrets.OP_API_KEY }}
-      OP_PRIVATE_KEY: ${{ secrets.OP_PRIVATE_KEY }}
-
-    container:
-      image: synthetixio/docker-sec-tools:16.17-alpine
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # pin@v2
-
-      - name: Set npm cache directory
-        run: npm config set cache .npm-cache --global
-        continue-on-error: true
-
-      - uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353 # pin@v2
-        with:
-          path: |
-            .npm-cache
-            node_modules
-          key: ${{ runner.os }}-alpine-node-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-alpine-node-
-        continue-on-error: true
-
-      # fixes permission issues on gh actions + docker + npm@8
-      - name: Chown workspace
-        run: chown -R $(whoami) .
-
-      # mkdir -p node_modules fixes https://github.com/npm/cli/issues/3208 starting from npm@7
-      - name: Install dependencies
-        run: |
-          mkdir -p node_modules
-          npm install --prefer-offline --no-audit --legacy-peer-deps
-
-      - name: Compile
-        run: npm run compile
-
-      - name: Test
-        run: npm run test
-
-      - name: Generate coverage
-        run: npm run coverage -- --testfiles "test/unit/*.ts"
-
-      - name: Upload coverage
-        run: codecov -t ${CODECOV_TOKEN} -f coverage.json
-
-  build:
-    needs: test
-    if: always()
-    runs-on: ubuntu-latest
-
-    container:
-      image: synthetixio/docker-node:16.17-alpine
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # pin@v2
-
-      - name: Set npm cache directory
-        run: npm config set cache .npm-cache --global
-        continue-on-error: true
-
-      - uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353 # pin@v2
-        with:
-          path: |
-            .npm-cache
-            node_modules
-          key: ${{ runner.os }}-alpine-node-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-alpine-node-
-        continue-on-error: true
-
-      # fixes permission issues on gh actions + docker + npm@8
-      - name: Chown workspace
-        run: chown -R $(whoami) .
-
-      # mkdir -p node_modules fixes https://github.com/npm/cli/issues/3208 starting from npm@7
-      - name: Install dependencies
-        run: |
-          mkdir -p node_modules
-          npm install --prefer-offline --no-audit --legacy-peer-deps
-
-      - name: Cache build cache
-        uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353 # pin@v2
-        with:
-          path: cache
-          key: ${{ runner.os }}-alpine-cache-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-alpine-cache-
-        continue-on-error: true
-
-      - name: Build
-        run: npm run build
-
-      - name: Compress build
-        if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.event_name == 'pull_request'
-        run: tar -zcvf build.tar.gz build
-        continue-on-error: true
-
-      - name: Archive build
-        if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.event_name == 'pull_request'
-        uses: actions/upload-artifact@27121b0bdffd731efa15d66772be8dc71245d074 # pin@v2
-        with:
-          name: build
-          path: build.tar.gz
-        continue-on-error: true

.gitignore

@@ -9,4 +9,6 @@ coverage.json
 .idea
 lint-results.sarif
 .env
-.vscode/
+.vscode/
+.yarn/
+

.prettierignore

@@ -1,2 +1,3 @@
 build/
 typechain
+contracts/deprecated

.prettierrc

@@ -7,8 +7,7 @@
         "tabWidth": 4,
         "useTabs": false,
         "singleQuote": false,
-        "bracketSpacing": false,
-        "explicitTypes": "preserve"
+        "bracketSpacing": false
       }
     },
     {

.solhint.json

@@ -0,0 +1,27 @@
+{
+	"extends": ["solhint:recommended"],
+	"plugins": ["numcast"],
+	"rules": {
+		"not-rely-on-time": "off",
+		"avoid-low-level-calls": "off",
+		"compiler-version": ["error", "^0.8.0"],
+		"contract-name-camelcase": "off",
+		"func-visibility": [
+			"error",
+			{
+				"ignoreConstructors": true
+			}
+		],
+		"no-complex-fallback": "off",
+		"no-inline-assembly": "off",
+		"private-vars-leading-underscore": "off",
+		"reason-string": [
+			"error",
+			{
+				"maxLength": 32
+			}
+		],
+		"numcast/safe-cast": "error",
+		"no-global-import": "off"
+	}
+}

.solhintignore

@@ -0,0 +1,6 @@
+artifacts/
+node_modules/
+**/contracts/generated
+**/contracts/routers
+**/typechain-types
+contracts/deprecated

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

cannonfile.toml

@@ -1,5 +1,5 @@
-name = "aelincannon"
-description = "Deploy Aelin factory contracts using Cannon"
+name = "aelin-contracts"
+description = "Deploy Aelin contracts using Cannon"
 version = "0.0.1"
 keywords = ["aelin", "cannon"]
 
@@ -43,4 +43,4 @@ depends = ["contract.poolLogic", "contract.dealLogic", "contract.aelinEscrowLogi
 [contract.upFrontDealFactory]
 artifact = "AelinUpFrontDealFactory" # Specifies the name of the contract to be deployed
 args = ["<%= contracts.upFrontDealLogic.address %>", "<%= contracts.aelinEscrowLogic.address %>", "<%= settings.aelinTreasuryAddress %>"]
-depends = ["contract.upFrontDealLogic", "contract.aelinEscrowLogic"]
+depends = ["contract.upFrontDealLogic", "contract.aelinEscrowLogic"]

contracts/MerkleDistributor.sol → contracts.old/MerkleDistributor.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.6;
 
-import "./interfaces/IMerkleDistributor.sol";
+import "./IMerkleDistributor.sol";
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "./Owned.sol";
 import "@openzeppelin/contracts/utils/cryptography/MerkleProof.sol";
@@ -15,11 +15,7 @@ contract MerkleDistributor is Owned, Pausable, IMerkleDistributor {
     // This is a packed array of booleans.
     mapping(uint256 => uint256) private claimedBitMap;
 
-    constructor(
-        address owner_,
-        address token_,
-        bytes32 merkleRoot_
-    ) Owned(owner_) Pausable() {
+    constructor(address owner_, address token_, bytes32 merkleRoot_) Owned(owner_) Pausable() {
         token = token_;
         merkleRoot = merkleRoot_;
         startTime = block.timestamp;
@@ -39,16 +35,12 @@ contract MerkleDistributor is Owned, Pausable, IMerkleDistributor {
         claimedBitMap[claimedWordIndex] = claimedBitMap[claimedWordIndex] | (1 << claimedBitIndex);
     }
 
-    function claim(
-        uint256 index,
-        address account,
-        uint256 amount,
-        bytes32[] calldata merkleProof
-    ) external override {
+    function claim(uint256 index, address account, uint256 amount, bytes32[] calldata merkleProof) external override {
         require(!isClaimed(index), "MerkleDistributor: Drop already claimed.");
 
         // Verify the merkle proof.
-        bytes32 node = keccak256(abi.encodePacked(index, account, amount));
+        bytes32 node = keccak256(bytes.concat(keccak256(abi.encode(index, account, amount))));
+
         require(MerkleProof.verify(merkleProof, merkleRoot, node), "MerkleDistributor: Invalid proof.");
 
         // Mark it claimed and send the token.

contracts/OptimismTreasury.sol → contracts.old/OptimismTreasury.sol

@@ -11,11 +11,7 @@ contract OptimismTreasury is Owned {
 
     constructor(address _owner) Owned(_owner) {}
 
-    function transferToken(
-        address token,
-        address to,
-        uint256 amount
-    ) external onlyOwner {
+    function transferToken(address token, address to, uint256 amount) external onlyOwner {
         IERC20(token).transfer(to, amount);
     }
 }

contracts/VAelinConverter.sol → contracts.old/VAelinConverter.sol

@@ -16,11 +16,7 @@ contract VAelinConverter is Owned {
     address public immutable AELIN;
     uint256 public startTime;
 
-    constructor(
-        address _owner,
-        address _vAelin,
-        address _aelin
-    ) Owned(_owner) {
+    constructor(address _owner, address _vAelin, address _aelin) Owned(_owner) {
         vAELIN = _vAelin;
         AELIN = _aelin;
         startTime = block.timestamp;

contracts/VirtualAelinToken.sol → contracts.old/VirtualAelinToken.sol

@@ -9,6 +9,6 @@ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 contract VirtualAelinToken is ERC20 {
     constructor(address preDistributionAddress) ERC20("Virtual Aelin Token", "vAELIN") {
-        _mint(preDistributionAddress, (((750 * 10**decimals()) * 100) / 98)); //
+        _mint(preDistributionAddress, (((750 * 10 ** decimals()) * 100) / 98)); //
     }
 }