FuelLabs · viraj124 · Sep 20, 2024 · Sep 19, 2024 · Sep 19, 2024 · Sep 20, 2024
diff --git a/.github/actions/setup-rust/action.yml b/.github/actions/setup-rust/action.yml
@@ -4,7 +4,7 @@ inputs:
   rust-version:
     default: 1.80.1
   forc-components:
-    default: '[email protected], fuel-core@0.33.0'
+    default: '[email protected], fuel-core@0.36.0'
 
 runs:
   using: 'composite'

diff --git a/docker/fuel-core/Dockerfile b/docker/fuel-core/Dockerfile
@@ -3,7 +3,7 @@
 # https://github.com/FuelLabs/chain-configuration/tree/master/upgradelog/ignition-testnet
 # and apply the latest state_transition_function and consensus_parameter
 # when upgrading fuel-core
-FROM ghcr.io/fuellabs/fuel-core:v0.33.0
+FROM ghcr.io/fuellabs/fuel-core:v0.36.0
 
 ARG FUEL_IP=0.0.0.0
 ARG FUEL_PORT=4001
@@ -22,13 +22,16 @@ RUN git clone \
     https://github.com/FuelLabs/chain-configuration.git \
     /chain-configuration
 
+# Anchor the chain configuration to a specific commit to avoid CI breaking
+RUN cd /chain-configuration && git checkout c1c4d3bca57f64118a8d157310e0a839ae5c180a
+
 # Copy the base local configuration
 RUN cp -R /chain-configuration/local/* ./
 
-# Copy the testnet consensus parameters and state transition bytecode
-RUN cp /chain-configuration/upgradelog/ignition-testnet/consensus_parameters/5.json \
+# Copy the devnet consensus parameters and state transition bytecode
+RUN cp /chain-configuration/upgradelog/ignition-devnet/consensus_parameters/9.json \
     ./latest_consensus_parameters.json
-RUN cp /chain-configuration/upgradelog/ignition-testnet/state_transition_function/6.wasm \
+RUN cp /chain-configuration/upgradelog/ignition-devnet/state_transition_function/9.wasm \
     ./state_transition_bytecode.wasm
 
 # update local state_config with custom genesis coins config

diff --git a/docker/full-env/Dockerfile b/docker/full-env/Dockerfile
@@ -1,6 +1,6 @@
 # This image is built for external projects that want to have
 # an e2e test environment
-FROM ghcr.io/fuellabs/fuel-core:v0.33.0 as fuel-core
+FROM ghcr.io/fuellabs/fuel-core:v0.36.0 as fuel-core
 FROM ghcr.io/fuellabs/fuel-block-committer:v0.4.0 as fuel-committer
 
 FROM node:20-slim as base

diff --git a/fuel-toolchain.toml b/fuel-toolchain.toml
@@ -2,5 +2,5 @@
 channel = "testnet"
 
 [components]
-fuel-core = "0.33.0"
+fuel-core = "0.36.0"
 forc = "0.63.4"
diff --git a/packages/base-asset/fuel-toolchain.toml b/packages/base-asset/fuel-toolchain.toml
@@ -3,4 +3,4 @@ channel = "nightly-2024-08-20"
 
 [components]
 forc = "0.63.1"
-fuel-core = "0.33.0"
+fuel-core = "0.36.0"
diff --git a/packages/integration-tests/tests/bridge_erc20.ts b/packages/integration-tests/tests/bridge_erc20.ts
@@ -71,7 +71,6 @@ describe('Bridging ERC20 tokens', async function () {
       .addContracts([fuel_bridge, fuel_bridgeImpl])
       .txParams({
         tip: 0,
-        gasLimit: 1_000_000,
         maxFee: 1,
       })
       .callParams({
@@ -273,7 +272,6 @@ describe('Bridging ERC20 tokens', async function () {
       expect(message).to.not.be.null;
 
       const tx = await relayCommonMessage(env.fuel.deployer, message, {
-        gasLimit: 30000000,
         maturity: undefined,
         contractIds: [fuel_bridgeImpl.id.toHexString()],
       });

diff --git a/packages/integration-tests/tests/bridge_mainnet_tokens.ts b/packages/integration-tests/tests/bridge_mainnet_tokens.ts
@@ -95,7 +95,6 @@ describe('Bridge mainnet tokens', function () {
       .addContracts([fuel_bridge, fuel_bridgeImpl])
       .txParams({
         tip: 0,
-        gasLimit: 1_000_000,
         maxFee: 1,
       })
       .callParams({

diff --git a/packages/test-utils/src/utils/constants.ts b/packages/test-utils/src/utils/constants.ts
@@ -6,14 +6,14 @@ export const ETHEREUM_ETH_DECIMALS = 18n;
 export const FUEL_ETH_DECIMALS = 9n;
 export const FUEL_MESSAGE_POLL_MS: number = 300;
 export const MAX_GAS_PER_TX = bn(100_000_000);
-export const FUEL_GAS_LIMIT = 500_000_000;
+export const FUEL_GAS_LIMIT = 100000000;
 export const FUEL_MAX_FEE = 1;
 export const FUEL_TX_PARAMS: TxParams = {
   gasLimit: process.env.FUEL_GAS_LIMIT || FUEL_GAS_LIMIT,
   maxFee: process.env.FUEL_MAX_FEE || FUEL_MAX_FEE,
 };
 export const FUEL_CALL_TX_PARAMS = {
-  gasLimit: bn(64_933),
+  gasLimit: bn(10_000_000),
   maxFee: FUEL_TX_PARAMS.maxFee,
 };
 export const FUEL_MESSAGE_TIMEOUT_MS = 1_000_000;
diff --git a/packages/test-utils/src/utils/fuels/relayCommonMessage.ts b/packages/test-utils/src/utils/fuels/relayCommonMessage.ts
@@ -48,6 +48,8 @@ type CommonMessageDetails = {
   ) => Promise<ScriptTransactionRequest>;
 };
 
+const PREDICATE_GAS_LIMIT = 10_000_000;
+
 // Details for relaying common messages with certain predicate roots
 function getCommonRelayableMessages(provider: Provider) {
   // Create a predicate for common messages
@@ -150,7 +152,7 @@ function getCommonRelayableMessages(provider: Provider) {
         });
         transaction.witnesses.push(ZeroBytes32);
 
-        transaction.gasLimit = bn(500_000);
+        transaction.gasLimit = bn(PREDICATE_GAS_LIMIT);
 
         debug(
           '-------------------------------------------------------------------'