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

renamed functions

Browse Source
This commit is contained in:
Richa-iitr 2022-06-20 05:29:53 +05:30
parent a35ab9ec4b
commit cf0e7ed240
12 changed files with 78 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/arbitrum/connectors/spell/events.sol
View File

@ -3,10 +3,10 @@ pragma solidity ^0.7.0;
pragma abicoder v2; pragma abicoder v2;
contract Events { contract Events {
event LogCastDSA( event LogCastOnDSA(
address indexed targetDSA, address indexed targetDSA,
string[] connectors, string[] connectors,
bytes[] datas bytes[] datas
); );
event LogCastSpells(string[] eventNames, bytes[] eventParams); event LogRetrySpell(string[] eventNames, bytes[] eventParams);
} }

20
contracts/arbitrum/connectors/spell/main.sol
View File

@ -19,7 +19,7 @@ abstract contract DSASpell is Events, Stores {
*@param connectors Array of connector names. *@param connectors Array of connector names.
*@param datas Array of connector calldatas. *@param datas Array of connector calldatas.
*/ */
function castDSA( function castOnDSA(
address targetDSA, address targetDSA,
string[] memory connectors, string[] memory connectors,
bytes[] memory datas bytes[] memory datas
@ -32,7 +32,7 @@ abstract contract DSASpell is Events, Stores {
AccountInterface(targetDSA).cast(connectors, datas, address(this)); AccountInterface(targetDSA).cast(connectors, datas, address(this));
_eventName = "LogCastDSA(address,string[],bytes[])"; _eventName = "LogCastOnDSA(address,string[],bytes[])";
_eventParam = abi.encode(targetDSA, connectors, datas); _eventParam = abi.encode(targetDSA, connectors, datas);
} }
@ -41,7 +41,7 @@ abstract contract DSASpell is Events, Stores {
*@param connectors Array of connector names. *@param connectors Array of connector names.
*@param datas Array of connector calldatas. *@param datas Array of connector calldatas.
*/ */
function castSpells(string[] memory connectors, bytes[] memory datas) function retrySpell(string[] memory connectors, bytes[] memory datas)
external external
payable payable
returns (string memory eventName, bytes memory eventParam) returns (string memory eventName, bytes memory eventParam)
@ -60,14 +60,16 @@ abstract contract DSASpell is Events, Stores {
for (uint256 i = 0; i < _length; i++) { for (uint256 i = 0; i < _length; i++) {
(bool success, bytes memory returnData) = _connectors[i] (bool success, bytes memory returnData) = _connectors[i]
.delegatecall(datas[i]); .delegatecall(datas[i]);
require(success, "spells-failed");
(_eventNames[i], _eventParams[i]) = abi.decode( if (success) {
returnData, (_eventNames[i], _eventParams[i]) = abi.decode(
(string, bytes) returnData,
); (string, bytes)
);
}
} }
eventName = "LogCastSpells(string[],bytes[])"; eventName = "LogRetrySpell(string[],bytes[])";
eventParam = abi.encode(_eventNames, _eventParams); eventParam = abi.encode(_eventNames, _eventParams);
} }
} }

4
contracts/avalanche/connectors/spell/events.sol
View File

@ -3,10 +3,10 @@ pragma solidity ^0.7.0;
pragma abicoder v2; pragma abicoder v2;
contract Events { contract Events {
event LogCastDSA( event LogCastOnDSA(
address indexed targetDSA, address indexed targetDSA,
string[] connectors, string[] connectors,
bytes[] datas bytes[] datas
); );
event LogCastSpells(string[] eventNames, bytes[] eventParams); event LogRetrySpell(string[] eventNames, bytes[] eventParams);
} }

20
contracts/avalanche/connectors/spell/main.sol
View File

