core: review usages of (*intero.Context).BlockHeight method by AnnaShaleva · Pull Request #3211 · nspcc-dev/neo-go

AnnaShaleva · 2023-11-21T09:41:39Z

This method returns persisted block height and doesn't take into account persisting block height. Some of the callers of this method relay on the wrong assumption that BlockHeight() returns persisting block index.

Fix improper usages of this method and adjust tests. Ref. https://github.com/neo-project/neo/blob/61a066583eef53c8eb7b770dcc3deb0305ab11db/src/Neo/SmartContract/ApplicationEngine.cs#L634.

AnnaShaleva · 2023-11-21T09:42:18Z

pkg/core/native/notary.go

 	}
 	till := toUint32(args[1])
-	if till < ic.BlockHeight() {
+	if till < ic.BlockHeight() { // @roman-khimov, is it OK to lock deposit till the current persisting block?


We need to decide about this one. It's not critical to have it as it is now.

In general, I'd say it has to have at least one block of lifetime (so it can't expire at the current one). This:

neo-go/pkg/network/server.go

Lines 1205 to 1208 in f10d2d2

depositExpiration := s.chain.GetNotaryDepositExpiration(payer)

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)

}

and this:

neo-go/pkg/core/blockchain.go

Lines 2465 to 2469 in f10d2d2

height := bc.BlockHeight()

isPartialTx := data != nil

if t.ValidUntilBlock <= height || !isPartialTx && t.ValidUntilBlock > height+bc.config.MaxValidUntilBlockIncrement {

return fmt.Errorf("%w: ValidUntilBlock = %d, current height = %d", ErrTxExpired, t.ValidUntilBlock, height)

}

confirms that to me.

at least one block of lifetime

Then here we even need if till < ic.BlockHeight() + 2, where 1 is for the currently persisting block and 1 for the next block that can be accepted afterwards. Agree?

Yes, the other way to look at it is

neo-go/pkg/core/native/notary.go

Lines 311 to 313 in f10d2d2

if ic.BlockHeight() < deposit.Till {

return stackitem.NewBool(false)

}

If you deposit, but can withdraw immediately the deposit is useless.

Good, I've fixed this in couple of places and added a comment to withdraw. Could you check it?

pkg/core/interop/context.go

pkg/core/interop/runtime/ext_test.go

roman-khimov · 2023-11-21T09:57:04Z

pkg/core/native/notary.go

 	}
 	till := toUint32(args[1])
-	if till < ic.BlockHeight() {
+	if till < ic.BlockHeight() { // @roman-khimov, is it OK to lock deposit till the current persisting block?


In general, I'd say it has to have at least one block of lifetime (so it can't expire at the current one). This:

neo-go/pkg/network/server.go

Lines 1205 to 1208 in f10d2d2

depositExpiration := s.chain.GetNotaryDepositExpiration(payer)

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)

}

and this:

neo-go/pkg/core/blockchain.go

Lines 2465 to 2469 in f10d2d2

height := bc.BlockHeight()

isPartialTx := data != nil

if t.ValidUntilBlock <= height || !isPartialTx && t.ValidUntilBlock > height+bc.config.MaxValidUntilBlockIncrement {

return fmt.Errorf("%w: ValidUntilBlock = %d, current height = %d", ErrTxExpired, t.ValidUntilBlock, height)

}

confirms that to me.

codecov · 2023-11-21T10:25:28Z

Codecov Report

Attention: 1 lines in your changes are missing coverage. Please review.

Comparison is base (80fcf81) 85.41% compared to head (7725596) 85.42%.

❗ Current head 7725596 differs from pull request most recent head 64b5ba2. Consider uploading reports for the commit 64b5ba2 to get more accurate results

Files	Patch %	Lines
pkg/core/interop/context.go	50.00%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #3211      +/-   ##
==========================================
+ Coverage   85.41%   85.42%   +0.01%     
==========================================
  Files         326      326              
  Lines       43819    43818       -1     
==========================================
+ Hits        37427    37431       +4     
+ Misses       4920     4917       -3     
+ Partials     1472     1470       -2

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

