@@ -117,8 +144,15 @@ import { MultisigTx as SignavaultTx } from '@/store/modules/signavault/types'
import { BN } from '@c4tplatform/caminojs/dist'
import { AddressState } from '@c4tplatform/caminojs/dist/apis/platformvm'
import Big from 'big.js'
+import axios from 'axios'
import 'reflect-metadata'
import { Component, Vue, Watch } from 'vue-property-decorator'
+import { AvaNetwork } from '@/js/AvaNetwork'
+import Spinner from '@/components/misc/Spinner.vue'
+import moment from 'moment'
+import { ava } from '@/AVA'
+import { MultisigWallet } from '@/js/wallets/MultisigWallet'
+import { WalletType } from '@/js/wallets/types'
@Component({
name: 'validator',
@@ -131,6 +165,7 @@ import { Component, Vue, Watch } from 'vue-property-decorator'
PendingMultisig,
ValidatorPending,
RewardsNotAvailable,
+ Spinner,
},
})
export default class Validator extends Vue {
@@ -146,6 +181,25 @@ export default class Validator extends Vue {
loadingRefreshRegisterNode: boolean = false
tab: string = 'opt-validator'
pendingValidator: ValidatorRaw | null = null
+ loading: boolean = false
+
+ nodeVersion: string = ''
+ initialized: boolean = false
+
+ startTime: string = ''
+ endTime: string = ''
+ upTime: number = 0
+ reaminingValidation: string = ''
+ bondedAmount: BN = new BN(0)
+ txID: string = ''
+
+ rewardAmount: BN = new BN(0)
+ pChainddress: string = ''
+ isMultisignTx: boolean = false
+ pendingTx: any = undefined
+
+ // @ts-ignore
+ helpers = this.globalHelper()
get multisigPendingNodeTx(): SignavaultTx | undefined {
return this.$store.getters['Signavault/transactions'].find(
@@ -157,6 +211,33 @@ export default class Validator extends Vue {
)
}
+ @Watch('$store.state.activeWallet')
+ async onActiveWalletChange() {
+ this.nodeInfo = null
+ this.nodeId = ''
+ this.pendingValidator = null
+ this.isNodeRegistered = false
+ this.isSuspended = false
+ this.registeredNodeID = ''
+ this.isKycVerified = false
+ this.isConsortiumMember = false
+ this.validatorIsSuspended = false
+ this.loadingRefreshRegisterNode = false
+ this.tab = 'opt-validator'
+ this.loading = false
+ this.nodeVersion = ''
+ this.initialized = false
+ this.startTime = ''
+ this.endTime = ''
+ this.upTime = 0
+ this.reaminingValidation = ''
+ this.bondedAmount = new BN(0)
+ this.txID = ''
+
+ this.evaluateCanRegisterNode()
+ this.updateValidators()
+ }
+
verifyValidatorIsReady(val: ValidatorRaw) {
this.nodeInfo = val
}
@@ -182,8 +263,11 @@ export default class Validator extends Vue {
clearInterval(this.intervalID)
}
- @Watch('$store.state.networkName')
- @Watch('$store.state.activeWallet')
+ hrp() {
+ return ava.getHRP()
+ }
+
+ @Watch('addresses')
async evaluateCanRegisterNode() {
const BN_ONE = new BN(1)
const result = await WalletHelper.getAddressState(this.addresses[0])
@@ -244,6 +328,7 @@ export default class Validator extends Vue {
return (this.$store.state.activeWallet as WalletCore).getStaticAddress('P')
}
+ @Watch('activeNetwork')
get addresses() {
let wallet: MnemonicWallet = this.$store.state.activeWallet
return wallet.getAllAddressesP()
@@ -302,16 +387,197 @@ export default class Validator extends Vue {
}
async refresh() {
- this.loadingRefreshRegisterNode = true
- await this.evaluateCanRegisterNode()
- await this.updateValidators()
- await this.$store.dispatch('Signavault/updateTransaction')
- this.loadingRefreshRegisterNode = false
+ if (this.tab == 'opt-rewards') {
+ await this.getClaimableReward()
+ } else {
+ if (this.multisigPendingNodeTx) {
+ await this.$store.dispatch('Signavault/updateTransaction')
+ await this.evaluateCanRegisterNode()
+ }
+ this.loadingRefreshRegisterNode = true
+ this.loading = true
+ this.$store.dispatch('updateBalances')
+ await this.evaluateCanRegisterNode()
+ await this.updateValidators()
+ await this.$store.dispatch('Signavault/updateTransaction')
+ if (this.nodeInfo) await this.getInformationValidator()
+ this.loading = false
+ this.loadingRefreshRegisterNode = false
+ }
+ }
+
+ async getPendingTransaction() {
+ if (this.isMultisignTx) {
+ let txClaim = this.$store.getters['Signavault/transactions'].find(
+ (item: any) =>
+ item?.tx?.alias === this.pChainddress &&
+ WalletHelper.getUnsignedTxType(item?.tx?.unsignedTx) === 'ClaimTx'
+ )
+ this.pendingTx = txClaim
+ } else {
+ this.pendingTx = undefined
+ }
+ }
+
+ async getClaimableReward() {
+ if (this.nodeInfo == null) return
+
+ let responseClaimable = await WalletHelper.getClaimables(
+ this.nodeInfo.rewardOwner.addresses[0].toString(),
+ this.nodeInfo.txID
+ )
+
+ if (responseClaimable != null && responseClaimable != undefined) {
+ this.rewardAmount = responseClaimable.validatorRewards
+ } else {
+ this.rewardAmount = new BN(0)
+ }
+ }
+
+ async getPChainAddress() {
+ try {
+ if (this.$store.state.activeWallet instanceof MultisigWallet) {
+ let activeWallet: MultisigWallet = this.$store.state.activeWallet
+ let address = activeWallet.getCurrentAddressPlatform()
+ this.pChainddress = address
+ this.isMultisignTx = true
+ } else {
+ let activeWallet: WalletType = this.$store.state.activeWallet
+ let address = await activeWallet.getAllAddressesP()
+ this.pChainddress = address[0]
+ this.isMultisignTx = false
+ }
+ } catch (e) {
+ console.error(e)
+ }
}
get hasValidator(): boolean {
return this.$store.getters['Platform/isValidator'](this.registeredNodeID)
}
+
+ get activeNetwork(): null | AvaNetwork {
+ return this.$store?.state?.Network?.selectedNetwork
+ }
+
+ async fetchNodeVersion() {
+ if (this.activeNetwork && this.activeNetwork.url) {
+ await axios
+ .post(this.activeNetwork.url + '/ext/info', {
+ jsonrpc: '2.0',
+ id: 1,
+ method: 'info.getNodeVersion',
+ })
+ .then((res) => {
+ const data = res.data
+ if (data && data.result && data.result.gitVersion) {
+ this.nodeVersion = data.result.gitVersion.slice(1) // remove v
+ }
+ })
+ .finally(() => {
+ this.initialized = true
+ })
+ }
+ }
+
+ checkNodeVersionFlag(targetVersion: string): boolean {
+ if (!this.initialized) {
+ throw new Error('Provider not initialized yet')
+ }
+
+ if (!this.nodeVersion) {
+ throw new Error('Node version not exists, function uncallable')
+ }
+
+ const versionRegex = /^\d+\.\d+\.\d+(-rc\d+)?$/
+ if (!versionRegex.test(targetVersion)) {
+ throw new Error(
+ `Invalid version format: ${targetVersion}. Correct version is of type major.minor.path e.g 1.2.3-rc2`
+ )
+ }
+
+ const [coreTargetVersion, targetVariant] = targetVersion.split('-')
+ const [coreNodeVersion, nodeVariant] = this.nodeVersion.split('-')
+
+ const [targetMajor, targetMinor, targetPatch] = coreTargetVersion.split('.').map(Number)
+ const [nodeMajor, nodeMinor, nodePatch] = coreNodeVersion.split('.').map(Number)
+
+ if (targetMajor !== nodeMajor) {
+ return targetMajor < nodeMajor
+ }
+
+ if (targetMinor !== nodeMinor) {
+ return targetMinor < nodeMinor
+ }
+
+ if (targetPatch !== nodePatch) {
+ return targetPatch < nodePatch
+ }
+
+ if (nodeVariant) {
+ return targetVariant <= nodeVariant
+ }
+
+ return true
+ }
+
+ formatUptime(uptime: string): number {
+ const versionFlag = this.checkNodeVersionFlag('0.4.10-rc3')
+ const value = versionFlag
+ ? Math.round(parseFloat(uptime))
+ : Math.round(parseFloat(uptime) * 100)
+
+ return value
+ }
+
+ humanizeDuration(duration: moment.Duration) {
+ const years = duration.years()
+ const months = duration.months()
+ const days = duration.days()
+ const hours = duration.hours()
+ const minutes = duration.minutes()
+ const seconds = duration.seconds()
+
+ let result = ''
+ if (years > 0) result += years + (years === 1 ? ' Year ' : ' Years ')
+ if (months > 0) result += months + (months === 1 ? ' Month ' : ' Months ')
+ if (days > 0) result += days + (days === 1 ? ' Day ' : ' Days ')
+ if (hours > 0) result += hours + ' h '
+ if (minutes > 0) result += minutes + ' m '
+ if (seconds > 0) result += seconds + ' s'
+
+ return result.trim()
+ }
+
+ async getInformationValidator() {
+ try {
+ await this.fetchNodeVersion()
+ this.loading = true
+ let today = moment()
+
+ if (this.nodeInfo === null) throw new Error('Node info is null')
+
+ this.startTime = moment(new Date(parseInt(this.nodeInfo.startTime) * 1000)).format(
+ 'MMM Do YYYY, h:mm:ss A'
+ )
+ this.endTime = moment(new Date(parseInt(this.nodeInfo.endTime) * 1000)).format(
+ 'MMM Do YYYY, h:mm:ss A'
+ )
+ this.upTime = this.formatUptime(this.nodeInfo.uptime)
+
+ var reaminingValidationDuration = moment.duration(
+ moment(new Date(parseInt(this.nodeInfo.endTime) * 1000)).diff(today)
+ )
+
+ this.reaminingValidation = this.humanizeDuration(reaminingValidationDuration)
+ this.bondedAmount = new BN(parseFloat(this.nodeInfo.stakeAmount) / 1000000000)
+ this.txID = this.nodeInfo.txID
+ } catch (e) {
+ console.error(e)
+ } finally {
+ this.loading = false
+ }
+ }
}
+
diff --git a/vue.config.js b/vue.config.js
deleted file mode 100644
index e69de29bb..000000000
diff --git a/webpack.common.js b/webpack.common.js
index 0f1d8c85d..fe81a2467 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -81,6 +81,7 @@ module.exports = {
'./mountsaveKyesButton': './src/views/wallet/mountSaveKeysButton.ts',
'./mountMultisigWalletSetting': './src/views/mountMultisigWalletSetting.ts',
'./mountVersionComponent': './src/components/misc/mountVersion.ts',
+ './mountCreateOfferForm': './src/components/wallet/earn/mountCreateOfferForm.ts',
},
}),
new HtmlWebPackPlugin({
diff --git a/yarn.lock b/yarn.lock
index 488bf38a6..798026e4d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11,6 +11,11 @@
event-pubsub "4.3.0"
js-message "1.0.7"
+"@adraffy/ens-normalize@1.8.9":
+ version "1.8.9"
+ resolved "https://registry.yarnpkg.com/@adraffy/ens-normalize/-/ens-normalize-1.8.9.tgz#67b3acadebbb551669c9a1da15fac951db795b85"
+ integrity sha512-93OmGCV0vO8+JQ3FHG+gZk/MPHzzMPDRiCiFcCQNTCnHaaxsacO3ScTPGlu2wX2dOtgfalbchPcw1cOYYjHCYQ==
+
"@ampproject/remapping@^2.2.0":
version "2.2.1"
resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630"
@@ -1062,25 +1067,25 @@
assert "2.0.0"
axios "^0.26.1"
bech32 "^2.0.0"
- bip39 "^3.0.4"
+ bip39 "3.1.0"
bn.js "5.1.1"
buffer "^5.5.0"
create-hash "1.2.0"
crypto-browserify "3.12.0"
elliptic "6.5.4"
- ethers "^5.7.0"
- hdkey "2.0.1"
+ ethers "6.0.8"
+ hdkey "2.1.0"
isomorphic-ws "5.0.0"
randombytes "^2.1.0"
store2 "2.14.2"
stream-browserify "3.0.0"
- ws "8.8.1"
+ ws "8.12.1"
xss "1.0.14"
-"@c4tplatform/signavaultjs@^1.0.11":
- version "1.0.11"
- resolved "https://registry.yarnpkg.com/@c4tplatform/signavaultjs/-/signavaultjs-1.0.11.tgz#6471a657c3ef6ed23b7c2f29953a72caf1050f90"
- integrity sha512-t0vb7mmKgqTyfzUvtGgZ78yPuTJOfgLpXnK9JZ4hGH1w7k+2eCtaWXwxf+VFvfDpArCK06xgZzya0HZrM6mn/w==
+"@c4tplatform/signavaultjs@^1.1":
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/@c4tplatform/signavaultjs/-/signavaultjs-1.1.0.tgz#cae4bf9bce1d270cb7f538775f7f7dde29ba8c1a"
+ integrity sha512-Aykw4Dad3f/6eRbhExZoitLrLhRMmeXauSbXJCItnqlf1h+4T4yDhDi3rQ8P99D8KCrY+OFBD379+x0UhtuVNg==
dependencies:
axios "^1.3.4"
create-hash "^1.2.0"
@@ -2295,6 +2300,11 @@
dependencies:
"@noble/hashes" "1.3.0"
+"@noble/hashes@1.1.2":
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.1.2.tgz#e9e035b9b166ca0af657a7848eb2718f0f22f183"
+ integrity sha512-KYRCASVTv6aeUi1tsF8/vpyR7zpfs3FUzy2Jqm+MU+LmUKhQ0y2FpfwqkCcxSg2ua4GALJd8k2R76WxwZGbQpA==
+
"@noble/hashes@1.3.0":
version "1.3.0"
resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.3.0.tgz#085fd70f6d7d9d109671090ccae1d3bec62554a1"
@@ -2305,6 +2315,11 @@
resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.3.1.tgz#8831ef002114670c603c458ab8b11328406953a9"
integrity sha512-EbqwksQwz9xDRGfDST86whPBgM65E0OH/pCgqW0GBVzO22bNE+NuIbeTb714+IfSjU3aRk47EUvXIb5bTsenKA==
+"@noble/secp256k1@1.7.1":
+ version "1.7.1"
+ resolved "https://registry.yarnpkg.com/@noble/secp256k1/-/secp256k1-1.7.1.tgz#b251c70f824ce3ca7f8dc3df08d58f005cc0507c"
+ integrity sha512-hOUk6AyBFmqVrv7k5WAw/LpszxVbj9gGN4JRkIX52fdFAj1UA61KXmZDvqVEm+pOyec3+fIeZB02LYa/pWOArw==
+
"@node-ipc/js-queue@2.0.3":
version "2.0.3"
resolved "https://registry.yarnpkg.com/@node-ipc/js-queue/-/js-queue-2.0.3.tgz#ac7fe33d766fa53e233ef8fedaf3443a01c5a4cd"
@@ -4037,6 +4052,11 @@ aes-js@3.0.0:
resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.0.0.tgz#e21df10ad6c2053295bcbb8dab40b09dbea87e4d"
integrity sha512-H7wUZRn8WpTq9jocdxQ2c8x2sKo9ZVmzfRE13GiNJXfp7NcKYEdvl3vspKjXox6RIG2VtaRe4JFvxG4rqp2Zuw==
+aes-js@4.0.0-beta.3:
+ version "4.0.0-beta.3"
+ resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-4.0.0-beta.3.tgz#da2253f0ff03a0b3a9e445c8cbdf78e7fda7d48c"
+ integrity sha512-/xJX0/VTPcbc5xQE2VUP91y1xN8q/rDfhEzLm+vLc3hYvb5+qHCnpJRuFcrKn63zumK/sCwYYzhG8HP78JYSTA==
+
agent-base@6, agent-base@^6.0.0, agent-base@^6.0.2:
version "6.0.2"
resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
@@ -4866,7 +4886,7 @@ bip32@^2.0.6:
typeforce "^1.11.5"
wif "^2.0.6"
-bip39@^3.0.4:
+bip39@3.1.0, bip39@^3.0.4:
version "3.1.0"
resolved "https://registry.yarnpkg.com/bip39/-/bip39-3.1.0.tgz#c55a418deaf48826a6ceb34ac55b3ee1577e18a3"
integrity sha512-c9kiwdk45Do5GL0vJMe7tS95VjCii65mYAH7DfWl3uW8AVzXKQVUm64i3hzVybBDMp9r7j9iNxR85+ul8MdN/A==
@@ -7890,7 +7910,19 @@ ethereumjs-util@^7.0.7, ethereumjs-util@^7.1.0, ethereumjs-util@^7.1.1, ethereum
ethereum-cryptography "^0.1.3"
rlp "^2.2.4"
-ethers@^5.7.0, ethers@^5.7.2:
+ethers@6.0.8:
+ version "6.0.8"
+ resolved "https://registry.yarnpkg.com/ethers/-/ethers-6.0.8.tgz#a02e31f2771b66ecab6c731c1141b30d9de09174"
+ integrity sha512-j5smdMwn4t4vEARcfUv54mTJ2NMCorYLL51wPjFInEnrRr2SF5Sl9a7Z4DXS8UO1fBJVGHnjDDrF1b7msY3f7Q==
+ dependencies:
+ "@adraffy/ens-normalize" "1.8.9"
+ "@noble/hashes" "1.1.2"
+ "@noble/secp256k1" "1.7.1"
+ aes-js "4.0.0-beta.3"
+ tslib "2.4.0"
+ ws "8.5.0"
+
+ethers@^5.7.2:
version "5.7.2"
resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.2.tgz#3a7deeabbb8c030d4126b24f84e525466145872e"
integrity sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg==
@@ -9279,6 +9311,16 @@ hdkey@2.0.1:
safe-buffer "^5.1.1"
secp256k1 "^4.0.0"
+hdkey@2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/hdkey/-/hdkey-2.1.0.tgz#755b30b73f54e93c31919c1b2f19205a8e57cb92"
+ integrity sha512-i9Wzi0Dy49bNS4tXXeGeu0vIcn86xXdPQUpEYg+SO1YiO8HtomjmmRMaRyqL0r59QfcD4PfVbSF3qmsWFwAemA==
+ dependencies:
+ bs58check "^2.1.2"
+ ripemd160 "^2.0.2"
+ safe-buffer "^5.1.1"
+ secp256k1 "^4.0.0"
+
he@1.2.x, he@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
@@ -14755,7 +14797,7 @@ rimraf@^3.0.0, rimraf@^3.0.2:
dependencies:
glob "^7.1.3"
-ripemd160@^2.0.0, ripemd160@^2.0.1:
+ripemd160@^2.0.0, ripemd160@^2.0.1, ripemd160@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
@@ -16350,6 +16392,11 @@ tsconfig@^7.0.0:
strip-bom "^3.0.0"
strip-json-comments "^2.0.0"
+tslib@2.4.0:
+ version "2.4.0"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
+ integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
+
tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
version "1.14.1"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
@@ -18134,10 +18181,15 @@ ws@7.4.6:
resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
-ws@8.8.1:
- version "8.8.1"
- resolved "https://registry.yarnpkg.com/ws/-/ws-8.8.1.tgz#5dbad0feb7ade8ecc99b830c1d77c913d4955ff0"
- integrity sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==
+ws@8.12.1:
+ version "8.12.1"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-8.12.1.tgz#c51e583d79140b5e42e39be48c934131942d4a8f"
+ integrity sha512-1qo+M9Ba+xNhPB+YTWUlK6M17brTut5EXbcBaMRN5pH5dFrXz7lzz1ChFSUq3bOUl8yEvSenhHmYUNJxFzdJew==
+
+ws@8.5.0:
+ version "8.5.0"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f"
+ integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==
ws@^3.0.0:
version "3.3.3"