Skip to content

integrate transfer and execute with return error #6852

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

Merged
merged 5 commits into from
Mar 18, 2025
Merged

integrate transfer and execute with return error #6852

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aacd0ff
update vm version
laurci Mar 4, 2025
ae061b7
fix integration tests
laurci Mar 4, 2025
16f0269
update vm version
laurci Mar 6, 2025
252b042
update vm version
laurci Mar 14, 2025
c7cd985
Merge branch 'rc/barnard' into transfer-with-return-err
laurci Mar 17, 2025
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ require (
github.com/multiversx/mx-chain-scenario-go v1.5.1-0.20250218162624-877d8b9870a4
github.com/multiversx/mx-chain-storage-go v1.0.20-0.20250218162234-85e60acebb43
github.com/multiversx/mx-chain-vm-common-go v1.5.17-0.20250218162215-88938774627c
github.com/multiversx/mx-chain-vm-go v1.5.38-0.20250218163500-604d44bde745
github.com/multiversx/mx-chain-vm-go v1.5.38-0.20250304111815-8b8e7254cac1
github.com/multiversx/mx-chain-vm-v1_2-go v1.2.69-0.20250220133402-01591d72f671
github.com/multiversx/mx-chain-vm-v1_3-go v1.3.70-0.20250220133720-4abbb3b36387
github.com/multiversx/mx-chain-vm-v1_4-go v1.4.99-0.20250220144348-9455d2a4e6e6
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,8 +415,8 @@ github.com/multiversx/mx-chain-storage-go v1.0.20-0.20250218162234-85e60acebb43
github.com/multiversx/mx-chain-storage-go v1.0.20-0.20250218162234-85e60acebb43/go.mod h1:tTVMcXx0UWdMymMv3N8b1D1P1XSQwfyGK6xwMlRoONo=
github.com/multiversx/mx-chain-vm-common-go v1.5.17-0.20250218162215-88938774627c h1:4L3SY1so6MwfmfO7+MGOhGtDxhVW5PtW6JG48sZmHNE=
github.com/multiversx/mx-chain-vm-common-go v1.5.17-0.20250218162215-88938774627c/go.mod h1:NGcFCdOnbpEdk042ixTgD6xavRFQ7ap0z3kBhTXKlDQ=
github.com/multiversx/mx-chain-vm-go v1.5.38-0.20250218163500-604d44bde745 h1:aCKp9XDJvKQuKALq0ey0Ztqd/RyzTLTzD8jlpUOZUUA=
github.com/multiversx/mx-chain-vm-go v1.5.38-0.20250218163500-604d44bde745/go.mod h1:ee6MdfII+4DRrfMfEEzrhLiq7r2HZ4oKr/vAGHn8En8=
github.com/multiversx/mx-chain-vm-go v1.5.38-0.20250304111815-8b8e7254cac1 h1:Sc+rD5V0Of0oSdA4N5Agiy33UVJbZ+oOVC6J8o/3oKg=
github.com/multiversx/mx-chain-vm-go v1.5.38-0.20250304111815-8b8e7254cac1/go.mod h1:ee6MdfII+4DRrfMfEEzrhLiq7r2HZ4oKr/vAGHn8En8=
github.com/multiversx/mx-chain-vm-v1_2-go v1.2.69-0.20250220133402-01591d72f671 h1:xTbDPTaJQ0evqELiXQ4a1pinEAvoE7Y6/cmj4MUjzDA=
github.com/multiversx/mx-chain-vm-v1_2-go v1.2.69-0.20250220133402-01591d72f671/go.mod h1:QbNaHsEseQvrAT81VtbwUTTWPMrbDCDoXRJsY0V+1KU=
github.com/multiversx/mx-chain-vm-v1_3-go v1.3.70-0.20250220133720-4abbb3b36387 h1:B0AMhrWhUIN7HHNHTpfDJHAopTUHFjx8YVMDkb3++WA=
Expand Down
4 changes: 3 additions & 1 deletion integrationTests/vm/esdt/forwarderMock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ func SyncMultiTransferMock(instanceMock *mock.InstanceMock, config interface{})
big.NewInt(0),
[]byte(callData.Function()),
scAddress,
callData.ElementsAsBytes())
callData.ElementsAsBytes(),
true,
)

return instance
})
Expand Down
8 changes: 6 additions & 2 deletions integrationTests/vm/esdt/localFuncs/localEsdtNft.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ func LocalMintMock(instanceMock *mock.InstanceMock, config interface{}) {
big.NewInt(0),
[]byte(callData.Function()),
scAddress,
callData.ElementsAsBytes())
callData.ElementsAsBytes(),
true,
)

return instance
})
Expand All @@ -54,7 +56,9 @@ func LocalBurnMock(instanceMock *mock.InstanceMock, config interface{}) {
big.NewInt(0),
[]byte(callData.Function()),
scAddress,
callData.ElementsAsBytes())
callData.ElementsAsBytes(),
true,
)

return instance
})
Expand Down
Loading