allow endianness choice in convutil

Author: nottug

autolykos2/autolykos2.go

@@ -84,8 +84,8 @@ func (cfg *Config) genIndexes(seed []byte, n uint32) []uint32 {
 
 func (cfg *Config) Compute(msg []byte, nonce, height uint64) []byte {
 	m := generateM(1024)
-	h := convutil.Uint32ToBytesBE(uint32(height))
-	nonceBytes := convutil.Uint64ToBytesBE(nonce)
+	h := convutil.Uint32ToBytes(uint32(height), binary.BigEndian)
+	nonceBytes := convutil.Uint64ToBytes(nonce, binary.BigEndian)
 
 	n := cfg.calcN(height)
 	bigN := new(big.Int).SetUint64(uint64(n))
@@ -94,15 +94,15 @@ func (cfg *Config) Compute(msg []byte, nonce, height uint64) []byte {
 	msgHash := crypto.Blake2b256(fullMsg)
 	prei8 := new(big.Int).SetBytes(msgHash[24:32])
 
-	i := convutil.Uint32ToBytesBE(uint32(prei8.Mod(prei8, bigN).Uint64()))
+	i := convutil.Uint32ToBytes(uint32(prei8.Mod(prei8, bigN).Uint64()), binary.BigEndian)
 	f := crypto.Blake2b256(concatBytes(i, concatBytes(h, m)))[1:32]
 
 	seed := concatBytes(f, concatBytes(msg, nonceBytes))
 	indexes := cfg.genIndexes(seed, n)
 
 	f2 := new(big.Int)
 	for _, index := range indexes {
-		elem := concatBytes(convutil.Uint32ToBytesBE(index), concatBytes(h, m))
+		elem := concatBytes(convutil.Uint32ToBytes(index, binary.BigEndian), concatBytes(h, m))
 		elemHash := crypto.Blake2b256(elem)[1:]
 		f2.Add(f2, new(big.Int).SetBytes(elemHash))
 	}

firopow/firopow.go

@@ -42,9 +42,7 @@ func finalize(seed [25]uint32, mixHash []byte) []byte {
 
 	crypto.KeccakF800(&state)
 
-	digest := convutil.Uint32ArrayToBytesLE(state[:8])
-
-	return digest
+	return convutil.Uint32ArrayToBytes(state[:8], binary.LittleEndian)
 }
 
 func firopow(hash []byte, height, nonce, datasetSize uint64, lookup func(index uint32) []uint32, l1 []uint32) ([]byte, []byte) {

internal/common/convutil/convutil.go

@@ -4,37 +4,35 @@ import (
 	"encoding/binary"
 )
 
-func Uint32ArrayToBytesLE(arr []uint32) []byte {
+func Uint32ArrayToBytes(arr []uint32, byteOrder binary.ByteOrder) []byte {
 	buf := make([]byte, len(arr)*4)
-
 	for i, v := range arr {
-		binary.LittleEndian.PutUint32(buf[i*4:], v)
+		byteOrder.PutUint32(buf[i*4:], v)
 	}
 
 	return buf
 }
 
-func BytesToUint32ArrayLE(buf []byte) []uint32 {
+func BytesToUint32Array(buf []byte, byteOrder binary.ByteOrder) []uint32 {
 	length := len(buf) / 4
 	arr := make([]uint32, length)
-
 	for i := 0; i < length; i++ {
-		arr[i] = binary.LittleEndian.Uint32(buf[i*4 : (i+1)*4])
+		arr[i] = byteOrder.Uint32(buf[i*4 : (i+1)*4])
 	}
 
 	return arr
 }
 
-func Uint32ToBytesBE(val uint32) []byte {
+func Uint32ToBytes(val uint32, byteOrder binary.ByteOrder) []byte {
 	data := make([]byte, 4)
-	binary.BigEndian.PutUint32(data, val)
+	byteOrder.PutUint32(data, val)
 
 	return data
 }
 
-func Uint64ToBytesBE(val uint64) []byte {
+func Uint64ToBytes(val uint64, byteOrder binary.ByteOrder) []byte {
 	data := make([]byte, 8)
-	binary.BigEndian.PutUint64(data, val)
+	byteOrder.PutUint64(data, val)
 
 	return data
 }

internal/dag/generate_test.go

@@ -17,6 +17,7 @@
 package dag
 
 import (
+	"encoding/binary"
 	"reflect"
 	"testing"
 
@@ -107,7 +108,7 @@ func TestCacheGeneration(t *testing.T) {
 		seed := d.SeedHash(uint64(tt.epoch)*d.EpochLength + 1)
 		d.generateCache(cache, tt.epoch, seed)
 
-		want := convutil.BytesToUint32ArrayLE(tt.cache)
+		want := convutil.BytesToUint32Array(tt.cache, binary.LittleEndian)
 		if !reflect.DeepEqual(cache, want) {
 			t.Errorf("failed on %d: cache mismatch: have %x, want %x", i, cache, want)
 		}
@@ -160,7 +161,7 @@ func TestCacheGenerationHashed(t *testing.T) {
 		seed := d.SeedHash(uint64(tt.epoch)*d.EpochLength + 1)
 		d.generateCache(cache, tt.epoch, seed)
 
-		raw := convutil.Uint32ArrayToBytesLE(cache)
+		raw := convutil.Uint32ArrayToBytes(cache, binary.LittleEndian)
 		hash := crypto.Keccak256(raw)
 
 		if !reflect.DeepEqual(hash, tt.hash) {

internal/progpow/algorithm.go

@@ -5,6 +5,8 @@
 package progpow
 
 import (
+	"encoding/binary"
+
 	"github.com/sencha-dev/powkit/internal/common/convutil"
 	"github.com/sencha-dev/powkit/internal/crypto"
 	"github.com/sencha-dev/powkit/internal/dag"
@@ -136,5 +138,5 @@ func Hash(cfg *Config, height, seed, datasetSize uint64, lookup dag.LookupFunc,
 		mixHash[l%numWords] = crypto.Fnv1a(mixHash[l%numWords], laneHash[l])
 	}
 
-	return convutil.Uint32ArrayToBytesLE(mixHash)
+	return convutil.Uint32ArrayToBytes(mixHash, binary.LittleEndian)
 }

internal/progpow/progpow094.go

@@ -47,9 +47,7 @@ func finalize(seed [25]uint32, mixHash []byte) []byte {
 
 	crypto.KeccakF800(&state)
 
-	digest := convutil.Uint32ArrayToBytesLE(state[:8])
-
-	return digest
+	return convutil.Uint32ArrayToBytes(state[:8], binary.LittleEndian)
 }
 
 func compute(hash []byte, height, nonce, datasetSize uint64, lookup func(index uint32) []uint32, l1 []uint32) ([]byte, []byte) {

kawpow/kawpow.go

@@ -63,9 +63,7 @@ func finalize(seed [25]uint32, mixHash []byte) []byte {
 
 	crypto.KeccakF800(&state)
 
-	digest := convutil.Uint32ArrayToBytesLE(state[:8])
-
-	return digest
+	return convutil.Uint32ArrayToBytes(state[:8], binary.LittleEndian)
 }
 
 func kawpow(hash []byte, height, nonce, datasetSize uint64, lookup func(index uint32) []uint32, l1 []uint32) ([]byte, []byte) {