fix: nodes running

FuelLabs · Dec 7, 2023 · a845155 · a845155
1 parent 312cc39
commit a845155
Show file tree

Hide file tree

Showing 17 changed files with 266 additions and 559 deletions.
diff --git a/.changeset/beige-coats-tap.md b/.changeset/beige-coats-tap.md
@@ -0,0 +1,7 @@
+---
+'@fuel-bridge/message-predicates': minor
+'@fuel-bridge/fungible-token': minor
+'@fuel-bridge/test-utils': minor
+---
+
+Update to fuel-core 0.21.0 (beta-5)
diff --git a/.github/actions/setup-rust/action.yml b/.github/actions/setup-rust/action.yml
@@ -14,10 +14,4 @@ runs:
         components: clippy, rustfmt
 
     - name: Init cache
-      uses: Swatinem/rust-cache@v2
-
-    # - name: Install Fuel toolchain
-    #   uses: FuelLabs/[email protected]
-    #   with:
-    #     name: custom
-    #     components: [email protected], [email protected]
+      uses: Swatinem/rust-cache@v2
diff --git a/Forc.toml b/Forc.toml
@@ -5,6 +5,3 @@ members = [
   "packages/message-predicates/contract-message-predicate",
   "packages/message-predicates/contract-message-receiver",
 ]
-
-[patch.'https://github.com/fuellabs/sway']
-std = { git = "https://github.com/fuellabs/sway", branch = "feat/transaction-policies" }
diff --git a/docker/block-committer/Dockerfile b/docker/block-committer/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/fuellabs/fuel-block-committer:v0.1.0
+FROM ghcr.io/fuellabs/fuel-block-committer:sha-126e787
 
 ARG ETHEREUM_WALLET_KEY=""
 ARG COMMIT_INTERVAL=1

diff --git a/docker/fuel-core/Dockerfile b/docker/fuel-core/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/fuellabs/fuel-core:v0.20.7
+FROM ghcr.io/fuellabs/fuel-core:v0.21.0
 
 ARG FUEL_IP=0.0.0.0
 ARG FUEL_PORT=4001

diff --git a/docker/fuel-core/chainConfig.json b/docker/fuel-core/chainConfig.json
@@ -5,7 +5,7 @@
       "signing_key": "0xc8e615a4089466174459ef19cfd257d2e17adfabff3b8f219dbb5fb4eca87c50"
     }
   },
-  "block_gas_limit": 10000000000000,
+  "block_gas_limit": 5000000000,
   "initial_state": {
     "coins": [
       {
@@ -110,19 +110,31 @@
       }
     ]
   },
-  "transaction_parameters": {
-    "contract_max_size": 16777216,
-    "max_inputs": 255,
-    "max_outputs": 255,
-    "max_witnesses": 255,
-    "max_gas_per_tx": 1000000000000,
-    "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,
-    "gas_price_factor": 1000000,
-    "max_gas_per_predicate": 100000000
+  "consensus_parameters": {
+    "tx_params": {
+      "max_inputs": 255,
+      "max_outputs": 255,
+      "max_witnesses": 255,
+      "max_gas_per_tx": 10000000,
+      "max_size": 17825792
+    },
+    "predicate_params": {
+      "max_predicate_length": 1048576,
+      "max_predicate_data_length": 1048576,
+      "max_gas_per_predicate": 10000000,
+      "max_message_data_length": 1048576
+    },
+    "script_params": {
+      "max_script_length": 1048576,
+      "max_script_data_length": 1048576
+    },
+    "contract_params": {
+      "contract_max_size": 16777216,
+      "max_storage_slots": 255
+    },
+    "fee_params": {
+      "gas_price_factor": 92,
+      "gas_per_byte": 4
+    }
   }
 }
diff --git a/docker/fuel-core/fuel_core.sh b/docker/fuel-core/fuel_core.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -euo
 
-RETRIES=${RETRIES:-60}
+RETRIES=${RETRIES:-160}
 JSON='{"jsonrpc":"2.0","id":0,"method":"net_version","params":[]}'
 FUEL_DB_PATH=./mnt/db/
 
