Merge branch 'master' into docs-portal-invoice-api

RequestNetwork · Oct 26, 2021 · 3dcf84c · 3dcf84c
2 parents ea84928 + f0d5492
commit 3dcf84c
Show file tree

Hide file tree

Showing 49 changed files with 987 additions and 834 deletions.
diff --git a/package.json b/package.json
@@ -48,6 +48,6 @@
     "nyc": "15.1.0",
     "prettier": "2.2.1",
     "remap-istanbul": "0.13.0",
-    "typescript": "4.1.3"
+    "typescript": "4.4.4"
   }
 }
diff --git a/packages/advanced-logic/package.json b/packages/advanced-logic/package.json
@@ -53,7 +53,7 @@
     "shx": "0.3.2",
     "ts-jest": "26.3.0",
     "ts-node": "9.0.0",
-    "typescript": "4.1.3"
+    "typescript": "4.4.4"
   },
   "gitHead": "6155223cfce769e48ccae480c510b35b4f54b4d0"
 }
diff --git a/packages/advanced-logic/src/extensions/payment-network/declarative.ts b/packages/advanced-logic/src/extensions/payment-network/declarative.ts
@@ -45,10 +45,11 @@ export default class DeclarativePaymentNetwork<
   ): ExtensionTypes.IAction {
     return {
       action: ExtensionTypes.PnAnyDeclarative.ACTION.DECLARE_SENT_PAYMENT,
-      id: ExtensionTypes.ID.PAYMENT_NETWORK_ANY_DECLARATIVE,
+      id: this.extensionId,
       parameters: {
         amount: parameters.amount.toString(),
         note: parameters.note,
+        txHash: parameters.txHash,
       },
     };
   }
@@ -65,10 +66,11 @@ export default class DeclarativePaymentNetwork<
   ): ExtensionTypes.IAction {
     return {
       action: ExtensionTypes.PnAnyDeclarative.ACTION.DECLARE_SENT_REFUND,
-      id: ExtensionTypes.ID.PAYMENT_NETWORK_ANY_DECLARATIVE,
+      id: this.extensionId,
       parameters: {
         amount: parameters.amount.toString(),
         note: parameters.note,
+        txHash: parameters.txHash,
       },
     };
   }
@@ -85,10 +87,11 @@ export default class DeclarativePaymentNetwork<
   ): ExtensionTypes.IAction {
     return {
       action: ExtensionTypes.PnAnyDeclarative.ACTION.DECLARE_RECEIVED_PAYMENT,
-      id: ExtensionTypes.ID.PAYMENT_NETWORK_ANY_DECLARATIVE,
+      id: this.extensionId,
       parameters: {
         amount: parameters.amount.toString(),
         note: parameters.note,
+        txHash: parameters.txHash,
       },
     };
   }
@@ -105,10 +108,11 @@ export default class DeclarativePaymentNetwork<
   ): ExtensionTypes.IAction {
     return {
       action: ExtensionTypes.PnAnyDeclarative.ACTION.DECLARE_RECEIVED_REFUND,
-      id: ExtensionTypes.ID.PAYMENT_NETWORK_ANY_DECLARATIVE,
+      id: this.extensionId,
       parameters: {
         amount: parameters.amount.toString(),
         note: parameters.note,
+        txHash: parameters.txHash,
       },
     };
   }