@ -19,7 +19,7 @@ abstract contract DSASpell is Events, Stores {
*@param connectors Array of connector names. *@param connectors Array of connector names.
*@param datas Array of connector calldatas. *@param datas Array of connector calldatas.
*/ */
function castDSA( function castOnDSA(
address targetDSA, address targetDSA,
string[] memory connectors, string[] memory connectors,
bytes[] memory datas bytes[] memory datas
@ -32,7 +32,7 @@ abstract contract DSASpell is Events, Stores {
AccountInterface(targetDSA).cast(connectors, datas, address(this)); AccountInterface(targetDSA).cast(connectors, datas, address(this));
_eventName = "LogCastDSA(address,string[],bytes[])"; _eventName = "LogCastOnDSA(address,string[],bytes[])";
_eventParam = abi.encode(targetDSA, connectors, datas); _eventParam = abi.encode(targetDSA, connectors, datas);
} }
@ -41,7 +41,7 @@ abstract contract DSASpell is Events, Stores {
*@param connectors Array of connector names. *@param connectors Array of connector names.
*@param datas Array of connector calldatas. *@param datas Array of connector calldatas.
*/ */
function castSpells(string[] memory connectors, bytes[] memory datas) function retrySpell(string[] memory connectors, bytes[] memory datas)
external external
payable payable
returns (string memory eventName, bytes memory eventParam) returns (string memory eventName, bytes memory eventParam)
@ -60,14 +60,16 @@ abstract contract DSASpell is Events, Stores {
for (uint256 i = 0; i < _length; i++) { for (uint256 i = 0; i < _length; i++) {
(bool success, bytes memory returnData) = _connectors[i] (bool success, bytes memory returnData) = _connectors[i]
.delegatecall(datas[i]); .delegatecall(datas[i]);
require(success, "spells-failed");
(_eventNames[i], _eventParams[i]) = abi.decode( if (success) {
returnData, (_eventNames[i], _eventParams[i]) = abi.decode(
(string, bytes) returnData,
); (string, bytes)
);
}
} }
eventName = "LogCastSpells(string[],bytes[])"; eventName = "LogRetrySpell(string[],bytes[])";
eventParam = abi.encode(_eventNames, _eventParams); eventParam = abi.encode(_eventNames, _eventParams);
} }
} }

4
contracts/fantom/connectors/spell/events.sol
View File

@ -3,10 +3,10 @@ pragma solidity ^0.7.0;
pragma abicoder v2; pragma abicoder v2;
contract Events { contract Events {
event LogCastDSA( event LogCastOnDSA(
address indexed targetDSA, address indexed targetDSA,
string[] connectors, string[] connectors,
bytes[] datas bytes[] datas
); );
event LogCastSpells(string[] eventNames, bytes[] eventParams); event LogRetrySpell(string[] eventNames, bytes[] eventParams);
} }

20
contracts/fantom/connectors/spell/main.sol
View File

@ -19,7 +19,7 @@ abstract contract DSASpell is Events, Stores {
*@param connectors Array of connector names. *@param connectors Array of connector names.
*@param datas Array of connector calldatas. *@param datas Array of connector calldatas.
*/ */
function castDSA( function castOnDSA(
address targetDSA, address targetDSA,
string[] memory connectors, string[] memory connectors,
bytes[] memory datas bytes[] memory datas
@ -32,7 +32,7 @@ abstract contract DSASpell is Events, Stores {
AccountInterface(targetDSA).cast(connectors, datas, address(this)); AccountInterface(targetDSA).cast(connectors, datas, address(this));
_eventName = "LogCastDSA(address,string[],bytes[])"; _eventName = "LogCastOnDSA(address,string[],bytes[])";
_eventParam = abi.encode(targetDSA, connectors, datas); _eventParam = abi.encode(targetDSA, connectors, datas);
} }
@ -41,7 +41,7 @@ abstract contract DSASpell is Events, Stores {
*@param connectors Array of connector names. *@param connectors Array of connector names.
*@param datas Array of connector calldatas. *@param datas Array of connector calldatas.
*/ */
function castSpells(string[] memory connectors, bytes[] memory datas) function retrySpell(string[] memory connectors, bytes[] memory datas)
external external
payable payable
returns (string memory eventName, bytes memory eventParam) returns (string memory eventName, bytes memory eventParam)
@ -60,14 +60,16 @@ abstract contract DSASpell is Events, Stores {
for (uint256 i = 0; i < _length; i++) { for (uint256 i = 0; i < _length; i++) {
(bool success, bytes memory returnData) = _connectors[i] (bool success, bytes memory returnData) = _connectors[i]
.delegatecall(datas[i]); .delegatecall(datas[i]);
require(success, "spells-failed");
(_eventNames[i], _eventParams[i]) = abi.decode( if (success) {
returnData, (_eventNames[i], _eventParams[i]) = abi.decode(
(string, bytes) returnData,
); (string, bytes)
);
}
} }
eventName = "LogCastSpells(string[],bytes[])"; eventName = "LogRetrySpell(string[],bytes[])";
eventParam = abi.encode(_eventNames, _eventParams); eventParam = abi.encode(_eventNames, _eventParams);
} }
} }

