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

contract comment updates (#415)

Browse Source
This commit is contained in:
noot
2023-04-25 14:43:03 +02:00
committed by GitHub
parent 9cc39e84da
commit 177b96da76
5 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ethereum/check_swap_creator_contract.go
View File

File diff suppressed because one or more lines are too long

2
ethereum/check_swap_creator_contract_test.go
View File

@@ -67,7 +67,7 @@ func TestExpectedSwapCreatorBytecodeHex(t *testing.T) {
allZeroTrustedForwarder := ethcommon.Address{}
codeHex := ethcommon.Bytes2Hex(getContractCode(t, allZeroTrustedForwarder))
require.Equal(t, expectedSwapCreatorBytecodeHex, codeHex,
"update the expectedSwapCreatorBytecodeHex constant with the actual value to fix this test")
"update the expectedSwapCreatorBytecodeHex constant with the actual value tocat fix this test")
}
// This test will fail if the compiled SwapCreator contract is updated, but the

18
ethereum/contracts/SwapCreator.sol
View File

@@ -125,9 +125,7 @@ contract SwapCreator is ERC2771Context, Secp256k1 {
if (_value != msg.value) revert InvalidValue();
} else {
// transfer ERC-20 token into this contract
// TODO: potentially check token balance before/after this step
// and ensure the balance was increased by swap.value since fee-on-transfer
// tokens are not supported
// WARN: fee-on-transfer tokens are not supported
IERC20(_asset).transferFrom(msg.sender, address(this), _value);
}
@@ -183,12 +181,9 @@ contract SwapCreator is ERC2771Context, Secp256k1 {
if (_swap.asset == address(0)) {
_swap.claimer.transfer(_swap.value);
} else {
// TODO: this will FAIL for fee-on-transfer or rebasing tokens if the token
// WARN: this will FAIL for fee-on-transfer or rebasing tokens if the token
// transfer reverts (i.e. if this contract does not contain _swap.value tokens),
// exposing Bob's secret while giving him nothing
//
// potential solution: wrap tokens into shares instead of absolute values
// swap.value would then contain the share of the token
// exposing Bob's secret while giving him nothing.
IERC20(_swap.asset).transfer(_swap.claimer, _swap.value);
}
}
@@ -208,12 +203,9 @@ contract SwapCreator is ERC2771Context, Secp256k1 {
_swap.claimer.transfer(_swap.value - fee);
payable(tx.origin).transfer(fee); // solhint-disable-line
} else {
// TODO: this will FAIL for fee-on-transfer or rebasing tokens if the token
// WARN: this will FAIL for fee-on-transfer or rebasing tokens if the token
// transfer reverts (i.e. if this contract does not contain _swap.value tokens),
// exposing Bob's secret while giving him nothing
//
// potential solution: wrap tokens into shares instead of absolute values
// swap.value would then contain the share of the token
// exposing Bob's secret while giving him nothing.
IERC20(_swap.asset).transfer(_swap.claimer, _swap.value - fee);
IERC20(_swap.asset).transfer(tx.origin, fee); // solhint-disable-line
}

2
ethereum/swap_creator.go
View File

File diff suppressed because one or more lines are too long