Merge pull request #139 from ardriveapp/PE-659_private_file_reward_fix

fix(priv upload): Use alternate encrypted estimation algorithm PE-477

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ardrive-cli",
-	"version": "1.0.1",
+	"version": "1.0.2",
 	"description": "The ArDrive Command Line Interface (CLI is a Node.js application for terminal-based ArDrive workflows. It also offers utility operations for securely interacting with Arweave wallets and inspecting various Arweave blockchain conditions.",
 	"main": "./lib/index.js",
 	"bin": {

src/ardrive.ts

@@ -727,8 +727,8 @@ export class ArDrive extends ArDriveAnonymous {
 		if (dataSize > Number.MAX_SAFE_INTEGER - 16) {
 			throw new Error(`Max un-encrypted dataSize allowed is ${Number.MAX_SAFE_INTEGER - 16}!`);
 		}
-		const modulo16 = dataSize % 16;
-		return dataSize - modulo16 + 16;
+
+		return (dataSize / 16 + 1) * 16;
 	}
 
 	async uploadPrivateFile(

src/utils/ardrive.test.ts

@@ -78,11 +78,11 @@ describe('ArDrive class', () => {
 		it('returns the expected values for valid inputs', () => {
 			const inputsAndExpectedOutputs = [
 				[0, 16],
-				[1, 16],
-				[15, 16],
+				[1, 17],
+				[15, 31],
 				[16, 32],
-				[17, 32],
-				[Number.MAX_SAFE_INTEGER - 16, Number.MAX_SAFE_INTEGER - 15]
+				[17, 33],
+				[Number.MAX_SAFE_INTEGER - 16, Number.MAX_SAFE_INTEGER]
 			];
 			inputsAndExpectedOutputs.forEach(([input, expectedOutput]) => {
 				expect(arDrive.encryptedDataSize(input)).to.equal(expectedOutput);
@@ -146,7 +146,7 @@ describe('ArDrive class', () => {
 			);
 			expect(actual).to.deep.equal({
 				metaDataBaseReward: '147',
-				fileDataBaseReward: '1234576',
+				fileDataBaseReward: '1234583',
 				communityWinstonTip: '9876543210'
 			});
 		});

tests/integration/ardrive.int.test.ts

@@ -546,15 +546,15 @@ describe('ArDrive class - integrated', () => {
 					);
 
 					// Pass expected existing file id, so that the file would be considered a revision
-					assertUploadFileExpectations(result, 3216, 187, 0, '1', 'private', existingFileId);
+					assertUploadFileExpectations(result, 3220, 187, 0, '1', 'private', existingFileId);
 				});
 
 				it('returns the correct ArFSResult', async () => {
 					stub(arfsDao, 'getOwnerForDriveId').resolves(walletOwner);
 					const stubDriveKey = await getStubDriveKey();
 
 					const result = await arDrive.uploadPrivateFile(stubEntityID, wrappedFile, stubDriveKey);
-					assertUploadFileExpectations(result, 3216, 182, 0, '1', 'private');
+					assertUploadFileExpectations(result, 3220, 182, 0, '1', 'private');
 				});
 			});