Skip to content

Commit

Permalink
Resolve merge conflict on OP Concepts page
Browse files Browse the repository at this point in the history
  • Loading branch information
hajjimo committed Apr 8, 2024
1 parent b935671 commit e6a2ed2
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions docs/src/content/docs/introduction/op-concepts.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,12 @@ When an `outgoing-payment` is completed against an open and active `incoming-pay

To set up ILP as a payment method in OP, the following are required:

- <LinkOut href='https://interledger.org/developers/rfcs/ilp-addresses/'>
ILP address
- The <LinkOut href='https://interledger.org/developers/rfcs/ilp-addresses/'>ILP address
</LinkOut> of the payee’s ASE: The ILP address is required so that packets representing
payments routed over the Interledger network will be forwarded to the node owned
and operated by the intended receiver (i.e. payee's ASE). The `ilpAddress` field
must be sent by the payee’s ASE in the `methods` object on an `incoming-payment`
response.
payments routed over the Interledger network will be forwarded to the node owned
and operated by the intended receiver (i.e. payee's ASE). The `ilpAddress` field
must be sent by the payee’s ASE in the `methods` object on an `incoming-payment`
response.
- Shared secret: A cryptographically secured secret exchanged between the sender and receiver to ensure that packets sent over the Interledger network through a <LinkOut href='https://interledger.org/developers/rfcs/stream-protocol/'>STREAM</LinkOut> connection can only be read by the two parties. The payee’s ASE must return the `sharedSecret` field in the `methods` object on an `incoming-payment` response.
- The payee's ASE must return the value `ilp` in the `type` field of the `methods` object on an `incoming-payment` response.
- The payer's ASE must send the value `ilp` in the `method` field when creating a `quote`.

0 comments on commit e6a2ed2

Please sign in to comment.