Merge branch 'master' into escrow-payment-processor

RequestNetwork · Nov 15, 2021 · 2370c5c · 2370c5c
2 parents 9f725de + c5954c3
commit 2370c5c
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 0 deletions.
diff --git a/packages/advanced-logic/src/extensions/payment-network/declarative.ts b/packages/advanced-logic/src/extensions/payment-network/declarative.ts
@@ -254,6 +254,8 @@ export default class DeclarativePaymentNetwork<
       parameters: {
         amount: extensionAction.parameters.amount,
         note: extensionAction.parameters.note,
+        txHash: extensionAction.parameters.txHash,
+        network: extensionAction.parameters.network,
       },
       timestamp,
       from: actionSigner,
@@ -298,6 +300,8 @@ export default class DeclarativePaymentNetwork<
       parameters: {
         amount: extensionAction.parameters.amount,
         note: extensionAction.parameters.note,
+        txHash: extensionAction.parameters.txHash,
+        network: extensionAction.parameters.network,
       },
       timestamp,
       from: actionSigner,
@@ -342,6 +346,8 @@ export default class DeclarativePaymentNetwork<
       parameters: {
         amount: extensionAction.parameters.amount,
         note: extensionAction.parameters.note,
+        txHash: extensionAction.parameters.txHash,
+        network: extensionAction.parameters.network,
       },
       timestamp,
       from: actionSigner,
@@ -386,6 +392,8 @@ export default class DeclarativePaymentNetwork<
       parameters: {
         amount: extensionAction.parameters.amount,
         note: extensionAction.parameters.note,
+        txHash: extensionAction.parameters.txHash,
+        network: extensionAction.parameters.network,
       },
       timestamp,
       from: actionSigner,

diff --git a/packages/advanced-logic/test/extensions/payment-network/declarative.test.ts b/packages/advanced-logic/test/extensions/payment-network/declarative.test.ts
@@ -87,6 +87,8 @@ describe('extensions/payment-network/any/declarative', () => {
         pnAnyDeclarative.createDeclareSentPaymentAction({
           amount: TestDataDeclarative.amount,
           note: TestDataDeclarative.note,
+          txHash: TestDataDeclarative.txHash,
+          network: TestDataDeclarative.network
         }),
       ).toEqual(TestDataDeclarative.actionDeclareSentPayment);
     });
@@ -99,6 +101,8 @@ describe('extensions/payment-network/any/declarative', () => {
         pnAnyDeclarative.createDeclareSentRefundAction({
           amount: TestDataDeclarative.amount,
           note: TestDataDeclarative.note,
+          txHash: TestDataDeclarative.txHash,
+          network: TestDataDeclarative.network
         }),
       ).toEqual(TestDataDeclarative.actionDeclareSentRefund);
     });
@@ -111,6 +115,8 @@ describe('extensions/payment-network/any/declarative', () => {
         pnAnyDeclarative.createDeclareReceivedPaymentAction({
           amount: TestDataDeclarative.amount,
           note: TestDataDeclarative.note,
+          txHash: TestDataDeclarative.txHash,
+          network: TestDataDeclarative.network
         }),
       ).toEqual(TestDataDeclarative.actionDeclareReceivedPayment);
     });
@@ -123,6 +129,8 @@ describe('extensions/payment-network/any/declarative', () => {
         pnAnyDeclarative.createDeclareReceivedRefundAction({
           amount: TestDataDeclarative.amount,
           note: TestDataDeclarative.note,
+          txHash: TestDataDeclarative.txHash,
+          network: TestDataDeclarative.network
         }),
       ).toEqual(TestDataDeclarative.actionDeclareReceivedRefund);
     });

diff --git a/packages/advanced-logic/test/utils/payment-network/any/generator-data-create.ts b/packages/advanced-logic/test/utils/payment-network/any/generator-data-create.ts
@@ -10,6 +10,8 @@ export const paymentInfo = { IBAN: 'FR123456789123456789', BIC: 'CE123456789' };
 export const refundInfo = { IBAN: 'FR987654321987654321', BIC: 'CE987654321' };
 export const amount = '12345';
 export const note = '123456789';
+export const txHash = '0x123456789';
+export const network = 'matic';
 export const payeeDelegate = TestData.payeeDelegateRaw.identity;
 export const payerDelegate = TestData.payerDelegateRaw.identity;
 export const delegateToAdd = TestData.otherIdRaw.identity;
@@ -103,6 +105,8 @@ export const actionDeclareSentPayment = {
   parameters: {
     amount,
     note,
+    txHash,
+    network,
   },
 };
 export const actionDeclareSentRefund = {
@@ -111,6 +115,8 @@ export const actionDeclareSentRefund = {
   parameters: {
     amount,
     note,
+    txHash,
+    network,
   },
 };
 
@@ -120,6 +126,8 @@ export const actionDeclareReceivedPayment = {
   parameters: {
     amount,
     note,
+    txHash,
+    network,
   },
 };
 export const actionDeclareReceivedRefund = {
@@ -128,6 +136,8 @@ export const actionDeclareReceivedRefund = {
   parameters: {
     amount,
     note,
+    txHash,
+    network,
   },
 };
 // ---------------------------------------------------------------------
@@ -344,6 +354,8 @@ export const extensionStateCreatedEmptySentPayment = {
         parameters: {
           amount,
           note,
+          txHash,
+          network,
         },
         timestamp: arbitraryTimestamp,
         from: TestData.payerRaw.identity,
@@ -375,6 +387,8 @@ export const extensionStateCreatedEmptyReceivedRefund = {
         parameters: {
           amount,
           note,
+          txHash,
+          network,
         },
         timestamp: arbitraryTimestamp,
         from: TestData.payerRaw.identity,
@@ -406,6 +420,8 @@ export const extensionStateCreatedEmptySentRefund = {
         parameters: {
           amount,
           note,
+          txHash,
+          network,
         },
         timestamp: arbitraryTimestamp,
         from: TestData.payeeRaw.identity,
@@ -495,6 +511,8 @@ export const extensionStateCreatedEmptyReceivedPayment = {
         parameters: {
           amount,
           note,
+          txHash,
+          network,
         },
         timestamp: arbitraryTimestamp,
         from: TestData.payeeRaw.identity,