@@ -125,7 +129,7 @@ export default class DeclarativePaymentNetwork<
   ): ExtensionTypes.IAction {
     return {
       action: ExtensionTypes.PnAnyDeclarative.ACTION.ADD_PAYMENT_INSTRUCTION,
-      id: ExtensionTypes.ID.PAYMENT_NETWORK_ANY_DECLARATIVE,
+      id: this.extensionId,
       parameters: {
         paymentInfo: parameters.paymentInfo,
       },
@@ -144,7 +148,7 @@ export default class DeclarativePaymentNetwork<
   ): ExtensionTypes.IAction {
     return {
       action: ExtensionTypes.PnAnyDeclarative.ACTION.ADD_REFUND_INSTRUCTION,
-      id: ExtensionTypes.ID.PAYMENT_NETWORK_ANY_DECLARATIVE,
+      id: this.extensionId,
       parameters: {
         refundInfo: parameters.refundInfo,
       },
@@ -163,7 +167,7 @@ export default class DeclarativePaymentNetwork<
   ): ExtensionTypes.IAction {
     return {
       action: ExtensionTypes.PnAnyDeclarative.ACTION.ADD_DELEGATE,
-      id: ExtensionTypes.ID.PAYMENT_NETWORK_ANY_DECLARATIVE,
+      id: this.extensionId,
       parameters: {
         delegate: parameters.delegate,
       },

diff --git a/packages/currency/package.json b/packages/currency/package.json
@@ -51,13 +51,13 @@
     "@types/jest": "26.0.13",
     "@types/multicoin-address-validator": "0.5.0",
     "@types/node-dijkstra": "2.5.1",
-    "ethers": "5.2.0",
+    "ethers": "5.5.1",
     "jest": "26.4.2",
     "prettier": "2.1.1",
     "shx": "0.3.2",
     "source-map-support": "0.5.19",
     "ts-jest": "26.3.0",
     "ts-node": "9.0.0",
-    "typescript": "4.1.3"
+    "typescript": "4.4.4"
   }
 }
diff --git a/packages/data-access/package.json b/packages/data-access/package.json
@@ -56,7 +56,7 @@
     "source-map-support": "0.5.19",
     "ts-jest": "26.3.0",
     "ts-node": "9.0.0",
-    "typescript": "4.1.3"
+    "typescript": "4.4.4"
   },
   "gitHead": "6155223cfce769e48ccae480c510b35b4f54b4d0"
 }
diff --git a/packages/data-format/package.json b/packages/data-format/package.json
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "ajv": "6.12.4",
-    "ethers": "5.2.0"
+    "ethers": "5.5.1"
   },
   "devDependencies": {
     "@types/node": "14.14.16",
@@ -49,7 +49,7 @@
     "rimraf": "3.0.2",
     "shx": "0.3.2",
     "ts-node": "9.0.0",
-    "typescript": "4.1.3"
+    "typescript": "4.4.4"
   },
   "gitHead": "6155223cfce769e48ccae480c510b35b4f54b4d0"
 }