pkg/core/native/notary.go

This method returns persisted block height and doesn't take into account persisting block height. Some of the callers of this method relay on the wrong assumption that BlockHeight() returns persisting block index. Fix improper usages of this method and adjust tests. Ref. https://github.com/neo-project/neo/blob/61a066583eef53c8eb7b770dcc3deb0305ab11db/src/Neo/SmartContract/ApplicationEngine.cs#L634. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru>

My poor grammar... Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru>

Follow nspcc-dev/neo-go#3211. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru>

* Implement NotaryAssisted transaction attribute Close #2896. Use a stub for native Notary contract hash since this contract is not implemented yet. Thus, technically, NotaryAssisted attribute verification will always fail on real network until native Notary is implemented. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Payloads: add doc to CalculateNetworkFee method of NotaryAssisted attribute Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Native: add NotaryAssisted attributes handler to Gas OnPersist Transactions network fee should be split between Primary node and Notary nodes. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Payloads: adjust comment to NotaryAssisted attribute Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Payloads: temporary use hard-coded Notary contract hash Once Notary contract is implemented, this hash will be replaced by a proper Notary contract hash. The exact value won't be changed since Notary contract has constant hash as any other native contract. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Payloads: replace hard-coded Notary hash value with calculated one No functional changes, just a refactoring for better code readability. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Native: implement native Notary contract Close #2897. Depends on #3175. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Native: fix typo in the exception message Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Native: use more syntactic sugar No functional changes, just a refactoring. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: add unit tests for OnNEP17Payment and ExpirationOf methods Also, mark improper code of Withdraw method with TODO, it should be reworked. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Fix transfer * Update tests/Neo.UnitTests/SmartContract/Native/UT_Notary.cs * Update UT_Notary.cs * fix * Fix notary * Fix notary * Notary: add unit tests for LockDepositUntil and BalanceOf methods Also, format code. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: test GAS distribution with FeePerKey update Test the situation described in https://github.com/neo-project/neo/pull/3175/files/00b54ff6d20cc84b435beaa790fe72a9d8f78bec#r1530493475. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: add test for Withdraw Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: remove unused code No functional changes, I just finally made my code analizer work properly. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Attributtes: fix NotaryAssisted attribute documentation format Co-authored-by: Shargon <shargon@gmail.com> * Native: update to the fresh master Fetch changes from the fresh master and fix build errors. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: sync up with master changes No functional changes, just adopt latest changes in syntax from master to make the code buildable and make unit tests pass. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: make the contract active starting from Echidna. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: add NEP-27 to the list of supported standards Port nspcc-dev/neo-go#3792. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: adjust deposit expiration rule Follow nspcc-dev/neo-go#3211. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * clean usings * Update tests/Neo.UnitTests/Extensions/Nep17NativeContractExtensions.cs Co-authored-by: Will <201105916+Wi1l-B0t@users.noreply.github.com> * Notary: improve long line format No functional changes. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: prettify exception thrown on unexpected OnNEP17Payment data Throw FormatException instead of InvalidCastException on invalid data passed to OnNEP17Payment. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: don't FAULT execution in case of non-tx verification container Return `false` in case if execution container for `verify` is not a transaction. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: unify deposit lock validity check No functional changes, just a refactoring. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: extend `verify` with signature argument validation Ref. https://github.com/neo-project/neo/pull/3178/files/56acd97e4b2e93601b7e3d4b15b5ccafc9455fcd#r2010316964. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: add a note about Deposit serialization No functional changes. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * UnitTests: remove NotaryAssisted fees unit test This test requires Notary nodes to be properly designated via native RoleManagement contract, it's hard to mock this behaviour during test, I wasn't able to properly do it. This test may be restored once we have better testing system. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: replace exceptions with false return for `withdraw` Ref. #3178 (comment). Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: refactor variable definition No functional changes, ref. #3178 (comment). Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: migrate to Policy.GetAttributeFeeV1 usage No functional changes, just adopt the #3859. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Review Notary (#3870) * Update Notary.cs * Update Notary.cs * Update Notary.cs * fix * clean * Clean * Update src/Neo/SmartContract/Native/Notary.cs * Update tests/Neo.UnitTests/TestUtils.Transaction.cs Co-authored-by: Christopher Schuchardt <cschuchardt88@gmail.com> * Update tests/Neo.UnitTests/TestUtils.Transaction.cs Co-authored-by: Christopher Schuchardt <cschuchardt88@gmail.com> * Update tests/Neo.UnitTests/TestUtils.Transaction.cs * Update tests/Neo.UnitTests/TestUtils.Transaction.cs * Notary: adapt Policy-based MaxValidUntilBlockIncrement Fetch recent update from #3861. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: rename manifest parameters to follow the native style Unify parameters naming to follow the style of other native contracts. No functional changes. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: adjust required callflags for some methods Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: fix Notary node scripthash construction Notary node account is always a standard single signature script. This commit fixes state difference between Go and C# nodes at block 9762 of NeoFS Testnet: ``` go run scripts/compare-dumps/compare-dumps.go ./godump-echidna-neofs-testnet/ ../../neo-project/neo/neo-cli-notary-testnet/Storage_2bdb2b5f/ Processing directory BlockStorage_0 Processing directory BlockStorage_100000 file BlockStorage_100000/dump-block-10000.json: block 9762, changes length mismatch: 13 vs 20 compare-dumps dumpDirA dumpDirB exit status 1 ``` The reason is in improper construction of Notary node address which leads to the fact that notary GAS reward goes to wrong addresses. Here's a part of OnPersist application log for this block generated by C# node that contains wrong GAS receiver addresses: ``` { "contract": "0xd2a4cff31913016155e38e474a2c06d08be276cf", "eventname": "Transfer", "state": { "type": "Array", "value": [ { "type": "Any" }, { "type": "ByteString", "value": "Z0B9UyyyUsDlW4OgICWJ+nwLyZc=" }, { "type": "Integer", "value": "11428571" } ] } }, { "contract": "0xd2a4cff31913016155e38e474a2c06d08be276cf", "eventname": "Transfer", "state": { "type": "Array", "value": [ { "type": "Any" }, { "type": "ByteString", "value": "5Sk5i/oPh7IBb7VvlHfiUjX2LHU=" }, { "type": "Integer", "value": "11428571" } ] } }, { "contract": "0xd2a4cff31913016155e38e474a2c06d08be276cf", "eventname": "Transfer", "state": { "type": "Array", "value": [ { "type": "Any" }, { "type": "ByteString", "value": "HcOwwNv9mwY1i3SF4d5qX8jDdJs=" }, { "type": "Integer", "value": "11428571" } ] } }, { "contract": "0xd2a4cff31913016155e38e474a2c06d08be276cf", "eventname": "Transfer", "state": { "type": "Array", "value": [ { "type": "Any" }, { "type": "ByteString", "value": "8a2TEhIZFJ/lZDklkMs+d6i7OWI=" }, { "type": "Integer", "value": "11428571" } ] } }, { "contract": "0xd2a4cff31913016155e38e474a2c06d08be276cf", "eventname": "Transfer", "state": { "type": "Array", "value": [ { "type": "Any" }, { "type": "ByteString", "value": "Oke4DvOe+XZ+3mQnZ5nE1Ilm3jY=" }, { "type": "Integer", "value": "11428571" } ] } }, { "contract": "0xd2a4cff31913016155e38e474a2c06d08be276cf", "eventname": "Transfer", "state": { "type": "Array", "value": [ { "type": "Any" }, { "type": "ByteString", "value": "7frkdtIbPRN2ijaHnw+tfUxMzA8=" }, { "type": "Integer", "value": "11428571" } ] } }, { "contract": "0xd2a4cff31913016155e38e474a2c06d08be276cf", "eventname": "Transfer", "state": { "type": "Array", "value": [ { "type": "Any" }, { "type": "ByteString", "value": "YjI6lI1pOy/OxH1PjcG/yIXwD/4=" }, { "type": "Integer", "value": "11428571" } ] } } ], "stack": [ ], "trigger": "OnPersist", "vmstate": "HALT" } ``` Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> --------- Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> Co-authored-by: Jimmy <jinghui@wayne.edu> Co-authored-by: Fernando Diaz Toledano <shargon@gmail.com> Co-authored-by: Christopher Schuchardt <cschuchardt88@gmail.com> Co-authored-by: Will <201105916+Wi1l-B0t@users.noreply.github.com> Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com> Co-authored-by: Vitor Nazário Coelho <vncoelho@gmail.com>

