@aastar/sdk 0.20.4 → 0.20.6

package/README.md

@@ -36,7 +36,10 @@ AAstar SDK 提供了一套完整的工具集用于交互 AAstar 协议。它采
 | `@aastar/sdk/x402` | x402 settlement (x402 结算) |
 | `@aastar/sdk/channel` | Micro-payment channels (微支付通道) |
 | `@aastar/sdk/enduser` · `/operator` · `/admin` | Role lifecycle workflows (角色生命周期) |
-| `@aastar/sdk/airaccount` | KMS WebAuthn passkeys, BLS aggregate signatures, tiered ERC-4337 accounts (Passkey + BLS + 分层签名) |
+| `@aastar/sdk/kms` | KMS WebAuthn passkeys, BLS aggregate signatures, tiered ERC-4337 accounts (Passkey + BLS + 分层签名) |
+
+> 🔄 The `@aastar/sdk/airaccount` subpath is **deprecated** — it still works as an alias of `@aastar/sdk/kms` for one release. Please migrate to `@aastar/sdk/kms`.
+> `@aastar/sdk/airaccount` 子路径已**废弃**，作为 `@aastar/sdk/kms` 的别名再保留一个版本，请尽快迁移到 `@aastar/sdk/kms`。
 
 > ⚠️ **`react` / `react-dom` are optional peer deps.** They're only needed for the `@aastar/sdk/dapp`
 > subpath. The root `import '@aastar/sdk'` and all non-UI subpaths work in Node/server with no React.
@@ -47,16 +50,16 @@ AAstar SDK 提供了一套完整的工具集用于交互 AAstar 协议。它采
 ## 📦 Installation | 安装
 
 ```bash
-pnpm add @aastar/sdk viem ethers
+pnpm add @aastar/sdk viem
 # or
-npm install @aastar/sdk viem ethers
+npm install @aastar/sdk viem
 
 # Only if you use the React UI subpath (@aastar/sdk/dapp):
 pnpm add react react-dom
 ```
 
-> AirAccount / KMS / BLS features are included — no separate install. Import them from `@aastar/sdk/airaccount`.
-> AirAccount / KMS / BLS 能力已内置，无需单独安装，从 `@aastar/sdk/airaccount` 导入即可。
+> You only need `@aastar/sdk` + `viem` — all transitive deps install automatically. KMS / WebAuthn / BLS features are bundled in — no separate install. Import them from `@aastar/sdk/kms`.
+> 只需安装 `@aastar/sdk` + `viem`，其余依赖自动带入。KMS / WebAuthn / BLS 能力已内置，无需单独安装，从 `@aastar/sdk/kms` 导入即可。
 
 ### Importing | 导入方式
 
@@ -66,7 +69,7 @@ import { createEndUserClient, createOperatorClient, CANONICAL_ADDRESSES } from '
 
 // …or cherry-pick from a subpath to keep bundles lean:
 import { registryActions } from '@aastar/sdk/core';
-import { KmsManager, P256PasskeySigner } from '@aastar/sdk/airaccount';
+import { KmsManager, P256PasskeySigner } from '@aastar/sdk/kms';
 import { useGasless } from '@aastar/sdk/dapp'; // requires react
 ```
 
@@ -74,37 +77,43 @@ import { useGasless } from '@aastar/sdk/dapp'; // requires react
 
 ## 🌐 Multi-chain | 多链配置
 
-Contract addresses are keyed by **chainId** in `CANONICAL_ADDRESSES`, so switching chains means
-switching the viem `chain` + `transport` and passing the matching address set.
-合约地址在 `CANONICAL_ADDRESSES` 中按 **chainId** 分组，切链 = 切换 viem `chain` + `transport` 并传入对应链的地址集。
+**Switching chains is seamless — just pass a viem `chain`.** Contract addresses are auto-resolved
+from `chain.id`, so you never hardcode addresses or memorize chainIds. Use the exact chain objects
+from `viem/chains`.
+切链是无感的——**只需传入一个 viem `chain`**，合约地址会根据 `chain.id` 自动解析，无需手写地址、无需记 chainId。直接用 `viem/chains` 里的链对象即可。
 
-| Network | chainId | Status |
-|---|---|---|
-| Optimism (mainnet) | `10` | ✅ deployed |
-| Sepolia (testnet) | `11155111` | ✅ deployed (primary test target) |
-| OP Sepolia (testnet) | `11155420` | ✅ deployed |
-| Ethereum mainnet | `1` | ⏳ not yet deployed |
+| Network | viem chain | chainId | Status |
+|---|---|---|---|
+| Optimism (mainnet) | `optimism` | `10` | ✅ deployed |
+| Sepolia (testnet) | `sepolia` | `11155111` | ✅ deployed (primary test target) |
+| OP Sepolia (testnet) | `optimismSepolia` | `11155420` | ✅ deployed |
+| Ethereum mainnet | `mainnet` | `1` | ⏳ not yet deployed |
 
 ```typescript
