@ar.io/sdk 2.6.0 → 2.7.0-alpha.1

package/lib/esm/common/io.js

@@ -380,13 +380,7 @@ export class IOReadable {
         });
     }
     async getAllowedDelegates(params) {
-        return this.process.read({
-            tags: [
-                { name: 'Action', value: 'Paginated-Allowed-Delegates' },
-                { name: 'Address', value: params.address },
-                ...paginationParamsToTags(params),
-            ],
-        });
+        return this.getGatewayDelegateAllowList(params);
     }
     async getGatewayVaults(params) {
         return this.process.read({
@@ -674,6 +668,7 @@ export class IOWriteable extends IOReadable {
                 ...tags,
                 { name: 'Action', value: 'Decrease-Operator-Stake' },
                 { name: 'Quantity', value: params.decreaseQty.valueOf().toString() },
+                { name: 'Instant', value: `${params.instant || false}` },
             ],
         });
     }

package/lib/esm/types/io.js

@@ -1,4 +1,15 @@
 import { validateArweaveId } from '../utils/arweave.js';
+export const validIntents = [
+    'Buy-Record',
+    'Extend-Lease',
+    'Increase-Undername-Limit',
+    'Upgrade-Name',
+    'Primary-Name-Request',
+];
+export const intentsUsingYears = ['Buy-Record', 'Extend-Lease'];
+export const isValidIntent = (intent) => {
+    return validIntents.indexOf(intent) !== -1;
+};
 // Typeguard functions
 export function isProcessConfiguration(config) {
     return 'process' in config;

package/lib/esm/utils/ao.js

@@ -20,14 +20,6 @@ import { defaultArweave } from '../common/arweave.js';
 import { ANTRegistry, AOProcess, Logger } from '../common/index.js';
 import { ANT_LUA_ID, ANT_REGISTRY_ID, AOS_MODULE_ID, DEFAULT_SCHEDULER_ID, } from '../constants.js';
 export async function spawnANT({ signer, module = AOS_MODULE_ID, luaCodeTxId = ANT_LUA_ID, ao = connect(), scheduler = DEFAULT_SCHEDULER_ID, state, stateContractTxId, antRegistryId = ANT_REGISTRY_ID, logger = Logger.default, arweave = defaultArweave, }) {
-    const registryClient = ANTRegistry.init({
-        process: new AOProcess({
-            processId: antRegistryId,
-            ao,
-            logger,
-        }),
-        signer: signer,
-    });
     //TODO: cache locally and only fetch if not cached
     const luaString = (await arweave.transactions.getData(luaCodeTxId, {
         decode: true,
@@ -62,7 +54,7 @@ export async function spawnANT({ signer, module = AOS_MODULE_ID, luaCodeTxId = A
         data: luaString,
         signer,
     });
-    logger.info(`Spawned ANT`, {
+    logger.debug(`Spawned ANT`, {
         processId,
         module,
         scheduler,
@@ -80,17 +72,25 @@ export async function spawnANT({ signer, module = AOS_MODULE_ID, luaCodeTxId = A
             data: JSON.stringify(state),
             signer,
         });
-        logger.info(`Initialized ANT`, {
+        logger.debug(`Initialized ANT`, {
             processId,
             module,
             scheduler,
             initializeMsgId,
         });
     }
+    const registryClient = ANTRegistry.init({
+        process: new AOProcess({
+            processId: antRegistryId,
+            ao,
+            logger,
+        }),
+        signer: signer,
+    });
     const { id: antRegistrationMsgId } = await registryClient.register({
         processId,
     });
-    logger.info(`Registered ANT to ANT Registry`, {
+    logger.debug(`Registered ANT to ANT Registry`, {
         processId,
         module,
         scheduler,
@@ -119,7 +119,7 @@ export async function evolveANT({ signer, processId, luaCodeTxId = ANT_LUA_ID, a
         data: luaString,
         signer,
     });
-    logger.info(`Evolved ANT`, {
+    logger.debug(`Evolved ANT`, {
         processId,
         luaCodeTxId,
         evalMsgId: evolveMsgId,
@@ -174,3 +174,21 @@ export function createAoSigner(signer) {
     };
     return aoSigner;
 }
+export const defaultTargetManifestId = '-k7t8xMoB8hW482609Z9F4bTFMC3MnuW8bTvTyT8pFI';
+export function initANTStateForAddress({ owner, targetId, ttlSeconds = 3600, keywords = [], controllers = [], description = '', ticker = 'aos', name = 'ANT', }) {
+    return {
+        ticker,
+        name,
+        description,
+        keywords,
+        owner,
+        controllers: [owner, ...controllers],
+        balances: { [owner]: 1 },
+        records: {
+            ['@']: {
+                transactionId: targetId ?? defaultTargetManifestId.toString(),
+                ttlSeconds,
+            },
+        },
+    };
+}

package/lib/esm/utils/base64.js

@@ -44,5 +44,5 @@ export function toB64Url(buffer) {
     return base64urlFromBase64(b64Str);
 }
 export function sha256B64Url(input) {
-    return toB64Url(createHash('sha256').update(input).digest());
+    return toB64Url(createHash('sha256').update(Uint8Array.from(input)).digest());
 }

package/lib/esm/version.js

@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 // AUTOMATICALLY GENERATED FILE - DO NOT TOUCH
-export const version = '2.6.0';
+export const version = '2.7.0-alpha.1';

package/lib/types/cli/cli.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+import './commands/updateGatewaySettings.js';

package/lib/types/cli/commands/gatewayWriteCommands.d.ts

@@ -0,0 +1,38 @@
+import { AddressAndVaultIdCLIWriteOptions, DecreaseDelegateStakeCLIOptions, JoinNetworkCLIOptions, OperatorStakeCLIOptions, RedelegateStakeCLIOptions, TransferCLIOptions, UpdateGatewaySettingsCLIOptions, WriteActionCLIOptions } from '../types.js';
+export declare function joinNetwork(options: JoinNetworkCLIOptions): Promise<{
+    joinNetworkResult: import("../../types/common.js").AoMessageResult;
+    joinedAddress: string;
+    message: string;
+}>;
+export declare function updateGatewaySettings(options: UpdateGatewaySettingsCLIOptions): Promise<{
+    updateGatewaySettingsResult: import("../../types/common.js").AoMessageResult;
+    updatedGatewayAddress: string;
+    message: string;
+}>;
+export declare function leaveNetwork(options: WriteActionCLIOptions): Promise<import("../../types/common.js").AoMessageResult>;
+export declare function saveObservations(o: WriteActionCLIOptions & {
+    failedGateways?: string[];
+    transactionId?: string;
+}): Promise<import("../../types/common.js").AoMessageResult>;
+export declare function increaseOperatorStake(o: OperatorStakeCLIOptions): Promise<import("../../types/common.js").WriteOptions>;
+export declare function decreaseOperatorStake(o: OperatorStakeCLIOptions): Promise<import("../../types/common.js").AoMessageResult>;
+export declare function instantWithdrawal(o: AddressAndVaultIdCLIWriteOptions): Promise<import("../../types/common.js").AoMessageResult>;
+export declare function cancelWithdrawal(o: AddressAndVaultIdCLIWriteOptions): Promise<import("../../types/common.js").AoMessageResult>;
+export declare function delegateStake(options: TransferCLIOptions): Promise<{
+    senderAddress: string;
+    transferResult: import("../../types/common.js").AoMessageResult;
+    message: string;
+} | {
+    message: string;
+}>;
+export declare function decreaseDelegateStake(options: DecreaseDelegateStakeCLIOptions): Promise<{
+    targetGateway: string;
+    decreaseDelegateStakeResult: import("../../types/common.js").AoMessageResult;
+    message: string;
+}>;
+export declare function redelegateStake(options: RedelegateStakeCLIOptions): Promise<{
+    sourceGateway: string;
+    targetGateway: string;
+    redelegateStakeResult: import("../../types/common.js").AoMessageResult;
+    message: string;
+}>;

package/lib/types/cli/commands/readCommands.d.ts

@@ -0,0 +1,57 @@
+import { AddressAndNameCLIOptions, AddressAndVaultIdCLIOptions, AddressCLIOptions, AuctionPricesCLIOptions, EpochCLIOptions, GetTokenCostCLIOptions, NameCLIOptions, PaginationAddressCLIOptions, PaginationCLIOptions } from '../types.js';
+export declare function getGateway(o: AddressCLIOptions): Promise<import("../../types/io.js").AoGateway | {
+    message: string;
+}>;
+export declare function listGateways(o: PaginationCLIOptions): Promise<import("../../types/io.js").PaginationResult<import("../../types/io.js").AoGatewayWithAddress> | {
+    message: string;
+}>;
+export declare function getGatewayDelegates(o: AddressCLIOptions): Promise<import("../../types/io.js").PaginationResult<import("../../types/io.js").AoGatewayDelegateWithAddress> | {
+    message: string;
+}>;
+export declare function getDelegations(o: PaginationAddressCLIOptions): Promise<import("../../types/io.js").PaginationResult<import("../../types/io.js").AoDelegation> | {
+    message: string;
+}>;
+export declare function getAllowedDelegates(o: PaginationAddressCLIOptions): Promise<import("../../types/io.js").PaginationResult<string> | {
+    message: string;
+}>;
+export declare function getArNSRecord(o: NameCLIOptions): Promise<import("../../types/io.js").AoArNSPermabuyData | import("../../types/io.js").AoArNSLeaseData | {
+    message: string;
+}>;
+export declare function listArNSRecords(o: PaginationCLIOptions): Promise<import("../../types/io.js").PaginationResult<import("../../types/io.js").AoArNSNameDataWithName> | {
+    message: string;
+}>;
+export declare function getArNSReservedName(o: NameCLIOptions): Promise<import("../../types/io.js").AoArNSReservedNameData | {
+    message: string;
+}>;
+export declare function listArNSReservedNames(o: PaginationCLIOptions): Promise<import("../../types/io.js").PaginationResult<import("../../types/io.js").AoArNSReservedNameDataWithName> | {
+    message: string;
+}>;
+export declare function getArNSAuction(o: NameCLIOptions): Promise<import("../../types/io.js").AoAuction | {
+    message: string;
+}>;
+export declare function listArNSAuctions(o: PaginationCLIOptions): Promise<import("../../types/io.js").PaginationResult<import("../../types/io.js").AoAuction> | {
+    message: string;
+}>;
+export declare function getArNSAuctionPrices(o: AuctionPricesCLIOptions): Promise<import("../../types/io.js").AoAuctionPriceData>;
+export declare function getEpoch(o: EpochCLIOptions): Promise<import("../../types/io.js").AoEpochData | {
+    message: string;
+}>;
+export declare function getPrescribedObservers(o: EpochCLIOptions): Promise<import("../../types/io.js").AoWeightedObserver[] | {
+    message: string;
+}>;
+export declare function getPrescribedNames(o: EpochCLIOptions): Promise<string[] | {
+    message: string;
+}>;
+export declare function getTokenCost(o: GetTokenCostCLIOptions): Promise<{
+    mIOTokenCost: number;
+    message: string;
+}>;
+export declare function getPrimaryName(o: AddressAndNameCLIOptions): Promise<import("../../types/common.js").AoPrimaryName | {
+    message: string;
+}>;
+export declare function getGatewayVaults(o: PaginationAddressCLIOptions): Promise<import("../../types/io.js").PaginationResult<import("../../types/io.js").AoGatewayVault> | {
+    message: string;
+}>;
+export declare function getVault(o: AddressAndVaultIdCLIOptions): Promise<import("../../types/io.js").AoVaultData | {
+    message: string;
+}>;

package/lib/types/cli/commands/transfer.d.ts

@@ -0,0 +1,23 @@
+/**
+ * Copyright (C) 2022-2024 Permanent Data Solutions, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { TransferCLIOptions } from '../types.js';
+export declare function transfer(options: TransferCLIOptions): Promise<{
+    senderAddress: string;
+    transferResult: import("../../types/common.js").AoMessageResult;
+    message: string;
+} | {
+    message: string;
+}>;

package/lib/types/cli/options.d.ts

@@ -0,0 +1,326 @@
+/**
+ * Copyright (C) 2022-2024 Permanent Data Solutions, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export declare const optionMap: {
+    walletFile: {
+        alias: string;
+        description: string;
+    };
+    privateKey: {
+        alias: string;
+        description: string;
+    };
+    dev: {
+        alias: string;
+        description: string;
+        type: string;
+    };
+    ioProcessId: {
+        alias: string;
+        description: string;
+    };
+    cuUrl: {
+        alias: string;
+        description: string;
+    };
+    processId: {
+        alias: string;
+        description: string;
+    };
+    debug: {
+        alias: string;
+        description: string;
+        type: string;
+    };
+    address: {
+        alias: string;
+        description: string;
+    };
+    target: {
+        alias: string;
+        description: string;
+    };
+    source: {
+        alias: string;
+        description: string;
+    };
+    quantity: {
+        alias: string;
+        description: string;
+    };
+    autoStake: {
+        alias: string;
+        description: string;
+        type: string;
+    };
+    allowDelegatedStaking: {
+        alias: string;
+        description: string;
+        type: string;
+    };
+    minDelegatedStake: {
+        alias: string;
+        description: string;
+    };
+    delegateRewardShareRatio: {
+        alias: string;
+        description: string;
+    };
+    label: {
+        alias: string;
+        description: string;
+    };
+    note: {
+        alias: string;
+        description: string;
+    };
+    properties: {
+        alias: string;
+        description: string;
+    };
+    observerAddress: {
+        alias: string;
+        description: string;
+    };
+    fqdn: {
+        alias: string;
+        description: string;
+    };
+    port: {
+        alias: string;
+        description: string;
+    };
+    protocol: {
+        alias: string;
+        description: string;
+    };
+    allowedDelegates: {
+        alias: string;
+        description: string;
+        type: string;
+    };
+    skipConfirmation: {
+        alias: string;
+        description: string;
+        type: string;
+    };
+    vaultId: {
+        alias: string;
+        description: string;
+    };
+    operatorStake: {
+        alias: string;
+        description: string;
+    };
+    name: {
+        alias: string;
+        description: string;
+    };
+    epochIndex: {
+        alias: string;
+        description: string;
+    };
+    timestamp: {
+        alias: string;
+        description: string;
+    };
+    initiator: {
+        alias: string;
+        description: string;
+    };
+    intent: {
+        alias: string;
+        description: string;
+    };
+    type: {
+        alias: string;
+        description: string;
+    };
+    years: {
+        alias: string;
+        description: string;
+    };
+    intervalMs: {
+        alias: string;
+        description: string;
+    };
+    cursor: {
+        alias: string;
+        description: string;
+    };
+    limit: {
+        alias: string;
+        description: string;
+    };
+    sortBy: {
+        alias: string;
+        description: string;
+    };
+    sortOrder: {
+        alias: string;
+        description: string;
+    };
+    tags: {
+        description: string;
+        alias: string;
+        type: string;
+    };
+    instant: {
+        alias: string;
+        description: string;
+        type: string;
+    };
+    increaseCount: {
+        alias: string;
+        description: string;
+    };
+    undername: {
+        alias: string;
+        description: string;
+    };
+    controller: {
+        alias: string;
+        description: string;
+    };
+    controllers: {
+        alias: string;
+        description: string;
+        type: string;
+    };
+    transactionId: {
+        alias: string;
+        description: string;
+    };
+    ttlSeconds: {
+        alias: string;
+        description: string;
+    };
+    ticker: {
+        alias: string;
+        description: string;
+    };
+    description: {
+        alias: string;
+        description: string;
+    };
+    keywords: {
+        alias: string;
+        description: string;
+        type: string;
+    };
+    names: {
+        alias: string;
+        description: string;
+        type: string;
+    };
+    failedGateways: {
+        alias: string;
+        description: string;
+        type: string;
+    };
+};
+export declare const walletOptions: {
+    alias: string;
+    description: string;
+}[];
+export declare const globalOptions: {
+    alias: string;
+    description: string;
+}[];
+export declare const writeActionOptions: {
+    alias: string;
+    description: string;
+    type: string;
+}[];
+export declare const addressOptions: {
+    alias: string;
+    description: string;
+}[];
+export declare const nameOptions: {
+    alias: string;
+    description: string;
+}[];
+export declare const initiatorOptions: {
+    alias: string;
+    description: string;
+}[];
+export declare const epochOptions: {
+    alias: string;
+    description: string;
+}[];
+export declare const addressAndVaultIdOptions: {
+    alias: string;
+    description: string;
+}[];
+export declare const nameWriteOptions: {
+    alias: string;
+    description: string;
+}[];
+export declare const paginationOptions: {
+    alias: string;
+    description: string;
+}[];
+export declare const paginationAddressOptions: {
+    alias: string;
+    description: string;
+}[];
+export declare const getVaultOptions: {
+    alias: string;
+    description: string;
+}[];
+export declare const tokenCostOptions: {
+    alias: string;
+    description: string;
+}[];
+export declare const arNSAuctionPricesOptions: {
+    alias: string;
+    description: string;
+}[];
+export declare const transferOptions: {
+    alias: string;
+    description: string;
+}[];
+export declare const operatorStakeOptions: {
+    alias: string;
+    description: string;
+}[];
+export declare const redelegateStakeOptions: {
+    alias: string;
+    description: string;
+}[];
+export declare const delegateStakeOptions: {
+    alias: string;
+    description: string;
+}[];
+export declare const decreaseDelegateStakeOptions: {
+    alias: string;
+    description: string;
+}[];
+export declare const updateGatewaySettingsOptions: {
+    alias: string;
+    description: string;
+}[];
+export declare const joinNetworkOptions: {
+    alias: string;
+    description: string;
+}[];
+export declare const buyRecordOptions: {
+    alias: string;
+    description: string;
+}[];
+export declare const antStateOptions: {
+    alias: string;
+    description: string;
+}[];

package/lib/types/cli/types.d.ts

@@ -0,0 +1,106 @@
+/**
+ * Copyright (C) 2022-2024 Permanent Data Solutions, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { AoAddressParams, AoArNSAuctionPricesParams, AoArNSNameParams, AoBuyRecordParams, AoExtendLeaseParams, AoGetVaultParams, AoIncreaseUndernameLimitParams, AoJoinNetworkParams, AoSubmitAuctionBidParams, AoTokenCostParams, PaginationParams } from '../types/io.js';
+export type WalletCLIOptions = {
+    walletFile?: string;
+    privateKey?: string;
+};
+export type GlobalCLIOptions = WalletCLIOptions & {
+    dev: boolean;
+    debug: boolean;
+    ioProcessId?: string;
+    cuUrl?: string;
+};
+export type WriteActionCLIOptions = GlobalCLIOptions & {
+    tags?: string[];
+    skipConfirmation?: boolean;
+};
+export type ProcessIdWriteActionCLIOptions = WriteActionCLIOptions & {
+    processId?: string;
+};
+/**
+ * A utility type to transform `number` properties in a type `T` to `string`
+ * properties, while preserving arrays, objects, and other types.
+ * Additionally, all properties are made optional.
+ *
+ * This type is intended to represent how `commander` parses CLI options,
+ * where all values are strings, and nested objects are recursively processed.
+ *
+ * @example
+ * ```ts
+ * export type MyNewCommandOptions = CLIOptionsFromAoParams<MyNewAoMethodParams> & GlobalOptions;
+ * ```
+ */
+export type CLIOptionsFromAoParams<T> = {
+    [K in keyof T]?: T[K] extends number | undefined ? string | undefined : T[K] extends string | boolean | symbol ? string : T[K] extends ReadonlyArray<infer U> ? ReadonlyArray<U> : T[K] extends object ? CLIOptionsFromAoParams<T[K]> : T[K];
+};
+export type PaginationCLIOptions = GlobalCLIOptions & CLIOptionsFromAoParams<PaginationParams>;
+export type AddressCLIOptions = GlobalCLIOptions & CLIOptionsFromAoParams<AoAddressParams>;
+export type ProcessIdCLIOptions = GlobalCLIOptions & {
+    processId?: string;
+};
+export type InitiatorCLIOptions = GlobalCLIOptions & CLIOptionsFromAoParams<{
+    initiator: string;
+}>;
+export type AddressAndNameCLIOptions = GlobalCLIOptions & CLIOptionsFromAoParams<{
+    address: string;
+    name: string;
+}>;
+export type EpochCLIOptions = GlobalCLIOptions & CLIOptionsFromAoParams<{
+    epochIndex: number;
+    timestamp: number;
+}>;
+export type GetTokenCostCLIOptions = GlobalCLIOptions & CLIOptionsFromAoParams<AoTokenCostParams>;
+export type AuctionPricesCLIOptions = GlobalCLIOptions & CLIOptionsFromAoParams<AoArNSAuctionPricesParams>;
+export type PaginationAddressCLIOptions = AddressCLIOptions & PaginationCLIOptions;
+export type NameCLIOptions = GlobalCLIOptions & CLIOptionsFromAoParams<AoArNSNameParams>;
+export type NameWriteCLIOptions = WriteActionCLIOptions & NameCLIOptions;
+export type AddressAndVaultIdCLIOptions = CLIOptionsFromAoParams<AoGetVaultParams> & GlobalCLIOptions;
+export type AddressAndVaultIdCLIWriteOptions = WriteActionCLIOptions & AddressAndVaultIdCLIOptions;
+export type TransferCLIOptions = WriteActionCLIOptions & {
+    quantity?: string;
+    target?: string;
+};
+export type JoinNetworkCLIOptions = WriteActionCLIOptions & CLIOptionsFromAoParams<AoJoinNetworkParams>;
+export type UpdateGatewaySettingsCLIOptions = Omit<JoinNetworkCLIOptions, 'operatorStake'>;
+export type DelegateStakeCLIOptions = TransferCLIOptions;
+export type RedelegateStakeCLIOptions = TransferCLIOptions & {
+    source?: string;
+    vaultId?: string;
+};
+export type OperatorStakeCLIOptions = WriteActionCLIOptions & {
+    operatorStake?: string;
+};
+export type DecreaseDelegateStakeCLIOptions = DelegateStakeCLIOptions & {
+    instant: boolean;
+};
+export type BuyRecordCLIOptions = WriteActionCLIOptions & CLIOptionsFromAoParams<AoBuyRecordParams>;
+export type UpgradeRecordCLIOptions = NameWriteCLIOptions;
+export type ExtendLeaseCLIOptions = WriteActionCLIOptions & CLIOptionsFromAoParams<AoExtendLeaseParams>;
+export type IncreaseUndernameLimitCLIOptions = WriteActionCLIOptions & CLIOptionsFromAoParams<AoIncreaseUndernameLimitParams>;
+export type SubmitAuctionBidCLIOptions = WriteActionCLIOptions & CLIOptionsFromAoParams<AoSubmitAuctionBidParams>;
+export type ANTStateCLIOptions = WriteActionCLIOptions & {
+    target?: string;
+    keywords?: string[];
+    ticker?: string;
+    name?: string;
+    description?: string;
+    controllers?: string[];
+    ttlSeconds?: string;
+};
+export type JsonSerializable = string | number | boolean | null | JsonSerializable[] | {
+    [key: string]: JsonSerializable;
+};