Update circles-core dependency and use new pathfinder service (#630)

* Update circles-core dependency

* Avoid retry loops in token.transfer and token.findTransitiveTransfer when pathfindeType is cli

* Update npm dependencies at patch level

* Add new env vars to webpack config

* Update npm dependencies at minor level

* Update deocumentation on .env

* Update circles-core dependencies

* Add an exception when txHash is null and display user error notification

* Update message transfer error for path not found

---------

Co-authored-by: JacqueGM <jacquemate@riseup.net>
Co-authored-by: miko <mikozet2@gmail.com>

.env.example

@@ -10,11 +10,16 @@ ETHEREUM_NODE_WS=ws://localhost:8545
 # Service Endpoints
 API_SERVICE_EXTERNAL=http://api.circles.local
 GRAPH_NODE_EXTERNAL=http://graph.circles.local
+PATHFINDER_SERVICE_ENDPOINT=http://localhost:8081
 RELAY_SERVICE_EXTERNAL=http://relay.circles.local
 
 # Database Endpoints
 DATABASE_SOURCE=graph
 
+# Pathfinder Type 'cli' or 'server'.
+# The core library can get the transfer steps from a pathfinder service ('server'), or from the circles-api that uses the cli tool ('cli')
+PATHFINDER_TYPE=server
+
 # Smart Contract addresses of 1.3.0 version
 HUB_ADDRESS=0xCfEB869F69431e42cdB54A4F4f105C19C080A601
 PROXY_FACTORY_ADDRESS=0x9b1f7F645351AF3631a656421eD2e40f2802E6c0

locales/en.json

@@ -340,7 +340,7 @@
     "errorMessage": "Something went wrong .. {errorMessage}",
     "errorMessageCannotBeCalculated": "Maximum amount cannot be calculated at this time.",
     "errorMessageTransferInvalid": "Could not transfer Circles as it is invalid.",
-    "errorMessageTransferNotFound": "Could not transfer Circles as there is currently no complete trust path between @{username} and you ..",
+    "errorMessageTransferNotFound": "The transaction to @{username} could not be completed due to the trust paths. Try smaller amounts.",
     "errorMessageTransferTooComplex": "Could not transfer Circles as there are too many hops required to send Circles to @{username}. Consider sending a smaller amount and ask @{username} to trust you directly to make this transfer easier.",
     "errorMessageTransferUnknown": "Could not transfer Circles. Something went wrong!",
     "formAmount": "Enter amount",

src/components/ButtonWobbly.js

@@ -56,7 +56,6 @@ const ButtonWobbly = ({
   isReady,
   isPending,
   onClick,
-  to,
 }) => {
   const classes = useStyles();
   const IconElement = iconSelector(icon);

src/store/token/actions.js

@@ -315,30 +315,41 @@ export function transfer(
       const value = new web3.utils.BN(
         core.utils.toFreckles(tcToCrc(Date.now(), Number(amount))),
       );
-      const txHash = await loopTransfer(
-        from,
-        to,
-        value,
-        paymentNote,
-        hops,
-        attempts,
-      );
+      let txHash;
 
-      dispatch(
-        addPendingActivity({
-          txHash,
-          type: ActivityTypes.HUB_TRANSFER,
-          data: {
-            from,
-            to,
-            value: value.toString(),
-          },
-        }),
-      );
+      if (process.env.PATHFINDER_TYPE === 'cli') {
+        txHash = await loopTransfer(
+          from,
+          to,
+          value,
+          paymentNote,
+          hops,
+          attempts,
+        );
+      } else {
+        txHash = await core.token.transfer(from, to, value, paymentNote);
+      }
 
-      dispatch({
-        type: ActionTypes.TOKEN_TRANSFER_SUCCESS,
-      });
+      if (txHash !== null) {
+        dispatch(
+          addPendingActivity({
+            txHash,
+            type: ActivityTypes.HUB_TRANSFER,
+            data: {
+              from,
+              to,
+              value: value.toString(),
+            },
+          }),
+        );
+
+        dispatch({
+          type: ActionTypes.TOKEN_TRANSFER_SUCCESS,
+        });
+      } else {
+        // "TransactionServiceException: execution reverted" as an example coming from  core.token.transfer
+        throw new TransferError();
+      }
     } catch (error) {
       dispatch({
         type: ActionTypes.TOKEN_TRANSFER_ERROR,

src/utils/findPath.js

@@ -11,7 +11,7 @@ const LARGE_AMOUNT = new web3.utils.BN(
   web3.utils.toWei('1000000000000000', 'ether'),
 );
 
-// Recursive helper function for findMaxFlow
+// Recursive helper function for findMaxFlow recursively reducing number of hops
 async function loopFindMaxFlow(
   from,
   to,
@@ -60,14 +60,26 @@ async function loopFindMaxFlow(
  * @returns nothing. Updates MaxFlow state in Freckles.
  */
 export async function findMaxFlow(from, to, setMaxFlow) {
-  // First attempting via API
+  // First attempting via API.
+  // The API parameters depends on the Pathfinder Type in use:
+  // The 'cli' uses hops, but this option is not available in the 'server'.
+  // Therefore we set the attemptsLeft and the hops option will be ignored.
   try {
-    const response = await loopFindMaxFlow(
-      from,
-      to,
-      PATHFINDER_HOPS_DEFAULT,
-      PATHFINDER_HOPS_DEFAULT,
-    );
+    let response;
+    if (process.env.PATHFINDER_TYPE === 'cli') {
+      response = await loopFindMaxFlow(
+        from,
+        to,
+        PATHFINDER_HOPS_DEFAULT,
+        PATHFINDER_HOPS_DEFAULT,
+      );
+    } else {
+      response = await core.token.findTransitiveTransfer(
+        from,
+        to,
+        LARGE_AMOUNT,
+      );
+    }
 
     // Throw an error when no path was found, we should try again with
     // checking direct sends as the API might not be in sync yet

src/views/SendConfirm.js

@@ -152,6 +152,8 @@ const SendConfirm = () => {
           messageId = 'Invalid';
         } else if (error.code === ErrorCodes.TRANSFER_NOT_FOUND) {
           messageId = 'NotFound';
+        } else if (error.code === ErrorCodes.UNKNOWN_ERROR) {
+          messageId = 'Unknown';
         }
         text = translate('SendConfirm.errorMessageTransfer' + messageId, {
           amount,