Skip to content

Commit fb29dba

Browse files
authored
Merge branch 'main' into pn/chore/portal-links
2 parents c01facb + 3eda4a0 commit fb29dba

File tree

209 files changed

+4264
-4265
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

209 files changed

+4264
-4265
lines changed

.eslintignore

-31
This file was deleted.

.eslintrc.js

-61
This file was deleted.

.github/workflows/pr.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: 'PR Checks'
1+
name: "PR Checks"
22

33
on:
44
pull_request:
@@ -47,6 +47,5 @@ jobs:
4747

4848
- name: Run lint & ts:check
4949
run: |
50-
pnpm build
51-
pnpm lint:check
50+
pnpm lint:ci
5251
pnpm ts:check

.lintstagedrc.mjs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
export default {
2-
'**/*.(js|jsx|ts|jsx|md|mdx|json|html|css)': ['prettier --write'],
3-
'**/*.ts?(x)': ['eslint'],
2+
'**/*.(js|jsx|ts|tsx|md|json|mdx|html|css)': ['biome check --apply-unsafe'],
43
};

.npmrc

+3-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ save-workspace-protocol=rolling
2727
public-hoist-pattern[]=*tailwind-variants*
2828
public-hoist-pattern[]=*framer-motion*
2929
public-hoist-pattern[]=*@react-aria/interactions*
30-
public-hoist-pattern[]=*eslint*
31-
public-hoist-pattern[]=*prettier*
3230
public-hoist-pattern[]=*ts-node*
3331
public-hoist-pattern[]=@types*
32+
public-hoist-pattern[]=*viem*
33+
public-hoist-pattern[]=*wagmi*
34+
public-hoist-pattern[]=*ethers*

.prettierignore

-25
This file was deleted.

.prettierrc.js

-17
This file was deleted.

