Merge pull request #317 from ava-labs/dev

Master update

Author: kanatliemre

.eslintrc.js

@@ -15,6 +15,8 @@ module.exports = {
     },
     rules: {
         'no-console': 'off',
+        'no-unused-vars': 'off',
+        'prefer-const': 'off',
         'vue/no-unused-components': 'off',
         'vue/multiline-html-element-content-newline': 'off',
         'no-unreachable': 'off',

package.json

@@ -18,7 +18,7 @@
         "test": "jest --verbose ./tests"
     },
     "dependencies": {
-        "@avalabs/avalanche-wallet-sdk": "0.11.1-beta.3",
+        "@avalabs/avalanche-wallet-sdk": "0.17.3",
         "@avalabs/vue_components": "0.10.0",
         "@ethereumjs/common": "2.0.0",
         "@ethereumjs/tx": "3.0.0",
@@ -32,7 +32,7 @@
         "@ledgerhq/hw-transport-webhid": "^5.51.1",
         "@ledgerhq/hw-transport-webusb": "5.22.0",
         "@obsidiansystems/hw-app-avalanche": "0.2.2",
-        "@openzeppelin/contracts": "^4.4.2",
+        "@openzeppelin/contracts": "4.6.0",
         "@types/big.js": "4.0.5",
         "@types/create-hash": "1.2.2",
         "@types/crypto-js": "^4.0.2",
@@ -44,7 +44,7 @@
         "@types/vue-datetime": "1.0.0",
         "@zxing/library": "0.15.2",
         "abi-decoder": "2.4.0",
-        "avalanche": "3.10.1",
+        "avalanche": "3.15.1",
         "axios": "0.21.2",
         "big.js": "5.2.2",
         "bip32": "2.0.5",
@@ -65,7 +65,7 @@
         "ethereum-blockies-base64": "1.0.2",
         "ethereumjs-tx": "2.1.2",
         "ethereumjs-util": "^7.0.7",
-        "ethers": "^5.3.1",
+        "ethers": "5.6.8",
         "express": "4.17.1",
         "hdkey": "2.0.1",
         "helmet": "3.23.3",
@@ -109,13 +109,15 @@
         "@fortawesome/fontawesome-free": "^5.13.0",
         "@types/jest": "^26.0.0",
         "@types/randomstring": "^1.1.8",
+        "@typescript-eslint/eslint-plugin": "4.33.0",
+        "@typescript-eslint/parser": "4.33.0",
         "@vue/cli-plugin-babel": "^4.1.0",
         "@vue/cli-plugin-eslint": "^4.1.0",
         "@vue/cli-plugin-router": "^4.1.0",
         "@vue/cli-plugin-typescript": "^4.3.1",
         "@vue/cli-plugin-vuex": "^4.1.0",
         "@vue/cli-service": "^4.5.13",
-        "@vue/eslint-config-typescript": "^4.0.0",
+        "@vue/eslint-config-typescript": "7.0.0",
         "@vue/test-utils": "^1.0.3",
         "babel-core": "^7.0.0-bridge.0",
         "cypress": "^4.12.1",
@@ -135,7 +137,7 @@
         "sass": "^1.24.4",
         "sass-loader": "^8.0.2",
         "ts-jest": "^26.1.1",
-        "typescript": "~3.9.5",
+        "typescript": "4.0.8",
         "vue-cli-plugin-vuetify": "^2.0.3",
         "vue-jest": "^3.0.5",
         "vue-template-compiler": "2.6.12",

src/AVA.ts

@@ -7,23 +7,23 @@ import { EVMAPI } from 'avalanche/dist/apis/evm'
 
 // Connect to TestNet by default
 // Doesn't really matter how we initialize, it will get changed by the network module later
-let ip: string = 'bootstrap.ava.network'
-let port: number = 21000
-let protocol: string = 'https'
-let network_id: number = 2
-let chain_id: string = 'X'
-let bintools: BinTools = BinTools.getInstance()
-let ava: Avalanche = new Avalanche(ip, port, protocol, network_id, chain_id)
+const ip: string = 'bootstrap.ava.network'
+const port: number = 21000
+const protocol: string = 'https'
+const network_id: number = 2
+const chain_id: string = 'X'
+const bintools: BinTools = BinTools.getInstance()
+const ava: Avalanche = new Avalanche(ip, port, protocol, network_id, chain_id)
 
-let avm: AVMAPI = ava.XChain()
-let cChain: EVMAPI = ava.CChain()
-let pChain = ava.PChain()
-let infoApi: InfoAPI = ava.Info()
-let keyChain: AVMKeyChain = avm.keyChain()
+const avm: AVMAPI = ava.XChain()
+const cChain: EVMAPI = ava.CChain()
+const pChain = ava.PChain()
+const infoApi: InfoAPI = ava.Info()
+const keyChain: AVMKeyChain = avm.keyChain()
 
 function isValidAddress(addr: string) {
     try {
-        let res = bintools.stringToAddress(addr)
+        const res = bintools.stringToAddress(addr)
         return true
     } catch (err) {
         return false

src/components/SidePanels/History/ViewTypes/ImportExport.vue

@@ -31,7 +31,7 @@ export default class ImportExport extends Vue {
     }
 
     get destinationChainId() {
-        let outs = this.transaction.outputs
+        let outs = this.transaction.outputs || []
 
         for (var i = 0; i < outs.length; i++) {
             let out = outs[i]

src/components/SidePanels/TxHistoryRow.vue

@@ -60,7 +60,10 @@ export default class TxHistoryRow extends Vue {
     }
 
     get hasMultisig() {
-        return this.transaction.outputs.filter((utxo) => utxo.addresses.length > 1).length > 0
+        return (
+            this.transaction.outputs?.filter((utxo) => utxo.addresses.length > 1).length > 0 ||
+            false
+        )
     }
 
     get memo(): string | null {

src/components/misc/AvaxInput.vue

@@ -31,7 +31,7 @@
 <script lang="ts">
 import 'reflect-metadata'
 import { Vue, Component, Prop, Model } from 'vue-property-decorator'
-import { Utils, Big } from '@avalabs/avalanche-wallet-sdk'
+import { Big, bnToBig } from '@avalabs/avalanche-wallet-sdk'
 //@ts-ignore
 import { BigNumInput } from '@avalabs/vue_components'
 import { BN } from 'avalanche'
@@ -65,7 +65,7 @@ export default class AvaxInput extends Vue {
 
     get amountUSD(): Big {
         let usdPrice = this.priceDict.usd
-        let amount = Utils.bnToBig(this.amount, 9)
+        let amount = bnToBig(this.amount, 9)
         let usdBig = amount.times(usdPrice)
         return usdBig
     }

src/components/misc/NftPayloadView/blacklist.ts

@@ -5,7 +5,7 @@ export const URLBLacklist = [`avax-reward.su`]
  * @param url
  */
 export function isUrlBanned(url: string) {
-    for (var i = 0; i < URLBLacklist.length; i++) {
+    for (let i = 0; i < URLBLacklist.length; i++) {
         if (url.includes(URLBLacklist[i])) {
             return true
         }

src/components/misc/ValidatorList/FilterSettings.vue

@@ -115,7 +115,7 @@ export default class FilterSettings extends Vue {
     availableSpace = 25
     activeFilter: null | ValidatorListFilter = null
     count = 0
-    timeout: NodeJS.Timeout | null = null
+    timeout: ReturnType<typeof setTimeout> | null = null
 
     @Prop() validators!: ValidatorListItem[]
     @Watch('validators')

src/components/modals/ExportCsvModal.vue

@@ -106,9 +106,14 @@ export default class ExportCsvModal extends Vue {
     generateCSVData() {
         let myAddresses = this.pAddressesStripped
 
+        // Sort tx by stake end time
+        const txsSorted = this.stakingTxs.sort((a, b) => {
+            return b.validatorEnd - a.validatorEnd
+        })
+
         let rows: CsvRowStakingData[] = []
-        for (var i = 0; i < this.stakingTxs.length; i++) {
-            let tx = this.stakingTxs[i]
+        for (var i = 0; i < txsSorted.length; i++) {
+            let tx = txsSorted[i]
 
             let type = tx.type
             let isRewarded = tx.rewarded
@@ -171,6 +176,7 @@ export default class ExportCsvModal extends Vue {
                     nodeID: nodeID,
                     isRewardOwner: isRewardOwner,
                     isInputOwner: isInputOwner,
+                    rewardDateUnix: tx.validatorEnd,
                 })
             } else {
                 // Skip if user did not want validation rewards
@@ -189,6 +195,7 @@ export default class ExportCsvModal extends Vue {
                     nodeID: nodeID,
                     isRewardOwner: isRewardOwner,
                     isInputOwner: isInputOwner,
+                    rewardDateUnix: tx.validatorEnd,
                 })
             }
         }
@@ -201,6 +208,7 @@ export default class ExportCsvModal extends Vue {
             'Stake Start Date',
             'Stake Duration',
             'Reward Date',
+            'Reward Timestamp (UNIX)',
             'AVAX Price at Reward Date',
             'Reward Received (AVAX)',
             'Reward Received (USD)',

src/components/modals/LedgerBlock.vue

@@ -44,7 +44,7 @@ import { LEDGER_EXCHANGE_TIMEOUT } from '../../store/modules/ledger/types'
 })
 export default class LedgerBlock extends Vue {
     duration: number = LEDGER_EXCHANGE_TIMEOUT / 1000
-    intervalId: NodeJS.Timeout | null = null
+    intervalId: ReturnType<typeof setTimeout> | null = null
 
     open() {
         // @ts-ignore