4
contracts/mainnet/connectors/spell/events.sol
View File

@ -3,10 +3,10 @@ pragma solidity ^0.7.0;
pragma abicoder v2; pragma abicoder v2;
contract Events { contract Events {
event LogCastDSA( event LogCastOnDSA(
address indexed targetDSA, address indexed targetDSA,
string[] connectors, string[] connectors,
bytes[] datas bytes[] datas
); );
event LogCastSpells(string[] eventNames, bytes[] eventParams); event LogRetrySpell(string[] eventNames, bytes[] eventParams);
} }

20
contracts/mainnet/connectors/spell/main.sol
View File

@ -19,7 +19,7 @@ abstract contract DSASpell is Events, Stores {
*@param connectors Array of connector names. *@param connectors Array of connector names.
*@param datas Array of connector calldatas. *@param datas Array of connector calldatas.
*/ */
function castDSA( function castOnDSA(
address targetDSA, address targetDSA,
string[] memory connectors, string[] memory connectors,
bytes[] memory datas bytes[] memory datas
@ -32,7 +32,7 @@ abstract contract DSASpell is Events, Stores {
AccountInterface(targetDSA).cast(connectors, datas, address(this)); AccountInterface(targetDSA).cast(connectors, datas, address(this));
_eventName = "LogCastDSA(address,string[],bytes[])"; _eventName = "LogCastOnDSA(address,string[],bytes[])";
_eventParam = abi.encode(targetDSA, connectors, datas); _eventParam = abi.encode(targetDSA, connectors, datas);
} }
@ -41,7 +41,7 @@ abstract contract DSASpell is Events, Stores {
*@param connectors Array of connector names. *@param connectors Array of connector names.
*@param datas Array of connector calldatas. *@param datas Array of connector calldatas.
*/ */
function castSpells(string[] memory connectors, bytes[] memory datas) function retrySpell(string[] memory connectors, bytes[] memory datas)
external external
payable payable
returns (string memory eventName, bytes memory eventParam) returns (string memory eventName, bytes memory eventParam)
@ -60,14 +60,16 @@ abstract contract DSASpell is Events, Stores {
for (uint256 i = 0; i < _length; i++) { for (uint256 i = 0; i < _length; i++) {
(bool success, bytes memory returnData) = _connectors[i] (bool success, bytes memory returnData) = _connectors[i]
.delegatecall(datas[i]); .delegatecall(datas[i]);
require(success, "spells-failed");
(_eventNames[i], _eventParams[i]) = abi.decode( if (success) {
returnData, (_eventNames[i], _eventParams[i]) = abi.decode(
(string, bytes) returnData,
); (string, bytes)
);
}
} }
eventName = "LogCastSpells(string[],bytes[])"; eventName = "LogRetrySpell(string[],bytes[])";
eventParam = abi.encode(_eventNames, _eventParams); eventParam = abi.encode(_eventNames, _eventParams);
} }
} }

4
contracts/optimism/connectors/spell/events.sol
View File

@ -3,10 +3,10 @@ pragma solidity ^0.7.0;
pragma abicoder v2; pragma abicoder v2;
contract Events { contract Events {
event LogCastDSA( event LogCastOnDSA(
address indexed targetDSA, address indexed targetDSA,
string[] connectors, string[] connectors,
bytes[] datas bytes[] datas
); );
event LogCastSpells(string[] eventNames, bytes[] eventParams); event LogRetrySpell(string[] eventNames, bytes[] eventParams);
} }

20
contracts/optimism/connectors/spell/main.sol
View File

