Instadapp/dsa-connectors-old
1
0
Fork 0
mirror of https://github.com/Instadapp/dsa-connectors-old.git synced 2024-07-29 22:47:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed try catchs

Browse Source
This commit is contained in:
Hilmar X 2020-09-04 14:53:06 +02:00
parent 92a5a7e112
commit 36fe5adc31
1 changed files with 36 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
contracts/connectors/gelato.sol
View File

@ -225,23 +225,20 @@ contract GelatoResolver is GelatoHelpers {
payable payable
{ {
uint256 ethToDeposit = getUint(_getId, _ethToDeposit); uint256 ethToDeposit = getUint(_getId, _ethToDeposit);
try IGelatoInterface(getGelatoCoreAddr()).multiProvide{value: ethToDeposit}( IGelatoInterface(getGelatoCoreAddr()).multiProvide{value: ethToDeposit}(
_executor, _executor,
_taskSpecs, _taskSpecs,
_modules _modules
) { );
} catch Error(string memory error) {
revert(string(abi.encodePacked("ConnectGelato.multiProvide:", error)));
} catch {
revert("ConnectGelato.multiProvide: unknown error");
}
setUint(_setId, ethToDeposit); setUint(_setId, ethToDeposit);
emit LogMultiProvide(_executor, _taskSpecs, _modules, ethToDeposit, _getId, _setId); emit LogMultiProvide(_executor, _taskSpecs, _modules, ethToDeposit, _getId, _setId);
bytes32 _eventCode = keccak256("LogMultiProvide(address,(address[],(address,bytes,uint8,uint8,uint256,bool)[],uint256)[],address[],uint256,uint256,uint256)"); bytes32 _eventCode = keccak256(
"LogMultiProvide(address,(address[],(address,bytes,uint8,uint8,uint256,bool)[],uint256)[],address[],uint256,uint256,uint256)"
);
bytes memory _eventParam = abi.encode(_executor, _taskSpecs, _modules, ethToDeposit, _getId, _setId); bytes memory _eventParam = abi.encode(_executor, _taskSpecs, _modules, ethToDeposit, _getId, _setId);
(uint _type, uint _id) = connectorID(); (uint256 _type, uint256 _id) = connectorID();
EventInterface(getEventAddr()).emitEvent(_type, _id, _eventCode, _eventParam); EventInterface(getEventAddr()).emitEvent(_type, _id, _eventCode, _eventParam);
} }
@ -260,17 +257,14 @@ contract GelatoResolver is GelatoHelpers {
external external
payable payable
{ {
try IGelatoInterface(getGelatoCoreAddr()).submitTask(_provider, _task, _expiryDate) { IGelatoInterface(getGelatoCoreAddr()).submitTask(_provider, _task, _expiryDate);
} catch Error(string memory error) {
revert(string(abi.encodePacked("ConnectGelato.submitTask:", error)));
} catch {
revert("ConnectGelato.submitTask: unknown error");
}
emit LogSubmitTask(_provider, _task, _expiryDate, 0, 0); emit LogSubmitTask(_provider, _task, _expiryDate, 0, 0);
bytes32 _eventCode = keccak256("LogSubmitTask((address,address),((address,bytes)[],(address,bytes,uint8,uint8,uint256,bool)[],uint256,uint256),uint256,uint256,uint256)"); bytes32 _eventCode = keccak256(
"LogSubmitTask((address,address),((address,bytes)[],(address,bytes,uint8,uint8,uint256,bool)[],uint256,uint256),uint256,uint256,uint256)"
);
bytes memory _eventParam = abi.encode(_provider, _task, _expiryDate, 0, 0); bytes memory _eventParam = abi.encode(_provider, _task, _expiryDate, 0, 0);
(uint _type, uint _id) = connectorID(); (uint256 _type, uint256 _id) = connectorID();
EventInterface(getEventAddr()).emitEvent(_type, _id, _eventCode, _eventParam); EventInterface(getEventAddr()).emitEvent(_type, _id, _eventCode, _eventParam);
} }
@ -291,22 +285,19 @@ contract GelatoResolver is GelatoHelpers {
external external
payable payable
{ {
try IGelatoInterface(getGelatoCoreAddr()).submitTaskCycle( IGelatoInterface(getGelatoCoreAddr()).submitTaskCycle(
_provider, _provider,
_tasks, _tasks,
_expiryDate, _expiryDate,
_cycles _cycles
) { );
} catch Error(string memory error) {
revert(string(abi.encodePacked("ConnectGelato.submitTaskCycle:", error)));
} catch {
revert("ConnectGelato.submitTaskCycle: unknown error");
}
emit LogSubmitTaskCycle(_provider, _tasks, _expiryDate, 0, 0); emit LogSubmitTaskCycle(_provider, _tasks, _expiryDate, 0, 0);
bytes32 _eventCode = keccak256("LogSubmitTaskCycle((address,address),((address,bytes)[],(address,bytes,uint8,uint8,uint256,bool)[],uint256,uint256)[],uint256,uint256,uint256)"); bytes32 _eventCode = keccak256(
"LogSubmitTaskCycle((address,address),((address,bytes)[],(address,bytes,uint8,uint8,uint256,bool)[],uint256,uint256)[],uint256,uint256,uint256)"
);
bytes memory _eventParam = abi.encode(_provider, _tasks, _expiryDate, 0, 0); bytes memory _eventParam = abi.encode(_provider, _tasks, _expiryDate, 0, 0);
(uint _type, uint _id) = connectorID(); (uint256 _type, uint256 _id) = connectorID();
EventInterface(getEventAddr()).emitEvent(_type, _id, _eventCode, _eventParam); EventInterface(getEventAddr()).emitEvent(_type, _id, _eventCode, _eventParam);
} }
@ -328,22 +319,19 @@ contract GelatoResolver is GelatoHelpers {
external external
payable payable
{ {
try IGelatoInterface(getGelatoCoreAddr()).submitTaskChain( IGelatoInterface(getGelatoCoreAddr()).submitTaskChain(
_provider, _provider,
_tasks, _tasks,
_expiryDate, _expiryDate,
_sumOfRequestedTaskSubmits _sumOfRequestedTaskSubmits
) { );
} catch Error(string memory error) {
revert(string(abi.encodePacked("ConnectGelato.submitTaskChain:", error)));
} catch {
revert("ConnectGelato.submitTaskChain: unknown error");
}
emit LogSubmitTaskChain(_provider, _tasks, _expiryDate, 0, 0); emit LogSubmitTaskChain(_provider, _tasks, _expiryDate, 0, 0);
bytes32 _eventCode = keccak256("LogSubmitTaskChain((address,address),((address,bytes)[],(address,bytes,uint8,uint8,uint256,bool)[],uint256,uint256)[],uint256,uint256,uint256)"); bytes32 _eventCode = keccak256(
"LogSubmitTaskChain((address,address),((address,bytes)[],(address,bytes,uint8,uint8,uint256,bool)[],uint256,uint256)[],uint256,uint256,uint256)"
);
bytes memory _eventParam = abi.encode(_provider, _tasks, _expiryDate, 0, 0); bytes memory _eventParam = abi.encode(_provider, _tasks, _expiryDate, 0, 0);
(uint _type, uint _id) = connectorID(); (uint256 _type, uint256 _id) = connectorID();
EventInterface(getEventAddr()).emitEvent(_type, _id, _eventCode, _eventParam); EventInterface(getEventAddr()).emitEvent(_type, _id, _eventCode, _eventParam);
} }
@ -369,23 +357,21 @@ contract GelatoResolver is GelatoHelpers {
uint256 withdrawAmount = getUint(_getId, _withdrawAmount); uint256 withdrawAmount = getUint(_getId, _withdrawAmount);
uint256 balanceBefore = address(this).balance; uint256 balanceBefore = address(this).balance;
uint256 actualWithdrawAmount; uint256 actualWithdrawAmount;
try IGelatoInterface(getGelatoCoreAddr()).multiUnprovide( IGelatoInterface(getGelatoCoreAddr()).multiUnprovide(
withdrawAmount, withdrawAmount,
_taskSpecs, _taskSpecs,
_modules _modules
) { );
actualWithdrawAmount = sub(address(this).balance, balanceBefore);
actualWithdrawAmount = sub(address(this).balance, balanceBefore);
setUint(_setId, actualWithdrawAmount); setUint(_setId, actualWithdrawAmount);
} catch Error(string memory error) {
revert(string(abi.encodePacked("ConnectGelato.multiUnprovide:", error)));
} catch {
revert("ConnectGelato.multiUnprovide: unknown error");
}
emit LogMultiUnprovide(_taskSpecs, _modules, actualWithdrawAmount, _getId, _setId); emit LogMultiUnprovide(_taskSpecs, _modules, actualWithdrawAmount, _getId, _setId);
bytes32 _eventCode = keccak256("LogMultiUnprovide(address,(address[],(address,bytes,uint8,uint8,uint256,bool)[],uint256)[],address[],uint256,uint256,uint256)"); bytes32 _eventCode = keccak256(
"LogMultiUnprovide(address,(address[],(address,bytes,uint8,uint8,uint256,bool)[],uint256)[],address[],uint256,uint256,uint256)"
);
bytes memory _eventParam = abi.encode(_taskSpecs, _modules, actualWithdrawAmount, _getId, _setId); bytes memory _eventParam = abi.encode(_taskSpecs, _modules, actualWithdrawAmount, _getId, _setId);
(uint _type, uint _id) = connectorID(); (uint256 _type, uint256 _id) = connectorID();
EventInterface(getEventAddr()).emitEvent(_type, _id, _eventCode, _eventParam); EventInterface(getEventAddr()).emitEvent(_type, _id, _eventCode, _eventParam);
} }
@ -397,17 +383,14 @@ contract GelatoResolver is GelatoHelpers {
external external
payable payable
{ {
try IGelatoInterface(getGelatoCoreAddr()).multiCancelTasks(_taskReceipts) { IGelatoInterface(getGelatoCoreAddr()).multiCancelTasks(_taskReceipts);
} catch Error(string memory error) {
revert(string(abi.encodePacked("ConnectGelato.multiCancelTasks:", error)));
} catch {
revert("ConnectGelato.multiCancelTasks: unknown error");
}
emit LogMultiCancelTasks(_taskReceipts, 0, 0); emit LogMultiCancelTasks(_taskReceipts, 0, 0);
bytes32 _eventCode = keccak256("LogMultiCancelTasks((uint256,address,(address,address),uint256,((address,bytes)[],(address,bytes,uint8,uint8,uint256,bool)[],uint256,uint256)[],uint256,uint256,uint256)[])"); bytes32 _eventCode = keccak256(
"LogMultiCancelTasks((uint256,address,(address,address),uint256,((address,bytes)[],(address,bytes,uint8,uint8,uint256,bool)[],uint256,uint256)[],uint256,uint256,uint256)[])"
);
bytes memory _eventParam = abi.encode(_taskReceipts, 0, 0); bytes memory _eventParam = abi.encode(_taskReceipts, 0, 0);
(uint _type, uint _id) = connectorID(); (uint256 _type, uint256 _id) = connectorID();
EventInterface(getEventAddr()).emitEvent(_type, _id, _eventCode, _eventParam); EventInterface(getEventAddr()).emitEvent(_type, _id, _eventCode, _eventParam);
} }
} }