feat: upgrade fuel-core (#939)

FuelLabs · Oct 20, 2023 · 9939298 · 9939298
1 parent f683bae
commit 9939298
Show file tree

Hide file tree

Showing 24 changed files with 264 additions and 60 deletions.
diff --git a/.changeset/grumpy-turkeys-tie.md b/.changeset/grumpy-turkeys-tie.md
@@ -0,0 +1,5 @@
+---
+'fuels-wallet': patch
+---
+
+fix: password input showing incorrect error feedback
diff --git a/.changeset/slow-buckets-design.md b/.changeset/slow-buckets-design.md
@@ -0,0 +1,5 @@
+---
+'fuels-wallet': patch
+---
+
+feat: upgrade fuel-core
diff --git a/.github/setup-forc/action.yml b/.github/setup-forc/action.yml
@@ -3,13 +3,13 @@ name: 'Setup Forc'
 inputs:
   rust-version:
     description: "Rust version"
-    default: 1.71.1
+    default: 1.73.0
   forc-version:
     description: "Forc version"
     default: 0.46.0
   fuel-core-version:
     description: "Fuel core version"
-    default: 0.20.4
+    default: 0.20.7
 
 runs:
   using: 'composite'

diff --git a/docker/fuel-core/Dockerfile b/docker/fuel-core/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/fuellabs/fuel-core:v0.20.4
+FROM ghcr.io/fuellabs/fuel-core:v0.20.7
 
 ENV MIN_GAS_PRICE="${MIN_GAS_PRICE}"
 ENV CONSENSUS_KEY="${CONSENSUS_KEY}"

diff --git a/docker/fuel-core/chainConfig.json b/docker/fuel-core/chainConfig.json
@@ -14,17 +14,157 @@
     "max_inputs": 255,
     "max_outputs": 255,
     "max_witnesses": 255,
-    "max_gas_per_tx": 100000000,
+    "max_gas_per_tx": 10000000,
     "max_script_length": 1048576,
     "max_script_data_length": 1048576,
-    "max_static_contracts": 255,
     "max_storage_slots": 255,
     "max_predicate_length": 1048576,
     "max_predicate_data_length": 1048576,
-    "max_gas_per_predicate": 100000000,
-    "gas_price_factor": 1000000000,
+    "max_gas_per_predicate": 10000000,
+    "gas_price_factor": 92,
     "gas_per_byte": 4,
-    "max_message_data_length": 1048576
+    "max_message_data_length": 1048576,
+    "chain_id": 0
+  },
+  "gas_costs": {
+    "add": 1,
+    "addi": 1,
+    "aloc": 1,
+    "and": 1,
+    "andi": 1,
+    "bal": 13,
+    "bhei": 1,
+    "bhsh": 1,
+    "burn": 132,
+    "cb": 1,
+    "cfei": 1,
+    "cfsi": 1,
+    "croo": 16,
+    "div": 1,
+    "divi": 1,
+    "ecr1": 3000,
+    "eck1": 951,
+    "ed19": 3000,
+    "eq": 1,
+    "exp": 1,
+    "expi": 1,
+    "flag": 1,
+    "gm": 1,
+    "gt": 1,
+    "gtf": 1,
+    "ji": 1,
+    "jmp": 1,
+    "jne": 1,
+    "jnei": 1,
+    "jnzi": 1,
+    "jmpf": 1,
+    "jmpb": 1,
+    "jnzf": 1,
+    "jnzb": 1,
+    "jnef": 1,
+    "jneb": 1,
+    "k256": 11,
+    "lb": 1,
+    "log": 9,
+    "lt": 1,
+    "lw": 1,
+    "mcpi": 33,
+    "mint": 135,
+    "mlog": 1,
+    "modOp": 1,
+    "modi": 1,
+    "moveOp": 1,
+    "movi": 1,
+    "mroo": 2,
+    "mul": 1,
+    "muli": 1,
+    "mldv": 1,
+    "noop": 1,
+    "not": 1,
+    "or": 1,
+    "ori": 1,
+    "ret": 13,
+    "rvrt": 13,
+    "s256": 2,
+    "sb": 1,
+    "scwq": 13,
+    "sll": 1,
+    "slli": 1,
+    "srl": 1,
+    "srli": 1,
+    "srw": 12,
+    "sub": 1,
+    "subi": 1,
+    "sw": 1,
+    "sww": 43,
+    "swwq": 44,
+    "time": 1,
+    "tr": 105,
+    "tro": 60,
+    "wdcm": 1,
+    "wqcm": 1,
+    "wdop": 1,
+    "wqop": 1,
+    "wdml": 1,
+    "wqml": 1,
+    "wddv": 1,
+    "wqdv": 2,
+    "wdmd": 3,
+    "wqmd": 4,
+    "wdam": 2,
+    "wqam": 3,
+    "wdmm": 3,
+    "wqmm": 3,
+    "xor": 1,
+    "xori": 1,
+    "call": {
+      "base": 144,
+      "dep_per_unit": 214
+    },
+    "ccp": {
+      "base": 15,
+      "dep_per_unit": 103
+    },
+    "csiz": {
+      "base": 17,
+      "dep_per_unit": 790
+    },
+    "ldc": {
+      "base": 15,
+      "dep_per_unit": 272
+    },
+    "logd": {
+      "base": 26,
+      "dep_per_unit": 64
+    },
+    "mcl": {
+      "base": 1,
+      "dep_per_unit": 3333
+    },
+    "mcli": {
+      "base": 1,
+      "dep_per_unit": 3333
+    },
+    "mcp": {
+      "base": 1,
+      "dep_per_unit": 2000
+    },
+    "meq": {
+      "base": 1,
+      "dep_per_unit": 2500
+    },
+    "retd": {
+      "base": 29,
+      "dep_per_unit": 62
+    },
+    "smo": {
+      "base": 209,
+      "dep_per_unit": 55
+    },
+    "srwq": {
+      "base": 47,
+      "dep_per_unit": 5
+    }
   },
   "wallet": {
     "address": "0x94ffcc53b892684acefaebc8a3d4a595e528a8cf664eeb3ef36f1020b0809d0d",

diff --git a/packages/app/src/systems/SignUp/components/CreatePassword/CreatePassword.tsx b/packages/app/src/systems/SignUp/components/CreatePassword/CreatePassword.tsx
@@ -54,7 +54,7 @@ export function CreatePassword({
   const form = useForm<CreatePasswordValues>({
     resolver: yupResolver(schema),
     reValidateMode: 'onChange',
-    mode: 'onChange',
+    mode: 'onBlur',
     defaultValues: {
       password: '',
       confirmPassword: '',

diff --git a/packages/docs/package.json b/packages/docs/package.json
@@ -57,10 +57,5 @@
     "eslint": "^8.51.0",
     "eslint-config-next": "13.5.4",
     "next-images": "1.8.5"
-  },
-  "pnpm": {
-    "overrides": {
-      "prettier@*": "2.8.8"
-    }
   }
 }
diff --git a/packages/e2e-contract-tests/playwright/e2e/DepositHalfEth.test.ts b/packages/e2e-contract-tests/playwright/e2e/DepositHalfEth.test.ts
@@ -5,12 +5,14 @@ import {
   hasText,
   walletConnect,
 } from '@fuel-wallet/test-utils';
-import { BaseAssetId } from 'fuels';
+import { BaseAssetId, bn } from 'fuels';
 
 import { shortAddress } from '../../src/utils';
 import '../../load.envs.js';
 import { testSetup } from '../utils';
 
+import { checkFee } from './utils';
+
 test.describe('Deposit Half ETH', () => {
   test.beforeEach(async ({ context, extensionId, page }) => {
     await testSetup({ context, page, extensionId });
@@ -51,6 +53,7 @@ test.describe('Deposit Half ETH', () => {
 
     // test gas fee is shown and correct
     await hasText(walletPage, 'Fee (network)');
-    await hasText(walletPage, '0.000000001 ETH');
+    const fee = bn.parseUnits('0.000000152');
+    await checkFee(walletPage, { minFee: fee.sub(100), maxFee: fee.add(100) });
   });
 });
diff --git a/packages/e2e-contract-tests/playwright/e2e/ForwardAndMintMulticall.test.ts b/packages/e2e-contract-tests/playwright/e2e/ForwardAndMintMulticall.test.ts
@@ -5,12 +5,14 @@ import {
   hasText,
   walletConnect,
 } from '@fuel-wallet/test-utils';
-import { BaseAssetId } from 'fuels';
+import { BaseAssetId, bn } from 'fuels';
 
 import { shortAddress, calculateAssetId } from '../../src/utils';
 import '../../load.envs.js';
 import { testSetup } from '../utils';
 
+import { checkFee } from './utils';
+
 const { VITE_CONTRACT_ID } = process.env;
 
 test.describe('Forward and Mint Multicall', () => {
@@ -57,6 +59,7 @@ test.describe('Forward and Mint Multicall', () => {
 
     // test gas fee is shown and correct
     await hasText(walletPage, 'Fee (network)');
-    await hasText(walletPage, '0.000000001 ETH');
+    const fee = bn.parseUnits('0.000000217');
+    await checkFee(walletPage, { minFee: fee.sub(100), maxFee: fee.add(100) });
   });
 });
diff --git a/packages/e2e-contract-tests/playwright/e2e/ForwardCustomAsset.test.ts b/packages/e2e-contract-tests/playwright/e2e/ForwardCustomAsset.test.ts
@@ -14,6 +14,8 @@ import '../../load.envs';
 import { calculateAssetId, shortAddress } from '../../src/utils';
 import { testSetup } from '../utils';
 
+import { checkFee } from './utils';
+
 const { VITE_CONTRACT_ID } = process.env;
 
 test.describe('Forward Custom Asset', () => {
@@ -70,6 +72,7 @@ test.describe('Forward Custom Asset', () => {
 
     // test gas fee is correct
     await hasText(walletPage, 'Fee (network)');
-    await hasText(walletPage, '0.000000001 ETH');
+    const fee = bn.parseUnits('0.000000126');
+    await checkFee(walletPage, { minFee: fee.sub(100), maxFee: fee.add(100) });
   });
 });
diff --git a/packages/e2e-contract-tests/playwright/e2e/ForwardEth.test.ts b/packages/e2e-contract-tests/playwright/e2e/ForwardEth.test.ts
@@ -5,12 +5,14 @@ import {
   getWalletPage,
   hasText,
 } from '@fuel-wallet/test-utils';
-import { BaseAssetId } from 'fuels';
+import { BaseAssetId, bn } from 'fuels';
 
 import '../../load.envs';
 import { shortAddress } from '../../src/utils';
 import { testSetup } from '../utils';
 
+import { checkFee } from './utils';
+
 test.describe('Forward Eth', () => {
   test.beforeEach(async ({ context, extensionId, page }) => {
     await testSetup({ context, page, extensionId });
@@ -44,6 +46,7 @@ test.describe('Forward Eth', () => {
 
     // test gas fee is correct
     await hasText(walletPage, 'Fee (network)');
-    await hasText(walletPage, '0.000000001 ETH');
+    const fee = bn.parseUnits('0.000000114');
+    await checkFee(walletPage, { minFee: fee.sub(100), maxFee: fee.add(100) });
   });
 });
diff --git a/packages/e2e-contract-tests/playwright/e2e/ForwardHalfAndExternalMint.test.ts b/packages/e2e-contract-tests/playwright/e2e/ForwardHalfAndExternalMint.test.ts
@@ -5,12 +5,14 @@ import {
   hasText,
   walletConnect,
 } from '@fuel-wallet/test-utils';
-import { BaseAssetId } from 'fuels';
+import { BaseAssetId, bn } from 'fuels';
 
 import { shortAddress, calculateAssetId } from '../../src/utils';
 import '../../load.envs.js';
 import { testSetup } from '../utils';
 
+import { checkFee } from './utils';
+
 const { VITE_EXTERNAL_CONTRACT_ID } = process.env;
 
 test.describe('Forward Half ETH and Mint External Custom Asset', () => {
@@ -67,6 +69,7 @@ test.describe('Forward Half ETH and Mint External Custom Asset', () => {
 
     // test gas fee is shown and correct
     await hasText(walletPage, 'Fee (network)');
-    await hasText(walletPage, '0.000000001 ETH');
+    const fee = bn.parseUnits('0.000000233');
+    await checkFee(walletPage, { minFee: fee.sub(100), maxFee: fee.add(100) });
   });
 });
diff --git a/packages/e2e-contract-tests/playwright/e2e/ForwardHalfAndMint.test.ts b/packages/e2e-contract-tests/playwright/e2e/ForwardHalfAndMint.test.ts
@@ -5,12 +5,14 @@ import {
   hasText,
   walletConnect,
 } from '@fuel-wallet/test-utils';
-import { BaseAssetId } from 'fuels';
+import { BaseAssetId, bn } from 'fuels';
 
 import { shortAddress, calculateAssetId } from '../../src/utils';
 import '../../load.envs.js';
 import { testSetup } from '../utils';
 
+import { checkFee } from './utils';
+
 const { VITE_CONTRACT_ID } = process.env;
 
 test.describe('Forward Half ETH and Mint Custom Asset', () => {
@@ -67,6 +69,7 @@ test.describe('Forward Half ETH and Mint Custom Asset', () => {
 
     // test gas fee is shown and correct
     await hasText(walletPage, 'Fee (network)');
-    await hasText(walletPage, '0.000000001 ETH');
+    const fee = bn.parseUnits('0.00000021');
+    await checkFee(walletPage, { minFee: fee.sub(100), maxFee: fee.add(100) });
   });
 });
diff --git a/packages/e2e-contract-tests/playwright/e2e/ForwardHalfCustomAsset.test.ts b/packages/e2e-contract-tests/playwright/e2e/ForwardHalfCustomAsset.test.ts
@@ -14,6 +14,8 @@ import '../../load.envs';
 import { calculateAssetId, shortAddress } from '../../src/utils';
 import { testSetup } from '../utils';
 
+import { checkFee } from './utils';
+
 const { VITE_CONTRACT_ID } = process.env;
 
 test.describe('Forward Half Custom Asset', () => {
@@ -76,6 +78,7 @@ test.describe('Forward Half Custom Asset', () => {
 
     // test gas fee is correct
     await hasText(walletPage, 'Fee (network)');
-    await hasText(walletPage, '0.000000001 ETH');
+    const fee = bn.parseUnits('0.000000165');
+    await checkFee(walletPage, { minFee: fee.sub(100), maxFee: fee.add(100) });
   });
 });