* Implement NotaryAssisted transaction attribute Close neo-project#2896. Use a stub for native Notary contract hash since this contract is not implemented yet. Thus, technically, NotaryAssisted attribute verification will always fail on real network until native Notary is implemented. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Payloads: add doc to CalculateNetworkFee method of NotaryAssisted attribute Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Native: add NotaryAssisted attributes handler to Gas OnPersist Transactions network fee should be split between Primary node and Notary nodes. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Payloads: adjust comment to NotaryAssisted attribute Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Payloads: temporary use hard-coded Notary contract hash Once Notary contract is implemented, this hash will be replaced by a proper Notary contract hash. The exact value won't be changed since Notary contract has constant hash as any other native contract. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Payloads: replace hard-coded Notary hash value with calculated one No functional changes, just a refactoring for better code readability. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Native: implement native Notary contract Close neo-project#2897. Depends on neo-project#3175. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Native: fix typo in the exception message Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Native: use more syntactic sugar No functional changes, just a refactoring. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: add unit tests for OnNEP17Payment and ExpirationOf methods Also, mark improper code of Withdraw method with TODO, it should be reworked. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Fix transfer * Update tests/Neo.UnitTests/SmartContract/Native/UT_Notary.cs * Update UT_Notary.cs * fix * Fix notary * Fix notary * Notary: add unit tests for LockDepositUntil and BalanceOf methods Also, format code. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: test GAS distribution with FeePerKey update Test the situation described in https://github.com/neo-project/neo/pull/3175/files/00b54ff6d20cc84b435beaa790fe72a9d8f78bec#r1530493475. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: add test for Withdraw Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: remove unused code No functional changes, I just finally made my code analizer work properly. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Attributtes: fix NotaryAssisted attribute documentation format Co-authored-by: Shargon <shargon@gmail.com> * Native: update to the fresh master Fetch changes from the fresh master and fix build errors. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: sync up with master changes No functional changes, just adopt latest changes in syntax from master to make the code buildable and make unit tests pass. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: make the contract active starting from Echidna. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: add NEP-27 to the list of supported standards Port nspcc-dev/neo-go#3792. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: adjust deposit expiration rule Follow nspcc-dev/neo-go#3211. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * clean usings * Update tests/Neo.UnitTests/Extensions/Nep17NativeContractExtensions.cs Co-authored-by: Will <201105916+Wi1l-B0t@users.noreply.github.com> * Notary: improve long line format No functional changes. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: prettify exception thrown on unexpected OnNEP17Payment data Throw FormatException instead of InvalidCastException on invalid data passed to OnNEP17Payment. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: don't FAULT execution in case of non-tx verification container Return `false` in case if execution container for `verify` is not a transaction. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: unify deposit lock validity check No functional changes, just a refactoring. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: extend `verify` with signature argument validation Ref. https://github.com/neo-project/neo/pull/3178/files/56acd97e4b2e93601b7e3d4b15b5ccafc9455fcd#r2010316964. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: add a note about Deposit serialization No functional changes. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * UnitTests: remove NotaryAssisted fees unit test This test requires Notary nodes to be properly designated via native RoleManagement contract, it's hard to mock this behaviour during test, I wasn't able to properly do it. This test may be restored once we have better testing system. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: replace exceptions with false return for `withdraw` Ref. neo-project#3178 (comment). Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: refactor variable definition No functional changes, ref. neo-project#3178 (comment). Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: migrate to Policy.GetAttributeFeeV1 usage No functional changes, just adopt the neo-project#3859. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Review Notary (neo-project#3870) * Update Notary.cs * Update Notary.cs * Update Notary.cs * fix * clean * Clean * Update src/Neo/SmartContract/Native/Notary.cs * Update tests/Neo.UnitTests/TestUtils.Transaction.cs Co-authored-by: Christopher Schuchardt <cschuchardt88@gmail.com> * Update tests/Neo.UnitTests/TestUtils.Transaction.cs Co-authored-by: Christopher Schuchardt <cschuchardt88@gmail.com> * Update tests/Neo.UnitTests/TestUtils.Transaction.cs * Update tests/Neo.UnitTests/TestUtils.Transaction.cs * Notary: adapt Policy-based MaxValidUntilBlockIncrement Fetch recent update from neo-project#3861. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: rename manifest parameters to follow the native style Unify parameters naming to follow the style of other native contracts. No functional changes. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: adjust required callflags for some methods Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Notary: fix Notary node scripthash construction Notary node account is always a standard single signature script. This commit fixes state difference between Go and C# nodes at block 9762 of NeoFS Testnet: ``` go run scripts/compare-dumps/compare-dumps.go ./godump-echidna-neofs-testnet/ ../../neo-project/neo/neo-cli-notary-testnet/Storage_2bdb2b5f/ Processing directory BlockStorage_0 Processing directory BlockStorage_100000 file BlockStorage_100000/dump-block-10000.json: block 9762, changes length mismatch: 13 vs 20 compare-dumps dumpDirA dumpDirB exit status 1 ``` The reason is in improper construction of Notary node address which leads to the fact that notary GAS reward goes to wrong addresses. Here's a part of OnPersist application log for this block generated by C# node that contains wrong GAS receiver addresses: ``` { "contract": "0xd2a4cff31913016155e38e474a2c06d08be276cf", "eventname": "Transfer", "state": { "type": "Array", "value": [ { "type": "Any" }, { "type": "ByteString", "value": "Z0B9UyyyUsDlW4OgICWJ+nwLyZc=" }, { "type": "Integer", "value": "11428571" } ] } }, { "contract": "0xd2a4cff31913016155e38e474a2c06d08be276cf", "eventname": "Transfer", "state": { "type": "Array", "value": [ { "type": "Any" }, { "type": "ByteString", "value": "5Sk5i/oPh7IBb7VvlHfiUjX2LHU=" }, { "type": "Integer", "value": "11428571" } ] } }, { "contract": "0xd2a4cff31913016155e38e474a2c06d08be276cf", "eventname": "Transfer", "state": { "type": "Array", "value": [ { "type": "Any" }, { "type": "ByteString", "value": "HcOwwNv9mwY1i3SF4d5qX8jDdJs=" }, { "type": "Integer", "value": "11428571" } ] } }, { "contract": "0xd2a4cff31913016155e38e474a2c06d08be276cf", "eventname": "Transfer", "state": { "type": "Array", "value": [ { "type": "Any" }, { "type": "ByteString", "value": "8a2TEhIZFJ/lZDklkMs+d6i7OWI=" }, { "type": "Integer", "value": "11428571" } ] } }, { "contract": "0xd2a4cff31913016155e38e474a2c06d08be276cf", "eventname": "Transfer", "state": { "type": "Array", "value": [ { "type": "Any" }, { "type": "ByteString", "value": "Oke4DvOe+XZ+3mQnZ5nE1Ilm3jY=" }, { "type": "Integer", "value": "11428571" } ] } }, { "contract": "0xd2a4cff31913016155e38e474a2c06d08be276cf", "eventname": "Transfer", "state": { "type": "Array", "value": [ { "type": "Any" }, { "type": "ByteString", "value": "7frkdtIbPRN2ijaHnw+tfUxMzA8=" }, { "type": "Integer", "value": "11428571" } ] } }, { "contract": "0xd2a4cff31913016155e38e474a2c06d08be276cf", "eventname": "Transfer", "state": { "type": "Array", "value": [ { "type": "Any" }, { "type": "ByteString", "value": "YjI6lI1pOy/OxH1PjcG/yIXwD/4=" }, { "type": "Integer", "value": "11428571" } ] } } ], "stack": [ ], "trigger": "OnPersist", "vmstate": "HALT" } ``` Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> --------- Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> Co-authored-by: Jimmy <jinghui@wayne.edu> Co-authored-by: Fernando Diaz Toledano <shargon@gmail.com> Co-authored-by: Christopher Schuchardt <cschuchardt88@gmail.com> Co-authored-by: Will <201105916+Wi1l-B0t@users.noreply.github.com> Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com> Co-authored-by: Vitor Nazário Coelho <vncoelho@gmail.com>

