Merge pull request #85 from ardriveapp/PE-707_price_calc_compatibility

PE-707: Price calc compatibility

Author: fedellen

.pnp.js

@@ -1,6 +1,6 @@
 {
 	"name": "ardrive-core-js",
-	"version": "1.0.2",
+	"version": "1.0.3",
 	"description": "ArDrive Core contains the essential back end application features to support the ArDrive CLI and Desktop apps, such as file management, Permaweb upload/download, wallet management and other common functions.",
 	"main": "./lib/exports.js",
 	"types": "./lib/exports.d.ts",
@@ -15,7 +15,6 @@
 		"jwk-to-pem": "^2.0.4",
 		"lodash": "^4.17.21",
 		"mime-types": "^2.1.29",
-		"node-fetch": "^2.6.1",
 		"regression": "^2.0.1",
 		"smartweave": "^0.4.45",
 		"utf8": "^3.0.0",
@@ -30,7 +29,6 @@
 		"@types/mime-types": "^2.1.0",
 		"@types/mocha": "^8.2.1",
 		"@types/node": "^14.14.32",
-		"@types/node-fetch": "^2.5.8",
 		"@types/power-assert": "^1",
 		"@types/regression": "^2",
 		"@types/sinon": "^10.0.2",

.yarn/cache/@types-node-fetch-npm-2.5.8-d946aa06c6-608cdd6aed.zip

@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
 import { Wallet } from './wallet';
 import Arweave from 'arweave';
 import { ArDriveCommunityOracle } from './community/ardrive_community_oracle';

.yarn/cache/form-data-npm-3.0.1-d080d436e0-6574ff4d2d.zip

@@ -1,4 +1,4 @@
-import fetch from 'node-fetch';
+import axios, { AxiosResponse } from 'axios';
 import { TransactionID } from '../types';
 import { ContractReader } from './contract_oracle';
 
@@ -9,8 +9,8 @@ import { ContractReader } from './contract_oracle';
 export class VertoContractReader implements ContractReader {
 	/** Fetches smartweave contracts from the Verto cache */
 	public async readContract(txId: TransactionID): Promise<unknown> {
-		const response = await fetch(`https://v2.cache.verto.exchange/${txId}`);
-		const contract = await response.json();
+		const response: AxiosResponse = await axios.get(`https://v2.cache.verto.exchange/${txId}`);
+		const contract = response.data;
 		return contract.state;
 	}
 }

.yarn/cache/node-fetch-npm-2.6.1-46c670dbc1-cbb171635e.zip

@@ -1,12 +1,12 @@
 import type { ArweaveOracle } from './arweave_oracle';
-import fetch from 'node-fetch';
 import { ByteCount, W, Winston } from '../types';
 import { BigNumber } from 'bignumber.js';
+import axios, { AxiosResponse } from 'axios';
 
 export class GatewayOracle implements ArweaveOracle {
 	async getWinstonPriceForByteCount(byteCount: ByteCount): Promise<Winston> {
-		const response = await fetch(`https://arweave.net/price/${byteCount}`);
-		const winstonAsString = await response.text();
+		const response: AxiosResponse = await axios.get(`https://arweave.net/price/${byteCount}`);
+		const winstonAsString = `${response.data}`;
 		return W(new BigNumber(winstonAsString));
 	}
 }

package.json

@@ -2,14 +2,14 @@
 import * as mime from 'mime-types';
 import * as fs from 'fs';
 import * as types from '../types/base_Types';
-import fetch from 'node-fetch';
 import path from 'path';
 import { deriveDriveKey, deriveFileKey, fileEncrypt } from './crypto';
 import { ArDriveUser } from '../types/base_Types';
 import { stagingAppUrl } from './constants';
 import { JWKInterface } from 'arweave/node/lib/wallet';
 import { Wallet } from '../wallet';
 import { JWKWallet } from '../jwk_wallet';
+import axios from 'axios';
 
 // Pauses application
 export async function sleep(ms: number): Promise<number> {
@@ -492,17 +492,17 @@ export async function sanitizePath(path: string): Promise<string> {
 	}
 }
 
-export async function getArUSDPrice(): Promise<number> {
-	let usdPrice = 0;
-	try {
-		const res = await fetch('https://api.coingecko.com/api/v3/simple/price?ids=arweave&vs_currencies=usd');
-		usdPrice = (await res.clone().json()).arweave.usd;
-		return usdPrice;
-	} catch (err) {
-		console.log('Error getting AR/USD price from Coingecko');
-		return 0;
-	}
-}
+// export async function getArUSDPrice(): Promise<number> {
+// 	let usdPrice = 0;
+// 	try {
+// 		const res = await fetch('https://api.coingecko.com/api/v3/simple/price?ids=arweave&vs_currencies=usd');
+// 		usdPrice = (await res.clone().json()).arweave.usd;
+// 		return usdPrice;
+// 	} catch (err) {
+// 		console.log('Error getting AR/USD price from Coingecko');
+// 		return 0;
+// 	}
+// }
 /**
  * Converts Winston value into AR
  *
@@ -540,8 +540,8 @@ export function readJWKFile(path: string): Wallet {
 }
 
 export async function fetchMempool(): Promise<string[]> {
-	const response = await fetch('https://arweave.net/tx/pending');
-	return response.json();
+	const response = await axios.get('https://arweave.net/tx/pending');
+	return response.data;
 }
 
 export function urlEncodeHashKey(keyBuffer: Buffer): string {

src/ardrive_factory.ts

@@ -609,16 +609,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node-fetch@npm:^2.5.8":
-  version: 2.5.8
-  resolution: "@types/node-fetch@npm:2.5.8"
-  dependencies:
-    "@types/node": "*"
-    form-data: ^3.0.0
-  checksum: 608cdd6aed2c6a44a26406eb63475d4bfb8f63f78f22f747e30dd7cda309b86dc019e4427b9092011541da95d83ef03e2e6558c37d39221c0931617f32d3c4e1
-  languageName: node
-  linkType: hard
-
 "@types/node@npm:*, @types/node@npm:>=13.7.0":
   version: 16.11.7
   resolution: "@types/node@npm:16.11.7"
@@ -1052,7 +1042,6 @@ __metadata:
     "@types/mime-types": ^2.1.0
     "@types/mocha": ^8.2.1
     "@types/node": ^14.14.32
-    "@types/node-fetch": ^2.5.8
     "@types/power-assert": ^1
     "@types/regression": ^2
     "@types/sinon": ^10.0.2
@@ -1079,7 +1068,6 @@ __metadata:
     lodash: ^4.17.21
     mime-types: ^2.1.29
     mocha: ^8.3.1
-    node-fetch: ^2.6.1
     nyc: ^15.1.0
     power-assert: ^1.6.1
     prettier: ^2.2.1
@@ -1710,7 +1698,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"combined-stream@npm:^1.0.6, combined-stream@npm:^1.0.8, combined-stream@npm:~1.0.6":
+"combined-stream@npm:^1.0.6, combined-stream@npm:~1.0.6":
   version: 1.0.8
   resolution: "combined-stream@npm:1.0.8"
   dependencies:
@@ -2830,17 +2818,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"form-data@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "form-data@npm:3.0.1"
-  dependencies:
-    asynckit: ^0.4.0
-    combined-stream: ^1.0.8
-    mime-types: ^2.1.12
-  checksum: 6574ff4d2d845c47ba288151a6e0573767eefdee9da358be199e0f0b66aa5c454e7d62ed5e0daef6f84167ba1e9596e064f36f206488e460ef449ef7b653cdfc
-  languageName: node
-  linkType: hard
-
 "form-data@npm:~2.3.2":
   version: 2.3.3
   resolution: "form-data@npm:2.3.3"
@@ -4296,13 +4273,6 @@ fsevents@~2.3.1:
   languageName: node
   linkType: hard
 
-"node-fetch@npm:^2.6.1":
-  version: 2.6.1
-  resolution: "node-fetch@npm:2.6.1"
-  checksum: cbb171635e538162b977eac5dfe7a1e07a9a02e991924377a6435502291e2f823d306b95aabc455caebf4a118ccf836868462bc70ccc3095af02bb9da61fda37
-  languageName: node
-  linkType: hard
-
 "node-forge@npm:^0.10.0":
   version: 0.10.0
   resolution: "node-forge@npm:0.10.0"