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

merge: 2.6 #3542

Merged
merged 274 commits into from
Feb 28, 2020
Merged

merge: 2.6 #3542

merged 274 commits into from
Feb 28, 2020

Conversation

air1one
Copy link
Contributor

@air1one air1one commented Feb 27, 2020

Summary

Checklist

  • Documentation (if necessary)
  • Tests (if necessary)
  • Ready to be merged

dated and others added 30 commits October 25, 2019 15:33
@dated @faustbrian
fix(core-magistrate-transactions): emit correct event (#3128)
5ef8fc8
@vasild @spkjp
fix(core-p2p): parallel download (#3092)
98def5a 
* chore(core-p2p): rename syncWithNetwork() to downloadBlocksFromHeight()

The new name better describes what the method does.

* fix(core-p2p): improve parallel block download

* Disallow gaps in the returned array of blocks.

* Cancel running jobs if some job fails.

* Do not discard downloaded blocks, lower than the ones supposed to be
  downloaded by a failed job.

* Download 10 chunks in parallel instead of 25 - it should be enough to
  saturate the connection and still not cause socketcluster timeouts.

* chore: print more details in log messages

* Make sure we dont try the same peer for different chunks at 1st

* Rename syncWithNetwork()->downloadBlocksFromHeight() also in __tests__/

* Adjust test

* Add a comment about AsyncFunction vs Promise

* Fix off-by-one error in printout

* Rewrite downloadBlocksFromHeight() tests

* Cache the downloaded chunks that were not returned to caller

* Remove redundant method PeerCommunicator.downloadBlocks()

Also improve error message printouts

* Remove unused import
@dated @faustbrian
fix(core-magistrate): get connection from databaseservice (#3130)
0081a2f
@dated @spkjp
refactor(core-magistrate): business and bridgechain ids as numbers (#…
61c4d5f 
…3118)
@dated @spkjp
refactor(core-database): refactor searchBusinesses & searchBridgechai…
d579fda 
…ns (#3110)
@dated @spkjp
feat(core-api): implement businesses/bridgechains endpoint (#3119)
697d347
@dated @spkjp
feat(core-magistrate): ensure unique bridgechain name per business (#…
f2ced87 
…3132)
@dated @faustbrian
refactor(crypto): use multiPaymentLimit from milestone if avail… (#3136)
0ef2512
@spkjp @faustbrian
fix(core-blockchain): add transactions back to pool only after… (#3138)
025c440
@faustbrian
release: 2.6.0-next.3
2375d68
@spkjp @faustbrian
fix(core): read paths.config instead of env variable (#3142)
312e6cd
@Lemii @faustbrian
refactor(core-magistrate-transactions): BridgechainUpdate errors (#3141)
2c619ae
@Lemii @faustbrian
refactor(core-magistrate-crypto): consolidate bridgechain schem… (#3143)
deef78d
@dated @faustbrian
refactor(core-database): convert htlc lock vendorfield to string duri…
95df802 
…ng bootstrap (#3145)
@spkjp @faustbrian
fix(core-p2p): uncaught IPC timeout (#3140)
c76adaa
@faustbrian
Revert "refactor(core-magistrate-crypto): consolidate bridgecha… (#3146)
ca9a947 
This reverts commit deef78d.
@Lemii @faustbrian
fix(core-magistrate-crypto): improve 'name' field validation to… (#3148)
e67abe7
@Lemii @faustbrian
polish(core-magistrate-crypto): remove redundant bridgechain sc… (#3150)
3e17881
@dated @faustbrian
refactor(core-api): fallback to core typegroup if querying by t… (#3147)
4787d44
@dated @faustbrian
refactor(core-magistrate): don't allow multiple business or bri… (#3137)
3877e56
@vasild @spkjp
fix(crypto): properly implement block size limit (#3154)
4bbfaa2
@spkjp @faustbrian
refactor(core-magistrate-crypto): use 4 bytes instead of 8 byte… (#3156)
035fd92
@dated @faustbrian
fix(core-database): correctly reduce indexed bridgechain entries (#3153)
8b64f7f
@Lemii @faustbrian
refactor(crypto): change MaximumPaymentCountExceededError error (#3152)
6b3e0cb
@spkjp @faustbrian
fix(core-blockchain): write accepted blocks to database before… (#3155)
1a74f32 
* fix: dont rollback while accepted blocks have not been written to database yet

The `AcceptBlockHandler` already alters `blocksInCurrentRound` while blocks
aren't written to database until the current batch finished processing.

In the case of a fork, we'd stop while blocks have been accepted, but not
written to database yet. This led to inconsistencies and resulted
in an assert being triggered which then wrecked the state machine
effectively stopping the node.

```
AssertionError [ERR_ASSERTION]: The expression evaluated to a falsy value:
  assert_1.default(this.blocksInCurrentRound.pop().data.id === block.data.id)
    at DatabaseService.revertBlock (/home/ark/.config/yarn/global/node_modules/@arkecosystem/core-database/dist/database-service.js:312:25)
    at async revertLastBlock (/home/ark/.config/yarn/global/node_modules/@arkecosystem/core-blockchain/dist/blockchain.js:236:13)
    at async __removeBlocks (/home/ark/.config/yarn/global/node_modules/@arkecosystem/core-blockchain/dist/blockchain.js:260:13)
    at async __removeBlocks (/home/ark/.config/yarn/global/node_modules/@arkecosystem/core-blockchain/dist/blockchain.js:261:13)
    at async Blockchain.removeBlocks (/home/ark/.config/yarn/global/node_modules/@arkecosystem/core-blockchain/dist/blockchain.js:270:9)
    at async startForkRecovery (/home/ark/.config/yarn/global/node_modules/@arkecosystem/core-blockchain/dist/state-machine.js:204:9)
```

This PR ensures that a fork only starts after all accepted blocks are
in the database. Tested manually, before I was able to reproduce it every
time, now I can no longer reproduce it.
@spkjp @faustbrian
refactor(crypto): update multipayment limits (#3157)
c9330a8
@spkjp @faustbrian
fix(core-p2p): timeout promise race (#3158)
3443f3a
@dated @faustbrian
feat(core-api): add additional fields to businesses search sche… (#3160)
05dd51f
@vasild @faustbrian
chore(core-p2p): improve log message (#3161)
9f410ea
@air1one @faustbrian
fix(core-p2p): call next() so that the request can proceed (#3163)
14b6489
@faustbrian faustbrian marked this pull request as ready for review February 27, 2020 15:17
@codecov
Copy link

codecov bot commented Feb 28, 2020 •
edited
Loading

Codecov Report

Merging #3542 into 3.0 will not change coverage by %.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##              3.0    #3542   +/-   ##
=======================================
  Coverage   47.52%   47.52%           
=======================================
  Files         548      548           
  Lines       13861    13861           
  Branches     1902     1902           
=======================================
  Hits         6587     6587           
  Misses       7245     7245           
  Partials       29       29

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c71cc33...c71cc33. Read the comment docs.

@faustbrian faustbrian merged commit c71cc33 into 3.0 Feb 28, 2020
@ghost ghost deleted the merge/3.0-2.6 branch February 28, 2020 08:17
@ghost ghost removed the Status: Needs Review label Feb 28, 2020
@ghost ghost mentioned this pull request Mar 1, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@faustbrian faustbrian faustbrian approved these changes

@kristjank kristjank Awaiting requested review from kristjank

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.