Skip to content

Format code for better reading #4

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

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

Format code for better reading #4

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
148 changes: 71 additions & 77 deletions contracts/AtomicSwap.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
pragma solidity ^0.4.15;
pragma solidity ^ 0.4 .15;

contract AtomicSwap {

enum State { Empty, Initiator, Participant }
enum State {
Empty,
Initiator,
Participant
}

struct Swap {
uint initTimestamp;
Expand All @@ -17,108 +21,98 @@ contract AtomicSwap {
}

mapping(bytes20 => Swap) public swaps;
event Refunded(uint _refundTime);

event Refunded(uint _refundTime);
event Redeemed(uint _redeemTime);
event Participated(
address _initiator,
address _participator,
address _initiator,
address _participator,
bytes20 _hashedSecret,
uint256 _value
);
event Initiated(
uint _initTimestamp,
uint _refundTime,
bytes20 _hashedSecret,
address _participant,
address _initiator,
uint256 _funds
);
event Initiated(
uint _initTimestamp,
uint _refundTime,
bytes20 _hashedSecret,
address _participant,
address _initiator,
uint256 _funds
);

function AtomicSwap() {}

modifier isRefundable(bytes20 _hashedSecret) {
require(block.timestamp > swaps[_hashedSecret].initTimestamp + swaps[_hashedSecret].refundTime);
require(swaps[_hashedSecret].emptied == false);
_;
}

modifier isRedeemable(bytes20 _hashedSecret, bytes32 _secret) {
require(ripemd160(_secret) == _hashedSecret);
require(block.timestamp < swaps[_hashedSecret].initTimestamp + swaps[_hashedSecret].refundTime);
require(swaps[_hashedSecret].emptied == false);
_;
}

function AtomicSwap() {}

modifier isRefundable(bytes20 _hashedSecret) {
require(block.timestamp > swaps[_hashedSecret].initTimestamp + swaps[_hashedSecret].refundTime);
require(swaps[_hashedSecret].emptied == false);
_;
}

modifier isRedeemable(bytes20 _hashedSecret, bytes32 _secret) {
require(ripemd160(_secret) == _hashedSecret);
require(block.timestamp < swaps[_hashedSecret].initTimestamp + swaps[_hashedSecret].refundTime);
require(swaps[_hashedSecret].emptied == false);
_;
}

modifier isInitiator(bytes20 _hashedSecret) {
require(msg.sender == swaps[_hashedSecret].initiator);
_;
}

modifier isNotInitiated(bytes20 _hashedSecret) {
require(swaps[_hashedSecret].state == State.Empty);
_;
}
modifier isInitiator(bytes20 _hashedSecret) {
require(msg.sender == swaps[_hashedSecret].initiator);
_;
}

modifier isNotInitiated(bytes20 _hashedSecret) {
require(swaps[_hashedSecret].state == State.Empty);
_;
}

function initiate (uint _refundTime,bytes20 _hashedSecret,address _participant)
payable
isNotInitiated(_hashedSecret)
{
swaps[_hashedSecret].refundTime = _refundTime;
swaps[_hashedSecret].initTimestamp = block.timestamp;
swaps[_hashedSecret].hashedSecret = _hashedSecret;
swaps[_hashedSecret].participant = _participant;
swaps[_hashedSecret].initiator = msg.sender;
function initiate(uint _refundTime, bytes20 _hashedSecret, address _participant) payable isNotInitiated(_hashedSecret) {
swaps[_hashedSecret].refundTime = _refundTime;
swaps[_hashedSecret].initTimestamp = block.timestamp;
swaps[_hashedSecret].hashedSecret = _hashedSecret;
swaps[_hashedSecret].participant = _participant;
swaps[_hashedSecret].initiator = msg.sender;
swaps[_hashedSecret].state = State.Initiator;
swaps[_hashedSecret].value = msg.value;
Initiated(
swaps[_hashedSecret].initTimestamp,
_refundTime,
_hashedSecret,
_participant,
msg.sender,
msg.value
);
}
Initiated(
swaps[_hashedSecret].initTimestamp,
_refundTime,
_hashedSecret,
_participant,
msg.sender,
msg.value
);
}

function participate(uint _refundTime, bytes20 _hashedSecret,address _initiator)
payable
isNotInitiated(_hashedSecret)
{
function participate(uint _refundTime, bytes20 _hashedSecret, address _initiator) payable isNotInitiated(_hashedSecret) {
swaps[_hashedSecret].refundTime = _refundTime;
swaps[_hashedSecret].initTimestamp = block.timestamp;
swaps[_hashedSecret].initTimestamp = block.timestamp;
swaps[_hashedSecret].participant = msg.sender;
swaps[_hashedSecret].initiator = _initiator;
swaps[_hashedSecret].value = msg.value;
swaps[_hashedSecret].hashedSecret = _hashedSecret;
swaps[_hashedSecret].state = State.Participant;
Participated(_initiator,msg.sender,_hashedSecret,msg.value);
Participated(_initiator, msg.sender, _hashedSecret, msg.value);
}

function redeem(bytes32 _secret, bytes20 _hashedSecret)
isRedeemable(_hashedSecret, _secret)
{
if(swaps[_hashedSecret].state == State.Participant){

function redeem(bytes32 _secret, bytes20 _hashedSecret) isRedeemable(_hashedSecret, _secret) {
if (swaps[_hashedSecret].state == State.Participant) {
swaps[_hashedSecret].initiator.transfer(swaps[_hashedSecret].value);
}
if(swaps[_hashedSecret].state == State.Initiator){
if (swaps[_hashedSecret].state == State.Initiator) {
swaps[_hashedSecret].participant.transfer(swaps[_hashedSecret].value);
}
swaps[_hashedSecret].emptied = true;
Redeemed(block.timestamp);
swaps[_hashedSecret].secret = _secret;
}
}

function refund(bytes20 _hashedSecret)
isRefundable(_hashedSecret)
{
if(swaps[_hashedSecret].state == State.Participant){
function refund(bytes20 _hashedSecret) isRefundable(_hashedSecret) {
if (swaps[_hashedSecret].state == State.Participant) {
swaps[_hashedSecret].participant.transfer(swaps[_hashedSecret].value);
}
if(swaps[_hashedSecret].state == State.Initiator){
if (swaps[_hashedSecret].state == State.Initiator) {
swaps[_hashedSecret].initiator.transfer(swaps[_hashedSecret].value);
}
swaps[_hashedSecret].emptied = true;
Refunded(block.timestamp);
}
}
Refunded(block.timestamp);
}
}