AnnaShaleva added the bug Something isn't working label Nov 21, 2023

AnnaShaleva added this to the v0.104.0 milestone Nov 21, 2023

AnnaShaleva requested a review from roman-khimov as a code owner November 21, 2023 09:41

AnnaShaleva commented Nov 21, 2023

View reviewed changes

AnnaShaleva mentioned this pull request Nov 21, 2023

Move NativeUpdateHistory logic uner hardforks #3212

Merged

roman-khimov reviewed Nov 21, 2023

View reviewed changes

AnnaShaleva force-pushed the fix-curr-height branch from 39a9366 to 7725596 Compare November 21, 2023 10:20

AnnaShaleva requested a review from roman-khimov November 21, 2023 10:22

roman-khimov approved these changes Nov 21, 2023

View reviewed changes

pkg/core/native/notary.go Outdated Show resolved Hide resolved

AnnaShaleva added 2 commits November 21, 2023 13:46

*: fix less then typos everywhere

64b5ba2

My poor grammar... Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru>

AnnaShaleva force-pushed the fix-curr-height branch from 7725596 to 64b5ba2 Compare November 21, 2023 10:48

AnnaShaleva requested a review from roman-khimov November 21, 2023 10:50

roman-khimov approved these changes Nov 21, 2023

View reviewed changes