@@ -56,8 +56,8 @@ exec /root/fuel-core run \
     --db-type in-memory \
     --utxo-validation \
     --vm-backtrace \
+    --enable-relayer \
     --relayer $L1_CHAIN_HTTP \
     --relayer-v2-listening-contracts $FUEL_MESSAGE_PORTAL_CONTRACT_ADDRESS \
-    --relayer-da-finalization 0 \
     --poa-interval-period 1s \
     --chain ./chainConfig.json
diff --git a/docker/l1-chain/Dockerfile b/docker/l1-chain/Dockerfile
@@ -1,5 +1,5 @@
 # ====== Build Image ======
-FROM node:16-alpine AS BUILD_IMAGE
+FROM node:18-alpine AS BUILD_IMAGE
 
 ARG L1_IP=0.0.0.0
 ARG L1_PORT=9545

diff --git a/docker/l1-chain/l1_chain.sh b/docker/l1-chain/l1_chain.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -euo
 
-RETRIES=${RETRIES:-20}
+RETRIES=${RETRIES:-120}
 JSON='{"jsonrpc":"2.0","id":0,"method":"net_version","params":[]}'
 L1_CHAIN_HTTP="http://127.0.0.1:$L1_PORT"
 

diff --git a/fuel-toolchain.toml b/fuel-toolchain.toml
diff --git a/package.json b/package.json
@@ -44,6 +44,6 @@
   },
   "devDependencies": {
     "@changesets/cli": "^2.26.2",
-    "@fuel-ts/forc": "pr-1407"
+    "@fuel-ts/forc": "next"
   }
 }
diff --git a/packages/esbuild-bin-loader/package.json b/packages/esbuild-bin-loader/package.json
@@ -10,6 +10,6 @@
     "build": "tsup"
   },
   "dependencies": {
-    "fuels": "pr-1407"
+    "fuels": "next"
   }
 }
diff --git a/packages/fungible-token/README.md b/packages/fungible-token/README.md
@@ -1,9 +1,9 @@
 <p align="center">
-    <a href="https://crates.io/crates/forc/0.47.0" alt="forc">
-        <img src="https://img.shields.io/badge/forc-v0.47.0-orange" />
+    <a href="https://crates.io/crates/forc/0.48.0" alt="forc">
+        <img src="https://img.shields.io/badge/forc-v0.48.0-orange" />
     </a>
-    <a href="https://crates.io/crates/fuel-core/0.20.7" alt="fuel-core">
-        <img src="https://img.shields.io/badge/fuel--core-v0.20.7-blue" />
+    <a href="https://crates.io/crates/fuel-core/0.21.0" alt="fuel-core">
+        <img src="https://img.shields.io/badge/fuel--core-v0.21.0-blue" />
     </a>
 </p>
 

diff --git a/packages/fungible-token/bridge-fungible-token/Forc.toml b/packages/fungible-token/bridge-fungible-token/Forc.toml
@@ -5,6 +5,4 @@ license = "Apache-2.0"
 name = "bridge_fungible_token"
 
 [dependencies]
-contract_message_receiver = { path = "../../message-predicates/contract-message-receiver" }
-reentrancy = { git = "https://github.com/FuelLabs/sway-libs", branch = "ls/feat/std-policies-branch" }
-src_20 = { git = "https://github.com/FuelLabs/sway-standards", branch = "ls/feat/std-policies-branch" }
+contract_message_receiver = { path = "../../message-predicates/contract-message-receiver" }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
@@ -24,7 +24,7 @@
     "dotenv": "^16.0.3",
     "ethereum-waffle": "^4.0.2",
     "ethers": "^5.7.2",
-    "fuels": "pr-1407",
+    "fuels": "next",
     "mocha": "^10.0.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.1.6"

diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
@@ -15,7 +15,7 @@
     "build": "tsup"
   },
   "peerDependencies": {
-    "fuels": "pr-1407",
+    "fuels": "next",
     "ethers": ">=5.7.2"
   },
   "devDependencies": {