Skip to content

Commit 0708cf5

Browse files
committed
Merge branch 'main' of github.com:FuelLabs/fuel-explorer into lf/fix/structure-and-txlist
2 parents 309018d + 3eda4a0 commit 0708cf5

File tree

230 files changed

+4520
-4372
lines changed

Some content is hidden

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

230 files changed

+4520
-4372
lines changed

.eslintignore

-31
This file was deleted.

.eslintrc.js

-61
This file was deleted.

.github/actions/docker-publish/action.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ inputs:
1919
dockerfile:
2020
description: 'Path to the Dockerfile'
2121
required: true
22+
context:
23+
description: 'Path to the Context'
24+
default: .
25+
required: true
2226
build-args:
2327
description: 'List of build-time variables'
2428
required: false
@@ -65,7 +69,7 @@ runs:
6569
uses: docker/build-push-action@v4
6670
id: publish
6771
with:
68-
context: .
72+
context: ${{ inputs.context }}
6973
file: ${{ inputs.dockerfile }}
7074
push: true
7175
tags: ${{ steps.meta.outputs.tags }}

.github/workflows/docker-publish.yml

+1
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,4 @@ jobs:
3030
password: ${{ secrets.GITHUB_TOKEN }}
3131
image: ghcr.io/fuellabs/fuel-explorer
3232
dockerfile: deployment/Dockerfile
33+
context: ./packages/graphql

.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

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
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

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

9-
if (!FUEL_PROVIDER_BETA5 || !PRIVATE_KEY) {
10-
throw new Error('Missing some config on your .env file');
9+
if (!FUEL_PROVIDER || !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() {
1416
const binHex = hexlify(await fs.readFile(BIN_PATH));
15-
const provider = await Provider.create(FUEL_PROVIDER_BETA5!);
17+
const provider = await Provider.create(FUEL_PROVIDER!);
1618
const wallet = Wallet.fromPrivateKey(PRIVATE_KEY!, provider);
1719
const { minGasPrice: gasPrice } = wallet.provider.getGasConfig();
1820
const walletAddress = wallet.address.toB256();
@@ -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}`);

deployment/Dockerfile

+6-5
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,21 @@ FROM node:20-slim AS base
44

55
# Expose the ENVs to the env of the container
66
ENV PORT="${PORT}"
7-
ENV FUEL_PROVIDER_BETA5="${FUEL_PROVIDER_BETA5}"
7+
ENV FUEL_PROVIDER="${FUEL_PROVIDER:-https://beta-5.fuel.network/graphql}"
88
ENV PNPM_HOME="/pnpm"
99
ENV PATH="$PNPM_HOME:$PATH"
10+
ENV SERVER_BUILD=true
1011

1112
# Enable pnpm using corepack form node.js
1213
RUN corepack enable
1314

1415
COPY . /app-explorer
1516
WORKDIR /app-explorer
1617

17-
RUN pnpm install --frozen-lockfile
18+
RUN pnpm install
1819

19-
EXPOSE 4444
20+
EXPOSE ${PORT}
2021

21-
WORKDIR /app-explorer/packages/graphql
22+
WORKDIR /app-explorer
2223

23-
CMD ["pnpm", "start"]
24+
CMD ["pnpm", "server:start"]

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
}

0 commit comments

Comments
 (0)