-import { createEndUserClient, CANONICAL_ADDRESSES } from '@aastar/sdk';
+import { createEndUserClient } from '@aastar/sdk';
 import { sepolia, optimism } from 'viem/chains';
 import { http } from 'viem';
 
-// Sepolia testnet
+// Sepolia testnet — addresses auto-resolved from sepolia.id
 const test = createEndUserClient({
   chain: sepolia,
   transport: http(process.env.SEPOLIA_RPC_URL),
-  addresses: CANONICAL_ADDRESSES[11155111],
 });
 
-// Optimism mainnet — same code, just swap chain + transport + address set
+// Optimism mainnet — same code, just swap chain + transport
 const prod = createEndUserClient({
   chain: optimism,
   transport: http('https://mainnet.optimism.io'),
-  addresses: CANONICAL_ADDRESSES[10],
 });
 ```
 
+- **Unsupported chain?** If you pass a chain that has no deployment yet (e.g. `mainnet`) and no
+  explicit `addresses`, the factory throws a clear error naming the supported chains — no silent
+  misconfiguration.
+- **Custom / private deployment?** Override per-call with `addresses: { ... }` (or `CANONICAL_ADDRESSES[chainId]`
+  to start from a known set); the explicit value always wins over auto-resolution.
+- 未部署的链（如 `mainnet`）且未显式传 `addresses` 时，工厂会抛出列明受支持链的清晰报错；自定义部署可通过 `addresses` 覆盖，显式值优先。
+
 Helpers for RPC URLs and explorer links live in `@aastar/sdk` too:
 `getNetwork(name)`, `getRpcUrl(name)`, `getChainId(name)`, `getTxUrl(name, hash)`, `getAddressUrl(name, addr)`.
 
@@ -131,23 +140,22 @@ Helpers for RPC URLs and explorer links live in `@aastar/sdk` too:
 import { http } from 'viem';
 import { privateKeyToAccount } from 'viem/accounts';
 import { sepolia } from 'viem/chains';
-import { createEndUserClient, createOperatorClient, CANONICAL_ADDRESSES } from '@aastar/sdk';
+import { createEndUserClient, createOperatorClient } from '@aastar/sdk';
 
 const account = privateKeyToAccount(process.env.PRIVATE_KEY as `0x${string}`);
 
 // Role-based clients compose viem action factories under the hood.
+// Addresses auto-resolve from chain.id — no `addresses` needed for supported chains.
 const enduser = createEndUserClient({
   chain: sepolia,
   transport: http(process.env.SEPOLIA_RPC_URL),
   account,
-  addresses: CANONICAL_ADDRESSES[11155111],
 });
 
 const operator = createOperatorClient({
   chain: sepolia,
   transport: http(process.env.SEPOLIA_RPC_URL),
   account,
-  addresses: CANONICAL_ADDRESSES[11155111],
 });
 ```
 
@@ -237,7 +245,7 @@ All capabilities are bundled into `@aastar/sdk`; the table below maps each forme
 | `@aastar/sdk/identity` | Reputation, Credit limits, ZK Proofs |
 | `@aastar/sdk/paymaster` | EntryPoint & Paymaster low-level API |
 | `@aastar/sdk/dapp` | React Components & Integration Hooks (needs `react`) |
-| `@aastar/sdk/airaccount` | KMS WebAuthn, BLS Signatures, ERC-4337 Tiered Accounts |
+| `@aastar/sdk/kms` | KMS WebAuthn, BLS Signatures, ERC-4337 Tiered Accounts (`/airaccount` = deprecated alias) |
 
 ---
 

