Ignore uuid check for messages with uuid not set

This commit is contained in:
Shrenuj Bansal 2022-09-13 16:33:55 -04:00
parent d249117182
commit 4c4b10c617
2 changed files with 56 additions and 3 deletions

View File

@ -0,0 +1,52 @@
package itests
import (
"context"
"github.com/filecoin-project/go-state-types/abi"
"github.com/filecoin-project/go-state-types/big"
"github.com/filecoin-project/go-state-types/exitcode"
"github.com/filecoin-project/lotus/api"
"github.com/filecoin-project/lotus/chain/types"
"github.com/filecoin-project/lotus/itests/kit"
"github.com/filecoin-project/lotus/node/config"
"github.com/stretchr/testify/require"
"testing"
"time"
)
func TestMsgWithoutUuidWithMaxFee(t *testing.T) {
ctx := context.Background()
kit.QuietMiningLogs()
node, _, ens := kit.EnsembleMinimal(t, kit.MockProofs())
ens.InterconnectAll().BeginMining(10 * time.Millisecond)
bal, err := node.WalletBalance(ctx, node.DefaultKey.Address)
require.NoError(t, err)
// send self half of account balance
msgHalfBal := &types.Message{
From: node.DefaultKey.Address,
To: node.DefaultKey.Address,
Value: big.Div(bal, big.NewInt(2)),
}
smHalfBal, err := node.MpoolPushMessage(ctx, msgHalfBal, &api.MessageSendSpec{MaxFee: abi.TokenAmount(config.DefaultDefaultMaxFee)})
require.NoError(t, err)
mLookup, err := node.StateWaitMsg(ctx, smHalfBal.Cid(), 3, api.LookbackNoLimit, true)
require.NoError(t, err)
require.Equal(t, exitcode.Ok, mLookup.Receipt.ExitCode)
msgQuarterBal := &types.Message{
From: node.DefaultKey.Address,
To: node.DefaultKey.Address,
Value: big.Div(bal, big.NewInt(4)),
}
smQuarterBal, err := node.MpoolPushMessage(ctx, msgQuarterBal, &api.MessageSendSpec{MaxFee: abi.TokenAmount(config.DefaultDefaultMaxFee)})
require.NoError(t, err)
require.Equal(t, msgQuarterBal.Value, smQuarterBal.Message.Value)
mLookup, err = node.StateWaitMsg(ctx, smQuarterBal.Cid(), 3, api.LookbackNoLimit, true)
require.NoError(t, err)
require.Equal(t, exitcode.Ok, mLookup.Receipt.ExitCode)
}

View File

@ -3,6 +3,7 @@ package full
import ( import (
"context" "context"
"encoding/json" "encoding/json"
"github.com/google/uuid"
"github.com/ipfs/go-cid" "github.com/ipfs/go-cid"
"go.uber.org/fx" "go.uber.org/fx"
@ -142,8 +143,8 @@ func (a *MpoolAPI) MpoolPushMessage(ctx context.Context, msg *types.Message, spe
msg = &cp msg = &cp
inMsg := *msg inMsg := *msg
// Check if this uuid has already been processed // Check if this uuid has already been processed. Ignore if uuid is not populated
if spec != nil { if (spec != nil) && (spec.MsgUuid != uuid.UUID{}) {
signedMessage, err := a.MessageSigner.GetSignedMessage(ctx, spec.MsgUuid) signedMessage, err := a.MessageSigner.GetSignedMessage(ctx, spec.MsgUuid)
if err == nil { if err == nil {
log.Warnf("Message already processed. cid=%s", signedMessage.Cid()) log.Warnf("Message already processed. cid=%s", signedMessage.Cid())
@ -206,7 +207,7 @@ func (a *MpoolAPI) MpoolPushMessage(ctx context.Context, msg *types.Message, spe
} }
// Store uuid->signed message in datastore // Store uuid->signed message in datastore
if spec != nil { if (spec != nil) && (spec.MsgUuid != uuid.UUID{}) {
err = a.MessageSigner.StoreSignedMessage(ctx, spec.MsgUuid, signedMsg) err = a.MessageSigner.StoreSignedMessage(ctx, spec.MsgUuid, signedMsg)
if err != nil { if err != nil {
return nil, err return nil, err