fix merge conflict

FuelLabs · Jul 4, 2024 · 519e608 · 519e608
2 parents 006bab7 + 799e871
commit 519e608
Show file tree

Hide file tree

Showing 216 changed files with 1,924 additions and 1,509 deletions.
diff --git a/.changeset/big-bats-laugh.md b/.changeset/big-bats-laugh.md
diff --git a/.changeset/big-ears-dress.md b/.changeset/big-ears-dress.md
diff --git a/.changeset/brown-ducks-collect.md b/.changeset/brown-ducks-collect.md
diff --git a/.changeset/calm-taxis-burn.md b/.changeset/calm-taxis-burn.md
diff --git a/.changeset/chilly-dolphins-call.md b/.changeset/chilly-dolphins-call.md
diff --git a/.changeset/clever-jobs-give.md b/.changeset/clever-jobs-give.md
diff --git a/.changeset/cool-bugs-mix.md b/.changeset/cool-bugs-mix.md
diff --git a/.changeset/curly-insects-happen.md b/.changeset/curly-insects-happen.md
diff --git a/.changeset/dirty-guests-tickle.md b/.changeset/dirty-guests-tickle.md
diff --git a/.changeset/dull-tips-sleep.md b/.changeset/dull-tips-sleep.md
diff --git a/.changeset/forty-mice-talk.md b/.changeset/forty-mice-talk.md
diff --git a/.changeset/four-seas-stare.md b/.changeset/four-seas-stare.md
diff --git a/.changeset/funny-panthers-cross.md b/.changeset/funny-panthers-cross.md
diff --git a/.changeset/funny-rats-tap.md b/.changeset/funny-rats-tap.md
diff --git a/.changeset/good-poems-boil.md b/.changeset/good-poems-boil.md
diff --git a/.changeset/healthy-ravens-clap.md b/.changeset/healthy-ravens-clap.md
diff --git a/.changeset/large-books-shop.md b/.changeset/large-books-shop.md
diff --git a/.changeset/large-kings-return.md b/.changeset/large-kings-return.md
diff --git a/.changeset/little-coats-draw.md b/.changeset/little-coats-draw.md
diff --git a/.changeset/many-goats-wonder.md b/.changeset/many-goats-wonder.md
diff --git a/.changeset/metal-jokes-judge.md b/.changeset/metal-jokes-judge.md
diff --git a/.changeset/modern-bugs-exist.md b/.changeset/modern-bugs-exist.md
diff --git a/.changeset/new-horses-battle.md b/.changeset/new-horses-battle.md
diff --git a/.changeset/nice-rabbits-confess.md b/.changeset/nice-rabbits-confess.md
diff --git a/.changeset/proud-files-attend.md b/.changeset/proud-files-attend.md
diff --git a/.changeset/quick-avocados-fetch.md b/.changeset/quick-avocados-fetch.md
diff --git a/.changeset/quick-maps-glow.md b/.changeset/quick-maps-glow.md
diff --git a/.changeset/quiet-toes-chew.md b/.changeset/quiet-toes-chew.md
diff --git a/.changeset/red-singers-search.md b/.changeset/red-singers-search.md
diff --git a/.changeset/rotten-suits-rush.md b/.changeset/rotten-suits-rush.md
diff --git a/.changeset/selfish-grapes-pretend.md b/.changeset/selfish-grapes-pretend.md
diff --git a/.changeset/serious-dogs-wash.md b/.changeset/serious-dogs-wash.md
diff --git a/.changeset/seven-moles-live.md b/.changeset/seven-moles-live.md
diff --git a/.changeset/sharp-windows-breathe.md b/.changeset/sharp-windows-breathe.md
diff --git a/.changeset/six-kiwis-begin.md b/.changeset/six-kiwis-begin.md
diff --git a/.changeset/slow-students-destroy.md b/.changeset/slow-students-destroy.md
diff --git a/.changeset/soft-colts-build.md b/.changeset/soft-colts-build.md
diff --git a/.changeset/stale-crabs-shop.md b/.changeset/stale-crabs-shop.md
diff --git a/.changeset/stale-starfishes-hope.md b/.changeset/stale-starfishes-hope.md
diff --git a/.changeset/strange-birds-leave.md b/.changeset/strange-birds-leave.md
diff --git a/.changeset/strong-ducks-tie.md b/.changeset/strong-ducks-tie.md
diff --git a/.changeset/stupid-steaks-count.md b/.changeset/stupid-steaks-count.md
diff --git a/.changeset/tall-ravens-crash.md b/.changeset/tall-ravens-crash.md
diff --git a/.changeset/ten-suns-knock.md b/.changeset/ten-suns-knock.md
diff --git a/.changeset/tender-coins-bathe.md b/.changeset/tender-coins-bathe.md
diff --git a/.changeset/three-spiders-perform.md b/.changeset/three-spiders-perform.md
diff --git a/.changeset/wet-camels-laugh.md b/.changeset/wet-camels-laugh.md
diff --git a/.changeset/wild-maps-build.md b/.changeset/wild-maps-build.md
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -3,9 +3,8 @@ updates:
   - package-ecosystem: "npm"
     directory: "/"
     schedule:
