zksync-sso 0.1.0 → 0.3.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/README.md +11 -2
- package/dist/_cjs/abi/{GuardianRecoveryModule.js → GuardianRecoveryValidator.js} +3 -3
- package/dist/_cjs/abi/GuardianRecoveryValidator.js.map +1 -0
- package/dist/_cjs/abi/SsoAccount.js +1288 -0
- package/dist/_cjs/abi/SsoAccount.js.map +1 -0
- package/dist/_cjs/abi/index.js +5 -3
- package/dist/_cjs/abi/index.js.map +1 -1
- package/dist/_cjs/client/ecdsa/decorators/wallet.js +8 -2
- package/dist/_cjs/client/ecdsa/decorators/wallet.js.map +1 -1
- package/dist/_cjs/client/index.js +74 -2
- package/dist/_cjs/client/index.js.map +1 -1
- package/dist/_cjs/client/passkey/account.js +5 -5
- package/dist/_cjs/client/passkey/account.js.map +1 -1
- package/dist/_cjs/client/passkey/actions/account.js +23 -1
- package/dist/_cjs/client/passkey/actions/account.js.map +1 -1
- package/dist/_cjs/client/passkey/actions/passkey.js +10 -7
- package/dist/_cjs/client/passkey/actions/passkey.js.map +1 -1
- package/dist/_cjs/client/passkey/client.js +3 -0
- package/dist/_cjs/client/passkey/client.js.map +1 -1
- package/dist/_cjs/client/passkey/decorators/wallet.js +7 -0
- package/dist/_cjs/client/passkey/decorators/wallet.js.map +1 -1
- package/dist/_cjs/client/recovery/actions/recovery.js +4 -4
- package/dist/_cjs/client/recovery/actions/recovery.js.map +1 -1
- package/dist/_cjs/client/recovery/decorators/wallet.js +7 -0
- package/dist/_cjs/client/recovery/decorators/wallet.js.map +1 -1
- package/dist/_cjs/client/session/actions/session.js +53 -1
- package/dist/_cjs/client/session/actions/session.js.map +1 -1
- package/dist/_cjs/client/session/client.js +19 -0
- package/dist/_cjs/client/session/client.js.map +1 -1
- package/dist/_cjs/client/session/decorators/wallet.js +46 -0
- package/dist/_cjs/client/session/decorators/wallet.js.map +1 -1
- package/dist/_cjs/client/utils/getEip712Domain.js +1 -1
- package/dist/_cjs/client/utils/getEip712Domain.js.map +1 -1
- package/dist/_cjs/client-auth-server/Signer.js +25 -1
- package/dist/_cjs/client-auth-server/Signer.js.map +1 -1
- package/dist/_cjs/client-auth-server/WalletProvider.js +3 -1
- package/dist/_cjs/client-auth-server/WalletProvider.js.map +1 -1
- package/dist/_cjs/utils/helpers.js +26 -0
- package/dist/_cjs/utils/helpers.js.map +1 -1
- package/dist/_cjs/utils/session.js +283 -1
- package/dist/_cjs/utils/session.js.map +1 -1
- package/dist/_esm/abi/{GuardianRecoveryModule.js → GuardianRecoveryValidator.js} +2 -2
- package/dist/_esm/abi/GuardianRecoveryValidator.js.map +1 -0
- package/dist/_esm/abi/SsoAccount.js +1285 -0
- package/dist/_esm/abi/SsoAccount.js.map +1 -0
- package/dist/_esm/abi/index.js +2 -1
- package/dist/_esm/abi/index.js.map +1 -1
- package/dist/_esm/client/ecdsa/decorators/wallet.js +9 -2
- package/dist/_esm/client/ecdsa/decorators/wallet.js.map +1 -1
- package/dist/_esm/client/index.js +74 -2
- package/dist/_esm/client/index.js.map +1 -1
- package/dist/_esm/client/passkey/account.js +5 -5
- package/dist/_esm/client/passkey/account.js.map +1 -1
- package/dist/_esm/client/passkey/actions/account.js +21 -0
- package/dist/_esm/client/passkey/actions/account.js.map +1 -1
- package/dist/_esm/client/passkey/actions/passkey.js +10 -8
- package/dist/_esm/client/passkey/actions/passkey.js.map +1 -1
- package/dist/_esm/client/passkey/client.js +3 -0
- package/dist/_esm/client/passkey/client.js.map +1 -1
- package/dist/_esm/client/passkey/decorators/wallet.js +8 -1
- package/dist/_esm/client/passkey/decorators/wallet.js.map +1 -1
- package/dist/_esm/client/recovery/actions/recovery.js +4 -4
- package/dist/_esm/client/recovery/actions/recovery.js.map +1 -1
- package/dist/_esm/client/recovery/decorators/wallet.js +8 -1
- package/dist/_esm/client/recovery/decorators/wallet.js.map +1 -1
- package/dist/_esm/client/session/actions/session.js +59 -1
- package/dist/_esm/client/session/actions/session.js.map +1 -1
- package/dist/_esm/client/session/client.js +20 -0
- package/dist/_esm/client/session/client.js.map +1 -1
- package/dist/_esm/client/session/decorators/wallet.js +55 -130
- package/dist/_esm/client/session/decorators/wallet.js.map +1 -1
- package/dist/_esm/client/utils/getEip712Domain.js +1 -1
- package/dist/_esm/client/utils/getEip712Domain.js.map +1 -1
- package/dist/_esm/client-auth-server/Signer.js +25 -1
- package/dist/_esm/client-auth-server/Signer.js.map +1 -1
- package/dist/_esm/client-auth-server/WalletProvider.js +3 -1
- package/dist/_esm/client-auth-server/WalletProvider.js.map +1 -1
- package/dist/_esm/utils/helpers.js +24 -0
- package/dist/_esm/utils/helpers.js.map +1 -1
- package/dist/_esm/utils/session.js +296 -1
- package/dist/_esm/utils/session.js.map +1 -1
- package/dist/_types/abi/{GuardianRecoveryModule.d.ts → GuardianRecoveryValidator.d.ts} +2 -2
- package/dist/_types/abi/{GuardianRecoveryModule.d.ts.map → GuardianRecoveryValidator.d.ts.map} +1 -1
- package/dist/_types/abi/SsoAccount.d.ts +992 -0
- package/dist/_types/abi/SsoAccount.d.ts.map +1 -0
- package/dist/_types/abi/index.d.ts +2 -1
- package/dist/_types/abi/index.d.ts.map +1 -1
- package/dist/_types/client/ecdsa/decorators/wallet.d.ts.map +1 -1
- package/dist/_types/client/index.d.ts +28 -2
- package/dist/_types/client/index.d.ts.map +1 -1
- package/dist/_types/client/passkey/account.d.ts +7 -3
- package/dist/_types/client/passkey/account.d.ts.map +1 -1
- package/dist/_types/client/passkey/actions/account.d.ts +7 -0
- package/dist/_types/client/passkey/actions/account.d.ts.map +1 -1
- package/dist/_types/client/passkey/actions/passkey.d.ts +2 -3
- package/dist/_types/client/passkey/actions/passkey.d.ts.map +1 -1
- package/dist/_types/client/passkey/client.d.ts.map +1 -1
- package/dist/_types/client/passkey/decorators/wallet.d.ts.map +1 -1
- package/dist/_types/client/recovery/decorators/wallet.d.ts.map +1 -1
- package/dist/_types/client/session/actions/session.d.ts +26 -1
- package/dist/_types/client/session/actions/session.d.ts.map +1 -1
- package/dist/_types/client/session/client.d.ts +6 -1
- package/dist/_types/client/session/client.d.ts.map +1 -1
- package/dist/_types/client/session/decorators/wallet.d.ts.map +1 -1
- package/dist/_types/client-auth-server/Signer.d.ts +3737 -905
- package/dist/_types/client-auth-server/Signer.d.ts.map +1 -1
- package/dist/_types/client-auth-server/WalletProvider.d.ts +3735 -905
- package/dist/_types/client-auth-server/WalletProvider.d.ts.map +1 -1
- package/dist/_types/utils/helpers.d.ts +7 -0
- package/dist/_types/utils/helpers.d.ts.map +1 -1
- package/dist/_types/utils/session.d.ts +51 -0
- package/dist/_types/utils/session.d.ts.map +1 -1
- package/package.json +4 -5
- package/src/abi/{GuardianRecoveryModule.ts → GuardianRecoveryValidator.ts} +1 -1
- package/src/abi/SsoAccount.ts +1284 -0
- package/src/abi/index.ts +2 -1
- package/src/client/ecdsa/decorators/wallet.ts +10 -3
- package/src/client/index.ts +119 -2
- package/src/client/passkey/account.ts +19 -9
- package/src/client/passkey/actions/account.ts +29 -0
- package/src/client/passkey/actions/passkey.ts +15 -10
- package/src/client/passkey/client.ts +5 -1
- package/src/client/passkey/decorators/wallet.ts +9 -2
- package/src/client/recovery/actions/recovery.ts +4 -4
- package/src/client/recovery/decorators/wallet.ts +9 -2
- package/src/client/session/actions/session.ts +85 -2
- package/src/client/session/client.ts +28 -1
- package/src/client/session/decorators/wallet.ts +68 -133
- package/src/client/utils/getEip712Domain.ts +1 -1
- package/src/client-auth-server/Signer.ts +18 -2
- package/src/client-auth-server/WalletProvider.ts +6 -1
- package/src/utils/helpers.ts +28 -0
- package/src/utils/session.ts +356 -1
- package/dist/_cjs/abi/GuardianRecoveryModule.js.map +0 -1
- package/dist/_esm/abi/GuardianRecoveryModule.js.map +0 -1
|
@@ -3,6 +3,7 @@ import { privateKeyToAccount } from "viem/accounts";
|
|
|
3
3
|
import { zksyncInMemoryNode } from "viem/chains";
|
|
4
4
|
import { encodeSessionTx } from "../../utils/encoding.js";
|
|
5
5
|
import { toSessionAccount } from "./account.js";
|
|
6
|
+
import { getSessionState, sessionStateNotify } from "./actions/session.js";
|
|
6
7
|
import { publicActionsRewrite } from "./decorators/publicActionsRewrite.js";
|
|
7
8
|
import { zksyncSsoWalletActions } from "./decorators/wallet.js";
|
|
8
9
|
export const signSessionTransaction = (args) => {
|
|
@@ -63,10 +64,29 @@ export function createZksyncSessionClient(_parameters) {
|
|
|
63
64
|
sessionConfig: parameters.sessionConfig,
|
|
64
65
|
contracts: parameters.contracts,
|
|
65
66
|
paymasterHandler: parameters.paymasterHandler,
|
|
67
|
+
onSessionStateChange: parameters.onSessionStateChange,
|
|
68
|
+
_sessionNotifyTimeout: undefined,
|
|
66
69
|
}))
|
|
67
70
|
.extend(publicActions)
|
|
68
71
|
.extend(publicActionsRewrite)
|
|
69
72
|
.extend(zksyncSsoWalletActions);
|
|
73
|
+
// Check session state on initialization if callback is provided
|
|
74
|
+
if (client.onSessionStateChange) {
|
|
75
|
+
getSessionState(client, {
|
|
76
|
+
account: client.account.address,
|
|
77
|
+
sessionConfig: client.sessionConfig,
|
|
78
|
+
contracts: client.contracts,
|
|
79
|
+
}).then(({ sessionState }) => {
|
|
80
|
+
sessionStateNotify({
|
|
81
|
+
sessionConfig: client.sessionConfig,
|
|
82
|
+
sessionState,
|
|
83
|
+
onSessionStateChange: client.onSessionStateChange,
|
|
84
|
+
sessionNotifyTimeout: client._sessionNotifyTimeout,
|
|
85
|
+
});
|
|
86
|
+
}).catch((error) => {
|
|
87
|
+
console.error("Failed to get session state on initialization:", error);
|
|
88
|
+
});
|
|
89
|
+
}
|
|
70
90
|
return client;
|
|
71
91
|
}
|
|
72
92
|
//# sourceMappingURL=client.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../src/client/session/client.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../src/client/session/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,33 @@
|
|
|
1
1
|
import { bytesToHex, formatTransaction } from "viem";
|
|
2
|
-
import { deployContract, getAddresses, getChainId, sendRawTransaction, signMessage, signTypedData, writeContract, } from "viem/actions";
|
|
2
|
+
import { deployContract, getAddresses, getCallsStatus, getCapabilities, getChainId, prepareAuthorization, sendCalls, sendRawTransaction, showCallsStatus, signAuthorization, signMessage, signTypedData, waitForCallsStatus, writeContract, } from "viem/actions";
|
|
3
3
|
import { signTransaction } from "viem/zksync";
|
|
4
4
|
import { getTransactionWithPaymasterData } from "../../../paymaster/index.js";
|
|
5
|
+
import { SessionErrorType, SessionEventType, validateSessionTransaction } from "../../../utils/session.js";
|
|
5
6
|
import { sendEip712Transaction } from "../actions/sendEip712Transaction.js";
|
|
7
|
+
import { getSessionState, sessionStateNotify } from "../actions/session.js";
|
|
8
|
+
const sessionErrorToSessionEventType = {
|
|
9
|
+
[SessionErrorType.SessionInactive]: SessionEventType.Inactive,
|
|
10
|
+
[SessionErrorType.SessionExpired]: SessionEventType.Expired,
|
|
11
|
+
};
|
|
12
|
+
/**
|
|
13
|
+
* Helper function to check session state and notify via callback
|
|
14
|
+
*/
|
|
15
|
+
async function getSessionStateAndNotify(client) {
|
|
16
|
+
const { sessionState } = await getSessionState(client, {
|
|
17
|
+
account: client.account.address,
|
|
18
|
+
sessionConfig: client.sessionConfig,
|
|
19
|
+
contracts: client.contracts,
|
|
20
|
+
});
|
|
21
|
+
if (client.onSessionStateChange) {
|
|
22
|
+
sessionStateNotify({
|
|
23
|
+
sessionConfig: client.sessionConfig,
|
|
24
|
+
sessionState,
|
|
25
|
+
onSessionStateChange: client.onSessionStateChange,
|
|
26
|
+
sessionNotifyTimeout: client._sessionNotifyTimeout,
|
|
27
|
+
});
|
|
28
|
+
}
|
|
29
|
+
return sessionState;
|
|
30
|
+
}
|
|
6
31
|
export function zksyncSsoWalletActions(client) {
|
|
7
32
|
return {
|
|
8
33
|
deployContract: (args) => deployContract(client, args),
|
|
@@ -29,6 +54,27 @@ export function zksyncSsoWalletActions(client) {
|
|
|
29
54
|
...format(unformattedTxWithPaymaster),
|
|
30
55
|
type: "eip712",
|
|
31
56
|
};
|
|
57
|
+
if (client.skipPreTransactionStateValidation !== false) {
|
|
58
|
+
// Get current session state and trigger callback if needed
|
|
59
|
+
const sessionState = await getSessionStateAndNotify(client);
|
|
60
|
+
// Validate transaction against session constraints
|
|
61
|
+
const validationResult = validateSessionTransaction({
|
|
62
|
+
sessionState,
|
|
63
|
+
sessionConfig: client.sessionConfig,
|
|
64
|
+
transaction: tx,
|
|
65
|
+
});
|
|
66
|
+
// Throw error if validation fails
|
|
67
|
+
if (validationResult.error) {
|
|
68
|
+
// If validation fails due to session issues, notify via callback
|
|
69
|
+
if (client.onSessionStateChange && Object.keys(sessionErrorToSessionEventType).includes(validationResult.error.type)) {
|
|
70
|
+
client.onSessionStateChange({
|
|
71
|
+
type: sessionErrorToSessionEventType[validationResult.error.type],
|
|
72
|
+
message: validationResult.error.message,
|
|
73
|
+
});
|
|
74
|
+
}
|
|
75
|
+
throw new Error(`Session validation failed: ${validationResult.error.message} (${validationResult.error.type})`);
|
|
76
|
+
}
|
|
77
|
+
}
|
|
32
78
|
return await sendEip712Transaction(client, tx);
|
|
33
79
|
},
|
|
34
80
|
signMessage: (args) => signMessage(client, args),
|
|
@@ -37,139 +83,18 @@ export function zksyncSsoWalletActions(client) {
|
|
|
37
83
|
return signTransaction(client, {
|
|
38
84
|
...args,
|
|
39
85
|
unformattedTxWithPaymaster,
|
|
86
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
40
87
|
});
|
|
41
88
|
},
|
|
42
89
|
signTypedData: (args) => signTypedData(client, args),
|
|
43
90
|
writeContract: (args) => writeContract(client, args),
|
|
91
|
+
signAuthorization: (args) => signAuthorization(client, args),
|
|
92
|
+
getCallsStatus: (args) => getCallsStatus(client, args),
|
|
93
|
+
getCapabilities: (args) => getCapabilities(client, args),
|
|
94
|
+
prepareAuthorization: (args) => prepareAuthorization(client, args),
|
|
95
|
+
sendCalls: (args) => sendCalls(client, args),
|
|
96
|
+
showCallsStatus: (args) => showCallsStatus(client, args),
|
|
97
|
+
waitForCallsStatus: (args) => waitForCallsStatus(client, args),
|
|
44
98
|
};
|
|
45
99
|
}
|
|
46
|
-
/* export class SpendLimitError extends Error {
|
|
47
|
-
public tokenAddress: Address;
|
|
48
|
-
public spendLimit: bigint;
|
|
49
|
-
|
|
50
|
-
constructor(message: string, info: { tokenAddress: Address, spendLimit: bigint }) {
|
|
51
|
-
super(message);
|
|
52
|
-
this.tokenAddress = info.tokenAddress;
|
|
53
|
-
this.spendLimit = info.spendLimit;
|
|
54
|
-
}
|
|
55
|
-
}
|
|
56
|
-
|
|
57
|
-
const l2BaseTokenAddress = getAddress('0x000000000000000000000000000000000000800a');
|
|
58
|
-
|
|
59
|
-
const blockedMethods = [
|
|
60
|
-
"approve", // do not allow token approvals to prevent indirect token transfer
|
|
61
|
-
];
|
|
62
|
-
const isBlockedMethod = (method: string) => {
|
|
63
|
-
return blockedMethods.includes(method);
|
|
64
|
-
}
|
|
65
|
-
|
|
66
|
-
const decodeERC20TransactionData = (transactionData: Hash) => {
|
|
67
|
-
try {
|
|
68
|
-
const { functionName, args } = decodeFunctionData({
|
|
69
|
-
abi: erc20Abi,
|
|
70
|
-
data: transactionData,
|
|
71
|
-
});
|
|
72
|
-
return { functionName, args };
|
|
73
|
-
} catch {
|
|
74
|
-
return { functionName: undefined, args: [] };
|
|
75
|
-
}
|
|
76
|
-
}
|
|
77
|
-
|
|
78
|
-
const getTotalFee = (fee: {
|
|
79
|
-
gas?: bigint,
|
|
80
|
-
gasPrice?: bigint,
|
|
81
|
-
maxFeePerGas?: bigint,
|
|
82
|
-
maxPriorityFeePerGas?: bigint,
|
|
83
|
-
}): bigint => {
|
|
84
|
-
if (!fee.gas) return 0n;
|
|
85
|
-
|
|
86
|
-
if (fee.gasPrice) {
|
|
87
|
-
return fee.gas * fee.gasPrice;
|
|
88
|
-
} else if (fee.maxFeePerGas && fee.maxPriorityFeePerGas) {
|
|
89
|
-
return fee.gas * (fee.maxFeePerGas + fee.maxPriorityFeePerGas);
|
|
90
|
-
} else if (fee.maxFeePerGas) {
|
|
91
|
-
return fee.gas * fee.maxFeePerGas;
|
|
92
|
-
} else if (fee.maxPriorityFeePerGas) {
|
|
93
|
-
return fee.gas * fee.maxPriorityFeePerGas;
|
|
94
|
-
}
|
|
95
|
-
|
|
96
|
-
return 0n;
|
|
97
|
-
}
|
|
98
|
-
|
|
99
|
-
const verifyTransactionData = async (
|
|
100
|
-
transaction: {
|
|
101
|
-
value?: bigint;
|
|
102
|
-
chain?: { id: number | undefined };
|
|
103
|
-
to?: Address;
|
|
104
|
-
data?: Hash;
|
|
105
|
-
gas?: bigint,
|
|
106
|
-
gasPrice?: bigint,
|
|
107
|
-
maxFeePerGas?: bigint,
|
|
108
|
-
maxPriorityFeePerGas?: bigint,
|
|
109
|
-
},
|
|
110
|
-
client: ClientWithZksyncSsoSessionData
|
|
111
|
-
) => {
|
|
112
|
-
const spendLimitCache = new Map<Address, bigint>(); // Prevent multiple calls to getTokenSpendLimit (mostly for ETH)
|
|
113
|
-
const exceedsSpendLimit = async (tokenAddress: Address, amount: bigint): Promise<boolean> => {
|
|
114
|
-
if (!spendLimitCache.has(tokenAddress)) {
|
|
115
|
-
const spendLimit = await getTokenSpendLimit(client, { tokenAddress, sessionKey: client.sessionKey!, contracts: client.contracts });
|
|
116
|
-
spendLimitCache.set(tokenAddress, spendLimit);
|
|
117
|
-
}
|
|
118
|
-
|
|
119
|
-
const tokenSpendLimit = spendLimitCache.get(tokenAddress)!;
|
|
120
|
-
if (tokenSpendLimit < amount) {
|
|
121
|
-
return true;
|
|
122
|
-
}
|
|
123
|
-
|
|
124
|
-
return false;
|
|
125
|
-
}
|
|
126
|
-
|
|
127
|
-
// Verify transaction value
|
|
128
|
-
const value = transaction.value || 0n;
|
|
129
|
-
if (await exceedsSpendLimit(getAddress(l2BaseTokenAddress), value)) {
|
|
130
|
-
throw new SpendLimitError(`Transaction value ${value} exceeds account spend limit`, {
|
|
131
|
-
tokenAddress: getAddress(l2BaseTokenAddress),
|
|
132
|
-
spendLimit: spendLimitCache.get(getAddress(l2BaseTokenAddress))!,
|
|
133
|
-
});
|
|
134
|
-
}
|
|
135
|
-
|
|
136
|
-
// Verify total fee
|
|
137
|
-
const totalFee = getTotalFee({
|
|
138
|
-
gas: transaction.gas,
|
|
139
|
-
gasPrice: transaction.gasPrice,
|
|
140
|
-
maxFeePerGas: transaction.maxFeePerGas,
|
|
141
|
-
maxPriorityFeePerGas: transaction.maxPriorityFeePerGas,
|
|
142
|
-
});
|
|
143
|
-
if (await exceedsSpendLimit(getAddress(l2BaseTokenAddress), totalFee)) {
|
|
144
|
-
throw new SpendLimitError(`Total fee ${totalFee} exceeds account spend limit`, {
|
|
145
|
-
tokenAddress: getAddress(l2BaseTokenAddress),
|
|
146
|
-
spendLimit: spendLimitCache.get(getAddress(l2BaseTokenAddress))!,
|
|
147
|
-
});
|
|
148
|
-
}
|
|
149
|
-
|
|
150
|
-
if (!transaction.data || !transaction.to) return;
|
|
151
|
-
|
|
152
|
-
// Assuming transaction is an erc20 transaction
|
|
153
|
-
const { functionName, args } = decodeERC20TransactionData(transaction.data);
|
|
154
|
-
if (!functionName) return;
|
|
155
|
-
|
|
156
|
-
// Verify if method is not blocked
|
|
157
|
-
if (isBlockedMethod(functionName)) {
|
|
158
|
-
throw new Error(`Method "${functionName}" is not allowed for this account`);
|
|
159
|
-
}
|
|
160
|
-
|
|
161
|
-
const tokenAddress = getAddress(transaction.to.toLowerCase());
|
|
162
|
-
|
|
163
|
-
// Verify transfer amount
|
|
164
|
-
if (functionName === "transfer") {
|
|
165
|
-
const [_to, _amount] = args;
|
|
166
|
-
const amount = _amount ? BigInt(_amount) : 0n;
|
|
167
|
-
if (await exceedsSpendLimit(tokenAddress, amount)) {
|
|
168
|
-
throw new SpendLimitError(`Amount ${amount} exceeds account spend limit`, {
|
|
169
|
-
tokenAddress,
|
|
170
|
-
spendLimit: spendLimitCache.get(tokenAddress)!,
|
|
171
|
-
});
|
|
172
|
-
}
|
|
173
|
-
}
|
|
174
|
-
} */
|
|
175
100
|
//# sourceMappingURL=wallet.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wallet.js","sourceRoot":"","sources":["../../../../../src/client/session/decorators/wallet.ts"],"names":[],"mappings":"AAAA,OAAO,EACS,UAAU,EACO,iBAAiB,EACZ,MAAM,MAAM,CAAC;AACnD,OAAO,EACL,cAAc,EAAE,YAAY,EAAE,UAAU,EAAE,kBAAkB,
|
|
1
|
+
{"version":3,"file":"wallet.js","sourceRoot":"","sources":["../../../../../src/client/session/decorators/wallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,7 +49,7 @@ function transactionToMessage(transaction) {
|
|
|
49
49
|
paymaster: paymaster ? BigInt(paymaster) : 0n,
|
|
50
50
|
nonce: nonce ? BigInt(nonce) : 0n,
|
|
51
51
|
value: value ?? 0n,
|
|
52
|
-
data: data ? data : "
|
|
52
|
+
data: data ? data : "0x",
|
|
53
53
|
factoryDeps: factoryDeps?.map((dep) => toHex(hashBytecode(dep))) ?? [],
|
|
54
54
|
paymasterInput: paymasterInput ? paymasterInput : "0x",
|
|
55
55
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getEip712Domain.js","sourceRoot":"","sources":["../../../../src/client/utils/getEip712Domain.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAuB,YAAY,EAAsH,MAAM,aAAa,CAAC;AAEpL,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAEvE,MAAM,oBAAoB,GAAG,MAAM,CAAC;AAEpC,6HAA6H;AAC7H,MAAM,CAAC,MAAM,eAAe,GAGxB,CAAC,WAAW,EAAE,EAAE;IAClB,uBAAuB,CAAC,WAAW,CAAC,CAAC;IAErC,MAAM,OAAO,GAAG,oBAAoB,CAClC,WAAkD,CACnD,CAAC;IAEF,OAAO;QACL,MAAM,EAAE;YACN,uBAAuB;YACvB,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,GAAG;YACZ,OAAO,EAAE,WAAW,CAAC,OAAO;SAC7B;QACD,KAAK,EAAE;YACL,WAAW,EAAE;gBACX,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE;gBACnC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE;gBACjC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE;gBAC/B,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE;gBACrC,EAAE,IAAI,EAAE,wBAAwB,EAAE,IAAI,EAAE,SAAS,EAAE;gBACnD,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE;gBACzC,EAAE,IAAI,EAAE,sBAAsB,EAAE,IAAI,EAAE,SAAS,EAAE;gBACjD,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE;gBACtC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;gBAClC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;gBAClC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE;gBAC/B,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,WAAW,EAAE;gBAC1C,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,OAAO,EAAE;aAC1C;SACF;QACD,WAAW,EAAE,aAAa;QAC1B,OAAO,EAAE,OAAO;KACjB,CAAC;AACJ,CAAC,CAAC;AAEF,8EAA8E;AAC9E,YAAY;AAEZ,SAAS,oBAAoB,CAC3B,WAAgD;IAEhD,MAAM,EACJ,GAAG,EACH,KAAK,EACL,EAAE,EACF,IAAI,EACJ,KAAK,EACL,YAAY,EACZ,oBAAoB,EACpB,WAAW,EACX,SAAS,EACT,cAAc,EACd,aAAa,EACb,IAAI,GACL,GAAG,WAAW,CAAC;IAEhB,OAAO;QACL,MAAM,EAAE,IAAI;QACZ,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC;QAClB,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE;QACxB,QAAQ,EAAE,GAAG,IAAI,EAAE;QACnB,sBAAsB,EAAE,aAAa,IAAI,oBAAoB;QAC7D,YAAY,EAAE,YAAY,IAAI,EAAE;QAChC,oBAAoB,EAAE,oBAAoB,IAAI,EAAE;QAChD,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE;QAC7C,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;QACjC,KAAK,EAAE,KAAK,IAAI,EAAE;QAClB,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"getEip712Domain.js","sourceRoot":"","sources":["../../../../src/client/utils/getEip712Domain.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { getTransactionWithPaymasterData } from "../paymaster/index.js";
|
|
|
4
4
|
import { StorageItem } from "../utils/storage.js";
|
|
5
5
|
import { parseSessionConfigJSON } from "./session/utils.js";
|
|
6
6
|
export class Signer {
|
|
7
|
-
constructor({ metadata, communicator, updateListener, session, chains, transports, paymasterHandler }) {
|
|
7
|
+
constructor({ metadata, communicator, updateListener, session, chains, transports, paymasterHandler, onSessionStateChange, skipPreTransactionStateValidation }) {
|
|
8
8
|
Object.defineProperty(this, "getMetadata", {
|
|
9
9
|
enumerable: true,
|
|
10
10
|
configurable: true,
|
|
@@ -47,6 +47,18 @@ export class Signer {
|
|
|
47
47
|
writable: true,
|
|
48
48
|
value: void 0
|
|
49
49
|
});
|
|
50
|
+
Object.defineProperty(this, "onSessionStateChange", {
|
|
51
|
+
enumerable: true,
|
|
52
|
+
configurable: true,
|
|
53
|
+
writable: true,
|
|
54
|
+
value: void 0
|
|
55
|
+
});
|
|
56
|
+
Object.defineProperty(this, "skipPreTransactionStateValidation", {
|
|
57
|
+
enumerable: true,
|
|
58
|
+
configurable: true,
|
|
59
|
+
writable: true,
|
|
60
|
+
value: void 0
|
|
61
|
+
});
|
|
50
62
|
Object.defineProperty(this, "_account", {
|
|
51
63
|
enumerable: true,
|
|
52
64
|
configurable: true,
|
|
@@ -83,6 +95,8 @@ export class Signer {
|
|
|
83
95
|
this.chains = chains;
|
|
84
96
|
this.transports = transports || {};
|
|
85
97
|
this.paymasterHandler = paymasterHandler;
|
|
98
|
+
this.onSessionStateChange = onSessionStateChange;
|
|
99
|
+
this.skipPreTransactionStateValidation = skipPreTransactionStateValidation;
|
|
86
100
|
this._account = new StorageItem(StorageItem.scopedStorageKey("account"), null, {
|
|
87
101
|
onChange: (newValue) => {
|
|
88
102
|
if (newValue) {
|
|
@@ -153,6 +167,16 @@ export class Signer {
|
|
|
153
167
|
chain,
|
|
154
168
|
transport: this.transports[chain.id] || http(),
|
|
155
169
|
paymasterHandler: this.paymasterHandler,
|
|
170
|
+
onSessionStateChange: (event) => {
|
|
171
|
+
if (!this.onSessionStateChange)
|
|
172
|
+
return;
|
|
173
|
+
this.onSessionStateChange({
|
|
174
|
+
state: event,
|
|
175
|
+
address: this.account.address,
|
|
176
|
+
chainId: chain.id,
|
|
177
|
+
});
|
|
178
|
+
},
|
|
179
|
+
skipPreTransactionStateValidation: this.skipPreTransactionStateValidation,
|
|
156
180
|
}),
|
|
157
181
|
};
|
|
158
182
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Signer.js","sourceRoot":"","sources":["../../../src/client-auth-server/Signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,kBAAkB,EAAE,MAAM,EAAa,IAAI,EAAyG,MAAM,MAAM,CAAC;AAGpM,OAAO,EAAE,yBAAyB,EAA+B,MAAM,oBAAoB,CAAC;AAE5F,OAAO,EAA+B,+BAA+B,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"Signer.js","sourceRoot":"","sources":["../../../src/client-auth-server/Signer.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ import {} from "./rpc.js";
|
|
|
7
7
|
import { Signer } from "./Signer.js";
|
|
8
8
|
const DEFAULT_AUTH_SERVER_URL = "https://auth-test.zksync.dev/confirm";
|
|
9
9
|
export class WalletProvider extends EventEmitter {
|
|
10
|
-
constructor({ metadata, chains, transports, session, authServerUrl, paymasterHandler }) {
|
|
10
|
+
constructor({ metadata, chains, transports, session, authServerUrl, paymasterHandler, onSessionStateChange, skipPreTransactionStateValidation }) {
|
|
11
11
|
super();
|
|
12
12
|
Object.defineProperty(this, "isZksyncSso", {
|
|
13
13
|
enumerable: true,
|
|
@@ -47,6 +47,8 @@ export class WalletProvider extends EventEmitter {
|
|
|
47
47
|
transports,
|
|
48
48
|
session: typeof session === "object" ? () => session : session,
|
|
49
49
|
paymasterHandler,
|
|
50
|
+
onSessionStateChange,
|
|
51
|
+
skipPreTransactionStateValidation,
|
|
50
52
|
});
|
|
51
53
|
}
|
|
52
54
|
get chain() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WalletProvider.js","sourceRoot":"","sources":["../../../src/client-auth-server/WalletProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAE7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpE,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"WalletProvider.js","sourceRoot":"","sources":["../../../src/client-auth-server/WalletProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,4 +37,28 @@ export function noThrow(fn) {
|
|
|
37
37
|
return null;
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
|
+
export function findSmallestBigInt(arr) {
|
|
41
|
+
if (arr.length === 0)
|
|
42
|
+
throw new Error("Array must not be empty");
|
|
43
|
+
let smallest = arr[0];
|
|
44
|
+
for (const num of arr) {
|
|
45
|
+
if (num < smallest)
|
|
46
|
+
smallest = num;
|
|
47
|
+
}
|
|
48
|
+
return smallest;
|
|
49
|
+
}
|
|
50
|
+
export function calculateMaxFee(fee) {
|
|
51
|
+
if (!fee.gas)
|
|
52
|
+
return 0n;
|
|
53
|
+
if (fee.gasPrice) {
|
|
54
|
+
return fee.gas * fee.gasPrice;
|
|
55
|
+
}
|
|
56
|
+
else if (fee.maxFeePerGas) {
|
|
57
|
+
return fee.gas * fee.maxFeePerGas;
|
|
58
|
+
}
|
|
59
|
+
else if (fee.maxPriorityFeePerGas) {
|
|
60
|
+
return fee.gas * fee.maxPriorityFeePerGas;
|
|
61
|
+
}
|
|
62
|
+
return 0n;
|
|
63
|
+
}
|
|
40
64
|
//# sourceMappingURL=helpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/utils/helpers.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,cAAc;IAC5B,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC;IACjC,IAAI,CAAC,SAAS;QAAE,OAAO,IAAI,CAAC;IAE5B,MAAM,UAAU,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IAEvD,iDAAiD;IACjD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACzC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,OAAO,KAAK,CAAC,CAAC,CAAE,CAAC,IAAI,EAAE,CAAC;QAC1B,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC,IAAI,EAAE,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,UAAU;IACxB,MAAM,EAAE,GAAG,QAAQ,CAAC,aAAa,CAC/B,mGAAmG,CACpG,CAAC;IACF,MAAM,IAAI,GAAG,EAAE,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IACtC,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IAEvB,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAClD,iEAAiE;QACjE,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ,IAAI,GAAG,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;YAC1D,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,GAAG,CAAC,IAAI,CAAC;IAClB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,UAAU,OAAO,CAAI,EAAW;IACpC,IAAI,CAAC;QACH,OAAO,EAAE,EAAE,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/utils/helpers.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,cAAc;IAC5B,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC;IACjC,IAAI,CAAC,SAAS;QAAE,OAAO,IAAI,CAAC;IAE5B,MAAM,UAAU,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IAEvD,iDAAiD;IACjD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACzC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,OAAO,KAAK,CAAC,CAAC,CAAE,CAAC,IAAI,EAAE,CAAC;QAC1B,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC,IAAI,EAAE,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,UAAU;IACxB,MAAM,EAAE,GAAG,QAAQ,CAAC,aAAa,CAC/B,mGAAmG,CACpG,CAAC;IACF,MAAM,IAAI,GAAG,EAAE,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IACtC,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IAEvB,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAClD,iEAAiE;QACjE,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ,IAAI,GAAG,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;YAC1D,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,GAAG,CAAC,IAAI,CAAC;IAClB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,UAAU,OAAO,CAAI,EAAW;IACpC,IAAI,CAAC;QACH,OAAO,EAAE,EAAE,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,GAAa;IAC9C,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IACjE,IAAI,QAAQ,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;IACtB,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;QACtB,IAAI,GAAG,GAAG,QAAQ;YAAE,QAAQ,GAAG,GAAG,CAAC;IACrC,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,GAK/B;IACC,IAAI,CAAC,GAAG,CAAC,GAAG;QAAE,OAAO,EAAE,CAAC;IAExB,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;QACjB,OAAO,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,QAAQ,CAAC;IAChC,CAAC;SAAM,IAAI,GAAG,CAAC,YAAY,EAAE,CAAC;QAC5B,OAAO,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,YAAY,CAAC;IACpC,CAAC;SAAM,IAAI,GAAG,CAAC,oBAAoB,EAAE,CAAC;QACpC,OAAO,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,oBAAoB,CAAC;IAC5C,CAAC;IAED,OAAO,EAAE,CAAC;AACZ,CAAC"}
|