Upgrade from upstream

[evan-forbes]

We will have to update our fork of the latest version of tendermint if we want to take advantage of security patches and upcoming features such as ABCI++.

Unfortunately, due to significant refactoring in tendermint since we forked, updating will be a little bit more complicated than strictly rebasing our changes onto the latest master branch.

This should likely be done after as much code as possible has been moved to the celestia-node repo, and we should also document each of the changes #482.

As a bonus, we should also think about streamlining the process of merging future updates.

[tac0turtle]

assigning to myself. I am working on this.

I am just about done with the merge conflicts, down to 60 out of 300. Then will fix tests and compare with changes here and in Tendermint. I should have a PR up later today.

[evan-forbes]

Update: we decided to wait a bit and revert quite a few changes. Most of those change have since been reverted, see #436 #509 #518 and #514, and it should be significantly easier to upgrade to the latest version of tendermint. We also would like to do this sooner rather than later, as everything else we're working on depends on celestia-core to some extent.

@marbar3778 do you think you'll have time to start this again? If not, I'm happy to start rebasing and then maybe you can help me debug after? Thanks!

[tac0turtle]

@marbar3778 do you think you'll have time to start this again? If not, I'm happy to start rebasing and then maybe you can help me debug after? Thanks!

Yea i can restart it later today. Ill try to get a PR up asap

[evan-forbes]

Thanks @marbar3778! you're the best

[evan-forbes]

closed by the merging of #534