Update circles-core dependency and use new pathfinder service

.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 stpes 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

package.json

@@ -25,12 +25,12 @@
     "test:watch": "npm run test -- --watch"
   },
   "devDependencies": {
-    "@babel/core": "^7.20.12",
-    "@babel/eslint-parser": "^7.19.1",
+    "@babel/core": "^7.21.3",
+    "@babel/eslint-parser": "^7.21.3",
     "@babel/node": "^7.20.7",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
-    "@babel/plugin-transform-runtime": "^7.19.6",
+    "@babel/plugin-transform-runtime": "^7.21.0",
     "@babel/preset-env": "^7.20.2",
     "@babel/preset-react": "^7.18.6",
     "@svgr/webpack": "^5.5.0",
@@ -41,7 +41,7 @@
     "css-loader": "^5.2.7",
     "dotenv": "^10.0.0",
     "eslint": "^7.32.0",
-    "eslint-config-prettier": "^8.6.0",
+    "eslint-config-prettier": "^8.8.0",
     "eslint-loader": "^4.0.2",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-prettier": "^3.4.1",
@@ -50,24 +50,24 @@
     "file-loader": "^6.2.0",
     "html-webpack-plugin": "^4.5.2",
     "jest": "^27.5.1",
-    "prettier": "^2.8.3",
+    "prettier": "^2.8.7",
     "rimraf": "^3.0.2",
     "style-loader": "^2.0.0",
     "terser-webpack-plugin": "^4.2.3",
-    "truffle": "^5.7.4",
+    "truffle": "^5.8.1",
     "webpack": "^4.46.0",
     "webpack-cli": "^3.3.12",
     "webpack-dev-server": "^3.11.3"
   },
   "dependencies": {
-    "@circles/core": "^3.2.1",
+    "@circles/core": "^4.0.1",
     "@circles/timecircles": "^1.0.6",
     "@material-ui/core": "^4.12.4",
     "@material-ui/lab": "^4.0.0-alpha.61",
     "@sentry/browser": "^6.19.7",
     "@sentry/tracing": "^6.19.7",
     "@zxing/library": "^0.19.2",
-    "bip39": "^3.0.4",
+    "bip39": "^3.1.0",
     "clipboard": "^2.0.11",
     "clsx": "^1.2.1",
     "compress.js": "^1.2.2",
@@ -79,7 +79,7 @@
     "mime": "^2.6.0",
     "notistack": "^1.0.10",
     "qrcode": "^1.5.1",
-    "qs": "^6.11.0",
+    "qs": "^6.11.1",
     "react": "^17.0.2",
     "react-div-100vh": "^0.7.0",
     "react-dom": "^17.0.2",
@@ -90,6 +90,6 @@
     "redux-create-action-types": "^2.1.0",
     "redux-logger": "^3.0.6",
     "redux-thunk": "^2.4.2",
-    "web3": "^1.8.2"
+    "web3": "^1.9.0"
   }
 }

src/components/ButtonWobbly.js

@@ -4,10 +4,7 @@ import clsx from 'clsx';
 import PropTypes from 'prop-types';
 import React from 'react';
 
-import {
-  IconWobblyCircle,
-  iconSelector,
-} from '~/styles/icons';
+import { IconWobblyCircle, iconSelector } from '~/styles/icons';
 
 const useStyles = makeStyles((theme) => ({
   buttonWobbly: {
@@ -59,7 +56,6 @@ const ButtonWobbly = ({
   isReady,
   isPending,
   onClick,
-  to,
 }) => {
   const classes = useStyles();
   const IconElement = iconSelector(icon);
@@ -91,8 +87,8 @@ ButtonWobbly.propTypes = {
   children: PropTypes.node.isRequired,
   className: PropTypes.string,
   icon: PropTypes.function,
-  isReady: PropTypes.bool,
   isPending: PropTypes.bool,
+  isReady: PropTypes.bool,
   onClick: PropTypes.function,
   to: PropTypes.string,
 };

src/services/core.js

@@ -9,6 +9,8 @@ const core = new CirclesCore(web3, {
   fallbackHandlerAddress: process.env.SAFE_DEFAULT_CALLBACK_HANDLER,
   graphNodeEndpoint: process.env.GRAPH_NODE_EXTERNAL,
   hubAddress: process.env.HUB_ADDRESS,
+  pathfinderServiceEndpoint: process.env.PATHFINDER_SERVICE_ENDPOINT,
+  pathfinderType: process.env.PATHFINDER_TYPE,
   proxyFactoryAddress: process.env.PROXY_FACTORY_ADDRESS,
   relayServiceEndpoint: process.env.RELAY_SERVICE_EXTERNAL,
   safeMasterAddress: process.env.SAFE_ADDRESS,

src/store/token/actions.js

@@ -315,15 +315,19 @@ 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;
+      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(
         addPendingActivity({
           txHash,

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

webpack.config.babel.js

@@ -16,6 +16,8 @@ const CONFIG_KEYS = [
   'GRAPH_NODE_EXTERNAL',
   'HUB_ADDRESS',
   'NODE_ENV',
+  'PATHFINDER_SERVICE_ENDPOINT',
+  'PATHFINDER_TYPE',
   'PROXY_FACTORY_ADDRESS',
   'RELAY_SERVICE_EXTERNAL',
   'SAFE_ADDRESS',