diff --git a/api/cbor_gen.go b/api/cbor_gen.go
new file mode 100644
index 000000000..6f71bbaed
--- /dev/null
+++ b/api/cbor_gen.go
@@ -0,0 +1,129 @@
+package api
+
+import (
+	"fmt"
+	"io"
+
+	"github.com/filecoin-project/lotus/chain/types"
+	cbg "github.com/whyrusleeping/cbor-gen"
+	xerrors "golang.org/x/xerrors"
+)
+
+/* This file was generated by github.com/whyrusleeping/cbor-gen */
+
+var _ = xerrors.Errorf
+
+func (t *PaymentInfo) MarshalCBOR(w io.Writer) error {
+	if t == nil {
+		_, err := w.Write(cbg.CborNull)
+		return err
+	}
+	if _, err := w.Write([]byte{131}); err != nil {
+		return err
+	}
+
+	// t.t.Channel (address.Address) (struct)
+	if err := t.Channel.MarshalCBOR(w); err != nil {
+		return err
+	}
+
+	// t.t.ChannelMessage (cid.Cid) (struct)
+
+	if t.ChannelMessage == nil {
+		if _, err := w.Write(cbg.CborNull); err != nil {
+			return err
+		}
+	} else {
+		if err := cbg.WriteCid(w, *t.ChannelMessage); err != nil {
+			return xerrors.Errorf("failed to write cid field t.ChannelMessage: %w", err)
+		}
+	}
+
+	// t.t.Vouchers ([]*types.SignedVoucher) (slice)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajArray, uint64(len(t.Vouchers)))); err != nil {
+		return err
+	}
+	for _, v := range t.Vouchers {
+		if err := v.MarshalCBOR(w); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (t *PaymentInfo) UnmarshalCBOR(r io.Reader) error {
+	br := cbg.GetPeeker(r)
+
+	maj, extra, err := cbg.CborReadHeader(br)
+	if err != nil {
+		return err
+	}
+	if maj != cbg.MajArray {
+		return fmt.Errorf("cbor input should be of type array")
+	}
+
+	if extra != 3 {
+		return fmt.Errorf("cbor input had wrong number of fields")
+	}
+
+	// t.t.Channel (address.Address) (struct)
+
+	{
+
+		if err := t.Channel.UnmarshalCBOR(br); err != nil {
+			return err
+		}
+
+	}
+	// t.t.ChannelMessage (cid.Cid) (struct)
+
+	{
+
+		pb, err := br.PeekByte()
+		if err != nil {
+			return err
+		}
+		if pb == cbg.CborNull[0] {
+			var nbuf [1]byte
+			if _, err := br.Read(nbuf[:]); err != nil {
+				return err
+			}
+		} else {
+
+			c, err := cbg.ReadCid(br)
+			if err != nil {
+				return xerrors.Errorf("failed to read cid field t.ChannelMessage: %w", err)
+			}
+
+			t.ChannelMessage = &c
+		}
+
+	}
+	// t.t.Vouchers ([]*types.SignedVoucher) (slice)
+
+	maj, extra, err = cbg.CborReadHeader(br)
+	if err != nil {
+		return err
+	}
+	if extra > 8192 {
+		return fmt.Errorf("t.Vouchers: array too large (%d)", extra)
+	}
+
+	if maj != cbg.MajArray {
+		return fmt.Errorf("expected cbor array")
+	}
+	if extra > 0 {
+		t.Vouchers = make([]*types.SignedVoucher, extra)
+	}
+	for i := 0; i < int(extra); i++ {
+
+		var v types.SignedVoucher
+		if err := v.UnmarshalCBOR(br); err != nil {
+			return err
+		}
+
+		t.Vouchers[i] = &v
+	}
+
+	return nil
+}
diff --git a/chain/actors/cbor_gen.go b/chain/actors/cbor_gen.go
index 5444dafb0..304722e45 100644
--- a/chain/actors/cbor_gen.go
+++ b/chain/actors/cbor_gen.go
@@ -24,14 +24,14 @@ func (t *InitActorState) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.AddressMap (cid.Cid)
+	// t.t.AddressMap (cid.Cid) (struct)
 
 	if err := cbg.WriteCid(w, t.AddressMap); err != nil {
 		return xerrors.Errorf("failed to write cid field t.AddressMap: %w", err)
 	}
 
-	// t.t.NextID (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.NextID)); err != nil {
+	// t.t.NextID (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.NextID))); err != nil {
 		return err
 	}
 	return nil
@@ -52,7 +52,7 @@ func (t *InitActorState) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.AddressMap (cid.Cid)
+	// t.t.AddressMap (cid.Cid) (struct)
 
 	{
 
@@ -64,7 +64,7 @@ func (t *InitActorState) UnmarshalCBOR(r io.Reader) error {
 		t.AddressMap = c
 
 	}
-	// t.t.NextID (uint64)
+	// t.t.NextID (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -73,7 +73,7 @@ func (t *InitActorState) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.NextID = extra
+	t.NextID = uint64(extra)
 	return nil
 }
 
@@ -86,13 +86,13 @@ func (t *ExecParams) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Code (cid.Cid)
+	// t.t.Code (cid.Cid) (struct)
 
 	if err := cbg.WriteCid(w, t.Code); err != nil {
 		return xerrors.Errorf("failed to write cid field t.Code: %w", err)
 	}
 
-	// t.t.Params ([]uint8)
+	// t.t.Params ([]uint8) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajByteString, uint64(len(t.Params)))); err != nil {
 		return err
 	}
@@ -117,7 +117,7 @@ func (t *ExecParams) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Code (cid.Cid)
+	// t.t.Code (cid.Cid) (struct)
 
 	{
 
@@ -129,7 +129,7 @@ func (t *ExecParams) UnmarshalCBOR(r io.Reader) error {
 		t.Code = c
 
 	}
-	// t.t.Params ([]uint8)
+	// t.t.Params ([]uint8) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -158,7 +158,7 @@ func (t *AccountActorState) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Address (address.Address)
+	// t.t.Address (address.Address) (struct)
 	if err := t.Address.MarshalCBOR(w); err != nil {
 		return err
 	}
@@ -180,7 +180,7 @@ func (t *AccountActorState) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Address (address.Address)
+	// t.t.Address (address.Address) (struct)
 
 	{
 
@@ -201,66 +201,66 @@ func (t *StorageMinerActorState) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Info (cid.Cid)
+	// t.t.Info (cid.Cid) (struct)
 
 	if err := cbg.WriteCid(w, t.Info); err != nil {
 		return xerrors.Errorf("failed to write cid field t.Info: %w", err)
 	}
 
-	// t.t.DePledgedCollateral (types.BigInt)
+	// t.t.DePledgedCollateral (types.BigInt) (struct)
 	if err := t.DePledgedCollateral.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.DePledgeTime (types.BigInt)
+	// t.t.DePledgeTime (types.BigInt) (struct)
 	if err := t.DePledgeTime.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Sectors (cid.Cid)
+	// t.t.Sectors (cid.Cid) (struct)
 
 	if err := cbg.WriteCid(w, t.Sectors); err != nil {
 		return xerrors.Errorf("failed to write cid field t.Sectors: %w", err)
 	}
 
-	// t.t.ProvingSet (cid.Cid)
+	// t.t.ProvingSet (cid.Cid) (struct)
 
 	if err := cbg.WriteCid(w, t.ProvingSet); err != nil {
 		return xerrors.Errorf("failed to write cid field t.ProvingSet: %w", err)
 	}
 
-	// t.t.CurrentFaultSet (types.BitField)
+	// t.t.CurrentFaultSet (types.BitField) (struct)
 	if err := t.CurrentFaultSet.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.NextFaultSet (types.BitField)
+	// t.t.NextFaultSet (types.BitField) (struct)
 	if err := t.NextFaultSet.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.NextDoneSet (types.BitField)
+	// t.t.NextDoneSet (types.BitField) (struct)
 	if err := t.NextDoneSet.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Power (types.BigInt)
+	// t.t.Power (types.BigInt) (struct)
 	if err := t.Power.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.SlashedAt (types.BigInt)
+	// t.t.SlashedAt (types.BigInt) (struct)
 	if err := t.SlashedAt.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.OwedStorageCollateral (types.BigInt)
+	// t.t.OwedStorageCollateral (types.BigInt) (struct)
 	if err := t.OwedStorageCollateral.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.ProvingPeriodEnd (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.ProvingPeriodEnd)); err != nil {
+	// t.t.ProvingPeriodEnd (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.ProvingPeriodEnd))); err != nil {
 		return err
 	}
 	return nil
@@ -281,7 +281,7 @@ func (t *StorageMinerActorState) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Info (cid.Cid)
+	// t.t.Info (cid.Cid) (struct)
 
 	{
 
@@ -293,7 +293,7 @@ func (t *StorageMinerActorState) UnmarshalCBOR(r io.Reader) error {
 		t.Info = c
 
 	}
-	// t.t.DePledgedCollateral (types.BigInt)
+	// t.t.DePledgedCollateral (types.BigInt) (struct)
 
 	{
 
@@ -302,7 +302,7 @@ func (t *StorageMinerActorState) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.DePledgeTime (types.BigInt)
+	// t.t.DePledgeTime (types.BigInt) (struct)
 
 	{
 
@@ -311,7 +311,7 @@ func (t *StorageMinerActorState) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Sectors (cid.Cid)
+	// t.t.Sectors (cid.Cid) (struct)
 
 	{
 
@@ -323,7 +323,7 @@ func (t *StorageMinerActorState) UnmarshalCBOR(r io.Reader) error {
 		t.Sectors = c
 
 	}
-	// t.t.ProvingSet (cid.Cid)
+	// t.t.ProvingSet (cid.Cid) (struct)
 
 	{
 
@@ -335,7 +335,7 @@ func (t *StorageMinerActorState) UnmarshalCBOR(r io.Reader) error {
 		t.ProvingSet = c
 
 	}
-	// t.t.CurrentFaultSet (types.BitField)
+	// t.t.CurrentFaultSet (types.BitField) (struct)
 
 	{
 
@@ -344,7 +344,7 @@ func (t *StorageMinerActorState) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.NextFaultSet (types.BitField)
+	// t.t.NextFaultSet (types.BitField) (struct)
 
 	{
 
@@ -353,7 +353,7 @@ func (t *StorageMinerActorState) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.NextDoneSet (types.BitField)
+	// t.t.NextDoneSet (types.BitField) (struct)
 
 	{
 
@@ -362,7 +362,7 @@ func (t *StorageMinerActorState) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Power (types.BigInt)
+	// t.t.Power (types.BigInt) (struct)
 
 	{
 
@@ -371,7 +371,7 @@ func (t *StorageMinerActorState) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.SlashedAt (types.BigInt)
+	// t.t.SlashedAt (types.BigInt) (struct)
 
 	{
 
@@ -380,7 +380,7 @@ func (t *StorageMinerActorState) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.OwedStorageCollateral (types.BigInt)
+	// t.t.OwedStorageCollateral (types.BigInt) (struct)
 
 	{
 
@@ -389,7 +389,7 @@ func (t *StorageMinerActorState) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.ProvingPeriodEnd (uint64)
+	// t.t.ProvingPeriodEnd (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -398,7 +398,7 @@ func (t *StorageMinerActorState) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.ProvingPeriodEnd = extra
+	t.ProvingPeriodEnd = uint64(extra)
 	return nil
 }
 
@@ -411,22 +411,22 @@ func (t *StorageMinerConstructorParams) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Owner (address.Address)
+	// t.t.Owner (address.Address) (struct)
 	if err := t.Owner.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Worker (address.Address)
+	// t.t.Worker (address.Address) (struct)
 	if err := t.Worker.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.SectorSize (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.SectorSize)); err != nil {
+	// t.t.SectorSize (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.SectorSize))); err != nil {
 		return err
 	}
 
-	// t.t.PeerID (peer.ID)
+	// t.t.PeerID (peer.ID) (string)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajTextString, uint64(len(t.PeerID)))); err != nil {
 		return err
 	}
@@ -451,7 +451,7 @@ func (t *StorageMinerConstructorParams) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Owner (address.Address)
+	// t.t.Owner (address.Address) (struct)
 
 	{
 
@@ -460,7 +460,7 @@ func (t *StorageMinerConstructorParams) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Worker (address.Address)
+	// t.t.Worker (address.Address) (struct)
 
 	{
 
@@ -469,7 +469,7 @@ func (t *StorageMinerConstructorParams) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.SectorSize (uint64)
+	// t.t.SectorSize (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -478,8 +478,8 @@ func (t *StorageMinerConstructorParams) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.SectorSize = extra
-	// t.t.PeerID (peer.ID)
+	t.SectorSize = uint64(extra)
+	// t.t.PeerID (peer.ID) (string)
 
 	{
 		sval, err := cbg.ReadString(br)
@@ -501,7 +501,7 @@ func (t *OnChainSealVerifyInfo) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.CommD ([]uint8)
+	// t.t.CommD ([]uint8) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajByteString, uint64(len(t.CommD)))); err != nil {
 		return err
 	}
@@ -509,7 +509,7 @@ func (t *OnChainSealVerifyInfo) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.CommR ([]uint8)
+	// t.t.CommR ([]uint8) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajByteString, uint64(len(t.CommR)))); err != nil {
 		return err
 	}
@@ -517,12 +517,12 @@ func (t *OnChainSealVerifyInfo) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Epoch (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.Epoch)); err != nil {
+	// t.t.Epoch (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.Epoch))); err != nil {
 		return err
 	}
 
-	// t.t.Proof ([]uint8)
+	// t.t.Proof ([]uint8) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajByteString, uint64(len(t.Proof)))); err != nil {
 		return err
 	}
@@ -530,7 +530,7 @@ func (t *OnChainSealVerifyInfo) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.DealIDs ([]uint64)
+	// t.t.DealIDs ([]uint64) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajArray, uint64(len(t.DealIDs)))); err != nil {
 		return err
 	}
@@ -540,8 +540,8 @@ func (t *OnChainSealVerifyInfo) MarshalCBOR(w io.Writer) error {
 		}
 	}
 
-	// t.t.SectorNumber (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.SectorNumber)); err != nil {
+	// t.t.SectorNumber (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.SectorNumber))); err != nil {
 		return err
 	}
 	return nil
@@ -562,7 +562,7 @@ func (t *OnChainSealVerifyInfo) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.CommD ([]uint8)
+	// t.t.CommD ([]uint8) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -579,7 +579,7 @@ func (t *OnChainSealVerifyInfo) UnmarshalCBOR(r io.Reader) error {
 	if _, err := io.ReadFull(br, t.CommD); err != nil {
 		return err
 	}
-	// t.t.CommR ([]uint8)
+	// t.t.CommR ([]uint8) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -596,7 +596,7 @@ func (t *OnChainSealVerifyInfo) UnmarshalCBOR(r io.Reader) error {
 	if _, err := io.ReadFull(br, t.CommR); err != nil {
 		return err
 	}
-	// t.t.Epoch (uint64)
+	// t.t.Epoch (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -605,8 +605,8 @@ func (t *OnChainSealVerifyInfo) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.Epoch = extra
-	// t.t.Proof ([]uint8)
+	t.Epoch = uint64(extra)
+	// t.t.Proof ([]uint8) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -623,7 +623,7 @@ func (t *OnChainSealVerifyInfo) UnmarshalCBOR(r io.Reader) error {
 	if _, err := io.ReadFull(br, t.Proof); err != nil {
 		return err
 	}
-	// t.t.DealIDs ([]uint64)
+	// t.t.DealIDs ([]uint64) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -653,7 +653,7 @@ func (t *OnChainSealVerifyInfo) UnmarshalCBOR(r io.Reader) error {
 		t.DealIDs[i] = val
 	}
 
-	// t.t.SectorNumber (uint64)
+	// t.t.SectorNumber (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -662,7 +662,7 @@ func (t *OnChainSealVerifyInfo) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.SectorNumber = extra
+	t.SectorNumber = uint64(extra)
 	return nil
 }
 
@@ -675,17 +675,17 @@ func (t *MinerInfo) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Owner (address.Address)
+	// t.t.Owner (address.Address) (struct)
 	if err := t.Owner.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Worker (address.Address)
+	// t.t.Worker (address.Address) (struct)
 	if err := t.Worker.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.PeerID (peer.ID)
+	// t.t.PeerID (peer.ID) (string)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajTextString, uint64(len(t.PeerID)))); err != nil {
 		return err
 	}
@@ -693,8 +693,8 @@ func (t *MinerInfo) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.SectorSize (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.SectorSize)); err != nil {
+	// t.t.SectorSize (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.SectorSize))); err != nil {
 		return err
 	}
 	return nil
@@ -715,7 +715,7 @@ func (t *MinerInfo) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Owner (address.Address)
+	// t.t.Owner (address.Address) (struct)
 
 	{
 
@@ -724,7 +724,7 @@ func (t *MinerInfo) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Worker (address.Address)
+	// t.t.Worker (address.Address) (struct)
 
 	{
 
@@ -733,7 +733,7 @@ func (t *MinerInfo) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.PeerID (peer.ID)
+	// t.t.PeerID (peer.ID) (string)
 
 	{
 		sval, err := cbg.ReadString(br)
@@ -743,7 +743,7 @@ func (t *MinerInfo) UnmarshalCBOR(r io.Reader) error {
 
 		t.PeerID = peer.ID(sval)
 	}
-	// t.t.SectorSize (uint64)
+	// t.t.SectorSize (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -752,7 +752,7 @@ func (t *MinerInfo) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.SectorSize = extra
+	t.SectorSize = uint64(extra)
 	return nil
 }
 
@@ -765,7 +765,7 @@ func (t *SubmitPoStParams) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Proof ([]uint8)
+	// t.t.Proof ([]uint8) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajByteString, uint64(len(t.Proof)))); err != nil {
 		return err
 	}
@@ -773,7 +773,7 @@ func (t *SubmitPoStParams) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.DoneSet (types.BitField)
+	// t.t.DoneSet (types.BitField) (struct)
 	if err := t.DoneSet.MarshalCBOR(w); err != nil {
 		return err
 	}
@@ -795,7 +795,7 @@ func (t *SubmitPoStParams) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Proof ([]uint8)
+	// t.t.Proof ([]uint8) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -812,7 +812,7 @@ func (t *SubmitPoStParams) UnmarshalCBOR(r io.Reader) error {
 	if _, err := io.ReadFull(br, t.Proof); err != nil {
 		return err
 	}
-	// t.t.DoneSet (types.BitField)
+	// t.t.DoneSet (types.BitField) (struct)
 
 	{
 
@@ -833,7 +833,7 @@ func (t *PaymentVerifyParams) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Extra ([]uint8)
+	// t.t.Extra ([]uint8) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajByteString, uint64(len(t.Extra)))); err != nil {
 		return err
 	}
@@ -841,7 +841,7 @@ func (t *PaymentVerifyParams) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Proof ([]uint8)
+	// t.t.Proof ([]uint8) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajByteString, uint64(len(t.Proof)))); err != nil {
 		return err
 	}
@@ -866,7 +866,7 @@ func (t *PaymentVerifyParams) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Extra ([]uint8)
+	// t.t.Extra ([]uint8) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -883,7 +883,7 @@ func (t *PaymentVerifyParams) UnmarshalCBOR(r io.Reader) error {
 	if _, err := io.ReadFull(br, t.Extra); err != nil {
 		return err
 	}
-	// t.t.Proof ([]uint8)
+	// t.t.Proof ([]uint8) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -912,7 +912,7 @@ func (t *UpdatePeerIDParams) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.PeerID (peer.ID)
+	// t.t.PeerID (peer.ID) (string)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajTextString, uint64(len(t.PeerID)))); err != nil {
 		return err
 	}
@@ -937,7 +937,7 @@ func (t *UpdatePeerIDParams) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.PeerID (peer.ID)
+	// t.t.PeerID (peer.ID) (string)
 
 	{
 		sval, err := cbg.ReadString(br)
@@ -959,7 +959,7 @@ func (t *MultiSigActorState) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Signers ([]address.Address)
+	// t.t.Signers ([]address.Address) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajArray, uint64(len(t.Signers)))); err != nil {
 		return err
 	}
@@ -969,32 +969,32 @@ func (t *MultiSigActorState) MarshalCBOR(w io.Writer) error {
 		}
 	}
 
-	// t.t.Required (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.Required)); err != nil {
+	// t.t.Required (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.Required))); err != nil {
 		return err
 	}
 
-	// t.t.NextTxID (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.NextTxID)); err != nil {
+	// t.t.NextTxID (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.NextTxID))); err != nil {
 		return err
 	}
 
-	// t.t.InitialBalance (types.BigInt)
+	// t.t.InitialBalance (types.BigInt) (struct)
 	if err := t.InitialBalance.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.StartingBlock (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.StartingBlock)); err != nil {
+	// t.t.StartingBlock (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.StartingBlock))); err != nil {
 		return err
 	}
 
