Skip to content

Commit

Permalink
Merge pull request #2 from multiversx/upgrade
Browse files Browse the repository at this point in the history 
upgrade
  • Loading branch information
@dorin-iancu
dorin-iancu authored Oct 9, 2023
2 parents cc3c43c + 8b4a284 commit f90f995
Show file tree
Hide file tree
Showing 20 changed files with 1,557 additions and 179 deletions.
1,643 changes: 1,507 additions & 136 deletions Cargo.lock
View file

Large diffs are not rendered by default.

10 changes: 6 additions & 4 deletions bridged-tokens-wrapper/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
[package]
name = "bridged-tokens-wrapper"
version = "0.0.0"
authors = ["Alin Cruceat <alin.cruceat@elrond.com>"]
authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
edition = "2018"
publish = false

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

[dependencies.transaction]
path = "../common/transaction"

[dependencies.multiversx-sc]
version = "0.41.3"
version = "0.43.4"

[dependencies.multiversx-sc-modules]
version = "0.41.3"
version = "0.43.4"

[dev-dependencies.multiversx-sc-scenario]
version = "0.41.3"
version = "0.43.4"
2 changes: 1 addition & 1 deletion bridged-tokens-wrapper/meta/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ publish = false
path = ".."

[dependencies.multiversx-sc-meta]
version = "0.41.3"
version = "0.43.4"
4 changes: 2 additions & 2 deletions bridged-tokens-wrapper/wasm/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "bridged-tokens-wrapper-wasm"
version = "0.0.0"
authors = ["Alin Cruceat <alin.cruceat@elrond.com>"]
authors = ["Alin Cruceat <alin.cruceat@multiversx.com>"]
edition = "2018"
publish = false

Expand All @@ -17,7 +17,7 @@ panic = "abort"
path = ".."

[dependencies.multiversx-sc-wasm-adapter]
version = "0.41.3"
version = "0.43.4"

[workspace]
members = ["."]
4 changes: 2 additions & 2 deletions common/eth-address/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[package]
name = "eth-address"
version = "0.0.0"
authors = ["dorin-iancu <dorin.iancu@elrond.com>"]
authors = ["dorin-iancu <dorin.iancu@multiversx.com>"]
edition = "2018"

[lib]
path = "src/lib.rs"
[dependencies.multiversx-sc]
version = "0.41.3"
version = "0.43.4"
6 changes: 3 additions & 3 deletions common/fee-estimator-module/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[package]
name = "fee-estimator-module"
version = "0.0.0"
authors = ["dorin-iancu <dorin.iancu@elrond.com>"]
authors = ["dorin-iancu <dorin.iancu@multiversx.com>"]
edition = "2018"
[dependencies.multiversx-sc]
version = "0.41.3"
version = "0.43.4"
[dev-dependencies.multiversx-sc-scenario]
version = "0.41.3"
version = "0.43.4"
6 changes: 3 additions & 3 deletions common/max-bridged-amount-module/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[package]
name = "max-bridged-amount-module"
version = "0.0.0"
authors = ["dorin-iancu <dorin.iancu@elrond.com>"]
authors = ["dorin-iancu <dorin.iancu@multiversx.com>"]
edition = "2018"
[dependencies.multiversx-sc]
version = "0.41.3"
version = "0.43.4"
[dev-dependencies.multiversx-sc-scenario]
version = "0.41.3"
version = "0.43.4"
6 changes: 3 additions & 3 deletions common/token-module/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[package]
name = "token-module"
version = "0.0.0"
authors = ["dorin-iancu <dorin.iancu@elrond.com>"]
authors = ["dorin-iancu <dorin.iancu@multiversx.com>"]
edition = "2018"
[dependencies.fee-estimator-module]
path = "../fee-estimator-module"

[dependencies.multiversx-sc]
version = "0.41.3"
version = "0.43.4"
[dev-dependencies.multiversx-sc-scenario]
version = "0.41.3"
version = "0.43.4"
4 changes: 2 additions & 2 deletions common/transaction/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "transaction"
version = "0.0.0"
authors = ["dorin-iancu <dorin.iancu@elrond.com>"]
authors = ["dorin-iancu <dorin.iancu@multiversx.com>"]
edition = "2018"

[lib]
Expand All @@ -10,4 +10,4 @@ path = "src/lib.rs"
path = "../eth-address"

[dependencies.multiversx-sc]
version = "0.41.3"
version = "0.43.4"
6 changes: 3 additions & 3 deletions common/tx-batch-module/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[package]
name = "tx-batch-module"
version = "0.0.0"
authors = ["dorin-iancu <dorin.iancu@elrond.com>"]
authors = ["dorin-iancu <dorin.iancu@multiversx.com>"]
edition = "2018"
[dependencies.multiversx-sc]
version = "0.41.3"
version = "0.43.4"

