scale: allocate slice elements when decoding

codec/decode.go

@@ -325,10 +325,6 @@ func (sd *Decoder) DecodeArray(t interface{}) (interface{}, error) {
 		v = reflect.ValueOf(t)
 	}
 
-	if v.Len() == 0 {
-		return t, nil
-	}
-
 	var err error
 	var o interface{}
 
@@ -341,10 +337,12 @@ func (sd *Decoder) DecodeArray(t interface{}) (interface{}, error) {
 		return t, nil
 	}
 
+	sl := reflect.MakeSlice(v.Type(), int(length), int(length))
+
 	for i := 0; i < int(length); i++ {
-		arrayValue := v.Index(i)
+		arrayValue := sl.Index(i)
 
-		switch v.Index(i).Interface().(type) {
+		switch sl.Index(i).Interface().(type) {
 		case []byte:
 			o, err = sd.DecodeByteArray()
 			if err != nil {
@@ -371,7 +369,14 @@ func (sd *Decoder) DecodeArray(t interface{}) (interface{}, error) {
 		}
 	}
 
-	return t, err
+	switch t.(type) {
+	case [][]byte:
+		copy(t.([][]byte), sl.Interface().([][]byte))
+	case [][32]byte:
+		copy(t.([][32]byte), sl.Interface().([][32]byte))
+	}
+
+	return sl.Interface(), err
 }
 
 // DecodeTuple accepts a byte array representing the SCALE encoded tuple and an interface. This interface should be a pointer
@@ -415,6 +420,14 @@ func (sd *Decoder) DecodeTuple(t interface{}) (interface{}, error) {
 				// get the pointer to the value and set the value
 				ptr := fieldValue.(*[]byte)
 				*ptr = o.([]byte)
+			case [][]byte:
+				o, err = sd.DecodeArray([][]byte{})
+				if err != nil {
+					break
+				}
+
+				ptr := fieldValue.(*[][]byte)
+				*ptr = o.([][]byte)
 			case int8:
 				o, err = sd.DecodeFixedWidthInt(int8(0))
 				if err != nil {

codec/decode_ptr.go

@@ -193,20 +193,21 @@ func (sd *Decoder) DecodePtrBool(output interface{}) error {
 
 // DecodePtrIntArray decodes a byte array to an array of ints
 func (sd *Decoder) DecodePtrIntArray(t interface{}) error {
-	_, err := sd.DecodeInteger()
+	length, err := sd.DecodeInteger()
 	if err != nil {
 		return err
 	}
 
-	for i := range t.([]int) {
-		//var temp int64
-		//var err error
+	sl := make([]int, length)
+	for i := range sl {
 		temp, err := sd.DecodeInteger()
-		t.([]int)[i] = int(temp)
+		sl[i] = int(temp)
 		if err != nil {
 			break
 		}
 	}
+
+	copy(t.([]int), sl)
 	return nil
 }
 

codec/decode_test.go

@@ -317,7 +317,6 @@ var decodeTupleTests = []decodeTupleTest{
 }
 
 var decodeArrayTests = []decodeArrayTest{
-	{val: []byte{}, t: [][]byte{}, output: [][]byte{}},
 	{val: []byte{0x00}, t: []int{}, output: []int{}},
 	{val: []byte{0x04, 0x04}, t: make([]int, 1), output: []int{1}},
 	{val: []byte{0x10, 0x04, 0x08, 0x0c, 0x10}, t: make([]int, 4), output: []int{1, 2, 3, 4}},
@@ -508,3 +507,35 @@ func TestDecodeArrays(t *testing.T) {
 		}
 	}
 }
+
+func TestDecodeEmptyArray(t *testing.T) {
+	expected := &struct {
+		Number *big.Int
+		Digest [][]byte
+	}{
+		big.NewInt(9),
+		[][]byte{{0xa, 0xb, 0xc, 0xd}, {0xe, 0xf}},
+	}
+
+	testStruct := &struct {
+		Number *big.Int
+		Digest [][]byte
+	}{
+		big.NewInt(0),
+		[][]byte{},
+	}
+
+	enc, err := Encode(expected)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	output, err := Decode(enc, testStruct)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if !reflect.DeepEqual(output, expected) {
+		t.Fatalf("Fail: got %v expected %v", output, expected)
+	}
+}

consensus/babe/babe.go

@@ -294,7 +294,7 @@ func (b *Session) buildBlock(parent *types.Header, slot Slot) (*types.Block, err
 	// initialize block header
 	encodedHeader, err := scale.Encode(header)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("cannot encode header: %s", err)
 	}
 	err = b.initializeBlock(encodedHeader)
 	if err != nil {
@@ -304,21 +304,21 @@ func (b *Session) buildBlock(parent *types.Header, slot Slot) (*types.Block, err
 	// add block inherents
 	err = b.buildBlockInherents(slot)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("cannot build inherents: %s", err)
 	}
 
 	// add block extrinsics
 	included, err := b.buildBlockExtrinsics(slot)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("cannot build extrisnics: %s", err)
 	}
 
 	// finalize block
 	log.Trace("build_block finalize block")
 	block, err := b.finalizeBlock()
 	if err != nil {
 		b.addToQueue(included)
-		return nil, err
+		return nil, fmt.Errorf("cannot finalize block: %s", err)
 	}
 
 	block.Header.ParentHash = parent.Hash()

consensus/babe/runtime.go

@@ -64,11 +64,12 @@ func (b *Session) finalizeBlock() (*types.Block, error) {
 		return nil, err
 	}
 
-	bh := &types.Block{
-		Header: new(types.Header),
-		Body:   new(types.Body),
-	}
-
+	// TODO: finalize block actually returns a header, not a block. need to update this function
+	// as well as buildBlock
+	bh := new(types.Header)
 	_, err = scale.Decode(data, bh)
-	return bh, err
+	return &types.Block{
+		Header: bh,
+		Body:   nil,
+	}, err
 }

core/service_test.go

@@ -103,7 +103,7 @@ func TestValidateTransaction(t *testing.T) {
 	// https://github.com/paritytech/substrate/blob/ea2644a235f4b189c8029b9c9eac9d4df64ee91e/core/test-runtime/src/system.rs#L190
 	expected := &transaction.Validity{
 		Priority: 69,
-		Requires: [][]byte{{}},
+		Requires: [][]byte{},
 		// https://github.com/paritytech/substrate/blob/ea2644a235f4b189c8029b9c9eac9d4df64ee91e/core/test-runtime/src/system.rs#L173
 		Provides:  [][]byte{{146, 157, 61, 99, 63, 98, 30, 242, 128, 49, 150, 90, 140, 165, 187, 249}},
 		Longevity: 64,

p2p/message_test.go

@@ -499,7 +499,7 @@ func TestDecodeBlockAnnounceMessage(t *testing.T) {
 		Number:         big.NewInt(1),
 		StateRoot:      stateRoot,
 		ExtrinsicsRoot: extrinsicsRoot,
-		Digest:         nil,
+		Digest:         [][]byte{},
 	}
 
 	if !reflect.DeepEqual(bhm, expected) {