-	// t.t.UnlockDuration (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.UnlockDuration)); err != nil {
+	// t.t.UnlockDuration (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.UnlockDuration))); err != nil {
 		return err
 	}
 
-	// t.t.Transactions ([]actors.MTransaction)
+	// t.t.Transactions ([]actors.MTransaction) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajArray, uint64(len(t.Transactions)))); err != nil {
 		return err
 	}
@@ -1021,7 +1021,7 @@ func (t *MultiSigActorState) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Signers ([]address.Address)
+	// t.t.Signers ([]address.Address) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1047,7 +1047,7 @@ func (t *MultiSigActorState) UnmarshalCBOR(r io.Reader) error {
 		t.Signers[i] = v
 	}
 
-	// t.t.Required (uint64)
+	// t.t.Required (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1056,8 +1056,8 @@ func (t *MultiSigActorState) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.Required = extra
-	// t.t.NextTxID (uint64)
+	t.Required = uint64(extra)
+	// t.t.NextTxID (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1066,8 +1066,8 @@ func (t *MultiSigActorState) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.NextTxID = extra
-	// t.t.InitialBalance (types.BigInt)
+	t.NextTxID = uint64(extra)
+	// t.t.InitialBalance (types.BigInt) (struct)
 
 	{
 
@@ -1076,7 +1076,7 @@ func (t *MultiSigActorState) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.StartingBlock (uint64)
+	// t.t.StartingBlock (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1085,8 +1085,8 @@ func (t *MultiSigActorState) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.StartingBlock = extra
-	// t.t.UnlockDuration (uint64)
+	t.StartingBlock = uint64(extra)
+	// t.t.UnlockDuration (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1095,8 +1095,8 @@ func (t *MultiSigActorState) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.UnlockDuration = extra
-	// t.t.Transactions ([]actors.MTransaction)
+	t.UnlockDuration = uint64(extra)
+	// t.t.Transactions ([]actors.MTransaction) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1134,7 +1134,7 @@ func (t *MultiSigConstructorParams) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Signers ([]address.Address)
+	// t.t.Signers ([]address.Address) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajArray, uint64(len(t.Signers)))); err != nil {
 		return err
 	}
@@ -1144,13 +1144,13 @@ func (t *MultiSigConstructorParams) MarshalCBOR(w io.Writer) error {
 		}
 	}
 
-	// t.t.Required (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.Required)); err != nil {
+	// t.t.Required (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.Required))); err != nil {
 		return err
 	}
 
-	// t.t.UnlockDuration (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.UnlockDuration)); err != nil {
+	// t.t.UnlockDuration (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.UnlockDuration))); err != nil {
 		return err
 	}
 	return nil
@@ -1171,7 +1171,7 @@ func (t *MultiSigConstructorParams) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Signers ([]address.Address)
+	// t.t.Signers ([]address.Address) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1197,7 +1197,7 @@ func (t *MultiSigConstructorParams) UnmarshalCBOR(r io.Reader) error {
 		t.Signers[i] = v
 	}
 
-	// t.t.Required (uint64)
+	// t.t.Required (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1206,8 +1206,8 @@ func (t *MultiSigConstructorParams) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.Required = extra
-	// t.t.UnlockDuration (uint64)
+	t.Required = uint64(extra)
+	// t.t.UnlockDuration (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1216,7 +1216,7 @@ func (t *MultiSigConstructorParams) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.UnlockDuration = extra
+	t.UnlockDuration = uint64(extra)
 	return nil
 }
 
@@ -1229,22 +1229,22 @@ func (t *MultiSigProposeParams) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.To (address.Address)
+	// t.t.To (address.Address) (struct)
 	if err := t.To.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Value (types.BigInt)
+	// t.t.Value (types.BigInt) (struct)
 	if err := t.Value.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Method (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.Method)); err != nil {
+	// t.t.Method (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.Method))); err != nil {
 		return err
 	}
 
-	// t.t.Params ([]uint8)
+	// t.t.Params ([]uint8) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajByteString, uint64(len(t.Params)))); err != nil {
 		return err
 	}
@@ -1269,7 +1269,7 @@ func (t *MultiSigProposeParams) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.To (address.Address)
+	// t.t.To (address.Address) (struct)
 
 	{
 
@@ -1278,7 +1278,7 @@ func (t *MultiSigProposeParams) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Value (types.BigInt)
+	// t.t.Value (types.BigInt) (struct)
 
 	{
 
@@ -1287,7 +1287,7 @@ func (t *MultiSigProposeParams) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Method (uint64)
+	// t.t.Method (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1296,8 +1296,8 @@ func (t *MultiSigProposeParams) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.Method = extra
-	// t.t.Params ([]uint8)
+	t.Method = uint64(extra)
+	// t.t.Params ([]uint8) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1326,8 +1326,8 @@ func (t *MultiSigTxID) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.TxID (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.TxID)); err != nil {
+	// t.t.TxID (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.TxID))); err != nil {
 		return err
 	}
 	return nil
@@ -1348,7 +1348,7 @@ func (t *MultiSigTxID) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.TxID (uint64)
+	// t.t.TxID (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1357,7 +1357,7 @@ func (t *MultiSigTxID) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.TxID = extra
+	t.TxID = uint64(extra)
 	return nil
 }
 
@@ -1370,12 +1370,12 @@ func (t *MultiSigSwapSignerParams) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.From (address.Address)
+	// t.t.From (address.Address) (struct)
 	if err := t.From.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.To (address.Address)
+	// t.t.To (address.Address) (struct)
 	if err := t.To.MarshalCBOR(w); err != nil {
 		return err
 	}
@@ -1397,7 +1397,7 @@ func (t *MultiSigSwapSignerParams) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.From (address.Address)
+	// t.t.From (address.Address) (struct)
 
 	{
 
@@ -1406,7 +1406,7 @@ func (t *MultiSigSwapSignerParams) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.To (address.Address)
+	// t.t.To (address.Address) (struct)
 
 	{
 
@@ -1427,8 +1427,8 @@ func (t *MultiSigChangeReqParams) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Req (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.Req)); err != nil {
+	// t.t.Req (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.Req))); err != nil {
 		return err
 	}
 	return nil
@@ -1449,7 +1449,7 @@ func (t *MultiSigChangeReqParams) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Req (uint64)
+	// t.t.Req (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1458,7 +1458,7 @@ func (t *MultiSigChangeReqParams) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.Req = extra
+	t.Req = uint64(extra)
 	return nil
 }
 
@@ -1471,32 +1471,32 @@ func (t *MTransaction) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Created (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.Created)); err != nil {
+	// t.t.Created (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.Created))); err != nil {
 		return err
 	}
 
-	// t.t.TxID (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.TxID)); err != nil {
+	// t.t.TxID (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.TxID))); err != nil {
 		return err
 	}
 
-	// t.t.To (address.Address)
+	// t.t.To (address.Address) (struct)
 	if err := t.To.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Value (types.BigInt)
+	// t.t.Value (types.BigInt) (struct)
 	if err := t.Value.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Method (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.Method)); err != nil {
+	// t.t.Method (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.Method))); err != nil {
 		return err
 	}
 
-	// t.t.Params ([]uint8)
+	// t.t.Params ([]uint8) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajByteString, uint64(len(t.Params)))); err != nil {
 		return err
 	}
@@ -1504,7 +1504,7 @@ func (t *MTransaction) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Approved ([]address.Address)
+	// t.t.Approved ([]address.Address) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajArray, uint64(len(t.Approved)))); err != nil {
 		return err
 	}
@@ -1514,18 +1514,18 @@ func (t *MTransaction) MarshalCBOR(w io.Writer) error {
 		}
 	}
 
-	// t.t.Complete (bool)
+	// t.t.Complete (bool) (bool)
 	if err := cbg.WriteBool(w, t.Complete); err != nil {
 		return err
 	}
 
-	// t.t.Canceled (bool)
+	// t.t.Canceled (bool) (bool)
 	if err := cbg.WriteBool(w, t.Canceled); err != nil {
 		return err
 	}
 
-	// t.t.RetCode (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.RetCode)); err != nil {
+	// t.t.RetCode (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.RetCode))); err != nil {
 		return err
 	}
 	return nil
@@ -1546,7 +1546,7 @@ func (t *MTransaction) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Created (uint64)
+	// t.t.Created (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1555,8 +1555,8 @@ func (t *MTransaction) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.Created = extra
-	// t.t.TxID (uint64)
+	t.Created = uint64(extra)
+	// t.t.TxID (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1565,8 +1565,8 @@ func (t *MTransaction) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.TxID = extra
-	// t.t.To (address.Address)
+	t.TxID = uint64(extra)
+	// t.t.To (address.Address) (struct)
 
 	{
 
@@ -1575,7 +1575,7 @@ func (t *MTransaction) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Value (types.BigInt)
+	// t.t.Value (types.BigInt) (struct)
 
 	{
 
@@ -1584,7 +1584,7 @@ func (t *MTransaction) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Method (uint64)
+	// t.t.Method (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1593,8 +1593,8 @@ func (t *MTransaction) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.Method = extra
-	// t.t.Params ([]uint8)
+	t.Method = uint64(extra)
+	// t.t.Params ([]uint8) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1611,7 +1611,7 @@ func (t *MTransaction) UnmarshalCBOR(r io.Reader) error {
 	if _, err := io.ReadFull(br, t.Params); err != nil {
 		return err
 	}
-	// t.t.Approved ([]address.Address)
+	// t.t.Approved ([]address.Address) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1637,7 +1637,7 @@ func (t *MTransaction) UnmarshalCBOR(r io.Reader) error {
 		t.Approved[i] = v
 	}
 
-	// t.t.Complete (bool)
+	// t.t.Complete (bool) (bool)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1654,7 +1654,7 @@ func (t *MTransaction) UnmarshalCBOR(r io.Reader) error {
 	default:
 		return fmt.Errorf("booleans are either major type 7, value 20 or 21 (got %d)", extra)
 	}
-	// t.t.Canceled (bool)
+	// t.t.Canceled (bool) (bool)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1671,7 +1671,7 @@ func (t *MTransaction) UnmarshalCBOR(r io.Reader) error {
 	default:
 		return fmt.Errorf("booleans are either major type 7, value 20 or 21 (got %d)", extra)
 	}
-	// t.t.RetCode (uint64)
+	// t.t.RetCode (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1680,7 +1680,7 @@ func (t *MTransaction) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.RetCode = extra
+	t.RetCode = uint64(extra)
 	return nil
 }
 
@@ -1693,12 +1693,12 @@ func (t *MultiSigRemoveSignerParam) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Signer (address.Address)
+	// t.t.Signer (address.Address) (struct)
 	if err := t.Signer.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Decrease (bool)
+	// t.t.Decrease (bool) (bool)
 	if err := cbg.WriteBool(w, t.Decrease); err != nil {
 		return err
 	}
@@ -1720,7 +1720,7 @@ func (t *MultiSigRemoveSignerParam) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Signer (address.Address)
+	// t.t.Signer (address.Address) (struct)
 
 	{
 
@@ -1729,7 +1729,7 @@ func (t *MultiSigRemoveSignerParam) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Decrease (bool)
+	// t.t.Decrease (bool) (bool)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1758,12 +1758,12 @@ func (t *MultiSigAddSignerParam) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Signer (address.Address)
+	// t.t.Signer (address.Address) (struct)
 	if err := t.Signer.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Increase (bool)
+	// t.t.Increase (bool) (bool)
 	if err := cbg.WriteBool(w, t.Increase); err != nil {
 		return err
 	}
@@ -1785,7 +1785,7 @@ func (t *MultiSigAddSignerParam) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Signer (address.Address)
+	// t.t.Signer (address.Address) (struct)
 
 	{
 
@@ -1794,7 +1794,7 @@ func (t *MultiSigAddSignerParam) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Increase (bool)
+	// t.t.Increase (bool) (bool)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1823,32 +1823,32 @@ func (t *PaymentChannelActorState) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.From (address.Address)
+	// t.t.From (address.Address) (struct)
 	if err := t.From.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.To (address.Address)
+	// t.t.To (address.Address) (struct)
 	if err := t.To.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.ToSend (types.BigInt)
+	// t.t.ToSend (types.BigInt) (struct)
 	if err := t.ToSend.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.ClosingAt (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.ClosingAt)); err != nil {
+	// t.t.ClosingAt (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.ClosingAt))); err != nil {
 		return err
 	}
 
-	// t.t.MinCloseHeight (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.MinCloseHeight)); err != nil {
+	// t.t.MinCloseHeight (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.MinCloseHeight))); err != nil {
 		return err
 	}
 
-	// t.t.LaneStates (map[string]*actors.LaneState)
+	// t.t.LaneStates (map[string]*actors.LaneState) (map)
 	if err := cbg.CborWriteHeader(w, cbg.MajMap, uint64(len(t.LaneStates))); err != nil {
 		return err
 	}
@@ -1885,7 +1885,7 @@ func (t *PaymentChannelActorState) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.From (address.Address)
+	// t.t.From (address.Address) (struct)
 
 	{
 
@@ -1894,7 +1894,7 @@ func (t *PaymentChannelActorState) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.To (address.Address)
+	// t.t.To (address.Address) (struct)
 
 	{
 
@@ -1903,7 +1903,7 @@ func (t *PaymentChannelActorState) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.ToSend (types.BigInt)
+	// t.t.ToSend (types.BigInt) (struct)
 
 	{
 
@@ -1912,7 +1912,7 @@ func (t *PaymentChannelActorState) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.ClosingAt (uint64)
+	// t.t.ClosingAt (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1921,8 +1921,8 @@ func (t *PaymentChannelActorState) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.ClosingAt = extra
-	// t.t.MinCloseHeight (uint64)
+	t.ClosingAt = uint64(extra)
+	// t.t.MinCloseHeight (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1931,8 +1931,8 @@ func (t *PaymentChannelActorState) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.MinCloseHeight = extra
-	// t.t.LaneStates (map[string]*actors.LaneState)
+	t.MinCloseHeight = uint64(extra)
+	// t.t.LaneStates (map[string]*actors.LaneState) (map)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1997,7 +1997,7 @@ func (t *PCAConstructorParams) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.To (address.Address)
+	// t.t.To (address.Address) (struct)
 	if err := t.To.MarshalCBOR(w); err != nil {
 		return err
 	}
@@ -2019,7 +2019,7 @@ func (t *PCAConstructorParams) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.To (address.Address)
+	// t.t.To (address.Address) (struct)
 
 	{
 
@@ -2040,18 +2040,18 @@ func (t *LaneState) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Closed (bool)
+	// t.t.Closed (bool) (bool)
 	if err := cbg.WriteBool(w, t.Closed); err != nil {
 		return err
 	}
 
-	// t.t.Redeemed (types.BigInt)
+	// t.t.Redeemed (types.BigInt) (struct)
 	if err := t.Redeemed.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Nonce (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.Nonce)); err != nil {
+	// t.t.Nonce (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.Nonce))); err != nil {
 		return err
 	}
 	return nil
@@ -2072,7 +2072,7 @@ func (t *LaneState) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Closed (bool)
+	// t.t.Closed (bool) (bool)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -2089,7 +2089,7 @@ func (t *LaneState) UnmarshalCBOR(r io.Reader) error {
 	default:
 		return fmt.Errorf("booleans are either major type 7, value 20 or 21 (got %d)", extra)
 	}
-	// t.t.Redeemed (types.BigInt)
+	// t.t.Redeemed (types.BigInt) (struct)
 
 	{
 
@@ -2098,7 +2098,7 @@ func (t *LaneState) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Nonce (uint64)
+	// t.t.Nonce (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -2107,7 +2107,7 @@ func (t *LaneState) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.Nonce = extra
+	t.Nonce = uint64(extra)
 	return nil
 }
 
@@ -2120,12 +2120,12 @@ func (t *PCAUpdateChannelStateParams) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Sv (types.SignedVoucher)
+	// t.t.Sv (types.SignedVoucher) (struct)
 	if err := t.Sv.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Secret ([]uint8)
+	// t.t.Secret ([]uint8) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajByteString, uint64(len(t.Secret)))); err != nil {
 		return err
 	}
@@ -2133,7 +2133,7 @@ func (t *PCAUpdateChannelStateParams) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Proof ([]uint8)
+	// t.t.Proof ([]uint8) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajByteString, uint64(len(t.Proof)))); err != nil {
 		return err
 	}
