This repository has been archived by the owner on May 13, 2022. It is now read-only.
updating develop with intermediate fixes from release-0.16 #479
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
release v0.12.0
…s no transaction can commence with delegatecall
issue371: hotfix 0.12.1
…on_0.12 client/core: fixes 378 patch exception error from chain
time: introduce marmot time
b. issue366 only deploy from branch `release-0.12` for MASTER
fixes #443
Add sub_id parameter
Begin stabilising v0.16.0 on release-0.16
Draft changelog
Signed-off-by: RJ Catalano <[email protected]>
Signed-off-by: RJ Catalano <[email protected]>
Signed-off-by: RJ Catalano <[email protected]>
issue-476: return One256 for EXTCODESIZE on native contracts
benjaminbollen
commented
Feb 8, 2017
| @@ -167,7 +168,15 @@ func (app *ErisMint) Commit() (res tmsp.Result) { | |||
| // flush events to listeners (XXX: note issue with blocking) | |||
| app.evc.Flush() | |||
|
|
|||
| return tmsp.NewResultOK(app.state.Hash(), "Success") | |||
| // MARMOT: | |||
There was a problem hiding this comment.
This is not good.
| @@ -156,7 +157,9 @@ func (vm *VM) DelegateCall(caller, callee *Account, code, input []byte, value in | |||
|
|
|||
| exception := new(string) | |||
| // fire the post call event (including exception if applicable) | |||
| defer vm.fireCallEvent(exception, &output, caller, callee, input, value, gas) | |||
| // NOTE: [ben] hotfix for issue 371; | |||
There was a problem hiding this comment.
This is not good.
| @@ -416,7 +416,10 @@ func MakeGenesisState(db dbm.DB, genDoc *genesis.GenesisDoc) *State { | |||
| } | |||
|
|
|||
| if genDoc.GenesisTime.IsZero() { | |||
| genDoc.GenesisTime = time.Now() | |||
| // MARMOT: really? | |||
There was a problem hiding this comment.
This is not good.
| genDoc.GenesisTime = time.Now() | ||
| // MARMOT: really? | ||
| // set time to 11/18/2016 @ 4:09am (UTC) | ||
| genDoc.GenesisTime = time.Unix(1479442162, 0) |
There was a problem hiding this comment.
This is not good.
…e version tag for tagged commits
carry over hotfix: correct deployment from master and release
tests: add forced cleanup of :build tag
|
Merging release-0.16 (and with it master 0.12.1) into develop |
silasdavis
pushed a commit
to silasdavis/burrow
that referenced
this pull request
Mar 9, 2019
updating develop with intermediate fixes from release-0.16
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.