[dependencies.transaction]
path = "../transaction"
[dev-dependencies.multiversx-sc-scenario]
version = "0.41.3"
version = "0.43.4"
8 changes: 5 additions & 3 deletions esdt-safe/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ publish = false

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

[dependencies.transaction]
path = "../common/transaction"

Expand All @@ -26,9 +27,10 @@ path = "../common/tx-batch-module"
path = "../common/max-bridged-amount-module"

[dependencies.multiversx-sc]
version = "0.41.3"
version = "0.43.4"

[dependencies.multiversx-sc-modules]
version = "0.41.3"
version = "0.43.4"

[dev-dependencies.multiversx-sc-scenario]
version = "0.41.3"
version = "0.43.4"
2 changes: 1 addition & 1 deletion esdt-safe/meta/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ publish = false
path = ".."

[dependencies.multiversx-sc-meta]
version = "0.41.3"
version = "0.43.4"
2 changes: 1 addition & 1 deletion esdt-safe/wasm/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ panic = "abort"
path = ".."

[dependencies.multiversx-sc-wasm-adapter]
version = "0.41.3"
version = "0.43.4"
6 changes: 4 additions & 2 deletions multi-transfer-esdt/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ publish = false

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

[dependencies.transaction]
path = "../common/transaction"

Expand All @@ -20,6 +21,7 @@ path = "../common/max-bridged-amount-module"
path = "../bridged-tokens-wrapper"

[dependencies.multiversx-sc]
version = "0.41.3"
version = "0.43.4"

[dev-dependencies.multiversx-sc-scenario]
version = "0.41.3"
version = "0.43.4"
2 changes: 1 addition & 1 deletion multi-transfer-esdt/meta/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ publish = false
path = ".."

[dependencies.multiversx-sc-meta]
version = "0.41.3"
version = "0.43.4"
2 changes: 1 addition & 1 deletion multi-transfer-esdt/wasm/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ panic = "abort"
path = ".."

[dependencies.multiversx-sc-wasm-adapter]
version = "0.41.3"
version = "0.43.4"
10 changes: 6 additions & 4 deletions multisig/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
[package]
name = "multisig"
version = "0.0.0"
authors = ["Andrei Marinica <andrei.marinica@elrond.com>, Dorin Iancu <dorin.iancu@elrond.com>"]
authors = ["Andrei Marinica <andrei.marinica@multiversx.com>, Dorin Iancu <dorin.iancu@multiversx.com>"]
edition = "2018"
publish = false

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

[dependencies.transaction]
path = "../common/transaction"

Expand All @@ -32,9 +33,10 @@ path = "../esdt-safe"
path = "../multi-transfer-esdt"

[dependencies.multiversx-sc]
version = "0.41.3"
version = "0.43.4"

[dependencies.multiversx-sc-modules]
version = "0.41.3"
version = "0.43.4"

[dev-dependencies.multiversx-sc-scenario]
version = "0.41.3"
version = "0.43.4"
4 changes: 2 additions & 2 deletions multisig/meta/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "multisig-meta"
version = "0.0.0"
authors = ["Andrei Marinica <andrei.marinica@elrond.com>, Dorin Iancu <dorin.iancu@elrond.com>"]
authors = ["Andrei Marinica <andrei.marinica@multiversx.com>, Dorin Iancu <dorin.iancu@multiversx.com>"]
edition = "2018"
publish = false
[dependencies.multisig]
path = ".."

[dependencies.multiversx-sc-meta]
version = "0.41.3"
version = "0.43.4"
5 changes: 2 additions & 3 deletions multisig/src/setup.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,11 @@ pub trait SetupModule:
) {
let mut metadata = CodeMetadata::UPGRADEABLE;
if is_payable {
// TODO: Replace with PayableBySc when it's available
metadata |= CodeMetadata::PAYABLE;
metadata |= CodeMetadata::PAYABLE_BY_SC;
}

let gas = self.blockchain().get_gas_left();
Self::Api::send_api_impl().upgrade_from_source_contract(
self.send_raw().upgrade_from_source_contract(
&child_sc_address,
gas,
&BigUint::zero(),
Expand Down
4 changes: 2 additions & 2 deletions multisig/wasm/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "multisig-wasm"
version = "0.0.0"
authors = ["Andrei Marinica <andrei.marinica@elrond.com>, Dorin Iancu <dorin.iancu@elrond.com>"]
authors = ["Andrei Marinica <andrei.marinica@multiversx.com>, Dorin Iancu <dorin.iancu@multiversx.com>"]
edition = "2018"
publish = false

Expand All @@ -17,7 +17,7 @@ panic = "abort"
path = ".."

[dependencies.multiversx-sc-wasm-adapter]
version = "0.41.3"
version = "0.43.4"

[workspace]
members = ["."]

0 comments on commit f90f995

Please sign in to comment.