TrueCloudLab/neo-go
8
0
Fork 0
mirror of https://github.com/nspcc-dev/neo-go.git synced 2024-11-29 13:41:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3065 from nspcc-dev/forbid-notary-sender

Browse source 
network: forbid Notary contract to be a sender of main transaction
This commit is contained in:
Roman Khimov 2023-07-20 11:09:19 +03:00 committed by GitHub
commit 35ebdc1c91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkg/network/server.go
View file

@ -1201,6 +1201,9 @@ func (s *Server) verifyNotaryRequest(_ *transaction.Transaction, data any) error
if r.FallbackTransaction.Sender() != notaryHash { if r.FallbackTransaction.Sender() != notaryHash {
return fmt.Errorf("P2PNotary contract should be a sender of the fallback transaction, got %s", address.Uint160ToString(r.FallbackTransaction.Sender())) return fmt.Errorf("P2PNotary contract should be a sender of the fallback transaction, got %s", address.Uint160ToString(r.FallbackTransaction.Sender()))
} }
if r.MainTransaction.Sender() == notaryHash {
return errors.New("P2PNotary contract is not allowed to be the sender of the main transaction")
}
depositExpiration := s.chain.GetNotaryDepositExpiration(payer) depositExpiration := s.chain.GetNotaryDepositExpiration(payer)
if r.FallbackTransaction.ValidUntilBlock >= depositExpiration { if r.FallbackTransaction.ValidUntilBlock >= depositExpiration {
return fmt.Errorf("fallback transaction is valid after deposit is unlocked: ValidUntilBlock is %d, deposit lock for %s expires at %d", r.FallbackTransaction.ValidUntilBlock, address.Uint160ToString(payer), depositExpiration) return fmt.Errorf("fallback transaction is valid after deposit is unlocked: ValidUntilBlock is %d, deposit lock for %s expires at %d", r.FallbackTransaction.ValidUntilBlock, address.Uint160ToString(payer), depositExpiration)

12
pkg/network/server_test.go
View file

@ -1036,7 +1036,10 @@ func TestVerifyNotaryRequest(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
newNotaryRequest := func() *payload.P2PNotaryRequest { newNotaryRequest := func() *payload.P2PNotaryRequest {
return &payload.P2PNotaryRequest{ return &payload.P2PNotaryRequest{
MainTransaction: &transaction.Transaction{Script: []byte{0, 1, 2}}, MainTransaction: &transaction.Transaction{
Script: []byte{0, 1, 2},
Signers: []transaction.Signer{{Account: random.Uint160()}},
},
FallbackTransaction: &transaction.Transaction{ FallbackTransaction: &transaction.Transaction{
ValidUntilBlock: 321, ValidUntilBlock: 321,
Signers: []transaction.Signer{{Account: bc.NotaryContractScriptHash}, {Account: random.Uint160()}}, Signers: []transaction.Signer{{Account: bc.NotaryContractScriptHash}, {Account: random.Uint160()}},
@ -1057,6 +1060,13 @@ func TestVerifyNotaryRequest(t *testing.T) {
require.Error(t, s.verifyNotaryRequest(nil, r)) require.Error(t, s.verifyNotaryRequest(nil, r))
}) })
t.Run("bad main sender", func(t *testing.T) {
bc.VerifyWitnessF = func() (int64, error) { return 0, nil }
r := newNotaryRequest()
r.MainTransaction.Signers[0] = transaction.Signer{Account: bc.NotaryContractScriptHash}
require.Error(t, s.verifyNotaryRequest(nil, r))
})
t.Run("expired deposit", func(t *testing.T) { t.Run("expired deposit", func(t *testing.T) {
r := newNotaryRequest() r := newNotaryRequest()
bc.NotaryDepositExpiration = r.FallbackTransaction.ValidUntilBlock bc.NotaryDepositExpiration = r.FallbackTransaction.ValidUntilBlock