fixed v4 gateway resolution #616
@@ -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,
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import (
|
|||||||
"encoding/hex"
|
"encoding/hex"
|
||||||
"fmt"
|
"fmt"
|
||||||
"math/big"
|
"math/big"
|
||||||
|
"net"
|
||||||
"net/url"
|
"net/url"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
@@ -27,7 +28,7 @@ type Client struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// NewClient creates a new TRON gRPC client connected to the given endpoint.
|
// NewClient creates a new TRON gRPC client connected to the given endpoint.
|
||||||
func NewClient(grpcURL string, timeout time.Duration, authToken string) (*Client, error) {
|
func NewClient(grpcURL string, timeout time.Duration, authToken string, forceIPv4 bool) (*Client, error) {
|
||||||
if grpcURL == "" {
|
if grpcURL == "" {
|
||||||
return nil, merrors.InvalidArgument("tronclient: grpc url is required")
|
return nil, merrors.InvalidArgument("tronclient: grpc url is required")
|
||||||
}
|
}
|
||||||
@@ -50,6 +51,9 @@ func NewClient(grpcURL string, timeout time.Duration, authToken string) (*Client
|
|||||||
}
|
}
|
||||||
|
|
||||||
opts := []grpc.DialOption{transportCreds}
|
opts := []grpc.DialOption{transportCreds}
|
||||||
|
if forceIPv4 {
|
||||||
|
opts = append(opts, grpc.WithContextDialer(grpcForceIPv4Dialer))
|
||||||
|
}
|
||||||
if token := strings.TrimSpace(authToken); token != "" {
|
if token := strings.TrimSpace(authToken); token != "" {
|
||||||
opts = append(opts,
|
opts = append(opts,
|
||||||
grpc.WithUnaryInterceptor(grpcTokenUnaryInterceptor(token)),
|
grpc.WithUnaryInterceptor(grpcTokenUnaryInterceptor(token)),
|
||||||
@@ -67,6 +71,40 @@ func NewClient(grpcURL string, timeout time.Duration, authToken string) (*Client
|
|||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func grpcForceIPv4Dialer(ctx context.Context, address string) (net.Conn, error) {
|
||||||
|
host, port, err := net.SplitHostPort(address)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Resolve IPv4 only
|
||||||
|
ips, err := net.DefaultResolver.LookupIP(ctx, "ip4", host)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if len(ips) == 0 {
|
||||||
|
return nil, merrors.Internal(fmt.Sprintf("no IPv4 address found for %s", host))
|
||||||
|
}
|
||||||
|
|
||||||
|
var dialer net.Dialer
|
||||||
|
var lastErr error
|
||||||
|
for _, ip := range ips {
|
||||||
|
target := net.JoinHostPort(ip.String(), port)
|
||||||
|
conn, err := dialer.DialContext(ctx, "tcp4", target)
|
||||||
|
if err == nil {
|
||||||
|
return conn, nil
|
||||||
|
}
|
||||||
|
lastErr = err
|
||||||
|
if ctx.Err() != nil {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if lastErr != nil {
|
||||||
|
return nil, merrors.Internal(fmt.Sprintf("failed to dial any IPv4 address for %s: %v", host, lastErr))
|
||||||
|
}
|
||||||
|
return nil, merrors.Internal(fmt.Sprintf("failed to dial IPv4 address for %s", host))
|
||||||
|
}
|
||||||
|
|
||||||
func normalizeGRPCAddress(grpcURL string) (string, bool, error) {
|
func normalizeGRPCAddress(grpcURL string) (string, bool, error) {
|
||||||
target := strings.TrimSpace(grpcURL)
|
target := strings.TrimSpace(grpcURL)
|
||||||
useTLS := false
|
useTLS := false
|
||||||
|
|||||||
@@ -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",
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user