ensure valid domain asset id generating

MixinNetwork · Aug 27, 2022 · c49f530 · c49f530
1 parent 78d988b
commit c49f530
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 81 deletions.
diff --git a/domains/binance/validation.go b/domains/binance/validation.go
@@ -1,16 +1,14 @@
 package binance
 
 import (
-	"crypto/md5"
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"io"
 	"strings"
 
 	"github.com/MixinNetwork/mixin/crypto"
+	"github.com/MixinNetwork/mixin/domains/ethereum"
 	"github.com/btcsuite/btcd/btcutil/bech32"
-	"github.com/gofrs/uuid"
 )
 
 var (
@@ -77,14 +75,7 @@ func GenerateAssetId(assetKey string) crypto.Hash {
 		return BinanceChainId
 	}
 
-	h := md5.New()
-	io.WriteString(h, BinanceChainBase)
-	io.WriteString(h, assetKey)
-	sum := h.Sum(nil)
-	sum[6] = (sum[6] & 0x0f) | 0x30
-	sum[8] = (sum[8] & 0x3f) | 0x80
-	id := uuid.FromBytesOrNil(sum).String()
-	return crypto.NewHash([]byte(id))
+	return ethereum.BuildChainAssetId(BinanceChainBase, assetKey)
 }
 
 type AccAddress []byte

diff --git a/domains/eos/validation.go b/domains/eos/validation.go
@@ -1,15 +1,13 @@
 package eos
 
 import (
-	"crypto/md5"
 	"encoding/hex"
 	"fmt"
-	"io"
 	"regexp"
 	"strings"
 
 	"github.com/MixinNetwork/mixin/crypto"
-	"github.com/gofrs/uuid"
+	"github.com/MixinNetwork/mixin/domains/ethereum"
 )
 
 var (
@@ -97,12 +95,5 @@ func GenerateAssetId(assetKey string) crypto.Hash {
 		return EOSChainId
 	}
 
-	h := md5.New()
-	io.WriteString(h, EOSChainBase)
-	io.WriteString(h, assetKey)
-	sum := h.Sum(nil)
-	sum[6] = (sum[6] & 0x0f) | 0x30
-	sum[8] = (sum[8] & 0x3f) | 0x80
-	id := uuid.FromBytesOrNil(sum).String()
-	return crypto.NewHash([]byte(id))
+	return ethereum.BuildChainAssetId(EOSChainBase, assetKey)
 }
