refactor

Author: hanjukim

.envrc_sample

@@ -16,7 +16,5 @@ export CHAIN_ID=tequila-0004
 export LCD_URI=https://tequila-lcd.terra.dev
 export FCD_URI=https://tequila-fcd.terra.dev
 export RPC_URI=
-export MIRROR_GRAPH_URI=https://tequila-graph.mirror.finance/graphql
-export STATION_STATUS_JSON=https://terra.money/station/version-web.json
 export SENTRY_DSN=
 #export USE_LOG_FILE=true

README.md

@@ -15,13 +15,8 @@
 
 ## Prerequisites
 
-1. `Node.js` version 14 or later
-1. `PostgreSQL` version 12 or later
-
-### Terra Core
-
-1. Setup a LCD
-1. Configure firewall ([Reference](https://docs.terra.money/How-to/Run-a-full-Terra-node/Set-up-production-environment.html#configure-the-firewall))
+1. `Node.js` v16.x or later
+1. `PostgreSQL` v12.x or later
 
 ## Project setup
 
@@ -79,7 +74,6 @@ module.exports = {
 | SENTRY_DSN          | Sentry DSN for error management (optional)                     |                                                                                        | API, Collector |
 | SERVER_PORT         | Listening port for API server                                  | 3060                                                                                   | API            |
 | FCD_URI             | FCD URI for Terra network                                      | https://bombay-fcd.terra.dev                                                           | API            |
-| STATION_STATUS_JSON | URL for Station version control                                | https://terra.money/station/version-web.json                                           | API            |
 | DISABLE_API         | Disable REST APIs                                              | false                                                                                  | API            |
 | EXCLUDED_ROUTES     | List of regular expression string for excluding routes         | []                                                                                     | API            |
 | MIN_GAS_PRICES      | Minimum gas price by denom object                              | {"uluna": "5.0"} | API            |

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "fcd",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.2",
   "description": "Terra FCD Suite",
   "main": "index.js",
   "author": "Terra Engineering <engineering@terra.money>",
@@ -10,7 +10,7 @@
     "url": "https://github.com/terra-money/fcd.git"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16"
   },
   "scripts": {
     "prettier": "prettier --write './src/**/*.ts'",

package.json

@@ -24,7 +24,7 @@ function extractAddressFromMsg(msg: Transaction.Message): string[] {
     }
   }
 
-  extractAddressesFromValue(msg.value)
+  extractAddressesFromValue(msg)
   return addrs
 }
 
@@ -45,6 +45,7 @@ function extractAddressFromLog(log: Transaction.Log) {
 export function generateAccountTxs(tx: TxEntity): AccountTxEntity[] {
   const msgs = tx.data.tx.body.messages
   const logs = tx.data.logs
+
   const addrs = msgs.map(extractAddressFromMsg).flat()
 
   if (logs) {

src/collector/block/accountTx.ts

@@ -3,7 +3,6 @@ const {
   LCD_URI,
   FCD_URI,
   RPC_URI,
-  STATION_STATUS_JSON,
   SENTRY_DSN,
   USE_LOG_FILE,
   DISABLE_API,
@@ -35,7 +34,6 @@ const config = {
   LCD_URI: LCD_URI || 'https://bombay-lcd.terra.dev',
   FCD_URI: FCD_URI || 'https://bombay-fcd.terra.dev',
   RPC_URI: RPC_URI || 'http://localhost:26657',
-  STATION_STATUS_JSON_URL: STATION_STATUS_JSON || 'https://terra.money/station/version-web.json',
   BANK_WALLETS: BANK_WALLETS ? (JSON.parse(BANK_WALLETS) as string[]) : [],
   TOKEN_NETWORK: TOKEN_NETWORK,
   SENTRY_DSN,

src/config.ts

@@ -26,14 +26,15 @@ interface DelayedVestingAccount {
 }
 
 interface VestingPeriod {
-  length: string
+  length: string // unit: seconds
   amount: Coins
 }
 
 interface PeriodicVestingAccount {
   '@type': '/cosmos.vesting.v1beta1.PeriodicVestingAccount'
   base_vesting_account: BaseVestingAccount
   start_time: string
+  // linear vesting from start_time to period.length (seconds)
   vesting_periods: VestingPeriod[]
 }
 

src/types/account.d.ts

@@ -17,13 +17,10 @@ declare namespace Transaction {
     }[]
   }
 
-  interface Message {
-    type: string
-    value: { [key: string]: any }
-  }
+  type Message = { [key: string]: any }
 
   interface Body {
-    messages: { [key: string]: any }[]
+    messages: Message[]
     memo: string
     timeout_height?: string
   }