Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ERC-7573: added keyEncryptedSeller to ILockingContract TransferConfirmed event #879

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update ERC-7573: added keyEncryptedSeller to ILockingContract TransferConfirmed event #879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ERCS/erc-7573.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ function confirmTransfer(bytes32 id, int amount, address to, string memory keyEn

Called from the seller of the token to confirm token transfer. Emits a `TransferConfirmed` event.
The parameter `id` is an identifier of the trade. The parameter `to` is the address of the buyer (the address of the seller is `msg.sender`).
The parameter `keyEncryptedSeller` is an encryption of the key that can be used by the seller to reclaim the token.
The parameter `keyEncryptedBuyer` is an encryption of the key that can be used by the buyer to claim the token.

If the trade specification, that is, the quadruppel (`id`, `amount`, `from`, `to`), in a call to `confirmTransfer`
Expand Down Expand Up @@ -90,7 +91,7 @@ The interface `ILockingContract`:
```solidity
interface ILockingContract {
event TransferIncepted(bytes32 id, int amount, address from, address to, string keyEncryptedSeller);
event TransferConfirmed(bytes32 id, int amount, address from, address to, string keyEncryptedBuyer);
event TransferConfirmed(bytes32 id, int amount, address from, address to, string keyEncryptedSeller, string keyEncryptedBuyer);
event TokenClaimed(bytes32 id, string key);
event TokenReclaimed(bytes32 id, string key);

Expand Down
17 changes: 9 additions & 8 deletions assets/erc-7573/contracts/ILockingContract.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ pragma solidity >=0.7.0;
* This is the locking contracts interface.
*
* The rationale is that the token is locked with with two encrypted keys
* or a hashes of keys associated with two different adresses (buyer/seller).
* or a hashes of keys associated with two different addresses (buyer/seller).
*
* The asset in transfered to the address of the buyer, if the buyer's key is presented.
* The asset in transferred to the address of the buyer, if the buyer's key is presented.
*
* The asset in (re-)transfered to the address of the seller, if the seller's key is presented.
* The asset in (re-)transferred to the address of the seller, if the seller's key is presented.
*/
interface ILockingContract {

Expand All @@ -38,12 +38,13 @@ interface ILockingContract {
/**
* @dev Emitted when the transfer for the token is incepted
* @param id the trade identifier of the trade.
* @param amount the number of tokens to be transfered.
* @param amount the number of tokens to be transferred.
* @param from The address of the seller.
* @param to The address of the buyer.
* @param keyEncryptedBuyer Encryption of the key that can be used by the buyer to claim the token.
* @param keyEncryptedSeller Encryption of the key that can be used by the seller to reclaim the token in case of cancellation or failed payment.
* @param keyEncryptedBuyer Encryption of the key that can be used by the buyer to claim the token in case of a successful payment.
*/
event TransferConfirmed(bytes32 id, int amount, address from, address to, string keyEncryptedBuyer);
event TransferConfirmed(bytes32 id, int amount, address from, address to, string keyEncryptedSeller, string keyEncryptedBuyer);

/**
* @dev Emitted when the token was successfully claimed (forward to buyer).
Expand All @@ -65,7 +66,7 @@ interface ILockingContract {
* @notice Called from the buyer of the token to initiate token transfer.
* @dev emits a {TransferIncepted}
* @param id the trade identifier of the trade.
* @param amount the number of tokens to be transfered.
* @param amount the number of tokens to be transferred.
* @param from The address of the seller (the address of the buyer is message.sender).
* @param keyEncryptedSeller Encryption of the key that can be used by the seller to (re-)claim the token.
*/
Expand All @@ -75,7 +76,7 @@ interface ILockingContract {
* @notice Called from the seller of the token to confirm token transfer. Locks the token.
* @dev emits a {TransferConfirmed}
* @param id the trade identifier of the trade.
* @param amount the number of tokens to be transfered.
* @param amount the number of tokens to be transferred.
* @param to The address of the buyer (the address of the seller is message.sender).
* @param keyEncryptedBuyer Encryption of the key that can be used by the buyer to claim the token.
*/
Expand Down
Loading