Skip to content

Commit

Permalink
Merge branch 'master' into ls/fix/remove-timeout
Browse files Browse the repository at this point in the history
  • Loading branch information
luizstacio authored Oct 14, 2024
2 parents ddecc0d + dde6e3a commit 3910100
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 47 deletions.
5 changes: 5 additions & 0 deletions .changeset/tidy-ducks-scream.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"fuels-wallet": patch
---

chore: update connectors and react version to 0.35.1
15 changes: 2 additions & 13 deletions .github/actions/setup-rust/action.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,12 @@
name: 'Rust & Forc Setup'
name: 'Forc Setup'

inputs:
rust-version:
default: 1.77.2
forc-components:
default: '[email protected], fuel-core@0.38.0'
default: '[email protected], fuel-core@0.39.0'

runs:
using: 'composite'
steps:
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ inputs.rust-version }}
components: clippy, rustfmt

- name: Init cache
uses: Swatinem/rust-cache@v2

- name: Install Fuel toolchain
uses: FuelLabs/[email protected]
with:
Expand Down
6 changes: 3 additions & 3 deletions docker/fuel-core/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

# We should be supporting always the same fuel-core version as the fuels (ts-sdk)
# https://github.com/FuelLabs/fuels-ts/blob/master/internal/fuel-core/VERSION
FROM ghcr.io/fuellabs/fuel-core:v0.38.0
FROM ghcr.io/fuellabs/fuel-core:v0.39.0

# dependencies
ENV DEBIAN_FRONTEND=noninteractive
Expand All @@ -21,15 +21,15 @@ RUN git clone \
https://github.com/FuelLabs/chain-configuration.git \
/chain-configuration && \
cd /chain-configuration && \
git checkout f31f565905e001b4d6ed9c9d09479dc961ad7367
git checkout 0dc0960f14da7b6650b5438dc1e99d7ff7acec73

# 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-devnet/consensus_parameters/13.json \
./latest_consensus_parameters.json
RUN cp /chain-configuration/upgradelog/ignition-devnet/state_transition_function/14.wasm \
RUN cp /chain-configuration/upgradelog/ignition-devnet/state_transition_function/15.wasm \
./state_transition_bytecode.wasm

# update local state_config with custom genesis coins config
Expand Down
4 changes: 2 additions & 2 deletions examples/cra-dapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"start": "vite"
},
"dependencies": {
"@fuels/connectors": "0.35.0",
"@fuels/react": "0.35.0",
"@fuels/connectors": "0.35.1",
"@fuels/react": "0.35.1",
"@tanstack/react-query": "5.28.4",
"fuels": "0.96.1",
"react": "18.3.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"devDependencies": {
"@crxjs/vite-plugin": "1.0.14",
"@fuel-wallet/types": "workspace:*",
"@fuels/connectors": "0.35.0",
"@fuels/connectors": "0.35.1",
"@playwright/test": "1.46.1",
"@sentry/cli": "2.33.1",
"@storybook/addon-a11y": "7.4.6",
Expand Down
4 changes: 2 additions & 2 deletions packages/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"@fuel-ui/css": "0.23.3",
"@fuel-ui/icons": "0.23.3",
"@fuel-ui/react": "0.23.3",
"@fuels/connectors": "0.35.0",
"@fuels/react": "0.35.0",
"@fuels/connectors": "0.35.1",
"@fuels/react": "0.35.1",
"@mdx-js/react": "2.3.0",
"@next/mdx": "14.2.12",
"@tanstack/react-query": "5.28.4",
Expand Down
4 changes: 2 additions & 2 deletions packages/e2e-contract-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"preview": "vite preview"
},
"dependencies": {
"@fuels/connectors": "0.35.0",
"@fuels/react": "0.35.0",
"@fuels/connectors": "0.35.1",
"@fuels/react": "0.35.1",
"@tanstack/react-query": "5.28.4",
"fuels": "0.96.1",
"react": "18.3.1",
Expand Down
48 changes: 24 additions & 24 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

0 comments on commit 3910100

Please sign in to comment.