refactor: use shared addresses type PE-8186

Author: fedellen

src/CLICommand/parameters_helper.ts

@@ -45,7 +45,8 @@ import {
 	assertCustomMetaData,
 	CustomMetaDataJsonFields,
 	DriveSignatureType,
-	VersionedDriveKey
+	VersionedDriveKey,
+	WalletAddresses
 } from 'ardrive-core-js';
 import { JWKInterface } from 'arweave/node/lib/wallet';
 import { deriveIpfsCid } from '../utils/ipfs_utils';
@@ -61,7 +62,7 @@ const TURBO_URL_ENV_VAR = 'TURBO_URL';
 interface GetDriveKeyParams {
 	driveId: DriveID;
 	arDrive: ArDrive;
-	owner: ArweaveAddress | ArweaveAddress[];
+	owner: ArweaveAddress | WalletAddresses;
 	drivePassword?: string;
 	useCache?: boolean;
 }
@@ -137,10 +138,10 @@ export class ParametersHelper {
 		return this.getRequiredWallet().then((wallet) => wallet.getAddress());
 	}
 
-	public async getWalletAddresses(): Promise<ArweaveAddress> {
+	public async getWalletAddresses(): Promise<WalletAddresses> {
 		const address = this.getParameterValue(AddressParameter);
 		if (address) {
-			return ADDR(address);
+			return { networkAddress: ADDR(address), ans104Address: ADDR(address) };
 		}
 
 		return this.getRequiredWallet().then((wallet) => wallet.getAllAddresses());

src/commands/create_folder.ts

@@ -52,7 +52,7 @@ new CLICommand({
 				const driveKey = await parameters.getDriveKey({
 					driveId,
 					arDrive: ardrive,
-					owner: await wallet.getOwner()
+					owner: await wallet.getAllAddresses()
 				});
 				return ardrive.createPrivateFolder({
 					folderName,

src/commands/download_drive.ts

@@ -46,7 +46,7 @@ new CLICommand({
 			const driveKey = await parameters.getDriveKey({
 				driveId,
 				arDrive: ardrive,
-				owner: await wallet.getOwner()
+				owner: await wallet.getAllAddresses()
 			});
 			await ardrive.downloadPrivateDrive({
 				driveId,

src/commands/download_file.ts

@@ -44,7 +44,7 @@ new CLICommand({
 			const driveKey = await parameters.getDriveKey({
 				driveId,
 				arDrive: ardrive,
-				owner: await wallet.getOwner()
+				owner: await wallet.getAllAddresses()
 			});
 			await ardrive.downloadPrivateFile({ fileId, driveKey, destFolderPath, defaultFileName });
 			outputPath = join(

src/commands/download_folder.ts

@@ -45,7 +45,7 @@ new CLICommand({
 			const driveKey = await parameters.getDriveKey({
 				driveId,
 				arDrive: arDrive,
-				owner: await wallet.getOwner()
+				owner: await wallet.getAllAddresses()
 			});
 			await arDrive.downloadPrivateFolder({
 				folderId,

src/commands/drive_info.ts

@@ -27,7 +27,7 @@ new CLICommand({
 				const driveKey = await parameters.getDriveKey({
 					driveId,
 					arDrive,
-					owner: await wallet.getOwner()
+					owner: await wallet.getAllAddresses()
 				});
 
 				return arDrive.getPrivateDrive({ driveId, driveKey });

src/commands/file_info.ts

@@ -28,7 +28,7 @@ new CLICommand({
 				const driveKey = await parameters.getDriveKey({
 					driveId,
 					arDrive,
-					owner: await wallet.getOwner()
+					owner: await wallet.getAllAddresses()
 				});
 
 				// We have the drive id from deriving a key, we can derive the owner

src/commands/folder_info.ts

@@ -29,7 +29,7 @@ new CLICommand({
 				const driveKey = await parameters.getDriveKey({
 					driveId,
 					arDrive,
-					owner: await wallet.getOwner()
+					owner: await wallet.getAllAddresses()
 				});
 
 				// We have the drive id from deriving a key, we can derive the owner

src/commands/get_drive_key.ts

@@ -20,7 +20,11 @@ new CLICommand({
 		const wallet = await parameters.getRequiredWallet();
 		const arDrive = cliArDriveFactory({ wallet, arweave });
 
-		const driveKey = await parameters.getDriveKey({ driveId, arDrive, owner: await wallet.getOwner() });
+		const driveKey = await parameters.getDriveKey({
+			driveId,
+			arDrive,
+			owner: await wallet.getAllAddresses()
+		});
 		if (options.verify) {
 			await arDrive.getPrivateDrive({ driveId, driveKey });
 		}

src/commands/get_file_key.ts

@@ -50,7 +50,7 @@ new CLICommand({
 			// TODO: In the future, loosen driveID requirement and fetch from fileID
 			const driveId: DriveID = EID(parameters.getRequiredParameterValue(DriveIdParameter));
 			const wallet = await parameters.getRequiredWallet();
-			const owner = await wallet.getOwner();
+			const owner = await wallet.getAllAddresses();
 			const arDrive = cliArDriveFactory({ wallet, arweave });
 
 			const driveKey = await parameters.getDriveKey({
@@ -68,7 +68,7 @@ new CLICommand({
 				fileId,
 				new GatewayAPI({ gatewayUrl: gatewayUrlForArweave(arweave) }),
 				driveKey,
-				owner,
+				Object.values(owner),
 				fileKey
 			).build();
 			console.log(file.fileKey.toJSON());