Skip to content

Commit 36a9cd7

Browse files
zone-liveulissesferreiraaganglada
authored
[NNT-395] feat: pass origin param to blockaid (#395)
Passes the `origin` param to the `scanTransactions` method from `SecurityAlertsApiClient` and removes the hardcoded value. Ex with Raydium ![Screenshot 2025-05-30 at 11 59 04](https://github.com/user-attachments/assets/89d0cce5-5b01-4dad-8b74-c3130df1551b) ![Screenshot 2025-05-30 at 13 55 30](https://github.com/user-attachments/assets/fd91c152-a01b-4c8d-b12e-35a1421e4815) --------- Co-authored-by: Ulisses Ferreira <ulisses@hey.com> Co-authored-by: Alejandro Garcia Anglada <aganglada@gmail.com>
1 parent 80baca2 commit 36a9cd7

46 files changed

Lines changed: 1259 additions & 884 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

package.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@
3535
"yarn lint:fix"
3636
]
3737
},
38-
"resolutions": {
39-
"@metamask/snaps-sdk@^6.7.0": "^6.18.0"
40-
},
4138
"devDependencies": {
4239
"@commitlint/cli": "^17.7.1",
4340
"@commitlint/config-conventional": "^17.7.0",
@@ -60,11 +57,11 @@
6057
"eslint-plugin-jest": "^27.1.5",
6158
"eslint-plugin-jsdoc": "^41.1.2",
6259
"eslint-plugin-n": "^15.7.0",
63-
"eslint-plugin-prettier": "^4.2.1",
60+
"eslint-plugin-prettier": "^5.1.3",
6461
"eslint-plugin-promise": "^6.1.1",
6562
"husky": "^9.1.6",
6663
"lint-staged": "^15.2.10",
67-
"prettier": "^2.7.1",
64+
"prettier": "^3.5.3",
6865
"prettier-plugin-packagejson": "^2.2.11",
6966
"sharp": "^0.33.5",
7067
"typescript": "^5.6.3"

packages/site/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"dependencies": {
3232
"@chakra-ui/react": "^3.0.2",
3333
"@emotion/react": "^11.13.3",
34-
"@metamask/keyring-api": "^17.4.0",
34+
"@metamask/keyring-api": "^18.0.0",
3535
"@metamask/providers": "^18.1.0",
3636
"@solana-program/compute-budget": "^0.7.0",
3737
"@solana-program/system": "^0.7.0",

packages/site/src/components/Accounts/AccountRow.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ export const AccountRow = ({
138138
id: crypto.randomUUID(),
139139
scope: network,
140140
account: account.id,
141+
origin: 'https://example.com',
141142
request: {
142143
method: SolMethod.SignAndSendTransaction,
143144
params: {
@@ -177,6 +178,7 @@ export const AccountRow = ({
177178
id: crypto.randomUUID(),
178179
scope: network,
179180
account: account.id,
181+
origin: 'https://example.com',
180182
request: {
181183
method: SolMethod.SignTransaction,
182184
params: {
@@ -212,6 +214,7 @@ export const AccountRow = ({
212214
id: crypto.randomUUID(),
213215
scope: network,
214216
account: account.id,
217+
origin: 'https://example.com',
215218
request: {
216219
method: SolMethod.SignMessage,
217220
params: {

packages/site/src/components/Accounts/builders/buildSendSolTransactionMessage.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,8 @@ export const buildSendSolTransactionMessage = async (
5252
),
5353
);
5454

55-
const transactionMessageBase64 = await base64EncodeTransaction(
56-
transactionMessage,
57-
);
55+
const transactionMessageBase64 =
56+
await base64EncodeTransaction(transactionMessage);
5857

5958
return transactionMessageBase64;
6059
};

packages/snap/locales/en.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,12 @@
166166
"confirmation.feeError": {
167167
"message": "Unable to estimate fee"
168168
},
169+
"confirmation.origin": {
170+
"message": "Request from"
171+
},
172+
"confirmation.origin.tooltip": {
173+
"message": "This is the site asking for your confirmation."
174+
},
169175
"confirmation.simulationErrorTitle": {
170176
"message": "This transaction was reverted during simulation."
171177
},
@@ -196,8 +202,8 @@
196202
"confirmation.signIn.description": {
197203
"message": "A site wants you to sign in to prove you own this account."
198204
},
199-
"confirmation.signIn.requestFrom": {
200-
"message": "Request from"
205+
"confirmation.signIn.domain": {
206+
"message": "Domain"
201207
},
202208
"confirmation.signIn.unknownDomain": {
203209
"message": "Unknown domain"

packages/snap/messages.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@
5454
"confirmation.advanced.data": "Data",
5555
"confirmation.fee": "Network fee",
5656
"confirmation.feeError": "Unable to estimate fee",
57+
"confirmation.origin": "Request from",
58+
"confirmation.origin.tooltip": "This is the site asking for your confirmation.",
5759
"confirmation.simulationErrorTitle": "This transaction was reverted during simulation.",
5860
"confirmation.simulationErrorSubtitle": "{reason}",
5961
"confirmation.validationErrorTitle": "This is a deceptive request",
@@ -64,7 +66,7 @@
6466
"confirmation.signMessage.message": "Message",
6567
"confirmation.signIn.title": "Sign-in request",
6668
"confirmation.signIn.description": "A site wants you to sign in to prove you own this account.",
67-
"confirmation.signIn.requestFrom": "Request from",
69+
"confirmation.signIn.domain": "Domain",
6870
"confirmation.signIn.unknownDomain": "Unknown domain",
6971
"confirmation.signIn.signingInWith": "Signing in with",
7072
"confirmation.signIn.badAccount": "This site is asking you to sign in using the wrong account.",
@@ -82,4 +84,4 @@
8284
"transactionScan.errors.insufficientSol": "Account does not have enough SOL to perform the operation.",
8385
"transactionScan.errors.slippageToleranceExceeded": "The transaction was reverted because the slippage tolerance was exceeded.",
8486
"transactionScan.errors.unknownError": "An unknown error occurred."
85-
}
87+
}

packages/snap/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@
4141
"@jest/globals": "^29.5.0",
4242
"@metamask/auto-changelog": "4.0.0",
4343
"@metamask/key-tree": "9.1.2",
44-
"@metamask/keyring-api": "17.5.0",
45-
"@metamask/keyring-snap-sdk": "3.2.0",
46-
"@metamask/snaps-cli": "6.5.1",
44+
"@metamask/keyring-api": "^18.0.0",
45+
"@metamask/keyring-snap-sdk": "^4.0.0",
46+
"@metamask/snaps-cli": "^7.2.0",
4747
"@metamask/snaps-jest": "8.12.0",
48-
"@metamask/snaps-sdk": "6.22.0",
48+
"@metamask/snaps-sdk": "^7.1.0",
4949
"@metamask/superstruct": "^3.1.0",
5050
"@metamask/utils": "11.4.0",
5151
"@noble/ed25519": "2.1.0",

packages/snap/snap.config.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ const environment = {
2020
};
2121

2222
const config: SnapConfig = {
23-
bundler: 'webpack',
2423
input: resolve(__dirname, 'src/index.ts'),
2524
server: {
2625
port: 8080,

packages/snap/snap.manifest.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"url": "https://github.com/MetaMask/snap-solana-wallet.git"
88
},
99
"source": {
10-
"shasum": "0k3RNrrLfLnYxquXiupTsbeS20QEM1SUWj7xdiYu3J4=",
10+
"shasum": "3a0KLtz9ic+Lh6Q0oJlyRXfXfWTvJ14xRvImD/MBvvE=",
1111
"location": {
1212
"npm": {
1313
"filePath": "dist/bundle.js",
@@ -98,5 +98,6 @@
9898
"snap_dialog": {},
9999
"snap_getPreferences": {}
100100
},
101+
"platformVersion": "7.1.0",
101102
"manifestVersion": "0.1"
102103
}

packages/snap/src/core/clients/security-alerts-api/SecurityAlertsApiClient.test.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ describe('SecurityAlertsApiClient', () => {
4343
transactions: ['transaction'],
4444
scope: Network.Mainnet,
4545
options: ['simulation', 'validation'],
46+
origin: 'https://metamask.io',
4647
});
4748

4849
expect(scanResult).toStrictEqual(mockResponse);
@@ -59,6 +60,7 @@ describe('SecurityAlertsApiClient', () => {
5960
transactions: ['transaction'],
6061
scope: Network.Mainnet,
6162
options: ['simulation', 'validation'],
63+
origin: 'https://metamask.io',
6264
}),
6365
).rejects.toThrow(mockError);
6466
});
@@ -78,6 +80,7 @@ describe('SecurityAlertsApiClient', () => {
7880
transactions: ['transaction'],
7981
scope: Network.Mainnet,
8082
options: ['simulation', 'validation'],
83+
origin: 'https://metamask.io',
8184
}),
8285
).rejects.toThrow('HTTP error! status: 404');
8386
});

0 commit comments

Comments
 (0)