diff --git a/domains/etc/validation.go b/domains/etc/validation.go
@@ -1,15 +1,12 @@
 package etc
 
 import (
-	"crypto/md5"
 	"encoding/hex"
 	"fmt"
-	"io"
 	"strings"
 
 	"github.com/MixinNetwork/mixin/crypto"
 	"github.com/MixinNetwork/mixin/domains/ethereum"
-	"github.com/gofrs/uuid"
 )
 
 var (
@@ -99,14 +96,7 @@ func GenerateAssetId(assetKey string) crypto.Hash {
 		return EthereumClassicChainId
 	}
 
-	h := md5.New()
-	io.WriteString(h, EthereumClassicChainBase)
-	io.WriteString(h, assetKey)
-	sum := h.Sum(nil)
-	sum[6] = (sum[6] & 0x0f) | 0x30
-	sum[8] = (sum[8] & 0x3f) | 0x80
-	id := uuid.FromBytesOrNil(sum).String()
-	return crypto.NewHash([]byte(id))
+	return ethereum.BuildChainAssetId(EthereumClassicChainBase, assetKey)
 }
 
 func formatAddress(to string) (string, error) {

diff --git a/domains/ethereum/validation.go b/domains/ethereum/validation.go
@@ -99,14 +99,21 @@ func GenerateAssetId(assetKey string) crypto.Hash {
 		return EthereumChainId
 	}
 
+	return BuildChainAssetId(EthereumChainBase, assetKey)
+}
+
+func BuildChainAssetId(base, asset string) crypto.Hash {
 	h := md5.New()
-	io.WriteString(h, EthereumChainBase)
-	io.WriteString(h, assetKey)
+	io.WriteString(h, base)
+	io.WriteString(h, asset)
 	sum := h.Sum(nil)
 	sum[6] = (sum[6] & 0x0f) | 0x30
 	sum[8] = (sum[8] & 0x3f) | 0x80
-	id := uuid.FromBytesOrNil(sum).String()
-	return crypto.NewHash([]byte(id))
+	id, err := uuid.FromBytes(sum)
+	if err != nil {
+		panic(hex.EncodeToString(sum))
+	}
+	return crypto.NewHash([]byte(id.String()))
 }
 
 const (

diff --git a/domains/polygon/validation.go b/domains/polygon/validation.go
@@ -1,14 +1,12 @@
 package polygon
 
 import (
-	"crypto/md5"
 	"encoding/hex"
 	"fmt"
-	"io"
 	"strings"
 
 	"github.com/MixinNetwork/mixin/crypto"
-	"github.com/gofrs/uuid"
+	"github.com/MixinNetwork/mixin/domains/ethereum"
 	"golang.org/x/crypto/sha3"
 )
 
@@ -99,14 +97,7 @@ func GenerateAssetId(assetKey string) crypto.Hash {
 		return PolygonChainId
 	}
 
-	h := md5.New()
-	io.WriteString(h, PolygonChainBase)
-	io.WriteString(h, assetKey)
-	sum := h.Sum(nil)
-	sum[6] = (sum[6] & 0x0f) | 0x30
-	sum[8] = (sum[8] & 0x3f) | 0x80
-	id := uuid.FromBytesOrNil(sum).String()
-	return crypto.NewHash([]byte(id))
+	return ethereum.BuildChainAssetId(PolygonChainBase, assetKey)
 }
 
 const (

diff --git a/domains/solana/validation.go b/domains/solana/validation.go
@@ -1,14 +1,12 @@
 package solana
 
 import (
-	"crypto/md5"
 	"fmt"
-	"io"
 	"strings"
 
 	"github.com/MixinNetwork/mixin/crypto"
+	"github.com/MixinNetwork/mixin/domains/ethereum"
 	"github.com/btcsuite/btcd/btcutil/base58"
-	"github.com/gofrs/uuid"
 )
 
 var (
@@ -85,12 +83,5 @@ func GenerateAssetId(assetKey string) crypto.Hash {
 		panic(assetKey)
 	}
 
-	h := md5.New()
-	io.WriteString(h, SolanaChainBase)
-	io.WriteString(h, assetKey)
-	sum := h.Sum(nil)
-	sum[6] = (sum[6] & 0x0f) | 0x30
-	sum[8] = (sum[8] & 0x3f) | 0x80
-	id := uuid.FromBytesOrNil(sum).String()
-	return crypto.NewHash([]byte(id))
+	return ethereum.BuildChainAssetId(SolanaChainBase, assetKey)
 }
diff --git a/domains/terra/validation.go b/domains/terra/validation.go
@@ -1,16 +1,14 @@
 package terra
 
 import (
-	"crypto/md5"
 	"encoding/hex"
 	"fmt"
-	"io"
 	"regexp"
 	"strings"
 
 	"github.com/MixinNetwork/mixin/crypto"
+	"github.com/MixinNetwork/mixin/domains/ethereum"
 	"github.com/btcsuite/btcd/btcutil/bech32"
-	"github.com/gofrs/uuid"
 )
 
 var (
@@ -88,14 +86,7 @@ func GenerateAssetId(assetKey string) crypto.Hash {
 		panic(assetKey)
 	}
 
-	h := md5.New()
-	io.WriteString(h, TerraChainBase)
-	io.WriteString(h, assetKey)
-	sum := h.Sum(nil)
-	sum[6] = (sum[6] & 0x0f) | 0x30
-	sum[8] = (sum[8] & 0x3f) | 0x80
-	id := uuid.FromBytesOrNil(sum).String()
-	return crypto.NewHash([]byte(id))
+	return ethereum.BuildChainAssetId(TerraChainBase, assetKey)
 }
 
 func convertAndEncode(hrp string, data []byte) (string, error) {

diff --git a/domains/tron/validation.go b/domains/tron/validation.go
@@ -1,16 +1,14 @@
 package tron
 
 import (
-	"crypto/md5"
 	"encoding/hex"
 	"fmt"
-	"io"
 	"strconv"
 	"strings"
 
 	"github.com/MixinNetwork/mixin/crypto"
+	"github.com/MixinNetwork/mixin/domains/ethereum"
 	"github.com/btcsuite/btcd/btcutil/base58"
-	"github.com/gofrs/uuid"
 )
 
 var (
@@ -93,14 +91,7 @@ func GenerateAssetId(assetKey string) crypto.Hash {
 		return TronChainId
 	}
 
-	h := md5.New()
-	io.WriteString(h, TronChainBase)
-	io.WriteString(h, assetKey)
-	sum := h.Sum(nil)
-	sum[6] = (sum[6] & 0x0f) | 0x30
-	sum[8] = (sum[8] & 0x3f) | 0x80
-	id := uuid.FromBytesOrNil(sum).String()
-	return crypto.NewHash([]byte(id))
+	return ethereum.BuildChainAssetId(TronChainBase, assetKey)
 }
 
 func formatAddress(to string) (string, error) {