github/atomic-swap
1
1
Fork 0
mirror of https://github.com/AthanorLabs/atomic-swap.git synced 2026-01-10 14:48:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Import a mock ed25519 contract

Browse Source
This commit is contained in:
Marcin Górny
2021-10-23 13:38:17 +02:00
parent c78a0dc6f7
commit 5872285431
2 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contracts/contracts/Ed25519_mock.sol Normal file
View File

@@ -0,0 +1,8 @@
pragma solidity ^0.8.9;
contract Ed25519 {
function scalarMultBase(uint s) public view returns (uint, uint) {
return (s, s);
}
}

30
contracts/contracts/Swap.sol
View File

@@ -1,8 +1,9 @@
pragma solidity 0.8.9;
import "./Ed25519_mock.sol";
contract Swap {
Ed25519 ed25519;
// the hash of the expected public key for which the secret `s_b` corresponds.
// this public key is a point on the ed25519 curve, and is in 33-byte compressed format (?)
bytes32 public pubKeyClaim;
@@ -27,8 +28,8 @@ contract Swap {
// this prevents Bob from withdrawing funds without locking funds on the other chain first
bool isReady = false;
event DerivedPubKeyClaim(uint256 x, uint256 y);
event DerivedPubKeyRefund(uint256 x, uint256 y);
event DerivedPubKeyClaim(uint256 s);
event DerivedPubKeyRefund(uint256 s);
constructor(
bytes32 _pubKeyClaim,
@@ -38,6 +39,7 @@ contract Swap {
pubKeyClaim = _pubKeyClaim;
pubKeyRefund = _pubKeyRefund;
timeout_0 = block.timestamp + 1 days; // TODO: make configurable
ed25519 = new Ed25519();
}
function set_ready() public {
@@ -51,11 +53,11 @@ contract Swap {
) public {
require(isReady == true, "contract is not ready!");
// confirm that provided secret `_s` was used to derive pubKeyClaim
/* Ed25519(_s) */
(uint px, uint py) = ed25519.scalarMultBase(_s);
/* emit DerivedPubKeyClaim(px, py); */
/* bytes32 ph = keccak256(abi.encode(px, py)); */
/* require(ph == pubKeyClaim, "provided public key does not match expected"); */
emit DerivedPubKeyClaim(_s);
bytes32 ph = keccak256(abi.encode(px, py));
require(ph == pubKeyClaim, "provided secret does not match the expected pubKey");
// // send eth to caller
payable(msg.sender).transfer(address(this).balance);
@@ -64,9 +66,12 @@ contract Swap {
function refund_bob(
uint256 _s
) public {
// TODO required that secret provided corresponds to expectedPubKeyClaim
require(isReady == false && block.timestamp <= timeout_1);
(uint px, uint py) = ed25519.scalarMultBase(_s);
bytes32 ph = keccak256(abi.encode(px, py));
require(ph == pubKeyClaim, "provided secret does not match the expected pubKey");
/* emit DerivedPubKeyClaim(px, py); */
emit DerivedPubKeyClaim(_s);
require(block.timestamp < timeout_0);
}
@@ -76,9 +81,10 @@ contract Swap {
) public {
require((block.timestamp <= timeout_0 && isReady == false) || block.timestamp <= timeout_1);
// TODO require that the provided secret matches `pubKeyRefund`
/* emit DerivedPubKeyRefund(px, py); */
(uint px, uint py) = ed25519.scalarMultBase(_s);
bytes32 ph = keccak256(abi.encode(px, py));
require(ph == pubKeyRefund, "provided secret does not match the expected pubKey");
emit DerivedPubKeyRefund(_s);
// send eth back to owner
owner.transfer(address(this).balance);