Skip to content

Commit

Permalink
Merge branch 'master' into mc/chore/deprecate-bech32
Browse files Browse the repository at this point in the history
  • Loading branch information
maschad committed Nov 20, 2024
2 parents 344713c + 6ab3e6b commit 6f47f6d
Show file tree
Hide file tree
Showing 668 changed files with 16,449 additions and 13,342 deletions.
11 changes: 11 additions & 0 deletions .changeset/large-points-arrive.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
"@fuel-ts/abi-typegen": patch
"@fuel-ts/abi-coder": patch
"@fuel-ts/account": patch
"@fuel-ts/address": patch
"@fuel-ts/program": patch
"@fuel-ts/script": patch
"@fuel-ts/math": patch
---

chore: added noImplicitOverride option to config
5 changes: 5 additions & 0 deletions .changeset/twenty-needles-buy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@fuel-ts/contract": patch
---

feat: better typegen contract factory integration with `launchTestNode`
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ apps/demo-react-cra
apps/demo-react-vite
apps/create-fuels-counter-guide
apps/docs-snippets2/src/typegend
apps/docs-snippets2/src/**/*.wrapped.ts
apps/docs-snippets2/src/**/*.test.ts

packages/fuels/src/cli/commands/deploy/proxy
packages/fuels/test/fixtures/project
Expand Down
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ module.exports = {
},
},
rules: {
'no-continue': 'off',
'no-restricted-syntax': [
'off',
{
Expand Down
27 changes: 27 additions & 0 deletions .github/workflows/bench-devnet.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: "Bench Devnet"

on:
push:
branches:
- release/*

jobs:
benchmarks:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: CI Setup
uses: ./.github/actions/test-setup

- name: Pretest
run: pnpm pretest

- name: Run Node benchmarks
uses: CodSpeedHQ/action@v3
with:
run: pnpm bench:node
token: ${{ secrets.CODSPEED_TOKEN }}
env:
DEVNET_WALLET_PVT_KEY: ${{ secrets.DEVNET_WALLET_PVT_KEY }}
4 changes: 2 additions & 2 deletions .github/workflows/bench.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
name: Benchmarks

on:
pull_request:
push:
branches:
- master
- next

jobs:
benchmarks:
runs-on: ubuntu-latest
# remove if:false after fine-tuning benchmarks
if: false
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: "CodeQL"

on:
push:
branches: [ "master" ]
branches: [ "master" , "next" ]
pull_request:
branches: [ "master" ]
branches: [ "master" , "next" ]
schedule:
- cron: '40 13 * * 4'

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/forc-version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
pull_request:
branches:
- master
- next

jobs:
verify-forc-version:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,11 @@ jobs:
run: pnpm test:coverage-diff

- name: Report Coverage
uses: thollander/actions-comment-pull-request@v2
uses: thollander/actions-comment-pull-request@v3
if: ${{ steps.findPr.outputs.number }}
with:
filePath: coverage/report/coverage-diff.txt
pr_number: ${{ (steps.findPr.outputs.number) }}
comment_tag: diff
file-path: coverage/report/coverage-diff.txt
pr-number: ${{ (steps.findPr.outputs.number) }}
comment-tag: diff
mode: recreate
create_if_not_exists: true
create-if-not-exists: true
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,7 @@ _site/
Forc.lock

# Ignore forc builds
**/out/debug
**/out/release
**/out
**/test-predicate-*/index.ts

## Ignore perf test files
Expand All @@ -169,3 +168,5 @@ Forc.lock
/playwright-report/
/blob-report/
/playwright/.cache/

FUELS_VERSION
5 changes: 5 additions & 0 deletions .knip.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"/apps/docs/*",
"/packages/abi-typegen/test/**",
"templates/**",
"/apps/docs-snippets/**",
"/apps/docs-snippets2/**/*.test.ts",
"apps/create-fuels-counter-guide/**"
],
Expand All @@ -14,6 +15,7 @@
"bun",
"@/sway-api/*",
"@fuel-ts/*",
"@fuels/connectors",
"@internal/fuel-core",
"@internal/forc",
"@types/jest",
Expand All @@ -28,6 +30,9 @@
"eslint-plugin-react",
"eslint-plugin-react-hooks",
"dotenv",
"ethers",
"kill",
"lsof",
"memfs",
"open",
"textlint",
Expand Down
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ apps/demo-typegen/src/script-types
apps/demo-typegen/src/predicate-types
apps/docs/.vitepress/cache/
apps/create-fuels-counter-guide
apps/docs-snippets/.fuels
apps/docs-snippets2/.fuels

packages/fuels/src/cli/commands/deploy/proxy
packages/fuels/test/fixtures/project
Expand Down
9 changes: 8 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@
"options": {
"useTabs": false
}
},
{
"files": ["apps/docs-snippets2/src/**/*.ts"],
"excludeFiles": ["apps/docs-snippets2/src/**/*.test.ts"],
"options": {
"printWidth": 80
}
}
]
}
}
4 changes: 0 additions & 4 deletions apps/create-fuels-counter-guide/fuel-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
[toolchain]
channel = "testnet"