-      interval: "weekly"
-      day: "sunday"
-    open-pull-requests-limit: 10
+      interval: "daily"
+    open-pull-requests-limit: 1
     labels:
       - "chore"
     commit-message:

diff --git a/.github/workflows/pr-validate-changesets.yaml b/.github/workflows/pr-validate-changesets.yaml
@@ -39,9 +39,16 @@ jobs:
         env:
           PR_TITLE: ${{ github.event.pull_request.title }}
 
+      - name: Set up .netrc file
+        run: |
+          echo "machine github.com" > $HOME/.netrc
+          echo "login github-actions[bot]" >> $HOME/.netrc
+          echo "password ${{ secrets.REPO_TOKEN }}" >> $HOME/.netrc
+          chmod 600 $HOME/.netrc
+
       - name: Commit Changeset
         run: |
-          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git config user.name "github-actions[bot]"
           git add .
           git commit -m "build: update dependency changeset"

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -106,7 +106,8 @@ jobs:
         run: pnpm test:e2e
         env:
           TESTNET_WALLET_PVT_KEY: ${{ secrets.TESTNET_WALLET_PVT_KEY }}
-          DEVNET_WALLET_PVT_KEY: ${{ github.head_ref == 'changeset-release/master' && secrets.DEVNET_WALLET_PVT_KEY || '' }}
+          # uncomment the below line to test against devnet
+          # DEVNET_WALLET_PVT_KEY: ${{ secrets.DEVNET_WALLET_PVT_KEY }}
 
   test:
     if: github.base_ref == 'master' || github.ref_name == 'master'

diff --git a/apps/create-fuels-counter-guide/package.json b/apps/create-fuels-counter-guide/package.json
@@ -18,15 +18,15 @@
     "@tanstack/react-query": "^5.29.2",
     "dotenv": "^16.4.5",
     "next": "14.2.4",
-    "react": "^18.2",
-    "react-dom": "^18.2",
+    "react": "^18.3",
+    "react-dom": "^18.3",
     "react-hot-toast": "^2.4.1",
     "react-use": "^17.5.0"
   },
   "devDependencies": {
     "@types/node": "^20",
-    "@types/react": "^18.2",
-    "@types/react-dom": "^18.2",
+    "@types/react": "^18.3",
+    "@types/react-dom": "^18.3",
     "autoprefixer": "^10.0.1",
     "eslint": "^8",
     "eslint-config-next": "14.2.4",

diff --git a/apps/create-fuels-counter-guide/src/components/Link.tsx b/apps/create-fuels-counter-guide/src/components/Link.tsx
@@ -1,3 +1,5 @@
+import NextLink from 'next/link';
+
 export const Link = ({
   href,
   children,
@@ -10,12 +12,12 @@ export const Link = ({
   target?: string;
 }) => {
   return (
-    <a
+    <NextLink
       href={href}
       className={`text-fuel-green hover:underline ${className}`}
       target={target}
     >
       {children}
-    </a>
+    </NextLink>
   );
 };
diff --git a/apps/demo-bun-fuels/package.json b/apps/demo-bun-fuels/package.json
@@ -14,6 +14,6 @@
   },
   "version": null,
   "devDependencies": {
-    "bun": "^1.1.9"
+    "bun": "^1.1.17"
   }
 }
diff --git a/apps/demo-bun-fuels/src/bun.test.ts b/apps/demo-bun-fuels/src/bun.test.ts
@@ -5,9 +5,8 @@
  * It ensures that built code is fully working.
  */
 
-import { generateTestWallet } from '@fuel-ts/account/test-utils';
-import { safeExec } from '@fuel-ts/errors/test-utils';
 import { ContractFactory, Provider, toHex, Wallet, FUEL_NETWORK_URL } from 'fuels';
+import { generateTestWallet , safeExec } from 'fuels/test-utils';
 
 import { SampleAbi__factory } from './sway-programs-api';
 import bytecode from './sway-programs-api/contracts/SampleAbi.hex';

diff --git a/apps/demo-fuels/src/index.test.ts b/apps/demo-fuels/src/index.test.ts
@@ -5,9 +5,8 @@
  * It ensures that built code is fully working.
  */
 
-import { generateTestWallet } from '@fuel-ts/account/test-utils';
-import { safeExec } from '@fuel-ts/errors/test-utils';
 import { ContractFactory, Provider, toHex, Wallet, FUEL_NETWORK_URL } from 'fuels';
+import { generateTestWallet , safeExec } from 'fuels/test-utils';
 
 import { SampleAbi__factory } from './sway-programs-api';
 import bytecode from './sway-programs-api/contracts/SampleAbi.hex';