@@ -2158,7 +2158,7 @@ func (t *PCAUpdateChannelStateParams) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Sv (types.SignedVoucher)
+	// t.t.Sv (types.SignedVoucher) (struct)
 
 	{
 
@@ -2167,7 +2167,7 @@ func (t *PCAUpdateChannelStateParams) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Secret ([]uint8)
+	// t.t.Secret ([]uint8) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -2184,7 +2184,7 @@ func (t *PCAUpdateChannelStateParams) UnmarshalCBOR(r io.Reader) error {
 	if _, err := io.ReadFull(br, t.Secret); err != nil {
 		return err
 	}
-	// t.t.Proof ([]uint8)
+	// t.t.Proof ([]uint8) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -2213,17 +2213,17 @@ func (t *PaymentInfo) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.PayChActor (address.Address)
+	// t.t.PayChActor (address.Address) (struct)
 	if err := t.PayChActor.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Payer (address.Address)
+	// t.t.Payer (address.Address) (struct)
 	if err := t.Payer.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.ChannelMessage (cid.Cid)
+	// t.t.ChannelMessage (cid.Cid) (struct)
 
 	if t.ChannelMessage == nil {
 		if _, err := w.Write(cbg.CborNull); err != nil {
@@ -2235,7 +2235,7 @@ func (t *PaymentInfo) MarshalCBOR(w io.Writer) error {
 		}
 	}
 
-	// t.t.Vouchers ([]*types.SignedVoucher)
+	// t.t.Vouchers ([]*types.SignedVoucher) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajArray, uint64(len(t.Vouchers)))); err != nil {
 		return err
 	}
@@ -2262,7 +2262,7 @@ func (t *PaymentInfo) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.PayChActor (address.Address)
+	// t.t.PayChActor (address.Address) (struct)
 
 	{
 
@@ -2271,7 +2271,7 @@ func (t *PaymentInfo) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Payer (address.Address)
+	// t.t.Payer (address.Address) (struct)
 
 	{
 
@@ -2280,7 +2280,7 @@ func (t *PaymentInfo) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.ChannelMessage (cid.Cid)
+	// t.t.ChannelMessage (cid.Cid) (struct)
 
 	{
 
@@ -2304,7 +2304,7 @@ func (t *PaymentInfo) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Vouchers ([]*types.SignedVoucher)
+	// t.t.Vouchers ([]*types.SignedVoucher) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -2342,18 +2342,18 @@ func (t *StoragePowerState) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Miners (cid.Cid)
+	// t.t.Miners (cid.Cid) (struct)
 
 	if err := cbg.WriteCid(w, t.Miners); err != nil {
 		return xerrors.Errorf("failed to write cid field t.Miners: %w", err)
 	}
 
-	// t.t.MinerCount (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.MinerCount)); err != nil {
+	// t.t.MinerCount (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.MinerCount))); err != nil {
 		return err
 	}
 
-	// t.t.TotalStorage (types.BigInt)
+	// t.t.TotalStorage (types.BigInt) (struct)
 	if err := t.TotalStorage.MarshalCBOR(w); err != nil {
 		return err
 	}
@@ -2375,7 +2375,7 @@ func (t *StoragePowerState) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Miners (cid.Cid)
+	// t.t.Miners (cid.Cid) (struct)
 
 	{
 
@@ -2387,7 +2387,7 @@ func (t *StoragePowerState) UnmarshalCBOR(r io.Reader) error {
 		t.Miners = c
 
 	}
-	// t.t.MinerCount (uint64)
+	// t.t.MinerCount (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -2396,8 +2396,8 @@ func (t *StoragePowerState) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.MinerCount = extra
-	// t.t.TotalStorage (types.BigInt)
+	t.MinerCount = uint64(extra)
+	// t.t.TotalStorage (types.BigInt) (struct)
 
 	{
 
@@ -2418,22 +2418,22 @@ func (t *CreateStorageMinerParams) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Owner (address.Address)
+	// t.t.Owner (address.Address) (struct)
 	if err := t.Owner.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Worker (address.Address)
+	// t.t.Worker (address.Address) (struct)
 	if err := t.Worker.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.SectorSize (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.SectorSize)); err != nil {
+	// t.t.SectorSize (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.SectorSize))); err != nil {
 		return err
 	}
 
-	// t.t.PeerID (peer.ID)
+	// t.t.PeerID (peer.ID) (string)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajTextString, uint64(len(t.PeerID)))); err != nil {
 		return err
 	}
@@ -2458,7 +2458,7 @@ func (t *CreateStorageMinerParams) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Owner (address.Address)
+	// t.t.Owner (address.Address) (struct)
 
 	{
 
@@ -2467,7 +2467,7 @@ func (t *CreateStorageMinerParams) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Worker (address.Address)
+	// t.t.Worker (address.Address) (struct)
 
 	{
 
@@ -2476,7 +2476,7 @@ func (t *CreateStorageMinerParams) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.SectorSize (uint64)
+	// t.t.SectorSize (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -2485,8 +2485,8 @@ func (t *CreateStorageMinerParams) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.SectorSize = extra
-	// t.t.PeerID (peer.ID)
+	t.SectorSize = uint64(extra)
+	// t.t.PeerID (peer.ID) (string)
 
 	{
 		sval, err := cbg.ReadString(br)
@@ -2508,7 +2508,7 @@ func (t *IsMinerParam) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Addr (address.Address)
+	// t.t.Addr (address.Address) (struct)
 	if err := t.Addr.MarshalCBOR(w); err != nil {
 		return err
 	}
@@ -2530,7 +2530,7 @@ func (t *IsMinerParam) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Addr (address.Address)
+	// t.t.Addr (address.Address) (struct)
 
 	{
 
@@ -2551,7 +2551,7 @@ func (t *PowerLookupParams) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Miner (address.Address)
+	// t.t.Miner (address.Address) (struct)
 	if err := t.Miner.MarshalCBOR(w); err != nil {
 		return err
 	}
@@ -2573,7 +2573,7 @@ func (t *PowerLookupParams) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Miner (address.Address)
+	// t.t.Miner (address.Address) (struct)
 
 	{
 
@@ -2594,7 +2594,7 @@ func (t *UpdateStorageParams) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Delta (types.BigInt)
+	// t.t.Delta (types.BigInt) (struct)
 	if err := t.Delta.MarshalCBOR(w); err != nil {
 		return err
 	}
@@ -2616,7 +2616,7 @@ func (t *UpdateStorageParams) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Delta (types.BigInt)
+	// t.t.Delta (types.BigInt) (struct)
 
 	{
 
@@ -2637,12 +2637,12 @@ func (t *ArbitrateConsensusFaultParams) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Block1 (types.BlockHeader)
+	// t.t.Block1 (types.BlockHeader) (struct)
 	if err := t.Block1.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Block2 (types.BlockHeader)
+	// t.t.Block2 (types.BlockHeader) (struct)
 	if err := t.Block2.MarshalCBOR(w); err != nil {
 		return err
 	}
@@ -2664,7 +2664,7 @@ func (t *ArbitrateConsensusFaultParams) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Block1 (types.BlockHeader)
+	// t.t.Block1 (types.BlockHeader) (struct)
 
 	{
 
@@ -2685,7 +2685,7 @@ func (t *ArbitrateConsensusFaultParams) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Block2 (types.BlockHeader)
+	// t.t.Block2 (types.BlockHeader) (struct)
 
 	{
 
@@ -2718,7 +2718,7 @@ func (t *PledgeCollateralParams) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Size (types.BigInt)
+	// t.t.Size (types.BigInt) (struct)
 	if err := t.Size.MarshalCBOR(w); err != nil {
 		return err
 	}
@@ -2740,7 +2740,7 @@ func (t *PledgeCollateralParams) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Size (types.BigInt)
+	// t.t.Size (types.BigInt) (struct)
 
 	{
 
@@ -2761,17 +2761,17 @@ func (t *MinerSlashConsensusFault) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Slasher (address.Address)
+	// t.t.Slasher (address.Address) (struct)
 	if err := t.Slasher.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.AtHeight (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.AtHeight)); err != nil {
+	// t.t.AtHeight (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.AtHeight))); err != nil {
 		return err
 	}
 
-	// t.t.SlashedCollateral (types.BigInt)
+	// t.t.SlashedCollateral (types.BigInt) (struct)
 	if err := t.SlashedCollateral.MarshalCBOR(w); err != nil {
 		return err
 	}
@@ -2793,7 +2793,7 @@ func (t *MinerSlashConsensusFault) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Slasher (address.Address)
+	// t.t.Slasher (address.Address) (struct)
 
 	{
 
@@ -2802,7 +2802,7 @@ func (t *MinerSlashConsensusFault) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.AtHeight (uint64)
+	// t.t.AtHeight (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -2811,8 +2811,8 @@ func (t *MinerSlashConsensusFault) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.AtHeight = extra
-	// t.t.SlashedCollateral (types.BigInt)
+	t.AtHeight = uint64(extra)
+	// t.t.SlashedCollateral (types.BigInt) (struct)
 
 	{
 
@@ -2833,12 +2833,12 @@ func (t *StorageParticipantBalance) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Locked (types.BigInt)
+	// t.t.Locked (types.BigInt) (struct)
 	if err := t.Locked.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Available (types.BigInt)
+	// t.t.Available (types.BigInt) (struct)
 	if err := t.Available.MarshalCBOR(w); err != nil {
 		return err
 	}
@@ -2860,7 +2860,7 @@ func (t *StorageParticipantBalance) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Locked (types.BigInt)
+	// t.t.Locked (types.BigInt) (struct)
 
 	{
 
@@ -2869,7 +2869,7 @@ func (t *StorageParticipantBalance) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Available (types.BigInt)
+	// t.t.Available (types.BigInt) (struct)
 
 	{
 
@@ -2890,20 +2890,20 @@ func (t *StorageMarketState) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Balances (cid.Cid)
+	// t.t.Balances (cid.Cid) (struct)
 
 	if err := cbg.WriteCid(w, t.Balances); err != nil {
 		return xerrors.Errorf("failed to write cid field t.Balances: %w", err)
 	}
 
-	// t.t.Deals (cid.Cid)
+	// t.t.Deals (cid.Cid) (struct)
 
 	if err := cbg.WriteCid(w, t.Deals); err != nil {
 		return xerrors.Errorf("failed to write cid field t.Deals: %w", err)
 	}
 
-	// t.t.NextDealID (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.NextDealID)); err != nil {
+	// t.t.NextDealID (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.NextDealID))); err != nil {
 		return err
 	}
 	return nil
@@ -2924,7 +2924,7 @@ func (t *StorageMarketState) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Balances (cid.Cid)
+	// t.t.Balances (cid.Cid) (struct)
 
 	{
 
@@ -2936,7 +2936,7 @@ func (t *StorageMarketState) UnmarshalCBOR(r io.Reader) error {
 		t.Balances = c
 
 	}
-	// t.t.Deals (cid.Cid)
+	// t.t.Deals (cid.Cid) (struct)
 
 	{
 
@@ -2948,7 +2948,7 @@ func (t *StorageMarketState) UnmarshalCBOR(r io.Reader) error {
 		t.Deals = c
 
 	}
-	// t.t.NextDealID (uint64)
+	// t.t.NextDealID (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -2957,7 +2957,7 @@ func (t *StorageMarketState) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.NextDealID = extra
+	t.NextDealID = uint64(extra)
 	return nil
 }
 
@@ -2970,7 +2970,7 @@ func (t *WithdrawBalanceParams) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Balance (types.BigInt)
+	// t.t.Balance (types.BigInt) (struct)
 	if err := t.Balance.MarshalCBOR(w); err != nil {
 		return err
 	}
@@ -2992,7 +2992,7 @@ func (t *WithdrawBalanceParams) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Balance (types.BigInt)
+	// t.t.Balance (types.BigInt) (struct)
 
 	{
 
@@ -3013,7 +3013,7 @@ func (t *StorageDealProposal) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.PieceRef ([]uint8)
+	// t.t.PieceRef ([]uint8) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajByteString, uint64(len(t.PieceRef)))); err != nil {
 		return err
 	}
@@ -3021,47 +3021,47 @@ func (t *StorageDealProposal) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.PieceSize (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.PieceSize)); err != nil {
+	// t.t.PieceSize (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.PieceSize))); err != nil {
 		return err
 	}
 
-	// t.t.PieceSerialization (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.PieceSerialization)); err != nil {
+	// t.t.PieceSerialization (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.PieceSerialization))); err != nil {
 		return err
 	}
 
-	// t.t.Client (address.Address)
+	// t.t.Client (address.Address) (struct)
 	if err := t.Client.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Provider (address.Address)
+	// t.t.Provider (address.Address) (struct)
 	if err := t.Provider.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.ProposalExpiration (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.ProposalExpiration)); err != nil {
+	// t.t.ProposalExpiration (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.ProposalExpiration))); err != nil {
 		return err
 	}
 
-	// t.t.Duration (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.Duration)); err != nil {
+	// t.t.Duration (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.Duration))); err != nil {
 		return err
 	}
 
-	// t.t.StoragePricePerEpoch (types.BigInt)
+	// t.t.StoragePricePerEpoch (types.BigInt) (struct)
 	if err := t.StoragePricePerEpoch.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.StorageCollateral (types.BigInt)
+	// t.t.StorageCollateral (types.BigInt) (struct)
 	if err := t.StorageCollateral.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.ProposerSignature (types.Signature)
+	// t.t.ProposerSignature (types.Signature) (struct)
 	if err := t.ProposerSignature.MarshalCBOR(w); err != nil {
 		return err
 	}
@@ -3083,7 +3083,7 @@ func (t *StorageDealProposal) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.PieceRef ([]uint8)
+	// t.t.PieceRef ([]uint8) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -3100,7 +3100,7 @@ func (t *StorageDealProposal) UnmarshalCBOR(r io.Reader) error {
 	if _, err := io.ReadFull(br, t.PieceRef); err != nil {
 		return err
 	}
-	// t.t.PieceSize (uint64)
+	// t.t.PieceSize (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -3109,8 +3109,8 @@ func (t *StorageDealProposal) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.PieceSize = extra
-	// t.t.PieceSerialization (uint64)
+	t.PieceSize = uint64(extra)
+	// t.t.PieceSerialization (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -3119,8 +3119,8 @@ func (t *StorageDealProposal) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.PieceSerialization = extra
-	// t.t.Client (address.Address)
+	t.PieceSerialization = uint64(extra)
+	// t.t.Client (address.Address) (struct)
 
 	{
 
@@ -3129,7 +3129,7 @@ func (t *StorageDealProposal) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Provider (address.Address)
+	// t.t.Provider (address.Address) (struct)
 
 	{
 
@@ -3138,7 +3138,7 @@ func (t *StorageDealProposal) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.ProposalExpiration (uint64)
+	// t.t.ProposalExpiration (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -3147,8 +3147,8 @@ func (t *StorageDealProposal) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.ProposalExpiration = extra
-	// t.t.Duration (uint64)
+	t.ProposalExpiration = uint64(extra)
+	// t.t.Duration (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -3157,8 +3157,8 @@ func (t *StorageDealProposal) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.Duration = extra
-	// t.t.StoragePricePerEpoch (types.BigInt)
+	t.Duration = uint64(extra)
+	// t.t.StoragePricePerEpoch (types.BigInt) (struct)
 
 	{
 
@@ -3167,7 +3167,7 @@ func (t *StorageDealProposal) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.StorageCollateral (types.BigInt)
+	// t.t.StorageCollateral (types.BigInt) (struct)
 
 	{
 
@@ -3176,7 +3176,7 @@ func (t *StorageDealProposal) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.ProposerSignature (types.Signature)
+	// t.t.ProposerSignature (types.Signature) (struct)
 
 	{
 
@@ -3209,12 +3209,12 @@ func (t *StorageDeal) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Proposal (actors.StorageDealProposal)
+	// t.t.Proposal (actors.StorageDealProposal) (struct)
 	if err := t.Proposal.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.CounterSignature (types.Signature)
+	// t.t.CounterSignature (types.Signature) (struct)
 	if err := t.CounterSignature.MarshalCBOR(w); err != nil {
 		return err
 	}
@@ -3236,7 +3236,7 @@ func (t *StorageDeal) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Proposal (actors.StorageDealProposal)
+	// t.t.Proposal (actors.StorageDealProposal) (struct)
 
 	{
 
@@ -3245,7 +3245,7 @@ func (t *StorageDeal) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.CounterSignature (types.Signature)
+	// t.t.CounterSignature (types.Signature) (struct)
 
 	{
 
@@ -3278,7 +3278,7 @@ func (t *PublishStorageDealsParams) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Deals ([]actors.StorageDeal)
+	// t.t.Deals ([]actors.StorageDeal) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajArray, uint64(len(t.Deals)))); err != nil {
 		return err
 	}
@@ -3305,7 +3305,7 @@ func (t *PublishStorageDealsParams) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Deals ([]actors.StorageDeal)
+	// t.t.Deals ([]actors.StorageDeal) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -3343,7 +3343,7 @@ func (t *PublishStorageDealResponse) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.DealIDs ([]uint64)
+	// t.t.DealIDs ([]uint64) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajArray, uint64(len(t.DealIDs)))); err != nil {
 		return err
 	}
@@ -3370,7 +3370,7 @@ func (t *PublishStorageDealResponse) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.DealIDs ([]uint64)
+	// t.t.DealIDs ([]uint64) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -3412,7 +3412,7 @@ func (t *ActivateStorageDealsParams) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Deals ([]uint64)
+	// t.t.Deals ([]uint64) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajArray, uint64(len(t.Deals)))); err != nil {
 		return err
 	}
@@ -3439,7 +3439,7 @@ func (t *ActivateStorageDealsParams) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Deals ([]uint64)
+	// t.t.Deals ([]uint64) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -3481,7 +3481,7 @@ func (t *ProcessStorageDealsPaymentParams) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.DealIDs ([]uint64)
+	// t.t.DealIDs ([]uint64) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajArray, uint64(len(t.DealIDs)))); err != nil {
 		return err
 	}
@@ -3508,7 +3508,7 @@ func (t *ProcessStorageDealsPaymentParams) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.DealIDs ([]uint64)
+	// t.t.DealIDs ([]uint64) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -3550,13 +3550,13 @@ func (t *OnChainDeal) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Deal (actors.StorageDeal)
+	// t.t.Deal (actors.StorageDeal) (struct)
 	if err := t.Deal.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.ActivationEpoch (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.ActivationEpoch)); err != nil {
+	// t.t.ActivationEpoch (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.ActivationEpoch))); err != nil {
 		return err
 	}
 	return nil
@@ -3577,7 +3577,7 @@ func (t *OnChainDeal) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Deal (actors.StorageDeal)
+	// t.t.Deal (actors.StorageDeal) (struct)
 
 	{
 
@@ -3586,7 +3586,7 @@ func (t *OnChainDeal) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.ActivationEpoch (uint64)
+	// t.t.ActivationEpoch (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -3595,6 +3595,6 @@ func (t *OnChainDeal) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.ActivationEpoch = extra
+	t.ActivationEpoch = uint64(extra)
 	return nil
 }
diff --git a/chain/deals/cbor_gen.go b/chain/deals/cbor_gen.go
index 40413170c..ec46764f9 100644
--- a/chain/deals/cbor_gen.go
+++ b/chain/deals/cbor_gen.go
@@ -24,7 +24,7 @@ func (t *AskRequest) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Miner (address.Address)
+	// t.t.Miner (address.Address) (struct)
 	if err := t.Miner.MarshalCBOR(w); err != nil {
 		return err
 	}
@@ -46,7 +46,7 @@ func (t *AskRequest) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Miner (address.Address)
+	// t.t.Miner (address.Address) (struct)
 
 	{
 
@@ -67,7 +67,7 @@ func (t *AskResponse) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Ask (types.SignedStorageAsk)
+	// t.t.Ask (types.SignedStorageAsk) (struct)
 	if err := t.Ask.MarshalCBOR(w); err != nil {
 		return err
 	}
@@ -89,7 +89,7 @@ func (t *AskResponse) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Ask (types.SignedStorageAsk)
+	// t.t.Ask (types.SignedStorageAsk) (struct)
 
 	{
 
@@ -122,7 +122,7 @@ func (t *Proposal) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.DealProposal (actors.StorageDealProposal)
+	// t.t.DealProposal (actors.StorageDealProposal) (struct)
 	if err := t.DealProposal.MarshalCBOR(w); err != nil {
 		return err
 	}
@@ -144,7 +144,7 @@ func (t *Proposal) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.DealProposal (actors.StorageDealProposal)
+	// t.t.DealProposal (actors.StorageDealProposal) (struct)
 
 	{
 
@@ -165,12 +165,12 @@ func (t *Response) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.State (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.State)); err != nil {
+	// t.t.State (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.State))); err != nil {
 		return err
 	}
 
-	// t.t.Message (string)
+	// t.t.Message (string) (string)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajTextString, uint64(len(t.Message)))); err != nil {
 		return err
 	}
@@ -178,18 +178,18 @@ func (t *Response) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Proposal (cid.Cid)
+	// t.t.Proposal (cid.Cid) (struct)
 
 	if err := cbg.WriteCid(w, t.Proposal); err != nil {
 		return xerrors.Errorf("failed to write cid field t.Proposal: %w", err)
 	}
 
-	// t.t.StorageDeal (actors.StorageDeal)
+	// t.t.StorageDeal (actors.StorageDeal) (struct)
 	if err := t.StorageDeal.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.PublishMessage (cid.Cid)
+	// t.t.PublishMessage (cid.Cid) (struct)
 
 	if t.PublishMessage == nil {
 		if _, err := w.Write(cbg.CborNull); err != nil {
@@ -201,7 +201,7 @@ func (t *Response) MarshalCBOR(w io.Writer) error {
 		}
 	}
 
-	// t.t.CommitMessage (cid.Cid)
+	// t.t.CommitMessage (cid.Cid) (struct)
 
 	if t.CommitMessage == nil {
 		if _, err := w.Write(cbg.CborNull); err != nil {
@@ -231,7 +231,7 @@ func (t *Response) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.State (uint64)
+	// t.t.State (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -240,8 +240,8 @@ func (t *Response) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.State = extra
-	// t.t.Message (string)
+	t.State = uint64(extra)
+	// t.t.Message (string) (string)
 
 	{
 		sval, err := cbg.ReadString(br)
@@ -251,7 +251,7 @@ func (t *Response) UnmarshalCBOR(r io.Reader) error {
 
 		t.Message = string(sval)
 	}
-	// t.t.Proposal (cid.Cid)
+	// t.t.Proposal (cid.Cid) (struct)
 
 	{
 
@@ -263,7 +263,7 @@ func (t *Response) UnmarshalCBOR(r io.Reader) error {
 		t.Proposal = c
 
 	}
-	// t.t.StorageDeal (actors.StorageDeal)
+	// t.t.StorageDeal (actors.StorageDeal) (struct)
 
 	{
 
@@ -284,7 +284,7 @@ func (t *Response) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.PublishMessage (cid.Cid)
+	// t.t.PublishMessage (cid.Cid) (struct)
 
 	{
 
@@ -308,7 +308,7 @@ func (t *Response) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.CommitMessage (cid.Cid)
+	// t.t.CommitMessage (cid.Cid) (struct)
 
 	{
 
@@ -344,12 +344,12 @@ func (t *SignedResponse) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Response (deals.Response)
+	// t.t.Response (deals.Response) (struct)
 	if err := t.Response.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Signature (types.Signature)
+	// t.t.Signature (types.Signature) (struct)
 	if err := t.Signature.MarshalCBOR(w); err != nil {
 		return err
 	}
@@ -371,7 +371,7 @@ func (t *SignedResponse) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Response (deals.Response)
+	// t.t.Response (deals.Response) (struct)
 
 	{
 
@@ -380,7 +380,7 @@ func (t *SignedResponse) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Signature (types.Signature)
+	// t.t.Signature (types.Signature) (struct)
 
 	{
 
@@ -413,38 +413,38 @@ func (t *ClientDealProposal) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Data (cid.Cid)
+	// t.t.Data (cid.Cid) (struct)
 
 	if err := cbg.WriteCid(w, t.Data); err != nil {
 		return xerrors.Errorf("failed to write cid field t.Data: %w", err)
 	}
 
-	// t.t.PricePerEpoch (types.BigInt)
+	// t.t.PricePerEpoch (types.BigInt) (struct)
 	if err := t.PricePerEpoch.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.ProposalExpiration (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.ProposalExpiration)); err != nil {
+	// t.t.ProposalExpiration (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.ProposalExpiration))); err != nil {
 		return err
 	}
 
-	// t.t.Duration (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.Duration)); err != nil {
+	// t.t.Duration (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.Duration))); err != nil {
 		return err
 	}
 
-	// t.t.ProviderAddress (address.Address)
+	// t.t.ProviderAddress (address.Address) (struct)
 	if err := t.ProviderAddress.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Client (address.Address)
+	// t.t.Client (address.Address) (struct)
 	if err := t.Client.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.MinerID (peer.ID)
+	// t.t.MinerID (peer.ID) (string)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajTextString, uint64(len(t.MinerID)))); err != nil {
 		return err
 	}
@@ -469,7 +469,7 @@ func (t *ClientDealProposal) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Data (cid.Cid)
+	// t.t.Data (cid.Cid) (struct)
 
 	{
 
@@ -481,7 +481,7 @@ func (t *ClientDealProposal) UnmarshalCBOR(r io.Reader) error {
 		t.Data = c
 
 	}
-	// t.t.PricePerEpoch (types.BigInt)
+	// t.t.PricePerEpoch (types.BigInt) (struct)
 
 	{
 
@@ -490,7 +490,7 @@ func (t *ClientDealProposal) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.ProposalExpiration (uint64)
+	// t.t.ProposalExpiration (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -499,8 +499,8 @@ func (t *ClientDealProposal) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.ProposalExpiration = extra
-	// t.t.Duration (uint64)
+	t.ProposalExpiration = uint64(extra)
+	// t.t.Duration (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -509,8 +509,8 @@ func (t *ClientDealProposal) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.Duration = extra
-	// t.t.ProviderAddress (address.Address)
+	t.Duration = uint64(extra)
+	// t.t.ProviderAddress (address.Address) (struct)
 
 	{
 
@@ -519,7 +519,7 @@ func (t *ClientDealProposal) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Client (address.Address)
+	// t.t.Client (address.Address) (struct)
 
 	{
 
@@ -528,7 +528,7 @@ func (t *ClientDealProposal) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.MinerID (peer.ID)
+	// t.t.MinerID (peer.ID) (string)
 
 	{
 		sval, err := cbg.ReadString(br)
@@ -550,23 +550,23 @@ func (t *ClientDeal) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.ProposalCid (cid.Cid)
+	// t.t.ProposalCid (cid.Cid) (struct)
 
 	if err := cbg.WriteCid(w, t.ProposalCid); err != nil {
 		return xerrors.Errorf("failed to write cid field t.ProposalCid: %w", err)
 	}
 
-	// t.t.Proposal (actors.StorageDealProposal)
+	// t.t.Proposal (actors.StorageDealProposal) (struct)
 	if err := t.Proposal.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.State (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.State)); err != nil {
+	// t.t.State (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.State))); err != nil {
 		return err
 	}
 
-	// t.t.Miner (peer.ID)
+	// t.t.Miner (peer.ID) (string)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajTextString, uint64(len(t.Miner)))); err != nil {
 		return err
 	}
@@ -591,7 +591,7 @@ func (t *ClientDeal) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.ProposalCid (cid.Cid)
+	// t.t.ProposalCid (cid.Cid) (struct)
 
 	{
 
@@ -603,7 +603,7 @@ func (t *ClientDeal) UnmarshalCBOR(r io.Reader) error {
 		t.ProposalCid = c
 
 	}
-	// t.t.Proposal (actors.StorageDealProposal)
+	// t.t.Proposal (actors.StorageDealProposal) (struct)
 
 	{
 
@@ -612,7 +612,7 @@ func (t *ClientDeal) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.State (uint64)
+	// t.t.State (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -621,8 +621,8 @@ func (t *ClientDeal) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.State = extra
-	// t.t.Miner (peer.ID)
+	t.State = uint64(extra)
+	// t.t.Miner (peer.ID) (string)
 
 	{
 		sval, err := cbg.ReadString(br)
@@ -644,7 +644,7 @@ func (t *MinerDeal) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Client (peer.ID)
+	// t.t.Client (peer.ID) (string)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajTextString, uint64(len(t.Client)))); err != nil {
 		return err
 	}
@@ -652,35 +652,35 @@ func (t *MinerDeal) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Proposal (actors.StorageDealProposal)
+	// t.t.Proposal (actors.StorageDealProposal) (struct)
 	if err := t.Proposal.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.ProposalCid (cid.Cid)
+	// t.t.ProposalCid (cid.Cid) (struct)
 
 	if err := cbg.WriteCid(w, t.ProposalCid); err != nil {
 		return xerrors.Errorf("failed to write cid field t.ProposalCid: %w", err)
 	}
 
-	// t.t.State (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.State)); err != nil {
+	// t.t.State (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.State))); err != nil {
 		return err
 	}
 
-	// t.t.Ref (cid.Cid)
+	// t.t.Ref (cid.Cid) (struct)
 
 	if err := cbg.WriteCid(w, t.Ref); err != nil {
 		return xerrors.Errorf("failed to write cid field t.Ref: %w", err)
 	}
 
-	// t.t.DealID (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.DealID)); err != nil {
+	// t.t.DealID (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.DealID))); err != nil {
 		return err
 	}
 
-	// t.t.SectorID (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.SectorID)); err != nil {
+	// t.t.SectorID (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.SectorID))); err != nil {
 		return err
 	}
 	return nil
@@ -701,7 +701,7 @@ func (t *MinerDeal) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Client (peer.ID)
+	// t.t.Client (peer.ID) (string)
 
 	{
 		sval, err := cbg.ReadString(br)
@@ -711,7 +711,7 @@ func (t *MinerDeal) UnmarshalCBOR(r io.Reader) error {
 
 		t.Client = peer.ID(sval)
 	}
-	// t.t.Proposal (actors.StorageDealProposal)
+	// t.t.Proposal (actors.StorageDealProposal) (struct)
 
 	{
 
@@ -720,7 +720,7 @@ func (t *MinerDeal) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.ProposalCid (cid.Cid)
+	// t.t.ProposalCid (cid.Cid) (struct)
 
 	{
 
@@ -732,7 +732,7 @@ func (t *MinerDeal) UnmarshalCBOR(r io.Reader) error {
 		t.ProposalCid = c
 
 	}
-	// t.t.State (uint64)
+	// t.t.State (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -741,8 +741,8 @@ func (t *MinerDeal) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.State = extra
-	// t.t.Ref (cid.Cid)
+	t.State = uint64(extra)
+	// t.t.Ref (cid.Cid) (struct)
 
 	{
 
@@ -754,7 +754,7 @@ func (t *MinerDeal) UnmarshalCBOR(r io.Reader) error {
 		t.Ref = c
 
 	}
-	// t.t.DealID (uint64)
+	// t.t.DealID (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -763,8 +763,8 @@ func (t *MinerDeal) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.DealID = extra
-	// t.t.SectorID (uint64)
+	t.DealID = uint64(extra)
+	// t.t.SectorID (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -773,6 +773,6 @@ func (t *MinerDeal) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.SectorID = extra
+	t.SectorID = uint64(extra)
 	return nil
 }
diff --git a/chain/deals/state_store.go b/chain/deals/state_store.go
index ae959146f..cde6240be 100644
--- a/chain/deals/state_store.go
+++ b/chain/deals/state_store.go
@@ -2,6 +2,7 @@ package deals
 
 import (
 	"bytes"
+
 	"github.com/filecoin-project/lotus/lib/cborrpc"
 	"github.com/ipfs/go-cid"
 	"github.com/ipfs/go-datastore"
diff --git a/chain/types/cbor_gen.go b/chain/types/cbor_gen.go
index ab63b28a1..a1a6adf35 100644
--- a/chain/types/cbor_gen.go
+++ b/chain/types/cbor_gen.go
@@ -23,12 +23,12 @@ func (t *BlockHeader) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Miner (address.Address)
+	// t.t.Miner (address.Address) (struct)
 	if err := t.Miner.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Tickets ([]*types.Ticket)
+	// t.t.Tickets ([]*types.Ticket) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajArray, uint64(len(t.Tickets)))); err != nil {
 		return err
 	}
@@ -38,7 +38,7 @@ func (t *BlockHeader) MarshalCBOR(w io.Writer) error {
 		}
 	}
 
-	// t.t.ElectionProof ([]uint8)
+	// t.t.ElectionProof ([]uint8) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajByteString, uint64(len(t.ElectionProof)))); err != nil {
 		return err
 	}
@@ -46,7 +46,7 @@ func (t *BlockHeader) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Parents ([]cid.Cid)
+	// t.t.Parents ([]cid.Cid) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajArray, uint64(len(t.Parents)))); err != nil {
 		return err
 	}
@@ -56,45 +56,45 @@ func (t *BlockHeader) MarshalCBOR(w io.Writer) error {
 		}
 	}
 
-	// t.t.ParentWeight (types.BigInt)
+	// t.t.ParentWeight (types.BigInt) (struct)
 	if err := t.ParentWeight.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Height (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.Height)); err != nil {
+	// t.t.Height (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.Height))); err != nil {
 		return err
 	}
 
-	// t.t.ParentStateRoot (cid.Cid)
+	// t.t.ParentStateRoot (cid.Cid) (struct)
 
 	if err := cbg.WriteCid(w, t.ParentStateRoot); err != nil {
 		return xerrors.Errorf("failed to write cid field t.ParentStateRoot: %w", err)
 	}
 
-	// t.t.ParentMessageReceipts (cid.Cid)
+	// t.t.ParentMessageReceipts (cid.Cid) (struct)
 
 	if err := cbg.WriteCid(w, t.ParentMessageReceipts); err != nil {
 		return xerrors.Errorf("failed to write cid field t.ParentMessageReceipts: %w", err)
 	}
 
-	// t.t.Messages (cid.Cid)
+	// t.t.Messages (cid.Cid) (struct)
 
 	if err := cbg.WriteCid(w, t.Messages); err != nil {
 		return xerrors.Errorf("failed to write cid field t.Messages: %w", err)
 	}
 
-	// t.t.BLSAggregate (types.Signature)
+	// t.t.BLSAggregate (types.Signature) (struct)
 	if err := t.BLSAggregate.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Timestamp (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.Timestamp)); err != nil {
+	// t.t.Timestamp (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.Timestamp))); err != nil {
 		return err
 	}
 
-	// t.t.BlockSig (types.Signature)
+	// t.t.BlockSig (types.Signature) (struct)
 	if err := t.BlockSig.MarshalCBOR(w); err != nil {
 		return err
 	}
@@ -116,7 +116,7 @@ func (t *BlockHeader) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Miner (address.Address)
+	// t.t.Miner (address.Address) (struct)
 
 	{
 
@@ -125,7 +125,7 @@ func (t *BlockHeader) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Tickets ([]*types.Ticket)
+	// t.t.Tickets ([]*types.Ticket) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -151,7 +151,7 @@ func (t *BlockHeader) UnmarshalCBOR(r io.Reader) error {
 		t.Tickets[i] = &v
 	}
 
-	// t.t.ElectionProof ([]uint8)
+	// t.t.ElectionProof ([]uint8) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -168,7 +168,7 @@ func (t *BlockHeader) UnmarshalCBOR(r io.Reader) error {
 	if _, err := io.ReadFull(br, t.ElectionProof); err != nil {
 		return err
 	}
-	// t.t.Parents ([]cid.Cid)
+	// t.t.Parents ([]cid.Cid) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -193,7 +193,7 @@ func (t *BlockHeader) UnmarshalCBOR(r io.Reader) error {
 		t.Parents[i] = c
 	}
 
-	// t.t.ParentWeight (types.BigInt)
+	// t.t.ParentWeight (types.BigInt) (struct)
 
 	{
 
@@ -202,7 +202,7 @@ func (t *BlockHeader) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Height (uint64)
+	// t.t.Height (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -211,8 +211,8 @@ func (t *BlockHeader) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.Height = extra
-	// t.t.ParentStateRoot (cid.Cid)
+	t.Height = uint64(extra)
+	// t.t.ParentStateRoot (cid.Cid) (struct)
 
 	{
 
@@ -224,7 +224,7 @@ func (t *BlockHeader) UnmarshalCBOR(r io.Reader) error {
 		t.ParentStateRoot = c
 
 	}
-	// t.t.ParentMessageReceipts (cid.Cid)
+	// t.t.ParentMessageReceipts (cid.Cid) (struct)
 
 	{
 
@@ -236,7 +236,7 @@ func (t *BlockHeader) UnmarshalCBOR(r io.Reader) error {
 		t.ParentMessageReceipts = c
 
 	}
-	// t.t.Messages (cid.Cid)
+	// t.t.Messages (cid.Cid) (struct)
 
 	{
 
@@ -248,7 +248,7 @@ func (t *BlockHeader) UnmarshalCBOR(r io.Reader) error {
 		t.Messages = c
 
 	}
-	// t.t.BLSAggregate (types.Signature)
+	// t.t.BLSAggregate (types.Signature) (struct)
 
 	{
 
@@ -257,7 +257,7 @@ func (t *BlockHeader) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Timestamp (uint64)
+	// t.t.Timestamp (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -266,8 +266,8 @@ func (t *BlockHeader) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.Timestamp = extra
-	// t.t.BlockSig (types.Signature)
+	t.Timestamp = uint64(extra)
+	// t.t.BlockSig (types.Signature) (struct)
 
 	{
 
@@ -288,7 +288,7 @@ func (t *Ticket) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.VRFProof ([]uint8)
+	// t.t.VRFProof ([]uint8) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajByteString, uint64(len(t.VRFProof)))); err != nil {
 		return err
 	}
@@ -313,7 +313,7 @@ func (t *Ticket) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.VRFProof ([]uint8)
+	// t.t.VRFProof ([]uint8) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -342,42 +342,42 @@ func (t *Message) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.To (address.Address)
+	// t.t.To (address.Address) (struct)
 	if err := t.To.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.From (address.Address)
+	// t.t.From (address.Address) (struct)
 	if err := t.From.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Nonce (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.Nonce)); err != nil {
+	// t.t.Nonce (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.Nonce))); err != nil {
 		return err
 	}
 
-	// t.t.Value (types.BigInt)
+	// t.t.Value (types.BigInt) (struct)
 	if err := t.Value.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.GasPrice (types.BigInt)
+	// t.t.GasPrice (types.BigInt) (struct)
 	if err := t.GasPrice.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.GasLimit (types.BigInt)
+	// t.t.GasLimit (types.BigInt) (struct)
 	if err := t.GasLimit.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Method (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.Method)); err != nil {
+	// t.t.Method (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.Method))); err != nil {
 		return err
 	}
 
-	// t.t.Params ([]uint8)
+	// t.t.Params ([]uint8) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajByteString, uint64(len(t.Params)))); err != nil {
 		return err
 	}
@@ -402,7 +402,7 @@ func (t *Message) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.To (address.Address)
+	// t.t.To (address.Address) (struct)
 
 	{
 
@@ -411,7 +411,7 @@ func (t *Message) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.From (address.Address)
+	// t.t.From (address.Address) (struct)
 
 	{
 
@@ -420,7 +420,7 @@ func (t *Message) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Nonce (uint64)
+	// t.t.Nonce (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -429,8 +429,8 @@ func (t *Message) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.Nonce = extra
-	// t.t.Value (types.BigInt)
+	t.Nonce = uint64(extra)
+	// t.t.Value (types.BigInt) (struct)
 
 	{
 
@@ -439,7 +439,7 @@ func (t *Message) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.GasPrice (types.BigInt)
+	// t.t.GasPrice (types.BigInt) (struct)
 
 	{
 
@@ -448,7 +448,7 @@ func (t *Message) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.GasLimit (types.BigInt)
+	// t.t.GasLimit (types.BigInt) (struct)
 
 	{
 
@@ -457,7 +457,7 @@ func (t *Message) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Method (uint64)
+	// t.t.Method (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -466,8 +466,8 @@ func (t *Message) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.Method = extra
-	// t.t.Params ([]uint8)
+	t.Method = uint64(extra)
+	// t.t.Params ([]uint8) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -496,12 +496,12 @@ func (t *SignedMessage) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Message (types.Message)
+	// t.t.Message (types.Message) (struct)
 	if err := t.Message.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Signature (types.Signature)
+	// t.t.Signature (types.Signature) (struct)
 	if err := t.Signature.MarshalCBOR(w); err != nil {
 		return err
 	}
@@ -523,7 +523,7 @@ func (t *SignedMessage) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Message (types.Message)
+	// t.t.Message (types.Message) (struct)
 
 	{
 
@@ -532,7 +532,7 @@ func (t *SignedMessage) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Signature (types.Signature)
+	// t.t.Signature (types.Signature) (struct)
 
 	{
 
@@ -553,13 +553,13 @@ func (t *MsgMeta) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.BlsMessages (cid.Cid)
+	// t.t.BlsMessages (cid.Cid) (struct)
 
 	if err := cbg.WriteCid(w, t.BlsMessages); err != nil {
 		return xerrors.Errorf("failed to write cid field t.BlsMessages: %w", err)
 	}
 
-	// t.t.SecpkMessages (cid.Cid)
+	// t.t.SecpkMessages (cid.Cid) (struct)
 
 	if err := cbg.WriteCid(w, t.SecpkMessages); err != nil {
 		return xerrors.Errorf("failed to write cid field t.SecpkMessages: %w", err)
@@ -583,7 +583,7 @@ func (t *MsgMeta) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.BlsMessages (cid.Cid)
+	// t.t.BlsMessages (cid.Cid) (struct)
 
 	{
 
@@ -595,7 +595,7 @@ func (t *MsgMeta) UnmarshalCBOR(r io.Reader) error {
 		t.BlsMessages = c
 
 	}
-	// t.t.SecpkMessages (cid.Cid)
+	// t.t.SecpkMessages (cid.Cid) (struct)
 
 	{
 
@@ -619,12 +619,12 @@ func (t *SignedVoucher) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.TimeLock (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.TimeLock)); err != nil {
+	// t.t.TimeLock (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.TimeLock))); err != nil {
 		return err
 	}
 
-	// t.t.SecretPreimage ([]uint8)
+	// t.t.SecretPreimage ([]uint8) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajByteString, uint64(len(t.SecretPreimage)))); err != nil {
 		return err
 	}
@@ -632,32 +632,32 @@ func (t *SignedVoucher) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Extra (types.ModVerifyParams)
+	// t.t.Extra (types.ModVerifyParams) (struct)
 	if err := t.Extra.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Lane (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.Lane)); err != nil {
+	// t.t.Lane (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.Lane))); err != nil {
 		return err
 	}
 
-	// t.t.Nonce (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.Nonce)); err != nil {
+	// t.t.Nonce (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.Nonce))); err != nil {
 		return err
 	}
 
-	// t.t.Amount (types.BigInt)
+	// t.t.Amount (types.BigInt) (struct)
 	if err := t.Amount.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.MinCloseHeight (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.MinCloseHeight)); err != nil {
+	// t.t.MinCloseHeight (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.MinCloseHeight))); err != nil {
 		return err
 	}
 
-	// t.t.Merges ([]types.Merge)
+	// t.t.Merges ([]types.Merge) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajArray, uint64(len(t.Merges)))); err != nil {
 		return err
 	}
@@ -667,7 +667,7 @@ func (t *SignedVoucher) MarshalCBOR(w io.Writer) error {
 		}
 	}
 
-	// t.t.Signature (types.Signature)
+	// t.t.Signature (types.Signature) (struct)
 	if err := t.Signature.MarshalCBOR(w); err != nil {
 		return err
 	}
@@ -689,7 +689,7 @@ func (t *SignedVoucher) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.TimeLock (uint64)
+	// t.t.TimeLock (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -698,8 +698,8 @@ func (t *SignedVoucher) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.TimeLock = extra
-	// t.t.SecretPreimage ([]uint8)
+	t.TimeLock = uint64(extra)
+	// t.t.SecretPreimage ([]uint8) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -716,7 +716,7 @@ func (t *SignedVoucher) UnmarshalCBOR(r io.Reader) error {
 	if _, err := io.ReadFull(br, t.SecretPreimage); err != nil {
 		return err
 	}
-	// t.t.Extra (types.ModVerifyParams)
+	// t.t.Extra (types.ModVerifyParams) (struct)
 
 	{
 
@@ -737,7 +737,7 @@ func (t *SignedVoucher) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Lane (uint64)
+	// t.t.Lane (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -746,8 +746,8 @@ func (t *SignedVoucher) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.Lane = extra
-	// t.t.Nonce (uint64)
+	t.Lane = uint64(extra)
+	// t.t.Nonce (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -756,8 +756,8 @@ func (t *SignedVoucher) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.Nonce = extra
-	// t.t.Amount (types.BigInt)
+	t.Nonce = uint64(extra)
+	// t.t.Amount (types.BigInt) (struct)
 
 	{
 
@@ -766,7 +766,7 @@ func (t *SignedVoucher) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.MinCloseHeight (uint64)
+	// t.t.MinCloseHeight (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -775,8 +775,8 @@ func (t *SignedVoucher) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.MinCloseHeight = extra
-	// t.t.Merges ([]types.Merge)
+	t.MinCloseHeight = uint64(extra)
+	// t.t.Merges ([]types.Merge) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -802,7 +802,7 @@ func (t *SignedVoucher) UnmarshalCBOR(r io.Reader) error {
 		t.Merges[i] = v
 	}
 
-	// t.t.Signature (types.Signature)
+	// t.t.Signature (types.Signature) (struct)
 
 	{
 
@@ -835,17 +835,17 @@ func (t *ModVerifyParams) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Actor (address.Address)
+	// t.t.Actor (address.Address) (struct)
 	if err := t.Actor.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Method (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.Method)); err != nil {
+	// t.t.Method (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.Method))); err != nil {
 		return err
 	}
 
-	// t.t.Data ([]uint8)
+	// t.t.Data ([]uint8) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajByteString, uint64(len(t.Data)))); err != nil {
 		return err
 	}
@@ -870,7 +870,7 @@ func (t *ModVerifyParams) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Actor (address.Address)
+	// t.t.Actor (address.Address) (struct)
 
 	{
 
@@ -879,7 +879,7 @@ func (t *ModVerifyParams) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Method (uint64)
+	// t.t.Method (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -888,8 +888,8 @@ func (t *ModVerifyParams) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.Method = extra
-	// t.t.Data ([]uint8)
+	t.Method = uint64(extra)
+	// t.t.Data ([]uint8) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -918,13 +918,13 @@ func (t *Merge) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Lane (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.Lane)); err != nil {
+	// t.t.Lane (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.Lane))); err != nil {
 		return err
 	}
 
-	// t.t.Nonce (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.Nonce)); err != nil {
+	// t.t.Nonce (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.Nonce))); err != nil {
 		return err
 	}
 	return nil
@@ -945,7 +945,7 @@ func (t *Merge) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Lane (uint64)
+	// t.t.Lane (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -954,8 +954,8 @@ func (t *Merge) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.Lane = extra
-	// t.t.Nonce (uint64)
+	t.Lane = uint64(extra)
+	// t.t.Nonce (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -964,7 +964,7 @@ func (t *Merge) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.Nonce = extra
+	t.Nonce = uint64(extra)
 	return nil
 }
 
@@ -977,24 +977,24 @@ func (t *Actor) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Code (cid.Cid)
+	// t.t.Code (cid.Cid) (struct)
 
 	if err := cbg.WriteCid(w, t.Code); err != nil {
 		return xerrors.Errorf("failed to write cid field t.Code: %w", err)
 	}
 
-	// t.t.Head (cid.Cid)
+	// t.t.Head (cid.Cid) (struct)
 
 	if err := cbg.WriteCid(w, t.Head); err != nil {
 		return xerrors.Errorf("failed to write cid field t.Head: %w", err)
 	}
 
-	// t.t.Nonce (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.Nonce)); err != nil {
+	// t.t.Nonce (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.Nonce))); err != nil {
 		return err
 	}
 
-	// t.t.Balance (types.BigInt)
+	// t.t.Balance (types.BigInt) (struct)
 	if err := t.Balance.MarshalCBOR(w); err != nil {
 		return err
 	}
@@ -1016,7 +1016,7 @@ func (t *Actor) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Code (cid.Cid)
+	// t.t.Code (cid.Cid) (struct)
 
 	{
 
@@ -1028,7 +1028,7 @@ func (t *Actor) UnmarshalCBOR(r io.Reader) error {
 		t.Code = c
 
 	}
-	// t.t.Head (cid.Cid)
+	// t.t.Head (cid.Cid) (struct)
 
 	{
 
@@ -1040,7 +1040,7 @@ func (t *Actor) UnmarshalCBOR(r io.Reader) error {
 		t.Head = c
 
 	}
-	// t.t.Nonce (uint64)
+	// t.t.Nonce (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1049,8 +1049,8 @@ func (t *Actor) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.Nonce = extra
-	// t.t.Balance (types.BigInt)
+	t.Nonce = uint64(extra)
+	// t.t.Balance (types.BigInt) (struct)
 
 	{
 
@@ -1071,12 +1071,12 @@ func (t *MessageReceipt) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.ExitCode (uint8)
+	// t.t.ExitCode (uint8) (uint8)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.ExitCode))); err != nil {
 		return err
 	}
 
-	// t.t.Return ([]uint8)
+	// t.t.Return ([]uint8) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajByteString, uint64(len(t.Return)))); err != nil {
 		return err
 	}
@@ -1084,7 +1084,7 @@ func (t *MessageReceipt) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.GasUsed (types.BigInt)
+	// t.t.GasUsed (types.BigInt) (struct)
 	if err := t.GasUsed.MarshalCBOR(w); err != nil {
 		return err
 	}
@@ -1106,7 +1106,7 @@ func (t *MessageReceipt) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.ExitCode (uint8)
+	// t.t.ExitCode (uint8) (uint8)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1119,7 +1119,7 @@ func (t *MessageReceipt) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("integer in input was too large for uint8 field")
 	}
 	t.ExitCode = uint8(extra)
-	// t.t.Return ([]uint8)
+	// t.t.Return ([]uint8) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1136,7 +1136,7 @@ func (t *MessageReceipt) UnmarshalCBOR(r io.Reader) error {
 	if _, err := io.ReadFull(br, t.Return); err != nil {
 		return err
 	}
-	// t.t.GasUsed (types.BigInt)
+	// t.t.GasUsed (types.BigInt) (struct)
 
 	{
 
@@ -1157,12 +1157,12 @@ func (t *BlockMsg) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Header (types.BlockHeader)
+	// t.t.Header (types.BlockHeader) (struct)
 	if err := t.Header.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.BlsMessages ([]cid.Cid)
+	// t.t.BlsMessages ([]cid.Cid) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajArray, uint64(len(t.BlsMessages)))); err != nil {
 		return err
 	}
@@ -1172,7 +1172,7 @@ func (t *BlockMsg) MarshalCBOR(w io.Writer) error {
 		}
 	}
 
-	// t.t.SecpkMessages ([]cid.Cid)
+	// t.t.SecpkMessages ([]cid.Cid) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajArray, uint64(len(t.SecpkMessages)))); err != nil {
 		return err
 	}
@@ -1199,7 +1199,7 @@ func (t *BlockMsg) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Header (types.BlockHeader)
+	// t.t.Header (types.BlockHeader) (struct)
 
 	{
 
@@ -1220,7 +1220,7 @@ func (t *BlockMsg) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.BlsMessages ([]cid.Cid)
+	// t.t.BlsMessages ([]cid.Cid) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1245,7 +1245,7 @@ func (t *BlockMsg) UnmarshalCBOR(r io.Reader) error {
 		t.BlsMessages[i] = c
 	}
 
-	// t.t.SecpkMessages ([]cid.Cid)
+	// t.t.SecpkMessages ([]cid.Cid) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1282,12 +1282,12 @@ func (t *SignedStorageAsk) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Ask (types.StorageAsk)
+	// t.t.Ask (types.StorageAsk) (struct)
 	if err := t.Ask.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Signature (types.Signature)
+	// t.t.Signature (types.Signature) (struct)
 	if err := t.Signature.MarshalCBOR(w); err != nil {
 		return err
 	}
@@ -1309,7 +1309,7 @@ func (t *SignedStorageAsk) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Ask (types.StorageAsk)
+	// t.t.Ask (types.StorageAsk) (struct)
 
 	{
 
@@ -1330,7 +1330,7 @@ func (t *SignedStorageAsk) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Signature (types.Signature)
+	// t.t.Signature (types.Signature) (struct)
 
 	{
 
@@ -1363,33 +1363,33 @@ func (t *StorageAsk) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Price (types.BigInt)
+	// t.t.Price (types.BigInt) (struct)
 	if err := t.Price.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.MinPieceSize (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.MinPieceSize)); err != nil {
+	// t.t.MinPieceSize (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.MinPieceSize))); err != nil {
 		return err
 	}
 
-	// t.t.Miner (address.Address)
+	// t.t.Miner (address.Address) (struct)
 	if err := t.Miner.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Timestamp (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.Timestamp)); err != nil {
+	// t.t.Timestamp (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.Timestamp))); err != nil {
 		return err
 	}
 
-	// t.t.Expiry (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.Expiry)); err != nil {
+	// t.t.Expiry (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.Expiry))); err != nil {
 		return err
 	}
 
-	// t.t.SeqNo (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.SeqNo)); err != nil {
+	// t.t.SeqNo (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.SeqNo))); err != nil {
 		return err
 	}
 	return nil
@@ -1410,7 +1410,7 @@ func (t *StorageAsk) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Price (types.BigInt)
+	// t.t.Price (types.BigInt) (struct)
 
 	{
 
@@ -1419,7 +1419,7 @@ func (t *StorageAsk) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.MinPieceSize (uint64)
+	// t.t.MinPieceSize (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1428,8 +1428,8 @@ func (t *StorageAsk) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.MinPieceSize = extra
-	// t.t.Miner (address.Address)
+	t.MinPieceSize = uint64(extra)
+	// t.t.Miner (address.Address) (struct)
 
 	{
 
@@ -1438,7 +1438,7 @@ func (t *StorageAsk) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Timestamp (uint64)
+	// t.t.Timestamp (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1447,8 +1447,8 @@ func (t *StorageAsk) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.Timestamp = extra
-	// t.t.Expiry (uint64)
+	t.Timestamp = uint64(extra)
+	// t.t.Expiry (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1457,8 +1457,8 @@ func (t *StorageAsk) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.Expiry = extra
-	// t.t.SeqNo (uint64)
+	t.Expiry = uint64(extra)
+	// t.t.SeqNo (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -1467,6 +1467,6 @@ func (t *StorageAsk) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.SeqNo = extra
+	t.SeqNo = uint64(extra)
 	return nil
 }
diff --git a/chain/types/voucher.go b/chain/types/voucher.go
index 7855b21a2..1cb68406c 100644
--- a/chain/types/voucher.go
+++ b/chain/types/voucher.go
@@ -5,6 +5,7 @@ import (
 	"encoding/base64"
 
 	"github.com/filecoin-project/lotus/chain/address"
+	cborrpc "github.com/filecoin-project/lotus/lib/cborrpc"
 	cbor "github.com/ipfs/go-ipld-cbor"
 )
 
@@ -46,13 +47,13 @@ func (sv *SignedVoucher) EncodedString() (string, error) {
 func (sv *SignedVoucher) Equals(other *SignedVoucher) bool {
 	// TODO: make this less bad
 
-	selfB, err := cbor.DumpObject(sv)
+	selfB, err := cborrpc.Dump(sv)
 	if err != nil {
 		log.Errorf("SignedVoucher.Equals: dump self: %s", err)
 		return false
 	}
 
-	otherB, err := cbor.DumpObject(other)
+	otherB, err := cborrpc.Dump(other)
 	if err != nil {
 		log.Errorf("SignedVoucher.Equals: dump other: %s", err)
 		return false
diff --git a/gen/main.go b/gen/main.go
index f7b4c68ef..f274e4430 100644
--- a/gen/main.go
+++ b/gen/main.go
@@ -6,10 +6,12 @@ import (
 
 	gen "github.com/whyrusleeping/cbor-gen"
 
+	"github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/deals"
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/lotus/paych"
+	"github.com/filecoin-project/lotus/retrieval"
 )
 
 func main() {
@@ -42,6 +44,29 @@ func main() {
 		os.Exit(1)
 	}
 
+	err = gen.WriteTupleEncodersToFile("./api/cbor_gen.go", "api",
+		api.PaymentInfo{},
+	)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	err = gen.WriteTupleEncodersToFile("./retrieval/cbor_gen.go", "retrieval",
+		retrieval.RetParams{},
+
+		retrieval.Query{},
+		retrieval.QueryResponse{},
+		retrieval.Unixfs0Offer{},
+		retrieval.DealProposal{},
+		retrieval.DealResponse{},
+		retrieval.Block{},
+	)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
 	/*
 		err = gen.WriteTupleEncodersToFile("./chain/cbor_gen.go", "chain",
 			chain.BlockSyncRequest{},
diff --git a/go.mod b/go.mod
index 4ad2e0779..da117bec0 100644
--- a/go.mod
+++ b/go.mod
@@ -73,7 +73,7 @@ require (
 	github.com/polydawn/refmt v0.0.0-20190809202753-05966cbd336a
 	github.com/stretchr/testify v1.4.0
 	github.com/whyrusleeping/bencher v0.0.0-20190829221104-bb6607aa8bba
-	github.com/whyrusleeping/cbor-gen v0.0.0-20191104184210-9aa3672a465c
+	github.com/whyrusleeping/cbor-gen v0.0.0-20191104210213-4418c8842f0f
 	github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7
 	github.com/whyrusleeping/pubsub v0.0.0-20131020042734-02de8aa2db3d
 	go.opencensus.io v0.22.0
@@ -84,7 +84,7 @@ require (
 	go.uber.org/zap v1.10.0
 	go4.org v0.0.0-20190313082347-94abd6928b1d // indirect
 	golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 // indirect
-	golang.org/x/time v0.0.0-20181108054448-85acf8d2951c
+	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
 	golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7
 	google.golang.org/api v0.9.0 // indirect
 	gopkg.in/cheggaaa/pb.v1 v1.0.28
diff --git a/go.sum b/go.sum
index 518e5e1eb..28d6ded71 100644
--- a/go.sum
+++ b/go.sum
@@ -78,6 +78,7 @@ github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFP
 github.com/fatih/color v1.6.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/fd/go-nat v1.0.0/go.mod h1:BTBu/CKvMmOMUPkKVef1pngt2WFH/lg7E6yQnulfp6E=
 github.com/filecoin-project/go-amt-ipld v0.0.0-20190919045431-3650716fff16 h1:NzojcJU1VbS6zdLG13JMYis/cQy/MrN3rxmZRq56jKA=
 github.com/filecoin-project/go-amt-ipld v0.0.0-20190919045431-3650716fff16/go.mod h1:lKjJYPg2kwbav5f78i5YA8kGccnZn18IySbpneXvaQs=
 github.com/filecoin-project/go-leb128 v0.0.0-20190212224330-8d79a5489543 h1:aMJGfgqe1QDhAVwxRg5fjCRF533xHidiKsugk7Vvzug=
@@ -166,6 +167,7 @@ github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoA
 github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE=
 github.com/gxed/hashland/keccakpg v0.0.1/go.mod h1:kRzw3HkwxFU1mpmPP8v1WyQzwdGfmKFJ6tItnhQ67kU=
 github.com/gxed/hashland/murmur3 v0.0.1/go.mod h1:KjXop02n4/ckmZSnY2+HKcLud/tcmvhST0bie/0lS48=
+github.com/gxed/pubsub v0.0.0-20180201040156-26ebdf44f824/go.mod h1:OiEWyHgK+CWrmOlVquHaIK1vhpUJydC9m0Je6mhaiNE=
 github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uPribsnS6o=
@@ -178,6 +180,7 @@ github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce/go.mod h1:oZtUIOe8dh
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/huin/goupnp v0.0.0-20180415215157-1395d1447324/go.mod h1:MZ2ZmwcBpvOoJ22IJsc7va19ZwoheaBk43rKg12SKag=
 github.com/huin/goupnp v1.0.0 h1:wg75sLpL6DZqwHQN6E1Cfk6mtfzS45z8OV+ic+DtHRo=
 github.com/huin/goupnp v1.0.0/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7Bnc=
 github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o=
@@ -187,6 +190,7 @@ github.com/influxdata/influxdb1-client v0.0.0-20190809212627-fc22c7df067e/go.mod
 github.com/ipfs/bbloom v0.0.1/go.mod h1:oqo8CVWsJFMOZqTglBG4wydCE4IQA/G2/SEofB0rjUI=
 github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
 github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
+github.com/ipfs/go-bitswap v0.0.1/go.mod h1:z+tP3h+HTJ810n1R5yMy2ccKFffJ2F6Vqm/5Bf7vs2c=
 github.com/ipfs/go-bitswap v0.1.0/go.mod h1:FFJEf18E9izuCqUtHxbWEvq+reg7o4CW5wSAE1wsxj0=
 github.com/ipfs/go-bitswap v0.1.2/go.mod h1:qxSWS4NXGs7jQ6zQvoPY3+NmOfHHG47mhkiLzBpJQIs=
 github.com/ipfs/go-bitswap v0.1.3/go.mod h1:YEQlFy0kkxops5Vy+OxWdRSEZIoS7I7KDIwoa5Chkps=
@@ -196,12 +200,15 @@ github.com/ipfs/go-bitswap v0.1.8/go.mod h1:TOWoxllhccevbWFUR2N7B1MTSVVge1s6XSMi
 github.com/ipfs/go-block-format v0.0.1/go.mod h1:DK/YYcsSUIVAFNwo/KZCdIIbpN0ROH/baNLgayt4pFc=
 github.com/ipfs/go-block-format v0.0.2 h1:qPDvcP19izTjU8rgo6p7gTXZlkMkF5bz5G3fqIsSCPE=
 github.com/ipfs/go-block-format v0.0.2/go.mod h1:AWR46JfpcObNfg3ok2JHDUfdiHRgWhJgCQF+KIgOPJY=
+github.com/ipfs/go-blockservice v0.0.1/go.mod h1:2Ao89U7jV1KIqqNk5EdhSTBG/Pgc1vMFr0bhkx376j4=
 github.com/ipfs/go-blockservice v0.1.0/go.mod h1:hzmMScl1kXHg3M2BjTymbVPjv627N7sYcvYaKbop39M=
 github.com/ipfs/go-blockservice v0.1.2/go.mod h1:t+411r7psEUhLueM8C7aPA7cxCclv4O3VsUVxt9kz2I=
 github.com/ipfs/go-blockservice v0.1.3-0.20190908200855-f22eea50656c h1:lN5IQA07VtLiTLAp/Scezp1ljFhXErC6yq4O1cu+yJ0=
 github.com/ipfs/go-blockservice v0.1.3-0.20190908200855-f22eea50656c/go.mod h1:t+411r7psEUhLueM8C7aPA7cxCclv4O3VsUVxt9kz2I=
 github.com/ipfs/go-car v0.0.0-20190823083746-79984a8632b4 h1:qYLz/x/d1SOiiFGS8dwCBCFJ5Oh64Y8HMBrS+MbaU8c=
 github.com/ipfs/go-car v0.0.0-20190823083746-79984a8632b4/go.mod h1:NSSM0pxlhej9rSFXQmB/lDru7TYNoDjKgmvqzlsd06Y=
+github.com/ipfs/go-car v0.0.1 h1:Nn3RjJbysnDud4wILAybzOAvzsaycrCoKM4BMIK0Y04=
+github.com/ipfs/go-car v0.0.1/go.mod h1:pUz3tUIpudsTch0ZQrEPOvNUBT1LufCXg8aZ4KOrEMM=
 github.com/ipfs/go-cid v0.0.1/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
 github.com/ipfs/go-cid v0.0.2/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
 github.com/ipfs/go-cid v0.0.3 h1:UIAh32wymBpStoe83YCzwVQQ5Oy/H0FdxvUS6DJDzms=
@@ -242,14 +249,17 @@ github.com/ipfs/go-ipfs-exchange-offline v0.0.1/go.mod h1:WhHSFCVYX36H/anEKQboAz
 github.com/ipfs/go-ipfs-files v0.0.3/go.mod h1:INEFm0LL2LWXBhNJ2PMIIb2w45hpXgPjNoE7yA8Y1d4=
 github.com/ipfs/go-ipfs-files v0.0.4 h1:WzRCivcybUQch/Qh6v8LBRhKtRsjnwyiuOV09mK7mrE=
 github.com/ipfs/go-ipfs-files v0.0.4/go.mod h1:INEFm0LL2LWXBhNJ2PMIIb2w45hpXgPjNoE7yA8Y1d4=
+github.com/ipfs/go-ipfs-flags v0.0.1/go.mod h1:RnXBb9WV53GSfTrSDVK61NLTFKvWc60n+K9EgCDh+rA=
 github.com/ipfs/go-ipfs-posinfo v0.0.1 h1:Esoxj+1JgSjX0+ylc0hUmJCOv6V2vFoZiETLR6OtpRs=
 github.com/ipfs/go-ipfs-posinfo v0.0.1/go.mod h1:SwyeVP+jCwiDu0C313l/8jg6ZxM0qqtlt2a0vILTc1A=
 github.com/ipfs/go-ipfs-pq v0.0.1 h1:zgUotX8dcAB/w/HidJh1zzc1yFq6Vm8J7T2F4itj/RU=
 github.com/ipfs/go-ipfs-pq v0.0.1/go.mod h1:LWIqQpqfRG3fNc5XsnIhz/wQ2XXGyugQwls7BgUmUfY=
+github.com/ipfs/go-ipfs-routing v0.0.1/go.mod h1:k76lf20iKFxQTjcJokbPM9iBXVXVZhcOwc360N4nuKs=
 github.com/ipfs/go-ipfs-routing v0.1.0 h1:gAJTT1cEeeLj6/DlLX6t+NxD9fQe2ymTO6qWRDI/HQQ=
 github.com/ipfs/go-ipfs-routing v0.1.0/go.mod h1:hYoUkJLyAUKhF58tysKpids8RNDPO42BVMgK5dNsoqY=
 github.com/ipfs/go-ipfs-util v0.0.1 h1:Wz9bL2wB2YBJqggkA4dD7oSmqB4cAnpNbGrlHJulv50=
 github.com/ipfs/go-ipfs-util v0.0.1/go.mod h1:spsl5z8KUnrve+73pOhSVZND1SIxPW5RyBCNzQxlJBc=
+github.com/ipfs/go-ipld-cbor v0.0.1/go.mod h1:RXHr8s4k0NE0TKhnrxqZC9M888QfsBN9rhS5NjfKzY8=
 github.com/ipfs/go-ipld-cbor v0.0.2/go.mod h1:wTBtrQZA3SoFKMVkp6cn6HMRteIB1VsmHA0AQFOn7Nc=
 github.com/ipfs/go-ipld-cbor v0.0.3 h1:ENsxvybwkmke7Z/QJOmeJfoguj6GH3Y0YOaGrfy9Q0I=
 github.com/ipfs/go-ipld-cbor v0.0.3/go.mod h1:wTBtrQZA3SoFKMVkp6cn6HMRteIB1VsmHA0AQFOn7Nc=
@@ -259,6 +269,7 @@ github.com/ipfs/go-ipld-format v0.0.2/go.mod h1:4B6+FM2u9OJ9zCV+kSbgFAZlOrv1Hqbf
 github.com/ipfs/go-log v0.0.1/go.mod h1:kL1d2/hzSpI0thNYjiKfjanbVNU+IIGA/WnNESY9leM=
 github.com/ipfs/go-log v0.0.2-0.20190920042044-a609c1ae5144 h1:5WM8S1nwquWQ3zEuNhK82NE5Di6Pd41qz9JxxvxTAIA=
 github.com/ipfs/go-log v0.0.2-0.20190920042044-a609c1ae5144/go.mod h1:azGN5dH7ailfREknDDNYB0Eq4qZ/4I4Y3gO0ivjJNyM=
+github.com/ipfs/go-merkledag v0.0.1/go.mod h1:CRdtHMROECqaehAGeJ0Wd9TtlmWv/ta5cUnvbTnniEI=
 github.com/ipfs/go-merkledag v0.1.0/go.mod h1:SQiXrtSts3KGNmgOzMICy5c0POOpUNQLvB3ClKnBAlk=
 github.com/ipfs/go-merkledag v0.2.3 h1:aMdkK9G1hEeNvn3VXfiEMLY0iJnbiQQUHnM0HFJREsE=
 github.com/ipfs/go-merkledag v0.2.3/go.mod h1:SQiXrtSts3KGNmgOzMICy5c0POOpUNQLvB3ClKnBAlk=
@@ -275,6 +286,7 @@ github.com/ipfs/go-verifcid v0.0.1 h1:m2HI7zIuR5TFyQ1b79Da5N9dnnCP1vcu2QqawmWlK2
 github.com/ipfs/go-verifcid v0.0.1/go.mod h1:5Hrva5KBeIog4A+UpqlaIU+DEstipcJYQQZc0g37pY0=
 github.com/ipsn/go-secp256k1 v0.0.0-20180726113642-9d62b9f0bc52 h1:QG4CGBqCeuBo6aZlGAamSkxWdgWfZGeE49eUOWJPA4c=
 github.com/ipsn/go-secp256k1 v0.0.0-20180726113642-9d62b9f0bc52/go.mod h1:fdg+/X9Gg4AsAIzWpEHwnqd+QY3b7lajxyjE1m4hkq4=
+github.com/jackpal/gateway v1.0.4/go.mod h1:lTpwd4ACLXmpyiCTRtfiNyVnUmqT9RivzCDQetPfnjA=
 github.com/jackpal/gateway v1.0.5 h1:qzXWUJfuMdlLMtt0a3Dgt+xkWQiA5itDEITVJtuSwMc=
 github.com/jackpal/gateway v1.0.5/go.mod h1:lTpwd4ACLXmpyiCTRtfiNyVnUmqT9RivzCDQetPfnjA=
 github.com/jackpal/go-nat-pmp v1.0.1 h1:i0LektDkO1QlrTm/cSuP+PyBCDnYvjPLGl4LdWEMiaA=
@@ -321,6 +333,8 @@ github.com/libp2p/go-addr-util v0.0.1/go.mod h1:4ac6O7n9rIAKB1dnd+s8IbbMXkt+oBpz
 github.com/libp2p/go-buffer-pool v0.0.1/go.mod h1:xtyIz9PMobb13WaxR6Zo1Pd1zXJKYg0a8KiIvDp3TzQ=
 github.com/libp2p/go-buffer-pool v0.0.2 h1:QNK2iAFa8gjAe1SPz6mHSMuCcjs+X1wlHzeOSqcmlfs=
 github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM=
+github.com/libp2p/go-conn-security v0.0.1/go.mod h1:bGmu51N0KU9IEjX7kl2PQjgZa40JQWnayTvNMgD/vyk=
+github.com/libp2p/go-conn-security-multistream v0.0.1/go.mod h1:nc9vud7inQ+d6SO0I/6dSWrdMnHnzZNHeyUQqrAJulE=
 github.com/libp2p/go-conn-security-multistream v0.1.0 h1:aqGmto+ttL/uJgX0JtQI0tD21CIEy5eYd1Hlp0juHY0=
 github.com/libp2p/go-conn-security-multistream v0.1.0/go.mod h1:aw6eD7LOsHEX7+2hJkDxw1MteijaVcI+/eP2/x3J1xc=
 github.com/libp2p/go-eventbus v0.0.2/go.mod h1:Hr/yGlwxA/stuLnpMiu82lpNKpvRy3EaJxPu40XYOwk=
@@ -328,15 +342,19 @@ github.com/libp2p/go-eventbus v0.1.0 h1:mlawomSAjjkk97QnYiEmHsLu7E136+2oCWSHRUvM
 github.com/libp2p/go-eventbus v0.1.0/go.mod h1:vROgu5cs5T7cv7POWlWxBaVLxfSegC5UGQf8A2eEmx4=
 github.com/libp2p/go-flow-metrics v0.0.1 h1:0gxuFd2GuK7IIP5pKljLwps6TvcuYgvG7Atqi3INF5s=
 github.com/libp2p/go-flow-metrics v0.0.1/go.mod h1:Iv1GH0sG8DtYN3SVJ2eG221wMiNpZxBdp967ls1g+k8=
+github.com/libp2p/go-libp2p v0.0.1/go.mod h1:bmRs8I0vwn6iRaVssZnJx/epY6WPSKiLoK1vyle4EX0=
 github.com/libp2p/go-libp2p v0.1.0/go.mod h1:6D/2OBauqLUoqcADOJpn9WbKqvaM07tDw68qHM0BxUM=
 github.com/libp2p/go-libp2p v0.1.1/go.mod h1:I00BRo1UuUSdpuc8Q2mN7yDF/oTUTRAX6JWpTiK9Rp8=
 github.com/libp2p/go-libp2p v0.3.0 h1:XhYEJKmIdi4U4Zbie/ym9k6lqgg3PHM2stGS/cOUDWk=
 github.com/libp2p/go-libp2p v0.3.0/go.mod h1:J7DPB1+zB5VLc8v/kKSD8+u2cbyIGI0Dh/Pf3Wprt+0=
+github.com/libp2p/go-libp2p-autonat v0.0.1/go.mod h1:fs71q5Xk+pdnKU014o2iq1RhMs9/PMaG5zXRFNnIIT4=
 github.com/libp2p/go-libp2p-autonat v0.1.0 h1:aCWAu43Ri4nU0ZPO7NyLzUvvfqd0nE3dX0R/ZGYVgOU=
 github.com/libp2p/go-libp2p-autonat v0.1.0/go.mod h1:1tLf2yXxiE/oKGtDwPYWTSYG3PtvYlJmg7NeVtPRqH8=
+github.com/libp2p/go-libp2p-blankhost v0.0.1/go.mod h1:Ibpbw/7cPPYwFb7PACIWdvxxv0t0XCCI10t7czjAjTc=
 github.com/libp2p/go-libp2p-blankhost v0.1.1/go.mod h1:pf2fvdLJPsC1FsVrNP3DUUvMzUts2dsLLBEpo1vW1ro=
 github.com/libp2p/go-libp2p-blankhost v0.1.3 h1:0KycuXvPDhmehw0ASsg+s1o3IfXgCUDqfzAl94KEBOg=
 github.com/libp2p/go-libp2p-blankhost v0.1.3/go.mod h1:KML1//wiKR8vuuJO0y3LUd1uLv+tlkGTAr3jC0S5cLg=
+github.com/libp2p/go-libp2p-circuit v0.0.1/go.mod h1:Dqm0s/BiV63j8EEAs8hr1H5HudqvCAeXxDyic59lCwE=
 github.com/libp2p/go-libp2p-circuit v0.1.0/go.mod h1:Ahq4cY3V9VJcHcn1SBXjr78AbFkZeIRmfunbA7pmFh8=
 github.com/libp2p/go-libp2p-circuit v0.1.1 h1:eopfG9fAg6rEHWQO1TSrLosXDgYbbbu/RTva/tBANus=
 github.com/libp2p/go-libp2p-circuit v0.1.1/go.mod h1:Ahq4cY3V9VJcHcn1SBXjr78AbFkZeIRmfunbA7pmFh8=
@@ -350,44 +368,61 @@ github.com/libp2p/go-libp2p-core v0.0.6/go.mod h1:0d9xmaYAVY5qmbp/fcgxHT3ZJsLjYe
 github.com/libp2p/go-libp2p-core v0.2.0/go.mod h1:X0eyB0Gy93v0DZtSYbEM7RnMChm9Uv3j7yRXjO77xSI=
 github.com/libp2p/go-libp2p-core v0.2.2 h1:Sv1ggdoMx9c7v7FOFkR7agraHCnAgqYsXrU1ARSRUMs=
 github.com/libp2p/go-libp2p-core v0.2.2/go.mod h1:8fcwTbsG2B+lTgRJ1ICZtiM5GWCWZVoVrLaDRvIRng0=
+github.com/libp2p/go-libp2p-crypto v0.0.1/go.mod h1:yJkNyDmO341d5wwXxDUGO0LykUVT72ImHNUqh5D/dBE=
 github.com/libp2p/go-libp2p-crypto v0.1.0 h1:k9MFy+o2zGDNGsaoZl0MA3iZ75qXxr9OOoAZF+sD5OQ=
 github.com/libp2p/go-libp2p-crypto v0.1.0/go.mod h1:sPUokVISZiy+nNuTTH/TY+leRSxnFj/2GLjtOTW90hI=
+github.com/libp2p/go-libp2p-discovery v0.0.1/go.mod h1:ZkkF9xIFRLA1xCc7bstYFkd80gBGK8Fc1JqGoU2i+zI=
 github.com/libp2p/go-libp2p-discovery v0.1.0 h1:j+R6cokKcGbnZLf4kcNwpx6mDEUPF3N6SrqMymQhmvs=
 github.com/libp2p/go-libp2p-discovery v0.1.0/go.mod h1:4F/x+aldVHjHDHuX85x1zWoFTGElt8HnoDzwkFZm29g=
+github.com/libp2p/go-libp2p-host v0.0.1/go.mod h1:qWd+H1yuU0m5CwzAkvbSjqKairayEHdR5MMl7Cwa7Go=
+github.com/libp2p/go-libp2p-interface-connmgr v0.0.1/go.mod h1:GarlRLH0LdeWcLnYM/SaBykKFl9U5JFnbBGruAk/D5k=
+github.com/libp2p/go-libp2p-interface-pnet v0.0.1/go.mod h1:el9jHpQAXK5dnTpKA4yfCNBZXvrzdOU75zz+C6ryp3k=
 github.com/libp2p/go-libp2p-kad-dht v0.1.1 h1:IH6NQuoUv5w5e1O8Jc3KyVDtr0rNd0G9aaADpLI1xVo=
 github.com/libp2p/go-libp2p-kad-dht v0.1.1/go.mod h1:1kj2Rk5pX3/0RwqMm9AMNCT7DzcMHYhgDN5VTi+cY0M=
 github.com/libp2p/go-libp2p-kbucket v0.2.0 h1:FB2a0VkOTNGTP5gu/I444u4WabNM9V1zCkQcWb7zajI=
 github.com/libp2p/go-libp2p-kbucket v0.2.0/go.mod h1:JNymBToym3QXKBMKGy3m29+xprg0EVr/GJFHxFEdgh8=
+github.com/libp2p/go-libp2p-loggables v0.0.1/go.mod h1:lDipDlBNYbpyqyPX/KcoO+eq0sJYEVR2JgOexcivchg=
 github.com/libp2p/go-libp2p-loggables v0.1.0 h1:h3w8QFfCt2UJl/0/NW4K829HX/0S4KD31PQ7m8UXXO8=
 github.com/libp2p/go-libp2p-loggables v0.1.0/go.mod h1:EyumB2Y6PrYjr55Q3/tiJ/o3xoDasoRYM7nOzEpoa90=
+github.com/libp2p/go-libp2p-metrics v0.0.1/go.mod h1:jQJ95SXXA/K1VZi13h52WZMa9ja78zjyy5rspMsC/08=
 github.com/libp2p/go-libp2p-mplex v0.2.0/go.mod h1:Ejl9IyjvXJ0T9iqUTE1jpYATQ9NM3g+OtR+EMMODbKo=
 github.com/libp2p/go-libp2p-mplex v0.2.1 h1:E1xaJBQnbSiTHGI1gaBKmKhu1TUKkErKJnE8iGvirYI=
 github.com/libp2p/go-libp2p-mplex v0.2.1/go.mod h1:SC99Rxs8Vuzrf/6WhmH41kNn13TiYdAWNYHrwImKLnE=
+github.com/libp2p/go-libp2p-nat v0.0.1/go.mod h1:4L6ajyUIlJvx1Cbh5pc6Ma6vMDpKXf3GgLO5u7W0oQ4=
 github.com/libp2p/go-libp2p-nat v0.0.4 h1:+KXK324yaY701On8a0aGjTnw8467kW3ExKcqW2wwmyw=
 github.com/libp2p/go-libp2p-nat v0.0.4/go.mod h1:N9Js/zVtAXqaeT99cXgTV9e75KpnWCvVOiGzlcHmBbY=
+github.com/libp2p/go-libp2p-net v0.0.1/go.mod h1:Yt3zgmlsHOgUWSXmt5V/Jpz9upuJBE8EgNU9DrCcR8c=
+github.com/libp2p/go-libp2p-netutil v0.0.1/go.mod h1:GdusFvujWZI9Vt0X5BKqwWWmZFxecf9Gt03cKxm2f/Q=
 github.com/libp2p/go-libp2p-netutil v0.1.0 h1:zscYDNVEcGxyUpMd0JReUZTrpMfia8PmLKcKF72EAMQ=
 github.com/libp2p/go-libp2p-netutil v0.1.0/go.mod h1:3Qv/aDqtMLTUyQeundkKsA+YCThNdbQD54k3TqjpbFU=
+github.com/libp2p/go-libp2p-peer v0.0.1/go.mod h1:nXQvOBbwVqoP+T5Y5nCjeH4sP9IX/J0AMzcDUVruVoo=
 github.com/libp2p/go-libp2p-peer v0.2.0 h1:EQ8kMjaCUwt/Y5uLgjT8iY2qg0mGUT0N1zUjer50DsY=
 github.com/libp2p/go-libp2p-peer v0.2.0/go.mod h1:RCffaCvUyW2CJmG2gAWVqwePwW7JMgxjsHm7+J5kjWY=
+github.com/libp2p/go-libp2p-peerstore v0.0.1/go.mod h1:RabLyPVJLuNQ+GFyoEkfi8H4Ti6k/HtZJ7YKgtSq+20=
 github.com/libp2p/go-libp2p-peerstore v0.1.0/go.mod h1:2CeHkQsr8svp4fZ+Oi9ykN1HBb6u0MOvdJ7YIsmcwtY=
 github.com/libp2p/go-libp2p-peerstore v0.1.3 h1:wMgajt1uM2tMiqf4M+4qWKVyyFc8SfA+84VV9glZq1M=
 github.com/libp2p/go-libp2p-peerstore v0.1.3/go.mod h1:BJ9sHlm59/80oSkpWgr1MyY1ciXAXV397W6h1GH/uKI=
 github.com/libp2p/go-libp2p-pnet v0.1.0 h1:kRUES28dktfnHNIRW4Ro78F7rKBHBiw5MJpl0ikrLIA=
 github.com/libp2p/go-libp2p-pnet v0.1.0/go.mod h1:ZkyZw3d0ZFOex71halXRihWf9WH/j3OevcJdTmD0lyE=
+github.com/libp2p/go-libp2p-protocol v0.0.1/go.mod h1:Af9n4PiruirSDjHycM1QuiMi/1VZNHYcK8cLgFJLZ4s=
 github.com/libp2p/go-libp2p-pubsub v0.1.0 h1:SmQeMa7IUv5vadh0fYgYsafWCBA1sCy5d/68kIYqGcU=
 github.com/libp2p/go-libp2p-pubsub v0.1.0/go.mod h1:ZwlKzRSe1eGvSIdU5bD7+8RZN/Uzw0t1Bp9R1znpR/Q=
 github.com/libp2p/go-libp2p-quic-transport v0.1.1 h1:MFMJzvsxIEDEVKzO89BnB/FgvMj9WI4GDGUW2ArDPUA=
 github.com/libp2p/go-libp2p-quic-transport v0.1.1/go.mod h1:wqG/jzhF3Pu2NrhJEvE+IE0NTHNXslOPn9JQzyCAxzU=
+github.com/libp2p/go-libp2p-record v0.0.1/go.mod h1:grzqg263Rug/sRex85QrDOLntdFAymLDLm7lxMgU79Q=
 github.com/libp2p/go-libp2p-record v0.1.0/go.mod h1:ujNc8iuE5dlKWVy6wuL6dd58t0n7xI4hAIl8pE6wu5Q=
 github.com/libp2p/go-libp2p-record v0.1.1 h1:ZJK2bHXYUBqObHX+rHLSNrM3M8fmJUlUHrodDPPATmY=
 github.com/libp2p/go-libp2p-record v0.1.1/go.mod h1:VRgKajOyMVgP/F0L5g3kH7SVskp17vFi2xheb5uMJtg=
+github.com/libp2p/go-libp2p-routing v0.0.1/go.mod h1:N51q3yTr4Zdr7V8Jt2JIktVU+3xBBylx1MZeVA6t1Ys=
 github.com/libp2p/go-libp2p-routing v0.1.0 h1:hFnj3WR3E2tOcKaGpyzfP4gvFZ3t8JkQmbapN0Ct+oU=
 github.com/libp2p/go-libp2p-routing v0.1.0/go.mod h1:zfLhI1RI8RLEzmEaaPwzonRvXeeSHddONWkcTcB54nE=
 github.com/libp2p/go-libp2p-routing-helpers v0.1.0 h1:BaFvpyv8TyhCN7TihawTiKuzeu8/Pyw7ZnMA4IvqIN8=
 github.com/libp2p/go-libp2p-routing-helpers v0.1.0/go.mod h1:oUs0h39vNwYtYXnQWOTU5BaafbedSyWCCal3gqHuoOQ=
+github.com/libp2p/go-libp2p-secio v0.0.1/go.mod h1:IdG6iQybdcYmbTzxp4J5dwtUEDTOvZrT0opIDVNPrJs=
 github.com/libp2p/go-libp2p-secio v0.1.0/go.mod h1:tMJo2w7h3+wN4pgU2LSYeiKPrfqBgkOsdiKK77hE7c8=
 github.com/libp2p/go-libp2p-secio v0.2.0 h1:ywzZBsWEEz2KNTn5RtzauEDq5RFEefPsttXYwAWqHng=
 github.com/libp2p/go-libp2p-secio v0.2.0/go.mod h1:2JdZepB8J5V9mBp79BmwsaPQhRPNN2NrnB2lKQcdy6g=
+github.com/libp2p/go-libp2p-swarm v0.0.1/go.mod h1:mh+KZxkbd3lQnveQ3j2q60BM1Cw2mX36XXQqwfPOShs=
 github.com/libp2p/go-libp2p-swarm v0.1.0/go.mod h1:wQVsCdjsuZoc730CgOvh5ox6K8evllckjebkdiY5ta4=
 github.com/libp2p/go-libp2p-swarm v0.2.0/go.mod h1:x07b4zkMFo2EvgPV2bMTlNmdQc8i+74Jjio7xGvsTgU=
 github.com/libp2p/go-libp2p-swarm v0.2.1 h1:9A8oQqPIZvbaRyrjViHeDYS7fE7fNtP7BRWdJrBHbe8=
@@ -399,17 +434,23 @@ github.com/libp2p/go-libp2p-testing v0.1.0 h1:WaFRj/t3HdMZGNZqnU2pS7pDRBmMeoDx7/
 github.com/libp2p/go-libp2p-testing v0.1.0/go.mod h1:xaZWMJrPUM5GlDBxCeGUi7kI4eqnjVyavGroI2nxEM0=
 github.com/libp2p/go-libp2p-tls v0.1.0 h1:o4bjjAdnUjNgJoPoDd0wUaZH7K+EenlNWJpgyXB3ulA=
 github.com/libp2p/go-libp2p-tls v0.1.0/go.mod h1:VZdoSWQDeNpIIAFJFv+6uqTqpnIIDHcqZQSTC/A1TT0=
+github.com/libp2p/go-libp2p-transport v0.0.1/go.mod h1:UzbUs9X+PHOSw7S3ZmeOxfnwaQY5vGDzZmKPod3N3tk=
+github.com/libp2p/go-libp2p-transport v0.0.4/go.mod h1:StoY3sx6IqsP6XKoabsPnHCwqKXWUMWU7Rfcsubee/A=
+github.com/libp2p/go-libp2p-transport-upgrader v0.0.1/go.mod h1:NJpUAgQab/8K6K0m+JmZCe5RUXG10UMEx4kWe9Ipj5c=
 github.com/libp2p/go-libp2p-transport-upgrader v0.1.1 h1:PZMS9lhjK9VytzMCW3tWHAXtKXmlURSc3ZdvwEcKCzw=
 github.com/libp2p/go-libp2p-transport-upgrader v0.1.1/go.mod h1:IEtA6or8JUbsV07qPW4r01GnTenLW4oi3lOPbUMGJJA=
 github.com/libp2p/go-libp2p-yamux v0.2.0/go.mod h1:Db2gU+XfLpm6E4rG5uGCFX6uXA8MEXOxFcRoXUODaK8=
 github.com/libp2p/go-libp2p-yamux v0.2.1 h1:Q3XYNiKCC2vIxrvUJL+Jg1kiyeEaIDNKLjgEjo3VQdI=
 github.com/libp2p/go-libp2p-yamux v0.2.1/go.mod h1:1FBXiHDk1VyRM1C0aez2bCfHQ4vMZKkAQzZbkSQt5fI=
+github.com/libp2p/go-maddr-filter v0.0.1/go.mod h1:6eT12kSQMA9x2pvFQa+xesMKUBlj9VImZbj3B9FBH/Q=
 github.com/libp2p/go-maddr-filter v0.0.4/go.mod h1:6eT12kSQMA9x2pvFQa+xesMKUBlj9VImZbj3B9FBH/Q=
 github.com/libp2p/go-maddr-filter v0.0.5 h1:CW3AgbMO6vUvT4kf87y4N+0P8KUl2aqLYhrGyDUbLSg=
 github.com/libp2p/go-maddr-filter v0.0.5/go.mod h1:Jk+36PMfIqCJhAnaASRH83bdAvfDRp/w6ENFaC9bG+M=
+github.com/libp2p/go-mplex v0.0.1/go.mod h1:pK5yMLmOoBR1pNCqDlA2GQrdAVTMkqFalaTWe7l4Yd0=
 github.com/libp2p/go-mplex v0.0.3/go.mod h1:pK5yMLmOoBR1pNCqDlA2GQrdAVTMkqFalaTWe7l4Yd0=
 github.com/libp2p/go-mplex v0.1.0 h1:/nBTy5+1yRyY82YaO6HXQRnO5IAGsXTjEJaR3LdTPc0=
 github.com/libp2p/go-mplex v0.1.0/go.mod h1:SXgmdki2kwCUlCCbfGLEgHjC4pFqhTp0ZoV6aiKgxDU=
+github.com/libp2p/go-msgio v0.0.1/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
 github.com/libp2p/go-msgio v0.0.2/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
 github.com/libp2p/go-msgio v0.0.3/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
 github.com/libp2p/go-msgio v0.0.4 h1:agEFehY3zWJFUHK6SEMR7UYmk2z6kC3oeCM7ybLhguA=
@@ -420,14 +461,18 @@ github.com/libp2p/go-openssl v0.0.2 h1:9pP2d3Ubaxkv7ZisLjx9BFwgOGnQdQYnfcH29HNY3
 github.com/libp2p/go-openssl v0.0.2/go.mod h1:v8Zw2ijCSWBQi8Pq5GAixw6DbFfa9u6VIYDXnvOXkc0=
 github.com/libp2p/go-reuseport v0.0.1 h1:7PhkfH73VXfPJYKQ6JwS5I/eVcoyYi9IMNGc6FWpFLw=
 github.com/libp2p/go-reuseport v0.0.1/go.mod h1:jn6RmB1ufnQwl0Q1f+YxAj8isJgDCQzaaxIFYDhcYEA=
+github.com/libp2p/go-reuseport-transport v0.0.1/go.mod h1:YkbSDrvjUVDL6b8XqriyA20obEtsW9BLkuOUyQAOCbs=
 github.com/libp2p/go-reuseport-transport v0.0.2 h1:WglMwyXyBu61CMkjCCtnmqNqnjib0GIEjMiHTwR/KN4=
 github.com/libp2p/go-reuseport-transport v0.0.2/go.mod h1:YkbSDrvjUVDL6b8XqriyA20obEtsW9BLkuOUyQAOCbs=
 github.com/libp2p/go-stream-muxer v0.0.1/go.mod h1:bAo8x7YkSpadMTbtTaxGVHWUQsR/l5MEaHbKaliuT14=
 github.com/libp2p/go-stream-muxer-multistream v0.2.0 h1:714bRJ4Zy9mdhyTLJ+ZKiROmAFwUHpeRidG+q7LTQOg=
 github.com/libp2p/go-stream-muxer-multistream v0.2.0/go.mod h1:j9eyPol/LLRqT+GPLSxvimPhNph4sfYfMoDPd7HkzIc=
+github.com/libp2p/go-tcp-transport v0.0.1/go.mod h1:mnjg0o0O5TmXUaUIanYPUqkW4+u6mK0en8rlpA6BBTs=
 github.com/libp2p/go-tcp-transport v0.1.0 h1:IGhowvEqyMFknOar4FWCKSWE0zL36UFKQtiRQD60/8o=
 github.com/libp2p/go-tcp-transport v0.1.0/go.mod h1:oJ8I5VXryj493DEJ7OsBieu8fcg2nHGctwtInJVpipc=
+github.com/libp2p/go-testutil v0.0.1/go.mod h1:iAcJc/DKJQanJ5ws2V+u5ywdL2n12X1WbbEG+Jjy69I=
 github.com/libp2p/go-testutil v0.1.0/go.mod h1:81b2n5HypcVyrCg/MJx4Wgfp/VHojytjVe/gLzZ2Ehc=
+github.com/libp2p/go-ws-transport v0.0.1/go.mod h1:p3bKjDWHEgtuKKj+2OdPYs5dAPIjtpQGHF2tJfGz7Ww=
 github.com/libp2p/go-ws-transport v0.1.0 h1:F+0OvvdmPTDsVc4AjPHjV7L7Pk1B7D5QwtDcKE2oag4=
 github.com/libp2p/go-ws-transport v0.1.0/go.mod h1:rjw1MG1LU9YDC6gzmwObkPd/Sqwhw7yT74kj3raBFuo=
 github.com/libp2p/go-yamux v1.2.2/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow=
@@ -456,6 +501,7 @@ github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp
 github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
+github.com/miekg/dns v1.1.4/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/miekg/dns v1.1.12/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/miekg/dns v1.1.16 h1:iMEQ/IVHxPTtx2Q07JP/k4CKRvSjiAZjZ0hnhgYEDmE=
 github.com/miekg/dns v1.1.16/go.mod h1:YNV562EiewvSmpCB6/W4c6yqjK7Z+M/aIS1JHsIVeg8=
@@ -500,6 +546,7 @@ github.com/multiformats/go-multihash v0.0.1/go.mod h1:w/5tugSrLEbWqlcgJabL3oHFKT
 github.com/multiformats/go-multihash v0.0.5/go.mod h1:lt/HCbqlQwlPBz7lv0sQCdtfcMtlJvakRUn/0Ual8po=
 github.com/multiformats/go-multihash v0.0.7 h1:uoqoE03rGJdlQEPq2EAc6UeSbo4L7mZyeAAoqNalf54=
 github.com/multiformats/go-multihash v0.0.7/go.mod h1:XuKXPp8VHcTygube3OWZC+aZrA+H1IhmjoCDtJc7PXM=
+github.com/multiformats/go-multistream v0.0.1/go.mod h1:fJTiDfXJVmItycydCnNx4+wSzZ5NwG2FEVAI30fiovg=
 github.com/multiformats/go-multistream v0.1.0 h1:UpO6jrsjqs46mqAK3n6wKRYFhugss9ArzbyUzU+4wkQ=
 github.com/multiformats/go-multistream v0.1.0/go.mod h1:fJTiDfXJVmItycydCnNx4+wSzZ5NwG2FEVAI30fiovg=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
@@ -628,8 +675,8 @@ github.com/whyrusleeping/bencher v0.0.0-20190829221104-bb6607aa8bba h1:X4n8JG2e2
 github.com/whyrusleeping/bencher v0.0.0-20190829221104-bb6607aa8bba/go.mod h1:CHQnYnQUEPydYCwuy8lmTHfGmdw9TKrhWV0xLx8l0oM=
 github.com/whyrusleeping/cbor-gen v0.0.0-20190910031516-c1cbffdb01bb/go.mod h1:xdlJQaiqipF0HW+Mzpg7XRM3fWbGvfgFlcppuvlkIvY=
 github.com/whyrusleeping/cbor-gen v0.0.0-20190917003517-d78d67427694/go.mod h1:xdlJQaiqipF0HW+Mzpg7XRM3fWbGvfgFlcppuvlkIvY=
-github.com/whyrusleeping/cbor-gen v0.0.0-20191104184210-9aa3672a465c h1:P3leakVQLSvS0b953QG0BcuoCul79KTNpHbE04Bxhmc=
-github.com/whyrusleeping/cbor-gen v0.0.0-20191104184210-9aa3672a465c/go.mod h1:xdlJQaiqipF0HW+Mzpg7XRM3fWbGvfgFlcppuvlkIvY=
+github.com/whyrusleeping/cbor-gen v0.0.0-20191104210213-4418c8842f0f h1:+GFA37QICd1Axd2n9uzjtvPjxJJI5PU78vpvam+hI4U=
+github.com/whyrusleeping/cbor-gen v0.0.0-20191104210213-4418c8842f0f/go.mod h1:xdlJQaiqipF0HW+Mzpg7XRM3fWbGvfgFlcppuvlkIvY=
 github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f h1:jQa4QT2UP9WYv2nzyawpKMOCl+Z/jW7djv2/J50lj9E=
 github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f/go.mod h1:p9UJB6dDgdPgMJZs7UjUOdulKyRr9fqkS+6JKAInPy8=
 github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 h1:EKhdznlJHPMoKr0XTrX+IlJs1LH3lyx2nfr1dOlZ79k=
@@ -637,6 +684,9 @@ github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1/go.mod h
 github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc/go.mod h1:bopw91TMyo8J3tvftk8xmU2kPmlrt4nScJQZU2hE5EM=
 github.com/whyrusleeping/go-notifier v0.0.0-20170827234753-097c5d47330f h1:M/lL30eFZTKnomXY6huvM6G0+gVquFNf6mxghaWlFUg=
 github.com/whyrusleeping/go-notifier v0.0.0-20170827234753-097c5d47330f/go.mod h1:cZNvX9cFybI01GriPRMXDtczuvUhgbcYr9iCGaNlRv8=
+github.com/whyrusleeping/go-smux-multiplex v3.0.16+incompatible/go.mod h1:34LEDbeKFZInPUrAG+bjuJmUXONGdEFW7XL0SpTY1y4=
+github.com/whyrusleeping/go-smux-multistream v2.0.2+incompatible/go.mod h1:dRWHHvc4HDQSHh9gbKEBbUZ+f2Q8iZTPG3UOGYODxSQ=
+github.com/whyrusleeping/go-smux-yamux v2.0.8+incompatible/go.mod h1:6qHUzBXUbB9MXmw3AUdB52L8sEb/hScCqOdW2kj/wuI=
 github.com/whyrusleeping/mafmt v1.2.8 h1:TCghSl5kkwEE0j+sU/gudyhVMRlpBin8fMBBHg59EbA=
 github.com/whyrusleeping/mafmt v1.2.8/go.mod h1:faQJFPbLSxzD9xpA02ttW/tS9vZykNvXwGvqIpk20FA=
 github.com/whyrusleeping/mdns v0.0.0-20180901202407-ef14215e6b30 h1:nMCC9Pwz1pxfC1Y6mYncdk+kq8d5aLx0Q+/gyZGE44M=
@@ -647,6 +697,7 @@ github.com/whyrusleeping/pubsub v0.0.0-20131020042734-02de8aa2db3d h1:wnjWu1N8UT
 github.com/whyrusleeping/pubsub v0.0.0-20131020042734-02de8aa2db3d/go.mod h1:g7ckxrjiFh8mi1AY7ox23PZD0g6QU/TxW3U3unX7I3A=
 github.com/whyrusleeping/timecache v0.0.0-20160911033111-cfcb2f1abfee h1:lYbXeSvJi5zk5GLKVuid9TVjS9a0OmLIDKTfoZBL6Ow=
 github.com/whyrusleeping/timecache v0.0.0-20160911033111-cfcb2f1abfee/go.mod h1:m2aV4LZI4Aez7dP5PMyVKEHhUyEJ/RjmPEDOpDvudHg=
+github.com/whyrusleeping/yamux v1.1.5/go.mod h1:E8LnQQ8HKx5KD29HZFUwM1PxCOdPRzGwur1mcYhXcD8=
 github.com/x-cray/logrus-prefixed-formatter v0.5.2/go.mod h1:2duySbKsL6M18s5GU7VPsoEPHyzalCE06qoARUCeBBE=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
@@ -693,6 +744,7 @@ golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTk
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/net v0.0.0-20170915142106-8351a756f30f/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180524181706-dfa909b99c79/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -755,6 +807,8 @@ golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c h1:fqgJT0MGcGpPgpWU7VRdRjuArfcOvC4AoJmILihzhDg=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZenJ2O330aBsf7JfSUXmQ=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20170915040203-e531a2a1c15f/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
diff --git a/lib/sectorbuilder/mock.go b/lib/sectorbuilder/mock.go
new file mode 100644
index 000000000..626eef75d
--- /dev/null
+++ b/lib/sectorbuilder/mock.go
@@ -0,0 +1,42 @@
+package sectorbuilder
+
+import (
+	"io/ioutil"
+	"os"
+	"path/filepath"
+
+	"github.com/filecoin-project/lotus/chain/address"
+)
+
+func TempSectorbuilder(sectorSize uint64) (*SectorBuilder, func(), error) {
+	dir, err := ioutil.TempDir("", "sbtest")
+	if err != nil {
+		return nil, nil, err
+	}
+
+	addr, err := address.NewFromString("t3vfxagwiegrywptkbmyohqqbfzd7xzbryjydmxso4hfhgsnv6apddyihltsbiikjf3lm7x2myiaxhuc77capq")
+	if err != nil {
+		return nil, nil, err
+	}
+
+	metadata := filepath.Join(dir, "meta")
+	sealed := filepath.Join(dir, "sealed")
+	staging := filepath.Join(dir, "staging")
+
+	sb, err := New(&SectorBuilderConfig{
+		SectorSize:  sectorSize,
+		SealedDir:   sealed,
+		StagedDir:   staging,
+		MetadataDir: metadata,
+		Miner:       addr,
+	})
+	if err != nil {
+		return nil, nil, err
+	}
+
+	return sb, func() {
+		if err := os.RemoveAll(dir); err != nil {
+			log.Warn("failed to clean up temp sectorbuilder: ", err)
+		}
+	}, nil
+}
diff --git a/lib/sectorbuilder/sectorbuilder_test.go b/lib/sectorbuilder/sectorbuilder_test.go
index b40a0b9cd..903373cc0 100644
--- a/lib/sectorbuilder/sectorbuilder_test.go
+++ b/lib/sectorbuilder/sectorbuilder_test.go
@@ -3,15 +3,12 @@ package sectorbuilder_test
 import (
 	"context"
 	"io"
-	"io/ioutil"
 	"math/rand"
-	"path/filepath"
 	"testing"
 
 	"github.com/ipfs/go-datastore"
 
 	"github.com/filecoin-project/lotus/build"
-	"github.com/filecoin-project/lotus/chain/address"
 	"github.com/filecoin-project/lotus/lib/sectorbuilder"
 	"github.com/filecoin-project/lotus/storage/sector"
 )
@@ -26,30 +23,11 @@ func TestSealAndVerify(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	dir, err := ioutil.TempDir("", "sbtest")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	addr, err := address.NewFromString("t3vfxagwiegrywptkbmyohqqbfzd7xzbryjydmxso4hfhgsnv6apddyihltsbiikjf3lm7x2myiaxhuc77capq")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	metadata := filepath.Join(dir, "meta")
-	sealed := filepath.Join(dir, "sealed")
-	staging := filepath.Join(dir, "staging")
-
-	sb, err := sectorbuilder.New(&sectorbuilder.SectorBuilderConfig{
-		SectorSize:  sectorSize,
-		SealedDir:   sealed,
-		StagedDir:   staging,
-		MetadataDir: metadata,
-		Miner:       addr,
-	})
+	sb, cleanup, err := TempSectorbuilder(sectorSize)
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer cleanup()
 
 	// TODO: Consider fixing
 	store := sector.NewStore(sb, datastore.NewMapDatastore(), func(ctx context.Context) (*sectorbuilder.SealTicket, error) {
diff --git a/node/hello/hello.go b/node/hello/hello.go
index d512d1d27..ef37fae38 100644
--- a/node/hello/hello.go
+++ b/node/hello/hello.go
@@ -3,6 +3,7 @@ package hello
 import (
 	"context"
 	"fmt"
+
 	"go.uber.org/fx"
 
 	"github.com/ipfs/go-cid"
diff --git a/node/impl/client/client.go b/node/impl/client/client.go
index a785bef44..85e9ca4f7 100644
--- a/node/impl/client/client.go
+++ b/node/impl/client/client.go
@@ -3,11 +3,12 @@ package client
 import (
 	"context"
 	"errors"
-	"golang.org/x/xerrors"
 	"io"
 	"math"
 	"os"
 
+	"golang.org/x/xerrors"
+
 	"github.com/ipfs/go-blockservice"
 	"github.com/ipfs/go-cid"
 	"github.com/ipfs/go-filestore"
diff --git a/paych/cbor_gen.go b/paych/cbor_gen.go
index 5eac7c08e..e640f3057 100644
--- a/paych/cbor_gen.go
+++ b/paych/cbor_gen.go
@@ -22,12 +22,12 @@ func (t *VoucherInfo) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Voucher (types.SignedVoucher)
+	// t.t.Voucher (types.SignedVoucher) (struct)
 	if err := t.Voucher.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Proof ([]uint8)
+	// t.t.Proof ([]uint8) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajByteString, uint64(len(t.Proof)))); err != nil {
 		return err
 	}
@@ -52,7 +52,7 @@ func (t *VoucherInfo) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Voucher (types.SignedVoucher)
+	// t.t.Voucher (types.SignedVoucher) (struct)
 
 	{
 
@@ -73,7 +73,7 @@ func (t *VoucherInfo) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Proof ([]uint8)
+	// t.t.Proof ([]uint8) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -102,27 +102,27 @@ func (t *ChannelInfo) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	// t.t.Channel (address.Address)
+	// t.t.Channel (address.Address) (struct)
 	if err := t.Channel.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Control (address.Address)
+	// t.t.Control (address.Address) (struct)
 	if err := t.Control.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Target (address.Address)
+	// t.t.Target (address.Address) (struct)
 	if err := t.Target.MarshalCBOR(w); err != nil {
 		return err
 	}
 
-	// t.t.Direction (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.Direction)); err != nil {
+	// t.t.Direction (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.Direction))); err != nil {
 		return err
 	}
 
-	// t.t.Vouchers ([]*paych.VoucherInfo)
+	// t.t.Vouchers ([]*paych.VoucherInfo) (slice)
 	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajArray, uint64(len(t.Vouchers)))); err != nil {
 		return err
 	}
@@ -132,8 +132,8 @@ func (t *ChannelInfo) MarshalCBOR(w io.Writer) error {
 		}
 	}
 
-	// t.t.NextLane (uint64)
-	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, t.NextLane)); err != nil {
+	// t.t.NextLane (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.NextLane))); err != nil {
 		return err
 	}
 	return nil
@@ -154,7 +154,7 @@ func (t *ChannelInfo) UnmarshalCBOR(r io.Reader) error {
 		return fmt.Errorf("cbor input had wrong number of fields")
 	}
 
-	// t.t.Channel (address.Address)
+	// t.t.Channel (address.Address) (struct)
 
 	{
 
@@ -163,7 +163,7 @@ func (t *ChannelInfo) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Control (address.Address)
+	// t.t.Control (address.Address) (struct)
 
 	{
 
@@ -172,7 +172,7 @@ func (t *ChannelInfo) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Target (address.Address)
+	// t.t.Target (address.Address) (struct)
 
 	{
 
@@ -181,7 +181,7 @@ func (t *ChannelInfo) UnmarshalCBOR(r io.Reader) error {
 		}
 
 	}
-	// t.t.Direction (uint64)
+	// t.t.Direction (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -190,8 +190,8 @@ func (t *ChannelInfo) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.Direction = extra
-	// t.t.Vouchers ([]*paych.VoucherInfo)
+	t.Direction = uint64(extra)
+	// t.t.Vouchers ([]*paych.VoucherInfo) (slice)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -217,7 +217,7 @@ func (t *ChannelInfo) UnmarshalCBOR(r io.Reader) error {
 		t.Vouchers[i] = &v
 	}
 
-	// t.t.NextLane (uint64)
+	// t.t.NextLane (uint64) (uint64)
 
 	maj, extra, err = cbg.CborReadHeader(br)
 	if err != nil {
@@ -226,6 +226,6 @@ func (t *ChannelInfo) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.NextLane = extra
+	t.NextLane = uint64(extra)
 	return nil
 }
diff --git a/retrieval/cbor_gen.go b/retrieval/cbor_gen.go
new file mode 100644
index 000000000..93d800697
--- /dev/null
+++ b/retrieval/cbor_gen.go
@@ -0,0 +1,473 @@
+package retrieval
+
+import (
+	"fmt"
+	"io"
+	"io/ioutil"
+
+	cbg "github.com/whyrusleeping/cbor-gen"
+	xerrors "golang.org/x/xerrors"
+)
+
+/* This file was generated by github.com/whyrusleeping/cbor-gen */
+
+var _ = xerrors.Errorf
+
+func (t *RetParams) MarshalCBOR(w io.Writer) error {
+	if t == nil {
+		_, err := w.Write(cbg.CborNull)
+		return err
+	}
+	if _, err := w.Write([]byte{129}); err != nil {
+		return err
+	}
+
+	// t.t.Unixfs0 (retrieval.Unixfs0Offer) (struct)
+	if err := t.Unixfs0.MarshalCBOR(w); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (t *RetParams) UnmarshalCBOR(r io.Reader) error {
+	br := cbg.GetPeeker(r)
+
+	maj, extra, err := cbg.CborReadHeader(br)
+	if err != nil {
+		return err
+	}
+	if maj != cbg.MajArray {
+		return fmt.Errorf("cbor input should be of type array")
+	}
+
+	if extra != 1 {
+		return fmt.Errorf("cbor input had wrong number of fields")
+	}
+
+	// t.t.Unixfs0 (retrieval.Unixfs0Offer) (struct)
+
+	{
+
+		pb, err := br.PeekByte()
+		if err != nil {
+			return err
+		}
+		if pb == cbg.CborNull[0] {
+			var nbuf [1]byte
+			if _, err := br.Read(nbuf[:]); err != nil {
+				return err
+			}
+		} else {
+			t.Unixfs0 = new(Unixfs0Offer)
+			if err := t.Unixfs0.UnmarshalCBOR(br); err != nil {
+				return err
+			}
+		}
+
+	}
+	return nil
+}
+
+func (t *Query) MarshalCBOR(w io.Writer) error {
+	if t == nil {
+		_, err := w.Write(cbg.CborNull)
+		return err
+	}
+	if _, err := w.Write([]byte{129}); err != nil {
+		return err
+	}
+
+	// t.t.Piece (cid.Cid) (struct)
+
+	if err := cbg.WriteCid(w, t.Piece); err != nil {
+		return xerrors.Errorf("failed to write cid field t.Piece: %w", err)
+	}
+
+	return nil
+}
+
+func (t *Query) UnmarshalCBOR(r io.Reader) error {
+	br := cbg.GetPeeker(r)
+
+	maj, extra, err := cbg.CborReadHeader(br)
+	if err != nil {
+		return err
+	}
+	if maj != cbg.MajArray {
+		return fmt.Errorf("cbor input should be of type array")
+	}
+
+	if extra != 1 {
+		return fmt.Errorf("cbor input had wrong number of fields")
+	}
+
+	// t.t.Piece (cid.Cid) (struct)
+
+	{
+
+		c, err := cbg.ReadCid(br)
+		if err != nil {
+			return xerrors.Errorf("failed to read cid field t.Piece: %w", err)
+		}
+
+		t.Piece = c
+
+	}
+	return nil
+}
+
+func (t *QueryResponse) MarshalCBOR(w io.Writer) error {
+	if t == nil {
+		_, err := w.Write(cbg.CborNull)
+		return err
+	}
+	if _, err := w.Write([]byte{131}); err != nil {
+		return err
+	}
+
+	// t.t.Status (retrieval.QueryResponseStatus) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.Status))); err != nil {
+		return err
+	}
+
+	// t.t.Size (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.Size))); err != nil {
+		return err
+	}
+
+	// t.t.MinPrice (types.BigInt) (struct)
+	if err := t.MinPrice.MarshalCBOR(w); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (t *QueryResponse) UnmarshalCBOR(r io.Reader) error {
+	br := cbg.GetPeeker(r)
+
+	maj, extra, err := cbg.CborReadHeader(br)
+	if err != nil {
+		return err
+	}
+	if maj != cbg.MajArray {
+		return fmt.Errorf("cbor input should be of type array")
+	}
+
+	if extra != 3 {
+		return fmt.Errorf("cbor input had wrong number of fields")
+	}
+
+	// t.t.Status (retrieval.QueryResponseStatus) (uint64)
+
+	maj, extra, err = cbg.CborReadHeader(br)
+	if err != nil {
+		return err
+	}
+	if maj != cbg.MajUnsignedInt {
+		return fmt.Errorf("wrong type for uint64 field")
+	}
+	t.Status = QueryResponseStatus(extra)
+	// t.t.Size (uint64) (uint64)
+
+	maj, extra, err = cbg.CborReadHeader(br)
+	if err != nil {
+		return err
+	}
+	if maj != cbg.MajUnsignedInt {
+		return fmt.Errorf("wrong type for uint64 field")
+	}
+	t.Size = uint64(extra)
+	// t.t.MinPrice (types.BigInt) (struct)
+
+	{
+
+		if err := t.MinPrice.UnmarshalCBOR(br); err != nil {
+			return err
+		}
+
+	}
+	return nil
+}
+
+func (t *Unixfs0Offer) MarshalCBOR(w io.Writer) error {
+	if t == nil {
+		_, err := w.Write(cbg.CborNull)
+		return err
+	}
+	if _, err := w.Write([]byte{130}); err != nil {
+		return err
+	}
+
+	// t.t.Offset (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.Offset))); err != nil {
+		return err
+	}
+
+	// t.t.Size (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.Size))); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (t *Unixfs0Offer) UnmarshalCBOR(r io.Reader) error {
+	br := cbg.GetPeeker(r)
+
+	maj, extra, err := cbg.CborReadHeader(br)
+	if err != nil {
+		return err
+	}
+	if maj != cbg.MajArray {
+		return fmt.Errorf("cbor input should be of type array")
+	}
+
+	if extra != 2 {
+		return fmt.Errorf("cbor input had wrong number of fields")
+	}
+
+	// t.t.Offset (uint64) (uint64)
+
+	maj, extra, err = cbg.CborReadHeader(br)
+	if err != nil {
+		return err
+	}
+	if maj != cbg.MajUnsignedInt {
+		return fmt.Errorf("wrong type for uint64 field")
+	}
+	t.Offset = uint64(extra)
+	// t.t.Size (uint64) (uint64)
+
+	maj, extra, err = cbg.CborReadHeader(br)
+	if err != nil {
+		return err
+	}
+	if maj != cbg.MajUnsignedInt {
+		return fmt.Errorf("wrong type for uint64 field")
+	}
+	t.Size = uint64(extra)
+	return nil
+}
+
+func (t *DealProposal) MarshalCBOR(w io.Writer) error {
+	if t == nil {
+		_, err := w.Write(cbg.CborNull)
+		return err
+	}
+	if _, err := w.Write([]byte{131}); err != nil {
+		return err
+	}
+
+	// t.t.Payment (api.PaymentInfo) (struct)
+	if err := t.Payment.MarshalCBOR(w); err != nil {
+		return err
+	}
+
+	// t.t.Ref (cid.Cid) (struct)
+
+	if err := cbg.WriteCid(w, t.Ref); err != nil {
+		return xerrors.Errorf("failed to write cid field t.Ref: %w", err)
+	}
+
+	// t.t.Params (retrieval.RetParams) (struct)
+	if err := t.Params.MarshalCBOR(w); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (t *DealProposal) UnmarshalCBOR(r io.Reader) error {
+	br := cbg.GetPeeker(r)
+
+	maj, extra, err := cbg.CborReadHeader(br)
+	if err != nil {
+		return err
+	}
+	if maj != cbg.MajArray {
+		return fmt.Errorf("cbor input should be of type array")
+	}
+
+	if extra != 3 {
+		return fmt.Errorf("cbor input had wrong number of fields")
+	}
+
+	// t.t.Payment (api.PaymentInfo) (struct)
+
+	{
+
+		if err := t.Payment.UnmarshalCBOR(br); err != nil {
+			return err
+		}
+
+	}
+	// t.t.Ref (cid.Cid) (struct)
+
+	{
+
+		c, err := cbg.ReadCid(br)
+		if err != nil {
+			return xerrors.Errorf("failed to read cid field t.Ref: %w", err)
+		}
+
+		t.Ref = c
+
+	}
+	// t.t.Params (retrieval.RetParams) (struct)
+
+	{
+
+		if err := t.Params.UnmarshalCBOR(br); err != nil {
+			return err
+		}
+
+	}
+	return nil
+}
+
+func (t *DealResponse) MarshalCBOR(w io.Writer) error {
+	if t == nil {
+		_, err := w.Write(cbg.CborNull)
+		return err
+	}
+	if _, err := w.Write([]byte{130}); err != nil {
+		return err
+	}
+
+	// t.t.Status (uint64) (uint64)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajUnsignedInt, uint64(t.Status))); err != nil {
+		return err
+	}
+
+	// t.t.Message (string) (string)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajTextString, uint64(len(t.Message)))); err != nil {
+		return err
+	}
+	if _, err := w.Write([]byte(t.Message)); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (t *DealResponse) UnmarshalCBOR(r io.Reader) error {
+	br := cbg.GetPeeker(r)
+
+	maj, extra, err := cbg.CborReadHeader(br)
+	if err != nil {
+		return err
+	}
+	if maj != cbg.MajArray {
+		return fmt.Errorf("cbor input should be of type array")
+	}
+
+	if extra != 2 {
+		return fmt.Errorf("cbor input had wrong number of fields")
+	}
+
+	// t.t.Status (uint64) (uint64)
+
+	maj, extra, err = cbg.CborReadHeader(br)
+	if err != nil {
+		return err
+	}
+	if maj != cbg.MajUnsignedInt {
+		return fmt.Errorf("wrong type for uint64 field")
+	}
+	t.Status = uint64(extra)
+	// t.t.Message (string) (string)
+
+	{
+		sval, err := cbg.ReadString(br)
+		if err != nil {
+			return err
+		}
+
+		t.Message = string(sval)
+	}
+	return nil
+}
+
+func (t *Block) MarshalCBOR(w io.Writer) error {
+	if t == nil {
+		_, err := w.Write(cbg.CborNull)
+		return err
+	}
+	if _, err := w.Write([]byte{130}); err != nil {
+		return err
+	}
+
+	// t.t.Prefix ([]uint8) (slice)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajByteString, uint64(len(t.Prefix)))); err != nil {
+		return err
+	}
+	if _, err := w.Write(t.Prefix); err != nil {
+		return err
+	}
+
+	// t.t.Data ([]uint8) (slice)
+	dlen := len(t.Data)
+	if _, err := w.Write(cbg.CborEncodeMajorType(cbg.MajByteString, uint64(dlen))); err != nil {
+		return err
+	}
+	if n, err := w.Write(t.Data); err != nil {
+		return err
+	} else if n != dlen {
+		return fmt.Errorf("somehow wrote the wrong number of bytes...")
+	}
+	return nil
+}
+
+func (t *Block) UnmarshalCBOR(r io.Reader) error {
+	br := cbg.GetPeeker(r)
+
+	maj, extra, err := cbg.CborReadHeader(br)
+	if err != nil {
+		return err
+	}
+	if maj != cbg.MajArray {
+		data, err := ioutil.ReadAll(r)
+		if err != nil {
+			panic("piss")
+		}
+		fmt.Println("STRING DATA: ", string(data))
+		return fmt.Errorf("cbor input should be of type array (got %d)", maj)
+	}
+
+	if extra != 2 {
+		return fmt.Errorf("cbor input had wrong number of fields")
+	}
+
+	// t.t.Prefix ([]uint8) (slice)
+
+	maj, extra, err = cbg.CborReadHeader(br)
+	if err != nil {
+		return err
+	}
+	if extra > 8192 {
+		return fmt.Errorf("t.Prefix: array too large (%d)", extra)
+	}
+
+	if maj != cbg.MajByteString {
+		return fmt.Errorf("expected byte array")
+	}
+	t.Prefix = make([]byte, extra)
+	if _, err := io.ReadFull(br, t.Prefix); err != nil {
+		return err
+	}
+	// t.t.Data ([]uint8) (slice)
+
+	maj, extra, err = cbg.CborReadHeader(br)
+	if err != nil {
+		return err
+	}
+	if extra > 8192 {
+		return fmt.Errorf("t.Data: array too large (%d)", extra)
+	}
+
+	if maj != cbg.MajByteString {
+		return fmt.Errorf("expected byte array")
+	}
+	t.Data = make([]byte, extra)
+	if _, err := io.ReadFull(br, t.Data); err != nil {
+		return err
+	}
+	return nil
+}
diff --git a/retrieval/client.go b/retrieval/client.go
index ec086ef49..bc2fa2db3 100644
--- a/retrieval/client.go
+++ b/retrieval/client.go
@@ -3,11 +3,9 @@ package retrieval
 import (
 	"context"
 	"io"
-	"io/ioutil"
 
 	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	cbor "github.com/ipfs/go-ipld-cbor"
 	logging "github.com/ipfs/go-log"
 	"github.com/libp2p/go-libp2p-core/host"
 	"github.com/libp2p/go-libp2p-core/network"
@@ -45,7 +43,7 @@ func (c *Client) Query(ctx context.Context, p discovery.RetrievalPeer, data cid.
 	}
 	defer s.Close()
 
-	err = cborrpc.WriteCborRPC(s, Query{
+	err = cborrpc.WriteCborRPC(s, &Query{
 		Piece: data,
 	})
 	if err != nil {
@@ -53,15 +51,8 @@ func (c *Client) Query(ctx context.Context, p discovery.RetrievalPeer, data cid.
 		return api.QueryOffer{Err: err.Error(), Miner: p.Address, MinerPeerID: p.ID}
 	}
 
-	// TODO: read deadline
-	rawResp, err := ioutil.ReadAll(s)
-	if err != nil {
-		log.Warn(err)
-		return api.QueryOffer{Err: err.Error(), Miner: p.Address, MinerPeerID: p.ID}
-	}
-
 	var resp QueryResponse
-	if err := cbor.DecodeInto(rawResp, &resp); err != nil {
+	if err := resp.UnmarshalCBOR(s); err != nil {
 		log.Warn(err)
 		return api.QueryOffer{Err: err.Error(), Miner: p.Address, MinerPeerID: p.ID}
 	}
@@ -167,7 +158,7 @@ func (cst *clientStream) doOneExchange(ctx context.Context, toFetch uint64, out
 		return xerrors.Errorf("setting up retrieval payment: %w", err)
 	}
 
-	deal := DealProposal{
+	deal := &DealProposal{
 		Payment: payment,
 		Ref:     cst.root,
 		Params: RetParams{
diff --git a/retrieval/miner.go b/retrieval/miner.go
index 350177fe2..39bb6f417 100644
--- a/retrieval/miner.go
+++ b/retrieval/miner.go
@@ -2,6 +2,7 @@ package retrieval
 
 import (
 	"context"
+	"fmt"
 	"io"
 
 	"github.com/ipfs/go-blockservice"
@@ -37,7 +38,7 @@ func NewMiner(sblks *sectorblocks.SectorBlocks, full api.FullNode) *Miner {
 
 func writeErr(stream network.Stream, err error) {
 	log.Errorf("Retrieval deal error: %s", err)
-	_ = cborrpc.WriteCborRPC(stream, DealResponse{
+	_ = cborrpc.WriteCborRPC(stream, &DealResponse{
 		Status:  Error,
 		Message: err.Error(),
 	})
@@ -58,7 +59,7 @@ func (m *Miner) HandleQueryStream(stream network.Stream) {
 		return
 	}
 
-	answer := QueryResponse{
+	answer := &QueryResponse{
 		Status: Unavailable,
 	}
 	if err == nil {
@@ -134,7 +135,7 @@ func (hnd *handlerDeal) handleNext() (bool, error) {
 	// If the file isn't open (new deal stream), isn't the right file, or isn't
 	// at the right offset, (re)open it
 	if hnd.open != deal.Ref || hnd.at != unixfs0.Offset {
-		log.Infof("opening file for sending (open '%s') (@%d, want %d)", hnd.open, hnd.at, unixfs0.Offset)
+		log.Infof("opening file for sending (open '%s') (@%d, want %d)", deal.Ref, hnd.at, unixfs0.Offset)
 		if err := hnd.openFile(deal); err != nil {
 			return false, err
 		}
@@ -195,7 +196,7 @@ func (hnd *handlerDeal) openFile(deal DealProposal) error {
 func (hnd *handlerDeal) accept(deal DealProposal) error {
 	unixfs0 := deal.Params.Unixfs0
 
-	resp := DealResponse{
+	resp := &DealResponse{
 		Status: Accepted,
 	}
 	if err := cborrpc.WriteCborRPC(hnd.stream, resp); err != nil {
@@ -203,6 +204,8 @@ func (hnd *handlerDeal) accept(deal DealProposal) error {
 		return err
 	}
 
+	defer fmt.Println("leaving accept retrieval deal")
+
 	blocksToSend := (unixfs0.Size + build.UnixfsChunkSize - 1) / build.UnixfsChunkSize
 	for i := uint64(0); i < blocksToSend; {
 		data, offset, nd, err := hnd.ufsr.ReadBlock(context.TODO())
@@ -221,11 +224,12 @@ func (hnd *handlerDeal) accept(deal DealProposal) error {
 			return
 		}*/
 
-		block := Block{
+		block := &Block{
 			Prefix: nd.Cid().Prefix().Bytes(),
 			Data:   nd.RawData(),
 		}
 
+		fmt.Println("retrieval sending block: ", i, blocksToSend, len(nd.RawData()))
 		if err := cborrpc.WriteCborRPC(hnd.stream, block); err != nil {
 			return err
 		}
diff --git a/retrieval/types.go b/retrieval/types.go
index a7a66ea51..d82d8b138 100644
--- a/retrieval/types.go
+++ b/retrieval/types.go
@@ -3,7 +3,6 @@ package retrieval
 import (
 	"github.com/filecoin-project/lotus/api"
 	"github.com/ipfs/go-cid"
-	cbor "github.com/ipfs/go-ipld-cbor"
 
 	"github.com/filecoin-project/lotus/chain/types"
 )
@@ -11,7 +10,7 @@ import (
 const ProtocolID = "/fil/retrieval/-1.0.0"          // TODO: spec
 const QueryProtocolID = "/fil/retrieval/qry/-1.0.0" // TODO: spec
 
-type QueryResponseStatus int
+type QueryResponseStatus uint64
 
 const (
 	Available QueryResponseStatus = iota
@@ -26,15 +25,6 @@ const (
 )
 
 func init() {
-	cbor.RegisterCborType(RetParams{})
-
-	cbor.RegisterCborType(Query{})
-	cbor.RegisterCborType(QueryResponse{})
-	cbor.RegisterCborType(Unixfs0Offer{})
-
-	cbor.RegisterCborType(DealProposal{})
-	cbor.RegisterCborType(DealResponse{})
-	cbor.RegisterCborType(Block{})
 }
 
 type Query struct {
@@ -69,7 +59,7 @@ type DealProposal struct {
 }
 
 type DealResponse struct {
-	Status  int
+	Status  uint64
 	Message string
 }