package/dist/BaseClient-BjbYP0cf.d.ts

@@ -0,0 +1,88 @@
+import { Address, Account } from 'viem';
+import { W as WalletClient, P as PublicClient } from './doc-types-471vSmPO.js';
+
+/**
+ * Base configuration for all L2 Business Clients
+ */
+interface ClientConfig {
+    /**
+     * Viem WalletClient for write operations.
+     * Must have an account attached.
+     */
+    client: WalletClient;
+    /**
+     * Optional PublicClient for read operations.
+     * If not provided, one will be derived from the WalletClient or created internally if possible (but usually explicit is better).
+     * Currently L1 actions use PublicClient | WalletClient, so WalletClient is enough for both if it has a provider.
+     * However, explicitly accepting PublicClient encourages separation.
+     */
+    publicClient?: PublicClient;
+    /**
+     * Registry contract address.
+     * Essential for looking up other contracts if not provided explicitly.
+     */
+    registryAddress?: Address;
+    /**
+     * GToken contract address.
+     * Required for operations involving token approvals and transfers.
+     */
+    gTokenAddress?: Address;
+    /**
+     * GTokenStaking contract address.
+     * Required for role registration that involves staking.
+     */
+    gTokenStakingAddress?: Address;
+    /**
+     * PaymasterFactory contract address.
+     * Required for deploying new PaymasterV4 instances.
+     */
+    paymasterFactoryAddress?: Address;
+    xpntsFactoryAddress?: Address;
+    ethUsdPriceFeedAddress?: Address;
+    entryPointAddress?: Address;
+}
+/**
+ * Common options for transaction methods
+ */
+interface TransactionOptions {
+    /**
+     * Override the account to use for the transaction.
+     * If not provided, uses the account from the WalletClient.
+     */
+    account?: Account | Address;
+    /**
+     * Optional value to send with the transaction (in wei)
+     */
+    value?: bigint;
+}
+/**
+ * Generic result wrapper for business operations
+ * Currently just returns the type directly, but can be expanded for metadata.
+ */
+type BusinessResult<T> = Promise<T>;
+
+declare abstract class BaseClient {
+    client: WalletClient;
+    publicClient?: PublicClient;
+    protected registryAddress?: Address;
+    protected gTokenAddress?: Address;
+    protected gTokenStakingAddress?: Address;
+    protected paymasterFactoryAddress?: Address;
+    protected entryPointAddress?: Address;
+    constructor(config: ClientConfig);
+    /**
+     * Get the account address of the connected wallet
+     */
+    getAddress(): Address;
+    /**
+     * Helper to ensure public client exists or fallback to wallet client (if it supports read)
+     */
+    getStartPublicClient(): PublicClient | WalletClient;
+    protected requireRegistry(): Address;
+    protected requireGToken(): Address;
+    protected requireGTokenStaking(): Address;
+    protected requirePaymasterFactory(): Address;
+    protected requireEntryPoint(): Address;
+}
+
+export { type BusinessResult as B, type ClientConfig as C, type TransactionOptions as T, BaseClient as a };

package/dist/UserClient-AIIHB54I.js

@@ -0,0 +1,6 @@
+export { UserClient } from './chunk-PAABYXS6.js';
+import './chunk-6QYXGMCR.js';
+import './chunk-G3UJC4EL.js';
+import './chunk-PZ5AY32C.js';
+//# sourceMappingURL=UserClient-AIIHB54I.js.map
+//# sourceMappingURL=UserClient-AIIHB54I.js.map

package/dist/{UserClient-JMNNZT4P.js.map → UserClient-AIIHB54I.js.map}

@@ -1 +1 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"UserClient-JMNNZT4P.js"}
+{"version":3,"sources":[],"names":[],"mappings":"","file":"UserClient-AIIHB54I.js"}

package/dist/account.d.ts