@ -19,7 +19,7 @@ abstract contract DSASpell is Events, Stores {
*@param connectors Array of connector names. *@param connectors Array of connector names.
*@param datas Array of connector calldatas. *@param datas Array of connector calldatas.
*/ */
function castDSA( function castOnDSA(
address targetDSA, address targetDSA,
string[] memory connectors, string[] memory connectors,
bytes[] memory datas bytes[] memory datas
@ -32,7 +32,7 @@ abstract contract DSASpell is Events, Stores {
AccountInterface(targetDSA).cast(connectors, datas, address(this)); AccountInterface(targetDSA).cast(connectors, datas, address(this));
_eventName = "LogCastDSA(address,string[],bytes[])"; _eventName = "LogCastOnDSA(address,string[],bytes[])";
_eventParam = abi.encode(targetDSA, connectors, datas); _eventParam = abi.encode(targetDSA, connectors, datas);
} }
@ -41,7 +41,7 @@ abstract contract DSASpell is Events, Stores {
*@param connectors Array of connector names. *@param connectors Array of connector names.
*@param datas Array of connector calldatas. *@param datas Array of connector calldatas.
*/ */
function castSpells(string[] memory connectors, bytes[] memory datas) function retrySpell(string[] memory connectors, bytes[] memory datas)
external external
payable payable
returns (string memory eventName, bytes memory eventParam) returns (string memory eventName, bytes memory eventParam)
@ -60,14 +60,16 @@ abstract contract DSASpell is Events, Stores {
for (uint256 i = 0; i < _length; i++) { for (uint256 i = 0; i < _length; i++) {
(bool success, bytes memory returnData) = _connectors[i] (bool success, bytes memory returnData) = _connectors[i]
.delegatecall(datas[i]); .delegatecall(datas[i]);
require(success, "spells-failed");
(_eventNames[i], _eventParams[i]) = abi.decode( if (success) {
returnData, (_eventNames[i], _eventParams[i]) = abi.decode(
(string, bytes) returnData,
); (string, bytes)
);
}
} }
eventName = "LogCastSpells(string[],bytes[])"; eventName = "LogRetrySpell(string[],bytes[])";
eventParam = abi.encode(_eventNames, _eventParams); eventParam = abi.encode(_eventNames, _eventParams);
} }
} }

4
contracts/polygon/connectors/spell/events.sol
View File

@ -3,10 +3,10 @@ pragma solidity ^0.7.0;
pragma abicoder v2; pragma abicoder v2;
contract Events { contract Events {
event LogCastDSA( event LogCastOnDSA(
address indexed targetDSA, address indexed targetDSA,
string[] connectors, string[] connectors,
bytes[] datas bytes[] datas
); );
event LogCastSpells(string[] eventNames, bytes[] eventParams); event LogRetrySpell(string[] eventNames, bytes[] eventParams);
} }

20
contracts/polygon/connectors/spell/main.sol
View File

@ -19,7 +19,7 @@ abstract contract DSASpell is Events, Stores {
*@param connectors Array of connector names. *@param connectors Array of connector names.
*@param datas Array of connector calldatas. *@param datas Array of connector calldatas.
*/ */
function castDSA( function castOnDSA(
address targetDSA, address targetDSA,
string[] memory connectors, string[] memory connectors,
bytes[] memory datas bytes[] memory datas
@ -32,7 +32,7 @@ abstract contract DSASpell is Events, Stores {
AccountInterface(targetDSA).cast(connectors, datas, address(this)); AccountInterface(targetDSA).cast(connectors, datas, address(this));
_eventName = "LogCastDSA(address,string[],bytes[])"; _eventName = "LogCastOnDSA(address,string[],bytes[])";
_eventParam = abi.encode(targetDSA, connectors, datas); _eventParam = abi.encode(targetDSA, connectors, datas);
} }
@ -41,7 +41,7 @@ abstract contract DSASpell is Events, Stores {
*@param connectors Array of connector names. *@param connectors Array of connector names.
*@param datas Array of connector calldatas. *@param datas Array of connector calldatas.
*/ */
function castSpells(string[] memory connectors, bytes[] memory datas) function retrySpell(string[] memory connectors, bytes[] memory datas)
external external
payable payable
returns (string memory eventName, bytes memory eventParam) returns (string memory eventName, bytes memory eventParam)
@ -60,14 +60,16 @@ abstract contract DSASpell is Events, Stores {
for (uint256 i = 0; i < _length; i++) { for (uint256 i = 0; i < _length; i++) {
(bool success, bytes memory returnData) = _connectors[i] (bool success, bytes memory returnData) = _connectors[i]
.delegatecall(datas[i]); .delegatecall(datas[i]);
require(success, "spells-failed");
(_eventNames[i], _eventParams[i]) = abi.decode( if (success) {
returnData, (_eventNames[i], _eventParams[i]) = abi.decode(
(string, bytes) returnData,
); (string, bytes)
);
}
} }
eventName = "LogCastSpells(string[],bytes[])"; eventName = "LogRetrySpell(string[],bytes[])";
eventParam = abi.encode(_eventNames, _eventParams); eventParam = abi.encode(_eventNames, _eventParams);
} }
} }