ABI's from //contract/out URLs; arbsep; placement fee considers upcoming fee changes; vault detection bugfixes; order placement bugfixes; BETA

This commit is contained in:
Tim
2024-07-03 16:18:29 -04:00
parent 104b798d4f
commit d38baccd49
18 changed files with 200 additions and 170 deletions

View File

@@ -1,8 +0,0 @@
<template>
<v-chip text="ALPHA" size='x-small' color="red" class="align-self-start" variant="text"/>
</template>
<script>
export default {
name: 'alpha'
}
</script>

8
src/components/Beta.vue Normal file
View File

@@ -0,0 +1,8 @@
<template>
<v-chip text="BETA" size='x-small' color="red" class="align-self-start" variant="text"/>
</template>
<script>
export default {
name: 'beta'
}
</script>

View File

@@ -2,16 +2,16 @@
<span class="d-inline-flex align-center">
<v-icon icon="mdi-arrow-up-bold" color="primary" class="arrow"/>
<span class="logo">dexorder</span>
<alpha v-if="alpha"/>
<beta v-if="showTag"/>
</span>
</template>
<script setup>
import Alpha from "@/components/Alpha.vue";
import Beta from "@/components/Beta.vue";
const props = defineProps({
alpha: {type: Boolean, default: false}
showTag: {type: Boolean, default: false}
})
</script>

View File

@@ -3,7 +3,7 @@
<v-card v-if="!loggedIn" rounded="0">
<v-card-title>
<!-- <v-icon icon="mdi-hand-wave" color="grey"/>-->
Welcome to Dexorder Alpha!
Welcome to Dexorder Beta!
</v-card-title>
<v-card-text>
This alpha test runs on the Dexorder Testnet blockchain, which gives you free testnet tokens to trade.

View File

@@ -27,8 +27,7 @@
import {useStore} from "@/store/store";
import {computed, ref} from "vue";
import {tokenFloat} from "@/misc.js";
import {contractOrNull} from "@/blockchain/contract.js"
import {vaultAbi} from "@/blockchain/abi.js";
import {vaultContract} from "@/blockchain/contract.js"
import {pendTransaction} from "@/blockchain/wallet.js";
import {FixedNumber} from "ethers";
@@ -50,7 +49,7 @@ function withdraw() {
if( amount === 0n )
return
pendTransaction(async (signer)=>{
const vault = contractOrNull(vaultAddr, vaultAbi, signer)
const vault = await vaultContract(vaultAddr, signer)
return await vault['withdraw(address,uint256)'](props.token.a, amount)
})
floatAmount.value = 0

View File

@@ -1,6 +1,6 @@
<template>
<div class="d-flex mb-1 align-center w-100">
<logo class="d-flex align-end clickable logo-large" @click="nav('Order')" :alpha="true"/>
<logo class="d-flex align-end clickable logo-large" @click="nav('Order')" :show-tag="true"/>
<slot/>
<div class="ml-auto d-flex align-center">
<span class="title mr-4">{{title}}</span>
@@ -19,7 +19,7 @@ import {useStore} from "@/store/store.js";
import {useChartOrderStore} from "@/orderbuild.js";
import {useTheme} from "vuetify";
import ToolbarButton from "@/components/chart/ToolbarButton.vue";
import Alpha from "@/components/Alpha.vue";
import beta from "@/components/Beta.vue";
import Logo from "@/components/Logo.vue";
import {nav} from "@/misc.js";