[components]
forc = "0.63.5"
fuel-core = "0.35.0"
22 changes: 11 additions & 11 deletions apps/create-fuels-counter-guide/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,31 +18,31 @@
"@fuels/react": "^0.27.1",
"@tanstack/react-query": "^5.55.4",
"clsx": "2.1.1",
"@wagmi/connectors": "^5.1.12",
"@wagmi/core": "^2.13.6",
"@wagmi/connectors": "^5.1.14",
"@wagmi/core": "^2.13.9",
"dotenv": "^16.4.5",
"fuels": "workspace:*",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-toastify": "^10.0.5"
"react-toastify": "^10.0.6"
},
"devDependencies": {
"@vitejs/plugin-react": "^4.3.1",
"@vitejs/plugin-react": "^4.3.3",
"@eslint/js": "^9.10.0",
"@types/node": "^22.5.5",
"@playwright/test": "^1.47.2",
"@types/react": "^18.3.8",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3",
"autoprefixer": "^10.4.20",
"eslint": "^8.57.0",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-refresh": "^0.4.12",
"eslint-plugin-react-refresh": "^0.4.13",
"globals": "^15.9.0",
"postcss": "^8.4.47",
"tailwindcss": "^3.4.12",
"typescript": "~5.6.2",
"typescript-eslint": "^8.5.0",
"vite": "^5.4.7",
"postcss": "^8.4.49",
"tailwindcss": "^3.4.14",
"typescript": "~5.6.3",
"typescript-eslint": "^8.8.0",
"vite": "^5.4.9",
"vitest": "~2.0.5"
}
}
2 changes: 1 addition & 1 deletion apps/demo-bun-fuels/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
"fuels": "workspace:*"
},
"devDependencies": {
"bun": "^1.1.29"
"bun": "^1.1.31"
}
}
6 changes: 2 additions & 4 deletions apps/demo-fuels/fuels.config.full.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable no-console */
import { createConfig } from 'fuels';
import type { ContractDeployOptions, DeployedContract, FuelsConfig } from 'fuels';
import type { ContractDeployOptions, DeployedData, FuelsConfig } from 'fuels';

const MY_FIRST_DEPLOYED_CONTRACT_NAME = '';

