Merge remote-tracking branch 'origin/master' into orderspec

# Conflicts:
#	src/blockchain/abi.js

src/components/NewOrder.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="d-inline-flex">
     <btn icon="mdi-plus" color="green" @click="show=true">New Order</btn>
+    <btn icon="mdi-delete-alert" color="red" class="mb-6" @click="cancelAll(vaultAddr)">Cancel All Orders</btn>
     <v-dialog v-model="show" width="auto">
       <v-card>
         <v-card-item class="d-flex">
@@ -38,6 +39,11 @@ import Btn from "@/components/Btn.vue";
 const s = useStore()
 const show = ref(false)
 
+import {cancelAll} from "@/blockchain/wallet.js";
+import {computed} from "vue";
+const props = defineProps(['vault'])
+const vaultAddr = computed(()=>props.vault?props.vault:s.vault)
+
 </script>
 
 <style scoped lang="scss">