npm - @clonegod/ttd-sol-common - Versions diffs - 1.0.156 → 1.0.157 - Mend

@clonegod/ttd-sol-common 1.0.156 → 1.0.157

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/appconfig/app_config.d.ts CHANGED Viewed

@@ -1,13 +1,14 @@
 import { ArbCache, ArbEventSubscriber, TradeResponseType, TradeRuntimeType } from "@clonegod/ttd-common";
-import { EventEmitter } from 'events';
 import { Connection, Keypair } from "@solana/web3.js";
-import { EnvArgs } from "./env_args";
+import { EventEmitter } from 'events';
 import { AbastrcatTrade } from "../trade";
+import { EnvArgs } from "./env_args";
 export declare class AppConfig extends EventEmitter {
     env_args: EnvArgs;
     app_full_name: string;
     arb_cache: ArbCache;
     arb_event_subscriber: ArbEventSubscriber;
+    is_already_subscribe_wallet_raw_txn: boolean;
     query_token_market_price_url: string;
     trade_runtime: TradeRuntimeType;
     connection: Connection;

package/dist/appconfig/app_config.js CHANGED Viewed

@@ -14,15 +14,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppConfig = void 0;
 const dist_1 = require("@clonegod/ttd-common/dist");
-const events_1 = require("events");
 const web3_js_1 = require("@solana/web3.js");
 const bs58_1 = __importDefault(require("bs58"));
-const env_args_1 = require("./env_args");
+const events_1 = require("events");
 const common_1 = require("../common");
 const trade_1 = require("../trade");
+const env_args_1 = require("./env_args");
 class AppConfig extends events_1.EventEmitter {
     constructor() {
         super();
+        this.is_already_subscribe_wallet_raw_txn = false;
         this.env_args = new env_args_1.EnvArgs();
         let { chain_id, app_name } = this.env_args;
         this.app_full_name = app_name;
@@ -92,13 +93,26 @@ class AppConfig extends events_1.EventEmitter {
     }
     subscribe_wallet_raw_txn_event() {
         return __awaiter(this, void 0, void 0, function* () {
-            let handler = (txid, tx_data) => {
-                console.log('subscribe_wallet_raw_txn_event, recv tx data:');
-                console.log({
-                    txid,
-                    tx_data
-                });
-                this.emit(common_1.LOCAL_EVENT_NAME.EVENT_WALLET_TRANSACTION + '#' + txid, tx_data);
+            if (this.is_already_subscribe_wallet_raw_txn) {
+                return;
+            }
+            this.is_already_subscribe_wallet_raw_txn = true;
+            let handler = (data) => {
+                let { txid, tx_data } = JSON.parse(data);
+                let transaction_data = {
+                    params: {
+                        result: {
+                            signature: txid,
+                            slot: tx_data.slot,
+                            transaction: {
+                                transaction: tx_data.transaction.transaction,
+                                meta: tx_data.transaction.meta,
+                                version: 0
+                            }
+                        }
+                    }
+                };
+                this.emit(common_1.LOCAL_EVENT_NAME.EVENT_WALLET_TRANSACTION + '#' + txid, transaction_data);
             };
             let group_id = this.trade_runtime.group.id;
             yield this.arb_event_subscriber.subscribe_wallet_raw_tx_result(group_id, '', handler);

package/dist/trade/tx_result_check.js CHANGED Viewed

@@ -50,7 +50,10 @@ class TransactionResultChecker {
             try {
                 this.trade_result_already_processed = true;
                 (0, dist_1.log_debug)('on events: EVENT_WALLET_TRANSACTION', messageStr);
-                const messageObj = JSON.parse(messageStr);
+                let messageObj = messageStr;
+                if (typeof messageStr === 'string') {
+                    messageObj = JSON.parse(messageStr);
+                }
                 const result = messageObj.params.result;
                 const _txid = result.signature;
                 const slot = result.slot;

package/grpc/transaction/LThcUp2D5p4JgRMnWEUVVSdNEHiq5YfN5HXPGRYeWBfypMT3aTa1CaC9XdPT69CyMdoJ32XAkjXAa2TmBYBeZAy.json ADDED Viewed

@@ -0,0 +1 @@

+ {"txid":"LThcUp2D5p4JgRMnWEUVVSdNEHiq5YfN5HXPGRYeWBfypMT3aTa1CaC9XdPT69CyMdoJ32XAkjXAa2TmBYBeZAy","tx_data":{"transaction":{"signature":{"type":"Buffer","data":[16,200,40,89,141,41,183,98,147,57,1,87,41,149,214,16,175,82,193,82,165,56,77,110,141,91,60,201,155,230,174,58,18,41,245,133,174,58,19,223,250,226,160,136,30,114,91,185,148,117,131,9,56,28,141,128,214,181,22,92,178,181,156,10]},"isVote":false,"transaction":{"signatures":[{"type":"Buffer","data":[16,200,40,89,141,41,183,98,147,57,1,87,41,149,214,16,175,82,193,82,165,56,77,110,141,91,60,201,155,230,174,58,18,41,245,133,174,58,19,223,250,226,160,136,30,114,91,185,148,117,131,9,56,28,141,128,214,181,22,92,178,181,156,10]}],"message":{"header":{"numRequiredSignatures":1,"numReadonlySignedAccounts":0,"numReadonlyUnsignedAccounts":9},"accountKeys":[{"type":"Buffer","data":[21,168,223,201,100,91,51,204,64,225,198,249,160,96,246,185,169,192,171,55,210,185,203,199,218,7,74,5,197,199,28,102]},{"type":"Buffer","data":[35,15,221,235,196,66,135,19,27,253,157,252,117,232,177,135,13,242,61,171,69,181,33,97,225,110,182,179,90,52,75,165]},{"type":"Buffer","data":[61,189,108,237,94,164,238,217,4,165,173,170,205,221,223,73,19,7,33,191,177,94,115,142,189,23,69,240,197,214,155,6]},{"type":"Buffer","data":[66,142,7,8,168,214,201,214,101,235,178,223,185,21,210,54,170,122,213,100,227,116,32,97,144,214,65,145,194,207,116,23]},{"type":"Buffer","data":[85,164,104,186,181,200,66,198,159,69,58,88,99,75,220,67,166,129,150,73,181,188,188,130,199,225,67,11,146,251,182,85]},{"type":"Buffer","data":[79,241,157,230,132,140,160,191,33,109,21,175,127,19,12,206,53,149,234,68,179,148,217,216,246,1,45,146,142,17,222,45]},{"type":"Buffer","data":[116,231,0,156,19,31,133,106,48,98,218,28,178,94,236,27,181,24,145,115,95,223,71,86,219,253,124,39,245,102,47,128]},{"type":"Buffer","data":[121,168,114,186,49,158,162,43,2,239,186,238,20,251,23,169,192,206,193,3,199,240,124,177,85,1,245,201,164,50,160,138]},{"type":"Buffer","data":[124,70,148,31,239,161,196,29,154,187,79,20,139,58,51,81,91,185,151,12,31,56,49,53,137,93,2,112,231,195,28,2]},{"type":"Buffer","data":[188,43,87,6,94,241,221,102,84,48,190,96,107,166,89,108,2,149,48,27,173,239,139,90,252,65,1,65,80,244,18,116]},{"type":"Buffer","data":[190,46,221,15,121,214,61,54,4,16,223,171,173,221,46,30,214,132,42,198,65,191,141,41,55,227,214,28,35,210,244,176]},{"type":"Buffer","data":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]},{"type":"Buffer","data":[129,110,102,99,12,59,183,36,220,89,228,159,108,196,48,110,96,58,106,172,202,6,250,62,52,226,180,10,213,151,157,141]},{"type":"Buffer","data":[165,213,202,158,4,207,93,181,144,183,20,186,47,227,44,177,89,19,63,193,193,146,183,34,87,253,7,211,156,176,64,30]},{"type":"Buffer","data":[3,6,70,111,229,33,23,50,255,236,173,186,114,195,155,231,188,140,229,187,197,247,18,107,44,67,155,58,64,0,0,0]},{"type":"Buffer","data":[198,250,122,243,190,219,173,58,61,101,243,106,171,201,116,49,177,187,228,194,210,246,224,228,124,166,2,3,69,47,93,97]},{"type":"Buffer","data":[5,74,83,90,153,41,33,6,77,36,232,113,96,218,56,124,124,53,181,221,188,146,187,129,228,31,168,64,65,5,68,141]},{"type":"Buffer","data":[6,155,136,87,254,171,129,132,251,104,127,99,70,24,192,53,218,196,57,220,26,235,59,85,152,160,240,0,0,0,0,1]},{"type":"Buffer","data":[6,221,246,225,215,101,161,147,217,203,225,70,206,235,121,172,28,180,133,237,95,91,55,145,58,140,245,133,126,255,0,169]},{"type":"Buffer","data":[6,221,246,225,238,117,143,222,24,66,93,188,228,108,205,218,182,26,252,77,131,185,13,39,254,189,249,40,216,161,139,252]}],"recentBlockhash":{"type":"Buffer","data":[82,58,243,143,72,241,122,249,155,126,58,109,174,48,72,57,131,236,110,218,173,48,125,246,193,133,101,192,195,219,115,147]},"instructions":[{"programIdIndex":14,"accounts":{},"data":{"type":"Buffer","data":[2,192,212,1,0]}},{"programIdIndex":14,"accounts":{},"data":{"type":"Buffer","data":[3,1,0,0,0,0,0,0,0]}},{"programIdIndex":13,"accounts":{"type":"Buffer","data":[0,12,6,8,7,4,5,1,18,19,16,15,17,10,2,3]},"data":{"type":"Buffer","data":[43,4,237,11,26,201,30,98,232,3,0,0,0,0,0,0,147,26,0,0,0,0,0,0,154,87,105,78,169,26,92,132,177,196,254,255,0,0,0,0,1]}},{"programIdIndex":11,"accounts":{"type":"Buffer","data":[0,9]},"data":{"type":"Buffer","data":[2,0,0,0,32,191,2,0,0,0,0,0]}}],"versioned":false,"addressTableLookups":[]}},"meta":{"fee":"5001","preBalances":["77368771","32092760","72161280","72161280","2039480","22339146210826","1588677399","9876350","2039280","4445332","13641700","1","1705400","1141440","1","377950852239","521498880","994548950606","934087680","1141440"],"postBalances":["77183770","32092760","72161280","72161280","2039480","22339146203949","1588677399","9883227","2039280","4625332","13641700","1","1705400","1141440","1","377950852239","521498880","994548950606","934087680","1141440"],"innerInstructions":[{"index":2,"instructions":[{"programIdIndex":18,"accounts":{"type":"Buffer","data":[8,15,4,0]},"data":{"type":"Buffer","data":[12,232,3,0,0,0,0,0,0,6]},"stackHeight":2},{"programIdIndex":18,"accounts":{"type":"Buffer","data":[5,17,7,6]},"data":{"type":"Buffer","data":[12,221,26,0,0,0,0,0,0,9]},"stackHeight":2}]}],"innerInstructionsNone":false,"logMessages":["Program ComputeBudget111111111111111111111111111111 invoke [1]","Program ComputeBudget111111111111111111111111111111 success","Program ComputeBudget111111111111111111111111111111 invoke [1]","Program ComputeBudget111111111111111111111111111111 success","Program CAMMCzo5YL8w4VFF8KVHrK22GGUsp5VTaW7grrKgrWqK invoke [1]","Program log: Instruction: SwapV2","Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA invoke [2]","Program log: Instruction: TransferChecked","Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA consumed 6200 of 65508 compute units","Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA success","Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA invoke [2]","Program log: Instruction: TransferChecked","Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA consumed 6238 of 55335 compute units","Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA success","Program data: QMbN6CYIceJ05wCcEx+FajBi2hyyXuwbtRiRc1/fR1bb/Xwn9WYvgBWo38lkWzPMQOHG+aBg9rmpwKs30rnLx9oHSgXFxxxmeahyujGeoisC77ruFPsXqcDOwQPH8HyxVQH1yaQyoIp8RpQf76HEHZq7TxSLOjNRW7mXDB84MTWJXQJw58McAt0aAAAAAAAAAAAAAAAAAADoAwAAAAAAAAAAAAAAAAAAAEEJYi+uQZFhAAAAAAAAAACl8LhRdAsAAAAAAAAAAAAAorT//w==","Program CAMMCzo5YL8w4VFF8KVHrK22GGUsp5VTaW7grrKgrWqK consumed 77126 of 119700 compute units","Program CAMMCzo5YL8w4VFF8KVHrK22GGUsp5VTaW7grrKgrWqK success","Program 11111111111111111111111111111111 invoke [1]","Program 11111111111111111111111111111111 success"],"logMessagesNone":false,"preTokenBalances":[{"accountIndex":4,"mint":"EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v","uiTokenAmount":{"uiAmount":410438.861085,"decimals":6,"amount":"410438861085","uiAmountString":"410438.861085"},"owner":"8sLbNZoA1cfnvMJLPfp98ZLAnFSYCFApfJKMbiXNLwxj","programId":"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"},{"accountIndex":5,"mint":"So11111111111111111111111111111111111111112","uiTokenAmount":{"uiAmount":22339.129336345,"decimals":9,"amount":"22339129336345","uiAmountString":"22339.129336345"},"owner":"8sLbNZoA1cfnvMJLPfp98ZLAnFSYCFApfJKMbiXNLwxj","programId":"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"},{"accountIndex":7,"mint":"So11111111111111111111111111111111111111112","uiTokenAmount":{"uiAmount":0.00783707,"decimals":9,"amount":"7837070","uiAmountString":"0.00783707"},"owner":"2TYv4Tn9raGVs6peco6EkVRKVZt7WwMVNpn5mWEaP7fK","programId":"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"},{"accountIndex":8,"mint":"EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v","uiTokenAmount":{"uiAmount":0.308573,"decimals":6,"amount":"308573","uiAmountString":"0.308573"},"owner":"2TYv4Tn9raGVs6peco6EkVRKVZt7WwMVNpn5mWEaP7fK","programId":"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"}],"postTokenBalances":[{"accountIndex":4,"mint":"EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v","uiTokenAmount":{"uiAmount":410438.862085,"decimals":6,"amount":"410438862085","uiAmountString":"410438.862085"},"owner":"8sLbNZoA1cfnvMJLPfp98ZLAnFSYCFApfJKMbiXNLwxj","programId":"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"},{"accountIndex":5,"mint":"So11111111111111111111111111111111111111112","uiTokenAmount":{"uiAmount":22339.129329468,"decimals":9,"amount":"22339129329468","uiAmountString":"22339.129329468"},"owner":"8sLbNZoA1cfnvMJLPfp98ZLAnFSYCFApfJKMbiXNLwxj","programId":"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"},{"accountIndex":7,"mint":"So11111111111111111111111111111111111111112","uiTokenAmount":{"uiAmount":0.007843947,"decimals":9,"amount":"7843947","uiAmountString":"0.007843947"},"owner":"2TYv4Tn9raGVs6peco6EkVRKVZt7WwMVNpn5mWEaP7fK","programId":"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"},{"accountIndex":8,"mint":"EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v","uiTokenAmount":{"uiAmount":0.307573,"decimals":6,"amount":"307573","uiAmountString":"0.307573"},"owner":"2TYv4Tn9raGVs6peco6EkVRKVZt7WwMVNpn5mWEaP7fK","programId":"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"}],"rewards":[],"loadedWritableAddresses":[],"loadedReadonlyAddresses":[],"returnDataNone":true,"computeUnitsConsumed":"77576"},"index":"1568"},"slot":"324979626"}}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "@clonegod/ttd-sol-common",
-    "version": "1.0.156",
+    "version": "1.0.157",
     "description": "",
     "main": "dist/index.js",
     "types": "types/index.d.ts",
@@ -13,7 +13,7 @@
         "push": "npm run build && npm publish"
     },
     "dependencies": {
-        "@clonegod/ttd-common": "1.1.6",
+        "@clonegod/ttd-common": "1.1.7",
         "@metaplex-foundation/mpl-token-metadata": "^2.5.2",
         "@solana/web3.js": "1.91.6",
         "rpc-websockets": "7.10.0",