Expand Down Expand Up @@ -91,9 +91,7 @@ export default createConfig({
// #endregion onBuild

// #region onDeploy
// #import { DeployedContract, FuelsConfig };

onDeploy: (config: FuelsConfig, data: DeployedContract[]) => {
onDeploy: (config: FuelsConfig, data: DeployedData) => {
console.log('fuels:onDeploy', { config, data });
},
// #endregion onDeploy
Expand Down
8 changes: 4 additions & 4 deletions apps/demo-nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
"pretest": "pnpm original:build"
},
"dependencies": {
"@fuels/vm-asm": "0.57.1",
"@fuels/vm-asm": "0.58.2",
"@types/node": "^22.5.5",
"@types/react-dom": "^18.3",
"@types/react": "^18.3.8",
"@types/react": "^18.3.11",
"fuels": "workspace:*",
"next": "14.2.13",
"next": "14.2.15",
"react-dom": "^18.3.1",
"react": "^18.3.1",
"typescript": "~5.6.2"
"typescript": "~5.6.3"
}
}
6 changes: 3 additions & 3 deletions apps/demo-react-cra/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
"version": "0.1.29",
"private": true,
"dependencies": {
"@fuels/vm-asm": "0.57.1",
"@fuels/vm-asm": "0.58.2",
"@testing-library/react": "^16.0.1",
"@types/node": "^22.5.5",
"@types/react": "^18.3.8",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3",
"eslint-config-react-app": "^7.0.1",
"fuels": "workspace:*",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-scripts": "5.0.1",
"typescript": "~5.6.2",
"typescript": "~5.6.3",
"web-vitals": "^2.1.4"
},
"scripts": {
Expand Down
12 changes: 6 additions & 6 deletions apps/demo-react-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@
"pretest": "pnpm original:build"
},
"dependencies": {
"@fuels/vm-asm": "0.57.1",
"@fuels/vm-asm": "0.58.2",
"fuels": "workspace:*",
"react-dom": "^18.3.1",
"react": "^18.3.1"
},
"devDependencies": {
"@types/react": "^18.3.8",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3",
"@typescript-eslint/eslint-plugin": "^6.9.1",
"@typescript-eslint/parser": "^6.21.0",
"@vitejs/plugin-react": "^4.3.1",
"@vitejs/plugin-react": "^4.3.3",
"eslint": "^8.57.0",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-refresh": "^0.4.12",
"typescript": "~5.6.2",
"vite": "^5.4.7"
"eslint-plugin-react-refresh": "^0.4.13",
"typescript": "~5.6.3",
"vite": "^5.4.9"
}
}
12 changes: 6 additions & 6 deletions apps/demo-wallet-sdk-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@
"@fuels/react": "^0.27.1",
"@tanstack/react-query": "^5.55.4",
"fuels": "workspace:*",
"next": "14.2.13",
"next": "14.2.15",
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"devDependencies": {
"@types/node": "^22.5.5",
"@types/react": "^18.3.8",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3",
"eslint": "^8.57.0",
"eslint-config-next": "14.2.13",
"postcss": "^8.4.47",
"eslint-config-next": "14.2.15",
"postcss": "^8.4.49",
"postcss-load-config": "^6.0.1",
"tailwindcss": "^3.4.12",
"typescript": "~5.6.2"
"tailwindcss": "^3.4.14",
"typescript": "~5.6.3"
}
}
1 change: 1 addition & 0 deletions apps/docs-snippets/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.fuels/
5 changes: 1 addition & 4 deletions apps/docs-snippets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,12 @@
"description": "",
"private": true,
"scripts": {
"pretest": "run-s build:forc type:check",
"build:forc": "pnpm fuels build",
"type:check": "tsc --noEmit"
"pretest": "./scripts/pretest.sh"
},
"devDependencies": {
"@fuel-ts/account": "workspace:*",
"@fuel-ts/errors": "workspace:*",
"@fuel-ts/utils": "workspace:*",
"ethers": "^6.13.2",
"fuels": "workspace:*",
"vitest": "~2.0.5"
},
Expand Down
14 changes: 14 additions & 0 deletions apps/docs-snippets/scripts/pretest.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Check if node is already running at port 4000, if not start it
# TODO: This is a temporary solution to avoid conflicts with the test node in docs-snippets2
if ! lsof -t -i:4000 > /dev/null; then
pnpm fuels node > /dev/null 2>&1 &
fi

# Builds projects
pnpm fuels build

# Deploys projects (needed for loader bytecode)
pnpm fuels deploy

# Checks for type errors
pnpm tsc --noEmit
Loading

0 comments on commit 6f47f6d

Please sign in to comment.