Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat!: upgrade fuel-core to v0.20.1 #1053

Merged
merged 22 commits into from
Aug 8, 2023
Merged

feat!: upgrade fuel-core to v0.20.1 #1053

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
65dcf67
Draft pull request of the upgrade to the `fuel-core master`
xgreenx Jul 18, 2023
da1e382
An upgrade to `fuel-core 0.20.1`
xgreenx Jul 18, 2023
e68292a
Patch the Sway branch name
xgreenx Jul 18, 2023
76a8661
Apply suggestions from code review
xgreenx Jul 18, 2023
dc46bbd
fix programs
leviathanbeak Jul 21, 2023
4edde7f
restart CI
leviathanbeak Jul 21, 2023
e846452
use is_some instead
leviathanbeak Jul 24, 2023
c20ff05
Merge branch 'master' into upgrade/fuel-core-v0.20.1
xgreenx Jul 24, 2023
f921c6e
Merge branch 'master' into upgrade/fuel-core-v0.20.1
xgreenx Jul 26, 2023
056b4c6
Add native support for serde serialization and deserialization
xgreenx Jul 26, 2023
539dcad
Increase default gas limit
xgreenx Jul 26, 2023
e48f003
Fix compilation errors
xgreenx Jul 27, 2023
5cc7e8b
Fix tests
xgreenx Jul 29, 2023
b703419
Fix tests
xgreenx Aug 1, 2023
8d72700
Merge branch 'master' into upgrade/fuel-core-v0.20.1
xgreenx Aug 5, 2023
0f9d926
The final fix for tests
xgreenx Aug 5, 2023
5b6de1e
Fix CI
xgreenx Aug 5, 2023
7ed154c
Fix CI
xgreenx Aug 5, 2023
bfddc93
Merge branch 'master' into upgrade/fuel-core-v0.20.1
hal3e Aug 7, 2023
a0f2274
Addressed review comments
xgreenx Aug 7, 2023
99b89cb
Apply suggestions from code review
xgreenx Aug 7, 2023
6159524
Merge branch 'master' into upgrade/fuel-core-v0.20.1
xgreenx Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ env:
CARGO_TERM_COLOR: always
DASEL_VERSION: https://github.com/TomWright/dasel/releases/download/v1.24.3/dasel_linux_amd64
RUSTFLAGS: "-D warnings"
FUEL_CORE_VERSION: 0.19.1
FUEL_CORE_VERSION: 0.20.1
RUST_VERSION: 1.70.0
FORC_VERSION: 0.40.1
FORC_PATCH_BRANCH: ""
FORC_PATCH_BRANCH: "upgrade/fuel-core-v0.20.1"
Br1ght0ne marked this conversation as resolved.
Show resolved Hide resolved
FORC_PATCH_REVISION: ""

jobs:
Expand Down Expand Up @@ -196,6 +196,7 @@ jobs:
with:
key: "${{ matrix.cargo_command }} ${{ matrix.args }} ${{ matrix.package }}"

# Use docker image of the `fuel-core` instead or build the `fuel-core` from the `master`.
- name: Install Fuel Core
if: ${{ matrix.install_fuel_core }}
run: |
Expand Down
26 changes: 15 additions & 11 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,6 @@ chrono = "0.4.24"
elliptic-curve = { version = "0.13.4", default-features = false }
eth-keystore = "0.5.0"
fuel-abi-types = "0.3.0"
fuel-core = { version = "0.19.1", default-features = false }
fuel-core-chain-config = { version = "0.19.1", default-features = false }
fuel-core-client = { version = "0.19.1", default-features = false }
fuel-core-types = { version = "0.19.1", default-features = false }
fuel-asm = "0.34.0"
fuel-crypto = "0.34.0"
fuel-merkle = "0.34.0"
fuel-storage = "0.34.0"
fuel-tx = "0.34.0"
fuel-types = { version = "0.34.0", default-features = false }
fuel-vm = "0.34.0"
fuels = { version = "0.44.0", path = "./packages/fuels" }
fuels-accounts = { version = "0.44.0", path = "./packages/fuels-accounts", default-features = false }
fuels-code-gen = { version = "0.44.0", path = "./packages/fuels-code-gen", default-features = false }
Expand Down Expand Up @@ -84,3 +73,18 @@ thiserror = { version = "1.0.40", default-features = false }
tokio = { version = "1.27.0", default-features = false }
trybuild = "1.0.80"
which = { version = "4.4", default-features = false }

# Depednencies from `fuel-core` repository:
xgreenx marked this conversation as resolved.
Show resolved Hide resolved
fuel-core = { version = "0.20.1", default-features = false }
fuel-core-chain-config = { version = "0.20.1", default-features = false }
fuel-core-client = { version = "0.20.1", default-features = false }
fuel-core-types = { version = "0.20.1", default-features = false }

# Depednencies from `fuel-vm` repository:
xgreenx marked this conversation as resolved.
Show resolved Hide resolved
fuel-asm = "0.35.0"
fuel-crypto = "0.35.0"
fuel-merkle = "0.35.0"
fuel-storage = "0.35.0"
fuel-tx = "0.35.0"
fuel-types = { version = "0.35.0", default-features = false }
fuel-vm = "0.35.0"
Loading