Skip to content

Commit 7e654ab

Browse files
originalixoriginalix
authored
chore: Add logs for dApp (#5603)
* chore: Add logs for dApp * feat: Add logs
1 parent 42c038e commit 7e654ab

16 files changed

+107
-4
lines changed

‎packages/kit-bg/src/providers/ProviderApiAlgo.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
providerApiMethod,
88
} from '@onekeyhq/shared/src/background/backgroundDecorators';
99
import { SEPERATOR } from '@onekeyhq/shared/src/engine/engineConsts';
10+
import { defaultLogger } from '@onekeyhq/shared/src/logger/logger';
1011

1112
import ProviderApiBase from './ProviderApiBase';
1213

@@ -82,7 +83,7 @@ class ProviderApiAlgo extends ProviderApiBase {
8283

8384
@providerApiMethod()
8485
public async connect(request: IJsBridgeMessagePayload) {
85-
console.log('algo connect', request);
86+
defaultLogger.discovery.dapp.dappRequest({ request });
8687
const accounts = await this.accounts(request);
8788

8889
if (accounts && accounts.length > 0) {
@@ -98,6 +99,7 @@ class ProviderApiAlgo extends ProviderApiBase {
9899
request: IJsBridgeMessagePayload,
99100
walletTransactions: Array<{ txn: string; signers: [] }>,
100101
): Promise<(string | null)[]> {
102+
defaultLogger.discovery.dapp.dappRequest({ request });
101103
const txsToSign: string[] = [];
102104
for (let i = 0; i < walletTransactions.length; i += 1) {
103105
// transaction with signers means that this transaction is not meant to be signed

‎packages/kit-bg/src/providers/ProviderApiAptos.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313
permissionRequired,
1414
providerApiMethod,
1515
} from '@onekeyhq/shared/src/background/backgroundDecorators';
16+
import { defaultLogger } from '@onekeyhq/shared/src/logger/logger';
1617
import bufferUtils from '@onekeyhq/shared/src/utils/bufferUtils';
1718
import hexUtils from '@onekeyhq/shared/src/utils/hexUtils';
1819
import { EMessageTypesAptos } from '@onekeyhq/shared/types/message';
@@ -108,6 +109,7 @@ class ProviderApiAptos extends ProviderApiBase {
108109

109110
@providerApiMethod()
110111
public async connect(request: IJsBridgeMessagePayload) {
112+
defaultLogger.discovery.dapp.dappRequest({ request });
111113
const accountsInfo =
112114
await this.backgroundApi.serviceDApp.dAppGetConnectedAccountsInfo(
113115
request,
@@ -177,6 +179,7 @@ class ProviderApiAptos extends ProviderApiBase {
177179
request: IJsBridgeMessagePayload,
178180
params: IEncodedTxAptos,
179181
): Promise<string> {
182+
defaultLogger.discovery.dapp.dappRequest({ request });
180183
const encodeTx = params;
181184

182185
const accounts = await this.getAccountsInfo(request);
@@ -260,6 +263,7 @@ class ProviderApiAptos extends ProviderApiBase {
260263
request: IJsBridgeMessagePayload,
261264
params: string,
262265
): Promise<string> {
266+
defaultLogger.discovery.dapp.dappRequest({ request });
263267
const { account, accountInfo } = await this._getAccount(request);
264268
const vault = await this.getAptosVault(request);
265269

@@ -287,6 +291,7 @@ class ProviderApiAptos extends ProviderApiBase {
287291
request: IJsBridgeMessagePayload,
288292
params: string,
289293
) {
294+
defaultLogger.discovery.dapp.dappRequest({ request });
290295
const { account, accountInfo } = await this._getAccount(request);
291296
const vault = await this.getAptosVault(request);
292297

@@ -317,6 +322,7 @@ class ProviderApiAptos extends ProviderApiBase {
317322
request: IJsBridgeMessagePayload,
318323
params: IEncodedTxAptos,
319324
) {
325+
defaultLogger.discovery.dapp.dappRequest({ request });
320326
const { account, accountInfo } = await this._getAccount(request);
321327
const result =
322328
await this.backgroundApi.serviceDApp.openSignAndSendTransactionModal({
@@ -336,6 +342,7 @@ class ProviderApiAptos extends ProviderApiBase {
336342
request: IJsBridgeMessagePayload,
337343
params: ISignMessagePayload,
338344
): Promise<ISignMessageResponse> {
345+
defaultLogger.discovery.dapp.dappRequest({ request });
339346
// @ts-expect-error
340347
const isPetra = request.data?.aptosProviderType === 'petra';
341348

@@ -377,6 +384,7 @@ class ProviderApiAptos extends ProviderApiBase {
377384
type_args: any[];
378385
},
379386
): Promise<string> {
387+
defaultLogger.discovery.dapp.dappRequest({ request });
380388
const encodeTx: IEncodedTxAptos = {
381389
type: 'entry_function_payload',
382390
function: params.func,
@@ -443,6 +451,7 @@ class ProviderApiAptos extends ProviderApiBase {
443451
property_types?: Array<string>;
444452
},
445453
) {
454+
defaultLogger.discovery.dapp.dappRequest({ request });
446455
const { account, accountInfo } = await this._getAccount(request);
447456
const encodeTx = generateTransferCreateNft(
448457
account.address,
@@ -511,6 +520,7 @@ class ProviderApiAptos extends ProviderApiBase {
511520
};
512521
},
513522
) {
523+
defaultLogger.discovery.dapp.dappRequest({ request });
514524
const vault = await this.getAptosVault(request);
515525
const rawTx = await vault.client.generateTransaction(
516526
params.sender,
@@ -527,6 +537,7 @@ class ProviderApiAptos extends ProviderApiBase {
527537
request: IJsBridgeMessagePayload,
528538
params: Uint8Array | string,
529539
) {
540+
defaultLogger.discovery.dapp.dappRequest({ request });
530541
const { account, accountInfo } = await this._getAccount(request);
531542
const bcsTxn: Uint8Array = decodeBytesTransaction(params);
532543
const encodedTx = {

‎packages/kit-bg/src/providers/ProviderApiBtc.ts‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import {
1717
providerApiMethod,
1818
} from '@onekeyhq/shared/src/background/backgroundDecorators';
1919
import { getNetworkIdsMap } from '@onekeyhq/shared/src/config/networkIds';
20+
import { defaultLogger } from '@onekeyhq/shared/src/logger/logger';
2021
import accountUtils from '@onekeyhq/shared/src/utils/accountUtils';
2122
import { memoizee } from '@onekeyhq/shared/src/utils/cacheUtils';
2223
import networkUtils from '@onekeyhq/shared/src/utils/networkUtils';
@@ -99,6 +100,7 @@ class ProviderApiBtc extends ProviderApiBase {
99100
@providerApiMethod()
100101
public async requestAccounts(request: IJsBridgeMessagePayload) {
101102
return this.semaphore.runExclusive(async () => {
103+
defaultLogger.discovery.dapp.dappRequest({ request });
102104
const accounts = await this.getAccounts(request);
103105
if (accounts && accounts.length) {
104106
return accounts;
@@ -155,7 +157,7 @@ class ProviderApiBtc extends ProviderApiBase {
155157
request: IJsBridgeMessagePayload,
156158
params: ISwitchNetworkParams,
157159
) {
158-
console.log('ProviderApiBtc.switchNetwork');
160+
defaultLogger.discovery.dapp.dappRequest({ request });
159161
const accountsInfo =
160162
await this.backgroundApi.serviceDApp.dAppGetConnectedAccountsInfo(
161163
request,
@@ -223,6 +225,7 @@ class ProviderApiBtc extends ProviderApiBase {
223225
request: IJsBridgeMessagePayload,
224226
params: ISendBitcoinParams,
225227
) {
228+
defaultLogger.discovery.dapp.dappRequest({ request });
226229
const { toAddress, satoshis, feeRate } = params;
227230
const accountsInfo = await this.getAccountsInfo(request);
228231
const { accountInfo: { accountId, networkId, address } = {} } =
@@ -279,6 +282,7 @@ class ProviderApiBtc extends ProviderApiBase {
279282
request: IJsBridgeMessagePayload,
280283
params: ISignMessageParams,
281284
) {
285+
defaultLogger.discovery.dapp.dappRequest({ request });
282286
const { message, type } = params;
283287
const accountsInfo = await this.getAccountsInfo(request);
284288
const { accountInfo: { accountId, networkId } = {} } = accountsInfo[0];
@@ -317,6 +321,7 @@ class ProviderApiBtc extends ProviderApiBase {
317321

318322
@providerApiMethod()
319323
public async pushTx(request: IJsBridgeMessagePayload, params: IPushTxParams) {
324+
defaultLogger.discovery.dapp.dappRequest({ request });
320325
const { rawTx } = params;
321326
const accountsInfo = await this.getAccountsInfo(request);
322327
const { accountInfo: { accountId, networkId, address } = {} } =
@@ -352,6 +357,7 @@ class ProviderApiBtc extends ProviderApiBase {
352357
request: IJsBridgeMessagePayload,
353358
params: ISignPsbtParams,
354359
) {
360+
defaultLogger.discovery.dapp.dappRequest({ request });
355361
const accountsInfo = await this.getAccountsInfo(request);
356362
const { accountInfo: { accountId, networkId } = {} } = accountsInfo[0];
357363

@@ -393,6 +399,7 @@ class ProviderApiBtc extends ProviderApiBase {
393399
request: IJsBridgeMessagePayload,
394400
params: ISignPsbtsParams,
395401
) {
402+
defaultLogger.discovery.dapp.dappRequest({ request });
396403
const accountsInfo = await this.getAccountsInfo(request);
397404
const { accountInfo: { accountId, networkId } = {} } = accountsInfo[0];
398405

@@ -530,6 +537,7 @@ class ProviderApiBtc extends ProviderApiBase {
530537
request: IJsBridgeMessagePayload,
531538
params: IPushPsbtParams,
532539
) {
540+
defaultLogger.discovery.dapp.dappRequest({ request });
533541
const accountsInfo = await this.getAccountsInfo(request);
534542
const { accountInfo: { accountId, networkId, address } = {} } =
535543
accountsInfo[0];

‎packages/kit-bg/src/providers/ProviderApiCardano.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
backgroundClass,
99
providerApiMethod,
1010
} from '@onekeyhq/shared/src/background/backgroundDecorators';
11+
import { defaultLogger } from '@onekeyhq/shared/src/logger/logger';
1112
import { EMessageTypesCommon } from '@onekeyhq/shared/types/message';
1213

1314
import { vaultFactory } from '../vaults/factory';
@@ -84,6 +85,7 @@ class ProviderApiCardano extends ProviderApiBase {
8485
@providerApiMethod()
8586
async connect(request: IJsBridgeMessagePayload) {
8687
return this.semaphore.runExclusive(async () => {
88+
defaultLogger.discovery.dapp.dappRequest({ request });
8789
const connectedAddress = await this.cardano_accounts(request);
8890
if (connectedAddress) {
8991
return connectedAddress;
@@ -173,6 +175,7 @@ class ProviderApiCardano extends ProviderApiBase {
173175

174176
@providerApiMethod()
175177
async signTx(request: IJsBridgeMessagePayload, params: { tx: string }) {
178+
defaultLogger.discovery.dapp.dappRequest({ request });
176179
const vault = await this.getAdaVault(request);
177180
if (!vault) {
178181
throw new Error('Not connected to any account.');
@@ -200,6 +203,7 @@ class ProviderApiCardano extends ProviderApiBase {
200203
payload: string;
201204
},
202205
) {
206+
defaultLogger.discovery.dapp.dappRequest({ request });
203207
if (typeof params.payload !== 'string') {
204208
throw web3Errors.rpc.invalidInput();
205209
}
@@ -226,6 +230,7 @@ class ProviderApiCardano extends ProviderApiBase {
226230

227231
@providerApiMethod()
228232
async submitTx(request: IJsBridgeMessagePayload, params: string) {
233+
defaultLogger.discovery.dapp.dappRequest({ request });
229234
const { accountInfo: { accountId, networkId, address } = {} } = (
230235
await this.getAccountsInfo(request)
231236
)[0];

‎packages/kit-bg/src/providers/ProviderApiConflux.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {
1111
permissionRequired,
1212
providerApiMethod,
1313
} from '@onekeyhq/shared/src/background/backgroundDecorators';
14+
import { defaultLogger } from '@onekeyhq/shared/src/logger/logger';
1415
import { memoizee } from '@onekeyhq/shared/src/utils/cacheUtils';
1516
import { toBigIntHex } from '@onekeyhq/shared/src/utils/numberUtils';
1617
import { EMessageTypesEth } from '@onekeyhq/shared/types/message';
@@ -189,7 +190,7 @@ class ProviderApiConflux extends ProviderApiBase {
189190

190191
@providerApiMethod()
191192
async cfx_requestAccounts(request: IJsBridgeMessagePayload) {
192-
console.log('ProviderApiConflux.cfx_requestAccounts', request);
193+
defaultLogger.discovery.dapp.dappRequest({ request });
193194

194195
const accounts = await this.cfx_accounts(request);
195196
if (accounts && accounts.length) {
@@ -205,7 +206,7 @@ class ProviderApiConflux extends ProviderApiBase {
205206
request: IJsBridgeMessagePayload,
206207
transaction: IEncodedTxCfx,
207208
) {
208-
console.log('cfx_sendTransaction', request, transaction);
209+
defaultLogger.discovery.dapp.dappRequest({ request });
209210

210211
const { accountInfo: { accountId, networkId } = {} } = (
211212
await this.getAccountsInfo(request)
@@ -232,6 +233,7 @@ class ProviderApiConflux extends ProviderApiBase {
232233

233234
@providerApiMethod()
234235
cfx_signTypedData_v4(request: IJsBridgeMessagePayload, ...messages: any[]) {
236+
defaultLogger.discovery.dapp.dappRequest({ request });
235237
return this._showSignMessageModal(request, {
236238
type: EMessageTypesEth.TYPED_DATA_V4,
237239
message: messages[1],
@@ -246,6 +248,7 @@ class ProviderApiConflux extends ProviderApiBase {
246248

247249
@providerApiMethod()
248250
async personal_sign(request: IJsBridgeMessagePayload, ...messages: any[]) {
251+
defaultLogger.discovery.dapp.dappRequest({ request });
249252
const message = messages[0];
250253

251254
return this._showSignMessageModal(request, {
@@ -257,6 +260,7 @@ class ProviderApiConflux extends ProviderApiBase {
257260

258261
@providerApiMethod()
259262
cfx_sign(request: IJsBridgeMessagePayload, ...messages: any[]) {
263+
defaultLogger.discovery.dapp.dappRequest({ request });
260264
return this._showSignMessageModal(request, {
261265
type: EMessageTypesEth.ETH_SIGN,
262266
message: messages[1],

‎packages/kit-bg/src/providers/ProviderApiCosmos.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import {
1717
permissionRequired,
1818
providerApiMethod,
1919
} from '@onekeyhq/shared/src/background/backgroundDecorators';
20+
import { defaultLogger } from '@onekeyhq/shared/src/logger/logger';
2021
import accountUtils from '@onekeyhq/shared/src/utils/accountUtils';
2122
import networkUtils from '@onekeyhq/shared/src/utils/networkUtils';
2223
import timerUtils from '@onekeyhq/shared/src/utils/timerUtils';
@@ -239,6 +240,7 @@ class ProviderApiCosmos extends ProviderApiBase {
239240
signOptions?: any;
240241
},
241242
): Promise<any> {
243+
defaultLogger.discovery.dapp.dappRequest({ request });
242244
const txWrapper = TransactionWrapper.fromAminoSignDoc(
243245
params.signDoc,
244246
undefined,
@@ -309,6 +311,7 @@ class ProviderApiCosmos extends ProviderApiBase {
309311
signOptions?: any;
310312
},
311313
): Promise<any> {
314+
defaultLogger.discovery.dapp.dappRequest({ request });
312315
const networkId = this.convertCosmosChainId(params.signDoc.chainId);
313316
if (!networkId) throw new Error('Invalid chainId');
314317

@@ -383,6 +386,7 @@ class ProviderApiCosmos extends ProviderApiBase {
383386
mode: string;
384387
},
385388
) {
389+
defaultLogger.discovery.dapp.dappRequest({ request });
386390
const networkId = this.convertCosmosChainId(params.chainId);
387391
if (!networkId) throw new Error('Invalid chainId');
388392

@@ -411,6 +415,7 @@ class ProviderApiCosmos extends ProviderApiBase {
411415
},
412416
) {
413417
return this.signMessageSemaphore.runExclusive(async () => {
418+
defaultLogger.discovery.dapp.dappRequest({ request });
414419
const paramsData = {
415420
data: params.data,
416421
signer: params.signer,
@@ -452,6 +457,7 @@ class ProviderApiCosmos extends ProviderApiBase {
452457
data: string;
453458
},
454459
): Promise<any> {
460+
defaultLogger.discovery.dapp.dappRequest({ request });
455461
const txInfo = await this.signArbitraryMessage(request, params);
456462

457463
const [signerInfo] = txInfo.authInfo.signerInfos;
@@ -487,6 +493,7 @@ class ProviderApiCosmos extends ProviderApiBase {
487493
};
488494
},
489495
): Promise<any> {
496+
defaultLogger.discovery.dapp.dappRequest({ request });
490497
const txInfo = await this.signArbitraryMessage(request, params);
491498

492499
const [signerInfo] = txInfo.authInfo.signerInfos;

0 commit comments

Comments
 (0)