Merge pull request #2542 from CityOfZion/CU-86a10fx0m

CU-86a10fx0m - Implement Wcsdk's calculateFee

.circleci/config.yml

@@ -27,7 +27,7 @@ jobs:
       - run: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
       - run: apt-get -y update
       - run: yarn config delete proxy
-      - run: yarn install --ignore-engines --frozen-lockfile --network-timeout 1000000 --network-concurrency 1
+      - run: yarn install --ignore-engines --frozen-lockfile --network-timeout 1500000 --network-concurrency 1
       - run: yarn lint
       - run: yarn flow
       - run: yarn assets
@@ -48,7 +48,7 @@ jobs:
       - run: apt-get -y install libusb-1.0-0-dev icnsutils graphicsmagick libudev-dev
       - run: apt-get -y install libxtst6 libxss1 libgtk2.0-0 libnss3 libasound2 libgconf-2-4
       - run: yarn config delete proxy
-      - run: yarn install --ignore-engines --frozen-lockfile --network-timeout 1000000 --network-concurrency 1
+      - run: yarn install --ignore-engines --frozen-lockfile --network-timeout 1500000 --network-concurrency 1
       - run: yarn release
       - store_artifacts:
           path: dist
@@ -59,7 +59,7 @@ jobs:
       xcode: "14.0.0"
     steps:
       - checkout
-      - run: yarn install --ignore-engines --frozen-lockfile --network-timeout 1000000 --network-concurrency 1
+      - run: yarn install --ignore-engines --frozen-lockfile --network-timeout 1500000 --network-concurrency 1
       - run: npm --build-from-source install node-pre-gyp --force
       - run: yarn release:mac
       - store_artifacts:
@@ -75,7 +75,7 @@ jobs:
       - run: npm install --global --production windows-build-tools --vs2015
       - run: npm config set msvs_version 2015 -g
       - run: choco install windows-sdk-8.1
-      - run: yarn install --ignore-engines --frozen-lockfile --network-timeout 1000000 --network-concurrency 1
+      - run: yarn install --ignore-engines --frozen-lockfile --network-timeout 1500000 --network-concurrency 1
       - run: yarn release
       - store_artifacts:
           path: dist

app/util/walletConnect.js

@@ -183,12 +183,14 @@ export const walletConnectOptions: TOptions = {
     'getWalletInfo',
     'getNetworkVersion',
     'traverseIterator',
+    'calculateFee',
   ],
   autoAcceptMethods: [
     'testInvoke',
     'getWalletInfo',
     'getNetworkVersion',
     'traverseIterator',
+    'calculateFee',
   ],
   adapter: new WalletConnectNeonAdapter(),
 }

config/paths.js

@@ -7,5 +7,6 @@ module.exports = {
     assets: resolveApp('assets'),
     styles: resolveApp('styles'),
     components: resolveApp('components'),
+    'node:crypto': path.resolve(__dirname, '../node_modules/crypto-browserify'),
   },
 }

config/webpack.config.dev.js

@@ -102,6 +102,13 @@ module.exports = {
           presets: [['@babel/preset-env', { targets: 'defaults' }]],
         },
       },
+      {
+        test: /(@cityofzion\/neon-dappkit).*\.(ts|js)x?$/,
+        loader: 'babel-loader',
+        options: {
+          presets: [['@babel/preset-env', { targets: 'defaults' }]],
+        },
+      },
       {
         test: /\.jsx?$/,
         use: {

config/webpack.config.prod.js

@@ -78,7 +78,7 @@ module.exports = {
         },
       },
       {
-        test: /(@cityofzion[\\/](neon-parser|neon-invoker|blockchain-service|bs-neo3|wallet-connect-sdk-wallet-core)|neon-parser[\\/]node_modules|neon-invoker[\\/]node_modules|blockchain-service[\\/]node_modules|bs-neo3[\\/]node_modules|wallet-connect-sdk-wallet-core[\\/]node_modules).*\.(ts|js)x?$/,
+        test: /(@cityofzion[\\/](neon-parser|neon-invoker|blockchain-service|bs-neo3|wallet-connect-sdk-wallet-core)|neon-parser|neon-dappkit[\\/]node_modules|neon-invoker[\\/]node_modules|blockchain-service[\\/]node_modules|bs-neo3[\\/]node_modules|wallet-connect-sdk-wallet-core[\\/]node_modules).*\.(ts|js)x?$/,
         loader: 'babel-loader',
         options: {
           presets: [['@babel/preset-env', { targets: 'defaults' }]],

package.json

@@ -120,7 +120,7 @@
     "@cityofzion/neon-js-legacy": "npm:@cityofzion/[email protected]",
     "@cityofzion/neon-js-legacy-latest": "npm:@cityofzion/[email protected]",
     "@cityofzion/neon-ledger-next": "npm:@cityofzion/[email protected]",
-    "@cityofzion/wallet-connect-sdk-wallet-react": "2.5.4",
+    "@cityofzion/wallet-connect-sdk-wallet-react": "3.0.1",
     "@emotion/react": "^11.10.6",
     "@emotion/styled": "^11.10.6",
     "@formatjs/intl-pluralrules": "^1.5.2",
@@ -136,6 +136,7 @@
     "cleave.js": "1.0.7",
     "compare-versions": "3.1.0",
     "coveralls": "3.0.11",
+    "crypto-browserify": "^3.12.0",
     "dotenv-cli": "^4.0.0",
     "ecc-jsbn": "0.2.0",
     "electron-context-menu": "0.9.1",
@@ -225,7 +226,7 @@
     "babel-eslint": "10.1.0",
     "babel-jest": "^23.4.2",
     "babel-loader": "8.2.5",
-    "babel-plugin-module-resolver": "3.1.1",
+    "babel-plugin-module-resolver": "^5.0.0",
     "cross-env": "5.1.1",
     "css-loader": "4.2.0",
     "electron": "19.0.8",
@@ -294,7 +295,8 @@
       "\\.(jpg|jpeg|png|gif|eot|otf|webp|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/__mocks__/fileMock.js",
       "\\.(svg)$": "<rootDir>/__mocks__/svgMock.js",
       "\\.(css|less|sass|scss)$": "identity-obj-proxy",
-      "^lodash-es$": "lodash"
+      "^lodash-es$": "lodash",
+      "^node:crypto$": "<rootDir>/node_modules/crypto-browserify"
     },
     "testPathIgnorePatterns": [
       "__tests__/testHelpers.js",
@@ -313,4 +315,4 @@
     "setupTestFrameworkScriptFile": "<rootDir>/__tests__/setupTests.js",
     "testURL": "http://localhost"
   }
-}
+}

preload.js

@@ -1,7 +1,9 @@
 /* eslint-disable */
 const _process = process
+const crypto = require('crypto-browserify');
 process.once('loaded', function() {
   global.process = _process
   global.require = require
   global.Buffer = Buffer
+  global.crypto = crypto
 })