price subscriptions

src/components/NeedsSigner.vue

@@ -0,0 +1,32 @@
+<template>
+  <NeedsProvider>
+    <slot v-if="ok"/>
+    <phone-card v-if="!ok">
+      <v-card-title><v-icon icon="mdi-reload-alert" color="warning"/> Connect Wallet</v-card-title>
+      <v-card-text>
+        Please select an account to use from your wallet.
+      </v-card-text>
+      <v-card-actions>
+        <v-btn @click="connectWallet">Connect Wallet</v-btn>
+      </v-card-actions>
+    </phone-card>
+  </NeedsProvider>
+</template>
+
+<script setup>
+import {useStore} from "@/store/store";
+import NeedsProvider from "@/components/NeedsProvider.vue";
+import {computed} from "vue";
+import PhoneCard from "@/components/PhoneCard.vue";
+import {connectWallet} from "@/blockchain/wallet.js";
+
+const s = useStore()
+
+const ok = computed(()=>s.address!==null)
+
+</script>
+
+<style scoped lang="scss">
+@use "src/styles/vars" as *;
+
+</style>

src/components/TimedOrderEntry.vue

@@ -84,16 +84,17 @@
 
 <script setup>
 import {useStore} from "@/store/store";
-import {computed, ref} from "vue";
+import {computed, onBeforeUnmount, ref} from "vue";
 import TokenChoice from "@/components/TokenChoice.vue"
 import PhoneCard from "@/components/PhoneCard.vue";
-import {queryHelperContract} from "@/blockchain/contract.js";
 // noinspection ES6UnusedImports
 import {SingletonCoroutine, vAutoSelect} from "@/misc.js";
-import {Exchange, newOrder, newTimeConstraint, TimeMode} from "@/blockchain/orderlib.js";
+import {newOrder, newTimeConstraint, TimeMode} from "@/blockchain/orderlib.js";
 import {FixedNumber} from "ethers";
 import {pendOrder} from "@/blockchain/wallet.js";
 import NeedsProvider from "@/components/NeedsProvider.vue";
+import {subPrices, unsubPrices} from "@/blockchain/prices.js";
+import {findRoute} from "@/blockchain/route.js";
 
 const s = useStore()
 const buy = ref(false)
@@ -131,7 +132,18 @@ const quote = computed(()=>{
   const token = inverted.value ? _tokenA.value : _tokenB.value
   return !token?{}:token
 })
-const routes = ref([])
+const _routes = ref([])
+const routes = computed({
+  get() {
+    return _routes.value
+  },
+  set(value) {
+    console.log('setting new routes', value)
+    subPrices(value)
+    unsubPrices(_routes.value)
+    _routes.value = value
+  }
+})
 const routesPending = ref(false)
 const amount = ref(100) // todo 0
 const amountIsTokenA = ref(false)
@@ -148,47 +160,33 @@ const timeUnitIndex = ref(1)
 const limitIsMinimum = computed(() => !(buy.value ^ inverted.value))
 const validOrder = computed(()=>amount.value > 0 && routes.value.length > 0 )
 
-async function findRoute() {
+
+onBeforeUnmount(() => {
+  unsubPrices(_routes.value)
+})
+
+
+async function componentFindRoute() {
   console.log('finding route', _tokenA.value, _tokenB.value)
   routes.value = []
-  if( !_tokenA.value || !_tokenB.value )
+  if (!_tokenA.value || !_tokenB.value)
     return
-  const helper = await queryHelperContract()
-  if( !helper ) {
-    console.log('no helper')
-    return
-  }
   routesPending.value = true
-  let rawRoutes
   try {
-    rawRoutes = await helper.getRoutes(tokenA.value.address, tokenB.value.address)
+    const result = await findRoute(tokenA.value, tokenB.value)
+    console.log('found route', result)
+    routes.value = result
   }
   catch (e) {
-    console.log('routes exception', e)
+    console.log('ignoring routes exception', e)
+  }
+  finally {
     routesPending.value = false
-    return
   }
-  // todo expose all available pools
-  let result = {} // we actually only find a single pool for now
-  for (let [exchange, fee, pool] of rawRoutes) {
-    exchange = Number(exchange)
-    fee = Number(fee)
-    if (result.fee === undefined || result.fee > fee) {
-      switch (exchange) {
-        case 0: // UniswapV2
-          break
-        case 1: // UniswapV3
-          result = {exchange: Exchange.UniswapV3, pool, fee,}
-          break
-      }
-    }
-  }
-  routes.value = [result]
-  routesPending.value = false
-  console.log('found route', result)
 }
 
-const routeFinder = new SingletonCoroutine(findRoute,10)
+
+const routeFinder = new SingletonCoroutine(componentFindRoute,10)
 routeFinder.invoke()
 
 function toggleTimeUnits() {

src/components/Vault.vue

@@ -59,13 +59,12 @@
 
 <script setup>
 import {useStore} from "@/store/store.js";
-import PhoneCard from "@/components/PhoneCard.vue";
 import {computed, defineAsyncComponent, ref} from "vue";
 import {vaultAddress} from "@/blockchain/contract.js";
 import CopyButton from "@/components/CopyButton.vue";
 import NeedsProvider from "@/components/NeedsProvider.vue";
 import Withdraw from "@/components/Withdraw.vue";
-console.log('vault setup')
+
 const TokenRow = defineAsyncComponent(()=>import('./TokenRow.vue'))
 const s = useStore()