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

fix(its): remove unnecessary use of payable in functions #298

Merged
merged 11 commits into from
Nov 11, 2024
Merged

fix(its): remove unnecessary use of payable in functions #298

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e1c0395
fix(its): remove unnecessary use of payable in functions
ahramy Nov 7, 2024
eec4301
Merge branch 'main' into fix/remove-unnecessary-payable
ahramy Nov 7, 2024
25889f2
updated
ahramy Nov 9, 2024
70885cb
Merge branch 'fix/remove-unnecessary-payable' of https://github.com/a…
ahramy Nov 9, 2024
dde32a9
updated
ahramy Nov 9, 2024
22c9676
updated
ahramy Nov 11, 2024
83425f0
Update InterchainTokenService.js
ahramy Nov 11, 2024
0774feb
Merge branch 'main' into fix/remove-unnecessary-payable
ahramy Nov 11, 2024
9bd7518
update comments
ahramy Nov 11, 2024
6381c96
Merge branch 'fix/remove-unnecessary-payable' of https://github.com/a…
ahramy Nov 11, 2024
4eb655d
Update InterchainTokenFactory.sol
ahramy Nov 11, 2024
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
2 changes: 1 addition & 1 deletion contracts/InterchainTokenService.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ contract InterchainTokenService is
uint256 amount,
bytes memory data,
uint256 gasValue
) external payable whenNotPaused {
) external whenNotPaused {
ahramy marked this conversation as resolved.
Show resolved Hide resolved
if (data.length == 0) revert EmptyData();
amount = _takeToken(tokenId, msg.sender, amount, false);

Expand Down
4 changes: 2 additions & 2 deletions contracts/TokenHandler.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ contract TokenHandler is ITokenHandler, ITokenManagerType, ReentrancyGuard, Crea
* @return address the address of the token.
*/
// slither-disable-next-line locked-ether
ahramy marked this conversation as resolved.
Show resolved Hide resolved
function giveToken(bytes32 tokenId, address to, uint256 amount) external payable returns (uint256, address) {
function giveToken(bytes32 tokenId, address to, uint256 amount) external returns (uint256, address) {
ahramy marked this conversation as resolved.
Show resolved Hide resolved
address tokenManager = _create3Address(tokenId);

(uint256 tokenManagerType, address tokenAddress) = ITokenManagerProxy(tokenManager).getImplementationTypeAndTokenAddress();
Expand Down Expand Up @@ -108,7 +108,7 @@ contract TokenHandler is ITokenHandler, ITokenManagerType, ReentrancyGuard, Crea
* @return address The address of the token corresponding to the input tokenId.
*/
// slither-disable-next-line locked-ether
function transferTokenFrom(bytes32 tokenId, address from, address to, uint256 amount) external payable returns (uint256, address) {
function transferTokenFrom(bytes32 tokenId, address from, address to, uint256 amount) external returns (uint256, address) {
address tokenManager = _create3Address(tokenId);
(uint256 tokenManagerType, address tokenAddress) = ITokenManagerProxy(tokenManager).getImplementationTypeAndTokenAddress();

Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/IInterchainTokenService.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ interface IInterchainTokenService is
uint256 amount,
bytes calldata data,
uint256 gasValue
) external payable;
) external;

/**
* @notice Sets the flow limits for multiple tokens.
Expand Down
4 changes: 2 additions & 2 deletions contracts/interfaces/ITokenHandler.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ interface ITokenHandler {
* @return uint256 The amount of token actually given, which could be different for certain token type.
* @return address the address of the token.
*/
function giveToken(bytes32 tokenId, address to, uint256 amount) external payable returns (uint256, address);
function giveToken(bytes32 tokenId, address to, uint256 amount) external returns (uint256, address);

/**
* @notice This function takes token from a specified address to the token manager.
Expand All @@ -41,7 +41,7 @@ interface ITokenHandler {
* @return address The address of the token corresponding to the input tokenId.
*/
// slither-disable-next-line locked-ether
function transferTokenFrom(bytes32 tokenId, address from, address to, uint256 amount) external payable returns (uint256, address);
function transferTokenFrom(bytes32 tokenId, address from, address to, uint256 amount) external returns (uint256, address);

/**
* @notice This function prepares a token manager after it is deployed
Expand Down
Loading