fixed serialization/deserialization

2026-01-15 20:02:03 +01:00
parent b512da71de
commit 0d6e16711f
7 changed files with 260 additions and 213 deletions
--- a/api/gateway/chain/client/client.go
+++ b/api/gateway/chain/client/client.go
@@ -7,11 +7,12 @@ import (
 	"strings"
 	"time"

+	chainasset "github.com/tech/sendico/pkg/chain"
 	"github.com/tech/sendico/pkg/merrors"
-	connectorv1 "github.com/tech/sendico/pkg/proto/connector/v1"
 	describablev1 "github.com/tech/sendico/pkg/proto/common/describable/v1"
 	moneyv1 "github.com/tech/sendico/pkg/proto/common/money/v1"
 	paginationv1 "github.com/tech/sendico/pkg/proto/common/pagination/v1"
+	connectorv1 "github.com/tech/sendico/pkg/proto/connector/v1"
 	chainv1 "github.com/tech/sendico/pkg/proto/gateway/chain/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
@@ -116,7 +117,7 @@ func (c *chainGatewayClient) CreateManagedWallet(ctx context.Context, req *chain
 	resp, err := c.client.OpenAccount(ctx, &connectorv1.OpenAccountRequest{
 		IdempotencyKey: strings.TrimSpace(req.GetIdempotencyKey()),
 		Kind:           connectorv1.AccountKind_CHAIN_MANAGED_WALLET,
-		Asset:          assetStringFromChainAsset(req.GetAsset()),
+		Asset:          chainasset.AssetString(req.GetAsset()),
 		OwnerRef:       strings.TrimSpace(req.GetOwnerRef()),
 		Label:          label,
 		Params:         params,
@@ -152,7 +153,7 @@ func (c *chainGatewayClient) ListManagedWallets(ctx context.Context, req *chainv
 	orgRef := ""
 	var page *paginationv1.CursorPageRequest
 	if req != nil {
-		assetString = assetStringFromChainAsset(req.GetAsset())
+		assetString = chainasset.AssetString(req.GetAsset())
 		ownerRef = strings.TrimSpace(req.GetOwnerRef())
 		orgRef = strings.TrimSpace(req.GetOrganizationRef())
 		page = req.GetPage()
@@ -189,10 +190,10 @@ func (c *chainGatewayClient) GetWalletBalance(ctx context.Context, req *chainv1.
 		return nil, merrors.Internal("chain-gateway: balance response missing")
 	}
 	return &chainv1.GetWalletBalanceResponse{Balance: &chainv1.WalletBalance{
-		Available:      balance.GetAvailable(),
-		PendingInbound: balance.GetPendingInbound(),
+		Available:       balance.GetAvailable(),
+		PendingInbound:  balance.GetPendingInbound(),
 		PendingOutbound: balance.GetPendingOutbound(),
-		CalculatedAt:   balance.GetCalculatedAt(),
+		CalculatedAt:    balance.GetCalculatedAt(),
 	}}, nil
 }

@@ -332,7 +333,7 @@ func walletParamsFromRequest(req *chainv1.CreateManagedWalletRequest) (*structpb
 		"organization_ref": strings.TrimSpace(req.GetOrganizationRef()),
 	}
 	if asset := req.GetAsset(); asset != nil {
-		params["network"] = asset.GetChain().String()
+		params["network"] = chainasset.NetworkName(asset.GetChain())
 		params["token_symbol"] = strings.TrimSpace(asset.GetTokenSymbol())
 		params["contract_address"] = strings.TrimSpace(asset.GetContractAddress())
 	}
@@ -370,12 +371,12 @@ func managedWalletFromAccount(account *connectorv1.Account) *chainv1.ManagedWall
 		ownerRef = strings.TrimSpace(account.GetOwnerRef())
 	}
 	asset := &chainv1.Asset{
-		Chain:           chainNetworkFromString(stringFromDetails(details, "network")),
+		Chain:           chainasset.NetworkFromString(stringFromDetails(details, "network")),
 		TokenSymbol:     strings.TrimSpace(stringFromDetails(details, "token_symbol")),
 		ContractAddress: strings.TrimSpace(stringFromDetails(details, "contract_address")),
 	}
 	if asset.GetTokenSymbol() == "" {
-		asset.TokenSymbol = strings.TrimSpace(tokenFromAssetString(account.GetAsset()))
+		asset.TokenSymbol = strings.TrimSpace(chainasset.TokenFromAssetString(account.GetAsset()))
 	}
 	describable := account.GetDescribable()
 	label := strings.TrimSpace(account.GetLabel())
@@ -392,15 +393,15 @@ func managedWalletFromAccount(account *connectorv1.Account) *chainv1.ManagedWall
 		}
 	}
 	return &chainv1.ManagedWallet{
-		WalletRef:      walletRef,
+		WalletRef:       walletRef,
 		OrganizationRef: organizationRef,
-		OwnerRef:       ownerRef,
-		Asset:          asset,
-		DepositAddress: stringFromDetails(details, "deposit_address"),
-		Status:         managedWalletStatusFromAccount(account.GetState()),
-		CreatedAt:      account.GetCreatedAt(),
-		UpdatedAt:      account.GetUpdatedAt(),
-		Describable:    describable,
+		OwnerRef:        ownerRef,
+		Asset:           asset,
+		DepositAddress:  stringFromDetails(details, "deposit_address"),
+		Status:          managedWalletStatusFromAccount(account.GetState()),
+		CreatedAt:       account.GetCreatedAt(),
+		UpdatedAt:       account.GetUpdatedAt(),
+		Describable:     describable,
 	}
 }

@@ -438,7 +439,7 @@ func operationFromTransfer(req *chainv1.SubmitTransferRequest) (*connectorv1.Ope
 	op := &connectorv1.Operation{
 		Type:           connectorv1.OperationType_TRANSFER,
 		IdempotencyKey: strings.TrimSpace(req.GetIdempotencyKey()),
-		From: &connectorv1.OperationParty{Ref: &connectorv1.OperationParty_Account{Account: &connectorv1.AccountRef{ConnectorId: chainConnectorID, AccountId: strings.TrimSpace(req.GetSourceWalletRef())}}},
+		From:           &connectorv1.OperationParty{Ref: &connectorv1.OperationParty_Account{Account: &connectorv1.AccountRef{ConnectorId: chainConnectorID, AccountId: strings.TrimSpace(req.GetSourceWalletRef())}}},
 		Money:          req.GetAmount(),
 		Params:         structFromMap(params),
 	}
@@ -487,14 +488,14 @@ func transferFromOperation(op *connectorv1.Operation) *chainv1.Transfer {
 		return nil
 	}
 	transfer := &chainv1.Transfer{
-		TransferRef:    strings.TrimSpace(op.GetOperationId()),
-		IdempotencyKey: strings.TrimSpace(op.GetOperationId()),
+		TransferRef:     strings.TrimSpace(op.GetOperationId()),
+		IdempotencyKey:  strings.TrimSpace(op.GetOperationId()),
 		RequestedAmount: op.GetMoney(),
-		NetAmount:      op.GetMoney(),
-		Status:         transferStatusFromOperation(op.GetStatus()),
+		NetAmount:       op.GetMoney(),
+		Status:          transferStatusFromOperation(op.GetStatus()),
 		TransactionHash: strings.TrimSpace(op.GetProviderRef()),
-		CreatedAt:      op.GetCreatedAt(),
-		UpdatedAt:      op.GetUpdatedAt(),
+		CreatedAt:       op.GetCreatedAt(),
+		UpdatedAt:       op.GetUpdatedAt(),
 	}
 	if from := op.GetFrom(); from != nil && from.GetAccount() != nil {
 		transfer.SourceWalletRef = strings.TrimSpace(from.GetAccount().GetAccountId())
@@ -527,7 +528,7 @@ func feeEstimateOperation(req *chainv1.EstimateTransferFeeRequest) (*connectorv1
 	op := &connectorv1.Operation{
 		Type:           connectorv1.OperationType_FEE_ESTIMATE,
 		IdempotencyKey: feeEstimateKey(req),
-		From: &connectorv1.OperationParty{Ref: &connectorv1.OperationParty_Account{Account: &connectorv1.AccountRef{ConnectorId: chainConnectorID, AccountId: strings.TrimSpace(req.GetSourceWalletRef())}}},
+		From:           &connectorv1.OperationParty{Ref: &connectorv1.OperationParty_Account{Account: &connectorv1.AccountRef{ConnectorId: chainConnectorID, AccountId: strings.TrimSpace(req.GetSourceWalletRef())}}},
 		Money:          req.GetAmount(),
 		Params:         structFromMap(params),
 	}
@@ -567,14 +568,14 @@ func gasTopUpComputeOperation(req *chainv1.ComputeGasTopUpRequest) (*connectorv1
 		return nil, merrors.InvalidArgument("chain-gateway: estimated_total_fee is required")
 	}
 	params := map[string]interface{}{
-		"mode":               "compute",
+		"mode":                "compute",
 		"estimated_total_fee": map[string]interface{}{"amount": fee.GetAmount(), "currency": fee.GetCurrency()},
 	}
 	return &connectorv1.Operation{
 		Type:           connectorv1.OperationType_GAS_TOPUP,
 		IdempotencyKey: fmt.Sprintf("gas_topup_compute:%s:%s", strings.TrimSpace(req.GetWalletRef()), strings.TrimSpace(fee.GetAmount())),
-		From: &connectorv1.OperationParty{Ref: &connectorv1.OperationParty_Account{Account: &connectorv1.AccountRef{ConnectorId: chainConnectorID, AccountId: strings.TrimSpace(req.GetWalletRef())}}},
-		Params: structFromMap(params),
+		From:           &connectorv1.OperationParty{Ref: &connectorv1.OperationParty_Account{Account: &connectorv1.AccountRef{ConnectorId: chainConnectorID, AccountId: strings.TrimSpace(req.GetWalletRef())}}},
+		Params:         structFromMap(params),
 	}, nil
 }

@@ -596,10 +597,10 @@ func gasTopUpEnsureOperation(req *chainv1.EnsureGasTopUpRequest) (*connectorv1.O
 		return nil, merrors.InvalidArgument("chain-gateway: estimated_total_fee is required")
 	}
 	params := map[string]interface{}{
-		"mode":               "ensure",
-		"organization_ref":   strings.TrimSpace(req.GetOrganizationRef()),
-		"target_wallet_ref":  strings.TrimSpace(req.GetTargetWalletRef()),
-		"client_reference":   strings.TrimSpace(req.GetClientReference()),
+		"mode":                "ensure",
+		"organization_ref":    strings.TrimSpace(req.GetOrganizationRef()),
+		"target_wallet_ref":   strings.TrimSpace(req.GetTargetWalletRef()),
+		"client_reference":    strings.TrimSpace(req.GetClientReference()),
 		"estimated_total_fee": map[string]interface{}{"amount": fee.GetAmount(), "currency": fee.GetCurrency()},
 	}
 	if len(req.GetMetadata()) > 0 {
@@ -608,7 +609,7 @@ func gasTopUpEnsureOperation(req *chainv1.EnsureGasTopUpRequest) (*connectorv1.O
 	return &connectorv1.Operation{
 		Type:           connectorv1.OperationType_GAS_TOPUP,
 		IdempotencyKey: strings.TrimSpace(req.GetIdempotencyKey()),
-		From: &connectorv1.OperationParty{Ref: &connectorv1.OperationParty_Account{Account: &connectorv1.AccountRef{ConnectorId: chainConnectorID, AccountId: strings.TrimSpace(req.GetSourceWalletRef())}}},
+		From:           &connectorv1.OperationParty{Ref: &connectorv1.OperationParty_Account{Account: &connectorv1.AccountRef{ConnectorId: chainConnectorID, AccountId: strings.TrimSpace(req.GetSourceWalletRef())}}},
 		Params:         structFromMap(params),
 	}, nil
 }
@@ -710,10 +711,10 @@ func feesToInterface(fees []*chainv1.ServiceFeeBreakdown) []interface{} {
 			continue
 		}
 		result = append(result, map[string]interface{}{
-			"fee_code":     strings.TrimSpace(fee.GetFeeCode()),
-			"description":  strings.TrimSpace(fee.GetDescription()),
-			"amount":       strings.TrimSpace(fee.GetAmount().GetAmount()),
-			"currency":     strings.TrimSpace(fee.GetAmount().GetCurrency()),
+			"fee_code":    strings.TrimSpace(fee.GetFeeCode()),
+			"description": strings.TrimSpace(fee.GetDescription()),
+			"amount":      strings.TrimSpace(fee.GetAmount().GetAmount()),
+			"currency":    strings.TrimSpace(fee.GetAmount().GetCurrency()),
 		})
 	}
 	if len(result) == 0 {
@@ -770,60 +771,3 @@ func operationStatusFromTransfer(status chainv1.TransferStatus) connectorv1.Oper
 		return connectorv1.OperationStatus_OPERATION_STATUS_UNSPECIFIED
 	}
 }
-
-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 ""
-	}
-}
-
-func tokenFromAssetString(asset string) string {
-	if asset == "" {
-		return ""
-	}
-	if idx := strings.Index(asset, "-"); idx > 0 {
-		return asset[:idx]
-	}
-	return asset
-}
-
-func chainNetworkFromString(value string) chainv1.ChainNetwork {
-	value = strings.ToUpper(strings.TrimSpace(value))
-	if value == "" {
-		return chainv1.ChainNetwork_CHAIN_NETWORK_UNSPECIFIED
-	}
-	if val, ok := chainv1.ChainNetwork_value[value]; ok {
-		return chainv1.ChainNetwork(val)
-	}
-	if !strings.HasPrefix(value, "CHAIN_NETWORK_") {
-		value = "CHAIN_NETWORK_" + value
-	}
-	if val, ok := chainv1.ChainNetwork_value[value]; ok {
-		return chainv1.ChainNetwork(val)
-	}
-	return chainv1.ChainNetwork_CHAIN_NETWORK_UNSPECIFIED
-}