@aztec/wallet-sdk 0.0.1-commit.fffb133c → 0.0.1-dev
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/dest/base-wallet/base_wallet.d.ts +83 -35
- package/dest/base-wallet/base_wallet.d.ts.map +1 -1
- package/dest/base-wallet/base_wallet.js +231 -70
- package/dest/base-wallet/index.d.ts +3 -2
- package/dest/base-wallet/index.d.ts.map +1 -1
- package/dest/base-wallet/index.js +1 -0
- package/dest/base-wallet/utils.d.ts +50 -0
- package/dest/base-wallet/utils.d.ts.map +1 -0
- package/dest/base-wallet/utils.js +133 -0
- package/dest/crypto.d.ts +39 -1
- package/dest/crypto.d.ts.map +1 -1
- package/dest/crypto.js +88 -0
- package/dest/extension/handlers/background_connection_handler.d.ts +12 -2
- package/dest/extension/handlers/background_connection_handler.d.ts.map +1 -1
- package/dest/extension/handlers/background_connection_handler.js +44 -8
- package/dest/extension/handlers/content_script_connection_handler.d.ts +2 -1
- package/dest/extension/handlers/content_script_connection_handler.d.ts.map +1 -1
- package/dest/extension/handlers/content_script_connection_handler.js +19 -0
- package/dest/extension/handlers/internal_message_types.d.ts +3 -1
- package/dest/extension/handlers/internal_message_types.d.ts.map +1 -1
- package/dest/extension/handlers/internal_message_types.js +3 -1
- package/dest/extension/provider/extension_wallet.d.ts +27 -6
- package/dest/extension/provider/extension_wallet.d.ts.map +1 -1
- package/dest/extension/provider/extension_wallet.js +87 -9
- package/dest/extension/provider/index.d.ts +2 -2
- package/dest/extension/provider/index.d.ts.map +1 -1
- package/dest/iframe/handlers/iframe_connection_handler.d.ts +122 -0
- package/dest/iframe/handlers/iframe_connection_handler.d.ts.map +1 -0
- package/dest/iframe/handlers/iframe_connection_handler.js +240 -0
- package/dest/iframe/handlers/index.d.ts +2 -0
- package/dest/iframe/handlers/index.d.ts.map +1 -0
- package/dest/iframe/handlers/index.js +1 -0
- package/dest/iframe/provider/iframe_discovery.d.ts +25 -0
- package/dest/iframe/provider/iframe_discovery.d.ts.map +1 -0
- package/dest/iframe/provider/iframe_discovery.js +167 -0
- package/dest/iframe/provider/iframe_provider.d.ts +65 -0
- package/dest/iframe/provider/iframe_provider.d.ts.map +1 -0
- package/dest/iframe/provider/iframe_provider.js +257 -0
- package/dest/iframe/provider/iframe_wallet.d.ts +85 -0
- package/dest/iframe/provider/iframe_wallet.d.ts.map +1 -0
- package/dest/iframe/provider/iframe_wallet.js +269 -0
- package/dest/iframe/provider/index.d.ts +4 -0
- package/dest/iframe/provider/index.d.ts.map +1 -0
- package/dest/iframe/provider/index.js +3 -0
- package/dest/manager/types.d.ts +6 -5
- package/dest/manager/types.d.ts.map +1 -1
- package/dest/manager/wallet_manager.d.ts +1 -1
- package/dest/manager/wallet_manager.d.ts.map +1 -1
- package/dest/manager/wallet_manager.js +48 -18
- package/dest/types.d.ts +64 -2
- package/dest/types.d.ts.map +1 -1
- package/dest/types.js +29 -0
- package/package.json +19 -9
- package/src/base-wallet/base_wallet.ts +318 -124
- package/src/base-wallet/index.ts +7 -1
- package/src/base-wallet/utils.ts +240 -0
- package/src/crypto.ts +104 -0
- package/src/extension/handlers/background_connection_handler.ts +42 -9
- package/src/extension/handlers/content_script_connection_handler.ts +18 -0
- package/src/extension/handlers/internal_message_types.ts +2 -0
- package/src/extension/provider/extension_wallet.ts +104 -15
- package/src/extension/provider/index.ts +1 -1
- package/src/iframe/handlers/iframe_connection_handler.ts +342 -0
- package/src/iframe/handlers/index.ts +7 -0
- package/src/iframe/provider/iframe_discovery.ts +185 -0
- package/src/iframe/provider/iframe_provider.ts +331 -0
- package/src/iframe/provider/iframe_wallet.ts +323 -0
- package/src/iframe/provider/index.ts +3 -0
- package/src/manager/types.ts +5 -4
- package/src/manager/wallet_manager.ts +55 -23
- package/src/types.ts +72 -0
|
@@ -1,2 +1,3 @@
|
|
|
1
|
-
export { BaseWallet, type FeeOptions } from './base_wallet.js';
|
|
2
|
-
|
|
1
|
+
export { BaseWallet, type CompleteFeeOptionsConfig, type FeeOptions, type SimulateViaEntrypointOptions, } from './base_wallet.js';
|
|
2
|
+
export { simulateViaNode, buildMergedSimulationResult, extractOptimizablePublicStaticCalls } from './utils.js';
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iYXNlLXdhbGxldC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsVUFBVSxFQUNWLEtBQUssd0JBQXdCLEVBQzdCLEtBQUssVUFBVSxFQUNmLEtBQUssNEJBQTRCLEdBQ2xDLE1BQU0sa0JBQWtCLENBQUM7QUFDMUIsT0FBTyxFQUFFLGVBQWUsRUFBRSwyQkFBMkIsRUFBRSxtQ0FBbUMsRUFBRSxNQUFNLFlBQVksQ0FBQyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/base-wallet/index.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/base-wallet/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,KAAK,wBAAwB,EAC7B,KAAK,UAAU,EACf,KAAK,4BAA4B,GAClC,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,2BAA2B,EAAE,mCAAmC,EAAE,MAAM,YAAY,CAAC"}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import type { AztecNode } from '@aztec/aztec.js/node';
|
|
2
|
+
import { TxSimulationResultWithAppOffset } from '@aztec/aztec.js/wallet';
|
|
3
|
+
import type { ChainInfo } from '@aztec/entrypoints/interfaces';
|
|
4
|
+
import type { ContractNameResolver } from '@aztec/pxe/client/lazy';
|
|
5
|
+
import { type FunctionCall } from '@aztec/stdlib/abi';
|
|
6
|
+
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
7
|
+
import type { GasSettings } from '@aztec/stdlib/gas';
|
|
8
|
+
import { type BlockHeader, type ExecutionPayload, TxSimulationResult } from '@aztec/stdlib/tx';
|
|
9
|
+
/**
|
|
10
|
+
* Splits an execution payload into a leading prefix of public static calls
|
|
11
|
+
* (eligible for direct node simulation) and the remaining calls.
|
|
12
|
+
*
|
|
13
|
+
* Only a leading run of public static calls is eligible for optimization.
|
|
14
|
+
* Any non-public-static call may enqueue public state mutations
|
|
15
|
+
* (e.g. private calls can enqueue public calls), so all calls that follow
|
|
16
|
+
* must go through the normal simulation path to see the correct state.
|
|
17
|
+
*
|
|
18
|
+
*/
|
|
19
|
+
export declare function extractOptimizablePublicStaticCalls(payload: ExecutionPayload): {
|
|
20
|
+
/** Leading public static calls eligible for direct node simulation. */
|
|
21
|
+
optimizableCalls: FunctionCall[];
|
|
22
|
+
/** All remaining calls. */
|
|
23
|
+
remainingCalls: FunctionCall[];
|
|
24
|
+
};
|
|
25
|
+
/**
|
|
26
|
+
* Simulates public static calls by splitting them into batches of MAX_ENQUEUED_CALLS_PER_CALL
|
|
27
|
+
* and sending each batch directly to the node.
|
|
28
|
+
*
|
|
29
|
+
* @param node - The Aztec node to simulate on.
|
|
30
|
+
* @param publicStaticCalls - Array of public static function calls to optimize.
|
|
31
|
+
* @param from - The account address making the calls.
|
|
32
|
+
* @param chainInfo - Chain information (chainId and version).
|
|
33
|
+
* @param gasSettings - Gas settings for the transaction.
|
|
34
|
+
* @param blockHeader - Block header to use as anchor.
|
|
35
|
+
* @param skipFeeEnforcement - Whether to skip fee enforcement during simulation.
|
|
36
|
+
* @returns Array of TxSimulationResult, one per batch.
|
|
37
|
+
*/
|
|
38
|
+
export declare function simulateViaNode(node: AztecNode, publicStaticCalls: FunctionCall[], from: AztecAddress, chainInfo: ChainInfo, gasSettings: GasSettings, blockHeader: BlockHeader, skipFeeEnforcement: boolean | undefined, getContractName: ContractNameResolver): Promise<TxSimulationResult[]>;
|
|
39
|
+
/**
|
|
40
|
+
* Merges simulation results from the optimized (public static) and normal paths.
|
|
41
|
+
* Since optimized calls are always a leading prefix, return values are simply
|
|
42
|
+
* concatenated: optimized first, then normal.
|
|
43
|
+
* Stats are taken from the normal result only (the optimized path doesn't produce them).
|
|
44
|
+
*
|
|
45
|
+
* @param optimizedResults - Results from optimized public static call batches.
|
|
46
|
+
* @param normalResult - Result from normal simulation (null if all calls were optimized).
|
|
47
|
+
* @returns A single TxSimulationResult with return values in original call order.
|
|
48
|
+
*/
|
|
49
|
+
export declare function buildMergedSimulationResult(optimizedResults: TxSimulationResult[], normalResult: TxSimulationResultWithAppOffset | null): TxSimulationResultWithAppOffset;
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iYXNlLXdhbGxldC91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN0RCxPQUFPLEVBQUUsK0JBQStCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUV6RSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUkvRCxPQUFPLEtBQUssRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBR25FLE9BQU8sRUFBRSxLQUFLLFlBQVksRUFBb0IsTUFBTSxtQkFBbUIsQ0FBQztBQUN4RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQVFyRCxPQUFPLEVBQ0wsS0FBSyxXQUFXLEVBQ2hCLEtBQUssZ0JBQWdCLEVBT3JCLGtCQUFrQixFQUNuQixNQUFNLGtCQUFrQixDQUFDO0FBRTFCOzs7Ozs7Ozs7R0FTRztBQUNILHdCQUFnQixtQ0FBbUMsQ0FBQyxPQUFPLEVBQUUsZ0JBQWdCLEdBQUc7SUFDOUUsdUVBQXVFO0lBQ3ZFLGdCQUFnQixFQUFFLFlBQVksRUFBRSxDQUFDO0lBQ2pDLDJCQUEyQjtJQUMzQixjQUFjLEVBQUUsWUFBWSxFQUFFLENBQUM7Q0FDaEMsQ0FPQTtBQXVHRDs7Ozs7Ozs7Ozs7O0dBWUc7QUFDSCx3QkFBc0IsZUFBZSxDQUNuQyxJQUFJLEVBQUUsU0FBUyxFQUNmLGlCQUFpQixFQUFFLFlBQVksRUFBRSxFQUNqQyxJQUFJLEVBQUUsWUFBWSxFQUNsQixTQUFTLEVBQUUsU0FBUyxFQUNwQixXQUFXLEVBQUUsV0FBVyxFQUN4QixXQUFXLEVBQUUsV0FBVyxFQUN4QixrQkFBa0IscUJBQWdCLEVBQ2xDLGVBQWUsRUFBRSxvQkFBb0IsR0FDcEMsT0FBTyxDQUFDLGtCQUFrQixFQUFFLENBQUMsQ0F3Qi9CO0FBRUQ7Ozs7Ozs7OztHQVNHO0FBQ0gsd0JBQWdCLDJCQUEyQixDQUN6QyxnQkFBZ0IsRUFBRSxrQkFBa0IsRUFBRSxFQUN0QyxZQUFZLEVBQUUsK0JBQStCLEdBQUcsSUFBSSxHQUNuRCwrQkFBK0IsQ0FxQmpDIn0=
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/base-wallet/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,+BAA+B,EAAE,MAAM,wBAAwB,CAAC;AAEzE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAI/D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAGnE,OAAO,EAAE,KAAK,YAAY,EAAoB,MAAM,mBAAmB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAQrD,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,gBAAgB,EAOrB,kBAAkB,EACnB,MAAM,kBAAkB,CAAC;AAE1B;;;;;;;;;GASG;AACH,wBAAgB,mCAAmC,CAAC,OAAO,EAAE,gBAAgB,GAAG;IAC9E,uEAAuE;IACvE,gBAAgB,EAAE,YAAY,EAAE,CAAC;IACjC,2BAA2B;IAC3B,cAAc,EAAE,YAAY,EAAE,CAAC;CAChC,CAOA;AAuGD;;;;;;;;;;;;GAYG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,SAAS,EACf,iBAAiB,EAAE,YAAY,EAAE,EACjC,IAAI,EAAE,YAAY,EAClB,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,WAAW,EACxB,kBAAkB,qBAAgB,EAClC,eAAe,EAAE,oBAAoB,GACpC,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAwB/B;AAED;;;;;;;;;GASG;AACH,wBAAgB,2BAA2B,CACzC,gBAAgB,EAAE,kBAAkB,EAAE,EACtC,YAAY,EAAE,+BAA+B,GAAG,IAAI,GACnD,+BAA+B,CAqBjC"}
|
|
@@ -0,0 +1,133 @@
|
|
|
1
|
+
import { TxSimulationResultWithAppOffset } from '@aztec/aztec.js/wallet';
|
|
2
|
+
import { MAX_ENQUEUED_CALLS_PER_CALL } from '@aztec/constants';
|
|
3
|
+
import { makeTuple } from '@aztec/foundation/array';
|
|
4
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
5
|
+
import { displayDebugLogs } from '@aztec/pxe/client/lazy';
|
|
6
|
+
import { generateSimulatedProvingResult } from '@aztec/pxe/simulator';
|
|
7
|
+
import { ClaimedLengthArray, CountedPublicCallRequest, PrivateCircuitPublicInputs, PublicCallRequest } from '@aztec/stdlib/kernel';
|
|
8
|
+
import { ChonkProof } from '@aztec/stdlib/proofs';
|
|
9
|
+
import { HashedValues, PrivateCallExecutionResult, PrivateExecutionResult, Tx, TxContext, TxSimulationResult } from '@aztec/stdlib/tx';
|
|
10
|
+
/**
|
|
11
|
+
* Splits an execution payload into a leading prefix of public static calls
|
|
12
|
+
* (eligible for direct node simulation) and the remaining calls.
|
|
13
|
+
*
|
|
14
|
+
* Only a leading run of public static calls is eligible for optimization.
|
|
15
|
+
* Any non-public-static call may enqueue public state mutations
|
|
16
|
+
* (e.g. private calls can enqueue public calls), so all calls that follow
|
|
17
|
+
* must go through the normal simulation path to see the correct state.
|
|
18
|
+
*
|
|
19
|
+
*/ export function extractOptimizablePublicStaticCalls(payload) {
|
|
20
|
+
const splitIndex = payload.calls.findIndex((call)=>!call.isPublicStatic());
|
|
21
|
+
const boundary = splitIndex === -1 ? payload.calls.length : splitIndex;
|
|
22
|
+
return {
|
|
23
|
+
optimizableCalls: payload.calls.slice(0, boundary),
|
|
24
|
+
remainingCalls: payload.calls.slice(boundary)
|
|
25
|
+
};
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* Simulates a batch of public static calls by bypassing account entrypoint and private execution,
|
|
29
|
+
* directly constructing a minimal Tx and calling node.simulatePublicCalls.
|
|
30
|
+
*
|
|
31
|
+
* @param node - The Aztec node to simulate on.
|
|
32
|
+
* @param publicStaticCalls - Array of public static function calls (max MAX_ENQUEUED_CALLS_PER_CALL).
|
|
33
|
+
* @param from - The account address making the calls.
|
|
34
|
+
* @param chainInfo - Chain information (chainId and version).
|
|
35
|
+
* @param gasSettings - Gas settings for the transaction.
|
|
36
|
+
* @param blockHeader - Block header to use as anchor.
|
|
37
|
+
* @param skipFeeEnforcement - Whether to skip fee enforcement during simulation.
|
|
38
|
+
* @returns TxSimulationResult with public return values.
|
|
39
|
+
*/ async function simulateBatchViaNode(node, publicStaticCalls, from, chainInfo, gasSettings, blockHeader, skipFeeEnforcement, getContractName) {
|
|
40
|
+
const txContext = new TxContext(chainInfo.chainId, chainInfo.version, gasSettings);
|
|
41
|
+
const publicFunctionCalldata = [];
|
|
42
|
+
for (const call of publicStaticCalls){
|
|
43
|
+
const calldata = await HashedValues.fromCalldata([
|
|
44
|
+
call.selector.toField(),
|
|
45
|
+
...call.args
|
|
46
|
+
]);
|
|
47
|
+
publicFunctionCalldata.push(calldata);
|
|
48
|
+
}
|
|
49
|
+
const publicCallRequests = makeTuple(MAX_ENQUEUED_CALLS_PER_CALL, (i)=>{
|
|
50
|
+
const call = publicStaticCalls[i];
|
|
51
|
+
if (!call) {
|
|
52
|
+
return CountedPublicCallRequest.empty();
|
|
53
|
+
}
|
|
54
|
+
const publicCallRequest = new PublicCallRequest(from, call.to, call.isStatic, publicFunctionCalldata[i].hash);
|
|
55
|
+
// Counter starts at 1 (minRevertibleSideEffectCounter) so all calls are revertible
|
|
56
|
+
return new CountedPublicCallRequest(publicCallRequest, i + 1);
|
|
57
|
+
});
|
|
58
|
+
const publicCallRequestsArray = new ClaimedLengthArray(publicCallRequests, publicStaticCalls.length);
|
|
59
|
+
const publicInputs = PrivateCircuitPublicInputs.from({
|
|
60
|
+
...PrivateCircuitPublicInputs.empty(),
|
|
61
|
+
anchorBlockHeader: blockHeader,
|
|
62
|
+
txContext: txContext,
|
|
63
|
+
publicCallRequests: publicCallRequestsArray,
|
|
64
|
+
startSideEffectCounter: new Fr(0),
|
|
65
|
+
endSideEffectCounter: new Fr(publicStaticCalls.length + 1)
|
|
66
|
+
});
|
|
67
|
+
// Minimal entrypoint structure — no real private execution, just public call requests
|
|
68
|
+
const emptyEntrypoint = new PrivateCallExecutionResult(Buffer.alloc(0), Buffer.alloc(0), new Map(), publicInputs, [], new Map(), [], [], [], [], []);
|
|
69
|
+
const privateResult = new PrivateExecutionResult(emptyEntrypoint, Fr.random(), publicFunctionCalldata);
|
|
70
|
+
const provingResult = await generateSimulatedProvingResult(privateResult, (_contractAddress, _functionSelector)=>Promise.resolve(''), node, 1);
|
|
71
|
+
provingResult.publicInputs.feePayer = from;
|
|
72
|
+
const tx = await Tx.create({
|
|
73
|
+
data: provingResult.publicInputs,
|
|
74
|
+
chonkProof: ChonkProof.empty(),
|
|
75
|
+
contractClassLogFields: [],
|
|
76
|
+
publicFunctionCalldata: publicFunctionCalldata
|
|
77
|
+
});
|
|
78
|
+
const publicOutput = await node.simulatePublicCalls(tx, skipFeeEnforcement);
|
|
79
|
+
if (publicOutput.revertReason) {
|
|
80
|
+
throw publicOutput.revertReason;
|
|
81
|
+
}
|
|
82
|
+
// Display debug logs from the public simulation.
|
|
83
|
+
await displayDebugLogs(publicOutput.debugLogs, getContractName);
|
|
84
|
+
return new TxSimulationResult(privateResult, provingResult.publicInputs, publicOutput, undefined);
|
|
85
|
+
}
|
|
86
|
+
/**
|
|
87
|
+
* Simulates public static calls by splitting them into batches of MAX_ENQUEUED_CALLS_PER_CALL
|
|
88
|
+
* and sending each batch directly to the node.
|
|
89
|
+
*
|
|
90
|
+
* @param node - The Aztec node to simulate on.
|
|
91
|
+
* @param publicStaticCalls - Array of public static function calls to optimize.
|
|
92
|
+
* @param from - The account address making the calls.
|
|
93
|
+
* @param chainInfo - Chain information (chainId and version).
|
|
94
|
+
* @param gasSettings - Gas settings for the transaction.
|
|
95
|
+
* @param blockHeader - Block header to use as anchor.
|
|
96
|
+
* @param skipFeeEnforcement - Whether to skip fee enforcement during simulation.
|
|
97
|
+
* @returns Array of TxSimulationResult, one per batch.
|
|
98
|
+
*/ export async function simulateViaNode(node, publicStaticCalls, from, chainInfo, gasSettings, blockHeader, skipFeeEnforcement = true, getContractName) {
|
|
99
|
+
const batches = [];
|
|
100
|
+
for(let i = 0; i < publicStaticCalls.length; i += MAX_ENQUEUED_CALLS_PER_CALL){
|
|
101
|
+
batches.push(publicStaticCalls.slice(i, i + MAX_ENQUEUED_CALLS_PER_CALL));
|
|
102
|
+
}
|
|
103
|
+
const results = [];
|
|
104
|
+
for (const batch of batches){
|
|
105
|
+
const result = await simulateBatchViaNode(node, batch, from, chainInfo, gasSettings, blockHeader, skipFeeEnforcement, getContractName);
|
|
106
|
+
results.push(result);
|
|
107
|
+
}
|
|
108
|
+
return results;
|
|
109
|
+
}
|
|
110
|
+
/**
|
|
111
|
+
* Merges simulation results from the optimized (public static) and normal paths.
|
|
112
|
+
* Since optimized calls are always a leading prefix, return values are simply
|
|
113
|
+
* concatenated: optimized first, then normal.
|
|
114
|
+
* Stats are taken from the normal result only (the optimized path doesn't produce them).
|
|
115
|
+
*
|
|
116
|
+
* @param optimizedResults - Results from optimized public static call batches.
|
|
117
|
+
* @param normalResult - Result from normal simulation (null if all calls were optimized).
|
|
118
|
+
* @returns A single TxSimulationResult with return values in original call order.
|
|
119
|
+
*/ export function buildMergedSimulationResult(optimizedResults, normalResult) {
|
|
120
|
+
const optimizedReturnValues = optimizedResults.flatMap((r)=>r.publicOutput?.publicReturnValues ?? []);
|
|
121
|
+
const normalReturnValues = normalResult?.publicOutput?.publicReturnValues ?? [];
|
|
122
|
+
const allReturnValues = [
|
|
123
|
+
...optimizedReturnValues,
|
|
124
|
+
...normalReturnValues
|
|
125
|
+
];
|
|
126
|
+
const baseResult = normalResult ?? optimizedResults[0];
|
|
127
|
+
const mergedPublicOutput = baseResult.publicOutput ? {
|
|
128
|
+
...baseResult.publicOutput,
|
|
129
|
+
publicReturnValues: allReturnValues
|
|
130
|
+
} : undefined;
|
|
131
|
+
const merged = new TxSimulationResult(baseResult.privateExecutionResult, baseResult.publicInputs, mergedPublicOutput, normalResult?.stats);
|
|
132
|
+
return TxSimulationResultWithAppOffset.fromResultAndOffset(merged, normalResult?.appCallOffset ?? 0);
|
|
133
|
+
}
|
package/dest/crypto.d.ts
CHANGED
|
@@ -189,4 +189,42 @@ export declare const DEFAULT_EMOJI_GRID_SIZE = 9;
|
|
|
189
189
|
* ```
|
|
190
190
|
*/
|
|
191
191
|
export declare function hashToEmoji(hash: string, count?: number): string;
|
|
192
|
-
|
|
192
|
+
/**
|
|
193
|
+
* Derives an AES-256-GCM key from a passphrase using PBKDF2-SHA256.
|
|
194
|
+
*
|
|
195
|
+
* @param passphrase - The user-provided passphrase or PIN
|
|
196
|
+
* @param salt - Random salt bytes
|
|
197
|
+
* @param iterations - PBKDF2 iteration count (default: 2,000,000)
|
|
198
|
+
* @returns An AES-256-GCM CryptoKey
|
|
199
|
+
*/
|
|
200
|
+
export declare function deriveKeyFromPassphrase(passphrase: string, salt: Uint8Array, iterations?: number): Promise<CryptoKey>;
|
|
201
|
+
/**
|
|
202
|
+
* Encrypts arbitrary bytes with a passphrase using PBKDF2 + AES-256-GCM.
|
|
203
|
+
*
|
|
204
|
+
* Output layout: `[salt (16)] [iv (12)] [ciphertext (...)]`
|
|
205
|
+
*
|
|
206
|
+
* @param plaintext - Data to encrypt
|
|
207
|
+
* @param passphrase - User passphrase or PIN
|
|
208
|
+
* @param iterations - PBKDF2 iteration count (default: 2,000,000)
|
|
209
|
+
* @returns A Uint8Array containing salt + iv + ciphertext
|
|
210
|
+
*/
|
|
211
|
+
export declare function encryptWithPassphrase(plaintext: Uint8Array, passphrase: string, iterations?: number): Promise<Uint8Array>;
|
|
212
|
+
/**
|
|
213
|
+
* Decrypts data produced by {@link encryptWithPassphrase}.
|
|
214
|
+
*
|
|
215
|
+
* @param data - The encrypted blob (salt + iv + ciphertext)
|
|
216
|
+
* @param passphrase - The passphrase used during encryption
|
|
217
|
+
* @param iterations - PBKDF2 iteration count (must match encryption)
|
|
218
|
+
* @returns The decrypted plaintext bytes
|
|
219
|
+
* @throws On wrong passphrase (AES-GCM auth tag mismatch)
|
|
220
|
+
*/
|
|
221
|
+
export declare function decryptWithPassphrase(data: Uint8Array, passphrase: string, iterations?: number): Promise<Uint8Array>;
|
|
222
|
+
/**
|
|
223
|
+
* Converts a Uint8Array to a base64 string.
|
|
224
|
+
*/
|
|
225
|
+
export declare function uint8ToBase64(bytes: Uint8Array): string;
|
|
226
|
+
/**
|
|
227
|
+
* Converts a base64 string to a Uint8Array.
|
|
228
|
+
*/
|
|
229
|
+
export declare function base64ToUint8(b64: string): Uint8Array;
|
|
230
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3J5cHRvLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY3J5cHRvLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQThEQTs7OztHQUlHO0FBQ0gsTUFBTSxXQUFXLGlCQUFpQjtJQUNoQyxnREFBZ0Q7SUFDaEQsR0FBRyxFQUFFLE1BQU0sQ0FBQztJQUNaLGtDQUFrQztJQUNsQyxHQUFHLEVBQUUsTUFBTSxDQUFDO0lBQ1osdUNBQXVDO0lBQ3ZDLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDVix1Q0FBdUM7SUFDdkMsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNYO0FBRUQ7Ozs7R0FJRztBQUNILE1BQU0sV0FBVyxnQkFBZ0I7SUFDL0IsdURBQXVEO0lBQ3ZELEVBQUUsRUFBRSxNQUFNLENBQUM7SUFDWCxrQ0FBa0M7SUFDbEMsVUFBVSxFQUFFLE1BQU0sQ0FBQztDQUNwQjtBQUVEOzs7OztHQUtHO0FBQ0gsTUFBTSxXQUFXLGFBQWE7SUFDNUIsaUNBQWlDO0lBQ2pDLFNBQVMsRUFBRSxTQUFTLENBQUM7SUFDckIseURBQXlEO0lBQ3pELFVBQVUsRUFBRSxTQUFTLENBQUM7Q0FDdkI7QUFFRDs7Ozs7R0FLRztBQUNILE1BQU0sV0FBVyxXQUFXO0lBQzFCLHdEQUF3RDtJQUN4RCxhQUFhLEVBQUUsU0FBUyxDQUFDO0lBQ3pCLG9EQUFvRDtJQUNwRCxnQkFBZ0IsRUFBRSxNQUFNLENBQUM7Q0FDMUI7QUFTRDs7Ozs7Ozs7Ozs7Ozs7R0FjRztBQUNILHdCQUFzQixlQUFlLElBQUksT0FBTyxDQUFDLGFBQWEsQ0FBQyxDQWE5RDtBQUVEOzs7Ozs7Ozs7Ozs7Ozs7R0FlRztBQUNILHdCQUFzQixlQUFlLENBQUMsU0FBUyxFQUFFLFNBQVMsR0FBRyxPQUFPLENBQUMsaUJBQWlCLENBQUMsQ0FRdEY7QUFFRDs7Ozs7Ozs7Ozs7Ozs7R0FjRztBQUNILHdCQUFnQixlQUFlLENBQUMsUUFBUSxFQUFFLGlCQUFpQixHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FnQi9FO0FBc0REOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7R0F3Qkc7QUFDSCx3QkFBc0IsaUJBQWlCLENBQ3JDLFVBQVUsRUFBRSxhQUFhLEVBQ3pCLGFBQWEsRUFBRSxTQUFTLEVBQ3hCLEtBQUssRUFBRSxPQUFPLEdBQ2IsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQXdEdEI7QUFFRDs7Ozs7Ozs7Ozs7Ozs7Ozs7R0FpQkc7QUFDSCx3QkFBc0IsT0FBTyxDQUFDLEdBQUcsRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FVckY7QUFFRDs7Ozs7Ozs7Ozs7Ozs7Ozs7R0FpQkc7QUFDSCx3QkFBc0IsT0FBTyxDQUFDLENBQUMsR0FBRyxPQUFPLEVBQUUsR0FBRyxFQUFFLFNBQVMsRUFBRSxPQUFPLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQVFoRztBQXdERDs7O0dBR0c7QUFDSCxlQUFPLE1BQU0sdUJBQXVCLElBQUksQ0FBQztBQUV6Qzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBcUJHO0FBQ0gsd0JBQWdCLFdBQVcsQ0FBQyxJQUFJLEVBQUUsTUFBTSxFQUFFLEtBQUssR0FBRSxNQUFnQyxHQUFHLE1BQU0sQ0FPekY7QUFTRDs7Ozs7OztHQU9HO0FBQ0gsd0JBQXNCLHVCQUF1QixDQUMzQyxVQUFVLEVBQUUsTUFBTSxFQUNsQixJQUFJLEVBQUUsVUFBVSxFQUNoQixVQUFVLEdBQUUsTUFBa0MsR0FDN0MsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQVdwQjtBQUVEOzs7Ozs7Ozs7R0FTRztBQUNILHdCQUFzQixxQkFBcUIsQ0FDekMsU0FBUyxFQUFFLFVBQVUsRUFDckIsVUFBVSxFQUFFLE1BQU0sRUFDbEIsVUFBVSxHQUFFLE1BQWtDLEdBQzdDLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FZckI7QUFFRDs7Ozs7Ozs7R0FRRztBQUNILHdCQUFzQixxQkFBcUIsQ0FDekMsSUFBSSxFQUFFLFVBQVUsRUFDaEIsVUFBVSxFQUFFLE1BQU0sRUFDbEIsVUFBVSxHQUFFLE1BQWtDLEdBQzdDLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FNckI7QUFFRDs7R0FFRztBQUNILHdCQUFnQixhQUFhLENBQUMsS0FBSyxFQUFFLFVBQVUsR0FBRyxNQUFNLENBTXZEO0FBRUQ7O0dBRUc7QUFDSCx3QkFBZ0IsYUFBYSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsVUFBVSxDQU9yRCJ9
|
package/dest/crypto.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crypto.d.ts","sourceRoot":"","sources":["../src/crypto.ts"],"names":[],"mappings":"AA8DA;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC,gDAAgD;IAChD,GAAG,EAAE,MAAM,CAAC;IACZ,kCAAkC;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,uCAAuC;IACvC,CAAC,EAAE,MAAM,CAAC;IACV,uCAAuC;IACvC,CAAC,EAAE,MAAM,CAAC;CACX;AAED;;;;GAIG;AACH,MAAM,WAAW,gBAAgB;IAC/B,uDAAuD;IACvD,EAAE,EAAE,MAAM,CAAC;IACX,kCAAkC;IAClC,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC5B,iCAAiC;IACjC,SAAS,EAAE,SAAS,CAAC;IACrB,yDAAyD;IACzD,UAAU,EAAE,SAAS,CAAC;CACvB;AAED;;;;;GAKG;AACH,MAAM,WAAW,WAAW;IAC1B,wDAAwD;IACxD,aAAa,EAAE,SAAS,CAAC;IACzB,oDAAoD;IACpD,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AASD;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,eAAe,IAAI,OAAO,CAAC,aAAa,CAAC,CAa9D;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAQtF;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,iBAAiB,GAAG,OAAO,CAAC,SAAS,CAAC,CAgB/E;AAsDD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,aAAa,EACzB,aAAa,EAAE,SAAS,EACxB,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,WAAW,CAAC,CAwDtB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAUrF;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,OAAO,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,CAAC,CAAC,CAQhG;AAwDD;;;GAGG;AACH,eAAO,MAAM,uBAAuB,IAAI,CAAC;AAEzC;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,GAAE,MAAgC,GAAG,MAAM,CAOzF"}
|
|
1
|
+
{"version":3,"file":"crypto.d.ts","sourceRoot":"","sources":["../src/crypto.ts"],"names":[],"mappings":"AA8DA;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC,gDAAgD;IAChD,GAAG,EAAE,MAAM,CAAC;IACZ,kCAAkC;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,uCAAuC;IACvC,CAAC,EAAE,MAAM,CAAC;IACV,uCAAuC;IACvC,CAAC,EAAE,MAAM,CAAC;CACX;AAED;;;;GAIG;AACH,MAAM,WAAW,gBAAgB;IAC/B,uDAAuD;IACvD,EAAE,EAAE,MAAM,CAAC;IACX,kCAAkC;IAClC,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC5B,iCAAiC;IACjC,SAAS,EAAE,SAAS,CAAC;IACrB,yDAAyD;IACzD,UAAU,EAAE,SAAS,CAAC;CACvB;AAED;;;;;GAKG;AACH,MAAM,WAAW,WAAW;IAC1B,wDAAwD;IACxD,aAAa,EAAE,SAAS,CAAC;IACzB,oDAAoD;IACpD,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AASD;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,eAAe,IAAI,OAAO,CAAC,aAAa,CAAC,CAa9D;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAQtF;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,iBAAiB,GAAG,OAAO,CAAC,SAAS,CAAC,CAgB/E;AAsDD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,aAAa,EACzB,aAAa,EAAE,SAAS,EACxB,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,WAAW,CAAC,CAwDtB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAUrF;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,OAAO,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,CAAC,CAAC,CAQhG;AAwDD;;;GAGG;AACH,eAAO,MAAM,uBAAuB,IAAI,CAAC;AAEzC;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,GAAE,MAAgC,GAAG,MAAM,CAOzF;AASD;;;;;;;GAOG;AACH,wBAAsB,uBAAuB,CAC3C,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,UAAU,EAChB,UAAU,GAAE,MAAkC,GAC7C,OAAO,CAAC,SAAS,CAAC,CAWpB;AAED;;;;;;;;;GASG;AACH,wBAAsB,qBAAqB,CACzC,SAAS,EAAE,UAAU,EACrB,UAAU,EAAE,MAAM,EAClB,UAAU,GAAE,MAAkC,GAC7C,OAAO,CAAC,UAAU,CAAC,CAYrB;AAED;;;;;;;;GAQG;AACH,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,UAAU,EAChB,UAAU,EAAE,MAAM,EAClB,UAAU,GAAE,MAAkC,GAC7C,OAAO,CAAC,UAAU,CAAC,CAMrB;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAMvD;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAOrD"}
|
package/dest/crypto.js
CHANGED
|
@@ -392,3 +392,91 @@ const FINGERPRINT_DATA = new TextEncoder().encode('aztec-wallet-verification-ver
|
|
|
392
392
|
}
|
|
393
393
|
return emojis.join('');
|
|
394
394
|
}
|
|
395
|
+
// ─── Passphrase-based encryption (PBKDF2 + AES-256-GCM) ───────────────────
|
|
396
|
+
/** Default PBKDF2 iteration count. High to compensate for short PINs (~1-2s on modern hardware). */ const DEFAULT_PBKDF2_ITERATIONS = 2_000_000;
|
|
397
|
+
const PBKDF2_SALT_BYTES = 16;
|
|
398
|
+
const PBKDF2_IV_BYTES = 12;
|
|
399
|
+
/**
|
|
400
|
+
* Derives an AES-256-GCM key from a passphrase using PBKDF2-SHA256.
|
|
401
|
+
*
|
|
402
|
+
* @param passphrase - The user-provided passphrase or PIN
|
|
403
|
+
* @param salt - Random salt bytes
|
|
404
|
+
* @param iterations - PBKDF2 iteration count (default: 2,000,000)
|
|
405
|
+
* @returns An AES-256-GCM CryptoKey
|
|
406
|
+
*/ export async function deriveKeyFromPassphrase(passphrase, salt, iterations = DEFAULT_PBKDF2_ITERATIONS) {
|
|
407
|
+
const keyMaterial = await crypto.subtle.importKey('raw', new TextEncoder().encode(passphrase), 'PBKDF2', false, [
|
|
408
|
+
'deriveKey'
|
|
409
|
+
]);
|
|
410
|
+
return crypto.subtle.deriveKey({
|
|
411
|
+
name: 'PBKDF2',
|
|
412
|
+
salt: salt,
|
|
413
|
+
iterations,
|
|
414
|
+
hash: 'SHA-256'
|
|
415
|
+
}, keyMaterial, {
|
|
416
|
+
name: 'AES-GCM',
|
|
417
|
+
length: 256
|
|
418
|
+
}, false, [
|
|
419
|
+
'encrypt',
|
|
420
|
+
'decrypt'
|
|
421
|
+
]);
|
|
422
|
+
}
|
|
423
|
+
/**
|
|
424
|
+
* Encrypts arbitrary bytes with a passphrase using PBKDF2 + AES-256-GCM.
|
|
425
|
+
*
|
|
426
|
+
* Output layout: `[salt (16)] [iv (12)] [ciphertext (...)]`
|
|
427
|
+
*
|
|
428
|
+
* @param plaintext - Data to encrypt
|
|
429
|
+
* @param passphrase - User passphrase or PIN
|
|
430
|
+
* @param iterations - PBKDF2 iteration count (default: 2,000,000)
|
|
431
|
+
* @returns A Uint8Array containing salt + iv + ciphertext
|
|
432
|
+
*/ export async function encryptWithPassphrase(plaintext, passphrase, iterations = DEFAULT_PBKDF2_ITERATIONS) {
|
|
433
|
+
const salt = crypto.getRandomValues(new Uint8Array(PBKDF2_SALT_BYTES));
|
|
434
|
+
const iv = crypto.getRandomValues(new Uint8Array(PBKDF2_IV_BYTES));
|
|
435
|
+
const key = await deriveKeyFromPassphrase(passphrase, salt, iterations);
|
|
436
|
+
const ciphertext = new Uint8Array(await crypto.subtle.encrypt({
|
|
437
|
+
name: 'AES-GCM',
|
|
438
|
+
iv
|
|
439
|
+
}, key, plaintext));
|
|
440
|
+
const result = new Uint8Array(PBKDF2_SALT_BYTES + PBKDF2_IV_BYTES + ciphertext.length);
|
|
441
|
+
result.set(salt, 0);
|
|
442
|
+
result.set(iv, PBKDF2_SALT_BYTES);
|
|
443
|
+
result.set(ciphertext, PBKDF2_SALT_BYTES + PBKDF2_IV_BYTES);
|
|
444
|
+
return result;
|
|
445
|
+
}
|
|
446
|
+
/**
|
|
447
|
+
* Decrypts data produced by {@link encryptWithPassphrase}.
|
|
448
|
+
*
|
|
449
|
+
* @param data - The encrypted blob (salt + iv + ciphertext)
|
|
450
|
+
* @param passphrase - The passphrase used during encryption
|
|
451
|
+
* @param iterations - PBKDF2 iteration count (must match encryption)
|
|
452
|
+
* @returns The decrypted plaintext bytes
|
|
453
|
+
* @throws On wrong passphrase (AES-GCM auth tag mismatch)
|
|
454
|
+
*/ export async function decryptWithPassphrase(data, passphrase, iterations = DEFAULT_PBKDF2_ITERATIONS) {
|
|
455
|
+
const salt = data.slice(0, PBKDF2_SALT_BYTES);
|
|
456
|
+
const iv = data.slice(PBKDF2_SALT_BYTES, PBKDF2_SALT_BYTES + PBKDF2_IV_BYTES);
|
|
457
|
+
const ciphertext = data.slice(PBKDF2_SALT_BYTES + PBKDF2_IV_BYTES);
|
|
458
|
+
const key = await deriveKeyFromPassphrase(passphrase, salt, iterations);
|
|
459
|
+
return new Uint8Array(await crypto.subtle.decrypt({
|
|
460
|
+
name: 'AES-GCM',
|
|
461
|
+
iv
|
|
462
|
+
}, key, ciphertext));
|
|
463
|
+
}
|
|
464
|
+
/**
|
|
465
|
+
* Converts a Uint8Array to a base64 string.
|
|
466
|
+
*/ export function uint8ToBase64(bytes) {
|
|
467
|
+
let binary = '';
|
|
468
|
+
for (const b of bytes){
|
|
469
|
+
binary += String.fromCharCode(b);
|
|
470
|
+
}
|
|
471
|
+
return btoa(binary);
|
|
472
|
+
}
|
|
473
|
+
/**
|
|
474
|
+
* Converts a base64 string to a Uint8Array.
|
|
475
|
+
*/ export function base64ToUint8(b64) {
|
|
476
|
+
const binary = atob(b64);
|
|
477
|
+
const bytes = new Uint8Array(binary.length);
|
|
478
|
+
for(let i = 0; i < binary.length; i++){
|
|
479
|
+
bytes[i] = binary.charCodeAt(i);
|
|
480
|
+
}
|
|
481
|
+
return bytes;
|
|
482
|
+
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { ChainInfo } from '@aztec/aztec.js/account';
|
|
2
2
|
import { type EncryptedPayload } from '../../crypto.js';
|
|
3
|
-
import { type DiscoveryRequest, type KeyExchangeRequest, type WalletInfo, type WalletMessage, type WalletResponse } from '../../types.js';
|
|
3
|
+
import { type DiscoveryRequest, type KeyExchangeRequest, type WalletInfo, type WalletMessage, type WalletResponse, type WalletSdkLogger } from '../../types.js';
|
|
4
4
|
import { type BackgroundMessage, type MessageSender } from './internal_message_types.js';
|
|
5
5
|
/**
|
|
6
6
|
* Status of a pending discovery request.
|
|
@@ -98,6 +98,8 @@ export interface BackgroundConnectionConfig {
|
|
|
98
98
|
walletVersion: string;
|
|
99
99
|
/** Optional wallet icon URL. */
|
|
100
100
|
walletIcon?: string;
|
|
101
|
+
/** Logger used for diagnostics. */
|
|
102
|
+
logger: WalletSdkLogger;
|
|
101
103
|
}
|
|
102
104
|
/**
|
|
103
105
|
* Handles wallet session flow in the extension background script.
|
|
@@ -115,6 +117,7 @@ export interface BackgroundConnectionConfig {
|
|
|
115
117
|
* walletId: 'my-wallet',
|
|
116
118
|
* walletName: 'My Wallet',
|
|
117
119
|
* walletVersion: '1.0.0',
|
|
120
|
+
* logger: console,
|
|
118
121
|
* },
|
|
119
122
|
* {
|
|
120
123
|
* sendToTab: (tabId, message) => browser.tabs.sendMessage(tabId, message),
|
|
@@ -136,9 +139,16 @@ export declare class BackgroundConnectionHandler {
|
|
|
136
139
|
private callbacks;
|
|
137
140
|
private pendingDiscoveries;
|
|
138
141
|
private activeSessions;
|
|
142
|
+
private log;
|
|
139
143
|
constructor(config: BackgroundConnectionConfig, transport: BackgroundTransport, callbacks?: BackgroundConnectionCallbacks);
|
|
140
144
|
initialize(): void;
|
|
141
145
|
private handleMessage;
|
|
146
|
+
/**
|
|
147
|
+
* Reply to a dApp PING with a PONG. Used as a liveness probe so the dApp can
|
|
148
|
+
* tell the difference between a slow request and a dead extension.
|
|
149
|
+
* @param sessionId - The session that sent the PING.
|
|
150
|
+
*/
|
|
151
|
+
private handlePing;
|
|
142
152
|
getWalletInfo(): WalletInfo;
|
|
143
153
|
handleDiscoveryRequest(request: DiscoveryRequest, tabId: number, origin: string): void;
|
|
144
154
|
approveDiscovery(requestId: string): boolean;
|
|
@@ -155,4 +165,4 @@ export declare class BackgroundConnectionHandler {
|
|
|
155
165
|
getSession(sessionId: string): ActiveSession | undefined;
|
|
156
166
|
getPendingDiscovery(requestId: string): PendingDiscovery | undefined;
|
|
157
167
|
}
|
|
158
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
168
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFja2dyb3VuZF9jb25uZWN0aW9uX2hhbmRsZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9leHRlbnNpb24vaGFuZGxlcnMvYmFja2dyb3VuZF9jb25uZWN0aW9uX2hhbmRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFekQsT0FBTyxFQUNMLEtBQUssZ0JBQWdCLEVBT3RCLE1BQU0saUJBQWlCLENBQUM7QUFDekIsT0FBTyxFQUNMLEtBQUssZ0JBQWdCLEVBQ3JCLEtBQUssa0JBQWtCLEVBRXZCLEtBQUssVUFBVSxFQUNmLEtBQUssYUFBYSxFQUVsQixLQUFLLGNBQWMsRUFDbkIsS0FBSyxlQUFlLEVBQ3JCLE1BQU0sZ0JBQWdCLENBQUM7QUFDeEIsT0FBTyxFQUNMLEtBQUssaUJBQWlCLEVBSXRCLEtBQUssYUFBYSxFQUNuQixNQUFNLDZCQUE2QixDQUFDO0FBRXJDOztHQUVHO0FBQ0gsTUFBTSxNQUFNLGVBQWUsR0FBRyxTQUFTLEdBQUcsVUFBVSxHQUFHLFVBQVUsQ0FBQztBQUVsRTs7R0FFRztBQUNILE1BQU0sV0FBVyxnQkFBZ0I7SUFDL0IsaUNBQWlDO0lBQ2pDLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsOEJBQThCO0lBQzlCLEtBQUssRUFBRSxNQUFNLENBQUM7SUFDZCxpQ0FBaUM7SUFDakMsT0FBTyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2pCLHlDQUF5QztJQUN6QyxNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsMkJBQTJCO0lBQzNCLFNBQVMsRUFBRSxTQUFTLENBQUM7SUFDckIsc0JBQXNCO0lBQ3RCLEtBQUssRUFBRSxNQUFNLENBQUM7SUFDZCx5QkFBeUI7SUFDekIsU0FBUyxFQUFFLE1BQU0sQ0FBQztJQUNsQixzQkFBc0I7SUFDdEIsTUFBTSxFQUFFLGVBQWUsQ0FBQztDQUN6QjtBQUVEOzs7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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"background_connection_handler.d.ts","sourceRoot":"","sources":["../../../src/extension/handlers/background_connection_handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEzD,OAAO,EACL,KAAK,gBAAgB,EAOtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EAEvB,KAAK,UAAU,EACf,KAAK,aAAa,EAElB,KAAK,cAAc,
|
|
1
|
+
{"version":3,"file":"background_connection_handler.d.ts","sourceRoot":"","sources":["../../../src/extension/handlers/background_connection_handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,7 @@ import { InternalMessageType, MessageOrigin } from './internal_message_types.js'
|
|
|
17
17
|
* walletId: 'my-wallet',
|
|
18
18
|
* walletName: 'My Wallet',
|
|
19
19
|
* walletVersion: '1.0.0',
|
|
20
|
+
* logger: console,
|
|
20
21
|
* },
|
|
21
22
|
* {
|
|
22
23
|
* sendToTab: (tabId, message) => browser.tabs.sendMessage(tabId, message),
|
|
@@ -37,6 +38,7 @@ import { InternalMessageType, MessageOrigin } from './internal_message_types.js'
|
|
|
37
38
|
callbacks;
|
|
38
39
|
pendingDiscoveries;
|
|
39
40
|
activeSessions;
|
|
41
|
+
log;
|
|
40
42
|
constructor(config, transport, callbacks = {}){
|
|
41
43
|
this.config = config;
|
|
42
44
|
this.transport = transport;
|
|
@@ -60,8 +62,11 @@ import { InternalMessageType, MessageOrigin } from './internal_message_types.js'
|
|
|
60
62
|
break;
|
|
61
63
|
case InternalMessageType.KEY_EXCHANGE_REQUEST:
|
|
62
64
|
if (sessionId) {
|
|
63
|
-
this.handleKeyExchangeRequest(sessionId, content).catch(()=>{
|
|
64
|
-
|
|
65
|
+
this.handleKeyExchangeRequest(sessionId, content).catch((err)=>{
|
|
66
|
+
this.log.warn('Key exchange failed — session will not be established', {
|
|
67
|
+
sessionId,
|
|
68
|
+
err
|
|
69
|
+
});
|
|
65
70
|
});
|
|
66
71
|
}
|
|
67
72
|
break;
|
|
@@ -75,13 +80,34 @@ import { InternalMessageType, MessageOrigin } from './internal_message_types.js'
|
|
|
75
80
|
void this.handleEncryptedMessage(sessionId, content);
|
|
76
81
|
}
|
|
77
82
|
break;
|
|
83
|
+
case InternalMessageType.PING:
|
|
84
|
+
if (sessionId) {
|
|
85
|
+
this.handlePing(sessionId);
|
|
86
|
+
}
|
|
87
|
+
break;
|
|
78
88
|
}
|
|
79
89
|
};
|
|
90
|
+
this.log = config.logger;
|
|
80
91
|
}
|
|
81
92
|
initialize() {
|
|
82
93
|
this.transport.addContentListener(this.handleMessage);
|
|
83
94
|
}
|
|
84
95
|
handleMessage;
|
|
96
|
+
/**
|
|
97
|
+
* Reply to a dApp PING with a PONG. Used as a liveness probe so the dApp can
|
|
98
|
+
* tell the difference between a slow request and a dead extension.
|
|
99
|
+
* @param sessionId - The session that sent the PING.
|
|
100
|
+
*/ handlePing(sessionId) {
|
|
101
|
+
const session = this.activeSessions.get(sessionId);
|
|
102
|
+
if (!session) {
|
|
103
|
+
return;
|
|
104
|
+
}
|
|
105
|
+
this.transport.sendToTab(session.tabId, {
|
|
106
|
+
origin: MessageOrigin.BACKGROUND,
|
|
107
|
+
type: InternalMessageType.PONG,
|
|
108
|
+
sessionId
|
|
109
|
+
});
|
|
110
|
+
}
|
|
85
111
|
getWalletInfo() {
|
|
86
112
|
return {
|
|
87
113
|
id: this.config.walletId,
|
|
@@ -164,8 +190,11 @@ import { InternalMessageType, MessageOrigin } from './internal_message_types.js'
|
|
|
164
190
|
content: response
|
|
165
191
|
});
|
|
166
192
|
this.callbacks.onSessionEstablished?.(session);
|
|
167
|
-
} catch
|
|
168
|
-
|
|
193
|
+
} catch (err) {
|
|
194
|
+
this.log.warn('Key exchange failed — session will not be established', {
|
|
195
|
+
sessionId,
|
|
196
|
+
err
|
|
197
|
+
});
|
|
169
198
|
}
|
|
170
199
|
}
|
|
171
200
|
async handleEncryptedMessage(sessionId, encrypted) {
|
|
@@ -176,8 +205,11 @@ import { InternalMessageType, MessageOrigin } from './internal_message_types.js'
|
|
|
176
205
|
try {
|
|
177
206
|
const message = await decrypt(session.sharedKey, encrypted);
|
|
178
207
|
this.callbacks.onWalletMessage?.(session, message);
|
|
179
|
-
} catch
|
|
180
|
-
|
|
208
|
+
} catch (err) {
|
|
209
|
+
this.log.warn('Failed to decrypt incoming wallet message', {
|
|
210
|
+
sessionId,
|
|
211
|
+
err
|
|
212
|
+
});
|
|
181
213
|
}
|
|
182
214
|
}
|
|
183
215
|
async sendResponse(sessionId, response) {
|
|
@@ -193,8 +225,12 @@ import { InternalMessageType, MessageOrigin } from './internal_message_types.js'
|
|
|
193
225
|
sessionId,
|
|
194
226
|
content: encrypted
|
|
195
227
|
});
|
|
196
|
-
} catch
|
|
197
|
-
|
|
228
|
+
} catch (err) {
|
|
229
|
+
this.log.error('Failed to encrypt wallet response — response will not be sent', {
|
|
230
|
+
sessionId,
|
|
231
|
+
messageId: response.messageId,
|
|
232
|
+
err
|
|
233
|
+
});
|
|
198
234
|
}
|
|
199
235
|
}
|
|
200
236
|
terminateSession(sessionId) {
|
|
@@ -44,6 +44,7 @@ export declare class ContentScriptConnectionHandler {
|
|
|
44
44
|
constructor(transport: ContentScriptTransport);
|
|
45
45
|
start(): void;
|
|
46
46
|
private handleBackgroundMessage;
|
|
47
|
+
private handlePong;
|
|
47
48
|
private handleDiscoveryRequest;
|
|
48
49
|
private handleDiscoveryApproved;
|
|
49
50
|
private handleKeyExchangeResponse;
|
|
@@ -53,4 +54,4 @@ export declare class ContentScriptConnectionHandler {
|
|
|
53
54
|
closeAllConnections(): void;
|
|
54
55
|
getConnectionCount(): number;
|
|
55
56
|
}
|
|
56
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
57
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udGVudF9zY3JpcHRfY29ubmVjdGlvbl9oYW5kbGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvZXh0ZW5zaW9uL2hhbmRsZXJzL2NvbnRlbnRfc2NyaXB0X2Nvbm5lY3Rpb25faGFuZGxlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQ0wsS0FBSyxpQkFBaUIsRUFDdEIsS0FBSyxvQkFBb0IsRUFHMUIsTUFBTSw2QkFBNkIsQ0FBQztBQW9DckM7O0dBRUc7QUFDSCxNQUFNLFdBQVcsc0JBQXNCO0lBQ3JDOzs7T0FHRztJQUNILGdCQUFnQixFQUFFLENBQUMsT0FBTyxFQUFFLG9CQUFvQixLQUFLLElBQUksQ0FBQztJQUUxRDs7O09BR0c7SUFDSCxxQkFBcUIsRUFBRSxDQUFDLE9BQU8sRUFBRSxDQUFDLE9BQU8sRUFBRSxpQkFBaUIsS0FBSyxJQUFJLEtBQUssSUFBSSxDQUFDO0NBQ2hGO0FBRUQ7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQXFCRztBQUNILHFCQUFhLDhCQUE4QjtJQUs3QixPQUFPLENBQUMsU0FBUztJQUo3QixPQUFPLENBQUMsS0FBSyxDQUFxQztJQUNsRCxPQUFPLENBQUMsU0FBUyxDQUFTO0lBQzFCLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBZ0Q7SUFFMUUsWUFBb0IsU0FBUyxFQUFFLHNCQUFzQixFQUFJO0lBRXpELEtBQUssSUFBSSxJQUFJLENBOEJaO0lBRUQsT0FBTyxDQUFDLHVCQUF1QixDQXdCN0I7SUFFRixPQUFPLENBQUMsVUFBVTtJQVFsQixPQUFPLENBQUMsc0JBQXNCO0lBUTlCLE9BQU8sQ0FBQyx1QkFBdUI7SUF3RC9CLE9BQU8sQ0FBQyx5QkFBeUI7SUFRakMsT0FBTyxDQUFDLG9CQUFvQjtJQVE1QixPQUFPLENBQUMseUJBQXlCO0lBVWpDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsTUFBTSxHQUFHLElBQUksQ0FNdkM7SUFFRCxtQkFBbUIsSUFBSSxJQUFJLENBSzFCO0lBRUQsa0JBQWtCLElBQUksTUFBTSxDQUUzQjtDQUNGIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"content_script_connection_handler.d.ts","sourceRoot":"","sources":["../../../src/extension/handlers/content_script_connection_handler.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,oBAAoB,EAG1B,MAAM,6BAA6B,CAAC;AAoCrC;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC;;;OAGG;IACH,gBAAgB,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,IAAI,CAAC;IAE1D;;;OAGG;IACH,qBAAqB,EAAE,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAI,KAAK,IAAI,CAAC;CAChF;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,8BAA8B;IAK7B,OAAO,CAAC,SAAS;IAJ7B,OAAO,CAAC,KAAK,CAAqC;IAClD,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,kBAAkB,CAAgD;IAE1E,YAAoB,SAAS,EAAE,sBAAsB,EAAI;IAEzD,KAAK,IAAI,IAAI,CA8BZ;IAED,OAAO,CAAC,uBAAuB,
|
|
1
|
+
{"version":3,"file":"content_script_connection_handler.d.ts","sourceRoot":"","sources":["../../../src/extension/handlers/content_script_connection_handler.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,oBAAoB,EAG1B,MAAM,6BAA6B,CAAC;AAoCrC;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC;;;OAGG;IACH,gBAAgB,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,IAAI,CAAC;IAE1D;;;OAGG;IACH,qBAAqB,EAAE,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAI,KAAK,IAAI,CAAC;CAChF;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,8BAA8B;IAK7B,OAAO,CAAC,SAAS;IAJ7B,OAAO,CAAC,KAAK,CAAqC;IAClD,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,kBAAkB,CAAgD;IAE1E,YAAoB,SAAS,EAAE,sBAAsB,EAAI;IAEzD,KAAK,IAAI,IAAI,CA8BZ;IAED,OAAO,CAAC,uBAAuB,CAwB7B;IAEF,OAAO,CAAC,UAAU;IAQlB,OAAO,CAAC,sBAAsB;IAQ9B,OAAO,CAAC,uBAAuB;IAwD/B,OAAO,CAAC,yBAAyB;IAQjC,OAAO,CAAC,oBAAoB;IAQ5B,OAAO,CAAC,yBAAyB;IAUjC,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAMvC;IAED,mBAAmB,IAAI,IAAI,CAK1B;IAED,kBAAkB,IAAI,MAAM,CAE3B;CACF"}
|
|
@@ -49,6 +49,9 @@ import { InternalMessageType, MessageOrigin } from './internal_message_types.js'
|
|
|
49
49
|
case InternalMessageType.SESSION_DISCONNECTED:
|
|
50
50
|
this.handleSessionDisconnected(sessionId);
|
|
51
51
|
break;
|
|
52
|
+
case InternalMessageType.PONG:
|
|
53
|
+
this.handlePong(sessionId);
|
|
54
|
+
break;
|
|
52
55
|
}
|
|
53
56
|
};
|
|
54
57
|
}
|
|
@@ -78,6 +81,15 @@ import { InternalMessageType, MessageOrigin } from './internal_message_types.js'
|
|
|
78
81
|
this.listening = true;
|
|
79
82
|
}
|
|
80
83
|
handleBackgroundMessage;
|
|
84
|
+
handlePong(sessionId) {
|
|
85
|
+
const connection = this.ports.get(sessionId);
|
|
86
|
+
if (!connection) {
|
|
87
|
+
return;
|
|
88
|
+
}
|
|
89
|
+
connection.port.postMessage({
|
|
90
|
+
type: WalletMessageType.PONG
|
|
91
|
+
});
|
|
92
|
+
}
|
|
81
93
|
handleDiscoveryRequest(request) {
|
|
82
94
|
this.transport.sendToBackground({
|
|
83
95
|
origin: MessageOrigin.CONTENT_SCRIPT,
|
|
@@ -110,6 +122,13 @@ import { InternalMessageType, MessageOrigin } from './internal_message_types.js'
|
|
|
110
122
|
content: data
|
|
111
123
|
});
|
|
112
124
|
break;
|
|
125
|
+
case WalletMessageType.PING:
|
|
126
|
+
this.transport.sendToBackground({
|
|
127
|
+
origin: MessageOrigin.CONTENT_SCRIPT,
|
|
128
|
+
type: InternalMessageType.PING,
|
|
129
|
+
sessionId
|
|
130
|
+
});
|
|
131
|
+
break;
|
|
113
132
|
default:
|
|
114
133
|
this.transport.sendToBackground({
|
|
115
134
|
origin: MessageOrigin.CONTENT_SCRIPT,
|