Skip to content

Commit 9e19a78

Browse files
brayansdtbrayansdt
committed
Reorganise logs
1 parent 9e14332 commit 9e19a78

File tree

2 files changed

+55
-54
lines changed

2 files changed

+55
-54
lines changed

‎packages/internal/toolkit/src/crypto.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ export async function signRaw(
4343
payload: string,
4444
signer: Signer,
4545
): Promise<string> {
46-
track('internal.crypto', 'log', { param: 'signRaw.payload', val: payload });
47-
track('internal.crypto', 'log', { param: 'signRaw.toUtf8Bytes', val: toUtf8Bytes(payload).toString() });
46+
track('xProvider', 'log', { param: 'signRaw.payload', val: payload });
47+
track('xProvider', 'log', { param: 'signRaw.toUtf8Bytes', val: toUtf8Bytes(payload).toString() });
4848
track(
49-
'internal.crypto',
49+
'xProvider',
5050
'log',
5151
{
5252
param: 'signRaw.payload.normalize() === payload',
@@ -65,41 +65,41 @@ export async function signRaw(
6565

6666
// compare message utf8 bytes with payload.normalize()
6767
track(
68-
'internal.crypto',
68+
'xProvider',
6969
'log',
7070
{
7171
param: 'signRaw.message === payload.normalize()',
7272
val: message === payload.normalize(),
7373
},
7474
);
7575
track(
76-
'internal.crypto',
76+
'xProvider',
7777
'log',
7878
{ param: 'signRaw.message2 === payload.normalize()', val: message2 === payload.normalize() },
7979
);
8080

8181
// output utf8 bytes
8282
track(
83-
'internal.crypto',
83+
'xProvider',
8484
'log',
8585
{ param: 'signRaw.message', val: message, bytes: toUtf8Bytes(message).toString() },
8686
);
8787
track(
88-
'internal.crypto',
88+
'xProvider',
8989
'log',
9090
{ param: 'signRaw.message2', val: message2, bytes: toUtf8Bytes(message2).toString() },
9191
);
9292
// compare utf8 bytes output
9393
track(
94-
'internal.crypto',
94+
'xProvider',
9595
'log',
9696
{
9797
param: 'signRaw.toUtf8Bytes === toUtf8Bytes(message)',
9898
val: toUtf8Bytes(payload).toString() === toUtf8Bytes(message).toString(),
9999
},
100100
);
101101
track(
102-
'internal.crypto',
102+
'xProvider',
103103
'log',
104104
{
105105
param: 'signRaw.toUtf8Bytes === toUtf8Bytes(message2)',

‎packages/x-provider/src/imx-wallet/imxWallet.ts

Lines changed: 46 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -31,48 +31,53 @@ const DEFAULT_CONNECTION_BYTES = new Uint8Array([
3131
]);
3232
const DEFAULT_CONNECTION_STRING_1 = 'Only sign this request if you’ve initiated an action with Immutable X.';
3333
const DEFAULT_CONNECTION_STRING_2 = Buffer.from(DEFAULT_CONNECTION_STRING_1, 'utf8').toString('utf8');
34+
const CONNECTION_FAILED_ERROR = 'The L2 IMX Wallet connection has failed';
3435

35-
// track language and charset
36-
track('xProvider', 'log', { param: 'navigator.language', val: navigator?.language });
37-
track('xProvider', 'log', { param: 'navigator.languages', val: navigator?.languages?.join(',') });
38-
track('xProvider', 'log', { param: 'document.characterSet', val: document?.characterSet });
39-
40-
track('xProvider', 'log', { param: 'DEFAULT_CONNECTION_STRING_2', val: DEFAULT_CONNECTION_STRING_2 });
41-
track('xProvider', 'log', { param: 'DEFAULT_CONNECTION_BYTES', val: DEFAULT_CONNECTION_BYTES.toString() });
42-
track(
43-
'xProvider',
44-
'log',
45-
{ param: 'DEFAULT_CONNECTION_STRING_1', val: toUtf8Bytes(DEFAULT_CONNECTION_STRING_1).toString() },
46-
);
47-
track(
48-
'xProvider',
49-
'log',
50-
{ param: 'DEFAULT_CONNECTION_STRING_2', val: toUtf8Bytes(DEFAULT_CONNECTION_STRING_2).toString() },
51-
);
52-
53-
track('xProvider', 'log', {
54-
param: 'DEFAULT_CONNECTION_STRING_1.normalize()',
55-
val: toUtf8Bytes(DEFAULT_CONNECTION_STRING_1.normalize()).toString(),
56-
});
57-
track('xProvider', 'log', {
58-
param: 'DEFAULT_CONNECTION_STRING_2.normalize()',
59-
val: toUtf8Bytes(DEFAULT_CONNECTION_STRING_2.normalize()).toString(),
60-
});
61-
track('xProvider', 'log', {
62-
param: 'Buffer.from(DEFAULT_CONNECTION_STRING_1, utf8).toString()',
63-
val: Buffer.from(DEFAULT_CONNECTION_STRING_1, 'utf8').toString(),
64-
});
65-
66-
track('xProvider', 'log', {
67-
param: 'DEFAULT_CONNECTION_BYTES === toUtf8Bytes(DEFAULT_CONNECTION_STRING_1)',
68-
val: DEFAULT_CONNECTION_BYTES.toString() === toUtf8Bytes(DEFAULT_CONNECTION_STRING_1).toString(),
69-
});
70-
track('xProvider', 'log', {
71-
param: 'DEFAULT_CONNECTION_BYTES === toUtf8Bytes(DEFAULT_CONNECTION_STRING_2)',
72-
val: DEFAULT_CONNECTION_BYTES.toString() === toUtf8Bytes(DEFAULT_CONNECTION_STRING_2).toString(),
73-
});
36+
function trackConnectionDetails() {
37+
// track language and charset
38+
track('xProvider', 'log', { param: 'navigator.language', val: navigator?.language });
39+
track('xProvider', 'log', { param: 'navigator.languages', val: navigator?.languages?.join(',') });
40+
track('xProvider', 'log', { param: 'document.characterSet', val: document?.characterSet });
7441

75-
const CONNECTION_FAILED_ERROR = 'The L2 IMX Wallet connection has failed';
42+
// track connection encoding details
43+
track('xProvider', 'log', { param: 'DEFAULT_CONNECTION_STRING_2', val: DEFAULT_CONNECTION_STRING_2 });
44+
track('xProvider', 'log', { param: 'DEFAULT_CONNECTION_BYTES', val: DEFAULT_CONNECTION_BYTES.toString() });
45+
track(
46+
'xProvider',
47+
'log',
48+
{ param: 'DEFAULT_CONNECTION_STRING_1', val: toUtf8Bytes(DEFAULT_CONNECTION_STRING_1).toString() },
49+
);
50+
track(
51+
'xProvider',
52+
'log',
53+
{ param: 'DEFAULT_CONNECTION_STRING_2', val: toUtf8Bytes(DEFAULT_CONNECTION_STRING_2).toString() },
54+
);
55+
track('xProvider', 'log', {
56+
param: 'DEFAULT_CONNECTION_STRING_1.normalize()',
57+
val: toUtf8Bytes(DEFAULT_CONNECTION_STRING_1.normalize()).toString(),
58+
});
59+
track('xProvider', 'log', {
60+
param: 'DEFAULT_CONNECTION_STRING_2.normalize()',
61+
val: toUtf8Bytes(DEFAULT_CONNECTION_STRING_2.normalize()).toString(),
62+
});
63+
track('xProvider', 'log', {
64+
param: 'Buffer.from(DEFAULT_CONNECTION_STRING_1, utf8).toString()',
65+
val: Buffer.from(DEFAULT_CONNECTION_STRING_1, 'utf8').toString(),
66+
});
67+
track('xProvider', 'log', {
68+
param: 'DEFAULT_CONNECTION_BYTES === toUtf8Bytes(DEFAULT_CONNECTION_STRING_1)',
69+
val: DEFAULT_CONNECTION_BYTES.toString() === toUtf8Bytes(DEFAULT_CONNECTION_STRING_1).toString(),
70+
});
71+
track('xProvider', 'log', {
72+
param: 'DEFAULT_CONNECTION_BYTES === toUtf8Bytes(DEFAULT_CONNECTION_STRING_2)',
73+
val: DEFAULT_CONNECTION_BYTES.toString() === toUtf8Bytes(DEFAULT_CONNECTION_STRING_2).toString(),
74+
});
75+
track('xProvider', 'log', { param: 'DEFAULT_CONNECTION_BYTES', val: DEFAULT_CONNECTION_BYTES.toString() });
76+
track('xProvider', 'log', {
77+
param: 'DEFAULT_CONNECTION_BYTES.toUtf8String()',
78+
val: toUtf8String(DEFAULT_CONNECTION_BYTES),
79+
});
80+
}
7681

7782
export async function connect(
7883
l1Provider: BrowserProvider,
@@ -81,11 +86,7 @@ export async function connect(
8186
const l1Signer = await l1Provider.getSigner();
8287
const address = await l1Signer.getAddress();
8388

84-
track('xProvider', 'log', { param: 'DEFAULT_CONNECTION_BYTES', val: DEFAULT_CONNECTION_BYTES.toString() });
85-
track('xProvider', 'log', {
86-
param: 'DEFAULT_CONNECTION_BYTES.toUtf8String()',
87-
val: toUtf8String(DEFAULT_CONNECTION_BYTES),
88-
});
89+
trackConnectionDetails();
8990

9091
const signature = await l1Signer.signMessage(DEFAULT_CONNECTION_BYTES);
9192
const iframe = await getOrSetupIFrame(env);

0 commit comments

Comments
 (0)