Merge branch 'master' of github.com:FuelLabs/fuels-ts

Author: petertonysmith94

.changeset/gold-pandas-double.md

@@ -0,0 +1,2 @@
+---
+---

.changeset/happy-ducks-change.md

@@ -0,0 +1,2 @@
+---
+---

.changeset/plenty-seals-pay.md

@@ -0,0 +1,5 @@
+---
+"@fuel-ts/predicate": minor
+---
+
+exporting getPredicateRoot from the predicate package

.changeset/rude-actors-appear.md

@@ -0,0 +1,2 @@
+---
+---

.changeset/twenty-onions-enjoy.md

@@ -0,0 +1,2 @@
+---
+---

.github/actions/ci-setup/action.yaml

@@ -14,8 +14,12 @@ runs:
       with:
         path: ~/.local/share/pnpm/store/v4
         key: ${{ runner.os }}-node-${{ inputs.node-version }}-pnpm-${{ inputs.pnpm-version }}-lock-${{ hashFiles('**/pnpm-lock.yaml') }}
-        restore-keys: |
-          ${{ runner.os }}-pnpm
+
+    - name: Cache Build
+      uses: actions/cache@v3
+      with:
+        path: .turbo
+        key: ${{ runner.os }}-turbo-${{ github.sha }}
 
     - name: Setup Node.js
       uses: actions/setup-node@v2

.github/actions/test-setup/action.yaml

@@ -14,8 +14,12 @@ runs:
       with:
         path: ~/.local/share/pnpm/store/v4
         key: ${{ runner.os }}-node-${{ inputs.node-version }}-pnpm-${{ inputs.pnpm-version }}-lock-${{ hashFiles('**/pnpm-lock.yaml') }}
-        restore-keys: |
-          ${{ runner.os }}-pnpm
+
+    - name: Cache Build
+      uses: actions/cache@v3
+      with:
+        path: .turbo
+        key: ${{ runner.os }}-turbo-${{ github.sha }}
 
     - name: Setup Node.js
       uses: actions/setup-node@v2

apps/demo-typegen/.gitignore

@@ -1,7 +1,5 @@
 node_modules
-src/contract-types
-src/predicate-types
-src/script-types
+src/*-types
 
 # Forc
 **/out/debug/**

package.json

@@ -11,7 +11,7 @@
   "packageManager": "[email protected]",
   "scripts": {
     "dev": "nodemon --config nodemon.config.json -x 'pnpm build:packages'",
-    "build": "turbo run build",
+    "build": "turbo run build --cache-dir=.turbo",
     "build:packages": "turbo run build --filter=!docs",
     "ci:test": "./scripts/tests-ci.sh",
     "pretest": "turbo run pretest",
@@ -23,7 +23,7 @@
     "test:validate": "./scripts/tests-validate.sh",
     "test:e2e": "vitest --run --config vite.node.config.mts $(scripts/tests-find.sh --e2e)",
     "lint": "run-s lint:check prettier:check",
-    "lint:check": "eslint . --ext .ts",
+    "lint:check": "eslint . --ext .ts --max-warnings 0",
     "lint:fix": "pnpm lint:check --fix",
     "lint:md-links": "tsx ./scripts/lint-md-links",
     "lint:package-jsons": "tsx ./scripts/lint-package-jsons",

packages/predicate/src/index.ts

@@ -1 +1,2 @@
 export * from './predicate';
+export * from './utils/getPredicateRoot';

packages/predicate/src/utils/getPredicateRoot.test.ts

@@ -0,0 +1,18 @@
+import { getBytesCopy } from 'ethers';
+
+import { getPredicateRoot } from './getPredicateRoot';
+
+describe('getPredicateRoot', () => {
+  it('should return the correct predicate root', () => {
+    const predicateBytes = getBytesCopy(
+      '0x740000034700000000000000000000805dfcc00110fff3001aec5000910000207144000361491200764800026141120c74000007724c0002134924c05a492001764800026141124a74000001240000005c450000504900085c43f0001341044076400001740000055d43f005104103007244002028ed0440a1412ee0244000000a0000000000000038966262edb5997574be45f94c665aedb41a1663f5b0528e765f355086eebf960000000000000088'
+    );
+
+    const predicateRoot = getPredicateRoot(predicateBytes);
+
+    const expectedPredicateRoot =
+      '0xd8fe10a7e398a8af7235e0a7d43388179d89c59d521dcf314e7ee407af8cddce';
+
+    expect(predicateRoot).toEqual(expectedPredicateRoot);
+  });
+});

scripts/postbuild.ts

@@ -8,9 +8,9 @@ import { join } from 'path';
  */
 try {
   if (existsSync(join(process.cwd(), 'tsconfig.dts.json'))) {
-    execSync('tsc --emitDeclarationOnly -p tsconfig.dts.json');
+    execSync('tsc --emitDeclarationOnly -p tsconfig.dts.json', { stdio: 'inherit' });
   } else if (existsSync(join(process.cwd(), 'tsconfig.json'))) {
-    execSync('tsc --emitDeclarationOnly -p tsconfig.json');
+    execSync('tsc --emitDeclarationOnly -p tsconfig.json', { stdio: 'inherit' });
   }
 } catch (err) {
   error(err.toString());