Preventing user from paying hub if channel is not in open state (#349)

* Preventing user from paying hub if channel is not in open state * Fixed block address input unit test
raiden-network · Sep 26, 2019 · 97268ff · 97268ff
1 parent c6ce813
commit 97268ff
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 25 deletions.
diff --git a/raiden-dapp/src/components/AddressInput.vue b/raiden-dapp/src/components/AddressInput.vue
@@ -71,6 +71,13 @@ export default class AddressInput extends Mixins(BlockieMixin) {
   })
   exclude!: Array<string>;
 
+  @Prop({
+    default: function() {
+      return [''];
+    }
+  })
+  block!: Array<string>;
+
   address: string = '';
 
   valid: boolean = false;
@@ -106,6 +113,10 @@ export default class AddressInput extends Mixins(BlockieMixin) {
       this.errorMessages.push(this.$t(
         'address-input.error.invalid-excluded-address'
       ) as string);
+    } else if (this.block.includes(value)) {
+      this.errorMessages.push(this.$t(
+        'address-input.error.channel-not-open'
+      ) as string);
     } else if (
       AddressUtils.isAddress(value) &&
       !AddressUtils.checkAddressChecksum(value)
@@ -247,7 +258,6 @@ export default class AddressInput extends Mixins(BlockieMixin) {
   line-height: 16px;
 
   .v-messages__wrapper {
-    height: 25px;
     display: flex;
     flex-direction: column;
     align-items: start;

diff --git a/raiden-dapp/src/locales/en.json b/raiden-dapp/src/locales/en.json
@@ -10,7 +10,8 @@
       "no-checksum": "Please enter an address in checksum format. You can convert your address on https://ethsum.netlify.com",
       "empty": "Please enter an address or ENS name",
       "ens-resolve-failed": "Please enter a resolvable ENS name",
-      "invalid-excluded-address": "Please enter a different address or ENS name. You can't use your own address or the address of the token network."
+      "invalid-excluded-address": "Please enter a different address or ENS name. You can't use your own address or the address of the token network.",
+      "channel-not-open": "Please enter a hub address you have an open channel with."
     }
   },
   "amount-input": {

diff --git a/raiden-dapp/src/views/Payment.vue b/raiden-dapp/src/views/Payment.vue
@@ -53,6 +53,7 @@
           <address-input
             v-model="target"
             :exclude="[token.address, defaultAccount]"
+            :block="blockedHubs"
           ></address-input>
         </v-flex>
       </v-layout>
@@ -115,7 +116,7 @@ import ActionButton from '@/components/ActionButton.vue';
 import ChannelDeposit from '@/components/ChannelDeposit.vue';
 import { BigNumber } from 'ethers/utils';
 import { mapGetters, mapState } from 'vuex';
-import { RaidenChannel } from 'raiden-ts';
+import { RaidenChannel, ChannelState } from 'raiden-ts';
 import { Zero } from 'ethers/constants';
 
 @Component({
@@ -131,7 +132,7 @@ import { Zero } from 'ethers/constants';
   },
   computed: {
     ...mapState(['defaultAccount']),
-    ...mapGetters(['channelWithBiggestCapacity'])
+    ...mapGetters(['channelWithBiggestCapacity', 'channels'])
   }
 })
 export default class Payment extends Vue {
@@ -147,10 +148,18 @@ export default class Payment extends Vue {
   errorTitle: string = '';
   error: string = '';
 
+  channels!: (tokenAddress: string) => RaidenChannel[];
+
   channelWithBiggestCapacity!: (
     tokenAddress: string
   ) => RaidenChannel | undefined;
 
+  get blockedHubs(): string[] {
+    return this.channels(this.token.address)
+      .filter((channel: RaidenChannel) => channel.state !== ChannelState.open)
+      .map((channel: RaidenChannel) => channel.partner as string);
+  }
+
   get capacity(): BigNumber {
     const withBiggestCapacity = this.channelWithBiggestCapacity(
       this.token.address

diff --git a/raiden-dapp/tests/unit/components/address-input.spec.ts b/raiden-dapp/tests/unit/components/address-input.spec.ts
@@ -17,15 +17,17 @@ describe('AddressInput', function() {
   let wrapper: Wrapper<AddressInput>;
   let raiden: Mocked<RaidenService>;
   let mockIdenticon: jest.Mock<any, any>;
-  const excludedAddress: string = '0x65E84e07dD79F3f03d72bc0fab664F56E6C55909';
+  const excludeAddress: string = '0x65E84e07dD79F3f03d72bc0fab664F56E6C55909';
+  const blockAddress: string = '0x123456789009876543211234567890';
 
   beforeEach(() => {
     mockIdenticon = jest.fn().mockResolvedValue('');
     raiden = new RaidenService(store) as Mocked<RaidenService>;
     wrapper = mount(AddressInput, {
       propsData: {
         value: '',
-        exclude: [excludedAddress]
+        exclude: [excludeAddress],
+        block: [blockAddress]
       },
       mocks: {
         $raiden: raiden,
@@ -156,9 +158,9 @@ describe('AddressInput', function() {
     });
   });
 
-  describe('excluded', () => {
+  describe('exclude & block address', () => {
     it('should show error message if excluded address is entered', async () => {
-      mockInput(wrapper, excludedAddress);
+      mockInput(wrapper, excludeAddress);
       await wrapper.vm.$nextTick();
 
       const messages = wrapper.find('.v-messages__message');
@@ -168,7 +170,16 @@ describe('AddressInput', function() {
       );
     });
 
-    it('should not show error message if there is no exclude prop', async () => {
+    it('should show error message if blocked address is entered', async () => {
+      mockInput(wrapper, blockAddress);
+      await wrapper.vm.$nextTick();
+
+      const messages = wrapper.find('.v-messages__message');
+      expect(messages.exists()).toBe(true);
+      expect(messages.text()).toBe('address-input.error.channel-not-open');
+    });
+
+    it('should not show error message if there is no exclude or block prop', async () => {
       wrapper = mount(AddressInput, {
         propsData: {
           value: ''
@@ -182,7 +193,7 @@ describe('AddressInput', function() {
         }
       });
 
-      mockInput(wrapper, excludedAddress);
+      mockInput(wrapper, excludeAddress);
       await wrapper.vm.$nextTick();
 
       const messages = wrapper.find('.v-messages__message');

diff --git a/raiden-dapp/tests/unit/views/payment.spec.ts b/raiden-dapp/tests/unit/views/payment.spec.ts
@@ -42,6 +42,21 @@ describe('Payment.vue', () => {
     name: 'Test Token'
   };
 
+  const channel = {
+    capacity: One,
+    balance: Zero,
+    ownDeposit: One,
+    partnerDeposit: Zero,
+    partner: '0xaddr' as any,
+    token: '0xtoken' as any,
+    state: ChannelState.open,
+    settleTimeout: 500,
+    tokenNetwork: '0xtokennetwork' as any,
+    closeBlock: undefined,
+    openBlock: 12346,
+    id: 1
+  } as RaidenChannel;
+
   function vueFactory(
     router: VueRouter,
     raiden: RaidenService
@@ -54,21 +69,9 @@ describe('Payment.vue', () => {
       vuetify,
       store: new Store({
         getters: {
-          channelWithBiggestCapacity: jest.fn().mockReturnValue(() => ({
-            capacity: One,
-            balance: Zero,
-            ownDeposit: One,
-            partnerDeposit: Zero,
-            partner: '0xaddr' as any,
-            token: '0xtoken' as any,
-            state: ChannelState.open,
-            settleTimeout: 500,
-            tokenNetwork: '0xtokennetwork' as any,
-            closeBlock: undefined,
-            openBlock: 12346,
-            id: 1
-          })),
-          defaultAddress: jest.fn().mockReturnValue(['0x1234567890'])
+          channelWithBiggestCapacity: jest.fn().mockReturnValue(() => channel),
+          defaultAddress: jest.fn().mockReturnValue(['0x1234567890']),
+          channels: jest.fn().mockReturnValue(() => [channel])
         }
       }),
       mocks: {