renamed functions

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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