Merge pull request #6 from Axis-Fi/layout

Re-org, import scripts

.github/workflows/test.yml → .github/workflows/axis-utils.yml

@@ -1,4 +1,4 @@
-name: test
+name: axis-utils
 
 on:
     push:
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: true
 
-    name: Foundry project
+    name: axis-utils
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -29,21 +29,25 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v3
         with:
-            version: 8
+            version: 9
 
       - name: Install Node dependencies
+        working-directory: packages/axis-utils
         run: pnpm install
 
       - name: Run lint check
+        working-directory: packages/axis-utils
         run: pnpm run lint:check
 
       - name: Run Forge build
+        working-directory: packages/axis-utils
         run: |
           forge --version
           forge build --sizes
         id: build
 
       # - name: Run Forge tests
+      # working-directory: packages/axis-utils
       #   run: |
       #     forge test -vvv
       #   id: test

.gitignore

@@ -1,4 +1,5 @@
 node_modules/
+dependencies/
 
 # Compiler files
 cache/

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "lib/forge-std"]
-	path = lib/forge-std
-	url = https://github.com/foundry-rs/forge-std

packages/axis-utils/foundry.toml

@@ -0,0 +1,36 @@
+[profile.default]
+src = "src"
+out = "out"
+libs = ["lib"]
+solc_version = "0.8.19"
+evm_version = "paris"
+
+[fuzz]
+runs = 1024
+
+# Remappings are setup using remappings.txt, since forge seems to ignore remappings here
+
+[fmt]
+line_length = 100
+tab_width = 4
+bracket_spacing = false
+multiline_func_header = "params_first"
+quote_style = "double"
+number_underscore = "thousands"
+wrap_comments = false
+ignore = [
+  "lib/**",
+]
+
+# See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options
+
+[dependencies]
+forge-std = "1.9.1"
+solmate = { version = "6.7.0", url = "git@github.com:transmissions11/solmate.git", commit = "c892309933b25c03d32b1b0d674df7ae292ba925" }
+axis-core = { version = "0.5.1", git = "git@github.com:Axis-Fi/axis-core.git", rev = "d07b3311771ea3162d99aa68689e40f4f4bd8135" }
+axis-periphery = { version = "0.5.1", git = "git@github.com:Axis-Fi/axis-periphery.git", rev = "fffb93ada5fe5d6f6529f0030d1c16a623ab4782" }
+solady = { version = "0.0.124" }
+clones-with-immutable-args = { version = "1.1.1", git = "git@github.com:wighawag/clones-with-immutable-args.git", rev = "f5ca191afea933d50a36d101009b5644dc28bc99" }
+"@openzeppelin-contracts" = { version = "4.9.2" }
+"@uniswap-v2-core" = { version = "1.0.1" }
+"@uniswap-v2-periphery" = { version = "1.0.1", git = "git@github.com:Axis-Fi/uniswap-v2-periphery.git", rev = "19be650786731dfe43cac3aac7a2d1f0731d18e2" }

packages/axis-utils/install.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+echo ""
+echo "*** Installing forge dependencies"
+forge install
+echo "    Done"
+
+echo ""
+echo "*** Installing soldeer dependencies"
+rm -rf dependencies/* && forge soldeer update
+echo "    Done"

package.json → packages/axis-utils/package.json

@@ -1,11 +1,12 @@
 {
-  "name": "axis-periphery",
+  "name": "axis-utils",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",
   "scripts": {
     "lint": "forge fmt && pnpm run solhint",
     "lint:check": "forge fmt --check && pnpm run solhint:check",
+    "postinstall": "./install.sh",
     "solhint": "solhint --fix --noPrompt --config ./.solhint.json 'src/**/*.sol' 'test/**/*.sol' 'script/**/*.sol'",
     "solhint:check": "solhint --config ./.solhint.json 'src/**/*.sol' 'test/**/*.sol' 'script/**/*.sol'"
   },