@@ -1 +1,48 @@
-export * from '@aastar/account';
+import { WalletClient, Address, Hex, Hash, Chain, Transport, LocalAccount } from 'viem';
+
+type EOAWalletClient = WalletClient & {
+    sendTransaction: (args: {
+        to: Address;
+        value?: bigint;
+        data?: Hex;
+    }) => Promise<Hash>;
+    getAddress: () => Address;
+};
+declare const createEOAWalletClient: (privateKey: Hex, chain: Chain, transport?: Transport) => EOAWalletClient;
+
+type SimpleSmartAccount = LocalAccount & {
+    signUserOperation: (userOp: any) => Promise<Hex>;
+    getInitCode: () => Promise<Hex>;
+    getDummySignature: () => Promise<Hex>;
+    entryPoint: Address;
+};
+declare function toSimpleSmartAccount(parameters: {
+    client: any;
+    owner: LocalAccount;
+    factoryAddress: Address;
+    entryPoint: {
+        address: Address;
+        version: '0.6' | '0.7';
+    };
+    salt?: bigint;
+    index?: bigint;
+}): Promise<SimpleSmartAccount>;
+
+/**
+ * Common Pack Logic for v0.7 UserOperations
+ */
+declare function packUserOpLimits(high: bigint, low: bigint): Hex;
+/**
+ * Local implementation of EntryPoint v0.7 getUserOpHash
+ */
+declare function getUserOpHash(op: any, ep: Address, chainId: number): Hex;
+/**
+ * UserOperation Client for handling high-level flows
+ */
+declare class UserOpClient {
+    static estimateGas(bundler: any, op: any, entryPoint: Address): Promise<any>;
+    static sendUserOp(bundler: any, op: any, entryPoint: Address): Promise<any>;
+    static getReceipt(bundler: any, hash: Hex): Promise<any>;
+}
+
+export { type EOAWalletClient, type SimpleSmartAccount, UserOpClient, createEOAWalletClient, getUserOpHash, packUserOpLimits, toSimpleSmartAccount };

package/dist/account.js

@@ -1,6 +1,6 @@
-export { UserOpClient, createEOAWalletClient, getUserOpHash, packUserOpLimits, toSimpleSmartAccount } from './chunk-YSDWB6DO.js';
-import './chunk-TBDMSJVL.js';
-import './chunk-ZJLIKMCA.js';
+export { UserOpClient, createEOAWalletClient, getUserOpHash, packUserOpLimits, toSimpleSmartAccount } from './chunk-4EZD7LPE.js';
+import './chunk-6QYXGMCR.js';
+import './chunk-G3UJC4EL.js';
 import './chunk-PZ5AY32C.js';
 //# sourceMappingURL=account.js.map
 //# sourceMappingURL=account.js.map

package/dist/admin.d.ts

@@ -1 +1,62 @@
-export * from '@aastar/admin';
+import { Address, Hash, Hex } from 'viem';
+import { a as BaseClient, C as ClientConfig, T as TransactionOptions } from './BaseClient-BjbYP0cf.js';
+import './doc-types-471vSmPO.js';
+
+interface ProtocolParams {
+    minStake: bigint;
+    treasury: Address;
+    entryPoint: Address;
+    superPaymaster: Address;
+}
+/**
+ * ProtocolGovernance - L3 Pattern
+ *
+ * Responsibilities:
+ * 1. Global Protocol Parameter Management (Registry, EntryPoint)
+ * 2. High-level Governance Operations (DAO Transfer, Upgrades)
+ * 3. SuperPaymaster & Module Approval
+ */
+declare class ProtocolGovernance extends BaseClient {
+    registryAddress: Address;
+    entryPointAddress: Address;
+    constructor(config: ClientConfig & {
+        registryAddress: Address;
+        entryPointAddress: Address;
+    });
+    /**
+     * Update the Global Treasury Address where protocol fees are collected
+     */
+    setTreasury(treasury: Address, options?: TransactionOptions): Promise<Hash>;
+    /**
+     * Update the supported EntryPoint address
+     */
+    updateEntryPoint(entryPoint: Address, options?: TransactionOptions): Promise<Hash>;
+    /**
+     * Approve a new SuperPaymaster contract address
+     */
+    setSuperPaymaster(paymaster: Address, options?: TransactionOptions): Promise<Hash>;
+    /**
+     * Set the Staking contract address
+     */
+    setStaking(staking: Address, options?: TransactionOptions): Promise<Hash>;
+    /**
+     * Configure a Role's parameters (Admin only).
+     * Reads the current on-chain config first, then merges the provided overrides
+     * and writes back the full struct via configureRole.
+     */
+    configureRole(params: {
+        roleId: Hex;
+        minStake?: bigint;
+        ticketPrice?: bigint;
+        exitFeePercent?: bigint;
+        minExitFee?: bigint;
+    }, options?: TransactionOptions): Promise<Hash>;
+    /**
+     * Transfer Protocol Ownership to a DAO (Multisig/Timelock)
+     * This is the final step of "Protocol Admin" lifecycle.
+     */
+    transferToDAO(daoAddress: Address, options?: TransactionOptions): Promise<Hash>;
+    getProtocolParams(): Promise<ProtocolParams>;
+}
+
+export { ProtocolGovernance, type ProtocolParams };