diff --git a/packages/docs/docs/guides/6-hosting-a-node/2-code.md b/packages/docs/docs/guides/6-hosting-a-node/2-code.md
@@ -30,17 +30,17 @@ You are ready to run the local test Node. You will need three different consoles
 
 First, make sure you [installed IPFS](https://docs.ipfs.io/guides/guides/install/) locally.
 
-Now you need to configure your IPFS to connect to our [dedicated network](../7-protocol/6-request-ipfs-network.md). We have a script to make it easy for you:
+Run IPFS with:
 
 ```bash
-cd packages/request-node
-yarn init-ipfs
+ipfs daemon
 ```
 
-Now you can run IPFS with:
+Now you need to configure your IPFS to connect to our [dedicated network](../7-protocol/6-request-ipfs-network.md). We have a script to make it easy for you:
 
 ```bash
-ipfs daemon
+cd packages/request-node
+yarn init-ipfs
 ```
 
 ## Running an Ethereum node

diff --git a/packages/docs/package.json b/packages/docs/package.json
@@ -44,7 +44,7 @@
     "bn.js": "5.1.3",
     "classnames": "2.2.6",
     "core-js": "3.6.5",
-    "ethers": "5.2.0",
+    "ethers": "5.5.1",
     "mobx": "5.15.6",
     "react": "16.13.1",
     "react-dom": "16.13.1",

diff --git a/packages/epk-decryption/package.json b/packages/epk-decryption/package.json
@@ -58,7 +58,7 @@
     "terser-webpack-plugin": "4.2.3",
     "ts-jest": "26.3.0",
     "ts-node": "9.0.0",
-    "typescript": "4.1.3",
+    "typescript": "4.4.4",
     "webpack": "4.44.2",
     "webpack-bundle-analyzer": "4.2.0",
     "webpack-cli": "3.3.12"

diff --git a/packages/epk-signature/package.json b/packages/epk-signature/package.json
@@ -57,7 +57,7 @@
     "terser-webpack-plugin": "4.2.3",
     "ts-jest": "26.3.0",
     "ts-node": "9.0.0",
-    "typescript": "4.1.3",
+    "typescript": "4.4.4",
     "webpack": "4.44.2",
     "webpack-bundle-analyzer": "4.2.0",
     "webpack-cli": "3.3.12"

diff --git a/packages/ethereum-storage/package.json b/packages/ethereum-storage/package.json
@@ -43,7 +43,7 @@
     "@requestnetwork/types": "0.35.0",
     "@requestnetwork/utils": "0.35.0",
     "bluebird": "3.7.2",
-    "ethers": "5.2.0",
+    "ethers": "5.5.1",
     "form-data": "3.0.0",
     "ipfs-unixfs": "2.0.3",
     "keyv": "4.0.3",
@@ -70,7 +70,7 @@
     "source-map-support": "0.5.19",
     "ts-jest": "26.3.0",
     "ts-node": "9.0.0",
-    "typescript": "4.1.3",
+    "typescript": "4.4.4",
     "web3-providers-http": "1.3.6"
   },
   "gitHead": "6155223cfce769e48ccae480c510b35b4f54b4d0"

diff --git a/packages/integration-test/package.json b/packages/integration-test/package.json
@@ -55,13 +55,13 @@
     "@truffle/hdwallet-provider": "1.2.3",
     "@types/jest": "26.0.13",
     "@types/node": "14.14.16",
-    "ethers": "5.2.0",
+    "ethers": "5.5.1",
     "jest": "26.4.2",
     "npm-run-all": "4.1.5",
     "prettier": "2.2.1",
     "ts-jest": "26.3.0",
     "ts-node": "9.0.0",
-    "typescript": "4.1.3",
+    "typescript": "4.4.4",
     "web3-eth": "1.3.6"
   }
 }
diff --git a/packages/integration-test/test/node-client.test.ts b/packages/integration-test/test/node-client.test.ts
@@ -1,8 +1,7 @@
 import { EthereumPrivateKeyDecryptionProvider } from '@requestnetwork/epk-decryption';
-import { EthereumPrivateKeySignatureProvider } from '@requestnetwork/epk-signature';
 import MultiFormat from '@requestnetwork/multi-format';
 import { Request, RequestNetwork, Types } from '@requestnetwork/request-client.js';
