Fix an edge case in the attribution resolver (#466)

* Fix edge case in attribution resolver

* Remove redundant starbit taker

* Remove additional taker reference

Author: cbovis

src/attributions/definitions/star-bit.json

@@ -12,10 +12,6 @@
     {
       "type": "relayer",
       "feeRecipientAddress": "0xc370d2a5920344aa6b7d8d11250e3e861434cbdd"
-    },
-    {
-      "type": "relayer",
-      "takerAddress": "0x0681e844593a051e2882ec897ecd5444efe19ff2"
     }
   ],
   "categories": []

src/attributions/resolve-attributions.js

@@ -44,23 +44,30 @@ const resolveAttributions = metadata => {
         mapping.senderAddress === undefined),
   );
 
+  const attributions = _.uniqWith(
+    matches.map(match => {
+      const definition = entityDefinitions.find(d =>
+        d.mappings.includes(match),
+      );
+
+      return {
+        id: definition.id,
+        type: match.type,
+      };
+    }),
+    _.isEqual,
+  );
+
   // TODO: Make this guard dynamic based on types constant
-  if (matches.filter(m => m.type === 'relayer').length > 1) {
+  if (attributions.filter(a => a.type === 'relayer').length > 1) {
     throw getErrorForDuplicate('relayer', metadata);
   }
 
-  if (matches.filter(m => m.type === 'consumer').length > 1) {
+  if (attributions.filter(a => a.type === 'consumer').length > 1) {
     throw getErrorForDuplicate('consumer', metadata);
   }
 
-  return matches.map(match => {
-    const definition = entityDefinitions.find(d => d.mappings.includes(match));
-
-    return {
-      id: definition.id,
-      type: match.type,
-    };
-  });
+  return attributions;
 };
 
 module.exports = resolveAttributions;

src/attributions/resolve-attributions.test.js

@@ -78,6 +78,24 @@ describe('attributions/resolveAttributions', () => {
           },
         ],
       },
+      {
+        id: 'a5808078-d297-4fbd-a818-dccd8a5438ed',
+        name: 'STAR BIT',
+        mappings: [
+          {
+            type: 'relayer',
+            feeRecipientAddress: '0x8124071f810d533ff63de61d0c98db99eeb99d64',
+          },
+          {
+            type: 'relayer',
+            feeRecipientAddress: '0xc370d2a5920344aa6b7d8d11250e3e861434cbdd',
+          },
+          {
+            type: 'relayer',
+            takerAddress: '0x0681e844593a051e2882ec897ecd5444efe19ff2',
+          },
+        ],
+      },
     ]);
   });
 
@@ -161,6 +179,17 @@ describe('attributions/resolveAttributions', () => {
     ]);
   });
 
+  it('should resolve relayer when multiple matches exist', () => {
+    const attributions = resolveAttributions({
+      feeRecipientAddress: '0x8124071f810d533ff63de61d0c98db99eeb99d64',
+      takerAddress: '0x0681e844593a051e2882ec897ecd5444efe19ff2',
+    });
+
+    expect(attributions).toEqual([
+      { id: 'a5808078-d297-4fbd-a818-dccd8a5438ed', type: 'relayer' },
+    ]);
+  });
+
   it('should throw an error when multiple matching relayers found', () => {
     expect(() =>
       resolveAttributions({

src/relayers/__snapshots__/get-all-relayers.test.js.snap

@@ -301,9 +301,6 @@ Object {
     "name": "STAR BIT",
     "orderMatcher": true,
     "slug": "star-bit",
-    "takerAddresses": Array [
-      "0x0681e844593a051e2882ec897ecd5444efe19ff2",
-    ],
     "url": "https://www.starbitex.com",
   },
   "switchDex": Object {

src/relayers/relayer-registry.js

@@ -81,7 +81,6 @@ module.exports = {
     name: 'STAR BIT',
     orderMatcher: true,
     slug: 'star-bit',
-    takerAddresses: ['0x0681e844593a051e2882ec897ecd5444efe19ff2'],
     url: 'https://www.starbitex.com',
   },
   tokenJar: {