• Home
  • Features
  • Pricing
  • Docs
  • Announcements
  • Sign In

neo-project / neo / 6070350868
77%

Build:
DEFAULT BRANCH: master
Ran 04 Sep 2023 07:21AM UTC
Jobs 1
Files 183
Run time 13s
Badge
Embed ▾
README BADGES
x

If you need to use a raster PNG badge, change the '.svg' to '.png' in the link

Markdown

Textile

RDoc

HTML

Rst

04 Sep 2023 07:19AM UTC coverage: 72.125% (+0.3%) from 71.78%
6070350868

push

github

web-flow
Payloads: implement Conflicts attribute (#2818)

* Payloads: implement Conflicts attribute

Closes #1991.

* Update src/Neo/Ledger/MemoryPool.cs

* Fix conflicting tx fees accounting

Fix the comment https://github.com/neo-project/neo/pull/2818#discussion_r1130790669.

* Reformat code and improve variables naming

Fix Vitor's comments.

* Make comments more clear and adjust variables naming

Fix Owen's feedback.

* Fix Conflicts attribute verification

Consider the case when transaction B has the hash of transaction A
in the Conflicts attribute and transaction B is on-chain. Let the
transaction C has the hash of transaction A in the Conflicts attribute.
Then transaction C still should be able to pass verification and should
be accepted to the subsequent block, because transaction A isn't on chain
and transaction A will never be accepted.

Thanks to Owen for testing, this case is described at the
https://github.com/neo-project/neo/pull/2818#pullrequestreview-1443230800.
The expected behaviour in the described case is that TXID-D and TXID-E will
be successfully accepted to the mempool and to chain, because the conflicting
TXID-A is not on chain (and it's OK that the hash of TXID-A is on-chain as
the conflicting hash).

* Fix formatting, comments and add a testcase for conflicting mempool txs

* Add one more testcase for conflicting transactions

Testcase provided by Vitor in https://github.com/neo-project/neo/pull/2818#discussion_r1209313799.

* Implement economic adjustments for Conflicts attribute

Transaction that conflicts with mempooled transactions have to pay
larger network fee than the sum of all conflicting transactions in
the pool that have the same sender as the newcomer.

Port the https://github.com/nspcc-dev/neo-go/pull/3031.

* Remove Trimmed value

* Check signers of on-chained conflict during new tx verification

Fix the problem described in
https://github.com/neo-project/neo/pull/2818#pullrequestreview-1526521347.

During new transactio... (continued)

2999 of 4848 branches covered (0.0%)

Branch coverage included in aggregate %.

178 of 178 new or added lines in 9 files covered. (100.0%)

10114 of 13333 relevant lines covered (75.86%)

18171.1 hits per line

Jobs
ID Job ID Ran Files Coverage
1 6070350868.1 04 Sep 2023 07:21AM UTC 0
72.12
GitHub Action Run
Source Files on build 6070350868
Detailed source file information is not available for this build.
  • Back to Repo
  • 63988016 on github
  • Prev Build on master (#6048822299)
  • Next Build on master (#6080620877)
STATUS · Troubleshooting · Open an Issue · Sales · Support · CAREERS · ENTERPRISE · START FREE · SCHEDULE DEMO
ANNOUNCEMENTS · TWITTER · TOS & SLA · Supported CI Services · What's a CI service? · Automated Testing

© 2026 Coveralls, Inc