Skip to content

Commit 6c49fc5

Browse files
upgrade migration to v0.59.0
1 parent 4988c2d commit 6c49fc5

File tree

9 files changed

+49
-4
lines changed

9 files changed

+49
-4
lines changed

Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

contracts/feature-tests/composability/forwarder/src/fwd_call_sync.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ pub trait ForwarderSyncCallModule {
119119
result
120120
}
121121

122+
#[allow(deprecated)]
122123
#[endpoint]
123124
#[payable("*")]
124125
fn forward_sync_accept_funds_rh_multi_esdt(

framework/base/src/types/interaction/result_handlers/returns_bt_legacy.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use crate::{
33
types::{BackTransfersLegacy, RHListItem, RHListItemExec, TxEnv},
44
};
55

6-
/// Indicates that back-transfers will be returned.
6+
/// Indicates that back-transfers will be returned, old implementation.
77
#[deprecated(
88
since = "0.59.0",
99
note = "Does not handle multi-transfers properly, use ReturnsBackTransfers instead"

framework/base/src/types/interaction/result_handlers/returns_bt_legacy_multi_esdt.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@ use crate::{
33
types::{EsdtTokenPayment, ManagedVec, RHListItem, RHListItemExec, TxEnv},
44
};
55

6-
/// Indicates that back-transfers will be returned.
6+
/// Indicates that back-transfers will be returned, old implementation.
7+
#[deprecated(
8+
since = "0.59.0",
9+
note = "Does not handle multi-transfers properly, use ReturnsBackTransfers instead"
10+
)]
711
pub struct ReturnsBackTransfersLegacyMultiESDT;
812

913
impl<Env, Original> RHListItem<Env, Original> for ReturnsBackTransfersLegacyMultiESDT

framework/base/src/types/interaction/result_handlers/returns_bt_legacy_reset.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use crate::{
33
types::{BackTransfersLegacy, RHListItem, RHListItemExec, TxEnv},
44
};
55

6-
/// Indicates that back-transfers will be returned.
6+
/// Indicates that back-transfers will be returned, old implementation.
77
///
88
/// Back-transfers are reset before a call, to avoid unwanted interferences.
99
#[deprecated(

framework/meta/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ toml = { version = "0.8.6", features = ["preserve_order"] }
3333
colored = "3.0"
3434
convert_case = "0.8"
3535
semver = "1.0.20"
36-
ruplacer = { version = "0.10.0", default-features = false }
36+
ruplacer = { version = "0.10", default-features = false }
37+
regex = "1.11"
3738
reqwest = { version = "0.12", features = ["blocking", "json"] }
3839
zip = { version = "4.0", features = ["deflate"], default-features = false }
3940
copy_dir = "0.1.2"

framework/meta/src/cmd/upgrade.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ mod upgrade_0_32;
33
mod upgrade_0_39;
44
mod upgrade_0_45;
55
mod upgrade_0_51;
6+
mod upgrade_0_59;
67
pub(crate) mod upgrade_common;
78
mod upgrade_print;
89
mod upgrade_selector;
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
use super::upgrade_common::{replace_in_files, version_bump_in_cargo_toml};
2+
use crate::folder_structure::RelevantDirectory;
3+
use regex::Regex;
4+
use ruplacer::Query;
5+
use std::path::Path;
6+
7+
/// Migrate `0.58` to `0.59.0`, including the version bump.
8+
pub fn upgrade_to_59_0(dir: &RelevantDirectory) {
9+
v_0_59_replace_in_files(dir.path.as_ref());
10+
11+
let (from_version, to_version) = dir.upgrade_in_progress.clone().unwrap();
12+
version_bump_in_cargo_toml(&dir.path, &from_version, &to_version);
13+
}
14+
15+
fn v_0_59_replace_in_files(sc_crate_path: &Path) {
16+
replace_in_files(
17+
sc_crate_path,
18+
"*rs",
19+
&[
20+
Query::regex(
21+
Regex::new(r"\bReturnsBackTransfers\b").unwrap(),
22+
"ReturnsBackTransfersLegacy",
23+
),
24+
Query::regex(
25+
Regex::new(r"\bReturnsBackTransfersReset\b").unwrap(),
26+
"ReturnsBackTransfersLegacyReset",
27+
),
28+
Query::regex(
29+
Regex::new(r"\bReturnsBackTransfersMultiESDT\b").unwrap(),
30+
"ReturnsBackTransfersLegacyMultiESDT",
31+
),
32+
][..],
33+
);
34+
}

framework/meta/src/cmd/upgrade/upgrade_selector.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ use super::{
1515
upgrade_0_39::{postprocessing_after_39_0, upgrade_to_39_0},
1616
upgrade_0_45::upgrade_to_45_0,
1717
upgrade_0_51::upgrade_to_51_0,
18+
upgrade_0_59::upgrade_to_59_0,
1819
upgrade_common::{cargo_check, version_bump_in_cargo_toml},
1920
upgrade_print::*,
2021
};
@@ -79,6 +80,8 @@ fn upgrade_function_selector(dir: &RelevantDirectory) {
7980
upgrade_to_45_0(dir)
8081
} else if framework_version!(0.51.0) == *to_version {
8182
upgrade_to_51_0(dir)
83+
} else if framework_version!(0.59.0) == *to_version {
84+
upgrade_to_59_0(dir)
8285
} else {
8386
version_bump_in_cargo_toml(&dir.path, from_version, to_version)
8487
}

0 commit comments

Comments
 (0)