From b094ef97bf72b5d6e35b1503c2360a480ec51784 Mon Sep 17 00:00:00 2001 From: phucledien Date: Fri, 12 Jan 2024 13:52:07 +0700 Subject: [PATCH] fix: update format feed transaction --- package.json | 2 +- pnpm-lock.yaml | 53 ++++++++------- src/commands/feed/index.ts | 4 +- src/index.ts | 2 +- src/types/api.ts | 128 ++++++++++++++++++++++++++++--------- 5 files changed, 131 insertions(+), 58 deletions(-) diff --git a/package.json b/package.json index b721bfd16..15a947047 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ }, "dependencies": { "@bonfida/spl-name-service": "^1.0.11", - "@consolelabs/mochi-formatter": "^18.2.5", + "@consolelabs/mochi-formatter": "^18.2.6", "@consolelabs/mochi-rest": "^5.1.9", "@discordjs/builders": "^0.12.0", "@discordjs/rest": "^0.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9ed873b07..ba3e74da1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,8 +12,8 @@ dependencies: specifier: ^1.0.11 version: 1.0.11(@solana/web3.js@1.73.2) '@consolelabs/mochi-formatter': - specifier: ^18.2.5 - version: 18.2.5(@consolelabs/mochi-rest@5.1.9)(ioredis@5.3.2) + specifier: ^18.2.6 + version: 18.2.6(@consolelabs/mochi-rest@5.1.9)(ioredis@5.3.2) '@consolelabs/mochi-rest': specifier: ^5.1.9 version: 5.1.9 @@ -374,7 +374,7 @@ packages: dependencies: '@babel/types': 7.23.6 '@jridgewell/gen-mapping': 0.3.3 - '@jridgewell/trace-mapping': 0.3.20 + '@jridgewell/trace-mapping': 0.3.21 jsesc: 2.5.2 dev: true @@ -855,16 +855,16 @@ packages: - utf-8-validate dev: false - /@bonfida/spl-name-service@1.0.11(@solana/web3.js@1.88.0): + /@bonfida/spl-name-service@1.0.11(@solana/web3.js@1.89.0): resolution: {integrity: sha512-uZA19yMkiv/bZt/QRH3gDWfL3ed15zFj3+ojhyQWhea+Esw5QEXuvHNS8CuWPHieqz8P00DzBI/EJyxWCs/OIg==} peerDependencies: '@solana/web3.js': ^1.75.0 dependencies: '@ethersproject/sha2': 5.7.0 - '@pythnetwork/client': 2.19.0(@solana/web3.js@1.88.0) + '@pythnetwork/client': 2.19.0(@solana/web3.js@1.89.0) '@solana/buffer-layout': 4.0.1 - '@solana/spl-token': 0.3.7(@solana/web3.js@1.88.0) - '@solana/web3.js': 1.88.0 + '@solana/spl-token': 0.3.7(@solana/web3.js@1.89.0) + '@solana/web3.js': 1.89.0 bech32-buffer: 0.2.1 bn.js: 5.2.1 borsh: 0.7.0 @@ -885,15 +885,15 @@ packages: dev: true optional: true - /@consolelabs/mochi-formatter@18.2.5(@consolelabs/mochi-rest@5.1.9)(ioredis@5.3.2): - resolution: {integrity: sha512-rJiNcCBffn8DvXeoOZM6iY9GGAn7vS4fDI9UJcsv30bBukBKJUk60kMrLnD3ttgfDimczaUyJ8FjB+lrbi3zsw==} + /@consolelabs/mochi-formatter@18.2.6(@consolelabs/mochi-rest@5.1.9)(ioredis@5.3.2): + resolution: {integrity: sha512-Cpzc5Ne1RykcamHma1HEaKhkXBD1tE7/Bny7pr2oK5O9K4UtsVY74BEvlk01kGODI+HQmKJu1VltNYsWjIdfsg==} peerDependencies: '@consolelabs/mochi-rest': ^5.1.9 ioredis: ^5.x.x dependencies: - '@bonfida/spl-name-service': 1.0.11(@solana/web3.js@1.88.0) + '@bonfida/spl-name-service': 1.0.11(@solana/web3.js@1.89.0) '@consolelabs/mochi-rest': 5.1.9 - '@solana/web3.js': 1.88.0 + '@solana/web3.js': 1.89.0 change-case: 4.1.2 ethers: 6.9.2 ioredis: 5.3.2 @@ -957,13 +957,13 @@ packages: buffer-layout: 1.2.2 dev: false - /@coral-xyz/borsh@0.28.0(@solana/web3.js@1.88.0): + /@coral-xyz/borsh@0.28.0(@solana/web3.js@1.89.0): resolution: {integrity: sha512-/u1VTzw7XooK7rqeD7JLUSwOyRSesPUk0U37BV9zK0axJc1q0nRbKFGFLYCQ16OtdOJTTwGfGp11Lx9B45bRCQ==} engines: {node: '>=10'} peerDependencies: '@solana/web3.js': ^1.68.0 dependencies: - '@solana/web3.js': 1.88.0 + '@solana/web3.js': 1.89.0 bn.js: 5.2.1 buffer-layout: 1.2.2 dev: false @@ -1832,6 +1832,13 @@ packages: '@jridgewell/sourcemap-codec': 1.4.15 dev: true + /@jridgewell/trace-mapping@0.3.21: + resolution: {integrity: sha512-SRfKmRe1KvYnxjEMtxEr+J4HIeMX5YBg/qhRHpxEIGjhX1rshcHlnFUE9K0GazhVKWM7B+nARSkV8LuvJdJ5/g==} + dependencies: + '@jridgewell/resolve-uri': 3.1.1 + '@jridgewell/sourcemap-codec': 1.4.15 + dev: true + /@mapbox/node-pre-gyp@1.0.11: resolution: {integrity: sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==} hasBin: true @@ -2061,14 +2068,14 @@ packages: - utf-8-validate dev: false - /@pythnetwork/client@2.19.0(@solana/web3.js@1.88.0): + /@pythnetwork/client@2.19.0(@solana/web3.js@1.89.0): resolution: {integrity: sha512-0VSQ0NqBOa5EtloXbOVYZ6Wpu8CLP3oaOKVTaUMSX/HXbB00S6G+xdwF7stxo6emgrAMopotx3icEVug5Lpomg==} peerDependencies: '@solana/web3.js': ^1.30.2 dependencies: '@coral-xyz/anchor': 0.28.1-beta.2 - '@coral-xyz/borsh': 0.28.0(@solana/web3.js@1.88.0) - '@solana/web3.js': 1.88.0 + '@coral-xyz/borsh': 0.28.0(@solana/web3.js@1.89.0) + '@solana/web3.js': 1.89.0 buffer: 6.0.3 transitivePeerDependencies: - bufferutil @@ -2342,7 +2349,7 @@ packages: - utf-8-validate dev: false - /@solana/spl-token@0.3.7(@solana/web3.js@1.88.0): + /@solana/spl-token@0.3.7(@solana/web3.js@1.89.0): resolution: {integrity: sha512-bKGxWTtIw6VDdCBngjtsGlKGLSmiu/8ghSt/IOYJV24BsymRbgq7r12GToeetpxmPaZYLddKwAz7+EwprLfkfg==} engines: {node: '>=16'} peerDependencies: @@ -2350,7 +2357,7 @@ packages: dependencies: '@solana/buffer-layout': 4.0.1 '@solana/buffer-layout-utils': 0.2.0 - '@solana/web3.js': 1.88.0 + '@solana/web3.js': 1.89.0 buffer: 6.0.3 transitivePeerDependencies: - bufferutil @@ -2382,8 +2389,8 @@ packages: - utf-8-validate dev: false - /@solana/web3.js@1.88.0: - resolution: {integrity: sha512-E4BdfB0HZpb66OPFhIzPApNE2tG75Mc6XKIoeymUkx/IV+USSYuxDX29sjgE/KGNYxggrOf4YuYnRMI6UiPL8w==} + /@solana/web3.js@1.89.0: + resolution: {integrity: sha512-b6PJxNL/DX+J2zccj3kzxZ6HyUF92tc8L9CjMlnTYKCdotAk163ygQ/jbHDT0yYs7pGeXAszyLuaqUXJ8bxwpA==} dependencies: '@babel/runtime': 7.23.8 '@noble/curves': 1.3.0 @@ -3249,7 +3256,7 @@ packages: hasBin: true dependencies: caniuse-lite: 1.0.30001576 - electron-to-chromium: 1.4.625 + electron-to-chromium: 1.4.629 node-releases: 2.0.14 update-browserslist-db: 1.0.13(browserslist@4.22.2) dev: true @@ -4085,8 +4092,8 @@ packages: resolution: {integrity: sha512-D3NOkROIlF+d5ixnz7pAf3Lu/AuWpd6AYgI9O67GQXMXTcCP1gJQRotOq35eQy5Sb4hez33XH1YdTtILA7Udww==} dev: true - /electron-to-chromium@1.4.625: - resolution: {integrity: sha512-DENMhh3MFgaPDoXWrVIqSPInQoLImywfCwrSmVl3cf9QHzoZSiutHwGaB/Ql3VkqcQV30rzgdM+BjKqBAJxo5Q==} + /electron-to-chromium@1.4.629: + resolution: {integrity: sha512-5UUkr3k3CZ/k+9Sw7vaaIMyOzMC0XbPyprKI3n0tbKDqkzTDOjK4izm7DxlkueRMim6ZZQ1ja9F7hoFVplHihA==} dev: true /elegant-spinner@1.0.1: diff --git a/src/commands/feed/index.ts b/src/commands/feed/index.ts index 24d098044..aa2171ef5 100644 --- a/src/commands/feed/index.ts +++ b/src/commands/feed/index.ts @@ -16,7 +16,7 @@ const slashCmd: SlashCommand = { run: async function (i) { const { ok, data } = await api.pay.transactions.getAll({ page: 0, - size: 10, + size: 15, action: ["transfer", "vault_transfer"], }) if (!ok) { @@ -27,7 +27,7 @@ const slashCmd: SlashCommand = { txns: data, withTitle: false, on: Platform.Discord, - groupDate: true, + groupDate: false, global: true, }) diff --git a/src/index.ts b/src/index.ts index 6b7767cb7..495315636 100644 --- a/src/index.ts +++ b/src/index.ts @@ -72,7 +72,7 @@ process.on("unhandledRejection", (reason, promise) => { ;(async () => { try { if (DEV) { - await registerCommand() + // await registerCommand() } else { await initUnleash() unleash.on("changed", (stream: any) => { diff --git a/src/types/api.ts b/src/types/api.ts index b55965716..b7ee1dbfd 100644 --- a/src/types/api.ts +++ b/src/types/api.ts @@ -35,12 +35,6 @@ export interface ModelAirdropStatusCount { status?: string } -export interface ModelBasePrivacySetting { - custom_settings?: ModelPrivacyCustomSetting[] - general_platform_group?: string - general_target_group?: string -} - export interface ModelChain { coin_gecko_id?: string currency?: string @@ -301,6 +295,7 @@ export interface ModelGuildUserXP { export interface ModelJSONNullString { string?: string + /** Valid is true if String is not NULL */ valid?: boolean } @@ -402,11 +397,6 @@ export interface ModelPayToken { symbol?: string } -export interface ModelPrivacyCustomSetting { - platform?: string - target_group?: string -} - export interface ModelProductBotCommand { code?: string created_at?: string @@ -573,9 +563,8 @@ export interface ModelUserPaymentSetting { export interface ModelUserPrivacySetting { profile_id?: string - social_accounts?: ModelBasePrivacySetting - tx?: ModelBasePrivacySetting - wallets?: ModelBasePrivacySetting + show_destination_wallet?: boolean + tx_target_group?: string } export interface ModelUserTokenSupportRequest { @@ -674,12 +663,6 @@ export interface RequestAssignVerifiedRoleRequest { user_discord_id: string } -export interface RequestBasePrivacySetting { - custom_settings?: RequestPrivacyCustomSetting[] - general_platform_group?: string - general_target_group?: string -} - export interface RequestClaimQuestsRewardsRequest { quest_id?: string routine?: string @@ -914,15 +897,9 @@ export interface RequestPaymentSetting { tx_limit_settings: RequestTxLimitSetting[] } -export interface RequestPrivacyCustomSetting { - platform?: string - target_group?: string -} - export interface RequestPrivacySetting { - social_accounts?: RequestBasePrivacySetting - tx?: RequestBasePrivacySetting - wallets?: RequestBasePrivacySetting + show_destination_wallet: boolean + tx_target_group: string } export interface RequestRoleReactionRequest { @@ -1161,6 +1138,24 @@ export interface ResponseAssetPlatformResponseData { shortname?: string } +export interface ResponseAssetToken { + address?: string + chain?: ResponseAssetTokenChain + decimal?: number + icon?: string + id?: string + name?: string + native?: boolean + price?: number + symbol?: string +} + +export interface ResponseAssetTokenChain { + name?: string + short_name?: string + type?: string +} + export interface ResponseBinanceFutureAccountPositionResponse { data?: ResponseBinanceFuturePositionInformation[] } @@ -1188,6 +1183,36 @@ export interface ResponseBinanceFuturePositionInformation { positions?: ResponseBinanceFuturePositionInfo[] } +export interface ResponseBinancePositionAmountVos { + amount?: string + amountInBTC?: string + amountInUSDT?: string + asset?: string +} + +export interface ResponseBinanceStakingProductPosition { + accrualDays?: number + amount?: string + apy?: string + asset?: string + canReStake?: boolean + canRedeemEarly?: boolean + deliveryDate?: number + duration?: number + interestEndDate?: number + nexInterestPay?: string + nextInterestPayDate?: number + payInterestPeriod?: number + positionId?: number + projectId?: string + purchaseTime?: number + redeemPeriod?: number + rewardAmt?: string + rewardAsset?: string + status?: string + type?: string +} + export interface ResponseChainGasTrackerResponseData { data?: ResponseGasTrackerResponse } @@ -1233,9 +1258,7 @@ export interface ResponseCoinMarketItemData { price_change_percentage_24h?: number price_change_percentage_24h_in_currency?: number price_change_percentage_7d_in_currency?: number - sparkline_in_7d?: { - price?: number[] - } + sparkline_in_7d?: { price?: number[] } symbol?: string } @@ -1323,8 +1346,10 @@ export interface ResponseCreateUserTokenSupportRequest { export interface ResponseDataFilterConfigByReaction { data?: ResponseRoleReactionResponse + /** page index */ page?: number + /** page size */ size?: number total?: number @@ -1332,8 +1357,10 @@ export interface ResponseDataFilterConfigByReaction { export interface ResponseDataListRoleReactionResponse { data?: ResponseListRoleReactionResponse + /** page index */ page?: number + /** page size */ size?: number total?: number @@ -1392,6 +1419,7 @@ export interface ResponseDiscordGuildResponse { id?: string name?: string owner?: boolean + /** @example 0 */ permissions?: string } @@ -1624,8 +1652,10 @@ export interface ResponseGetInvestListResponse { export interface ResponseGetLevelRoleConfigsResponse { data?: ModelGuildConfigLevelRole[] + /** page index */ page?: number + /** page size */ size?: number total?: number @@ -1743,6 +1773,7 @@ export interface ResponseGetTrackingWalletsResponse { export interface ResponseGetTrendingSearch { coins?: ResponseGetTrendingSearchCoin[] + /** this field coingecko return empty */ exchanges?: any } @@ -2260,6 +2291,7 @@ export interface ResponseOnchainInvestDataResponse { export interface ResponsePaginationResponse { /** page index */ page?: number + /** page size */ size?: number total?: number @@ -2506,6 +2538,27 @@ export interface ResponseUser { username?: string } +export interface ResponseUserBalanceCex { + binance?: ResponseWalletAssetData[] +} + +export interface ResponseUserBalanceOnchain { + evm?: ResponseWalletAssetData[] + ron?: ResponseWalletAssetData[] + sol?: ResponseWalletAssetData[] + sui?: ResponseWalletAssetData[] +} + +export interface ResponseUserBalanceResponse { + cex?: ResponseUserBalanceCex + lastest_snapshot_bals?: string + offchain?: ResponseWalletAssetData[] + onchain?: ResponseUserBalanceOnchain + pnl?: string + summarize?: ResponseWalletAssetData[] + totalUsdAmount?: number +} + export interface ResponseUserFeedbackResponse { data?: ModelUserFeedback[] page?: number @@ -2521,6 +2574,18 @@ export interface ResponseUserNotificationSettingResponse { data?: ModelUserNotificationSetting } +export interface ResponseWalletAssetData { + amount?: string + asset_balance?: number + chain_id?: number + contract_name?: string + contract_symbol?: string + detail_lending?: ResponseBinancePositionAmountVos + detail_staking?: ResponseBinanceStakingProductPosition + token?: ResponseAssetToken + usd_balance?: number +} + export interface UtilPagination { page?: number size?: number @@ -2529,6 +2594,7 @@ export interface UtilPagination { export interface UuidNullUUID { uuid?: string + /** Valid is true if UUID is not NULL */ valid?: boolean }