tech/sendico
2
0
Fork 0
Code Issues 31 Pull Requests Actions Packages Projects Releases Wiki Activity

fixed ip4v enforcement

Browse Source
This commit is contained in:
Stephan D
2026-03-03 19:08:56 +01:00
parent e6d7e68196
commit f52b135db4
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
api/gateway/tron/internal/server/internal/serverimp.go
View File

@@ -53,14 +53,19 @@ type config struct {
type chainConfig struct { type chainConfig struct {
Name string `yaml:"name"` Name string `yaml:"name"`
RPCURLEnv string `yaml:"rpc_url_env"` RPCURLEnv string `yaml:"rpc_url_env"`
GRPCURLEnv string `yaml:"grpc_url_env"` // Native TRON gRPC endpoint GRPC chainGRPCConfig `yaml:"grpc"`
GRPCTokenEnv string `yaml:"grpc_token_env"`
ChainID uint64 `yaml:"chain_id"` ChainID uint64 `yaml:"chain_id"`
NativeToken string `yaml:"native_token"` NativeToken string `yaml:"native_token"`
Tokens []tokenConfig `yaml:"tokens"` Tokens []tokenConfig `yaml:"tokens"`
GasTopUpPolicy *gasTopUpPolicyConfig `yaml:"gas_topup_policy"` GasTopUpPolicy *gasTopUpPolicyConfig `yaml:"gas_topup_policy"`
} }
type chainGRPCConfig struct {
URLEnv string `yaml:"url_env"` // Native TRON gRPC endpoint env var
TokenEnv string `yaml:"token_env"` // Optional auth token env var for x-token header
ForceIPv4 bool `yaml:"force_ipv4"` // Force IPv4 sockets when dialing TRON gRPC.
}
type serviceWalletConfig struct { type serviceWalletConfig struct {
Chain string `yaml:"chain"` Chain string `yaml:"chain"`
Address string `yaml:"address"` Address string `yaml:"address"`
@@ -282,14 +287,14 @@ func resolveNetworkConfigs(logger mlogger.Logger, chains []chainConfig) ([]gatew
// Resolve optional TRON gRPC URL // Resolve optional TRON gRPC URL
grpcURL := "" grpcURL := ""
if grpcEnv := strings.TrimSpace(chain.GRPCURLEnv); grpcEnv != "" { if grpcEnv := strings.TrimSpace(chain.GRPC.URLEnv); grpcEnv != "" {
grpcURL = strings.TrimSpace(os.Getenv(grpcEnv)) grpcURL = strings.TrimSpace(os.Getenv(grpcEnv))
if grpcURL != "" { if grpcURL != "" {
logger.Info("TRON gRPC URL configured", zap.String("chain", network.String()), zap.String("env", grpcEnv)) logger.Info("TRON gRPC URL configured", zap.String("chain", network.String()), zap.String("env", grpcEnv))
} }
} }
grpcToken := "" grpcToken := ""
if grpcTokenEnv := strings.TrimSpace(chain.GRPCTokenEnv); grpcTokenEnv != "" { if grpcTokenEnv := strings.TrimSpace(chain.GRPC.TokenEnv); grpcTokenEnv != "" {
grpcToken = strings.TrimSpace(os.Getenv(grpcTokenEnv)) grpcToken = strings.TrimSpace(os.Getenv(grpcTokenEnv))
if grpcToken != "" { if grpcToken != "" {
logger.Info("TRON gRPC token configured", zap.String("chain", network.String()), zap.String("env", grpcTokenEnv)) logger.Info("TRON gRPC token configured", zap.String("chain", network.String()), zap.String("env", grpcTokenEnv))
@@ -301,6 +306,7 @@ func resolveNetworkConfigs(logger mlogger.Logger, chains []chainConfig) ([]gatew
RPCURL: rpcURL, RPCURL: rpcURL,
GRPCUrl: grpcURL, GRPCUrl: grpcURL,
GRPCToken: grpcToken, GRPCToken: grpcToken,
GRPCForceIPv4: chain.GRPC.ForceIPv4,
ChainID: chain.ChainID, ChainID: chain.ChainID,
NativeToken: chain.NativeToken, NativeToken: chain.NativeToken,
TokenConfigs: contracts, TokenConfigs: contracts,

2
api/gateway/tron/internal/service/gateway/tronclient/registry.go
View File

@@ -58,7 +58,7 @@ func Prepare(ctx context.Context, logger mlogger.Logger, networks []shared.Netwo
zap.String("grpc_url", grpcURL), zap.String("grpc_url", grpcURL),
) )
client, err := NewClient(grpcURL, timeout, grpcToken) client, err := NewClient(grpcURL, timeout, grpcToken, network.GRPCForceIPv4)
if err != nil { if err != nil {
registry.Close() registry.Close()
registry.logger.Error("Failed to initialize TRON gRPC client", registry.logger.Error("Failed to initialize TRON gRPC client",

1
api/gateway/tron/shared/helpers.go
View File

@@ -170,6 +170,7 @@ type Network struct {
RPCURL string RPCURL string
GRPCUrl string // Native TRON gRPC endpoint (for transactions) GRPCUrl string // Native TRON gRPC endpoint (for transactions)
GRPCToken string // Optional auth token for TRON gRPC (x-token header) GRPCToken string // Optional auth token for TRON gRPC (x-token header)
GRPCForceIPv4 bool
ChainID uint64 ChainID uint64
NativeToken string NativeToken string
TokenConfigs []TokenContract TokenConfigs []TokenContract