Skip to content

Commit

Permalink
feat: update to fuel-core 0.26.0 (#1240)
Browse files Browse the repository at this point in the history
Closes #1216

---------

Co-authored-by: Arthur Geron <[email protected]>
Co-authored-by: Hélcio Franco <[email protected]>
  • Loading branch information
3 people authored May 10, 2024
1 parent 7ac8f7c commit b4f52e0
Show file tree
Hide file tree
Showing 172 changed files with 17,139 additions and 10,271 deletions.
7 changes: 7 additions & 0 deletions .changeset/old-boxes-cheat.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@fuel-wallet/connections": minor
"@fuel-wallet/types": minor
"fuels-wallet": minor
---

feat: update wallet to the latest fuel core (0.26.0)
5 changes: 5 additions & 0 deletions .changeset/stupid-flowers-provide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"fuels-wallet": minor
---

feat: add custom network fees, offering options like regular, fast and custom tip.
141 changes: 71 additions & 70 deletions .github/workflows/pr-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,10 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- name: Start Test Node
run: pnpm node:up:test

- name: Graphql Codegen
run: pnpm codegen:app
env:
NODE_ENV: test
run: pnpm node:up

- name: Generate .env
run: cp packages/app/.env.example packages/app/.env

# Unit tests running with JEST
- name: Find PR number
Expand Down Expand Up @@ -64,7 +62,7 @@ jobs:
base-coverage-file: ${{ env.COVERAGE_FILE }}

- name: Stop Test Node
run: pnpm node:clean:test
run: pnpm node:clean

tests-e2e:
name: E2E Tests
Expand All @@ -81,20 +79,17 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- name: Start Test Node
run: pnpm node:up:test

- name: Graphql Codegen
run: pnpm codegen:app
env:
NODE_ENV: test
run: pnpm node:up

- name: Generate .env
run: cp packages/app/.env.example packages/app/.env

- name: Build Application
run: pnpm build:test
run: pnpm build:app
env:
## increase node.js m memory limit for building
## with sourcemaps
NODE_OPTIONS: "--max-old-space-size=4096"
NODE_ENV: test

# E2E tests running with Playwright
- name: Install Playwright Browsers
Expand All @@ -113,60 +108,66 @@ jobs:
retention-days: 30

- name: Stop Test Node
run: pnpm node:clean:test
run: pnpm node:clean

tests-e2e-contracts:
name: E2E Contract Tests
runs-on: buildjet-4vcpu-ubuntu-2204
steps:
- uses: actions/checkout@v3
- uses: FuelLabs/github-actions/setups/node@master
with:
node-version: 18.14.1
pnpm-version: 8.15.7
- uses: FuelLabs/github-actions/setups/docker@master
with:
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Run PNPM install
id: pnpm-cache
run:
pnpm recursive install --frozen-lockfile

- name: Start Test Node
run: pnpm node:up:test

- name: Build Application
run: pnpm build:all
env:
## increase node.js m memory limit for building
## with sourcemaps
NODE_OPTIONS: "--max-old-space-size=4096"
NODE_ENV: test

- name: Build & Deploy Contracts
run: pnpm deploy:contracts
working-directory: ./packages/e2e-contract-tests

# E2E tests running with Playwright
- name: Install Playwright Browsers
run: npx playwright install --with-deps chromium

- name: Run E2E Contract Tests
run: xvfb-run --auto-servernum -- pnpm test:e2e:contracts
env:
NODE_ENV: test

- uses: actions/upload-artifact@v4
if: always()
with:
name: playwright-report
path: |
packages/app/playwright-report/
packages/app/playwright-html/
retention-days: 30

- name: Stop Test Node
run: pnpm node:clean:test
# tests-e2e-contracts:
# name: E2E Contract Tests
# runs-on: buildjet-4vcpu-ubuntu-2204
# steps:
# - uses: actions/checkout@v3
# - uses: FuelLabs/github-actions/setups/node@master
# with:
# node-version: 18.14.1
# pnpm-version: 8.15.7
# - uses: FuelLabs/github-actions/setups/docker@master
# with:
# username: ${{ github.repository_owner }}
# password: ${{ secrets.GITHUB_TOKEN }}

# - name: Run PNPM install
# id: pnpm-cache
# run:
# pnpm recursive install --frozen-lockfile

# - name: Start Test Node
# run: pnpm node:up

# - name: Generate .env app
# run: cp packages/app/.env.example packages/app/.env

# - name: Generate .env e2e-contracts
# run: cp packages/e2e-contract-tests/.env.example packages/e2e-contract-tests/.env

# - name: Build Application
# run: pnpm build:all
# env:
# ## increase node.js m memory limit for building
# ## with sourcemaps
# NODE_OPTIONS: "--max-old-space-size=4096"
# NODE_ENV: test

# - name: Build & Deploy Contracts
# run: pnpm deploy:contracts
# working-directory: ./packages/e2e-contract-tests

# # E2E tests running with Playwright
# - name: Install Playwright Browsers
# run: npx playwright install --with-deps chromium

# - name: Run E2E Contract Tests
# run: xvfb-run --auto-servernum -- pnpm test:e2e:contracts
# env:
# NODE_ENV: test

# - uses: actions/upload-artifact@v4
# if: always()
# with:
# name: playwright-report
# path: |
# packages/app/playwright-report/
# packages/app/playwright-html/
# retention-days: 30

# - name: Stop Test Node
# run: pnpm node:clean

4 changes: 4 additions & 0 deletions Forc.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[workspace]
members = [
"packages/e2e-contract-tests/contracts/custom_asset"
]
2 changes: 1 addition & 1 deletion biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"**/build",
"**/dist",
"**/dist-crx",
"**/contracts",
"**/contracts/**",
"pnpm-lock.yaml"
]
}
Expand Down
6 changes: 0 additions & 6 deletions docker/.env.test

