[PVM] utxos Lock rewrite (#390)

vms/platformvm/fx/camino_fx.go

@@ -13,7 +13,10 @@ type CaminoFx interface {
 	RecoverAddresses(msg []byte, credentials []verify.Verifiable) (secp256k1fx.RecoverMap, error)
 
 	// Verifies that Multisig aliases are on inputs are only used in supported hierarchy
-	VerifyMultisigOwner(outIntf, msigIntf interface{}) error
+	VerifyMultisigOwner(ownerIntf, msigIntf interface{}) error
+
+	// Verifies that Multisig aliases are on inputs are only used in supported hierarchy
+	VerifyMultisigOutputOwner(outIntf, msigIntf interface{}) error
 
 	// VerifyMultisigTransfer verifies that the specified transaction can spend the
 	// provided utxo with no restrictions on the destination. If the transaction

vms/platformvm/test/camino_defaults.go

@@ -47,7 +47,8 @@ const (
 )
 
 var (
-	avaxAssetID  = ids.ID{'C', 'A', 'M'}
+	AVAXAssetID  = ids.ID{'C', 'A', 'M'}
+	OtherAssetID = ids.ID{'O', 'T', 'H', 'E', 'R'}
 	cChainID     = ids.ID{'C', '-', 'C', 'H', 'A', 'I', 'N'}
 	xChainID     = ids.ID{'X', '-', 'C', 'H', 'A', 'I', 'N'}
 	rewardConfig = reward.Config{
@@ -210,7 +211,7 @@ func Context(t *testing.T) *snow.Context {
 	require.NoError(t, aliaser.Alias(constants.PlatformChainID, "P"))
 
 	ctx := snow.DefaultContextTest()
-	ctx.AVAXAssetID = avaxAssetID
+	ctx.AVAXAssetID = AVAXAssetID
 	ctx.ChainID = constants.PlatformChainID
 	ctx.XChainID = xChainID
 	ctx.CChainID = cChainID

vms/platformvm/test/expect/camino_expect.go

@@ -21,8 +21,11 @@ import (
 	"github.com/ava-labs/avalanchego/vms/platformvm/test"
 	"github.com/ava-labs/avalanchego/vms/platformvm/txs"
 	"github.com/ava-labs/avalanchego/vms/secp256k1fx"
+	"github.com/stretchr/testify/require"
 )
 
+// TODO @evlekht prefix all funcs with corresponding diff/state/chain
+
 func VerifyMultisigPermission(t *testing.T, s *state.MockDiff, addrs []ids.ShortID, aliases []*multisig.AliasWithNonce) {
 	t.Helper()
 	GetMultisigAliases(t, s, addrs, aliases)
@@ -139,14 +142,102 @@ func GetUTXOsFromInputs(t *testing.T, s *state.MockDiff, ins []*avax.Transferabl
 	}
 }
 
+func StateGetAllUTXOs(t *testing.T, s *state.MockState, addrs []ids.ShortID, utxos [][]*avax.UTXO) {
+	t.Helper()
+	require.Len(t, addrs, len(utxos))
+	seen := set.Set[ids.ID]{}
+	for i, addr := range addrs {
+		utxoIDs := []ids.ID{}
+		for _, utxo := range utxos[i] {
+			utxoID := utxo.InputID()
+			utxoIDs = append(utxoIDs, utxoID)
+			if seen.Contains(utxoID) {
+				continue
+			}
+			seen.Add(utxoID)
+			s.EXPECT().GetUTXO(utxoID).Return(utxo, nil)
+		}
+		s.EXPECT().UTXOIDs(addr.Bytes(), ids.Empty, math.MaxInt).Return(utxoIDs, nil)
+	}
+}
+
+// Doesn't support multisig alias yet
+func StateSpendMultisig(t *testing.T, s *state.MockState, utxo *avax.UTXO) {
+	t.Helper()
+
+	out := utxo.Out
+	if lockedOut, ok := utxo.Out.(*locked.Out); ok {
+		out = lockedOut.TransferableOut
+	}
+	secpOut, ok := out.(*secp256k1fx.TransferOutput)
+	require.True(t, ok)
+
+	addrs := secpOut.OutputOwners.Addrs
+	for _, addr := range addrs {
+		s.EXPECT().GetMultisigAlias(addr).Return(nil, database.ErrNotFound)
+	}
+}
+
+func StateVerifyMultisigOwner(
+	t *testing.T,
+	s *state.MockState,
+	owner *secp256k1fx.OutputOwners,
+	msigAliasAddresses []ids.ShortID,
+	msigAliases []*multisig.AliasWithNonce,
+	collectAddresses bool,
+) {
+	t.Helper()
+	if owner == nil {
+		return
+	}
+
+	aliases := make(map[ids.ShortID]*multisig.AliasWithNonce)
+	for i := range msigAliasAddresses {
+		aliases[msigAliasAddresses[i]] = msigAliases[i]
+	}
+
+	addresses := set.Set[ids.ShortID]{}
+
+	if collectAddresses {
+		for _, addr := range owner.Addrs {
+			addresses.Add(addr)
+		}
+		for _, alias := range msigAliases {
+			owner, ok := alias.Owners.(*secp256k1fx.OutputOwners)
+			require.True(t, ok)
+			for _, addr := range owner.Addrs {
+				addresses.Add(addr)
+			}
+		}
+	}
+
+	for _, msigAliasAddress := range msigAliasAddresses {
+		addresses.Add(msigAliasAddress)
+	}
+
+	for addr := range addresses {
+		if _, ok := aliases[addr]; ok {
+			s.EXPECT().GetMultisigAlias(addr).Return(aliases[addr], nil)
+		} else {
+			s.EXPECT().GetMultisigAlias(addr).Return(nil, database.ErrNotFound)
+		}
+	}
+}
+
 func ConsumeUTXOs(t *testing.T, s *state.MockDiff, ins []*avax.TransferableInput) {
 	t.Helper()
 	for _, in := range ins {
 		s.EXPECT().DeleteUTXO(in.InputID())
 	}
 }
 
-func ProduceUTXOs(t *testing.T, s *state.MockDiff, outs []*avax.TransferableOutput, txID ids.ID, baseOutIndex int) {
+func ProduceUTXOs(
+	t *testing.T,
+	s *state.MockDiff,
+	outs []*avax.TransferableOutput,
+	txID ids.ID,
+	baseOutIndex int,
+) {
 	t.Helper()
 	for i := range outs {
 		s.EXPECT().AddUTXO(&avax.UTXO{
@@ -160,7 +251,14 @@ func ProduceUTXOs(t *testing.T, s *state.MockDiff, outs []*avax.TransferableOutp
 	}
 }
 
-func ProduceNewlyLockedUTXOs(t *testing.T, s *state.MockDiff, outs []*avax.TransferableOutput, txID ids.ID, baseOutIndex int, lockState locked.State) {
+func ProduceNewlyLockedUTXOs(
+	t *testing.T,
+	s *state.MockDiff,
+	outs []*avax.TransferableOutput,
+	txID ids.ID,
+	baseOutIndex int,
+	lockState locked.State,
+) {
 	t.Helper()
 	for i := range outs {
 		out := outs[i].Out

vms/platformvm/txs/executor/camino_tx_executor.go

@@ -247,11 +247,7 @@ func (e *CaminoStandardTxExecutor) AddValidatorTx(tx *txs.AddValidatorTx) error
 			return errWrongOwnerType
 		}
 
-		if err := e.Fx.VerifyMultisigOwner(
-			&secp256k1fx.TransferOutput{
-				OutputOwners: *rewardOwner,
-			}, e.State,
-		); err != nil {
+		if err := e.Fx.VerifyMultisigOwner(rewardOwner, e.State); err != nil {
 			return err
 		}
 
@@ -741,11 +737,7 @@ func (e *CaminoStandardTxExecutor) DepositTx(tx *txs.DepositTx) error {
 		return errWrongOwnerType
 	}
 
-	if err := e.Fx.VerifyMultisigOwner(
-		&secp256k1fx.TransferOutput{
-			OutputOwners: *rewardOwner,
-		}, e.State,
-	); err != nil {
+	if err := e.Fx.VerifyMultisigOwner(rewardOwner, e.State); err != nil {
 		return err
 	}