Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: beta-5 #146

Merged
merged 4 commits into from
Jan 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: FuelLabs/github-actions/setups/node@master
with:
node-version: 18.19.0

- name: Run Audit
# temporally avoid low severity vulnerabilities
Expand All @@ -40,6 +42,8 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: FuelLabs/github-actions/setups/node@master
with:
node-version: 18.19.0

- name: Run lint & ts:check
run: |
Expand Down
2 changes: 1 addition & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
node-version=18.14.1
node-version=18.19.0

# Not always possible to be strict, but if it works for you, keep it to true.
# https://pnpm.io/next/npmrc#strict-peer-dependencies
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.14.1
18.19.0
4 changes: 1 addition & 3 deletions contracts/predicate/.env.example
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
FUEL_PROVIDER_URL=https://beta-4.fuel.network/graphql
PRIVATE_KEY=

FUEL_PROVIDER_URL=https://beta-5.swayswap.io/graphql
6 changes: 3 additions & 3 deletions contracts/predicate/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"license": "ISC",
"devDependencies": {
"dotenv": "16.3.1",
"fuels": "0.67.0",
"vitest": "0.34.6",
"tsx": "4.6.0"
"fuels": "0.71.0",
"vitest": "1.1.3",
"tsx": "4.7.0"
}
}
6 changes: 3 additions & 3 deletions contracts/predicate/scripts/run-predicate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ import { BaseAssetId, Predicate, Provider, Wallet, bn, hexlify } from 'fuels';
import { promises as fs } from 'node:fs';
import { resolve } from 'node:path';

const { FUEL_PROVIDER_URL, PRIVATE_KEY } = process.env;
const { FUEL_PROVIDER_BETA5, PRIVATE_KEY } = process.env;
const BIN_PATH = resolve(__dirname, '../out/debug/predicate-app.bin');
const AMOUNT = 300_000;