package/dist/admin.js

@@ -1,6 +1,6 @@
-export { ProtocolGovernance } from './chunk-5TDDS3T5.js';
-import './chunk-TBDMSJVL.js';
-import './chunk-ZJLIKMCA.js';
+export { ProtocolGovernance } from './chunk-FJ7XECC5.js';
+import './chunk-6QYXGMCR.js';
+import './chunk-G3UJC4EL.js';
 import './chunk-PZ5AY32C.js';
 //# sourceMappingURL=admin.js.map
 //# sourceMappingURL=admin.js.map

package/dist/airaccount.d.ts

@@ -1,2 +1,4 @@
-export * from '@aastar/airaccount/server';
-export * from '@aastar/airaccount';
+export { ACCOUNT_ABI, AGENT_SESSION_KEY_VALIDATOR_ABI, AIRACCOUNT_ABI, AIRACCOUNT_ADDRESSES, AIRACCOUNT_FACTORY_ABI, AIR_ACCOUNT_COMPOSITE_VALIDATOR_ABI, AIR_ACCOUNT_DELEGATE_ABI, AIR_ACCOUNT_DELEGATE_ADDRESS, ALG_ID, AccountManager, AccountRecord, ActiveRecovery, AgentRegistryService, AgentReputationSummary, AgentSessionConfig, AgentSessionInfo, AirAccountVersion, BLSSignatureService, BeginCeremonyResponse, BindERC8004AgentWalletParams, BlsConfigRecord, BuildCredentialOptions, CALLDATA_PARSER_REGISTRY_ABI, ConsoleLogger, CreateAgentAccountParams, CreateP256SessionKeyRequest, CreateP256SessionKeyResponse, DEFAULT_CREDENTIAL_ID, DEFAULT_KMS_ENDPOINT, DEFAULT_ORIGIN, DEFAULT_RP_ID, DelegateInitParams, DvtPendingConfirmationError, EIP7702Authorization, EIP7702DelegateService, ENTRYPOINT_ABI_V6, ENTRYPOINT_ABI_V7_V8, ENTRYPOINT_ADDRESSES, ERC20_ABI, ERC8004Service, ERC8004_ADDRESSES, EXECUTE_BATCH_SELECTOR, EXECUTE_SELECTOR, EXECUTE_USER_OP_SELECTOR, EntryPointConfig, EntryPointVersion, EntryPointVersionConfig, EstimateGasParams, EthereumProvider, ExecuteTransferParams, FACTORY_ABI_V6, FACTORY_ABI_V7_V8, FORCE_EXIT_MODULE_ABI, ForceExitService, GLOBAL_GUARD_ABI, GrantP256SessionParams, GrantSessionParams, GuardChecker, GuardState, GuardStateReader, ILogger, ISignerAdapter, IStorageAdapter, InstallModuleParams, KmsAgentService, KmsAttestationManifestResponse, KmsAttestationProofResponse, KmsAttestationResponse, KmsBeginAuthenticationRequest, KmsBeginAuthenticationResponse, KmsBeginGrantSessionAuthRequest, KmsBeginGrantSessionAuthResponse, KmsBeginRegistrationRequest, KmsBeginRegistrationResponse, KmsChangePasskeyResponse, KmsCompleteRegistrationRequest, KmsCompleteRegistrationResponse, KmsCreateAgentKeyRequest, KmsCreateAgentKeyResponse, KmsCreateKeyRequest, KmsCreateKeyResponse, KmsDeleteKeyResponse, KmsDeriveAddressResponse, KmsDescribeKeyResponse, KmsEip712Domain, KmsEip712FieldValue, KmsEip712TypeDef, KmsEthereumTransaction, KmsGetPublicKeyResponse, KmsHealthResponse, KmsHttpClient, KmsHttpClientOptions, KmsKeyStatusResponse, KmsListKeysResponse, KmsManager, KmsMonitorService, KmsPaymentAuth, KmsPaymentSignatureResponse, KmsPaymentSigner, KmsPurgeKeyResponse, KmsQueueStatusResponse, KmsRefreshAgentCredentialRequest, KmsRefreshAgentCredentialResponse, KmsRevokeAgentCredentialRequest, KmsRevokeAgentCredentialResponse, KmsRollbackCounterResponse, KmsSessionService, KmsSignAgentRequest, KmsSignAgentResponse, KmsSignGTokenAuthorizationRequest, KmsSignGrantSessionRequest, KmsSignGrantSessionResponse, KmsSignHashResponse, KmsSignMicropaymentVoucherRequest, KmsSignP256GrantSessionRequest, KmsSignRequest, KmsSignResponse, KmsSignTypedDataRequest, KmsSignTypedDataResponse, KmsSignX402PaymentRequest, KmsSigner, KmsStatsResponse, KmsVersionResponse, L2Type, L2_TYPE, LegacyPasskeyAssertion, LocalWalletSigner, MAX_GUARDIANS, MODULE_TYPE, MemoryStorage, MintAgentIdentityParams, ModuleManager, ModuleTypeId, OapdConfig, P256PasskeySigner, PasskeyAssertionContext, PasskeyCeremonySigner, PaymasterManager, PaymasterPriceStalenessError, PaymasterRecord, PendingExit, PendingWeightChange, QueryAgentReputationParams, RECOVERY_THRESHOLD, RECOVERY_TIMELOCK_SECONDS, RecoveryService, RevokeP256SessionKeyRequest, RevokeP256SessionKeyResponse, RunCeremonyOptions, SESSION_KEY_VALIDATOR_ABI, ServerConfig, SessionInfo, SessionKeyService, SetAgentWalletParams, SignP256UserOpRequest, SignP256UserOpResponse, SilentLogger, SubmitAgentReputationParams, TIER_GUARD_HOOK_ABI, TokenBalance, TokenGuardState, TokenInfo, TokenService, TransferManager, TransferRecord, TransferResult, UninstallModuleParams, VALIDATOR_ABI, WEIGHT_CHANGE_EXPIRY_SECONDS, WEIGHT_CHANGE_THRESHOLD, WEIGHT_CHANGE_TIMELOCK_SECONDS, WalletManager, WebAuthnAssertion, WebAuthnAuthenticationCredential, WeightConfig, WeightedSignatureService, YAAAServerClient, base64UrlDecode, base64UrlEncode, beginAuthenticationChallenge, beginGrantSessionChallenge, buildAuthenticationCredential, buildAuthenticatorData, buildClientDataJSON, buildInstallModuleHash, buildUninstallModuleHash, computeOapdSalt, erc8004AddressesForChain, getOapdAddress, getOapdAddressWithChainId, isExecuteUserOpWrapped, isOapdDeployed, isPendingConfirmation, packP256SessionSignature, packSecp256k1SessionSignature, runAuthenticationCeremony, runGrantSessionCeremony, runWebAuthnCeremony, sepoliaV07Config, validateConfig, wrapExecuteUserOp } from './kms.js';
+export { A as ALG_BLS, a as ALG_CUMULATIVE_T2, b as ALG_CUMULATIVE_T3, c as ALG_ECDSA, d as ALG_P256, e as AlgId, B as BLSConfig, f as BLSManager, g as BLSNode, h as BLSSignatureData, i as BeginAuthenticationResponse, j as BeginRegistrationResponse, k as BeginTransactionVerificationResponse, C as CryptoUtil, l as CumulativeT2SignatureData, m as CumulativeT3SignatureData, E as ERC4337Utils, G as GasEstimate, n as GuardStatus, P as PackedUserOperation, o as PasskeyAuthenticationParams, p as PasskeyInfo, q as PasskeyManager, r as PasskeyRegistrationParams, s as PreCheckResult, T as TierConfig, t as TierLevel, u as TransactionVerificationParams, U as UserOpBuilder, v as UserOperation, Y as YAAAClient, w as YAAAConfig, x as algIdForTier, y as resolveTier } from './tier-router-DLiMxs0h.js';
+import 'ethers';
+import 'axios';