cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge pull request #996 from filecoin-project/fix/yet-anothur-fork-issue

Browse Source 
Fix withUpdates
This commit is contained in:
Łukasz Magiera 2019-12-20 13:18:04 +01:00 committed by GitHub
commit 7c925db748
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/version.go
View File

@ -5,7 +5,7 @@ import "fmt"
var CurrentCommit string var CurrentCommit string
// BuildVersion is the local build version, set by build system // BuildVersion is the local build version, set by build system
const BuildVersion = "0.1.4" const BuildVersion = "0.1.5"
var UserVersion = BuildVersion + CurrentCommit var UserVersion = BuildVersion + CurrentCommit
@ -31,7 +31,7 @@ func (ve Version) EqMajorMinor(v2 Version) bool {
} }
// APIVersion is a semver version of the rpc api exposed // APIVersion is a semver version of the rpc api exposed
var APIVersion Version = newVer(0, 1, 4) var APIVersion Version = newVer(0, 1, 5)
const ( const (
majorMask = 0xff0000 majorMask = 0xff0000

4
chain/actors/forks.go
View File

@ -26,12 +26,12 @@ func withUpdates(updates ...update) interface{} {
vmctx := args[1].Interface().(types.VMContext) vmctx := args[1].Interface().(types.VMContext)
for _, u := range updates { for _, u := range updates {
if u.start >= vmctx.BlockHeight() { if vmctx.BlockHeight() >= u.start {
return reflect.ValueOf(u.method).Call(args) return reflect.ValueOf(u.method).Call(args)
} }
} }
return reflect.ValueOf(notFound(vmctx)).Call([]reflect.Value{args[1]}) return reflect.ValueOf(notFound(vmctx)).Call([]reflect.Value{})
}) })
return out.Interface() return out.Interface()