Skip to content

Commit cb487fd

Browse files
Merge pull request from GHSA-qf7j-25g9-r63f
Extra check in vm-common
2 parents 84c9960 + d55a7f9 commit cb487fd

File tree

3 files changed

+53
-2
lines changed

3 files changed

+53
-2
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/ElrondNetwork/elrond-go-core v1.1.15
1313
github.com/ElrondNetwork/elrond-go-crypto v1.0.1
1414
github.com/ElrondNetwork/elrond-go-logger v1.0.7
15-
github.com/ElrondNetwork/elrond-vm-common v1.3.6
15+
github.com/ElrondNetwork/elrond-vm-common v1.3.10
1616
github.com/ElrondNetwork/go-libp2p-pubsub v0.6.1-rc1
1717
github.com/beevik/ntp v0.3.0
1818
github.com/btcsuite/btcd v0.22.0-beta

go.sum

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,9 @@ github.com/ElrondNetwork/elrond-go-logger v1.0.7/go.mod h1:cBfgx0ST/CJx8jrxJSC5a
7373
github.com/ElrondNetwork/elrond-vm-common v1.1.0/go.mod h1:w3i6f8uiuRkE68Ie/gebRcLgTuHqvruJSYrFyZWuLrE=
7474
github.com/ElrondNetwork/elrond-vm-common v1.2.9/go.mod h1:B/Y8WiqHyDd7xsjNYsaYbVMp1jQgQ+z4jTJkFvj/EWI=
7575
github.com/ElrondNetwork/elrond-vm-common v1.3.4/go.mod h1:B/Y8WiqHyDd7xsjNYsaYbVMp1jQgQ+z4jTJkFvj/EWI=
76-
github.com/ElrondNetwork/elrond-vm-common v1.3.6 h1:4wr26EVIMAu7pJ197EkAqa1NYoVYiAJ3Z11UcQyc+cg=
7776
github.com/ElrondNetwork/elrond-vm-common v1.3.6/go.mod h1:seROQuR7RJCoCS7mgRXVAlvjztltY1c+UroAgWr/USE=
77+
github.com/ElrondNetwork/elrond-vm-common v1.3.10 h1:s7jLzKw6V5bCDx6nImD0c+FQNZvod0RqXLAkl65fcCQ=
78+
github.com/ElrondNetwork/elrond-vm-common v1.3.10/go.mod h1:seROQuR7RJCoCS7mgRXVAlvjztltY1c+UroAgWr/USE=
7879
github.com/ElrondNetwork/go-libp2p-pubsub v0.6.1-rc1 h1:Nu/uwYQg/QbfoQ0uD6GahYTwgtAkAwtzsB0HVfSP58I=
7980
github.com/ElrondNetwork/go-libp2p-pubsub v0.6.1-rc1/go.mod h1:pJfaShe+i5aWZx8NhSkQjvOYQYLoqPztmFUlKjToOzM=
8081
github.com/ElrondNetwork/protobuf v1.3.2 h1:qoCSYiO+8GtXBEZWEjw0WPcZfM3g7QuuJrwpN+y6Mvg=

integrationTests/vm/txsFee/asyncESDT_test.go

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,3 +397,53 @@ func TestAsyncMultiTransferOnCallAndOnCallback(t *testing.T) {
397397
utils.CheckESDTNFTBalance(t, testContext, forwarderAddr, sftTokenID, 2, halfBalance)
398398
utils.CheckESDTNFTBalance(t, testContext, forwarderAddr, sftTokenID, 3, halfBalance)
399399
}
400+
401+
func TestSendNFTToContractWith0Function(t *testing.T) {
402+
testContext, err := vm.CreatePreparedTxProcessorWithVMs(config.EnableEpochs{})
403+
require.Nil(t, err)
404+
defer testContext.Close()
405+
406+
ownerAddr := []byte("12345678901234567890123456789010")
407+
sftTokenID := []byte("SFT-123456")
408+
sftNonce := uint64(1)
409+
sftBalance := big.NewInt(1000)
410+
411+
utils.CreateAccountWithESDTBalance(t, testContext.Accounts, ownerAddr, big.NewInt(1000000000), sftTokenID, sftNonce, sftBalance)
412+
utils.CheckESDTNFTBalance(t, testContext, ownerAddr, sftTokenID, sftNonce, sftBalance)
413+
414+
gasPrice := uint64(10)
415+
ownerAccount, _ := testContext.Accounts.LoadAccount(ownerAddr)
416+
deployGasLimit := uint64(1000000)
417+
txGasLimit := uint64(1000000)
418+
419+
vaultAddr := utils.DoDeploySecond(t,
420+
testContext,
421+
"../esdt/testdata/vault-managed-api.wasm",
422+
ownerAccount,
423+
gasPrice,
424+
deployGasLimit,
425+
nil,
426+
big.NewInt(0),
427+
)
428+
429+
// send the tokens to vault
430+
ownerAccount, _ = testContext.Accounts.LoadAccount(ownerAddr)
431+
tx := utils.CreateESDTNFTTransferTx(
432+
ownerAccount.GetNonce(),
433+
ownerAddr,
434+
vaultAddr,
435+
sftTokenID,
436+
sftNonce,
437+
sftBalance,
438+
gasPrice,
439+
txGasLimit,
440+
"",
441+
)
442+
tx.Data = append(tx.Data, []byte("@")...)
443+
retCode, err := testContext.TxProcessor.ProcessTransaction(tx)
444+
require.Equal(t, vmcommon.Ok, retCode)
445+
require.Nil(t, err)
446+
447+
_, err = testContext.Accounts.Commit()
448+
require.Nil(t, err)
449+
}

0 commit comments

Comments
 (0)