From eb72bc8b4d6f82e290010b36ed8c032650516310 Mon Sep 17 00:00:00 2001
From: Conor Flynn <cflynn@quantify-co.com>
Date: Sun, 15 Jan 2023 15:28:11 -0500
Subject: [PATCH] Add new R-Function

---
 ...nc.Rmd => aave-protocol-dated-func-v1.Rmd} |  0
 .../aave-protocol-dated-func-v2.Rmd           | 85 +++++++++++++++++++
 2 files changed, 85 insertions(+)
 rename R-Code-Samples/{aave-protocol-dated-func.Rmd => aave-protocol-dated-func-v1.Rmd} (100%)
 create mode 100644 R-Code-Samples/aave-protocol-dated-func-v2.Rmd

diff --git a/R-Code-Samples/aave-protocol-dated-func.Rmd b/R-Code-Samples/aave-protocol-dated-func-v1.Rmd
similarity index 100%
rename from R-Code-Samples/aave-protocol-dated-func.Rmd
rename to R-Code-Samples/aave-protocol-dated-func-v1.Rmd
diff --git a/R-Code-Samples/aave-protocol-dated-func-v2.Rmd b/R-Code-Samples/aave-protocol-dated-func-v2.Rmd
new file mode 100644
index 00000000..52a3deae
--- /dev/null
+++ b/R-Code-Samples/aave-protocol-dated-func-v2.Rmd
@@ -0,0 +1,85 @@
+---
+title: "DFDE-Method"
+author: "Conor Flynn"
+date: "2022-12-15"
+output: html_document
+---
+
+```{r setup, include=FALSE}
+knitr::opts_chunk$set(echo = TRUE)
+```
+
+```{r}
+library("httr")
+library("jsonlite")
+library("lubridate")
+library(stringr)
+library(tidyverse)
+
+getJson <- function(startdate, enddate) {
+  
+  httr::GET(url = "http://defi-de.idea.rpi.edu:8080/defi/v1/rest/initialize?source=amber_data&auth_data=key,UAK7ed69235426c360be22bfc2bde1809b6")
+  
+  engine_key <- "b6c810a7f35f4fa0d28258278325b4b5ab82ba79868ab33d01d5c878e13872ec129a91a3fbf702e59c2404f0fb4a53420a3ffb50130c35b4d06b32d81e56c1f4"
+  
+  socket <- socketConnection("defi-de.idea.rpi.edu", 61200, blocking=TRUE)
+  ss <- readLines(socket, 1)
+  ss
+  
+  reqString <- paste(
+                  "SRC&&&RQST&&&destination&&&", ss, 
+                  "&&&key&&&", engine_key, "&&&",
+                  "start_date&&&", startdate, "&&&",
+                  "end_date&&&", enddate, "&&&",
+                  "query&&&aave-protocol-dated&&&",
+                  "request&&&aave-protocol-dated\n", sep="")
+  
+  writeLines(reqString, socket)
+  
+  data <- readLines(socket, 1)
+  
+  while (TRUE) {
+    temp <- readLines(socket, 1)
+    data <- paste(data, temp, "")
+    if (grepl("<<<end>>>", temp, fixed=TRUE)) {break}
+  }
+  data
+  
+  data <- str_replace(data, "  <<<end>>> ", "")
+  data <- str_replace_all(data, " ", "")
+  data <- str_replace_all(data, "\\}\\{", "\\},\\{")
+  data <- paste("[", data, "]", sep="")
+  output <- fromJSON(data)
+  
+  output <- output[,-(colnames(output) == "_id")]
+  colnames(output)[colnames(output) == "action"] = "type"
+  output$type <- as.factor(output$type)
+  output <- output %>% mutate(datetime = as_datetime(as.numeric(substr(timestamp, 1, nchar(timestamp)-3))))
+  
+  colnames(output)[colnames(output) == "assetId"] = "reserveId"
+  colnames(output)[colnames(output) == "assetSymbol"] = "reserve"
+  
+  output$amount <- as.double(output$amount)
+  output$borrowRate <- as.double(output$borrowRate)
+  
+  colnames(output)[colnames(output) == "user"] = "userId"
+  
+  output <- output %>% unite(col = "onBehalfOfId", onBehalfOf,repayer,initiator, na.rm = TRUE, sep = "")
+  
+  
+  colnames(output)[colnames(output) == "collateralAssetId"] = "collateralReserveId"
+  colnames(output)[colnames(output) == "collateralAssetSymbol"] = "collateralReserve"
+  colnames(output)[colnames(output) == "principalAssetId"] = "principalReserveId"
+  colnames(output)[colnames(output) == "principalAssetSymbol"] = "principalReserve"
+  
+  output$principalAmount <- as.double(output$principalAmount)
+  output <- output[,-15]
+  output
+  
+  return(output)
+}
+
+
+temp <- getJson("2022-08-01", "2022-08-02")
+temp
+```
\ No newline at end of file