@ar.io/sdk 2.1.0-alpha.1 → 2.1.0-alpha.11

package/lib/esm/common/ant.js

@@ -15,6 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import { isProcessConfiguration, isProcessIdConfiguration, } from '../types.js';
+import { createAoSigner } from '../utils/ao.js';
 import { AOProcess, InvalidContractConfigurationError } from './index.js';
 export class ANT {
     static init({ signer, ...config }) {
@@ -77,7 +78,7 @@ export class AoANTReadable {
         return record;
     }
     /**
-     * @returns {Promise<Record<string, ANTRecord>>} All the undernames managed by the ANT.
+     * @returns {Promise<Record<string, AoANTRecord>>} All the undernames managed by the ANT.
      * @example
      * Get the current records
      * ```ts
@@ -181,7 +182,7 @@ export class AoANTWriteable extends AoANTReadable {
     signer;
     constructor({ signer, ...config }) {
         super(config);
-        this.signer = signer;
+        this.signer = createAoSigner(signer);
     }
     /**
      * @param target @type {string} The address of the account you want to transfer the ANT to.
@@ -198,7 +199,6 @@ export class AoANTWriteable extends AoANTReadable {
         ];
         return this.process.send({
             tags,
-            data: {},
             signer: this.signer,
         });
     }
@@ -217,7 +217,6 @@ export class AoANTWriteable extends AoANTReadable {
         ];
         return this.process.send({
             tags,
-            data: {},
             signer: this.signer,
         });
     }
@@ -236,7 +235,6 @@ export class AoANTWriteable extends AoANTReadable {
         ];
         return this.process.send({
             tags,
-            data: {},
             signer: this.signer,
         });
     }
@@ -258,7 +256,6 @@ export class AoANTWriteable extends AoANTReadable {
                 { name: 'Transaction-Id', value: transactionId },
                 { name: 'TTL-Seconds', value: ttlSeconds.toString() },
             ],
-            data: { transactionId, ttlSeconds },
             signer: this.signer,
         });
     }
@@ -276,7 +273,6 @@ export class AoANTWriteable extends AoANTReadable {
                 { name: 'Action', value: 'Remove-Record' },
                 { name: 'Sub-Domain', value: undername },
             ],
-            data: { undername },
             signer: this.signer,
         });
     }
@@ -294,7 +290,6 @@ export class AoANTWriteable extends AoANTReadable {
                 { name: 'Action', value: 'Set-Ticker' },
                 { name: 'Ticker', value: ticker },
             ],
-            data: { ticker },
             signer: this.signer,
         });
     }
@@ -312,7 +307,6 @@ export class AoANTWriteable extends AoANTReadable {
                 { name: 'Action', value: 'Set-Name' },
                 { name: 'Name', value: name },
             ],
-            data: { name },
             signer: this.signer,
         });
     }

package/lib/esm/common/contracts/ao-process.js

@@ -15,7 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import { connect } from '@permaweb/aoconnect';
-import { createData } from 'arbundles';
 import { safeDecode } from '../../utils/json.js';
 import { version } from '../../version.js';
 import { WriteInteractionError } from '../error.js';
@@ -29,22 +28,6 @@ export class AOProcess {
         this.logger = logger;
         this.ao = ao;
     }
-    // TODO: could abstract into our own interface that constructs different signers
-    static async createAoSigner(signer) {
-        // ensure appropriate permissions are granted with injected signers.
-        if (signer.publicKey === undefined && 'setPublicKey' in signer) {
-            await signer.setPublicKey();
-        }
-        const aoSigner = async ({ data, tags, target, anchor }) => {
-            const dataItem = createData(data, signer, { tags, target, anchor });
-            const signedData = dataItem.sign(signer).then(async () => ({
-                id: await dataItem.id,
-                raw: await dataItem.getRaw(),
-            }));
-            return signedData;
-        };
-        return aoSigner;
-    }
     async read({ tags, retries = 3, }) {
         let attempts = 0;
         let lastError;
@@ -105,8 +88,8 @@ export class AOProcess {
                     process: this.processId,
                     // TODO: any other default tags we want to add?
                     tags: [...tags, { name: 'AR-IO-SDK', value: version }],
-                    data: typeof data !== 'string' ? JSON.stringify(data) : data,
-                    signer: await AOProcess.createAoSigner(signer),
+                    data,
+                    signer,
                 });
                 this.logger.debug(`Sent message to process`, {
                     messageId,

package/lib/esm/common/index.js

@@ -17,6 +17,7 @@
 export * from './error.js';
 export * from './logger.js';
 export * from './ant.js';
+export * from './ant-registry.js';
 // ao
 export * from './io.js';
 export * from './contracts/ao-process.js';

package/lib/esm/common/io.js

@@ -1,5 +1,6 @@
 import { IO_TESTNET_PROCESS_ID } from '../constants.js';
 import { isProcessConfiguration, isProcessIdConfiguration, } from '../io.js';
+import { createAoSigner } from '../utils/ao.js';
 import { defaultArweave } from './arweave.js';
 import { AOProcess } from './contracts/ao-process.js';
 import { InvalidContractConfigurationError } from './error.js';
@@ -42,6 +43,11 @@ export class IOReadable {
             tags: [{ name: 'Action', value: 'Info' }],
         });
     }
+    async getTokenSupply() {
+        return this.process.read({
+            tags: [{ name: 'Action', value: 'Total-Token-Supply' }],
+        });
+    }
     async getEpochSettings(params) {
         const allTags = [
             { name: 'Action', value: 'Epoch-Settings' },
@@ -336,11 +342,11 @@ export class IOWriteable extends IOReadable {
                     processId: IO_TESTNET_PROCESS_ID,
                 }),
             });
-            this.signer = signer;
+            this.signer = createAoSigner(signer);
         }
         else if (isProcessConfiguration(config)) {
             super({ process: config.process });
-            this.signer = signer;
+            this.signer = createAoSigner(signer);
         }
         else if (isProcessIdConfiguration(config)) {
             super({
@@ -348,7 +354,7 @@ export class IOWriteable extends IOReadable {
                     processId: config.processId,
                 }),
             });
-            this.signer = signer;
+            this.signer = createAoSigner(signer);
         }
         else {
             throw new InvalidContractConfigurationError();
@@ -383,11 +389,11 @@ export class IOWriteable extends IOReadable {
             },
             {
                 name: 'Allow-Delegated-Staking',
-                value: allowDelegatedStaking.toString(),
+                value: allowDelegatedStaking?.toString(),
             },
             {
                 name: 'Delegate-Reward-Share-Ratio',
-                value: delegateRewardShareRatio.toString(),
+                value: delegateRewardShareRatio?.toString(),
             },
             {
                 name: 'FQDN',
@@ -399,7 +405,7 @@ export class IOWriteable extends IOReadable {
             },
             {
                 name: 'Min-Delegated-Stake',
-                value: minDelegatedStake.valueOf().toString(),
+                value: minDelegatedStake?.valueOf().toString(),
             },
             {
                 name: 'Note',
@@ -407,7 +413,7 @@ export class IOWriteable extends IOReadable {
             },
             {
                 name: 'Port',
-                value: port.toString(),
+                value: port?.toString(),
             },
             {
                 name: 'Properties',
@@ -419,7 +425,7 @@ export class IOWriteable extends IOReadable {
             },
             {
                 name: 'Auto-Stake',
-                value: autoStake.toString(),
+                value: autoStake?.toString(),
             },
             {
                 name: 'Observer-Address',
@@ -533,10 +539,6 @@ export class IOWriteable extends IOReadable {
                     value: params.failedGateways.join(','),
                 },
             ],
-            data: {
-                reportTxId: params.reportTxId,
-                failedGateways: params.failedGateways,
-            },
         });
     }
     async buyRecord(params, options) {

package/lib/esm/constants.js

@@ -25,6 +25,7 @@ export const IO_DEVNET_PROCESS_ID = 'GaQrvEMKBpkjofgnBi_B3IgIDmY_XYelVLB6GcRGrHc
 // backwards compatibility - TODO: remove in v2.0.0
 export const ioDevnetProcessId = IO_DEVNET_PROCESS_ID;
 export const IO_TESTNET_PROCESS_ID = 'agYcCFJtrMG6cqMuZfskIkFTGvUPddICmtQSBIoPdiA';
+export const ANT_REGISTRY_ID = 'i_le_yKKPVstLTDSmkHRqf-wYphMnwB9OhleiTgMkWc';
 export const MIO_PER_IO = 1_000_000;
 export const AOS_MODULE_ID = 'cbn0KKrBZH7hdNkNokuXLtGryrWM--PjSTBqIzw9Kkk';
 export const ANT_LUA_ID = 'Flwio4Lr08g6s6uim6lEJNnVGD9ylvz0_aafvpiL8FI';

package/lib/esm/io.js

@@ -1,4 +1,5 @@
 import { validateArweaveId } from './utils/arweave.js';
+// Typeguard functions
 export function isProcessConfiguration(config) {
     return 'process' in config;
 }
@@ -8,5 +9,5 @@ export function isProcessIdConfiguration(config) {
         validateArweaveId(config.processId) === true);
 }
 export function isLeasedArNSRecord(record) {
-    return record.type === 'lease' && record.endTimestamp !== undefined;
+    return record.type === 'lease';
 }

package/lib/esm/types.js

@@ -14,7 +14,6 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-export * from './contract-state.js';
 export * from './common.js';
 export * from './token.js';
 export * from './io.js';

package/lib/esm/utils/ao.js

@@ -14,11 +14,17 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import { connect } from '@permaweb/aoconnect';
+import { connect, createDataItemSigner } from '@permaweb/aoconnect';
+import { createData } from 'arbundles';
 import { defaultArweave } from '../common/arweave.js';
 import { AOProcess } from '../common/index.js';
-import { ANT_LUA_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, }) {
+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, }) {
+    // AoSigner is not a Contract Signer - should probably add that to the contract signer type
+    const registryClient = new AOProcess({
+        processId: antRegistryId,
+        ao,
+    });
     //TODO: cache locally and only fetch if not cached
     const luaString = (await defaultArweave.transactions.getData(luaCodeTxId, {
         decode: true,
@@ -27,7 +33,13 @@ export async function spawnANT({ signer, module = AOS_MODULE_ID, luaCodeTxId = A
     const processId = await ao.spawn({
         module,
         scheduler,
-        signer: await AOProcess.createAoSigner(signer),
+        signer,
+        tags: [
+            {
+                name: 'ANT-Registry-Id',
+                value: antRegistryId,
+            },
+        ],
     });
     const aosClient = new AOProcess({
         processId,
@@ -54,6 +66,13 @@ export async function spawnANT({ signer, module = AOS_MODULE_ID, luaCodeTxId = A
             signer,
         });
     }
+    await registryClient.send({
+        tags: [
+            { name: 'Action', value: 'Register' },
+            { name: 'Process-Id', value: processId },
+        ],
+        signer,
+    });
     return processId;
 }
 export async function evolveANT({ signer, processId, luaCodeTxId = ANT_LUA_ID, ao = connect(), }) {
@@ -77,3 +96,23 @@ export async function evolveANT({ signer, processId, luaCodeTxId = ANT_LUA_ID, a
     });
     return id;
 }
+export function createAoSigner(signer) {
+    if (!('publicKey' in signer)) {
+        return createDataItemSigner(signer);
+    }
+    const aoSigner = async ({ data, tags, target, anchor }) => {
+        // ensure appropriate permissions are granted with injected signers.
+        if (signer.publicKey === undefined &&
+            'setPublicKey' in signer &&
+            typeof signer.setPublicKey === 'function') {
+            await signer.setPublicKey();
+        }
+        const dataItem = createData(data, signer, { tags, target, anchor });
+        const signedData = dataItem.sign(signer).then(async () => ({
+            id: await dataItem.id,
+            raw: await dataItem.getRaw(),
+        }));
+        return signedData;
+    };
+    return aoSigner;
+}

package/lib/esm/utils/json.js

@@ -14,6 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function safeDecode(data) {
     try {
         return JSON.parse(data);

package/lib/esm/utils/processes.js

@@ -16,37 +16,17 @@
  */
 import { EventEmitter } from 'eventemitter3';
 import { pLimit } from 'plimit-lit';
+import { ANTRegistry } from '../common/ant-registry.js';
 import { ANT } from '../common/ant.js';
 import { IO } from '../common/io.js';
 import { Logger } from '../common/logger.js';
 import { IO_TESTNET_PROCESS_ID } from '../constants.js';
-export const getANTProcessesOwnedByWallet = async ({ address, contract = IO.init({
-    processId: IO_TESTNET_PROCESS_ID,
-}), }) => {
-    const throttle = pLimit(50);
-    // get the record names of the registry - TODO: this may need to be paginated
-    const records = await fetchAllArNSRecords({
-        contract: contract,
-    });
-    const uniqueContractProcessIds = Object.values(records)
-        .filter((record) => record.processId !== undefined)
-        .map((record) => record.processId);
-    // check the contract owner and controllers
-    const ownedOrControlledByWallet = await Promise.all(uniqueContractProcessIds.map(async (processId) => throttle(async () => {
-        const ant = ANT.init({
-            processId,
-        });
-        const { Owner, Controllers } = await ant.getState();
-        if (Owner === address || Controllers.includes(address)) {
-            return processId;
-        }
-        return;
-    })));
-    if (ownedOrControlledByWallet.length === 0) {
-        return [];
-    }
-    // TODO: insert gql query to find ANT processes owned by wallet given wallet not currently in the registry
-    return [...new Set(ownedOrControlledByWallet)];
+/**
+ * @beta This API is in beta and may change in the future.
+ */
+export const getANTProcessesOwnedByWallet = async ({ address, registry = ANTRegistry.init(), }) => {
+    const res = await registry.accessControlList({ address });
+    return [...new Set([...res.Owned, ...res.Controlled])];
 };
 function timeout(ms, promise) {
     return new Promise((resolve, reject) => {
@@ -78,9 +58,11 @@ export class ArNSEventEmitter extends EventEmitter {
         this.throttle = pLimit(concurrency);
         this.logger = logger;
     }
-    async fetchProcessesOwnedByWallet({ address }) {
+    async fetchProcessesOwnedByWallet({ address, pageSize, antRegistry = ANTRegistry.init(), }) {
         const uniqueContractProcessIds = {};
-        await timeout(this.timeoutMs, fetchAllArNSRecords({ contract: this.contract, emitter: this }))
+        const antIdRes = await antRegistry.accessControlList({ address });
+        const antIds = new Set([...antIdRes.Owned, ...antIdRes.Controlled]);
+        await timeout(this.timeoutMs, fetchAllArNSRecords({ contract: this.contract, emitter: this, pageSize }))
             .catch((e) => {
             this.emit('error', `Error getting ArNS records: ${e}`);
             this.logger.error(`Error getting ArNS records`, {
@@ -90,19 +72,17 @@ export class ArNSEventEmitter extends EventEmitter {
             return {};
         })
             .then((records) => {
-            if (!records)
-                return;
-            Object.entries(records).forEach(([name, record]) => {
-                if (record.processId === undefined) {
-                    return;
-                }
-                if (uniqueContractProcessIds[record.processId] === undefined) {
-                    uniqueContractProcessIds[record.processId] = {
-                        state: undefined,
-                        names: {},
-                    };
+            Object.entries(records).forEach(([name, arnsRecord]) => {
+                if (antIds.has(arnsRecord.processId)) {
+                    if (uniqueContractProcessIds[arnsRecord.processId] == undefined) {
+                        uniqueContractProcessIds[arnsRecord.processId] = {
+                            state: undefined,
+                            names: {},
+                        };
+                    }
+                    uniqueContractProcessIds[arnsRecord.processId].names[name] =
+                        arnsRecord;
                 }
-                uniqueContractProcessIds[record.processId].names[name] = record;
             });
         });
         const idCount = Object.keys(uniqueContractProcessIds).length;
@@ -132,13 +112,14 @@ export class ArNSEventEmitter extends EventEmitter {
 }
 export const fetchAllArNSRecords = async ({ contract = IO.init({
     processId: IO_TESTNET_PROCESS_ID,
-}), emitter, logger = Logger.default, }) => {
+}), emitter, logger = Logger.default, pageSize = 50_000, }) => {
     let cursor;
     const startTimestamp = Date.now();
     const records = {};
     do {
         const pageResult = await contract
-            .getArNSRecords({ cursor })
+            .getArNSRecords({ cursor, limit: pageSize })
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             .catch((e) => {
             logger?.error(`Error getting ArNS records`, {
                 message: e?.message,

package/lib/esm/version.js

@@ -15,4 +15,4 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 // AUTOMATICALLY GENERATED FILE - DO NOT TOUCH
-export const version = '2.1.0-alpha.1';
+export const version = '2.1.0-alpha.11';

package/lib/types/common/ant-registry.d.ts

@@ -0,0 +1,26 @@
+import { AoANTRegistryRead, AoANTRegistryWrite, AoMessageResult, ProcessConfiguration, WithSigner } from '../types.js';
+import { AOProcess } from './index.js';
+export declare class ANTRegistry {
+    static init(): AoANTRegistryRead;
+    static init(config: Required<ProcessConfiguration> & {
+        signer?: undefined;
+    }): AoANTRegistryRead;
+    static init({ signer, ...config }: WithSigner<Required<ProcessConfiguration>>): AoANTRegistryRead;
+}
+export declare class AoANTRegistryReadable implements AoANTRegistryRead {
+    protected process: AOProcess;
+    constructor(config?: ProcessConfiguration);
+    accessControlList({ address, }: {
+        address: string;
+    }): Promise<{
+        Owned: string[];
+        Controlled: string[];
+    }>;
+}
+export declare class AoANTRegistryWriteable extends AoANTRegistryReadable implements AoANTRegistryWrite {
+    private signer;
+    constructor({ signer, ...config }: WithSigner<ProcessConfiguration>);
+    register({ processId, }: {
+        processId: string;
+    }): Promise<AoMessageResult>;
+}

package/lib/types/common/ant.d.ts

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import { ANTRecord, AoANTRead, AoANTState, AoANTWrite, AoMessageResult, ProcessConfiguration, WalletAddress, WithSigner } from '../types.js';
+import { AoANTRead, AoANTRecord, AoANTState, AoANTWrite, AoMessageResult, ProcessConfiguration, WalletAddress, WithSigner } from '../types.js';
 import { AOProcess } from './index.js';
 export declare class ANT {
     static init(config: Required<ProcessConfiguration> & {
@@ -44,16 +44,16 @@ export declare class AoANTReadable implements AoANTRead {
      */
     getRecord({ undername }: {
         undername: string;
-    }): Promise<ANTRecord>;
+    }): Promise<AoANTRecord>;
     /**
-     * @returns {Promise<Record<string, ANTRecord>>} All the undernames managed by the ANT.
+     * @returns {Promise<Record<string, AoANTRecord>>} All the undernames managed by the ANT.
      * @example
      * Get the current records
      * ```ts
      * ant.getRecords();
      * ````
      */
-    getRecords(): Promise<Record<string, ANTRecord>>;
+    getRecords(): Promise<Record<string, AoANTRecord>>;
     /**
      * @returns {Promise<string>} The owner of the ANT.
      * @example

package/lib/types/common/contracts/ao-process.d.ts

@@ -1,5 +1,4 @@
-/// <reference types="node" />
-import { AOContract, AoClient, ContractSigner } from '../../types.js';
+import { AOContract, AoClient, AoSigner } from '../../types.js';
 import { ILogger } from '../logger.js';
 export declare class AOProcess implements AOContract {
     private logger;
@@ -10,18 +9,6 @@ export declare class AOProcess implements AOContract {
         ao?: AoClient;
         logger?: ILogger;
     });
-    static createAoSigner(signer: ContractSigner): Promise<(args: {
-        data: string | Buffer;
-        tags?: {
-            name: string;
-            value: string;
-        }[];
-        target?: string;
-        anchor?: string;
-    }) => Promise<{
-        id: string;
-        raw: ArrayBuffer;
-    }>>;
     read<K>({ tags, retries, }: {
         tags?: Array<{
             name: string;
@@ -29,13 +16,13 @@ export declare class AOProcess implements AOContract {
         }>;
         retries?: number;
     }): Promise<K>;
-    send<I, K>({ tags, data, signer, retries, }: {
+    send<K>({ tags, data, signer, retries, }: {
         tags: Array<{
             name: string;
             value: string;
         }>;
-        data?: I;
-        signer: ContractSigner;
+        data?: string | undefined;
+        signer: AoSigner;
         retries?: number;
     }): Promise<{
         id: string;

package/lib/types/common/index.d.ts

@@ -17,5 +17,6 @@
 export * from './error.js';
 export * from './logger.js';
 export * from './ant.js';
+export * from './ant-registry.js';
 export * from './io.js';
 export * from './contracts/ao-process.js';

package/lib/types/common/io.d.ts

@@ -15,10 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import Arweave from 'arweave';
-import { ArNSReservedNameData, EpochDistributionData, EpochObservations, WeightedObserver } from '../contract-state.js';
 import { AoArNSNameData, AoEpochData, AoEpochSettings, AoGateway, AoIORead, AoIOWrite, EpochInput } from '../io.js';
 import { mIOToken } from '../token.js';
-import { AoArNSNameDataWithName, AoBalanceWithAddress, AoGatewayWithAddress, AoMessageResult, ContractSigner, JoinNetworkParams, PaginationParams, PaginationResult, ProcessConfiguration, TransactionId, UpdateGatewaySettingsParams, WalletAddress, WithSigner, WriteOptions } from '../types.js';
+import { AoArNSNameDataWithName, AoArNSReservedNameData, AoBalanceWithAddress, AoEpochDistributionData, AoEpochObservationData, AoGatewayWithAddress, AoJoinNetworkParams, AoMessageResult, AoUpdateGatewaySettingsParams, AoWeightedObserver, ContractSigner, PaginationParams, PaginationResult, ProcessConfiguration, TransactionId, WalletAddress, WithSigner, WriteOptions } from '../types.js';
 import { AOProcess } from './contracts/ao-process.js';
 export declare class IO {
     static init(): AoIORead;
@@ -49,16 +48,17 @@ export declare class IOReadable implements AoIORead {
         Logo: string;
         Denomination: number;
     }>;
+    getTokenSupply(): Promise<number>;
     getEpochSettings(params?: EpochInput): Promise<AoEpochSettings>;
     getEpoch(epoch?: EpochInput): Promise<AoEpochData>;
     getArNSRecord({ name, }: {
         name: string;
     }): Promise<AoArNSNameData | undefined>;
     getArNSRecords(pageParams?: PaginationParams): Promise<PaginationResult<AoArNSNameDataWithName>>;
-    getArNSReservedNames(): Promise<Record<string, ArNSReservedNameData> | Record<string, never>>;
+    getArNSReservedNames(): Promise<Record<string, AoArNSReservedNameData> | Record<string, never>>;
     getArNSReservedName({ name, }: {
         name: string;
-    }): Promise<ArNSReservedNameData | undefined>;
+    }): Promise<AoArNSReservedNameData | undefined>;
     getBalance({ address }: {
         address: WalletAddress;
     }): Promise<number>;
@@ -68,10 +68,10 @@ export declare class IOReadable implements AoIORead {
     }): Promise<AoGateway | undefined>;
     getGateways(pageParams?: PaginationParams): Promise<PaginationResult<AoGatewayWithAddress>>;
     getCurrentEpoch(): Promise<AoEpochData>;
-    getPrescribedObservers(epoch?: EpochInput): Promise<WeightedObserver[]>;
+    getPrescribedObservers(epoch?: EpochInput): Promise<AoWeightedObserver[]>;
     getPrescribedNames(epoch?: EpochInput): Promise<string[]>;
-    getObservations(epoch?: EpochInput): Promise<EpochObservations>;
-    getDistributions(epoch?: EpochInput): Promise<EpochDistributionData>;
+    getObservations(epoch?: EpochInput): Promise<AoEpochObservationData>;
+    getDistributions(epoch?: EpochInput): Promise<AoEpochDistributionData>;
     getTokenCost(params: {
         intent: 'Buy-Record';
         purchaseType: 'permabuy' | 'lease';
@@ -101,12 +101,9 @@ export declare class IOWriteable extends IOReadable implements AoIOWrite {
         target: string;
         qty: number | mIOToken;
     }, options?: WriteOptions): Promise<AoMessageResult>;
-    joinNetwork({ operatorStake, allowDelegatedStaking, delegateRewardShareRatio, fqdn, label, minDelegatedStake, note, port, properties, protocol, autoStake, observerAddress, }: Omit<JoinNetworkParams, 'observerWallet' | 'qty'> & {
-        observerAddress: string;
-        operatorStake: number | mIOToken;
-    }, options?: WriteOptions): Promise<AoMessageResult>;
+    joinNetwork({ operatorStake, allowDelegatedStaking, delegateRewardShareRatio, fqdn, label, minDelegatedStake, note, port, properties, protocol, autoStake, observerAddress, }: AoJoinNetworkParams, options?: WriteOptions): Promise<AoMessageResult>;
     leaveNetwork(options?: WriteOptions): Promise<AoMessageResult>;
-    updateGatewaySettings({ allowDelegatedStaking, delegateRewardShareRatio, fqdn, label, minDelegatedStake, note, port, properties, protocol, autoStake, observerAddress, }: UpdateGatewaySettingsParams, options?: WriteOptions): Promise<AoMessageResult>;
+    updateGatewaySettings({ allowDelegatedStaking, delegateRewardShareRatio, fqdn, label, minDelegatedStake, note, port, properties, protocol, autoStake, observerAddress, }: AoUpdateGatewaySettingsParams, options?: WriteOptions): Promise<AoMessageResult>;
     delegateStake(params: {
         target: string;
         stakeQty: number | mIOToken;