This file was deleted.

9 changes: 0 additions & 9 deletions docker/Makefile
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
up:
docker compose -p dev --env-file .env up -d --build

up-test:
docker compose -p test --env-file .env.test up -d --build

down:
docker compose -p dev stop

down-test:
docker compose -p test stop

clean:
docker compose -p dev down --rmi local -v --remove-orphans

clean-test:
docker compose -p test down --rmi local -v --remove-orphans
6 changes: 3 additions & 3 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ services:
volumes:
- fuel-core-db:/mnt/db
healthcheck:
test: curl --fail http://localhost:4000/health || exit 1
test: curl --fail http://localhost:4000/v1/health || exit 1
interval: 1s
timeout: 5s
retries: 20
Expand All @@ -30,8 +30,8 @@ services:
MIN_GAS_PRICE: ${MIN_GAS_PRICE}
WALLET_SECRET_KEY: ${WALLET_SECRET}
DISPENSE_AMOUNT: ${DISPENSE_AMOUNT}
FUEL_NODE_URL: http://${PROJECT:-fuel-node}_fuel-core:4000/graphql
image: ghcr.io/fuellabs/faucet:v0.6.2
FUEL_NODE_URL: http://${PROJECT:-fuel-node}_fuel-core:4000/v1/graphql
image: ghcr.io/fuellabs/faucet:v0.7.2
ports:
- '${FUEL_FAUCET_PORT:-4040}:3000'
links:
Expand Down
4 changes: 2 additions & 2 deletions docker/fuel-core/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/fuellabs/fuel-core:v0.22.0
FROM ghcr.io/fuellabs/fuel-core:v0.26.0

ENV MIN_GAS_PRICE="${MIN_GAS_PRICE}"
ENV CONSENSUS_KEY="${CONSENSUS_KEY}"
Expand All @@ -11,7 +11,7 @@ RUN apt install curl -y

WORKDIR /root/

COPY chainConfig.json .
COPY config ./config
COPY run.sh .
EXPOSE ${PORT}

Expand Down
Loading

0 comments on commit b4f52e0

Please sign in to comment.