Update common.L1Tx parsers, add test checks

common/l1tx.go

@@ -1,18 +1,17 @@
 package common
 
 import (
+	"fmt"
 	"math/big"
 
 	ethCommon "github.com/ethereum/go-ethereum/common"
+	"github.com/hermeznetwork/hermez-node/utils"
 	"github.com/iden3/go-iden3-crypto/babyjub"
 )
 
 const (
-	fromBJJCompressedB = 256
+	// L1TxBytesLen is the length of the byte array that represents the L1Tx
-	fromEthAddrB       = 160
+	L1TxBytesLen = 68
-	f16B               = 16
-	tokenIDB           = 32
-	cidXB              = 32
 )
 
 // L1Tx is a struct that represents a L1 tx
@@ -64,69 +63,57 @@ func (tx *L1Tx) Tx() *Tx {
 }
 
 // Bytes encodes a L1Tx into []byte
-func (tx *L1Tx) Bytes(nLevels int) []byte {
+func (tx *L1Tx) Bytes(nLevels int) ([]byte, error) {
-	res := big.NewInt(0)
+	var b [68]byte
-	res = res.Add(res, big.NewInt(0).Or(big.NewInt(0), tx.ToIdx.BigInt()))
+	copy(b[0:4], tx.ToIdx.Bytes())
-	res = res.Add(res, big.NewInt(0).Lsh(big.NewInt(0).Or(big.NewInt(0), big.NewInt(int64(tx.TokenID))), uint(nLevels)))
+	copy(b[4:8], tx.TokenID.Bytes())
-	res = res.Add(res, big.NewInt(0).Lsh(big.NewInt(0).Or(big.NewInt(0), tx.Amount), uint(nLevels+tokenIDB)))
+	amountFloat16, err := utils.NewFloat16(tx.Amount)
-	res = res.Add(res, big.NewInt(0).Lsh(big.NewInt(0).Or(big.NewInt(0), tx.LoadAmount), uint(nLevels+tokenIDB+f16B)))
+	if err != nil {
-	res = res.Add(res, big.NewInt(0).Lsh(big.NewInt(0).Or(big.NewInt(0), tx.FromIdx.BigInt()), uint(nLevels+tokenIDB+2*f16B)))
+		return nil, err
-
+	}
-	fromBJJ := big.NewInt(0)
+	copy(b[8:10], amountFloat16.Bytes())
-	fromBJJ.SetString(tx.FromBJJ.String(), 16)
+	loadAmountFloat16, err := utils.NewFloat16(tx.LoadAmount)
-	fromBJJCompressed := big.NewInt(0).Or(big.NewInt(0), fromBJJ)
+	if err != nil {
-	res = res.Add(res, big.NewInt(0).Lsh(fromBJJCompressed, uint(2*nLevels+tokenIDB+2*f16B)))
+		return nil, err
-
+	}
-	fromEthAddr := big.NewInt(0).Or(big.NewInt(0), tx.FromEthAddr.Hash().Big())
+	copy(b[10:12], loadAmountFloat16.Bytes())
-	res = res.Add(res, big.NewInt(0).Lsh(fromEthAddr, uint(fromBJJCompressedB+2*nLevels+tokenIDB+2*f16B)))
+	copy(b[12:16], tx.FromIdx.Bytes())
-
+	pkComp := tx.FromBJJ.Compress()
-	return res.Bytes()
+	copy(b[16:48], SwapEndianness(pkComp[:]))
+	copy(b[48:68], SwapEndianness(tx.FromEthAddr.Bytes()))
+	return SwapEndianness(b[:]), nil
 }
 
 // L1TxFromBytes decodes a L1Tx from []byte
-func L1TxFromBytes(l1TxEncoded []byte) (*L1Tx, error) {
+func L1TxFromBytes(bRaw []byte) (*L1Tx, error) {
-	l1Tx := &L1Tx{}
+	if len(bRaw) != L1TxBytesLen {
-	var idxB uint = cidXB
+		return nil, fmt.Errorf("Can not parse L1Tx bytes, expected length %d, current: %d", 68, len(bRaw))
-
+	}
-	l1TxEncodedBI := big.NewInt(0)
-	l1TxEncodedBI.SetBytes(l1TxEncoded)
-
-	toIdx, err := IdxFromBigInt(extract(l1TxEncodedBI, 0, idxB))
 
+	b := SwapEndianness(bRaw)
+	tx := &L1Tx{}
+	var err error
+	tx.ToIdx, err = IdxFromBytes(b[0:4])
 	if err != nil {
 		return nil, err
 	}
-
+	tx.TokenID, err = TokenIDFromBytes(b[4:8])
-	l1Tx.ToIdx = toIdx
-
-	l1Tx.TokenID = TokenID(extract(l1TxEncodedBI, idxB, tokenIDB).Uint64())
-	l1Tx.Amount = extract(l1TxEncodedBI, idxB+tokenIDB, f16B)
-	l1Tx.LoadAmount = extract(l1TxEncodedBI, idxB+tokenIDB+f16B, f16B)
-	fromIdx, err := IdxFromBigInt(extract(l1TxEncodedBI, idxB+tokenIDB+2*f16B, f16B))
-
 	if err != nil {
 		return nil, err
 	}
-
+	tx.Amount = new(big.Int).SetBytes(SwapEndianness(b[8:10]))
-	l1Tx.FromIdx = fromIdx
+	tx.LoadAmount = new(big.Int).SetBytes(SwapEndianness(b[10:12]))
-
+	tx.FromIdx, err = IdxFromBytes(b[12:16])
+	if err != nil {
+		return nil, err
+	}
+	pkCompB := SwapEndianness(b[16:48])
 	var pkComp babyjub.PublicKeyComp
-	copy(pkComp[:], extract(l1TxEncodedBI, 2*idxB+tokenIDB+2*f16B, fromBJJCompressedB).Bytes())
+	copy(pkComp[:], pkCompB)
-	pk, err := pkComp.Decompress()
+	tx.FromBJJ, err = pkComp.Decompress()
-
 	if err != nil {
 		return nil, err
 	}
-
+	tx.FromEthAddr = ethCommon.BytesToAddress(SwapEndianness(b[48:68]))
-	l1Tx.FromBJJ = pk
+	return tx, nil
-
-	l1Tx.FromEthAddr = ethCommon.BigToAddress(extract(l1TxEncodedBI, fromBJJCompressedB+2*idxB+tokenIDB+2*f16B, fromEthAddrB))
-
-	return l1Tx, nil
-}
-
-// extract masks and shifts a bigInt
-func extract(num *big.Int, origin uint, len uint) *big.Int {
-	mask := big.NewInt(0).Sub(big.NewInt(0).Lsh(big.NewInt(1), len), big.NewInt(1))
-	return big.NewInt(0).And(big.NewInt(0).Rsh(num, origin), mask)
 }

common/l1tx_test.go

@@ -32,12 +32,23 @@ func TestL1TxCodec(t *testing.T) {
 	expected, err := utils.HexDecode("c58d29fa6e86e4fae04ddced660d45bcf3cb237056ca90f80d7c374ae7485e9bcc47d4ac399460948da6aeeb899311097925a72c00000002000200010000000500000003")
 	require.Nil(t, err)
 
-	encodedData := l1Tx.Bytes(32)
+	encodedData, err := l1Tx.Bytes(32)
+	require.Nil(t, err)
 	assert.Equal(t, expected, encodedData)
 
 	decodedData, err := L1TxFromBytes(encodedData)
 	require.Nil(t, err)
+	assert.Equal(t, l1Tx, *decodedData)
 
-	encodedData2 := decodedData.Bytes(32)
+	encodedData2, err := decodedData.Bytes(32)
+	require.Nil(t, err)
 	assert.Equal(t, encodedData, encodedData2)
+
+	// expect error if length!=68
+	_, err = L1TxFromBytes(encodedData[:66])
+	require.NotNil(t, err)
+	_, err = L1TxFromBytes([]byte{})
+	require.NotNil(t, err)
+	_, err = L1TxFromBytes(nil)
+	require.NotNil(t, err)
 }

common/token.go

@@ -2,12 +2,16 @@ package common
 
 import (
 	"encoding/binary"
+	"fmt"
 	"math/big"
 	"time"
 
 	ethCommon "github.com/ethereum/go-ethereum/common"
 )
 
+// tokenIDBytesLen defines the length of the TokenID byte array representation
+const tokenIDBytesLen = 4
+
 // Token is a struct that represents an Ethereum token that is supported in Hermez network
 type Token struct {
 	TokenID     TokenID           `meddler:"token_id"`
@@ -41,3 +45,12 @@ func (t TokenID) Bytes() []byte {
 func (t TokenID) BigInt() *big.Int {
 	return big.NewInt(int64(t))
 }
+
+// TokenIDFromBytes returns TokenID from a byte array
+func TokenIDFromBytes(b []byte) (TokenID, error) {
+	if len(b) != tokenIDBytesLen {
+		return 0, fmt.Errorf("can not parse TokenID, bytes len %d, expected 4", len(b))
+	}
+	tid := binary.LittleEndian.Uint32(b[:4])
+	return TokenID(tid), nil
+}