dev to master diff

.yarnrc.yml

@@ -1,4 +1,4 @@
-nodeLinker: pnp
+nodeLinker: node-modules
 
 plugins:
     - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

package.json

@@ -9,62 +9,64 @@
 	},
 	"dependencies": {
 		"@alexsasharegan/simple-cache": "^3.3.3",
-		"arbundles": "^0.6.19",
-		"arweave": "^1.11.4",
-		"axios": "^0.21.1",
-		"axios-retry": "^3.6.0",
+		"@ardrive/ardrive-promise-cache": "^1.1.4",
+		"@ardrive/turbo-sdk": "^1.0.1",
+		"arbundles": "^0.6.22",
+		"arweave": "^1.14.4",
+		"axios": "^1.5.1",
+		"axios-retry": "^3.8.0",
 		"base64-js": "^1.5.1",
-		"bignumber.js": "^9.0.1",
+		"bignumber.js": "^9.1.2",
 		"bn.js": "^5.2.1",
-		"futoin-hkdf": "^1.3.3",
+		"futoin-hkdf": "^1.5.3",
 		"human-crypto-keys": "git+https://github.com/ardriveapp/js-human-crypto-keys.git#expose_lib",
-		"jwk-to-pem": "^2.0.4",
+		"jwk-to-pem": "^2.0.5",
 		"lodash": "^4.17.21",
-		"mime-types": "^2.1.29",
+		"mime-types": "^2.1.35",
 		"regression": "^2.0.1",
 		"smartweave": "^0.4.49",
 		"utf8": "^3.0.0",
-		"uuid": "^8.3.2"
+		"uuid": "^9.0.1"
 	},
 	"devDependencies": {
-		"@istanbuljs/nyc-config-typescript": "^1.0.1",
-		"@types/bn.js": "^5",
-		"@types/chai": "^4.2.15",
+		"@istanbuljs/nyc-config-typescript": "^1.0.2",
+		"@types/bn.js": "^5.1.2",
+		"@types/chai": "^4.3.6",
 		"@types/human-crypto-keys": "^0.1.2",
-		"@types/jwk-to-pem": "^2.0.0",
-		"@types/lodash": "^4",
-		"@types/mime-types": "^2.1.0",
-		"@types/mocha": "^8.2.1",
-		"@types/node": "^18.17.2",
-		"@types/node-fetch": "^2.6.1",
-		"@types/power-assert": "^1",
-		"@types/regression": "^2",
-		"@types/sinon": "^10.0.2",
-		"@types/source-map-support": "^0.5.3",
-		"@types/utf8": "^2.1.6",
-		"@types/uuid": "^8.3.0",
-		"@typescript-eslint/eslint-plugin": "^6.2.1",
-		"@typescript-eslint/parser": "^6.2.1",
-		"chai": "^4.3.3",
-		"eslint": "^8.46.0",
-		"eslint-config-prettier": "^8.1.0",
-		"eslint-plugin-prettier": "latest",
-		"espower-typescript": "^10.0.0",
-		"husky": "^=6",
-		"lint-staged": "^11.0.0",
-		"mocha": "^8.3.1",
+		"@types/jwk-to-pem": "^2.0.1",
+		"@types/lodash": "^4.14.199",
+		"@types/mime-types": "^2.1.2",
+		"@types/mocha": "^10.0.2",
+		"@types/node": "^18.18.3",
+		"@types/node-fetch": "^2.6.6",
+		"@types/power-assert": "^1.5.9",
+		"@types/regression": "^2.0.3",
+		"@types/sinon": "^10.0.18",
+		"@types/source-map-support": "^0.5.8",
+		"@types/utf8": "^3.0.1",
+		"@types/uuid": "^9.0.4",
+		"@typescript-eslint/eslint-plugin": "^6.7.4",
+		"@typescript-eslint/parser": "^6.7.4",
+		"chai": "^4.3.10",
+		"eslint": "^8.50.0",
+		"eslint-config-prettier": "^9.0.0",
+		"eslint-plugin-prettier": "^5.0.0",
+		"espower-typescript": "^10.0.1",
+		"husky": "^8.0.3",
+		"lint-staged": "^14.0.1",
+		"mocha": "^10.2.0",
 		"nyc": "^15.1.0",
 		"power-assert": "^1.6.1",
-		"prettier": "^2.2.1",
-		"rimraf": "^3.0.2",
-		"sinon": "^11.1.1",
-		"source-map-support": "^0.5.19",
-		"ts-node": "^10.1.0",
-		"ts-sinon": "^2.0.1",
-		"typescript": "^5.1.6"
+		"prettier": "^3.0.3",
+		"rimraf": "^5.0.5",
+		"sinon": "^16.0.0",
+		"source-map-support": "^0.5.21",
+		"ts-node": "^10.9.1",
+		"ts-sinon": "^2.0.2",
+		"typescript": "^5.2.2"
 	},
 	"scripts": {
-		"clean": "rimraf [ lib .nyc_output node_modules coverage ]",
+		"clean": "rimraf [ lib .nyc_output coverage ]",
 		"format": "prettier --write \"src/**/*.ts\"",
 		"lint": "eslint . --ext .ts",
 		"lintfix": "eslint . --ext .ts --fix",

src/ardrive.ts

@@ -218,18 +218,13 @@ export class ArDrive extends ArDriveAnonymous {
 			  };
 
 		// Move file will create a new meta data tx with identical meta data except for a new parentFolderId
-		const {
-			dataTxId,
-			metaDataTxId,
-			dataCaches,
-			fastFinalityIndexes,
-			metaDataTxReward
-		} = await this.arFsDao.movePublicFile({
-			originalMetaData: originalFileMetaData,
-			transactionData: fileTransactionData,
-			newParentFolderId,
-			metaDataBaseReward: fileMetaDataBaseReward
-		});
+		const { dataTxId, metaDataTxId, dataCaches, fastFinalityIndexes, metaDataTxReward } =
+			await this.arFsDao.movePublicFile({
+				originalMetaData: originalFileMetaData,
+				transactionData: fileTransactionData,
+				newParentFolderId,
+				metaDataBaseReward: fileMetaDataBaseReward
+			});
 
 		const result: ArFSResult = {
 			created: [
@@ -300,19 +295,13 @@ export class ArDrive extends ArDriveAnonymous {
 			  };
 
 		// Move file will create a new meta data tx with identical meta data except for a new parentFolderId
-		const {
-			dataTxId,
-			fileKey,
-			metaDataTxId,
-			dataCaches,
-			fastFinalityIndexes,
-			metaDataTxReward
-		} = await this.arFsDao.movePrivateFile({
-			originalMetaData: originalFileMetaData,
-			transactionData: fileTransactionData,
-			newParentFolderId,
-			metaDataBaseReward: fileMetaDataBaseReward
-		});
+		const { dataTxId, fileKey, metaDataTxId, dataCaches, fastFinalityIndexes, metaDataTxReward } =
+			await this.arFsDao.movePrivateFile({
+				originalMetaData: originalFileMetaData,
+				transactionData: fileTransactionData,
+				newParentFolderId,
+				metaDataBaseReward: fileMetaDataBaseReward
+			});
 
 		const result: ArFSResult = {
 			created: [
@@ -480,17 +469,13 @@ export class ArDrive extends ArDriveAnonymous {
 			  };
 
 		// Move folder will create a new meta data tx with identical meta data except for a new parentFolderId
-		const {
-			metaDataTxId,
-			dataCaches,
-			fastFinalityIndexes,
-			metaDataTxReward
-		} = await this.arFsDao.movePrivateFolder({
-			originalMetaData: originalFolderMetaData,
-			transactionData: folderTransactionData,
-			newParentFolderId,
-			metaDataBaseReward: folderMetaDataBaseReward
-		});
+		const { metaDataTxId, dataCaches, fastFinalityIndexes, metaDataTxReward } =
+			await this.arFsDao.movePrivateFolder({
+				originalMetaData: originalFolderMetaData,
+				transactionData: folderTransactionData,
+				newParentFolderId,
+				metaDataBaseReward: folderMetaDataBaseReward
+			});
 
 		const arFSResult: ArFSResult = {
 			created: [
@@ -1167,23 +1152,16 @@ export class ArDrive extends ArDriveAnonymous {
 			? undefined
 			: await (async () => {
 					const uploadPlan = this.uploadPlanner.planCreateDrive(arFSPrototypes);
-					const { rewardSettings, totalWinstonPrice } = await this.costCalculator.calculateCostForCreateDrive(
-						uploadPlan
-					);
+					const { rewardSettings, totalWinstonPrice } =
+						await this.costCalculator.calculateCostForCreateDrive(uploadPlan);
 					await this.assertWalletBalance(totalWinstonPrice);
 					return rewardSettings;
 			  })();
 
 		const createDriveResult = await arFSCreateDrive(rewardSettings);
 
-		const {
-			driveId,
-			metaDataTxId,
-			rootFolderId,
-			rootFolderTxId,
-			dataCaches,
-			fastFinalityIndexes
-		} = createDriveResult;
+		const { driveId, metaDataTxId, rootFolderId, rootFolderTxId, dataCaches, fastFinalityIndexes } =
+			createDriveResult;
 
 		const arFSResults: ArFSResult = {
 			created: [
@@ -1520,17 +1498,12 @@ export class ArDrive extends ArDriveAnonymous {
 					feeMultiple: this.feeMultiple
 			  };
 
-		const {
-			entityId,
-			metaDataTxId,
-			dataCaches,
-			fastFinalityIndexes,
-			metaDataTxReward
-		} = await this.arFsDao.renamePublicFile({
-			file,
-			newName,
-			metadataRewardSettings
-		});
+		const { entityId, metaDataTxId, dataCaches, fastFinalityIndexes, metaDataTxReward } =
+			await this.arFsDao.renamePublicFile({
+				file,
+				newName,
+				metadataRewardSettings
+			});
 
 		const arFSResult: ArFSResult = {
 			created: [
@@ -1581,19 +1554,13 @@ export class ArDrive extends ArDriveAnonymous {
 					feeMultiple: this.feeMultiple
 			  };
 
-		const {
-			entityId,
-			fileKey,
-			metaDataTxId,
-			dataCaches,
-			fastFinalityIndexes,
-			metaDataTxReward
-		} = await this.arFsDao.renamePrivateFile({
-			file,
-			newName,
-			metadataRewardSettings,
-			driveKey
-		});
+		const { entityId, fileKey, metaDataTxId, dataCaches, fastFinalityIndexes, metaDataTxReward } =
+			await this.arFsDao.renamePrivateFile({
+				file,
+				newName,
+				metadataRewardSettings,
+				driveKey
+			});
 
 		const arFSResult: ArFSResult = {
 			created: [
@@ -1642,17 +1609,12 @@ export class ArDrive extends ArDriveAnonymous {
 					feeMultiple: this.feeMultiple
 			  };
 
-		const {
-			entityId,
-			metaDataTxId,
-			dataCaches,
-			fastFinalityIndexes,
-			metaDataTxReward
-		} = await this.arFsDao.renamePublicFolder({
-			folder,
-			newName,
-			metadataRewardSettings
-		});
+		const { entityId, metaDataTxId, dataCaches, fastFinalityIndexes, metaDataTxReward } =
+			await this.arFsDao.renamePublicFolder({
+				folder,
+				newName,
+				metadataRewardSettings
+			});
 
 		const arFSResult: ArFSResult = {
 			created: [
@@ -1704,18 +1666,13 @@ export class ArDrive extends ArDriveAnonymous {
 					feeMultiple: this.feeMultiple
 			  };
 
-		const {
-			entityId,
-			metaDataTxId,
-			dataCaches,
-			fastFinalityIndexes,
-			metaDataTxReward
-		} = await this.arFsDao.renamePrivateFolder({
-			folder,
-			newName,
-			metadataRewardSettings,
-			driveKey
-		});
+		const { entityId, metaDataTxId, dataCaches, fastFinalityIndexes, metaDataTxReward } =
+			await this.arFsDao.renamePrivateFolder({
+				folder,
+				newName,
+				metadataRewardSettings,
+				driveKey
+			});
 
 		const arFSResult: ArFSResult = {
 			created: [
@@ -1761,17 +1718,12 @@ export class ArDrive extends ArDriveAnonymous {
 					feeMultiple: this.feeMultiple
 			  };
 
-		const {
-			entityId,
-			metaDataTxId,
-			dataCaches,
-			fastFinalityIndexes,
-			metaDataTxReward
-		} = await this.arFsDao.renamePublicDrive({
-			drive,
-			newName,
-			metadataRewardSettings
-		});
+		const { entityId, metaDataTxId, dataCaches, fastFinalityIndexes, metaDataTxReward } =
+			await this.arFsDao.renamePublicDrive({
+				drive,
+				newName,
+				metadataRewardSettings
+			});
 
 		const arFSResult: ArFSResult = {
 			created: [
@@ -1817,18 +1769,13 @@ export class ArDrive extends ArDriveAnonymous {
 					feeMultiple: this.feeMultiple
 			  };
 
-		const {
-			entityId,
-			metaDataTxId,
-			dataCaches,
-			fastFinalityIndexes,
-			metaDataTxReward
-		} = await this.arFsDao.renamePrivateDrive({
-			drive,
-			newName,
-			metadataRewardSettings,
-			driveKey
-		});
+		const { entityId, metaDataTxId, dataCaches, fastFinalityIndexes, metaDataTxReward } =
+			await this.arFsDao.renamePrivateDrive({
+				drive,
+				newName,
+				metadataRewardSettings,
+				driveKey
+			});
 
 		const arFSResult: ArFSResult = {
 			created: [