-import { ClientTypes, IdentityTypes, PaymentTypes, RequestLogicTypes } from '@requestnetwork/types';
+import { IdentityTypes, PaymentTypes, RequestLogicTypes } from '@requestnetwork/types';
 import Utils from '@requestnetwork/utils';
 import {
   payRequest,
@@ -11,6 +10,14 @@ import {
 import { CurrencyManager } from '@requestnetwork/currency';
 
 import { Wallet, providers, BigNumber } from 'ethers';
+import {
+  erc20requestCreationHash,
+  httpConfig,
+  payeeIdentity,
+  payerIdentity,
+  requestNetwork,
+  signatureProvider,
+} from './scheduled/fixtures';
 
 const mnemonic = 'candy maple cake sugar pudding cream honey rich smooth crumble sweet treat';
 const provider = new providers.JsonRpcProvider('http://localhost:8545');
@@ -19,15 +26,6 @@ const wallet = Wallet.fromMnemonic(mnemonic).connect(provider);
 // eslint-disable-next-line no-magic-numbers
 jest.setTimeout(10000);
 
-const payeeIdentity: IdentityTypes.IIdentity = {
-  type: IdentityTypes.TYPE.ETHEREUM_ADDRESS,
-  value: '0x627306090abab3a6e1400e9345bc60c78a8bef57',
-};
-const payerIdentity: IdentityTypes.IIdentity = {
-  type: IdentityTypes.TYPE.ETHEREUM_ADDRESS,
-  value: '0xf17f52151ebef6c7334fad080c5704d77216b732',
-};
-
 const requestCreationHashBTC: Types.IRequestInfo = {
   currency: 'BTC',
   expectedAmount: '1000',
@@ -68,24 +66,8 @@ const wrongDecryptionProvider = new EthereumPrivateKeyDecryptionProvider({
   method: Types.Encryption.METHOD.ECIES,
 });
 
-const httpConfig: Partial<ClientTypes.IHttpDataAccessConfig> = {
-  getConfirmationDeferDelay: 1000,
-  getConfirmationRetryDelay: 500,
-};
-
-const signatureProvider = new EthereumPrivateKeySignatureProvider({
-  method: Types.Signature.METHOD.ECDSA,
-  privateKey: '0xc87509a1c067bbde78beb793e6fa76530b6382a4c0241e5e4a9ec0a0f44dc0d3',
-});
-signatureProvider.addSignatureParameters({
-  method: Types.Signature.METHOD.ECDSA,
-  privateKey: '0xae6ae8e5ccbfb04590405997ee2d52d2b330726137b875053c36d94e974d162f',
-});
-
 describe('Request client using a request node', () => {
   it('can create a request, change the amount and get data', async () => {
-    const requestNetwork = new RequestNetwork({ httpConfig, signatureProvider });
-
     // Create a request
     const request = await requestNetwork.createRequest({
       requestInfo: requestCreationHashBTC,
@@ -120,8 +102,6 @@ describe('Request client using a request node', () => {
   });
 
   it('can create a request with declarative payment network and content data', async () => {
-    const requestNetwork = new RequestNetwork({ httpConfig, signatureProvider });
-
     const paymentNetwork: PaymentTypes.IPaymentNetworkCreateParameters = {
       id: PaymentTypes.PAYMENT_NETWORK_ID.DECLARATIVE,
       parameters: {
@@ -184,8 +164,6 @@ describe('Request client using a request node', () => {
   });
 
   it('can create requests and get them fromIdentity and with time boundaries', async () => {
-    const requestNetwork = new RequestNetwork({ httpConfig, signatureProvider });
-
     // create request 1
     const requestCreationHash1: Types.IRequestInfo = {
       currency: 'BTC',
@@ -261,8 +239,6 @@ describe('Request client using a request node', () => {
   });
 
   it('can create requests and get them fromIdentity with smart contract identity', async () => {
-    const requestNetwork = new RequestNetwork({ httpConfig, signatureProvider });
-
     const payerSmartContract = {
       network: 'private',
       type: IdentityTypes.TYPE.ETHEREUM_SMART_CONTRACT,
@@ -525,22 +501,7 @@ describe('ERC20 localhost request creation and detection test', () => {
     },
   };
 
-  const contractAddress = '0x9FBDa871d559710256a2502A2517b794B482Db40';
-
-  const erc20requestCreationHash: Types.IRequestInfo = {
-    currency: {
-      network: 'private',
-      type: Types.RequestLogic.CURRENCY.ERC20,
-      value: contractAddress,
-    },
-    expectedAmount: '10',
-    payee: payeeIdentity,
-    payer: payerIdentity,
-  };
-
   it('can create an ERC20 request on localhost and detect the payment using address based detection', async () => {
-    const requestNetwork = new RequestNetwork({ httpConfig, signatureProvider });
-
     // Create a request
     const request = await requestNetwork.createRequest({
       paymentNetwork,