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.

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

sc upgrade to 0.53.0 #16

Merged
merged 1 commit into from
Sep 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 4 additions & 5 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: CI
on:
push:
branches:
- master
- main
pull_request:

permissions:
Expand All @@ -13,10 +13,9 @@ permissions:
jobs:
contracts:
name: Contracts
uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v2
uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v3.2.0
with:
rust-toolchain: nightly-2023-02-09
vmtools-version: v1.4.60
install-libtinfo5: true
rust-toolchain: stable
enable-contracts-size-report: false
secrets:
token: ${{ secrets.GITHUB_TOKEN }}
8 changes: 5 additions & 3 deletions ping-pong/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
name = "ping-pong"
version = "0.0.2"
authors = ["Bruda Claudiu-Marcel <[email protected]>"]
edition = "2018"
edition = "2021"
publish = false

[lib]
path = "src/ping_pong.rs"

[dependencies.multiversx-sc]
version = "0.42.0"
version = "0.52.3"

[dev-dependencies.multiversx-sc-scenario]
version = "0.42.0"
version = "0.52.3"
6 changes: 3 additions & 3 deletions ping-pong/meta/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
name = "ping-pong-meta"
version = "0.0.0"
authors = ["Bruda Claudiu-Marcel <[email protected]>"]
edition = "2018"
edition = "2021"
publish = false
[dependencies.ping-pong]
path = ".."

[dependencies.multiversx-sc-meta]
version = "0.42.0"
[dependencies.multiversx-sc-meta-lib]
version = "0.52.3"
2 changes: 1 addition & 1 deletion ping-pong/meta/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
fn main() {
multiversx_sc_meta::cli_main::<ping_pong::AbiProvider>();
multiversx_sc_meta_lib::cli_main::<ping_pong::AbiProvider>();
}
2 changes: 1 addition & 1 deletion ping-pong/src/ping_pong.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#![no_std]

multiversx_sc::imports!();
use multiversx_sc::imports::*;

/// A contract that allows anyone to send a fixed sum, locks it for a while and then allows users to take it back.
/// Sending funds to the contract is called "ping".
Expand Down
1 change: 0 additions & 1 deletion ping-pong/tests/ping_pong_egld_scenario_rs_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;

fn world() -> ScenarioWorld {
let mut blockchain = ScenarioWorld::new();
blockchain.set_current_dir_from_workspace("ping-pong");

blockchain.register_contract("file:output/ping-pong.wasm", ping_pong::ContractBuilder);
blockchain
Expand Down
22 changes: 17 additions & 5 deletions ping-pong/wasm/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,22 +1,34 @@
# Code generated by the multiversx-sc build system. DO NOT EDIT.

# ##########################################
# ############## AUTO-GENERATED #############
# ##########################################

[package]
name = "ping-pong-wasm"
version = "0.0.1"
authors = ["Bruda Claudiu-Marcel <[email protected]>"]
edition = "2018"
version = "0.0.0"
edition = "2021"
publish = false

[lib]
crate-type = ["cdylib"]

[workspace]
[profile.release]
codegen-units = 1
opt-level = "z"
lto = true
debug = false
panic = "abort"
overflow-checks = false

[profile.dev]
panic = "abort"

[dependencies.ping-pong]
path = ".."

[dependencies.multiversx-sc-wasm-adapter]
version = "0.42.0"
version = "0.52.3"

[workspace]
members = ["."]
3 changes: 1 addition & 2 deletions ping-pong/wasm/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Code generated by the multiversx-sc multi-contract system. DO NOT EDIT.
// Code generated by the multiversx-sc build system. DO NOT EDIT.

////////////////////////////////////////////////////
////////////////// AUTO-GENERATED //////////////////
Expand All @@ -10,7 +10,6 @@
// Total number of exported functions: 11

#![no_std]
#![feature(lang_items)]

multiversx_sc_wasm_adapter::allocator!();
multiversx_sc_wasm_adapter::panic_handler!();
Expand Down
Loading