Skip to content

Commit

Permalink
Bump apps to beta-5 (#753)
Browse files Browse the repository at this point in the history
* init

* init

* init

* Fundraiser bump

* TicTacToe bump

* diagnosing compiler bug

* bug fix

* Oracle-bump

* OTC-bump

* Timelock-bump

* update toolchain

* wow it actually works

* fmt

* update rust version?

* fix unnecessary hashes

* escrow lint

* update forc version in ci.yml

* update sdk

* fmt

* contributing book

* update versions in readme

* update versions in dao readme

* update tests

* bump

* update tests

* fmt

* readme versions

* readme versions

* readme versions

* update tests

* readme versions

* merge mport

* remove u8 conversion

* bump tests

* ujpdate tests

* fmt

* test 1

* update to latest

* bump apps to latest toolchain

* fmting

* add line to toml

* fmt 2

* update rust version

* latest toolchain

* fmt

* forc build

* Update toolchain

* Refactor English Auction Contract for new Native Assets

* Update tests for refactored English Auction

* Run formatter

* Update tests to fuels-rs 0.53.0

* Update Forc.lock

* Update to Rust 1.73.0

* Fix Clippy errors

* Change to rust v0.74.0

* update version

* make clippy happy

* Update README versions

* Add patch for tests

* Update Airdrop Contract

* Update tests for fuels-rs v0.53.0

* Update README and SPECIFICATION

* Update Forc.lock

* Updates based on PR comments

* Add comment on assembly code

* Update registry contract

* Update Registry contract tests

* Change set_name_owner() to transfer_name_ownership()

* Update README

* Add comments

* Fix inline docs type

* Update to forc v0.48.1

* Update to forc v0.48.1

* Run formatteR

* Update README

* Update README

* Update tests to fuels-rs 0.53.0

* Run rust formatter

* it works!!

* update to latest

* Fix execution error

* Fix failure to fetch fuel-core

* Resolve PR comments

* Update to nightly and format

* Update to nightly, fuel-core v0.21.0, and run formatter

* update to fuel-core 0.21.0

* Make clippy happy

* Make clipply happy

* Update README

* Update README

* Update NFT to forc v0.48.1

* Update token to forc v0.48.1

* Update to forc v0.48.1

* Update .templates

* Update .template tests

* Update aurora

* Update CI

* Update nightly date in CI

* Update nightly date in CI

* Update predicate to froc v0.48.1

* Update tests for fuels-rs v0.53.0

* Remove tx_params comment

* Update fuels-rs version in README

* Update to forc v0.49.1

* Update airdrop

* Update english auction

* Update counter script

* Update DAO

* Update escrow

* Update fundraiser

* Update tictactoe

* Update multisig

* update token

* Update NFT

* Update oracle

* Update timelock

* Update name registry

* Update OTC swap predicate

* Update all READMEs

* Update template

* Run formmater

* Update native-asset tests

* Update CI

* revert book CI updates

* Update DI

* Update CI

* Change ci to cd into contrubiting book

* Fix CI

* Have CI cd into manifest directories

---------

Co-authored-by: bitzoic <bitzoic.eth@gmail.com>
Co-authored-by: Cameron Carstens <54727135+bitzoic@users.noreply.github.com>
  • Loading branch information
3 people authored Jan 24, 2024
1 parent 24e7494 commit a7a5362
Show file tree
Hide file tree
Showing 218 changed files with 10,567 additions and 9,077 deletions.
2,385 changes: 1,004 additions & 1,381 deletions .devops/.template/project/Cargo.lock

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions .devops/.template/project/Forc.lock
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[[package]]
name = 'core'
source = 'path+from-root-FDF4A5DCC6ECD181'
name = "core"
source = "path+from-root-C3992B43B72ADB8C"

[[package]]
name = 'std'
source = 'git+https://github.com/fuellabs/sway?tag=v0.37.0#607ac50176db8bef936f91bacf435d0ea37d041e'
dependencies = ['core']
name = "std"
source = "git+https://github.com/fuellabs/sway?tag=v0.49.1#2ac7030570f22510b0ac2a7b5ddf7baa20bdc0e1"
dependencies = ["core"]

[[package]]
name = 'template-contract'
source = 'member'
dependencies = ['std']
name = "template-contract"
source = "member"
dependencies = ["std"]
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2021"
license = "Apache-2.0"

[dependencies]
fuels = { version = "0.40.0", features = ["fuel-core-lib"] }
fuels = { version = "0.53.0", features = ["fuel-core-lib"] }
tokio = { version = "1.12", features = ["rt", "macros"] }

[[test]]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
library;

mod example;
pub mod example;
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,20 @@ pub async fn setup() -> (Template<WalletUnlocked>, WalletUnlocked) {
Some(amount_per_coin),
);

let provider_config = Config {
manual_blocks_enabled: true, // Necessary so the `produce_blocks` API can be used locally
..Config::local_node()
};

let mut wallets =
launch_custom_provider_and_get_wallets(wallet_config, Some(provider_config), None).await;
let mut wallets = launch_custom_provider_and_get_wallets(wallet_config, None, None)
.await
.unwrap();

let wallet = wallets.pop().unwrap();

let storage_configuration = StorageConfiguration::load_from(TEMPLATE_CONTRACT_STORAGE_PATH);
let storage_configuration = StorageConfiguration::default()
.add_slot_overrides_from_file(TEMPLATE_CONTRACT_STORAGE_PATH);
let configuration =
LoadConfiguration::default().set_storage_configuration(storage_configuration.unwrap());
LoadConfiguration::default().with_storage_configuration(storage_configuration.unwrap());

let id = Contract::load_from(TEMPLATE_CONTRACT_BINARY_PATH, configuration)
.unwrap()
.deploy(&wallet, TxParameters::default())
.deploy(&wallet, TxPolicies::default())
.await
.unwrap();

Expand Down
6 changes: 3 additions & 3 deletions .devops/.template/project/fuel-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[toolchain]
channel = "latest-2023-04-12"
channel = "nightly-2024-01-24"

[components]
forc = "0.37.0"
fuel-core = "0.17.9"
forc = "0.49.1"
fuel-core = "0.22.0"
6 changes: 3 additions & 3 deletions .devops/aurora/fuel-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[toolchain]
channel = "2023-02-16"
channel = "nightly-2024-01-24"

[components]
forc = "0.35.1"
fuel-core = "0.17.2"
forc = "0.49.1"
fuel-core = "0.22.0"
22 changes: 11 additions & 11 deletions .docs/contributing-book/src/code/Forc.lock
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
[[package]]
name = 'bad_documentation'
source = 'member'
dependencies = ['std']
name = "bad_documentation"
source = "member"
dependencies = ["std"]

[[package]]
name = 'connect_four'
source = 'member'
dependencies = ['std']
name = "connect_four"
source = "member"
dependencies = ["std"]

[[package]]
name = 'core'
source = 'path+from-root-EB296BD18C0E4CC4'
name = "core"
source = "path+from-root-C3992B43B72ADB8C"

[[package]]
name = 'std'
source = 'git+https://github.com/fuellabs/sway?tag=v0.44.1#04a597093e7441898933dd412b8e4dc6ac860cd3'
dependencies = ['core']
name = "std"
source = "git+https://github.com/fuellabs/sway?tag=v0.49.1#2ac7030570f22510b0ac2a7b5ddf7baa20bdc0e1"
dependencies = ["core"]
6 changes: 3 additions & 3 deletions .docs/contributing-book/src/code/fuel-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[toolchain]
channel = "latest-2023-08-16"
channel = "nightly-2024-01-24"

[components]
forc = "0.44.1"
fuel-core = "0.20.4"
forc = "0.49.1"
fuel-core = "0.22.0"
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ concurrency:
cancel-in-progress: true

env:
RUST_VERSION: 1.71.1
RUST_VERSION: 1.74.0

jobs:
lint-toml-files:
Expand Down Expand Up @@ -73,8 +73,8 @@ jobs:
- name: Install Fuel toolchain
uses: FuelLabs/action-fuel-toolchain@v0.6.0
with:
toolchain: latest
date: 2023-09-29
toolchain: nightly
date: 2024-01-24

- name: Check Sway formatting
run: |
Expand Down Expand Up @@ -133,11 +133,11 @@ jobs:
- name: Install Fuel toolchain
uses: FuelLabs/action-fuel-toolchain@v0.6.0
with:
toolchain: latest
date: 2023-08-16
toolchain: nightly
date: 2024-01-24

- name: Check Sway formatting
run: forc fmt --check --path ${{ matrix.project }}
run: cd ${{ matrix.project }} && forc fmt --check

- name: Build Sway
run: forc build --locked --path ${{ matrix.project }}
run: cd ${{ matrix.project }} && forc build --locked
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- v*

env:
RUST_VERSION: 1.63.0
RUST_VERSION: 1.74.0

jobs:
deploy:
Expand Down
12 changes: 6 additions & 6 deletions DAO/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
</p>

<p align="center">
<a href="https://crates.io/crates/forc/0.42.1" alt="forc">
<img src="https://img.shields.io/badge/forc-v0.42.1-orange" />
<a href="https://crates.io/crates/forc/0.49.1" alt="forc">
<img src="https://img.shields.io/badge/forc-v0.49.1-orange" />
</a>
<a href="https://crates.io/crates/fuel-core/0.18.3" alt="fuel-core">
<img src="https://img.shields.io/badge/fuel--core-v0.18.3-yellow" />
<a href="https://crates.io/crates/fuel-core/0.22.0" alt="fuel-core">
<img src="https://img.shields.io/badge/fuel--core-v0.22.0-yellow" />
</a>
<a href="https://crates.io/crates/fuels/0.42.0" alt="forc">
<img src="https://img.shields.io/badge/fuels-v0.42.0-blue" />
<a href="https://crates.io/crates/fuels/0.53.0" alt="forc">
<img src="https://img.shields.io/badge/fuels-v0.53.0-blue" />
</a>
</p>

Expand Down
Loading

0 comments on commit a7a5362

Please sign in to comment.