chore: improve clients, add soyas and other regions
This commit is contained in:
187
README.md
187
README.md
@@ -15,6 +15,8 @@ go get github.com/samlior/libsam
|
||||
| fra | fra1.shreder.xyz:9991 |
|
||||
| ams | ams1.shreder.xyz:9991 |
|
||||
| ewr | ny1.shreder.xyz:9991 |
|
||||
| uk | lon.shreder.xyz:9991 |
|
||||
| jp | tyo.shreder.xyz:9991 |
|
||||
|
||||
### Usage
|
||||
|
||||
@@ -105,6 +107,13 @@ See [example](./cmd/shreder/main.go).
|
||||
"keepAliveUrl": "http://germany.solana.dex.blxrbdn.com/ping",
|
||||
"tips": "0.001",
|
||||
"rateLimit": 0
|
||||
},
|
||||
{
|
||||
"name": "soyas",
|
||||
"sendTxUrl": "fra.landing.soyas.xyz:9000",
|
||||
"sendBundleUrl": "",
|
||||
"tips": "0.001",
|
||||
"rateLimit": 0
|
||||
}
|
||||
```
|
||||
|
||||
@@ -191,6 +200,13 @@ See [example](./cmd/shreder/main.go).
|
||||
"keepAliveUrl": "http://amsterdam.solana.dex.blxrbdn.com/api/v2/ping",
|
||||
"tips": "0.001",
|
||||
"rateLimit": 0
|
||||
},
|
||||
{
|
||||
"name": "soyas",
|
||||
"sendTxUrl": "ams.landing.soyas.xyz:9000",
|
||||
"sendBundleUrl": "",
|
||||
"tips": "0.001",
|
||||
"rateLimit": 0
|
||||
}
|
||||
```
|
||||
|
||||
@@ -278,6 +294,177 @@ See [example](./cmd/shreder/main.go).
|
||||
"keepAliveUrl": "http://ny.solana.dex.blxrbdn.com/api/v2/ping",
|
||||
"tips": "0.001",
|
||||
"rateLimit": 0
|
||||
},
|
||||
{
|
||||
"name": "soyas",
|
||||
"sendTxUrl": "nyc.landing.soyas.xyz:9000",
|
||||
"sendBundleUrl": "",
|
||||
"tips": "0.001",
|
||||
"rateLimit": 0
|
||||
}
|
||||
```
|
||||
|
||||
</details>
|
||||
|
||||
<details><summary> London </summary>
|
||||
|
||||
```json
|
||||
{
|
||||
"name": "helius",
|
||||
"sendTxUrl": "http://lon-sender.helius-rpc.com/fast",
|
||||
"sendBundleUrl": "",
|
||||
"keepAliveUrl": "http://lon-sender.helius-rpc.com/ping",
|
||||
"tips": "0.001",
|
||||
"rateLimit": 0
|
||||
},
|
||||
{
|
||||
"name": "blockrazor",
|
||||
"sendTxUrl": "london.solana-grpc.blockrazor.xyz:80",
|
||||
"sendBundleUrl": "",
|
||||
"tips": "0.001",
|
||||
"rateLimit": 0
|
||||
},
|
||||
{
|
||||
"name": "node1",
|
||||
"sendTxUrl": "http://lon.node1.me",
|
||||
"sendBundleUrl": "",
|
||||
"keepAliveUrl": "http://lon.node1.me/ping",
|
||||
"tips": "0.001",
|
||||
"rateLimit": 0
|
||||
},
|
||||
{
|
||||
"name": "nextblock",
|
||||
"sendTxUrl": "http://london.nextblock.io/api/v2/submit",
|
||||
"sendBundleUrl": "",
|
||||
"keepAliveUrl": "http://london.nextblock.io/api/v2/ping",
|
||||
"tips": "0.001",
|
||||
"rateLimit": 0
|
||||
|
||||
},
|
||||
{
|
||||
"name": "flashBlock",
|
||||
"sendTxUrl": "http://london.flashblock.trade/api/v2/submit-batch",
|
||||
"sendBundleUrl": "http://london.flashblock.trade/api/v2/submit-batch",
|
||||
"keepAliveUrl": "http://london.flashblock.trade/api/v2/ping",
|
||||
"tips": "0.001",
|
||||
"rateLimit": 0
|
||||
},
|
||||
{
|
||||
"name": "stellium",
|
||||
"sendTxUrl": "http://lhr1.flashrpc.com/be95e80d-afc2-4a48-b017-db021fc4c19e",
|
||||
"sendBundleUrl": "",
|
||||
"keepAliveUrl": "http://lhr1.flashrpc.com/ping",
|
||||
"tips": "0.001",
|
||||
"rateLimit": 0
|
||||
},
|
||||
{
|
||||
"name": "blocxroute",
|
||||
"sendTxUrl": "http://uk.solana.dex.blxrbdn.com/api/v2/submit",
|
||||
"sendBundleUrl": "",
|
||||
"keepAliveUrl": "http://uk.solana.dex.blxrbdn.com/api/v2/ping",
|
||||
"tips": "0.001",
|
||||
"rateLimit": 0
|
||||
},
|
||||
{
|
||||
"name": "soyas",
|
||||
"sendTxUrl": "lon.landing.soyas.xyz:9000",
|
||||
"sendBundleUrl": "",
|
||||
"tips": "0.001",
|
||||
"rateLimit": 0
|
||||
}
|
||||
```
|
||||
|
||||
</details>
|
||||
|
||||
|
||||
<details><summary> Japan </summary>
|
||||
|
||||
```json
|
||||
{
|
||||
"name": "helius",
|
||||
"sendTxUrl": "http://tyo-sender.helius-rpc.com/fast",
|
||||
"sendBundleUrl": "",
|
||||
"keepAliveUrl": "http://tyo-sender.helius-rpc.com/ping",
|
||||
"tips": "0.001",
|
||||
"rateLimit": 0
|
||||
},
|
||||
{
|
||||
"name": "0slot",
|
||||
"sendTxUrl": "http://jp1.0slot.trade?api-key=3fec78a0d361418a8eff95be9ed85cc3&anti-mev=true",
|
||||
"sendBundleUrl": "",
|
||||
"keepAliveUrl": "http://jp1.0slot.trade/ping",
|
||||
"tips": "0.001",
|
||||
"rateLimit": 0
|
||||
},
|
||||
{
|
||||
"name": "blockrazor",
|
||||
"sendTxUrl": "tokyo.solana-grpc.blockrazor.xyz:80",
|
||||
"sendBundleUrl": "",
|
||||
"tips": "0.001",
|
||||
"rateLimit": 0
|
||||
},
|
||||
{
|
||||
"name": "node1",
|
||||
"sendTxUrl": "http://tk.node1.me",
|
||||
"sendBundleUrl": "",
|
||||
"keepAliveUrl": "http://tk.node1.me/ping",
|
||||
"tips": "0.001",
|
||||
"rateLimit": 0
|
||||
},
|
||||
{
|
||||
"name": "nextblock",
|
||||
"sendTxUrl": "http://tokyo.nextblock.io/api/v2/submit",
|
||||
"sendBundleUrl": "",
|
||||
"keepAliveUrl": "http://tokyo.nextblock.io/api/v2/ping",
|
||||
"tips": "0.001",
|
||||
"rateLimit": 4
|
||||
},
|
||||
{
|
||||
"name": "flashBlock",
|
||||
"sendTxUrl": "http://tokyo.flashblock.trade/api/v2/submit-batch",
|
||||
"sendBundleUrl": "http://tokyo.flashblock.trade/api/v2/submit-batch",
|
||||
"keepAliveUrl": "http://tokyo.flashblock.trade/api/v2/ping",
|
||||
"tips": "0.001",
|
||||
"rateLimit": 0
|
||||
},
|
||||
{
|
||||
"name": "astralane",
|
||||
"sendTxUrl": "http://jp.gateway.astralane.io/iris?api-key=zhaozNc5OIadLPI3r9nUVVPpCZcQAUjngO6Tgr5XUJcmBrIisFaaZF81Ijn01Ytn",
|
||||
"sendBundleUrl": "",
|
||||
"keepAliveUrl": "http://jp.gateway.astralane.io/ping",
|
||||
"tips": "0.001",
|
||||
"rateLimit": 0
|
||||
},
|
||||
{
|
||||
"name": "nozomi",
|
||||
"sendTxUrl": "http://tyo1.nozomi.temporal.xyz/?c=34cff37e-f1a5-446a-98bb-66aa1b62cb74",
|
||||
"sendBundleUrl": "",
|
||||
"keepAliveUrl": "http://tyo1.nozomi.temporal.xyz/ping",
|
||||
"tips": "0.001",
|
||||
"rateLimit": 0
|
||||
},
|
||||
{
|
||||
"name": "stellium",
|
||||
"sendTxUrl": "http://tyo1.flashrpc.com/be95e80d-afc2-4a48-b017-db021fc4c19e",
|
||||
"sendBundleUrl": "",
|
||||
"keepAliveUrl": "http://tyo1.flashrpc.com/ping",
|
||||
"tips": "0.001",
|
||||
"rateLimit": 0
|
||||
},
|
||||
{
|
||||
"name": "blocxroute",
|
||||
"sendTxUrl": "http://tokyo.solana.dex.blxrbdn.com/api/v2/submit",
|
||||
"sendBundleUrl": "",
|
||||
"keepAliveUrl": "http://tokyo.solana.dex.blxrbdn.com/api/v2/ping",
|
||||
"tips": "0.001",
|
||||
"rateLimit": 0
|
||||
},
|
||||
{
|
||||
"name": "soyas",
|
||||
"sendTxUrl": "tyo.landing.soyas.xyz:9000",
|
||||
"sendBundleUrl": "",
|
||||
"tips": "0.001",
|
||||
"rateLimit": 0
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
1
go.mod
1
go.mod
@@ -32,6 +32,7 @@ require (
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
|
||||
github.com/modern-go/reflect2 v1.0.2 // indirect
|
||||
github.com/mostynb/zstdpool-freelist v0.0.0-20201229113212-927304c0c3b1 // indirect
|
||||
github.com/quic-go/quic-go v0.58.0 // indirect
|
||||
github.com/streamingfast/logging v0.0.0-20230608130331-f22c91403091 // indirect
|
||||
go.mongodb.org/mongo-driver v1.12.2 // indirect
|
||||
go.uber.org/atomic v1.7.0 // indirect
|
||||
|
||||
3
go.sum
3
go.sum
@@ -77,6 +77,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
||||
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/quic-go/quic-go v0.58.0 h1:ggY2pvZaVdB9EyojxL1p+5mptkuHyX5MOSv4dgWF4Ug=
|
||||
github.com/quic-go/quic-go v0.58.0/go.mod h1:upnsH4Ju1YkqpLXC305eW3yDZ4NfnNbmQRCMWS58IKU=
|
||||
github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
|
||||
github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
|
||||
github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
|
||||
@@ -88,6 +90,7 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
|
||||
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
|
||||
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
|
||||
github.com/test-go/testify v1.1.4 h1:Tf9lntrKUMHiXQ07qBScBTSA0dhYQlu83hswqelv1iE=
|
||||
github.com/test-go/testify v1.1.4/go.mod h1:rH7cfJo/47vWGdi4GPj16x3/t1xGOj2YxzmNQzk2ghU=
|
||||
github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
|
||||
|
||||
@@ -12,4 +12,5 @@ const (
|
||||
SWQoSAgentBlockRazor = "blockrazor"
|
||||
SWQoSAgentAstralane = "astralane"
|
||||
SWQoSAgentStellium = "stellium"
|
||||
SWQoSAgentSoyas = "soyas"
|
||||
)
|
||||
|
||||
205
pkg/swqos/clients/soyas_client.go
Normal file
205
pkg/swqos/clients/soyas_client.go
Normal file
@@ -0,0 +1,205 @@
|
||||
package clients
|
||||
|
||||
import (
|
||||
"context"
|
||||
"crypto/ed25519"
|
||||
"crypto/rand"
|
||||
"crypto/tls"
|
||||
"crypto/x509"
|
||||
"errors"
|
||||
"fmt"
|
||||
"math/big"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/gagliardetto/solana-go"
|
||||
|
||||
"github.com/mr-tron/base58"
|
||||
"github.com/quic-go/quic-go"
|
||||
)
|
||||
|
||||
const (
|
||||
alpnTPUProtocolID = "solana-tpu"
|
||||
defaultServerName = "soyas-landing"
|
||||
defaultKeepAlive = 25 * time.Second
|
||||
defaultIdleTimeout = 5 * time.Minute
|
||||
)
|
||||
|
||||
type SoyasClient struct {
|
||||
endpointAddr string
|
||||
tlsConfig *tls.Config
|
||||
quicConfig *quic.Config
|
||||
|
||||
connMu sync.RWMutex
|
||||
conn *quic.Conn
|
||||
reconnectMu sync.Mutex
|
||||
}
|
||||
|
||||
// Connect creates a client using the whitelisted Solana keypair (base58-encoded secret key) as the mutual-TLS client identity.
|
||||
func NewSoyasClient(ctx context.Context, url string) *SoyasClient {
|
||||
cert, err := x509CertificateFromSolanaBase58Key("2ketcrBU1kBvr68sPVYdBdn5ztgg3VBKZP1xa1o5B8w47wemBXH73ZALdmj3ukcGzkxh6DhzLq3myu45XUwW1eNC")
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
tlsConfig := &tls.Config{
|
||||
Certificates: []tls.Certificate{cert},
|
||||
ServerName: defaultServerName,
|
||||
InsecureSkipVerify: true,
|
||||
NextProtos: []string{alpnTPUProtocolID},
|
||||
MinVersion: tls.VersionTLS13,
|
||||
}
|
||||
|
||||
quicConfig := &quic.Config{
|
||||
KeepAlivePeriod: defaultKeepAlive,
|
||||
MaxIdleTimeout: defaultIdleTimeout,
|
||||
}
|
||||
|
||||
client := &SoyasClient{
|
||||
endpointAddr: url,
|
||||
tlsConfig: tlsConfig,
|
||||
quicConfig: quicConfig,
|
||||
}
|
||||
|
||||
if err = client.reconnect(ctx); err != nil {
|
||||
panic(err)
|
||||
}
|
||||
return client
|
||||
}
|
||||
|
||||
// Close closes the underlying QUIC connection (if any). Safe to call multiple times.
|
||||
func (c *SoyasClient) Close() error {
|
||||
c.reconnectMu.Lock()
|
||||
defer c.reconnectMu.Unlock()
|
||||
|
||||
c.connMu.Lock()
|
||||
conn := c.conn
|
||||
c.conn = nil
|
||||
c.connMu.Unlock()
|
||||
|
||||
if conn == nil {
|
||||
return nil
|
||||
}
|
||||
return conn.CloseWithError(0, "")
|
||||
}
|
||||
|
||||
// SendTransaction sends a signed Solana transaction payload to Soyas.
|
||||
// The payload should be the raw wire bytes (for example, from solana-go's tx.MarshalBinary()).
|
||||
// If sending fails, it reconnects once and retries.
|
||||
func (c *SoyasClient) SendTransaction(ctx context.Context, tx *solana.Transaction) error {
|
||||
if c.endpointAddr == "" {
|
||||
return fmt.Errorf("send tx url is empty")
|
||||
}
|
||||
|
||||
raw, err := tx.MarshalBinary()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
conn := c.getConn()
|
||||
if conn != nil {
|
||||
if err := trySendBytes(ctx, conn, raw); err == nil {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
if err := c.reconnect(ctx); err != nil {
|
||||
return err
|
||||
}
|
||||
conn = c.getConn()
|
||||
if conn == nil {
|
||||
return errors.New("missing QUIC connection")
|
||||
}
|
||||
return trySendBytes(ctx, conn, raw)
|
||||
}
|
||||
|
||||
func (c *SoyasClient) SendBundle(ctx context.Context, txs []*solana.Transaction) error {
|
||||
return fmt.Errorf("soyas client not support send bundle")
|
||||
}
|
||||
|
||||
func (c *SoyasClient) getConn() *quic.Conn {
|
||||
c.connMu.RLock()
|
||||
defer c.connMu.RUnlock()
|
||||
return c.conn
|
||||
}
|
||||
|
||||
func (c *SoyasClient) reconnect(ctx context.Context) error {
|
||||
c.reconnectMu.Lock()
|
||||
defer c.reconnectMu.Unlock()
|
||||
|
||||
if existing := c.getConn(); existing != nil && existing.Context().Err() == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
conn, err := quic.DialAddr(ctx, c.endpointAddr, c.tlsConfig, c.quicConfig)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
c.connMu.Lock()
|
||||
old := c.conn
|
||||
c.conn = conn
|
||||
c.connMu.Unlock()
|
||||
|
||||
if old != nil {
|
||||
_ = old.CloseWithError(0, "")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func trySendBytes(ctx context.Context, conn *quic.Conn, payload []byte) error {
|
||||
stream, err := conn.OpenUniStreamSync(ctx)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if _, err := stream.Write(payload); err != nil {
|
||||
_ = stream.Close()
|
||||
return err
|
||||
}
|
||||
return stream.Close()
|
||||
}
|
||||
|
||||
// x509CertificateFromSolanaBase58Key creates a short-lived self-signed X.509
|
||||
// certificate whose public key is derived from the provided Solana Ed25519 key.
|
||||
// The Soyas ingress extracts this public key to identify/allowlist the client.
|
||||
func x509CertificateFromSolanaBase58Key(apiKeyBase58 string) (tls.Certificate, error) {
|
||||
raw, err := base58.Decode(apiKeyBase58)
|
||||
if err != nil {
|
||||
return tls.Certificate{}, err
|
||||
}
|
||||
|
||||
var seed []byte
|
||||
switch len(raw) {
|
||||
case ed25519.SeedSize:
|
||||
seed = raw
|
||||
case ed25519.PrivateKeySize:
|
||||
seed = raw[:ed25519.SeedSize]
|
||||
default:
|
||||
return tls.Certificate{}, errors.New("api key must decode to 32 (seed) or 64 (secret) bytes")
|
||||
}
|
||||
|
||||
priv := ed25519.NewKeyFromSeed(seed)
|
||||
pub := priv.Public().(ed25519.PublicKey)
|
||||
|
||||
serial, err := rand.Int(rand.Reader, new(big.Int).Lsh(big.NewInt(1), 128))
|
||||
if err != nil {
|
||||
return tls.Certificate{}, err
|
||||
}
|
||||
|
||||
template := &x509.Certificate{
|
||||
SerialNumber: serial,
|
||||
NotBefore: time.Now().Add(-5 * time.Minute),
|
||||
NotAfter: time.Now().Add(365 * 24 * time.Hour),
|
||||
KeyUsage: x509.KeyUsageDigitalSignature,
|
||||
ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth},
|
||||
}
|
||||
|
||||
der, err := x509.CreateCertificate(rand.Reader, template, template, pub, priv)
|
||||
if err != nil {
|
||||
return tls.Certificate{}, err
|
||||
}
|
||||
|
||||
return tls.Certificate{
|
||||
Certificate: [][]byte{der},
|
||||
PrivateKey: priv,
|
||||
}, nil
|
||||
}
|
||||
@@ -24,6 +24,8 @@ func NewSWQoSClient(ctx context.Context, config *SWQoSClientConfig) (SWQoSClient
|
||||
client = clients.NewAstralaneClient(config.SendTxUrl)
|
||||
case enum.SWQoSAgentBlocxRoute:
|
||||
client = clients.NewBloxrouteClient(config.SendTxUrl)
|
||||
case enum.SWQoSAgentSoyas:
|
||||
client = clients.NewSoyasClient(ctx, config.SendTxUrl)
|
||||
case enum.SWQoSAgent0slot, enum.SWQoSAgentJito, enum.SWQoSAgentHelius, enum.SWQoSAgentNozomi, enum.SWQoSAgentStellium:
|
||||
client = clients.NewHttpClient(config.SendTxUrl, config.SendBundleUrl)
|
||||
default:
|
||||
|
||||
Reference in New Issue
Block a user