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

Jump to bottom

Improve error messages for unlock logic #701

Merged
merged 1 commit into from
Mar 1, 2024
Merged

Improve error messages for unlock logic #701

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions vm/vm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ func (s *unlockedAddressesSet) SignatureUnlock(addr iotago.DirectUnlockableAddre
ReferencedByInputIndex: map[uint16]struct{}{},
}

// we "unlock" the signature here, so it can be used for for "ReferentialUnlockDirect" referential unlocks
// we "unlock" the signature here, so it can be used for "ReferentialUnlockDirect" referential unlocks
s.SignatureUnlockedAddrsByIndex[inputIndex] = &unlockedAddressWithSignature{
UnlockedAddress: unlockedAddr,
Signature: sig,
Expand All @@ -204,11 +204,11 @@ func (s *unlockedAddressesSet) ReferentialUnlockNonDirectlyUnlockable(owner iota

referencedAddr, referenceExists := s.UnlockedAddrsByAddrKey[owner.Key()]
if !referenceExists {
return ierrors.Errorf("input %d is not unlocked through input %d's unlock", inputIndex, referencedInputIndex)
return ierrors.Errorf("input %d's address was not previously unlocked by unlock %d", inputIndex, referencedInputIndex)
}

if referencedAddr.UnlockedAtInputIndex != referencedInputIndex {
return ierrors.Errorf("input %d is not unlocked through input %d's unlock", inputIndex, referencedInputIndex)
return ierrors.Errorf("input %d references unlock %d but its address was unlocked by unlock %d instead", inputIndex, referencedInputIndex, referencedAddr.UnlockedAtInputIndex)
}

if checkUnlockOnly {
Expand All @@ -228,17 +228,17 @@ func (s *unlockedAddressesSet) ReferentialUnlockNonDirectlyUnlockable(owner iota
func (s *unlockedAddressesSet) ReferentialUnlockDirectlyUnlockable(owner iotago.DirectUnlockableAddress, inputIndex uint16, referencedInputIndex uint16, checkUnlockOnly bool) error {
referencedAddrWithSignature, referenceExists := s.SignatureUnlockedAddrsByIndex[referencedInputIndex]
if !referenceExists {
return ierrors.Errorf("input %d is not unlocked through input %d's unlock", inputIndex, referencedInputIndex)
return ierrors.Errorf("input %d's address was not previously unlocked by unlock %d", inputIndex, referencedInputIndex)
}

if referencedAddrWithSignature.UnlockedAtInputIndex != referencedInputIndex {
return ierrors.Errorf("input %d is not unlocked through input %d's unlock", inputIndex, referencedInputIndex)
return ierrors.Errorf("input %d references unlock %d but its address was unlocked by unlock %d instead", inputIndex, referencedInputIndex, referencedAddrWithSignature.UnlockedAtInputIndex)
}

// the signature was already verified in another unlock, so we don't need to check it again,
// but we need to make sure that the signature fits the address.
if !referencedAddrWithSignature.Signature.MatchesAddress(owner) {
return ierrors.Errorf("input %d's address is not unlocked through input %d's unlock", inputIndex, referencedInputIndex)
return ierrors.Errorf("input %d's address is not unlocked through unlock %d", inputIndex, referencedInputIndex)
}

if checkUnlockOnly {
Expand Down
Loading