roman-khimov merged commit 4d86012 into master Nov 21, 2023

roman-khimov deleted the fix-curr-height branch November 21, 2023 10:51

AnnaShaleva added a commit to neo-project/neo that referenced this pull request Mar 4, 2025

Notary: adjust deposit expiration rule

7b7aede

Follow nspcc-dev/neo-go#3211. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

core: review usages of (*intero.Context).BlockHeight method#3211

core: review usages of (*intero.Context).BlockHeight method#3211
roman-khimov merged 2 commits intomasterfrom
fix-curr-height

AnnaShaleva commented Nov 21, 2023

Uh oh!

AnnaShaleva Nov 21, 2023

Uh oh!

roman-khimov Nov 21, 2023

Uh oh!

AnnaShaleva Nov 21, 2023 •

edited

Loading

Uh oh!

roman-khimov Nov 21, 2023

Uh oh!

AnnaShaleva Nov 21, 2023

Uh oh!

Uh oh!

Uh oh!

roman-khimov Nov 21, 2023

Uh oh!

codecov bot commented Nov 21, 2023 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	depositExpiration := s.chain.GetNotaryDepositExpiration(payer)
	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)
	}

	height := bc.BlockHeight()
	isPartialTx := data != nil
	if t.ValidUntilBlock <= height \|\| !isPartialTx && t.ValidUntilBlock > height+bc.config.MaxValidUntilBlockIncrement {
	return fmt.Errorf("%w: ValidUntilBlock = %d, current height = %d", ErrTxExpired, t.ValidUntilBlock, height)
	}

	if ic.BlockHeight() < deposit.Till {
	return stackitem.NewBool(false)
	}

Conversation

AnnaShaleva commented Nov 21, 2023

Uh oh!

AnnaShaleva Nov 21, 2023

Choose a reason for hiding this comment

Uh oh!

roman-khimov Nov 21, 2023

Choose a reason for hiding this comment

Uh oh!

AnnaShaleva Nov 21, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

roman-khimov Nov 21, 2023

Choose a reason for hiding this comment

Uh oh!

AnnaShaleva Nov 21, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

roman-khimov Nov 21, 2023

Choose a reason for hiding this comment

Uh oh!

codecov bot commented Nov 21, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

AnnaShaleva Nov 21, 2023 •

edited

Loading

codecov bot commented Nov 21, 2023 •

edited

Loading