if (!FUEL_PROVIDER_URL || !PRIVATE_KEY) {
if (!FUEL_PROVIDER_BETA5 || !PRIVATE_KEY) {
throw new Error('Missing some config on your .env file');
}

async function main() {
const binHex = hexlify(await fs.readFile(BIN_PATH));
const provider = await Provider.create(FUEL_PROVIDER_URL!);
const provider = await Provider.create(FUEL_PROVIDER_BETA5!);
const wallet = Wallet.fromPrivateKey(PRIVATE_KEY!, provider);
const { minGasPrice: gasPrice } = wallet.provider.getGasConfig();
const walletAddress = wallet.address.toB256();
Expand Down
2 changes: 1 addition & 1 deletion deployment/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM node:20-slim AS base

# Expose the ENVs to the env of the container
ENV PORT="${PORT}"
ENV FUEL_PROVIDER_URL="${FUEL_PROVIDER_URL}"
ENV FUEL_PROVIDER_BETA5="${FUEL_PROVIDER_BETA5}"
ENV PNPM_HOME="/pnpm"
ENV PATH="$PNPM_HOME:$PATH"

Expand Down
2 changes: 1 addition & 1 deletion docs/GETTING_STARTED.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

This project includes both frontend and contracts. To begin, install dependencies:

- [Node.js v18.14.1 or latest stable](https://nodejs.org/en/). We recommend using [nvm](https://github.com/nvm-sh/nvm) to install.
- [Node.js v18.18.0 or latest stable](https://nodejs.org/en/). We recommend using [nvm](https://github.com/nvm-sh/nvm) to install.
- [PNPM v7.18.2 or latest stable](https://pnpm.io/installation/)
- [Docker v20.0.21 or latest stable](https://docs.docker.com/get-docker/)
- [Docker Compose v2.15.1 or latest stable](https://docs.docker.com/get-docker/)
Expand Down
38 changes: 19 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"author": "Fuel Labs <contact@fuel.sh> (https://fuel.network/)",
"license": "Apache-2.0",
"engines": {
"node": "18.x",
"node": ">=18.19.0",
"pnpm": ">=8.1.0"
},
"homepage": "https://github.com/FuelLabs/fuel-explorer",
Expand Down Expand Up @@ -57,40 +57,40 @@
"@fuels/prettier-config": "^0.1.4",
"@fuels/ts-config": "^0.1.4",
"jest": "29.7.0",
"lint-staged": "15.1.0"
"lint-staged": "15.2.0"
},
"devDependencies": {
"@fuels/tsup-config": "^0.1.4",
"@next/eslint-plugin-next": "^14.0.3",
"@swc/core": "1.3.99",
"@next/eslint-plugin-next": "^14.0.4",
"@swc/core": "1.3.102",
"@swc/jest": "0.2.29",
"@types/jest": "29.5.10",
"@types/node": "20.10.0",
"@typescript-eslint/eslint-plugin": "^6.13.1",
"@typescript-eslint/parser": "^6.13.1",
"eslint": "^8.54.0",
"eslint-config-prettier": "^9.0.0",
"@types/jest": "29.5.11",
"@types/node": "20.10.8",
"@typescript-eslint/eslint-plugin": "^6.18.1",
"@typescript-eslint/parser": "^6.18.1",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-node": "^0.3.9",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jest-dom": "^5.1.0",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-prettier": "^5.1.2",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-testing-library": "^6.2.0",
"get-tsconfig": "4.7.2",
"husky": "^8.0.3",
"next": "14.0.3",
"next": "14.0.4",
"npm-run-all": "^4.1.5",
"prettier": "^3.1.0",
"ts-node": "10.9.1",
"prettier": "^3.1.1",
"ts-node": "10.9.2",
"tsup": "8.0.1",
"tsx": "4.6.0",
"turbo": "^1.10.16",
"typescript": "5.3.2",
"updates": "^15.0.4"
"tsx": "4.7.0",
"turbo": "^1.11.3",
"typescript": "5.3.3",
"updates": "^15.1.1"
},
"pnpm": {
"peerDependencyRules": {
Expand Down
2 changes: 1 addition & 1 deletion packages/app/.env.example
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FUEL_PROVIDER_URL=https://beta-4.fuel.network/graphql
FUEL_PROVIDER_BETA5=https://beta-5.fuel.network/graphql
2 changes: 1 addition & 1 deletion packages/app/.env.production
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FUEL_PROVIDER_URL=https://beta-4.fuel.network/graphql
FUEL_PROVIDER_BETA5=https://beta-5.fuel.network/graphql
78 changes: 39 additions & 39 deletions packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,70 +15,70 @@
"dependencies": {
"@faker-js/faker": "8.3.1",
"@fuel-explorer/graphql": "workspace:*",
"@fuel-ts/math": "0.67.0",
"@fuel-ts/math": "0.71.0",
"@fuel-wallet/sdk": "0.13.10",
"@fuels/assets": "0.1.4",
"@fuels/ui": "workspace:*",
"@tabler/icons-react": "2.42.0",
"@tanstack/react-query": "5.8.9",
"clsx": "2.0.0",
"csstype": "3.1.2",
"@tabler/icons-react": "2.45.0",
"@tanstack/react-query": "5.17.9",
"clsx": "2.1.0",
"csstype": "3.1.3",
"dayjs": "1.11.10",
"framer-motion": "10.16.5",
"fuels": "0.67.0",
"geist": "1.1.0",
"framer-motion": "10.17.12",
"fuels": "0.71.0",
"geist": "1.2.0",
"graphql": ">=16.8.1",
"graphql-request": "6.1.0",
"graphql-request": ">=6.1.0",
"graphql-tag": "2.12.6",
"graphql-yoga": "5.0.0",
"graphql-yoga": "5.1.1",
"js-cookies": "1.0.4",
"next": "14.0.3",
"next": "14.0.4",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-json-view-lite": "1.2.1",
"react-use": "17.4.1",
"react-use": "17.4.2",
"react-window": "1.8.10",
"tai64": "1.0.0",
"tailwind-merge": "2.0.0",
"tailwind-variants": "0.1.18",
"tailwind-merge": "2.2.0",
"tailwind-variants": "0.1.20",
"zod": "3.22.4",
"zod-validation-error": "2.1.0"
},
"devDependencies": {
"@babel/core": "^7.23.3",
"@storybook/addon-a11y": "^7.6.0",
"@storybook/addon-actions": "^7.6.0",
"@storybook/addon-essentials": "^7.6.0",
"@storybook/addon-interactions": "^7.6.0",
"@storybook/addon-links": "^7.6.0",
"@storybook/addon-storysource": "^7.6.0",
"@storybook/addon-viewport": "7.6.0",
"@storybook/addons": "^7.6.0",
"@storybook/nextjs": "^7.6.0",
"@storybook/react": "^7.6.0",
"@babel/core": "^7.23.7",
"@storybook/addon-a11y": "^7.6.7",
"@storybook/addon-actions": "^7.6.7",
"@storybook/addon-essentials": "^7.6.7",
"@storybook/addon-interactions": "^7.6.7",
"@storybook/addon-links": "^7.6.7",
"@storybook/addon-storysource": "^7.6.7",
"@storybook/addon-viewport": "7.6.7",
"@storybook/addons": "^7.6.7",
"@storybook/nextjs": "^7.6.7",
"@storybook/react": "^7.6.7",
"@storybook/testing-library": "^0.2.2",
"@storybook/types": "^7.6.0",
"@storybook/types": "^7.6.7",
"@svgr/webpack": "8.1.0",
"@testing-library/dom": "9.3.3",
"@testing-library/jest-dom": "6.1.4",
"@types/node": "20.10.0",
"@types/react": "^18.2.39",
"@types/react-dom": "^18.2.17",
"@testing-library/dom": "9.3.4",
"@testing-library/jest-dom": "6.2.0",
"@types/node": "20.10.8",
"@types/react": "^18.2.47",
"@types/react-dom": "^18.2.18",
"@types/react-window": "1.8.8",
"@xstate/cli": "^0.5.11",
"@xstate/cli": "^0.5.17",
"autoprefixer": "10.4.16",
"postcss": "8.4.31",
"postcss-import": "15.1.0",
"postcss": "8.4.33",
"postcss-import": "16.0.0",
"radix-ui-themes-with-tailwind": "1.2.6",
"storybook": "^7.6.0",
"storybook": "^7.6.7",
"storybook-addon-theme": "workspace:*",
"tailwindcss": "3.3.5",
"tailwindcss": "3.4.1",
"tailwindcss-animate": "1.0.7",
"tailwindcss-radix": "2.8.0",
"tsconfig-paths-webpack-plugin": "^4.1.0",
"typescript": "5.3.2",
"vite": "^5.0.3",
"vite-tsconfig-paths": "^4.2.1"
"typescript": "5.3.3",
"vite": "^5.0.11",
"vite-tsconfig-paths": "^4.2.3"
},
"browser": {
"fs": false,
Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/app/api/graphql/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { createExecutor, createSchema } from '@fuel-explorer/graphql';
import { ContextDomain } from '@fuel-explorer/graphql/src/domains/Context';
import { createYoga } from 'graphql-yoga';

const url = process.env.FUEL_PROVIDER_URL!;
const url = process.env.FUEL_PROVIDER_BETA5!;
const executor = createExecutor(async ({ body }) => {
return fetch(url, {
body,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,19 +132,13 @@ export function TxScreenSimple({ transaction: tx, isLoading }: TxScreenProps) {
description={
<LoadingWrapper
isLoading={isLoading}
regularEl={<>Gas used: {formatZeroUnits(tx.gasUsed || '')}</>}
loadingEl={
<>
<LoadingBox className="w-28 h-5 mt-2" />
<LoadingBox className="w-28 h-5 mt-1" />
</>
}
regularEl={
<>
Gas used: {formatZeroUnits(tx.gasUsed || '')}
<br />
Gas limit: {formatZeroUnits(tx.gasLimit || '')}
</>
}
/>
}
>
Expand Down
2 changes: 1 addition & 1 deletion packages/graphql/.env.example
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FUEL_PROVIDER_URL=https://beta-4.fuel.network/graphql
FUEL_PROVIDER_BETA5=https://beta-5.fuel.network/graphql
2 changes: 1 addition & 1 deletion packages/graphql/.env.production
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FUEL_PROVIDER_URL=https://beta-4.fuel.network/graphql
FUEL_PROVIDER_BETA5=https://beta-5.fuel.network/graphql
5 changes: 4 additions & 1 deletion packages/graphql/codegen.fuel.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import type { CodegenConfig } from '@graphql-codegen/cli';

console.log(`process.env.FUEL_PROVIDER_BETA5`, process.env.FUEL_PROVIDER_BETA5);

const config: CodegenConfig = {
generates: {
'./src/schemas/fuelcore.graphql': {
schema:
process.env.FUEL_PROVIDER_URL || 'https://beta-4.fuel.network/graphql',
process.env.FUEL_PROVIDER_BETA5 ||
'https://beta-5.fuel.network/graphql',
plugins: ['schema-ast'],
config: {
includeDirectives: true,
Expand Down
32 changes: 16 additions & 16 deletions packages/graphql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,20 @@
"prepare": "pnpm build"
},
"dependencies": {
"@fuel-ts/math": "0.67.0",
"@fuel-ts/math": "0.71.0",
"@graphql-tools/delegate": "^10.0.3",
"@graphql-tools/schema": "^10.0.2",
"@graphql-tools/stitch": "^9.0.3",
"@graphql-tools/utils": "^10.0.11",
"@graphql-tools/utils": "^10.0.12",
"@luckycatfactory/esbuild-graphql-loader": "3.8.1",
"chokidar": "3.5.3",
"cors": "^2.8.5",
"dayjs": "1.11.10",
"dotenv": "16.3.1",
"esbuild": "0.19.8",
"ethers": "6.9.0",
"esbuild": "0.19.11",
"ethers": "6.9.2",
"express": "5.0.0-beta.1",
"fuels": "0.67.0",
"fuels": "0.71.0",
"get-port": "7.0.0",
"graphql": ">=16.8.1",
"graphql-http": "^1.22.0",
Expand All @@ -43,27 +43,27 @@
"graphql-tag": "2.12.6",
"lodash": "^4.17.21",
"tai64": "1.0.0",
"typescript": "5.3.2"
"typescript": "5.3.3"
},
"devDependencies": {
"@babel/cli": "7.23.4",
"@babel/core": "^7.23.3",
"@babel/core": "^7.23.7",
"@fuels/ts-config": "^0.1.4",
"@graphql-codegen/cli": "5.0.0",
"@graphql-codegen/introspection": "4.0.0",
"@graphql-codegen/schema-ast": "4.0.0",
"@graphql-codegen/typescript": "4.0.1",
"@graphql-codegen/typescript-graphql-request": "6.0.1",
"@graphql-codegen/typescript-operations": "4.0.1",
"@graphql-codegen/cli": "5.0.1",
"@graphql-codegen/introspection": "4.0.1",
"@graphql-codegen/schema-ast": "4.0.1",
"@graphql-codegen/typescript": "4.0.2",
"@graphql-codegen/typescript-graphql-request": "6.1.0",
"@graphql-codegen/typescript-operations": "4.1.0",
"@parcel/watcher": "2.3.0",
"@types/cors": "^2.8.17",
"@types/express": "^4.17.21",
"@types/lodash": "4.14.202",
"@types/node": "^20.10.0",
"@types/node": "^20.10.8",
"execa": "8.0.1",
"graphql-codegen-typescript-common": "0.18.2",
"graphql-codegen-typescript-mock-data": "3.7.0",
"graphql-codegen-typescript-mock-data": "3.7.1",
"tsconfig-paths": "^4.2.0",
"tsx": "4.6.0"
"tsx": "4.7.0"
}
}
Loading
Loading