resolved conflicts

2021-07-06 16:00:41 +02:00
parent 9839d5701b 97207df705
commit ff2772a58c
9 changed files with 102 additions and 35 deletions
@@ -705,7 +705,7 @@ func (a *StateAPI) StateChangedActors(ctx context.Context, old cid.Cid, new cid.
 		return nil, xerrors.Errorf("failed to load new state tree: %w", err)
 	}

-	return state.Diff(oldTree, newTree)
+	return state.Diff(ctx, oldTree, newTree)
 }

 func (a *StateAPI) StateMinerSectorCount(ctx context.Context, addr address.Address, tsk types.TipSetKey) (api.MinerSectors, error) {