.vscode/extensions.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"recommendations": [
3-
"esbenp.prettier-vscode",
4-
"dbaeumer.vscode-eslint",
3+
"biomejs.biome",
54
"statelyai.stately-vscode",
65
"firsttris.vscode-jest-runner",
76
"rust-lang.rust-analyzer",

.vscode/settings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"editor.defaultFormatter": "esbenp.prettier-vscode",
2+
"editor.defaultFormatter": "biomejs.biome",
33
"editor.formatOnSave": true,
44
"editor.codeActionsOnSave": {
55
"source.fixAll.eslint": "explicit"

biome.json

+80
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
{
2+
"$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
3+
"organizeImports": {
4+
"enabled": true
5+
},
6+
"formatter": {
7+
"enabled": true,
8+
"formatWithErrors": true,
9+
"indentStyle": "space",
10+
"indentWidth": 2,
11+
"lineWidth": 80
12+
},
13+
"linter": {
14+
"enabled": true,
15+
"rules": {
16+
"recommended": true,
17+
"style": {
18+
"noNonNullAssertion": "off"
19+
},
20+
"suspicious": {
21+
"noExplicitAny": "warn",
22+
"noImplicitAnyLet": "warn",
23+
"noArrayIndexKey": "off",
24+
"noConfusingVoidType": "off",
25+
"noSelfCompare": "off"
26+
},
27+
"correctness": {
28+
"useExhaustiveDependencies": "off"
29+
},
30+
"complexity": {
31+
"noStaticOnlyClass": "off",
32+
"noForEach": "warn",
33+
"noBannedTypes": "off"
34+
},
35+
"performance": {
36+
"noAccumulatingSpread": "off"
37+
},
38+
"a11y": {
39+
"noSvgWithoutTitle": "off"
40+
}
41+
}
42+
},
43+
"javascript": {
44+
"formatter": {
45+
"quoteStyle": "single"
46+
}
47+
},
48+
"json": {
49+
"parser": {
50+
"allowTrailingCommas": true
51+
}
52+
},
53+
"vcs": {
54+
"enabled": true,
55+
"clientKind": "git",
56+
"useIgnoreFile": true
57+
},
58+
"files": {
59+
"ignore": [
60+
"**/node_modules",
61+
"**/.turbo",
62+
"**/.next",
63+
"**/.vercel",
64+
"**/dist",
65+
"**/build",
66+
"**/fuel-v2-contracts",
67+
"**/coverage",
68+
"**/generated",
69+
"**/storybook-static",
70+
"*.typegen.ts",
71+
"./packages/app-explorer/public/storybook",
72+
"./packages/app-explorer/public/ui",
73+
"./packages/app-explorer/public/portal",
74+
"./packages/app-explorer/public/portal-storybook",
75+
"./packages/app-portal/public/**",
76+
"./packages/app-portal/src/types",
77+
"pnpm-lock.yaml"
78+
]
79+
}
80+
}

contracts/predicate/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"license": "ISC",
1414
"devDependencies": {
1515
"dotenv": "16.4.1",
16-
"fuels": "0.71.1",
17-
"vitest": "1.2.1",
16+
"fuels": "0.73.0",
17+
"vitest": "1.2.2",
1818
"tsx": "4.7.0"
1919
}
2020
}

contracts/predicate/scripts/run-predicate.ts

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
import { BaseAssetId, Predicate, Provider, Wallet, bn, hexlify } from 'fuels';
21
import { promises as fs } from 'node:fs';
32
import { resolve } from 'node:path';
3+
import { BaseAssetId, Predicate, Provider, Wallet, bn, hexlify } from 'fuels';
44

55
const { FUEL_PROVIDER, PRIVATE_KEY } = process.env;
66
const BIN_PATH = resolve(__dirname, '../out/debug/predicate-app.bin');
77
const AMOUNT = 300_000;
88

99
if (!FUEL_PROVIDER || !PRIVATE_KEY) {
10-
throw new Error('Missing some config in .env file. Should have FUEL_PROVIDER and PRIVATE_KEY');
10+
throw new Error(
11+
'Missing some config in .env file. Should have FUEL_PROVIDER and PRIVATE_KEY',
12+
);
1113
}
1214

1315
async function main() {
@@ -43,7 +45,7 @@ async function main() {
4345
BaseAssetId,
4446
{
4547
gasPrice,
46-
}
48+
},
4749
);
4850
const res2 = await tx2.waitForResult();
4951
console.log(`→ Transaction Id: ${res2.id}`);

docker/erc20-deployer/deployer/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
"dependencies": {
77
"@fuel-bridge/test-utils": "next",
88
"ethers": "5.7.2",
9-
"fuels": "0.71.1"
9+
"fuels": "0.73.0"
1010
},
1111
"devDependencies": {
12-
"ts-node": "^10.9.1"
12+
"ts-node": "^10.9.2"
1313
}
1414
}

docker/erc20-deployer/deployer/src/index.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
import { createServer } from 'http';
12
import {
23
getOrDeployECR20Contract,
34
getOrDeployFuelTokenContract,
45
getTokenId,
56
setupEnvironment,
67
} from '@fuel-bridge/test-utils';
7-
import { createServer } from 'http';
88

99
const {
1010
PORT,
@@ -32,7 +32,7 @@ async function main() {
3232
gasPrice: 1,
3333
gasLimit: 1_000_000,
3434
},
35-
9
35+
9,
3636
);
3737
const tokenId = getTokenId(FuelToken);
3838
await startServer({
@@ -44,7 +44,7 @@ async function main() {
4444

4545
function startServer(deployments: Record<string, string>) {
4646
return new Promise((resolve) => {
47-
createServer(function (req, res) {
47+
createServer((req, res) => {
4848
switch (req.url) {
4949
case '/health':
5050
res.writeHead(200, { 'Content-Type': 'text/plain' });

docker/l1-chain/hardhat/hardhat.config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import type { HardhatUserConfig } from 'hardhat/types';
21
import '@nomiclabs/hardhat-etherscan';
32
import '@openzeppelin/hardhat-upgrades';
43
import 'hardhat-typechain';
4+
import type { HardhatUserConfig } from 'hardhat/types';
55

66
const ETHERSCAN_API_KEY = process.env.ETHERSCAN_API_KEY || '';
77
const LOCALHOST_HTTP = process.env.LOCALHOST_HTTP || '';

docker/l1-chain/hardhat/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
"license": "MIT",
88
"dependencies": {
99
"dotenv": "^10.0.0",
10-
"hardhat": "^2.9.6"
10+
"hardhat": "^2.19.5"
1111
}
1212
}

0 commit comments

Comments
 (0)