refactor: use new getOwner(); preserve backwards compatible getAddress() PE-8186

fedellen · fedellen · commit ae9727127d1f · 2025-08-15T14:25:47.000-05:00
diff --git a/src/CLICommand/parameters_helper.ts b/src/CLICommand/parameters_helper.ts
@@ -61,7 +61,7 @@ const TURBO_URL_ENV_VAR = 'TURBO_URL';
 interface GetDriveKeyParams {
 	driveId: DriveID;
 	arDrive: ArDrive;
-	owner: ArweaveAddress;
+	owner: ArweaveAddress | ArweaveAddress[];
 	drivePassword?: string;
 	useCache?: boolean;
 }
@@ -198,14 +198,15 @@ export class ParametersHelper {
 
 		drivePassword = drivePassword ?? (await this.getDrivePassword());
 		if (drivePassword) {
-			const wallet: JWKWallet = (await this.getRequiredWallet()) as JWKWallet;
+			const wallet = await this.getRequiredWallet();
 
 			const derivedDriveKey: DriveKey = await deriveDriveKey({
 				dataEncryptionKey: drivePassword,
 				driveId: `${driveId}`,
 				walletPrivateKey: JSON.stringify(wallet.getPrivateKey()),
 				driveSignatureType: driveSignatureInfo.driveSignatureType,
-				encryptedSignatureData: driveSignatureInfo.encryptedSignatureData
+				encryptedSignatureData: driveSignatureInfo.encryptedSignatureData,
+				wallet
 			});
 			ParametersHelper.driveKeyCache[`${driveId}`] = derivedDriveKey;
 			return derivedDriveKey;
diff --git a/src/commands/create_folder.ts b/src/commands/create_folder.ts
@@ -52,7 +52,7 @@ new CLICommand({
 				const driveKey = await parameters.getDriveKey({
 					driveId,
 					arDrive: ardrive,
-					owner: await wallet.getAddress()
+					owner: await wallet.getOwner()
 				});
 				return ardrive.createPrivateFolder({
 					folderName,
diff --git a/src/commands/download_drive.ts b/src/commands/download_drive.ts
@@ -46,7 +46,7 @@ new CLICommand({
 			const driveKey = await parameters.getDriveKey({
 				driveId,
 				arDrive: ardrive,
-				owner: await wallet.getAddress()
+				owner: await wallet.getOwner()
 			});
 			await ardrive.downloadPrivateDrive({
 				driveId,
diff --git a/src/commands/download_file.ts b/src/commands/download_file.ts
@@ -44,7 +44,7 @@ new CLICommand({
 			const driveKey = await parameters.getDriveKey({
 				driveId,
 				arDrive: ardrive,
-				owner: await wallet.getAddress()
+				owner: await wallet.getOwner()
 			});
 			await ardrive.downloadPrivateFile({ fileId, driveKey, destFolderPath, defaultFileName });
 			outputPath = join(
diff --git a/src/commands/download_folder.ts b/src/commands/download_folder.ts
@@ -45,7 +45,7 @@ new CLICommand({
 			const driveKey = await parameters.getDriveKey({
 				driveId,
 				arDrive: arDrive,
-				owner: await wallet.getAddress()
+				owner: await wallet.getOwner()
 			});
 			await arDrive.downloadPrivateFolder({
 				folderId,
diff --git a/src/commands/drive_info.ts b/src/commands/drive_info.ts
@@ -27,7 +27,7 @@ new CLICommand({
 				const driveKey = await parameters.getDriveKey({
 					driveId,
 					arDrive,
-					owner: await wallet.getAddress()
+					owner: await wallet.getOwner()
 				});
 
 				return arDrive.getPrivateDrive({ driveId, driveKey });
diff --git a/src/commands/file_info.ts b/src/commands/file_info.ts
@@ -28,7 +28,7 @@ new CLICommand({
 				const driveKey = await parameters.getDriveKey({
 					driveId,
 					arDrive,
-					owner: await wallet.getAddress()
+					owner: await wallet.getOwner()
 				});
 
 				// We have the drive id from deriving a key, we can derive the owner
diff --git a/src/commands/folder_info.ts b/src/commands/folder_info.ts
@@ -29,7 +29,7 @@ new CLICommand({
 				const driveKey = await parameters.getDriveKey({
 					driveId,
 					arDrive,
-					owner: await wallet.getAddress()
+					owner: await wallet.getOwner()
 				});
 
 				// We have the drive id from deriving a key, we can derive the owner
diff --git a/src/commands/get_drive_key.ts b/src/commands/get_drive_key.ts
@@ -20,7 +20,7 @@ new CLICommand({
 		const wallet = await parameters.getRequiredWallet();
 		const arDrive = cliArDriveFactory({ wallet, arweave });
 
-		const driveKey = await parameters.getDriveKey({ driveId, arDrive, owner: await wallet.getAddress() });
+		const driveKey = await parameters.getDriveKey({ driveId, arDrive, owner: await wallet.getOwner() });
 		if (options.verify) {
 			await arDrive.getPrivateDrive({ driveId, driveKey });
 		}
diff --git a/src/commands/get_file_key.ts b/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.getAddress();
+			const owner = await wallet.getOwner();
 			const arDrive = cliArDriveFactory({ wallet, arweave });
 
 			const driveKey = await parameters.getDriveKey({
diff --git a/src/commands/last_tx.ts b/src/commands/last_tx.ts
@@ -17,7 +17,7 @@ new CLICommand({
 		const parameters = new ParametersHelper(options);
 		const gateway = parameters.getGateway();
 		const walletAddress = await parameters.getWalletAddress();
-		const lastTx = await lastTxForAddress(gateway, walletAddress);
+		const lastTx = await lastTxForAddress(gateway, Array.isArray(walletAddress) ? walletAddress[0] : walletAddress);
 		console.log(lastTx);
 		return SUCCESS_EXIT_CODE;
 	})
diff --git a/src/commands/list_drive.ts b/src/commands/list_drive.ts
@@ -40,7 +40,7 @@ new CLICommand({
 			const driveKey = await parameters.getDriveKey({
 				driveId,
 				arDrive,
-				owner: await wallet.getAddress()
+				owner: await wallet.getOwner()
 			});
 
 			const drive = await arDrive.getPrivateDrive({ driveId, driveKey });
diff --git a/src/commands/list_folder.ts b/src/commands/list_folder.ts
@@ -48,7 +48,7 @@ new CLICommand({
 			const driveKey = await parameters.getDriveKey({
 				driveId,
 				arDrive,
-				owner: await wallet.getAddress()
+				owner: await wallet.getOwner()
 			});
 			const withKeys = await parameters.getParameterValue(WithKeysParameter, (value) => !!value);
 
diff --git a/src/commands/move_file.ts b/src/commands/move_file.ts
@@ -52,7 +52,7 @@ new CLICommand({
 				const driveKey = await parameters.getDriveKey({
 					driveId,
 					arDrive: ardrive,
-					owner: await wallet.getAddress()
+					owner: await wallet.getOwner()
 				});
 
 				return ardrive.movePrivateFile({ fileId, newParentFolderId, driveKey });
diff --git a/src/commands/move_folder.ts b/src/commands/move_folder.ts
@@ -52,7 +52,7 @@ new CLICommand({
 				const driveKey = await parameters.getDriveKey({
 					driveId,
 					arDrive: ardrive,
-					owner: await wallet.getAddress()
+					owner: await wallet.getOwner()
 				});
 
 				return ardrive.movePrivateFolder({ folderId, newParentFolderId, driveKey });
diff --git a/src/commands/rename_drive.ts b/src/commands/rename_drive.ts
@@ -51,7 +51,7 @@ new CLICommand({
 				const driveKey = await parameters.getDriveKey({
 					driveId,
 					arDrive: ardrive,
-					owner: await wallet.getAddress()
+					owner: await wallet.getOwner()
 				});
 
 				return ardrive.renamePrivateDrive({
diff --git a/src/commands/rename_file.ts b/src/commands/rename_file.ts
@@ -52,7 +52,7 @@ new CLICommand({
 				const driveKey = await parameters.getDriveKey({
 					driveId,
 					arDrive: ardrive,
-					owner: await wallet.getAddress()
+					owner: await wallet.getOwner()
 				});
 
 				return ardrive.renamePrivateFile({
diff --git a/src/commands/rename_folder.ts b/src/commands/rename_folder.ts
@@ -53,7 +53,7 @@ new CLICommand({
 				const driveKey = await parameters.getDriveKey({
 					driveId,
 					arDrive: ardrive,
-					owner: await wallet.getAddress()
+					owner: await wallet.getOwner()
 				});
 
 				return ardrive.renamePrivateFolder({
diff --git a/src/commands/upload_file.ts b/src/commands/upload_file.ts
@@ -260,7 +260,7 @@ new CLICommand({
 									driveId: await arDrive.getDriveIdForFolderId(parentFolderId),
 									drivePassword,
 									arDrive: arDrive,
-									owner: await wallet.getAddress(),
+									owner: await wallet.getOwner(),
 									useCache: true
 							  })
 							: undefined;

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ new CLICommand({`
`20`	`20`	`const wallet = await parameters.getRequiredWallet();`
`21`	`21`	`const arDrive = cliArDriveFactory({ wallet, arweave });`
`22`	`22`
`23`		`- const driveKey = await parameters.getDriveKey({ driveId, arDrive, owner: await wallet.getAddress() });`
	`23`	`+ const driveKey = await parameters.getDriveKey({ driveId, arDrive, owner: await wallet.getOwner() });`
`24`	`24`	`if (options.verify) {`
`25`	`25`	`await arDrive.getPrivateDrive({ driveId, driveKey });`
`26`	`26`	`}`