fixed serialization/deserialization

api/gateway/chain/internal/service/gateway/connector.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/tech/sendico/gateway/chain/internal/appversion"
 	"github.com/tech/sendico/gateway/chain/internal/service/gateway/shared"
+	chainasset "github.com/tech/sendico/pkg/chain"
 	"github.com/tech/sendico/pkg/connector/params"
 	"github.com/tech/sendico/pkg/merrors"
 	describablev1 "github.com/tech/sendico/pkg/proto/common/describable/v1"
@@ -372,7 +373,7 @@ func chainWalletToAccount(wallet *chainv1.ManagedWallet) *connectorv1.Account {
 			AccountId:   strings.TrimSpace(wallet.GetWalletRef()),
 		},
 		Kind:            connectorv1.AccountKind_CHAIN_MANAGED_WALLET,
-		Asset:           assetStringFromChainAsset(wallet.GetAsset()),
+		Asset:           chainasset.AssetString(wallet.GetAsset()),
 		State:           chainWalletState(wallet.GetStatus()),
 		Label:           strings.TrimSpace(wallet.GetDescribable().GetName()),
 		OwnerRef:        strings.TrimSpace(wallet.GetOwnerRef()),
@@ -568,79 +569,12 @@ func chainStatusFromOperation(status connectorv1.OperationStatus) chainv1.Transf
 }
 
 func parseChainAsset(assetString string, reader params.Reader) (*chainv1.Asset, error) {
-	network := strings.TrimSpace(reader.String("network"))
-	token := strings.TrimSpace(reader.String("token_symbol"))
-	contract := strings.TrimSpace(reader.String("contract_address"))
-
-	if token == "" {
-		token = tokenFromAssetString(assetString)
-	}
-	if network == "" {
-		network = networkFromAssetString(assetString)
-	}
-	if token == "" {
-		return nil, merrors.InvalidArgument("asset: token_symbol is required")
-	}
-	chain := shared.ChainEnumFromName(network)
-	if chain == chainv1.ChainNetwork_CHAIN_NETWORK_UNSPECIFIED {
-		return nil, merrors.InvalidArgument("asset: network is required")
-	}
-	return &chainv1.Asset{
-		Chain:           chain,
-		TokenSymbol:     strings.ToUpper(token),
-		ContractAddress: strings.ToLower(contract),
-	}, nil
-}
-
-func tokenFromAssetString(asset string) string {
-	if asset == "" {
-		return ""
-	}
-	if idx := strings.Index(asset, "-"); idx > 0 {
-		return asset[:idx]
-	}
-	return asset
-}
-
-func networkFromAssetString(asset string) string {
-	if asset == "" {
-		return ""
-	}
-	idx := strings.Index(asset, "-")
-	if idx < 0 {
-		return ""
-	}
-	return strings.TrimSpace(asset[idx+1:])
-}
-
-func assetStringFromChainAsset(asset *chainv1.Asset) string {
-	if asset == nil {
-		return ""
-	}
-	symbol := strings.ToUpper(strings.TrimSpace(asset.GetTokenSymbol()))
-	if symbol == "" {
-		return ""
-	}
-	suffix := chainAssetSuffix(asset.GetChain())
-	if suffix == "" {
-		return symbol
-	}
-	return symbol + "-" + suffix
-}
-
-func chainAssetSuffix(chain chainv1.ChainNetwork) string {
-	switch chain {
-	case chainv1.ChainNetwork_CHAIN_NETWORK_ETHEREUM_MAINNET:
-		return "ETH"
-	case chainv1.ChainNetwork_CHAIN_NETWORK_ARBITRUM_ONE:
-		return "ARB"
-	case chainv1.ChainNetwork_CHAIN_NETWORK_TRON_MAINNET:
-		return "TRC20"
-	case chainv1.ChainNetwork_CHAIN_NETWORK_TRON_NILE:
-		return "TRC20"
-	default:
-		return ""
-	}
+	return chainasset.ParseAsset(
+		assetString,
+		reader.String("network"),
+		reader.String("token_symbol"),
+		reader.String("contract_address"),
+	)
 }
 
 func describableFromLabel(label, desc string) *describablev1.Describable {

api/gateway/chain/internal/service/gateway/shared/helpers.go

@@ -4,6 +4,7 @@ import (
 	"strings"
 
 	"github.com/tech/sendico/gateway/chain/storage/model"
+	chainasset "github.com/tech/sendico/pkg/chain"
 	moneyv1 "github.com/tech/sendico/pkg/proto/common/money/v1"
 	chainv1 "github.com/tech/sendico/pkg/proto/gateway/chain/v1"
 	"go.mongodb.org/mongo-driver/bson/primitive"
@@ -57,15 +58,7 @@ func ChainKeyFromEnum(chain chainv1.ChainNetwork) (string, chainv1.ChainNetwork)
 }
 
 func ChainEnumFromName(name string) chainv1.ChainNetwork {
-	if name == "" {
-		return chainv1.ChainNetwork_CHAIN_NETWORK_UNSPECIFIED
-	}
-	upper := strings.ToUpper(strings.ReplaceAll(strings.ReplaceAll(name, " ", "_"), "-", "_"))
-	key := "CHAIN_NETWORK_" + upper
-	if val, ok := chainv1.ChainNetwork_value[key]; ok {
-		return chainv1.ChainNetwork(val)
-	}
-	return chainv1.ChainNetwork_CHAIN_NETWORK_UNSPECIFIED
+	return chainasset.NetworkFromString(name)
 }
 
 func ManagedWalletStatusToProto(status model.ManagedWalletStatus) chainv1.ManagedWalletStatus {