Merge branch 'master' into fix/btach-conversion-capped

Author: olivier7delf

.circleci/config.yml

@@ -95,6 +95,10 @@ jobs:
           name: Generate Payment Detection queries
           command: yarn workspace @requestnetwork/payment-detection run codegen
 
+      - run:
+          name: Build all packages (tsc)
+          command: yarn build:tsc
+
       - persist_to_workspace:
           root: *working_directory
           paths: .

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+yarn lint-staged

README.md

@@ -18,25 +18,26 @@ Join the [Request Hub][requesthub-slack-url] to get in touch with us.
 
 ### Published Packages
 
-| Package                                                                | Version                                                                                                                                           | Description                                                         |
-| ---------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------- |
-| [`@requestnetwork/advanced-logic`](/packages/advanced-logic)           | [![npm](https://img.shields.io/npm/v/@requestnetwork/advanced-logic.svg)](https://www.npmjs.com/package/@requestnetwork/advanced-logic)           | Extensions to the protocol                                          |
-| [`@requestnetwork/request-client.js`](/packages/request-client.js)     | [![npm](https://img.shields.io/npm/v/@requestnetwork/request-client.js.svg)](https://www.npmjs.com/package/@requestnetwork/request-client.js)     | Library to use Request nodes as servers                             |
-| [`@requestnetwork/data-access`](/packages/data-access)                 | [![npm](https://img.shields.io/npm/v/@requestnetwork/data-access.svg)](https://www.npmjs.com/package/@requestnetwork/data-access)                 | Indexing an batching of transactions                                |
-| [`@requestnetwork/data-format`](/packages/data-format)                 | [![npm](https://img.shields.io/npm/v/@requestnetwork/data-format.svg)](https://www.npmjs.com/package/@requestnetwork/data-format)                 | Standards for data stored on Request, like invoices format          |
-| [`@requestnetwork/epk-signature`](/packages/epk-signature)             | [![npm](https://img.shields.io/npm/v/@requestnetwork/epk-signature.svg)](https://www.npmjs.com/package/@requestnetwork/epk-signature)             | Sign requests using Ethereum private keys                           |
-| [`@requestnetwork/ethereum-storage`](/packages/ethereum-storage)       | [![npm](https://img.shields.io/npm/v/@requestnetwork/ethereum-storage.svg)](https://www.npmjs.com/package/@requestnetwork/ethereum-storage)       | Storage of Request data on Ethereum and IPFS                        |
-| [`@requestnetwork/epk-decryption`](/packages/epk-decryption)           | [![npm](https://img.shields.io/npm/v/@requestnetwork/epk-decryption.svg)](https://www.npmjs.com/package/@requestnetwork/epk-decryption)           | Decrypt encrypted requests using Ethereum private keys              |
-| [`@requestnetwork/payment-detection`](/packages/payment-detection)     | [![npm](https://img.shields.io/npm/v/@requestnetwork/payment-detection.svg)](https://www.npmjs.com/package/@requestnetwork/payment-detection)     | Client-side payment detection, to compute the balance.              |
-| [`@requestnetwork/payment-processor`](/packages/payment-processor)     | [![npm](https://img.shields.io/npm/v/@requestnetwork/payment-processor.svg)](https://www.npmjs.com/package/@requestnetwork/payment-processor)     | Pay a request using a web3 wallet                                   |
-| [`@requestnetwork/request-logic`](/packages/request-logic)             | [![npm](https://img.shields.io/npm/v/@requestnetwork/request-logic.svg)](https://www.npmjs.com/package/@requestnetwork/request-logic)             | The Request business logic: properties and actions of requests      |
-| [`@requestnetwork/request-node`](/packages/request-node)               | [![npm](https://img.shields.io/npm/v/@requestnetwork/request-node.svg)](https://www.npmjs.com/package/@requestnetwork/request-node)               | Web server that allows easy access to Request system                |
-| [`@requestnetwork/transaction-manager`](/packages/transaction-manager) | [![npm](https://img.shields.io/npm/v/@requestnetwork/transaction-manager.svg)](https://www.npmjs.com/package/@requestnetwork/transaction-manager) | Creates transactions to be sent to Data Access, managing encryption |
-| [`@requestnetwork/types`](/packages/types)                             | [![npm](https://img.shields.io/npm/v/@requestnetwork/types.svg)](https://www.npmjs.com/package/@requestnetwork/types)                             | Typescript types shared across @requestnetwork packages             |
-| [`@requestnetwork/utils`](/packages/utils)                             | [![npm](https://img.shields.io/npm/v/@requestnetwork/utils.svg)](https://www.npmjs.com/package/@requestnetwork/utils)                             | Collection of tools shared between the @requestnetwork packages     |
-| [`@requestnetwork/web3-signature`](/packages/web3-signature)           | [![npm](https://img.shields.io/npm/v/@requestnetwork/web3-signature.svg)](https://www.npmjs.com/package/@requestnetwork/web3-signature)           | Sign requests using web3 tools (like Metamask)                      |
-| [`@requestnetwork/multi-format`](/packages/multi-format)               | [![npm](https://img.shields.io/npm/v/@requestnetwork/multi-format.svg)](https://www.npmjs.com/package/@requestnetwork/multi-format)               | Serialize and deserialize object in the Request Network protocol    |
-| [`@requestnetwork/smart-contracts`](/packages/smart-contracts)         | [![npm](https://img.shields.io/npm/v/@requestnetwork/smart-contracts.svg)](https://www.npmjs.com/package/@requestnetwork/smart-contracts)         | Sources and artifacts of the smart contracts                        |
+| Package                                                                  | Version                                                                                                                                             | Description                                                         |
+| ------------------------------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------- |
+| [`@requestnetwork/advanced-logic`](/packages/advanced-logic)             | [![npm](https://img.shields.io/npm/v/@requestnetwork/advanced-logic.svg)](https://www.npmjs.com/package/@requestnetwork/advanced-logic)             | Extensions to the protocol                                          |
+| [`@requestnetwork/request-client.js`](/packages/request-client.js)       | [![npm](https://img.shields.io/npm/v/@requestnetwork/request-client.js.svg)](https://www.npmjs.com/package/@requestnetwork/request-client.js)       | Library to use Request nodes as servers                             |
+| [`@requestnetwork/data-access`](/packages/data-access)                   | [![npm](https://img.shields.io/npm/v/@requestnetwork/data-access.svg)](https://www.npmjs.com/package/@requestnetwork/data-access)                   | Indexing an batching of transactions                                |
+| [`@requestnetwork/data-format`](/packages/data-format)                   | [![npm](https://img.shields.io/npm/v/@requestnetwork/data-format.svg)](https://www.npmjs.com/package/@requestnetwork/data-format)                   | Standards for data stored on Request, like invoices format          |
+| [`@requestnetwork/epk-signature`](/packages/epk-signature)               | [![npm](https://img.shields.io/npm/v/@requestnetwork/epk-signature.svg)](https://www.npmjs.com/package/@requestnetwork/epk-signature)               | Sign requests using Ethereum private keys                           |
+| [`@requestnetwork/ethereum-storage`](/packages/ethereum-storage)         | [![npm](https://img.shields.io/npm/v/@requestnetwork/ethereum-storage.svg)](https://www.npmjs.com/package/@requestnetwork/ethereum-storage)         | Storage of Request data on Ethereum and IPFS, with custom indexing  |
+| [`@requestnetwork/epk-decryption`](/packages/epk-decryption)             | [![npm](https://img.shields.io/npm/v/@requestnetwork/epk-decryption.svg)](https://www.npmjs.com/package/@requestnetwork/epk-decryption)             | Decrypt encrypted requests using Ethereum private keys              |
+| [`@requestnetwork/payment-detection`](/packages/payment-detection)       | [![npm](https://img.shields.io/npm/v/@requestnetwork/payment-detection.svg)](https://www.npmjs.com/package/@requestnetwork/payment-detection)       | Client-side payment detection, to compute the balance.              |
+| [`@requestnetwork/payment-processor`](/packages/payment-processor)       | [![npm](https://img.shields.io/npm/v/@requestnetwork/payment-processor.svg)](https://www.npmjs.com/package/@requestnetwork/payment-processor)       | Pay a request using a web3 wallet                                   |
+| [`@requestnetwork/request-logic`](/packages/request-logic)               | [![npm](https://img.shields.io/npm/v/@requestnetwork/request-logic.svg)](https://www.npmjs.com/package/@requestnetwork/request-logic)               | The Request business logic: properties and actions of requests      |
+| [`@requestnetwork/request-node`](/packages/request-node)                 | [![npm](https://img.shields.io/npm/v/@requestnetwork/request-node.svg)](https://www.npmjs.com/package/@requestnetwork/request-node)                 | Web server that allows easy access to Request system                |
+| [`@requestnetwork/transaction-manager`](/packages/transaction-manager)   | [![npm](https://img.shields.io/npm/v/@requestnetwork/transaction-manager.svg)](https://www.npmjs.com/package/@requestnetwork/transaction-manager)   | Creates transactions to be sent to Data Access, managing encryption |
+| [`@requestnetwork/types`](/packages/types)                               | [![npm](https://img.shields.io/npm/v/@requestnetwork/types.svg)](https://www.npmjs.com/package/@requestnetwork/types)                               | Typescript types shared across @requestnetwork packages             |
+| [`@requestnetwork/utils`](/packages/utils)                               | [![npm](https://img.shields.io/npm/v/@requestnetwork/utils.svg)](https://www.npmjs.com/package/@requestnetwork/utils)                               | Collection of tools shared between the @requestnetwork packages     |
+| [`@requestnetwork/web3-signature`](/packages/web3-signature)             | [![npm](https://img.shields.io/npm/v/@requestnetwork/web3-signature.svg)](https://www.npmjs.com/package/@requestnetwork/web3-signature)             | Sign requests using web3 tools (like Metamask)                      |
+| [`@requestnetwork/multi-format`](/packages/multi-format)                 | [![npm](https://img.shields.io/npm/v/@requestnetwork/multi-format.svg)](https://www.npmjs.com/package/@requestnetwork/multi-format)                 | Serialize and deserialize object in the Request Network protocol    |
+| [`@requestnetwork/thegraph-data-access`](/packages/thegraph-data-access) | [![npm](https://img.shields.io/npm/v/@requestnetwork/thegraph-data-access.svg)](https://www.npmjs.com/package/@requestnetwork/thegraph-data-access) | Storage of Request data on Ethereum and IPFS, indexed by TheGraph   |
+| [`@requestnetwork/smart-contracts`](/packages/smart-contracts)           | [![npm](https://img.shields.io/npm/v/@requestnetwork/smart-contracts.svg)](https://www.npmjs.com/package/@requestnetwork/smart-contracts)           | Sources and artifacts of the smart contracts                        |
 
 ### Private Packages
 

package.json

@@ -14,9 +14,10 @@
     "url": "git+https://github.com/RequestNetwork/requestNetwork.git"
   },
   "scripts": {
+    "prepare": "husky install",
     "build": "lerna run build",
     "clean": "lerna run clean",
-    "build:tsc": "tsc -b packages/advanced-logic/tsconfig.build.json packages/currency/tsconfig.build.json packages/data-access/tsconfig.build.json packages/data-format/tsconfig.build.json packages/epk-decryption/tsconfig.build.json packages/epk-signature/tsconfig.build.json packages/ethereum-storage/tsconfig.build.json packages/integration-test/tsconfig.build.json packages/multi-format/tsconfig.build.json packages/payment-detection/tsconfig.build.json packages/prototype-estimator/tsconfig.build.json packages/request-client.js/tsconfig.build.json packages/request-logic/tsconfig.build.json packages/request-node/tsconfig.build.json packages/smart-contracts/tsconfig.build.json packages/toolbox/tsconfig.build.json packages/transaction-manager/tsconfig.build.json packages/types/tsconfig.build.json packages/usage-examples/tsconfig.build.json packages/utils/tsconfig.build.json packages/web3-signature/tsconfig.build.json",
+    "build:tsc": "tsc -b packages/**/tsconfig.build.json",
     "lint": "eslint . --fix --quiet",
     "lint:check": "eslint . --quiet",
     "lint-staged": "lint-staged",
@@ -41,7 +42,7 @@
     "eslint-plugin-import": "2.22.1",
     "eslint-plugin-jsdoc": "32.3.0",
     "eslint-plugin-prefer-arrow": "1.2.3",
-    "husky": "4.3.0",
+    "husky": "8.0.1",
     "lerna": "3.22.1",
     "lint-staged": "10.5.4",
     "npm-package-json-lint": "5.1.0",

packages/advanced-logic/package.json

@@ -51,7 +51,6 @@
     "@types/lodash": "4.14.161",
     "jest": "26.4.2",
     "nyc": "15.1.0",
-    "prettier": "2.2.1",
     "shx": "0.3.2",
     "ts-jest": "26.3.0",
     "ts-node": "9.0.0",

packages/advanced-logic/src/extensions/payment-network/any-to-near.ts

@@ -3,7 +3,7 @@ import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwor
 import { UnsupportedNetworkError } from './address-based';
 import AnyToNativeTokenPaymentNetwork from './any-to-native';
 
-const CURRENT_VERSION = '0.2.0';
+const CURRENT_VERSION = '0.1.0';
 const supportedNetworks = ['aurora', 'aurora-testnet'];
 
 export default class AnyToNearPaymentNetwork extends AnyToNativeTokenPaymentNetwork {

packages/advanced-logic/test/utils/payment-network/any/generator-data-create.ts

@@ -93,7 +93,7 @@ export const actionCreationWithNativeTokenPayment: ExtensionTypes.IAction<Extens
       refundAddress: 'refund.near',
       salt: arbitrarySalt,
     },
-    version: '0.2.0',
+    version: '0.1.0',
   };
 export const actionCreationWithAnyToNativeTokenPayment: ExtensionTypes.IAction<ExtensionTypes.PnAnyToAnyConversion.ICreationParameters> =
   {
@@ -108,7 +108,7 @@ export const actionCreationWithAnyToNativeTokenPayment: ExtensionTypes.IAction<E
       network: 'aurora',
       maxRateTimespan: 1000000,
     },
-    version: '0.2.0',
+    version: '0.1.0',
   };
 
 export const actionAddDelegate = {
@@ -239,7 +239,7 @@ export const extensionStateWithNativeTokenPaymentAndRefund: RequestLogicTypes.IE
       sentPaymentAmount: '0',
       sentRefundAmount: '0',
     },
-    version: '0.2.0',
+    version: '0.1.0',
   },
 };
 export const extensionStateWithAnyToNativeTokenPaymentAndRefund: RequestLogicTypes.IExtensionStates =
@@ -279,7 +279,7 @@ export const extensionStateWithAnyToNativeTokenPaymentAndRefund: RequestLogicTyp
         maxRateTimespan: 1000000,
         feeAmount: '100',
       },
-      version: '0.2.0',
+      version: '0.1.0',
     },
   };
 export const extensionStateAnyToNativeWithPaymentAddressAdded: RequestLogicTypes.IExtensionStates =
@@ -325,7 +325,7 @@ export const extensionStateAnyToNativeWithPaymentAddressAdded: RequestLogicTypes
         maxRateTimespan: 1000000,
         feeAmount: '100',
       },
-      version: '0.2.0',
+      version: '0.1.0',
     },
   };
 
@@ -371,7 +371,7 @@ export const extensionStateAnyToNativeWithFeeAdded: RequestLogicTypes.IExtension
       maxRateTimespan: 1000000,
       feeAmount: '100',
     },
-    version: '0.2.0',
+    version: '0.1.0',
   },
 };
 

packages/advanced-logic/tsconfig.build.json

@@ -4,8 +4,7 @@
     "outDir": "dist",
     "rootDir": "src"
   },
-  "include": ["src/**/*"],
-  "exclude": ["**/*.test.ts", "**/*.spec.ts"],
+  "exclude": ["test/", "**/*.test.ts", "**/*.spec.ts"],
   "references": [
     { "path": "../currency/tsconfig.build.json" },
     { "path": "../types/tsconfig.build.json" },

packages/advanced-logic/tsconfig.json

@@ -2,5 +2,6 @@
   "extends": "../../tsconfig",
   "compilerOptions": {
     "types": ["node", "jest"]
-  }
+  },
+  "include": ["src/", "test/"]
 }

packages/currency/src/currencyManager.ts

@@ -129,6 +129,13 @@ export class CurrencyManager<TMeta = unknown> implements ICurrencyManager<TMeta>
     );
   }
 
+  fromHash(hash: string, network?: string): CurrencyDefinition<TMeta> | undefined {
+    return this.knownCurrencies.find(
+      (x) =>
+        x.hash.toLowerCase() === hash.toLowerCase() &&
+        ((x.type === ISO4217 && !network) || ('network' in x && x.network === network) || !network),
+    );
+  }
   /**
    * Retrieves a currency given its storage format (ICurrency)
    */