IPC-512: Update code layout (#518)

Author: fridrik01

.github/workflows/ci.yaml

@@ -25,7 +25,6 @@ jobs:
     # Set job outputs to values from filter step
     outputs:
       contracts:     ${{ steps.filter.outputs.contracts }}
-      fvm-utils:     ${{ steps.filter.outputs.fvm-utils }}
       ipc:           ${{ steps.filter.outputs.ipc }}
       ipld-resolver: ${{ steps.filter.outputs.ipld-resolver }}
       fendermint:    ${{ steps.filter.outputs.fendermint }}
@@ -40,12 +39,10 @@ jobs:
           filters: |
             contracts:
               - 'contracts/**'
-            fvm-utils:
-              - 'fvm-utils/**'
             ipc:
               - 'ipc/**'
             ipld-resolver:
-              - 'ipld-resolver/**'
+              - 'ipld/resolver/**'
             fendermint:
               - 'fendermint/**'
 
@@ -59,6 +56,10 @@ jobs:
       needs.changes.outputs.contracts == 'true' ||
       github.ref == 'refs/heads/main'
 
+  contracts-build-and-test:
+    uses: ./.github/workflows/contracts-build-and-test.yaml
+    needs: [contracts-prettier]
+
   contracts-test:
     uses: ./.github/workflows/contracts-test.yaml
     needs: [contracts-prettier]
@@ -75,13 +76,6 @@ jobs:
     uses: ./.github/workflows/contracts-sast.yaml
     needs: [contracts-prettier]
 
-  fvm-utils:
-    uses: ./.github/workflows/fvm-utils.yaml
-    needs: [changes, license]
-    if: >-
-      needs.changes.outputs.fvm-utils == 'true' ||
-      github.ref == 'refs/heads/main'
-
   ipc:
     uses: ./.github/workflows/ipc.yaml
     needs: [changes, license]
@@ -117,7 +111,6 @@ jobs:
     if: github.ref == 'refs/heads/main'
     needs:
       - contracts-test # generates the ABI artifacts (although fendermint can do on its own too)
-      - fvm-utils
       - ipc
       - ipld-resolver
       - fendermint-test

.github/workflows/contracts-build-and-test.yaml

@@ -0,0 +1,42 @@
+name: Contract Build and Test Workflow
+
+# This workflow is triggered from the main CI workflow.
+on:
+  workflow_call:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - name: Set up Node.js
+      uses: actions/setup-node@v2
+      with:
+        node-version: '18' # Adjust this as needed for your project
+
+    - name: Install dependencies
+      run: |
+        cd contracts
+        npm install
+
+    - name: Install Foundry
+      run: |
+        cd contracts
+        curl -L https://foundry.paradigm.xyz | bash
+        export PATH="$PATH:/home/runner/.config/.foundry/bin"
+        foundryup
+        forge install
+    - name: Generate Ethereum Private Key and Create .env File and run make
+      run: |
+        cd contracts
+        PRIVATE_KEY=$(node -e "console.log(require('crypto').randomBytes(32).toString('hex'))")
+        echo "export PRIVATE_KEY=0x$PRIVATE_KEY" > .env
+        echo "export RPC_URL=http://127.0.0.1:1337" >> .env
+        echo "export CHAIN_ID=1337" >> .env
+        export PATH="$PATH:/home/runner/.config/.foundry/bin"
+        npx ganache-cli -g0 -p1337 --account 0x$PRIVATE_KEY,1001901919191919191  &
+        sleep 5
+        make

.github/workflows/fvm-utils.yaml

@@ -19,7 +19,7 @@ jobs:
           toolchain: nightly
           components: rustfmt
       - name: Check code formatting
-        run: cd ipld-resolver && make check-fmt
+        run: cd ipld/resolver && make check-fmt
 
       # - name: Check diagrams
       #   run: make check-diagrams
@@ -79,4 +79,4 @@ jobs:
           [ -d contracts/out ] || (cd contracts && make compile-abi)
 
       - name: ${{ matrix.make.name }}
-        run: cd ipld-resolver && make ${{ matrix.make.task }}
+        run: cd ipld/resolver && make ${{ matrix.make.task }}