Merge pull request #12 from DataINCITE/flynnc3-temp

Flynnc3 temp

DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/stream/external/requests/ExternalRequestFramework.java

@@ -80,7 +80,10 @@ public ExternalRequestFramework(ExternalStreamManager manager, String name, Stri
 		this.date_location = date_location;
 		this.date_start_var = date_start_var;
 		this.date_end_var = date_end_var;
-		this.date_format = DateTimeFormatter.ofPattern(date_format);
+		if(is_dated)
+			this.date_format = DateTimeFormatter.ofPattern(date_format);
+		else
+			this.date_format = null;
 	}
 
 	public final boolean hasTag(String tag) {

DeFi-Data-Engine/DeFi Data Engine/src/main/resources/requests/graph-reserves.properties

@@ -1,37 +1,82 @@
-request.name=	graph-swaps
+request.name=	graph-reserves
 
 url.base=		https://api.thegraph.com/subgraphs/name/aave/protocol-v2
 
-url.properties= method,swaps,\
+url.properties= method,reserves,\
 				values,\
 				id:\
-				user:\
-				reserve:\
-				pool:\
-				userReserve:\
-				timestamp:\
-				borrowRateModeTo:\
-				borrowRateModeFrom:\
-				stableBorrowRate:\
-				variableBorrowRate
+                underlyingAsset:\
+                pool{id}:\
+                symbol:\
+                name:\
+                decimals:\
+                usageAsCollateralEnabled:\
+                borrowingEnabled:\
+                stableBorrowRateEnabled:\
+                isActive:\
+                isFrozen:\
+                price:\
+                reserveInterestRateStrategy:\
+                optimalUtilisationRate:\
+                variableRateSlope1:\
+                variableRateSlope2:\
+                stableRateSlope1:\
+                stableRateSlope2:\
+                baseVariableBorrowRate:\
+                baseLTVasCollateral:\
+                reserveLiquidationThreshold:\
+                reserveLiquidationBonus:\
+                utilizationRate:\
+                totalLiquidity:\
+                totalATokenSupply:\
+                totalLiquidityAsCollateral:\
+                totalPrincipalStableDebt:\
+                totalScaledVariableDebt:\
+                totalCurrentVariableDebt:\
+                totalDeposits:\
+                liquidityRate:\
+                averageStableRate:\
+                variableBorrowRate:\
+                stableBorrowRate:\
+                liquidityIndex:\
+                variableBorrowIndex:\
+                aToken{id}:\
+                vToken{id}:\
+                sToken{id}:\
+                reserveFactor:\
+                lastUpdateTimestamp:\
+                stableDebtLastUpdateTimestamp:\
+                aEmissionPerSecond:\
+                vEmissionPerSecond:\
+                sEmissionPerSecond:\
+                aTokenIncentivesIndex:\
+                vTokenIncentivesIndex:\
+                sTokenIncentivesIndex:\
+                aIncentivesLastUpdateTimestamp:\
+                vIncentivesLastUpdateTimestamp:\
+                sIncentivesLastUpdateTimestamp:\
+                lifetimeLiquidity:\
+                lifetimePrincipalStableDebt:\
+                lifetimeScaledVariableDebt:\
+                lifetimeCurrentVariableDebt:\
+                lifetimeRepayments:\
+                lifetimeWithdrawals:\
+                lifetimeBorrows:\
+                lifetimeLiquidated:\
+                lifetimeFlashLoans:\
+                lifetimeFlashLoanPremium:\
+                lifetimeDepositorsInterestEarned:\
+                lifetimeReserveFactorAccrued 
 
 url.headers=	Content-Type,application/json
 
 data.path=		data,\
-				swaps
+				reserves
 
 recursion.type=	graphql
 
 recursion.tags= -l,1000
 
-recursion.location=	timestamp
+recursion.location=	id
 
-date.valid=		true
-
-date.location=	properties
-
-date.start=		startDate
-
-date.end=		endDate
-
-date.format=	yyyy-MM-dd
+date.valid=		false

DeFi-Data-Engine/DeFi Data Engine/src/main/resources/requests/graph-swaps.properties

@@ -1,85 +1,32 @@
-request.name=	graph-reserves
+request.name=	graph-swaps
 
 url.base=		https://api.thegraph.com/subgraphs/name/aave/protocol-v2
 
-url.properties= method,reserves,\
+url.properties= method,swaps,\
 				values,\
 				id:\
-				underlyingAsset:\
-				pool:\
-				symbol:\
-				name:\
-				decimals:\
-				usageAsCollateralEnabled:\
-				borrowingEnabled:\
-				stableBorrowRateEnabled:\
-				isActive:\
-				isFrozen:\
-				price:\
-				reserveInterestRateStrategy:\
-				optimalUtilisationRate:\
-				variableRateSlope1:\
-				variableRateSlope2:\
-				stableRateSlope1:\
-				stableRateSlope2:\
-				baseVariableBorrowRate:\
-				baseLTVasCollateral:\
-				reserveLiquidationThreshold:\
-				reserveLiquidationBonus:\
-				utilizationRate:\
-				totalLiquidity:\
-				totalATokenSupply:\
-				totalLiquidityAsCollateral:\
-				totalPrincipalStableDebt:\
-				totalScaledVariableDebt:\
-				totalCurrentVariableDebt:\
-				totalDeposits:\
-				liquidityRate:\
-				averageStableRate:\
-				variableBorrowRate:\
-				stableBorrowRate:\
-				liquidityIndex:\
-				variableBorrowIndex:\
-				aToken{id}:\
-				vToken{id}:\
-				sToken{id}:\
-				reserveFactor:\
-				lastUpdateTimestamp:\
-				stableDebtLastUpdateTimestamp:\
-				aEmissionPerSecond:\
-				vEmissionPerSecond:\
-				sEmissionPerSecond:\
-				aTokenIncentivesIndex:\
-				vTokenIncentivesIndex:\
-				sTokenIncentivesIndex:\
-				aIncentivesLastUpdateTimestamp:\
-				vIncentivesLastUpdateTimestamp:\
-				sIncentivesLastUpdateTimestamp:\
-				lifetimeLiquidity:\
-				lifetimePrincipalStableDebt:\
-				lifetimeScaledVariableDebt:\
-				lifetimeCurrentVariableDebt:\
-				lifetimeRepayments:\
-				lifetimeWithdrawals:\
-				lifetimeBorrows:\
-				lifetimeLiquidated:\
-				lifetimeFlashLoans:\
-				lifetimeFlashLoanPremium:\
-				lifetimeDepositorsInterestEarned:\
-				ifetimeReserveFactorAccrued
+               	user{id}:\
+              	reserve{id}:\
+                pool{id}:\
+                userReserve{id}:\
+                timestamp:\
+                borrowRateModeTo:\
+                borrowRateModeFrom:\
+                stableBorrowRate:\
+                variableBorrowRate
 
 url.headers=	Content-Type,application/json
 
 data.path=		data,\
-				reserves
+				swaps
 
 recursion.type=	graphql
 
 recursion.tags= -l,1000
 
-recursion.location=	id
+recursion.location=	timestamp
 
-date.valid=		false
+date.valid=		true
 
 date.location=	properties
 

DeFi-Data-Engine/DeFi Data Engine/src/main/resources/requests/graph-user-reserves.properties

@@ -1,4 +1,4 @@
-request.name=	graph-swaps
+request.name=	graph-user-reserves
 
 url.base=		https://api.thegraph.com/subgraphs/name/aave/protocol-v2
 
@@ -18,7 +18,7 @@ url.properties= method,userReserves,\
 				currentTotalDebt:\
 				stableBorrowRate:\
 				oldStableBorrowRate:\
-				liquiditiyRate:\
+				liquidityRate:\
 				stableBorrowLastUpdateTimestamp:\
 				variableBorrowIndex:\
 				aTokenincentivesUserIndex:\
@@ -32,13 +32,13 @@ url.properties= method,userReserves,\
 url.headers=	Content-Type,application/json
 
 data.path=		data,\
-				swaps
+				userReserves
 
 recursion.type=	graphql
 
 recursion.tags= -l,1000
 
-recursion.location=	timestamp
+recursion.location=	lastUpdateTimestamp
 
 date.valid=		true
 

DeFi-Data-Engine/Rest Application/.gitignore

@@ -0,0 +1 @@
+/bin/

DeFi-Data-Engine/Rest Application/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Rest Application</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>