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

sync mandos with v0.54.4 #1875

Merged
merged 8 commits into from
Nov 28, 2024
Merged

sync mandos with v0.54.4 #1875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6a6ff5c
sync mandos with v0.54.4
BiancaIalangi Nov 26, 2024
4acebb0
VM Rust - fix transferValueOnly in async call
BiancaIalangi Nov 26, 2024
8c6ae73
clippy fix
BiancaIalangi Nov 26, 2024
567b8f1
clippy fix
BiancaIalangi Nov 27, 2024
54bc4d4
fix for sc with names containing -
mihaicalinluca Nov 27, 2024
406e02e
Merge pull request #1880 from multiversx/snippets-gen-name-fix
andrei-marinica Nov 28, 2024
2fac9aa
update mx-scenario-go v3.0.0
BiancaIalangi Nov 28, 2024
7f67242
Merge branch 'master' into sync-mandos
BiancaIalangi Nov 28, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/actions-nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
rust-toolchain: nightly-2024-05-22
path-to-sc-meta: framework/meta
enable-contracts-size-report: false
mx-scenario-go-version: v2.1.0-alpha
mx-scenario-go-version: v3.0.0
coverage-args: --ignore-filename-regex='meta/src' --ignore-filename-regex='wasm-adapter' --ignore-filename-regex='benchmarks/' --ignore-filename-regex='tests/' --output ./coverage.md
secrets:
token: ${{ secrets.GITHUB_TOKEN }}
token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
with:
rust-toolchain: stable
path-to-sc-meta: framework/meta
mx-scenario-go-version: v2.1.0-alpha
mx-scenario-go-version: v3.0.0
coverage-args: --ignore-filename-regex='meta/src' --ignore-filename-regex='wasm-adapter' --ignore-filename-regex='benchmarks/' --ignore-filename-regex='tests/' --output ./coverage.md
secrets:
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/template-test-current.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
run: |
cargo install wasm-opt
cargo install --path framework/meta
sc-meta install mx-scenario-go --tag v2.0.0
sc-meta install mx-scenario-go --tag v3.0.0

which wasm-opt
which mx-scenario-go
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/template-test-released.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
run: |
cargo install wasm-opt
cargo install --path framework/meta
sc-meta install mx-scenario-go --tag v2.0.0
sc-meta install mx-scenario-go --tag v3.0.0

which wasm-opt
which mx-scenario-go
Expand Down
12 changes: 12 additions & 0 deletions chain/vm/src/tx_execution/exec_general_tx.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,18 @@ pub(crate) fn create_transfer_value_log(tx_input: &TxInput, call_type: CallType)
let mut data = vec![call_type.to_log_bytes(), tx_input.func_name.to_bytes()];
data.append(&mut tx_input.args.clone());

if tx_input.esdt_values.is_empty()
&& !tx_input.callback_payments.egld_value.is_zero()
&& tx_input.call_type == CallType::AsyncCallback
{
return TxLog {
address: tx_input.from.clone(),
endpoint: "transferValueOnly".into(),
topics: vec![b"".to_vec(), tx_input.to.to_vec()],
data,
};
}

let egld_value = if tx_input.call_type == CallType::AsyncCallback {
&tx_input.callback_payments.egld_value
} else {
Expand Down
2 changes: 1 addition & 1 deletion contracts/feature-tests/alloc-features/scenarios/alloc_mem_fail.scen.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"sc:alloc-mem-fail": {
"nonce": "0",
"balance": "0",
"code": "file:../output/alloc-mem-fail.wasm"
"code": "mxsc:../output/alloc-mem-fail.mxsc.json"
},
"address:an_account": {
"nonce": "0",
Expand Down
2 changes: 1 addition & 1 deletion contracts/feature-tests/alloc-features/scenarios/alloc_mem_leaking.scen.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"sc:alloc-mem-leaking": {
"nonce": "0",
"balance": "0",
"code": "file:../output/alloc-mem-leaking.wasm"
"code": "mxsc:../output/alloc-mem-leaking.mxsc.json"
},
"address:an_account": {
"nonce": "0",
Expand Down
2 changes: 1 addition & 1 deletion contracts/feature-tests/basic-features/scenarios/crypto_verify_bls.scen.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"expect": {
"out": [],
"status": "10",
"message": "str:err blsSignatureDeserialize 0032a2ddf341c08d1eb7232f05dc34e4454155e676b58c40fddf9a036562ac2c01533d2d557cb49d73aa9d7a89744696",
"message": "str:signature is invalid",
"logs": "*",
"gas": "*",
"refund": "*"
Expand Down
2 changes: 1 addition & 1 deletion ...s/feature-tests/basic-features/scenarios/crypto_verify_bls_aggregated_signature.scen.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"expect": {
"out": [],
"status": "10",
"message": "str:err blsSignatureDeserialize 0012858363e8caa5b398d3febdd7bc01bc2fae1fef8f486ff4d84a5f3342f2d38085904eb10b73c0879a45d23585ce8f",
"message": "str:signature is invalid",
"logs": "*",
"gas": "*",
"refund": "*"
Expand Down
2 changes: 1 addition & 1 deletion contracts/feature-tests/basic-features/scenarios/crypto_verify_bls_share.scen.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"expect": {
"out": [],
"status": "10",
"message": "str:err blsSignatureDeserialize ff725db195e37aa237cdbbda76270d4a229b6e7a3651104dc58c4349c0388e8546976fe54a04240530b99064e434c90f",
"message": "str:signature is invalid",
"logs": "*",
"gas": "*",
"refund": "*"
Expand Down
2 changes: 1 addition & 1 deletion contracts/feature-tests/basic-features/scenarios/crypto_verify_secp256r1.scen.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"expect": {
"out": [],
"status": "10",
"message": "str:signature verification failed",
"message": "str:signature is invalid",
"logs": "*",
"gas": "*",
"refund": "*"
Expand Down
2 changes: 1 addition & 1 deletion contracts/feature-tests/composability/scenarios/forwarder_call_async_retrieve_egld.scen.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
"address": "sc:vault",
"endpoint": "str:transferValueOnly",
"topics": [
"1000",
"",
"sc:forwarder"
],
"data": [
Expand Down
2 changes: 1 addition & 1 deletion contracts/feature-tests/composability/scenarios/promises_call_async_retrieve_egld.scen.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"address": "sc:vault",
"endpoint": "str:transferValueOnly",
"topics": [
"1000",
"",
"sc:forwarder"
],
"data": [
Expand Down
2 changes: 1 addition & 1 deletion framework/meta-lib/src/contract/generate_snippets/snippet_gen_main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ use super::{
impl MetaConfig {
pub fn generate_rust_snippets(&self, args: &GenerateSnippetsArgs) {
let main_contract = self.sc_config.main_contract();
let crate_name = &main_contract.contract_name;
let crate_name = &main_contract.contract_name.replace("-", "_");
let mut file =
create_snippets_crate_and_get_lib_file(&self.snippets_dir, crate_name, args.overwrite);
write_snippets_to_file(&mut file, &self.original_contract_abi, crate_name);
Expand Down
Loading