restucturization of recipients payment methods

api/server/.gitignore

@@ -1,3 +1,4 @@
 /app
 /server
 /storage
+.gocache

api/server/go.mod

@@ -6,7 +6,7 @@ replace github.com/tech/sendico/pkg => ../pkg
 
 replace github.com/tech/sendico/ledger => ../ledger
 
-replace github.com/tech/sendico/chain/gateway => ../chain/gateway
+replace github.com/tech/sendico/gateway/chain => ../gateway/chain
 
 require (
 	github.com/aws/aws-sdk-go-v2 v1.40.0
@@ -20,7 +20,7 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/stretchr/testify v1.11.1
-	github.com/tech/sendico/chain/gateway v0.1.0
+	github.com/tech/sendico/gateway/chain v0.1.0
 	github.com/tech/sendico/ledger v0.0.0-00010101000000-000000000000
 	github.com/tech/sendico/pkg v0.1.0
 	github.com/testcontainers/testcontainers-go v0.33.0

api/server/interface/api/srequest/signup.go

@@ -1,6 +1,11 @@
 package srequest
 
-import "github.com/tech/sendico/pkg/model"
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/tech/sendico/pkg/model"
+)
 
 type Signup struct {
 	Account              model.AccountData `json:"account"`
@@ -8,3 +13,17 @@ type Signup struct {
 	OrganizationTimeZone string            `json:"organizationTimeZone"`
 	OwnerRole            model.Describable `json:"ownerRole"`
 }
+
+// UnmarshalJSON enforces strict parsing to catch malformed or unexpected fields.
+func (s *Signup) UnmarshalJSON(data []byte) error {
+	type alias Signup
+	var payload alias
+
+	dec := json.NewDecoder(bytes.NewReader(data))
+	dec.DisallowUnknownFields()
+	if err := dec.Decode(&payload); err != nil {
+		return err
+	}
+	*s = Signup(payload)
+	return nil
+}

api/server/interface/api/sresponse/wallet.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/tech/sendico/pkg/api/http/response"
 	"github.com/tech/sendico/pkg/mlogger"
-	gatewayv1 "github.com/tech/sendico/pkg/proto/chain/gateway/v1"
 	moneyv1 "github.com/tech/sendico/pkg/proto/common/money/v1"
 	paginationv1 "github.com/tech/sendico/pkg/proto/common/pagination/v1"
+	chainv1 "github.com/tech/sendico/pkg/proto/gateway/chain/v1"
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
@@ -53,7 +53,7 @@ type walletBalanceResponse struct {
 	Balance      walletBalance `json:"balance"`
 }
 
-func Wallets(logger mlogger.Logger, resp *gatewayv1.ListManagedWalletsResponse, accessToken *TokenData) http.HandlerFunc {
+func Wallets(logger mlogger.Logger, resp *chainv1.ListManagedWalletsResponse, accessToken *TokenData) http.HandlerFunc {
 	dto := walletsResponse{
 		Page:         resp.GetPage(),
 		authResponse: authResponse{AccessToken: *accessToken},
@@ -65,14 +65,14 @@ func Wallets(logger mlogger.Logger, resp *gatewayv1.ListManagedWalletsResponse,
 	return response.Ok(logger, dto)
 }
 
-func WalletBalance(logger mlogger.Logger, bal *gatewayv1.WalletBalance, accessToken *TokenData) http.HandlerFunc {
+func WalletBalance(logger mlogger.Logger, bal *chainv1.WalletBalance, accessToken *TokenData) http.HandlerFunc {
 	return response.Ok(logger, walletBalanceResponse{
 		Balance:      toWalletBalance(bal),
 		authResponse: authResponse{AccessToken: *accessToken},
 	})
 }
 
-func toWallet(w *gatewayv1.ManagedWallet) wallet {
+func toWallet(w *chainv1.ManagedWallet) wallet {
 	if w == nil {
 		return wallet{}
 	}
@@ -102,7 +102,7 @@ func toWallet(w *gatewayv1.ManagedWallet) wallet {
 	}
 }
 
-func toWalletBalance(b *gatewayv1.WalletBalance) walletBalance {
+func toWalletBalance(b *chainv1.WalletBalance) walletBalance {
 	if b == nil {
 		return walletBalance{}
 	}

api/server/internal/server/accountapiimp/service.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	chaingatewayclient "github.com/tech/sendico/chain/gateway/client"
+	chaingatewayclient "github.com/tech/sendico/gateway/chain/client"
 	api "github.com/tech/sendico/pkg/api/http"
 	"github.com/tech/sendico/pkg/auth"
 	"github.com/tech/sendico/pkg/db/account"
@@ -20,7 +20,7 @@ import (
 	"github.com/tech/sendico/pkg/messaging"
 	"github.com/tech/sendico/pkg/mlogger"
 	"github.com/tech/sendico/pkg/mservice"
-	gatewayv1 "github.com/tech/sendico/pkg/proto/chain/gateway/v1"
+	chainv1 "github.com/tech/sendico/pkg/proto/gateway/chain/v1"
 	"github.com/tech/sendico/server/interface/accountservice"
 	eapi "github.com/tech/sendico/server/interface/api"
 	"github.com/tech/sendico/server/interface/services/fileservice"
@@ -47,11 +47,11 @@ type AccountAPI struct {
 	accountsPermissionRef primitive.ObjectID
 	accService            accountservice.AccountService
 	chainGateway          chainWalletClient
-	chainAsset            *gatewayv1.Asset
+	chainAsset            *chainv1.Asset
 }
 
 type chainWalletClient interface {
-	CreateManagedWallet(ctx context.Context, req *gatewayv1.CreateManagedWalletRequest) (*gatewayv1.CreateManagedWalletResponse, error)
+	CreateManagedWallet(ctx context.Context, req *chainv1.CreateManagedWalletRequest) (*chainv1.CreateManagedWalletResponse, error)
 	Close() error
 }
 
@@ -192,7 +192,7 @@ func (a *AccountAPI) initChainGateway(cfg *eapi.ChainGatewayConfig) error {
 	return nil
 }
 
-func buildGatewayAsset(cfg eapi.ChainGatewayAssetConfig) (*gatewayv1.Asset, error) {
+func buildGatewayAsset(cfg eapi.ChainGatewayAssetConfig) (*chainv1.Asset, error) {
 	chain, err := parseChainNetwork(cfg.Chain)
 	if err != nil {
 		return nil, err
@@ -201,24 +201,24 @@ func buildGatewayAsset(cfg eapi.ChainGatewayAssetConfig) (*gatewayv1.Asset, erro
 	if tokenSymbol == "" {
 		return nil, merrors.InvalidArgument("chain gateway token symbol is required")
 	}
-	return &gatewayv1.Asset{
+	return &chainv1.Asset{
 		Chain:           chain,
 		TokenSymbol:     strings.ToUpper(tokenSymbol),
 		ContractAddress: strings.ToLower(strings.TrimSpace(cfg.ContractAddress)),
 	}, nil
 }
 
-func parseChainNetwork(value string) (gatewayv1.ChainNetwork, error) {
+func parseChainNetwork(value string) (chainv1.ChainNetwork, error) {
 	switch strings.ToUpper(strings.TrimSpace(value)) {
 	case "ETHEREUM_MAINNET", "CHAIN_NETWORK_ETHEREUM_MAINNET":
-		return gatewayv1.ChainNetwork_CHAIN_NETWORK_ETHEREUM_MAINNET, nil
+		return chainv1.ChainNetwork_CHAIN_NETWORK_ETHEREUM_MAINNET, nil
 	case "ARBITRUM_ONE", "CHAIN_NETWORK_ARBITRUM_ONE":
-		return gatewayv1.ChainNetwork_CHAIN_NETWORK_ARBITRUM_ONE, nil
+		return chainv1.ChainNetwork_CHAIN_NETWORK_ARBITRUM_ONE, nil
 	case "OTHER_EVM", "CHAIN_NETWORK_OTHER_EVM":
-		return gatewayv1.ChainNetwork_CHAIN_NETWORK_OTHER_EVM, nil
+		return chainv1.ChainNetwork_CHAIN_NETWORK_OTHER_EVM, nil
 	case "", "CHAIN_NETWORK_UNSPECIFIED":
-		return gatewayv1.ChainNetwork_CHAIN_NETWORK_UNSPECIFIED, merrors.InvalidArgument("chain network must be specified")
+		return chainv1.ChainNetwork_CHAIN_NETWORK_UNSPECIFIED, merrors.InvalidArgument("chain network must be specified")
 	default:
-		return gatewayv1.ChainNetwork_CHAIN_NETWORK_UNSPECIFIED, merrors.InvalidArgument(fmt.Sprintf("unsupported chain network %s", value))
+		return chainv1.ChainNetwork_CHAIN_NETWORK_UNSPECIFIED, merrors.InvalidArgument(fmt.Sprintf("unsupported chain network %s", value))
 	}
 }

api/server/internal/server/accountapiimp/signup.go

@@ -16,7 +16,7 @@ import (
 	"github.com/tech/sendico/pkg/model"
 	"github.com/tech/sendico/pkg/mservice"
 	"github.com/tech/sendico/pkg/mutil/mzap"
-	gatewayv1 "github.com/tech/sendico/pkg/proto/chain/gateway/v1"
+	chainv1 "github.com/tech/sendico/pkg/proto/gateway/chain/v1"
 	"github.com/tech/sendico/server/interface/api/srequest"
 	"github.com/tech/sendico/server/interface/api/sresponse"
 	"go.mongodb.org/mongo-driver/bson/primitive"
@@ -249,7 +249,7 @@ func (a *AccountAPI) openOrgWallet(ctx context.Context, org *model.Organization,
 		return merrors.Internal("chain gateway client is not configured")
 	}
 	asset := *a.chainAsset
-	req := &gatewayv1.CreateManagedWalletRequest{
+	req := &chainv1.CreateManagedWalletRequest{
 		IdempotencyKey:  uuid.NewString(),
 		OrganizationRef: org.ID.Hex(),
 		OwnerRef:        org.ID.Hex(),

api/server/internal/server/accountapiimp/signup_integration_test.go

@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"net/http"
 	"net/http/httptest"
+	"os"
 	"testing"
 	"time"
 
@@ -27,6 +28,10 @@ func stringPtr(s string) *string {
 
 // TestSignupRequestSerialization tests JSON marshaling/unmarshaling with real MongoDB
 func TestSignupRequestSerialization(t *testing.T) {
+	if os.Getenv("RUN_DOCKER_TESTS") == "" {
+		t.Skip("skipping: docker-dependent integration test (set RUN_DOCKER_TESTS=1 to enable)")
+	}
+
 	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
 	defer cancel()
 

api/server/internal/server/walletapiimp/balance.go

@@ -8,7 +8,7 @@ import (
 	"github.com/tech/sendico/pkg/api/http/response"
 	"github.com/tech/sendico/pkg/model"
 	"github.com/tech/sendico/pkg/mservice"
-	gatewayv1 "github.com/tech/sendico/pkg/proto/chain/gateway/v1"
+	chainv1 "github.com/tech/sendico/pkg/proto/gateway/chain/v1"
 	"github.com/tech/sendico/server/interface/api/sresponse"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.uber.org/zap"
@@ -39,7 +39,7 @@ func (a *WalletAPI) getWalletBalance(r *http.Request, account *model.Account, to
 		return response.Internal(a.logger, mservice.ChainGateway, errors.New("chain gateway client is not configured"))
 	}
 
-	resp, err := a.chainGateway.GetWalletBalance(ctx, &gatewayv1.GetWalletBalanceRequest{WalletRef: walletRef})
+	resp, err := a.chainGateway.GetWalletBalance(ctx, &chainv1.GetWalletBalanceRequest{WalletRef: walletRef})
 	if err != nil {
 		a.logger.Warn("Failed to fetch wallet balance", zap.Error(err), zap.String("wallet_ref", walletRef))
 		return response.Auto(a.logger, mservice.ChainGateway, err)

api/server/internal/server/walletapiimp/list.go

@@ -8,7 +8,7 @@ import (
 	"github.com/tech/sendico/pkg/api/http/response"
 	"github.com/tech/sendico/pkg/model"
 	"github.com/tech/sendico/pkg/mservice"
-	gatewayv1 "github.com/tech/sendico/pkg/proto/chain/gateway/v1"
+	chainv1 "github.com/tech/sendico/pkg/proto/gateway/chain/v1"
 	"github.com/tech/sendico/server/interface/api/sresponse"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.uber.org/zap"
@@ -35,7 +35,7 @@ func (a *WalletAPI) listWallets(r *http.Request, account *model.Account, token *
 		return response.Internal(a.logger, mservice.ChainGateway, errors.New("chain gateway client is not configured"))
 	}
 
-	req := &gatewayv1.ListManagedWalletsRequest{
+	req := &chainv1.ListManagedWalletsRequest{
 		OrganizationRef: orgRef.Hex(),
 	}
 	if owner := strings.TrimSpace(r.URL.Query().Get("owner_ref")); owner != "" {

api/server/internal/server/walletapiimp/service.go

@@ -7,13 +7,13 @@ import (
 	"strings"
 	"time"
 
-	chaingatewayclient "github.com/tech/sendico/chain/gateway/client"
+	chaingatewayclient "github.com/tech/sendico/gateway/chain/client"
 	api "github.com/tech/sendico/pkg/api/http"
 	"github.com/tech/sendico/pkg/auth"
 	"github.com/tech/sendico/pkg/merrors"
 	"github.com/tech/sendico/pkg/mlogger"
 	"github.com/tech/sendico/pkg/mservice"
-	gatewayv1 "github.com/tech/sendico/pkg/proto/chain/gateway/v1"
+	chainv1 "github.com/tech/sendico/pkg/proto/gateway/chain/v1"
 	eapi "github.com/tech/sendico/server/interface/api"
 	mutil "github.com/tech/sendico/server/internal/mutil/param"
 	"go.mongodb.org/mongo-driver/bson/primitive"
@@ -31,8 +31,8 @@ type WalletAPI struct {
 }
 
 type chainWalletClient interface {
-	ListManagedWallets(ctx context.Context, req *gatewayv1.ListManagedWalletsRequest) (*gatewayv1.ListManagedWalletsResponse, error)
-	GetWalletBalance(ctx context.Context, req *gatewayv1.GetWalletBalanceRequest) (*gatewayv1.GetWalletBalanceResponse, error)
+	ListManagedWallets(ctx context.Context, req *chainv1.ListManagedWalletsRequest) (*chainv1.ListManagedWalletsResponse, error)
+	GetWalletBalance(ctx context.Context, req *chainv1.GetWalletBalanceRequest) (*chainv1.GetWalletBalanceResponse, error)
 	Close() error
 }