Merge branch 'main' of github.com:FuelLabs/fuel-explorer into pn/chore/mint-tx

Author: pedronauck

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

@@ -19,6 +19,10 @@ inputs:
   dockerfile:
     description: 'Path to the Dockerfile'
     required: true
+  context:
+    description: 'Path to the Context'
+    default: .
+    required: true
   build-args:
     description: 'List of build-time variables'
     required: false
@@ -65,7 +69,7 @@ runs:
       uses: docker/build-push-action@v4
       id: publish
       with:
-        context: .
+        context: ${{ inputs.context }}
         file: ${{ inputs.dockerfile }}
         push: true
         tags: ${{ steps.meta.outputs.tags }}

.github/workflows/docker-publish.yml

@@ -30,3 +30,4 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
           image: ghcr.io/fuellabs/fuel-explorer
           dockerfile: deployment/Dockerfile
+          context: ./packages/graphql

contracts/predicate/scripts/run-predicate.ts

@@ -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_BETA5, PRIVATE_KEY } = process.env;
+const { FUEL_PROVIDER, PRIVATE_KEY } = process.env;
 const BIN_PATH = resolve(__dirname, '../out/debug/predicate-app.bin');
 const AMOUNT = 300_000;
 
-if (!FUEL_PROVIDER_BETA5 || !PRIVATE_KEY) {
-  throw new Error('Missing some config on your .env file');
+if (!FUEL_PROVIDER || !PRIVATE_KEY) {
+  throw new Error('Missing some config in .env file. Should have FUEL_PROVIDER and PRIVATE_KEY');
 }
 
 async function main() {
   const binHex = hexlify(await fs.readFile(BIN_PATH));
-  const provider = await Provider.create(FUEL_PROVIDER_BETA5!);
+  const provider = await Provider.create(FUEL_PROVIDER!);
   const wallet = Wallet.fromPrivateKey(PRIVATE_KEY!, provider);
   const { minGasPrice: gasPrice } = wallet.provider.getGasConfig();
   const walletAddress = wallet.address.toB256();

deployment/Dockerfile

@@ -4,20 +4,21 @@ FROM node:20-slim AS base
 
 # Expose the ENVs to the env of the container
 ENV PORT="${PORT}"
-ENV FUEL_PROVIDER_BETA5="${FUEL_PROVIDER_BETA5}"
+ENV FUEL_PROVIDER="${FUEL_PROVIDER:-https://beta-5.fuel.network/graphql}"
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
+ENV SERVER_BUILD=true
 
 # Enable pnpm using corepack form node.js
 RUN corepack enable
 
 COPY . /app-explorer
 WORKDIR /app-explorer
 
-RUN pnpm install --frozen-lockfile
+RUN pnpm install
 
-EXPOSE 4444
+EXPOSE ${PORT}
 
-WORKDIR /app-explorer/packages/graphql
+WORKDIR /app-explorer
 
-CMD ["pnpm", "start"]
+CMD ["pnpm", "server:start"]

docker/erc20-deployer/Dockerfile

@@ -26,11 +26,4 @@ ENV PK_ETH_WALLET="${PK_ETH_WALLET}"
 EXPOSE ${PORT}
 
 # copy over script and run
-CMD ["pnpm", "start"]
-
-
-      # L1_CHAIN_HTTP=http://localhost:8545 \
-      # FUEL_GRAPHQL_ENDPOINT=http://localhost:4000/graphql \
-      # DEPLOYMENTS_HTTP=http://localhost:8080 \
-      # PK_ETH_WALLET=59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d \
-      # pnpm start
+CMD ["pnpm", "start"]

docker/l1-chain/Dockerfile

@@ -1,11 +1,10 @@
 # ====== Build Image ======
-FROM node:20-alpine AS BUILD_IMAGE
+FROM node:18-alpine AS BUILD_IMAGE
 
 # dependencies
 RUN apk --no-cache add git
 RUN npm i -g pnpm
 
-
 # set workdir
 WORKDIR /l1chain
 
@@ -18,7 +17,7 @@ ADD ./.fuelChainConsts.env /l1chain/portal-contracts/.fuelChainConsts.env
 WORKDIR /l1chain/portal-contracts
 
 # build the ethereum contracts and environment
-RUN pnpm install --force
+RUN pnpm install
 # replace the fuel chain consts values and change contract code
 RUN pnpm ts-node scripts/replaceFuelChainConsts.ts
 # run contract compile with the new consts
@@ -29,7 +28,7 @@ RUN pnpm compile
 COPY ./hardhat/hardhat.config.ts .
 
 # ====== Final Image ======
-FROM node:20-alpine
+FROM node:18-alpine
 
 ARG L1_IP=0.0.0.0
 ARG L1_PORT=8545

packages/app-explorer/.env.example

@@ -1 +1 @@
-FUEL_PROVIDER_BETA5=https://beta-5.fuel.network/graphql
+FUEL_PROVIDER=https://beta-5.fuel.network/graphql

packages/app-explorer/.env.production

@@ -1 +1 @@
-FUEL_PROVIDER_BETA5=https://beta-5.fuel.network/graphql
+FUEL_PROVIDER=https://beta-5.fuel.network/graphql

packages/app-explorer/src/app/api/graphql/route.ts

@@ -1,8 +1,10 @@
 import { createExecutor, createSchema } from '@fuel-explorer/graphql';
 import { ContextDomain } from '@fuel-explorer/graphql/src/domains/Context';
 import { createYoga } from 'graphql-yoga';
+import { requireEnv } from '~/systems/utils/requireEnv';
+
+const { FUEL_PROVIDER: url } = requireEnv(['FUEL_PROVIDER']);
 
-const url = process.env.FUEL_PROVIDER_BETA5!;
 const executor = createExecutor(async ({ body }) => {
   return fetch(url, {
     body,

packages/app-explorer/src/systems/utils/requireEnv.ts

@@ -0,0 +1,12 @@
+export function requireEnv<
+  A extends string[],
+  B extends { [key in A[number]]: string },
+>(keys: string[]): B {
+  return keys.reduce((ret, key) => {
+    if (!process.env[key]) {
+      throw new Error(`Environment variable ${key} is required`);
+    }
+    ret[key] = process.env[key]!;
+    return ret;
+  }, {} as B);
+}

packages/app-portal/.env.production

@@ -1,6 +1,6 @@
 VITE_ETH_CHAIN=sepolia
 VITE_FUEL_CHAIN=fuelBeta5
-VITE_FUEL_VERSION=0.20.7
+VITE_FUEL_VERSION=0.22.0
 VITE_IS_PUBLIC_PREVIEW=true
 VITE_WALLET_INSTALL=https://chrome.google.com/webstore/detail/fuel-wallet/dldjpboieedgcmpkchcjcbijingjcgok
 VITE_WALLET_INSTALL_NEXT=https://next-wallet.fuel.network/docs/install/#install-from-source-code

packages/app-portal/index.html

@@ -1,8 +1,8 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+    <link rel="icon" type="image/svg+xml" href="/fuel-logo.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Fuel Portal</title>
   </head>

packages/graphql/.dockerignore

@@ -0,0 +1,3 @@
+node_moduels
+.turbo
+dist

packages/graphql/.env.example

@@ -1,2 +1,2 @@
-FUEL_PROVIDER_BETA5=https://beta-5.fuel.network/graphql
-SERVER_PORT=4000
+FUEL_PROVIDER=https://beta-5.fuel.network/graphql
+SERVER_PORT=4444

packages/graphql/.env.production

@@ -1 +1,2 @@
-FUEL_PROVIDER_BETA5=https://beta-5.fuel.network/graphql
+FUEL_PROVIDER=https://beta-5.fuel.network/graphql
+SERVER_PORT=4444

packages/graphql/README.md

@@ -7,3 +7,13 @@ This is a mock api for block-explorer
 ```sh
 pnpm dev
 ```
+
+## Docker
+
+```
+docker run \
+  -e FUEL_PROVIDER=https://beta-5.fuel.network/graphql \
+  -e SERVER_PORT=3000 \
+  -p 3333:3000 \
+  ghcr.io/fuellabs/fuel-explorer:main
+```

packages/graphql/codegen.fuel.ts

@@ -1,13 +1,15 @@
 import type { CodegenConfig } from '@graphql-codegen/cli';
 
-console.log(`process.env.FUEL_PROVIDER_BETA5`, process.env.FUEL_PROVIDER_BETA5);
+import { requireEnv } from './src/utils/requireEnv';
+
+const { FUEL_PROVIDER } = requireEnv([
+  ['FUEL_PROVIDER', 'https://beta-5.fuel.network/graphql'],
+]);
 
 const config: CodegenConfig = {
   generates: {
     './src/schemas/fuelcore.graphql': {
-      schema:
-        process.env.FUEL_PROVIDER_BETA5 ||
-        'https://beta-5.fuel.network/graphql',
+      schema: FUEL_PROVIDER,
       plugins: ['schema-ast'],
       config: {
         includeDirectives: true,

packages/graphql/package.json

@@ -10,12 +10,12 @@
   "typings": "./src/index.ts",
   "scripts": {
     "build": "run-s codegen:fuel build:lib",
-    "build:lib": "tsup --dts",
+    "build:lib": "tsup",
     "build:watch": "pnpm build:lib --watch",
     "codegen:fuel": "gql-gen -r dotenv/config --config codegen.fuel.ts",
     "codegen:app": "gql-gen -r dotenv/config --config codegen.ts",
     "dev": "pnpm build:watch",
-    "start": "pnpm dev",
+    "server:start": "node ./dist/index.js",
     "fix:generated": "node ./scripts/fix-generated.mjs",
     "ts:check": "tsc --noEmit",
     "prepare": "pnpm build"
@@ -43,7 +43,8 @@
     "graphql-tag": "2.12.6",
     "lodash": "^4.17.21",
     "tai64": "1.0.0",
-    "typescript": "5.3.3"
+    "typescript": "5.3.3",
+    "wait-port": "1.1.0"
   },
   "devDependencies": {
     "@babel/cli": "7.23.9",
@@ -63,7 +64,9 @@
     "execa": "8.0.1",
     "graphql-codegen-typescript-common": "0.18.2",
     "graphql-codegen-typescript-mock-data": "3.7.1",
+    "npm-run-all": "^4.1.5",
     "tsconfig-paths": "^4.2.0",
+    "tsup": "8.0.1",
     "tsx": "4.7.0"
   }
 }

packages/graphql/src/bin.ts

@@ -0,0 +1,9 @@
+import { runServerCodegen, runServer } from './server';
+
+const { CODE_GEN = 'false' } = process.env;
+
+if (CODE_GEN === 'true') {
+  runServerCodegen();
+} else {
+  runServer();
+}