mirror of
https://github.com/Instadapp/dsa-connectors.git
synced 2024-07-29 22:37:00 +00:00
_sourceChain assembly + lint
This commit is contained in:
parent
03941edab3
commit
d280a09b64
|
@ -13,7 +13,6 @@ import "./events.sol";
|
||||||
import "./interface.sol";
|
import "./interface.sol";
|
||||||
|
|
||||||
abstract contract SocketConnectorBridge is Basic {
|
abstract contract SocketConnectorBridge is Basic {
|
||||||
|
|
||||||
address constant registry = 0xc30141B657f4216252dc59Af2e7CdB9D8792e1B0;
|
address constant registry = 0xc30141B657f4216252dc59Af2e7CdB9D8792e1B0;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -21,30 +20,33 @@ abstract contract SocketConnectorBridge is Basic {
|
||||||
* @param _txData - contains data returned from socket build-tx API. Struct defined in interfaces.sol
|
* @param _txData - contains data returned from socket build-tx API. Struct defined in interfaces.sol
|
||||||
* @param _ethAmt - Eth to bridge for .value()
|
* @param _ethAmt - Eth to bridge for .value()
|
||||||
*/
|
*/
|
||||||
function socketBridge(
|
function socketBridge(bytes memory _txData, uint256 _ethAmt)
|
||||||
bytes memory _txData,
|
internal
|
||||||
uint _ethAmt
|
returns (bool _success)
|
||||||
) internal returns (bool _success) {
|
{
|
||||||
(_success, ) = registry.call{value: _ethAmt}(_txData);
|
(_success, ) = registry.call{ value: _ethAmt }(_txData);
|
||||||
require(_success, "Socket-swap-failed");
|
require(_success, "Socket-swap-failed");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
abstract contract SocketConnectorResolver is SocketConnectorBridge {
|
abstract contract SocketConnectorResolver is SocketConnectorBridge {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @dev Gets Allowance target from registry.
|
* @dev Gets Allowance target from registry.
|
||||||
* @param _route route number
|
* @param _route route number
|
||||||
*/
|
*/
|
||||||
function getAllowanceTarget(uint _route) internal view returns (address _allowanceTarget) {
|
function getAllowanceTarget(uint256 _route)
|
||||||
ISocketRegistry.RouteData memory data = ISocketRegistry(registry).routes(_route);
|
internal
|
||||||
|
view
|
||||||
|
returns (address _allowanceTarget)
|
||||||
|
{
|
||||||
|
ISocketRegistry.RouteData memory data = ISocketRegistry(registry)
|
||||||
|
.routes(_route);
|
||||||
require(data.route != address(0), "allowanceTarget-not-valid");
|
require(data.route != address(0), "allowanceTarget-not-valid");
|
||||||
return data.route;
|
return data.route;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
abstract contract SocketConnector is SocketConnectorResolver {
|
abstract contract SocketConnector is SocketConnectorResolver {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @dev Bridge Token.
|
* @dev Bridge Token.
|
||||||
* @notice Bridge Token on Socket.
|
* @notice Bridge Token on Socket.
|
||||||
|
@ -55,7 +57,7 @@ abstract contract SocketConnector is SocketConnectorResolver {
|
||||||
* @param _targetChain Target chain ID
|
* @param _targetChain Target chain ID
|
||||||
* @param _recipient address of the recipient on the target chain
|
* @param _recipient address of the recipient on the target chain
|
||||||
*/
|
*/
|
||||||
function bridge (
|
function bridge(
|
||||||
address _token,
|
address _token,
|
||||||
bytes memory _txData,
|
bytes memory _txData,
|
||||||
uint256 _route,
|
uint256 _route,
|
||||||
|
@ -63,11 +65,13 @@ abstract contract SocketConnector is SocketConnectorResolver {
|
||||||
uint256 _targetChain,
|
uint256 _targetChain,
|
||||||
address _recipient
|
address _recipient
|
||||||
)
|
)
|
||||||
external payable returns (string memory _eventName, bytes memory _eventParam)
|
external
|
||||||
|
payable
|
||||||
|
returns (string memory _eventName, bytes memory _eventParam)
|
||||||
{
|
{
|
||||||
uint _ethAmt;
|
uint256 _ethAmt;
|
||||||
|
|
||||||
if(_token == ethAddr) {
|
if (_token == ethAddr) {
|
||||||
_ethAmt = _amount;
|
_ethAmt = _amount;
|
||||||
} else {
|
} else {
|
||||||
TokenInterface _tokenContract = TokenInterface(_token);
|
TokenInterface _tokenContract = TokenInterface(_token);
|
||||||
|
@ -76,11 +80,16 @@ abstract contract SocketConnector is SocketConnectorResolver {
|
||||||
|
|
||||||
socketBridge(_txData, _ethAmt);
|
socketBridge(_txData, _ethAmt);
|
||||||
|
|
||||||
|
uint256 _sourceChain;
|
||||||
|
assembly {
|
||||||
|
_sourceChain := chainid()
|
||||||
|
}
|
||||||
|
|
||||||
_eventName = "LogSocketBridge(address,uint256,uint256,uint256,address)";
|
_eventName = "LogSocketBridge(address,uint256,uint256,uint256,address)";
|
||||||
_eventParam = abi.encode(
|
_eventParam = abi.encode(
|
||||||
_token,
|
_token,
|
||||||
_amount,
|
_amount,
|
||||||
block.chainid,
|
_sourceChain,
|
||||||
_targetChain,
|
_targetChain,
|
||||||
_recipient
|
_recipient
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user