diff --git a/R-Code-Samples/GetTransactions.Rmd b/R-Code-Samples/GetTransactions.Rmd index 8dbb749..f4df0a3 100644 --- a/R-Code-Samples/GetTransactions.Rmd +++ b/R-Code-Samples/GetTransactions.Rmd @@ -363,9 +363,9 @@ get_transactions <- function(data) { mutate(borrowRate = as.numeric(borrowRate) / (10^25)) %>% mutate(pool = pool) %>% left_join(aliases, by = c("user" = "id")) %>% - rename(userAlias = alias) %>% + dplyr::rename(userAlias = alias) %>% left_join(aliases, by = c("onBehalfOf" = "id")) %>% - rename(onBehalfOfAlias = alias) %>% + dplyr::rename(onBehalfOfAlias = alias) %>% select(id, type, timestamp, user, userAlias, onBehalfOf, onBehalfOfAlias, pool, reserve, amount, amountUSD, amountETH, borrowRate, borrowRateMode) %>% drop_na() %>% @@ -379,7 +379,7 @@ get_transactions <- function(data) { left_join(reserveParamsHistory, by = c("id" = "txID", "timestamp", "reserve")) %>% mutate(reserve = symbol) %>% left_join(aliases, by = c("user" = "id")) %>% - rename(userAlias = alias) %>% + dplyr::rename(userAlias = alias) %>% select(id, timestamp, user, userAlias, pool, reserve, fromState, toState, type) %>% drop_na() %>% distinct() @@ -397,9 +397,9 @@ get_transactions <- function(data) { mutate(priceInEth = as.numeric(priceInEth) / (10^18)) %>% mutate(amountETH = as.numeric(amount) * as.numeric(priceInEth)) %>% left_join(aliases, by = c("user" = "id")) %>% - rename(userAlias = alias) %>% + dplyr::rename(userAlias = alias) %>% left_join(aliases, by = c("onBehalfOf" = "id")) %>% - rename(onBehalfOfAlias = alias) %>% + dplyr::rename(onBehalfOfAlias = alias) %>% select(id, timestamp, type, amount, amountUSD, amountETH, reserve, user, userAlias, onBehalfOf, onBehalfOfAlias, pool) %>% drop_na() %>% @@ -425,9 +425,9 @@ get_transactions <- function(data) { principalAmount, principalReserve, principalAmountUSD, principalAmountETH, collateralAmount, collateralReserve = symbol, collateralAmountUSD, collateralAmountETH) %>% left_join(aliases, by = c("user" = "id")) %>% - rename(userAlias = alias) %>% + dplyr::rename(userAlias = alias) %>% left_join(aliases, by = c("liquidator" = "id")) %>% - rename(liquidatorAlias = alias) %>% + dplyr::rename(liquidatorAlias = alias) %>% distinct() # mutate and parse redeems df @@ -443,9 +443,9 @@ get_transactions <- function(data) { mutate(priceInEth = as.numeric(priceInEth) / (10^18)) %>% mutate(amountETH = as.numeric(amount) * as.numeric(priceInEth)) %>% left_join(aliases, by = c("user" = "id")) %>% - rename(userAlias = alias) %>% + dplyr::rename(userAlias = alias) %>% left_join(aliases, by = c("onBehalfOf" = "id")) %>% - rename(onBehalfOfAlias = alias) %>% + dplyr::rename(onBehalfOfAlias = alias) %>% select(id,timestamp, type, amount, amountUSD, amountETH, reserve, user, userAlias, onBehalfOf, onBehalfOfAlias, priceInUsd, pool) %>% drop_na() %>% @@ -464,9 +464,9 @@ get_transactions <- function(data) { mutate(priceInEth = as.numeric(priceInEth) / (10^18)) %>% mutate(amountETH = as.numeric(amount) * as.numeric(priceInEth)) %>% left_join(aliases, by = c("user" = "id")) %>% - rename(userAlias = alias) %>% + dplyr::rename(userAlias = alias) %>% left_join(aliases, by = c("onBehalfOf" = "id")) %>% - rename(onBehalfOfAlias = alias) %>% + dplyr::rename(onBehalfOfAlias = alias) %>% select(id, timestamp, type, amount, amountUSD, amountETH, reserve, user, userAlias, onBehalfOf, onBehalfOfAlias, priceInUsd, pool) %>% drop_na() %>% @@ -481,7 +481,7 @@ get_transactions <- function(data) { left_join(reserveParamsHistory, by = c("id" = "txID", "timestamp", "reserve")) %>% mutate(reserve = symbol) %>% left_join(aliases, by = c("user" = "id")) %>% - rename(userAlias = alias) %>% + dplyr::rename(userAlias = alias) %>% select(id, timestamp, type, reserve, user, userAlias, pool, borrowRateModeTo, borrowRateModeFrom, stableBorrowRate = stableBorrowRate.x, variableBorrowRate = variableBorrowRate.x) %>% drop_na() %>%