@clonegod/ttd-base-common 1.0.14 → 1.0.15

package/dist/trade/send/bloxroute_base.d.ts

@@ -1,7 +1,10 @@
 export declare class BloxrouteBase {
     private endpoint;
     private authToken;
+    private ws_endpoint;
+    private wsClient;
     constructor();
-    sendPrivateTransaction(signedTx: string): Promise<string>;
-    sendBundle(transactions: string[], targetBlockNumber?: number): Promise<string>;
+    sendTransaction(signedTx: string): Promise<string>;
+    private sendTransactionByWs;
+    private sendTransactionByHttp;
 }

package/dist/trade/send/bloxroute_base.js

@@ -17,50 +17,71 @@ const dist_1 = require("@clonegod/ttd-core/dist");
 const axios_1 = __importDefault(require("axios"));
 class BloxrouteBase {
     constructor() {
-        this.endpoint = process.env.BASE_BLOXROUTE_RPC_ENDPOINT || '';
+        this.endpoint = process.env.BASE_BLOXROUTE_RPC_ENDPOINT || 'https://api.blxrbdn.com';
         this.authToken = process.env.BASE_BLOXROUTE_AUTH_TOKEN || '';
+        this.ws_endpoint = process.env.BASE_BLOXROUTE_WS_ENDPOINT || 'wss://api.blxrbdn.com/ws';
     }
-    sendPrivateTransaction(signedTx) {
+    sendTransaction(signedTx) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!this.authToken) {
+                (0, dist_1.log_warn)('BloXroute Base authToken is not set!!! BASE_BLOXROUTE_AUTH_TOKEN is empty or null');
+                return '';
+            }
+            if (signedTx.startsWith('0x')) {
+                signedTx = signedTx.slice(2);
+            }
+            this.sendTransactionByWs(signedTx);
+            return yield this.sendTransactionByHttp(signedTx);
+        });
+    }
+    sendTransactionByWs(signedTx) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.ws_endpoint) {
+                return '';
+            }
             try {
-                const response = yield axios_1.default.post(this.endpoint, {
+                if (!this.wsClient) {
+                    this.wsClient = new dist_1.WebSocketClient(this.ws_endpoint, {
+                        headers: {
+                            'Authorization': this.authToken || ''
+                        }
+                    });
+                    this.wsClient.onMessage((message) => {
+                        console.log('BloXroute Base ws message', message);
+                    });
+                    this.wsClient.connect();
+                }
+                if (!this.wsClient.isConnected()) {
+                    (0, dist_1.log_warn)('BloXroute Base ws is not connected!!!');
+                    return '';
+                }
+                this.wsClient.send(JSON.stringify({
                     jsonrpc: "2.0",
                     id: "1",
-                    method: "eth_sendPrivateTransaction",
-                    params: [signedTx]
-                }, {
-                    headers: {
-                        'Content-Type': 'application/json',
-                        'Authorization': this.authToken
-                    },
-                    timeout: 3000
-                });
-                if (response.data.error) {
-                    throw new Error(`BloXroute Base Error: ${response.data.error.code} - ${response.data.error.message}`);
-                }
-                return response.data.result;
+                    method: "blxr_tx",
+                    params: {
+                        "transaction": signedTx,
+                        "blockchain_network": "Base-Mainnet"
+                    }
+                }));
+                return '';
             }
             catch (error) {
-                (0, dist_1.log_error)('BloXroute Base sendPrivateTransaction failed!!!', error);
-                throw error;
+                (0, dist_1.log_error)('BloXroute Base sendTransactionByWs failed!!!', error);
             }
         });
     }
-    sendBundle(transactions, targetBlockNumber) {
+    sendTransactionByHttp(signedTx) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const currentBlock = targetBlockNumber || Math.floor(Date.now() / 1000);
-                const targetBlock = currentBlock + 1;
                 const response = yield axios_1.default.post(this.endpoint, {
                     jsonrpc: "2.0",
                     id: "1",
-                    method: "eth_sendBundle",
-                    params: [{
-                            txs: transactions,
-                            blockNumber: `0x${targetBlock.toString(16)}`,
-                            minTimestamp: Math.floor(Date.now() / 1000),
-                            maxTimestamp: Math.floor(Date.now() / 1000) + 30
-                        }]
+                    method: "blxr_tx",
+                    params: {
+                        "transaction": signedTx,
+                        "blockchain_network": "Base-Mainnet"
+                    }
                 }, {
                     headers: {
                         'Content-Type': 'application/json',
@@ -69,12 +90,12 @@ class BloxrouteBase {
                     timeout: 3000
                 });
                 if (response.data.error) {
-                    throw new Error(`BloXroute Base Bundle Error: ${response.data.error.code} - ${response.data.error.message}`);
+                    throw new Error(`BloXroute Base Error: ${response.data.error.code} - ${response.data.error.message}`);
                 }
-                return response.data.result.bundleHash;
+                return response.data.result.tx_hash;
             }
             catch (error) {
-                (0, dist_1.log_error)('BloXroute Base sendBundle failed!!!', error);
+                (0, dist_1.log_error)('BloXroute Base sendPrivateTransaction failed!!!', error);
                 throw error;
             }
         });

package/dist/trade/send/send_tx.js

@@ -120,9 +120,9 @@ class BaseTransactionSender {
                 },
                 {
                     name: 'BloXroute - Private Transaction',
-                    enable: process.env.SEND_TX_BLOXROUTE_PRIVATE === 'true',
+                    enable: process.env.SEND_TX_BLOXROUTE_RPC === 'true',
                     send: () => __awaiter(this, void 0, void 0, function* () {
-                        return yield this.bloxroute.sendPrivateTransaction(signedMainTx);
+                        return yield this.bloxroute.sendTransaction(signedMainTx);
                     })
                 }
             ];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clonegod/ttd-base-common",
-    "version": "1.0.14",
+    "version": "1.0.15",
     "description": "Base common library",
     "license": "UNLICENSED",
     "main": "dist/index.js",
@@ -14,7 +14,7 @@
         "push": "npm run build && npm publish"
     },
     "dependencies": {
-        "@clonegod/ttd-core": "2.0.51",
+        "@clonegod/ttd-core": "2.0.85",
         "axios": "^1.11.00",
         "dotenv": "^16.4.7",
         "ethers": "^5.8.0"