From 43f2286890d149405e3f8abf707bee3181f124d5 Mon Sep 17 00:00:00 2001 From: whyrusleeping Date: Wed, 4 Dec 2019 17:32:34 -0800 Subject: [PATCH] Set maximum sector ID to 2^48-1 --- chain/actors/actor_miner.go | 6 +++--- go.mod | 2 +- go.sum | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/chain/actors/actor_miner.go b/chain/actors/actor_miner.go index 022e49ad5..0ae52a059 100644 --- a/chain/actors/actor_miner.go +++ b/chain/actors/actor_miner.go @@ -23,7 +23,7 @@ import ( "golang.org/x/xerrors" ) -const MaxSectorID = 32 << 30 // 32 billion sectors should be good enough right? +const MaxSectors = 1 << 48 type StorageMinerActor struct{} @@ -539,7 +539,7 @@ func SectorIsUnique(ctx context.Context, s types.Storage, sroot cid.Cid, sid uin } func AddToSectorSet(ctx context.Context, blks amt.Blocks, ss cid.Cid, sectorID uint64, commR, commD []byte) (cid.Cid, ActorError) { - if sectorID > MaxSectorID { + if sectorID >= MaxSectors { return cid.Undef, aerrors.Newf(25, "sector ID out of range: %d", sectorID) } ssr, err := amt.LoadAMT(blks, ss) @@ -562,7 +562,7 @@ func AddToSectorSet(ctx context.Context, blks amt.Blocks, ss cid.Cid, sectorID u } func GetFromSectorSet(ctx context.Context, s types.Storage, ss cid.Cid, sectorID uint64) (bool, []byte, []byte, ActorError) { - if sectorID > MaxSectorID { + if sectorID >= MaxSectors { return false, nil, nil, aerrors.Newf(25, "sector ID out of range: %d", sectorID) } diff --git a/go.mod b/go.mod index 3c3124cbd..12319e951 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/fatih/color v1.7.0 // indirect github.com/filecoin-project/chain-validation v0.0.3 github.com/filecoin-project/filecoin-ffi v0.0.0-20191204125133-ebb3e13addf1 - github.com/filecoin-project/go-amt-ipld v0.0.0-20191203073133-f941215342ed + github.com/filecoin-project/go-amt-ipld v0.0.0-20191205011053-79efc22d6cdc github.com/gbrlsnchs/jwt/v3 v3.0.0-beta.1 github.com/go-ole/go-ole v1.2.4 // indirect github.com/google/go-cmp v0.3.1 // indirect diff --git a/go.sum b/go.sum index 48afc3bc4..3b69e1714 100644 --- a/go.sum +++ b/go.sum @@ -80,6 +80,8 @@ github.com/filecoin-project/chain-validation v0.0.3 h1:luT/8kJ0WdMIqQ9Bm31W4JkuY github.com/filecoin-project/chain-validation v0.0.3/go.mod h1:NCEGFjcWRjb8akWFSOXvU6n2efkWIqAeOKU6o5WBGQw= github.com/filecoin-project/go-amt-ipld v0.0.0-20191203073133-f941215342ed h1:Wt4+eF3fda6MKLjK0/zzBOxs5cUwGyucJSAfO4LnX/w= github.com/filecoin-project/go-amt-ipld v0.0.0-20191203073133-f941215342ed/go.mod h1:KsFPWjF+UUYl6n9A+qbg4bjFgAOneicFZtDH/LQEX2U= +github.com/filecoin-project/go-amt-ipld v0.0.0-20191205011053-79efc22d6cdc h1:cODZD2YzpTUtrOSxbEnWFcQHidNRZiRdvLxySjGvG/M= +github.com/filecoin-project/go-amt-ipld v0.0.0-20191205011053-79efc22d6cdc/go.mod h1:KsFPWjF+UUYl6n9A+qbg4bjFgAOneicFZtDH/LQEX2U= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/gbrlsnchs/jwt/v3 v3.0.0-beta.1 h1:EzDjxMg43q1tA2c0MV3tNbaontnHLplHyFF6M5KiVP0=