search

poanetwork / parity-ethereum

Fast, light, robust Ethereum implementation.
https://parity.io
Other
10 stars 12 forks source link

void #143

Closed ghost closed 5 years ago

varasev commented 5 years ago

We have updated the aura-pos to upstream's stable v2.4.5. Does v2.4.5 contain the reset function?

varasev commented 5 years ago

@afck @vkomenda Could we rebase the aura-pos branch on the v2.4.6 stable?

varasev commented 5 years ago

Sorry, it seems that https://github.com/paritytech/parity-ethereum/pull/10669 is not in the upstream's stable branch yet.

So this would be needed (i've not tried, possibly this can be merged easily).

@lazaridiscom Could you try to include that PR into the aura-pos but in the different branch? (say, aura-pos-with-pr10669)

varasev commented 5 years ago

Going master would be the ideal, though.

Usually, we only rebase the aura-pos on the stable upstream branch, so if you need to check that rebased on upstream master, you can try to do that in a separate branch.

varasev commented 5 years ago

When do you expect to have aura-pos on 2.4.6 available?

Not sure about the timing, but I asked our Rust developers above to do that. I guess, one of them will answer as soon as they are ready.

varasev commented 5 years ago

as i understand that you keep your aura-pos branches identical to the stables

The aura-pos branch contains our modifications needed for POSDAO model we are working on (see our WhitePaper, section 9.3 if interested). But we also keep the aura-pos branch up-to-date with the upstream's stable branch.