Iden3PaymentRailsRequestV1 #275

volodymyr-basiuk · 2024-10-01T13:15:23Z

No description provided.

src/iden3comm/handlers/payment.ts

Kolezhniuk · 2024-10-17T12:19:17Z

src/iden3comm/handlers/payment.ts

+              primaryType: 'Iden3PaymentRailsRequestV1',
+              domain: {
+                ...domain,
+                salt: ''


why salt is empty?

Because now we don't use it in domain separator (name, version, chain id and contract address is enough).
I believe we can remove this field since it's not even in the contract domain type:
keccak256("EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)");

Kolezhniuk · 2024-10-17T12:19:59Z

src/iden3comm/handlers/payment.ts

+  signer: Signer,
+  opts: {
+    payments: [
+      {


I would add a type for this

Kolezhniuk · 2024-10-17T12:22:05Z

src/iden3comm/handlers/payment.ts

-  paymentValidationHandler: (txId: string, data: PaymentRequestDataInfo) => Promise<void>;
+  paymentValidationHandler: (
+    txId: string,
+    data: Iden3PaymentRequestCryptoV1 | Iden3PaymentRailsRequestV1


Just to know, why the name is Iden3PaymentRails request?

Kolezhniuk · 2024-10-17T12:23:54Z

src/iden3comm/handlers/payment.ts

+        const selectedPayment = paymentReq.data.find((p) => {
+          const proofs = Array.isArray(p.proof) ? p.proof : [p.proof];
+          return (
+            proofs.filter(


i guess better to use find instead of filter

Kolezhniuk · 2024-10-17T12:25:18Z

src/iden3comm/handlers/payment.ts

+          throw new Error(`failed request. not supported '${selectedPayment.type}' payment type `);
+        }
+
+        if (selectedPayment.currency !== SupportedCurrencies.ETHWEI) {


can we rename it ETH_WEI or something like that?

Kolezhniuk · 2024-11-01T12:30:59Z

src/iden3comm/handlers/payment.ts

+  amount: bigint;
+  currency: SupportedCurrencies | string;
+  chainId: string;
+  expirationDate?: Date;


maybe better ISO string?

Kolezhniuk · 2024-11-01T12:33:15Z

src/iden3comm/handlers/payment.ts

 }

 /** @beta PaymentRequestMessageHandlerOptions represents payment-request handler options */
 export type PaymentRequestMessageHandlerOptions = {
-  paymentHandler: (data: PaymentRequestDataInfo) => Promise<string>;
+  paymentHandler: (
+    data: Iden3PaymentRequestCryptoV1 | Iden3PaymentRailsRequestV1 | Iden3PaymentRailsERC20RequestV1


I would creare separate

Kolezhniuk · 2024-11-01T12:37:56Z

src/iden3comm/handlers/payment.ts

      const paymentReq = paymentRequest.body.payments[i];
-      if (paymentReq.type !== PaymentRequestType.PaymentRequest) {
-        throw new Error(`failed request. not supported '${paymentReq.type}' payment type `);
+      const dataArray = Array.isArray(paymentReq.data) ? paymentReq.data : [paymentReq.data];
+      const selectedPayment =
+        dataArray.length === 1
+          ? dataArray[0]
+          : dataArray.find((p) => {
+              return p.type === PaymentRequestDataType.Iden3PaymentRequestCryptoV1
+                ? p.id === ctx.nonce
+                : p.nonce === ctx.nonce;
+            });


Suggested change

const paymentReq = paymentRequest.body.payments[i];

if (paymentReq.type !== PaymentRequestType.PaymentRequest) {

throw new Error(`failed request. not supported '${paymentReq.type}' payment type `);

const dataArray = Array.isArray(paymentReq.data) ? paymentReq.data : [paymentReq.data];

const selectedPayment =

dataArray.length === 1

? dataArray[0]

: dataArray.find((p) => {

return p.type === PaymentRequestDataType.Iden3PaymentRequestCryptoV1

? p.id === ctx.nonce

: p.nonce === ctx.nonce;

});

const { data } = paymentRequest.body.payments[i];

const selectedPayment = Array.isArray(data)

? data.find((p) => {

return p.type === PaymentRequestDataType.Iden3PaymentRequestCryptoV1

? p.id === ctx.nonce

: p.nonce === ctx.nonce;

})

: data;

Kolezhniuk · 2024-11-01T12:54:55Z

src/iden3comm/handlers/payment.ts

+        dataArr.push(
+          type === PaymentRequestDataType.Iden3PaymentRailsRequestV1
+            ? {
+                type,
+                '@context': [
+                  `https://schema.iden3.io/core/jsonld/payment.jsonld#${type}`,
+                  'https://w3id.org/security/suites/eip712sig-2021/v1'
+                ],
+                recipient,
+                amount: amount.toString(),
+                currency,
+                expirationDate: new Date(expiration).toISOString(),
+                nonce: nonce.toString(),
+                metadata: '0x',
+                proof
+              }
+            : {
+                type,
+                '@context': [
+                  `https://schema.iden3.io/core/jsonld/payment.jsonld#${type}`,
+                  'https://w3id.org/security/suites/eip712sig-2021/v1'
+                ],
+                features: features || [],
+                tokenAddress: tokenAddress || '',
+                recipient,
+                amount: amount.toString(),
+                currency,
+                expirationDate: new Date(expiration).toISOString(),
+                nonce: nonce.toString(),
+                metadata: '0x',
+                proof
+              }
+        );


Suggested change

dataArr.push(

type === PaymentRequestDataType.Iden3PaymentRailsRequestV1

? {

type,

'@context': [

`https://schema.iden3.io/core/jsonld/payment.jsonld#${type}`,

'https://w3id.org/security/suites/eip712sig-2021/v1'

],

recipient,

amount: amount.toString(),

currency,

expirationDate: new Date(expiration).toISOString(),

nonce: nonce.toString(),

metadata: '0x',

proof

}

: {

type,

'@context': [

`https://schema.iden3.io/core/jsonld/payment.jsonld#${type}`,

'https://w3id.org/security/suites/eip712sig-2021/v1'

],

features: features || [],

tokenAddress: tokenAddress || '',

recipient,

amount: amount.toString(),

currency,

expirationDate: new Date(expiration).toISOString(),

nonce: nonce.toString(),

metadata: '0x',

proof

}

);

const d: Iden3PaymentRailsRequestV1 = {

type: PaymentRequestDataType.Iden3PaymentRailsRequestV1,

'@context': [

`https://schema.iden3.io/core/jsonld/payment.jsonld#${type}`,

'https://w3id.org/security/suites/eip712sig-2021/v1'

],

recipient,

amount: amount.toString(),

currency,

expirationDate: new Date(expiration).toISOString(),

nonce: nonce.toString(),

metadata: '0x',

proof

};

dataArr.push(

type === PaymentRequestDataType.Iden3PaymentRailsRequestV1

? d

: ({ ...d, type, tokenAddress } as Iden3PaymentRailsERC20RequestV1)

);

Kolezhniuk

Well done

init Iden3PaymentRailsRequestV1

80cf68e

volodymyr-basiuk changed the title ~~[WIP] init Iden3PaymentRailsRequestV1~~ [WIP] Iden3PaymentRailsRequestV1 Oct 1, 2024

volodymyr-basiuk added 5 commits October 2, 2024 14:27

add unit tests

83f3488

add integration tests

2304cfd

use enums for types

af3f1b7

todo added

e832465

prettier

e7ebc72

volodymyr-basiuk requested a review from vmidyllic October 3, 2024 13:08

volodymyr-basiuk added 5 commits October 3, 2024 17:23

createPaymentRailsV1 function

0942cde

set typeUrl Iden3PaymentRailsRequestV1.json

b638140

format

1830190

check recipient

091bff4

format

a78b1ac

volodymyr-basiuk marked this pull request as ready for review October 7, 2024 11:06

volodymyr-basiuk added 11 commits October 11, 2024 13:20

add currencty and rename value to amount

cc6b1f1

add supported in the msg

78a5649

format

da5b90d

remove expiration

0f228de

Iden3PaymentRequestCryptoV1 expiration

3680ef8

format

ff4c638

rename Iden3PaymentRailsResponseV1 to Iden3PaymentRailsV1

99c77fc

remove top lvl PaymentRequest type field

f601100

format

cddfeac

fix tests

dd9a219

add @context field to payment messages

f237306

volodymyr-basiuk changed the title ~~[WIP] Iden3PaymentRailsRequestV1~~ Iden3PaymentRailsRequestV1 Oct 15, 2024

volodymyr-basiuk requested a review from Kolezhniuk October 17, 2024 09:40

Kolezhniuk requested changes Oct 17, 2024

View reviewed changes

volodymyr-basiuk added 2 commits October 24, 2024 12:21

add Iden3PaymentRailsERC20RequestV1

23ebd25

add integration tests

740ef3c

Kolezhniuk reviewed Nov 1, 2024

View reviewed changes

resolve comments

119ad86

volodymyr-basiuk dismissed vmidyllic’s stale review via 119ad86 November 1, 2024 13:14

resolve

ca73277

volodymyr-basiuk requested review from Kolezhniuk and vmidyllic November 1, 2024 13:20

fix expirationDate value

610a262

Kolezhniuk previously approved these changes Nov 1, 2024

View reviewed changes

vmidyllic previously approved these changes Nov 6, 2024

View reviewed changes

verifyEIP712TypedData added and check allowedSigners

eac7597

volodymyr-basiuk dismissed stale reviews from vmidyllic and Kolezhniuk via eac7597 November 7, 2024 12:19

volodymyr-basiuk requested review from vmidyllic and Kolezhniuk November 7, 2024 12:20

volodymyr-basiuk added 5 commits November 7, 2024 14:24

replace asset to with

434e043

fix unit

5d9d8a4

add did resolution

21cc80a

change err messages

d5068a9

Merge branch 'main' into feat/mc-payment

6d18de7

vmidyllic previously approved these changes Nov 18, 2024

View reviewed changes

Merge branch 'main' into feat/mc-payment

e195b0b

volodymyr-basiuk dismissed vmidyllic’s stale review via e195b0b November 18, 2024 16:01

volodymyr-basiuk requested a review from vmidyllic November 18, 2024 16:01

vmidyllic approved these changes Nov 18, 2024

View reviewed changes

Kolezhniuk approved these changes Nov 19, 2024

View reviewed changes

volodymyr-basiuk merged commit fa0ac64 into main Nov 19, 2024
2 checks passed

volodymyr-basiuk deleted the feat/mc-payment branch November 19, 2024 14:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Iden3PaymentRailsRequestV1 #275

Iden3PaymentRailsRequestV1 #275

volodymyr-basiuk commented Oct 1, 2024

Kolezhniuk Oct 17, 2024

volodymyr-basiuk Oct 25, 2024

volodymyr-basiuk Oct 25, 2024

Kolezhniuk Oct 17, 2024

Kolezhniuk Oct 17, 2024

Kolezhniuk Oct 17, 2024

Kolezhniuk Oct 17, 2024

Kolezhniuk Nov 1, 2024

Kolezhniuk Nov 1, 2024

Kolezhniuk Nov 1, 2024

Kolezhniuk Nov 1, 2024

Kolezhniuk left a comment

Iden3PaymentRailsRequestV1 #275

Iden3PaymentRailsRequestV1 #275

Conversation

volodymyr-basiuk commented Oct 1, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Kolezhniuk left a comment

Choose a reason for hiding this comment