@exodus/web3-ethereum 1.8.0 → 2.0.0
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.
package/lib/index.d.ts
CHANGED
package/lib/index.js
CHANGED
|
@@ -48,7 +48,7 @@ version) {
|
|
|
48
48
|
return typedData.toString();
|
|
49
49
|
}
|
|
50
50
|
export function exposeHandlers(rpc, deps) {
|
|
51
|
-
const { chainId, isTrusted, isAutoApproved, ensureTrusted, approveConnection, approveMessage, approveTransactions, forwardRequest, getAddress, getPrivateKey, getEstimatedGas, getFeeData, getNonce, sendRawTransaction, onTransactionsSigned = () => { }, onEthWalletWatchAssetRequest = () => { }, isUnlocked = () => true, ensureUnlocked = () => true,
|
|
51
|
+
const { chainId, isTrusted, isAutoApproved, ensureTrusted, approveConnection, approveMessage, approveTransactions, forwardRequest, getAddress, getPrivateKey, getEstimatedGas, getFeeData, getNonce, sendRawTransaction, onTransactionsSigned = () => { }, onEthWalletWatchAssetRequest = () => { }, isUnlocked = () => true, ensureUnlocked = () => true, getAsset, } = deps;
|
|
52
52
|
const network = `evm:${chainId}`;
|
|
53
53
|
async function assertTrusted() {
|
|
54
54
|
const trusted = await isTrusted();
|
|
@@ -106,6 +106,7 @@ export function exposeHandlers(rpc, deps) {
|
|
|
106
106
|
}
|
|
107
107
|
async function approveAndSignTransaction(transaction) {
|
|
108
108
|
await assertTrusted();
|
|
109
|
+
const asset = await getAsset(network);
|
|
109
110
|
const preparedTransaction = await prepareTransaction(transaction);
|
|
110
111
|
validateTransaction(preparedTransaction);
|
|
111
112
|
const simulatedChanges = await simulateTransaction(asset, preparedTransaction);
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
+
import type { EthRequestArguments } from '../types.js';
|
|
1
2
|
import type { Dependencies } from '../types.js';
|
|
2
3
|
import type RPC from '@exodus/json-rpc';
|
|
3
4
|
import type { Transport } from '@exodus/web3-types';
|
|
4
5
|
interface RpcConstructor {
|
|
5
6
|
new (...options: unknown[]): typeof RPC;
|
|
6
7
|
}
|
|
7
|
-
export declare function
|
|
8
|
+
export declare function validateRequestWithEVMPrefix(request: EthRequestArguments): unknown;
|
|
8
9
|
export declare const registerRPCHandlers: ({ deps, RPC, transport, }: {
|
|
9
10
|
deps: Dependencies;
|
|
10
11
|
RPC: RpcConstructor;
|
|
@@ -24,21 +24,23 @@ function validateEVMsDeps(evms) {
|
|
|
24
24
|
}
|
|
25
25
|
evms.forEach(validateEVMDeps);
|
|
26
26
|
}
|
|
27
|
-
export function
|
|
28
|
-
|
|
29
|
-
|
|
27
|
+
export function validateRequestWithEVMPrefix(request) {
|
|
28
|
+
if (typeof request !== 'object') {
|
|
29
|
+
return validateRequest(request);
|
|
30
|
+
}
|
|
31
|
+
const originalMethod = request?.method;
|
|
30
32
|
if (!originalMethod) {
|
|
31
|
-
return validateRequest(
|
|
33
|
+
return validateRequest(request);
|
|
32
34
|
}
|
|
33
35
|
const underscorePosition = originalMethod.indexOf('_');
|
|
34
36
|
if (underscorePosition === -1 || typeof originalMethod !== 'string') {
|
|
35
|
-
return validateRequest(
|
|
37
|
+
return validateRequest(request);
|
|
36
38
|
}
|
|
37
39
|
// 0x1_eth_getAccounts -> eth_getAccounts
|
|
38
40
|
const methodWithoutPrefix = originalMethod.slice(underscorePosition + 1);
|
|
39
41
|
// NOTE: validateRequest can deeply mutate the argument, e.g. removing additional properties.
|
|
40
42
|
// We should always use the result of validateRequest() call, and never use the original argument again.
|
|
41
|
-
const validated = validateRequest({ ...
|
|
43
|
+
const validated = validateRequest({ ...request, method: methodWithoutPrefix });
|
|
42
44
|
return { ...validated, method: originalMethod };
|
|
43
45
|
}
|
|
44
46
|
export const registerRPCHandlers = ({ deps, RPC, transport, }) => {
|
|
@@ -53,7 +55,7 @@ export const registerRPCHandlers = ({ deps, RPC, transport, }) => {
|
|
|
53
55
|
const { app, evms = [], wallet } = deps;
|
|
54
56
|
const rpc = new RPC({
|
|
55
57
|
transport,
|
|
56
|
-
parse:
|
|
58
|
+
parse: validateRequestWithEVMPrefix,
|
|
57
59
|
getIsDevelopmentMode: () => app.isDevelopmentEnvironment?.() ?? false,
|
|
58
60
|
requestTimeout: RPC_REQUEST_TIMEOUT,
|
|
59
61
|
});
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@exodus/web3-ethereum",
|
|
3
3
|
"description": "Apps connectivity library for EVM-compatible chains.",
|
|
4
|
-
"version": "
|
|
4
|
+
"version": "2.0.0",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"sideEffects": false,
|
|
7
7
|
"module": "lib/index.js",
|
|
@@ -33,22 +33,22 @@
|
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@exodus/currency": "^2.1.2",
|
|
35
35
|
"@exodus/ethereum-api": "^6.0.0",
|
|
36
|
-
"@exodus/web3-constants": "^1.
|
|
36
|
+
"@exodus/web3-constants": "^1.16.0",
|
|
37
37
|
"@exodus/web3-ethereum-utils": "^1.8.0",
|
|
38
|
-
"@exodus/web3-provider": "^2.
|
|
39
|
-
"@exodus/web3-rpc-handlers": "^0.
|
|
38
|
+
"@exodus/web3-provider": "^2.14.0",
|
|
39
|
+
"@exodus/web3-rpc-handlers": "^0.11.0",
|
|
40
40
|
"eth-rpc-errors": "^4.0.3"
|
|
41
41
|
},
|
|
42
42
|
"devDependencies": {
|
|
43
43
|
"@exodus/assets": "^8.0.72",
|
|
44
44
|
"@exodus/json-rpc": "^1.11.0",
|
|
45
45
|
"@exodus/schemasafe": "^1.0.0",
|
|
46
|
-
"@exodus/web3-types": "^1.
|
|
46
|
+
"@exodus/web3-types": "^1.12.0",
|
|
47
47
|
"@exodus/web3-validation": "^1.31.0",
|
|
48
48
|
"@wallet-standard/base": "^1.0.1"
|
|
49
49
|
},
|
|
50
50
|
"peerDependencies": {
|
|
51
51
|
"@exodus/assets": "^8.0.72"
|
|
52
52
|
},
|
|
53
|
-
"gitHead": "
|
|
53
|
+
"gitHead": "54f84cf089d1dffd5dafd443fc2aacb8dd0fc962"
|
|
54
54
|
}
|