From 47475742a294511a99e41536190afbe482107f7a Mon Sep 17 00:00:00 2001 From: Richa-iitr Date: Mon, 20 Jun 2022 11:15:10 +0530 Subject: [PATCH] minor changes --- contracts/arbitrum/connectors/spell/events.sol | 2 +- contracts/arbitrum/connectors/spell/main.sol | 8 ++++---- contracts/avalanche/connectors/spell/events.sol | 2 +- contracts/avalanche/connectors/spell/main.sol | 8 ++++---- contracts/fantom/connectors/spell/events.sol | 2 +- contracts/fantom/connectors/spell/main.sol | 8 ++++---- contracts/mainnet/connectors/spell/events.sol | 2 +- contracts/mainnet/connectors/spell/main.sol | 8 ++++---- contracts/optimism/connectors/spell/events.sol | 2 +- contracts/optimism/connectors/spell/main.sol | 8 ++++---- contracts/polygon/connectors/spell/events.sol | 2 +- contracts/polygon/connectors/spell/main.sol | 8 ++++---- 12 files changed, 30 insertions(+), 30 deletions(-) diff --git a/contracts/arbitrum/connectors/spell/events.sol b/contracts/arbitrum/connectors/spell/events.sol index 036c990f..b3e455d6 100644 --- a/contracts/arbitrum/connectors/spell/events.sol +++ b/contracts/arbitrum/connectors/spell/events.sol @@ -8,5 +8,5 @@ contract Events { string[] connectors, bytes[] datas ); - event LogRetrySpell(string[] eventNames, bytes[] eventParams); + event LogSpellFactory(string[] eventNames, bytes[] eventParams); } diff --git a/contracts/arbitrum/connectors/spell/main.sol b/contracts/arbitrum/connectors/spell/main.sol index 54d26cec..553bee32 100644 --- a/contracts/arbitrum/connectors/spell/main.sol +++ b/contracts/arbitrum/connectors/spell/main.sol @@ -12,7 +12,7 @@ import { AccountInterface } from "../../common/interfaces.sol"; import { Stores } from "../../common/stores.sol"; import { Events } from "./events.sol"; -abstract contract DSASpell is Events, Stores { +abstract contract DSASpellsResolver is Events, Stores { /** *@dev Cast spells on DSA. *@param targetDSA target DSA to cast spells on. @@ -41,7 +41,7 @@ abstract contract DSASpell is Events, Stores { *@param connectors Array of connector names. *@param datas Array of connector calldatas. */ - function retrySpell(string[] memory connectors, bytes[] memory datas) + function spellFactory(string[] memory connectors, bytes[] memory datas) external payable returns (string memory eventName, bytes memory eventParam) @@ -69,11 +69,11 @@ abstract contract DSASpell is Events, Stores { } } - eventName = "LogRetrySpell(string[],bytes[])"; + eventName = "LogSpellFactory(string[],bytes[])"; eventParam = abi.encode(_eventNames, _eventParams); } } -contract ConnectV2DSASpellArbitrum is DSASpell { +contract ConnectV2DSASpellArbitrum is DSASpellsResolver { string public name = "DSA-Spell-v1.0"; } diff --git a/contracts/avalanche/connectors/spell/events.sol b/contracts/avalanche/connectors/spell/events.sol index 036c990f..b3e455d6 100644 --- a/contracts/avalanche/connectors/spell/events.sol +++ b/contracts/avalanche/connectors/spell/events.sol @@ -8,5 +8,5 @@ contract Events { string[] connectors, bytes[] datas ); - event LogRetrySpell(string[] eventNames, bytes[] eventParams); + event LogSpellFactory(string[] eventNames, bytes[] eventParams); } diff --git a/contracts/avalanche/connectors/spell/main.sol b/contracts/avalanche/connectors/spell/main.sol index b09a80b9..bccc11d2 100644 --- a/contracts/avalanche/connectors/spell/main.sol +++ b/contracts/avalanche/connectors/spell/main.sol @@ -12,7 +12,7 @@ import { AccountInterface } from "../../common/interfaces.sol"; import { Stores } from "../../common/stores.sol"; import { Events } from "./events.sol"; -abstract contract DSASpell is Events, Stores { +abstract contract DSASpellsResolver is Events, Stores { /** *@dev Cast spells on DSA. *@param targetDSA target DSA to cast spells on. @@ -41,7 +41,7 @@ abstract contract DSASpell is Events, Stores { *@param connectors Array of connector names. *@param datas Array of connector calldatas. */ - function retrySpell(string[] memory connectors, bytes[] memory datas) + function spellFactory(string[] memory connectors, bytes[] memory datas) external payable returns (string memory eventName, bytes memory eventParam) @@ -69,11 +69,11 @@ abstract contract DSASpell is Events, Stores { } } - eventName = "LogRetrySpell(string[],bytes[])"; + eventName = "LogSpellFactory(string[],bytes[])"; eventParam = abi.encode(_eventNames, _eventParams); } } -contract ConnectV2DSASpellAvalanche is DSASpell { +contract ConnectV2DSASpellAvalanche is DSASpellsResolver { string public name = "DSA-Spell-v1.0"; } diff --git a/contracts/fantom/connectors/spell/events.sol b/contracts/fantom/connectors/spell/events.sol index 036c990f..b3e455d6 100644 --- a/contracts/fantom/connectors/spell/events.sol +++ b/contracts/fantom/connectors/spell/events.sol @@ -8,5 +8,5 @@ contract Events { string[] connectors, bytes[] datas ); - event LogRetrySpell(string[] eventNames, bytes[] eventParams); + event LogSpellFactory(string[] eventNames, bytes[] eventParams); } diff --git a/contracts/fantom/connectors/spell/main.sol b/contracts/fantom/connectors/spell/main.sol index 6c86a123..62bdb130 100644 --- a/contracts/fantom/connectors/spell/main.sol +++ b/contracts/fantom/connectors/spell/main.sol @@ -12,7 +12,7 @@ import { AccountInterface } from "../../common/interfaces.sol"; import { Stores } from "../../common/stores.sol"; import { Events } from "./events.sol"; -abstract contract DSASpell is Events, Stores { +abstract contract DSASpellsResolver is Events, Stores { /** *@dev Cast spells on DSA. *@param targetDSA target DSA to cast spells on. @@ -41,7 +41,7 @@ abstract contract DSASpell is Events, Stores { *@param connectors Array of connector names. *@param datas Array of connector calldatas. */ - function retrySpell(string[] memory connectors, bytes[] memory datas) + function spellFactory(string[] memory connectors, bytes[] memory datas) external payable returns (string memory eventName, bytes memory eventParam) @@ -69,11 +69,11 @@ abstract contract DSASpell is Events, Stores { } } - eventName = "LogRetrySpell(string[],bytes[])"; + eventName = "LogSpellFactory(string[],bytes[])"; eventParam = abi.encode(_eventNames, _eventParams); } } -contract ConnectV2DSASpellFantom is DSASpell { +contract ConnectV2DSASpellFantom is DSASpellsResolver { string public name = "DSA-Spell-v1.0"; } diff --git a/contracts/mainnet/connectors/spell/events.sol b/contracts/mainnet/connectors/spell/events.sol index 036c990f..b3e455d6 100644 --- a/contracts/mainnet/connectors/spell/events.sol +++ b/contracts/mainnet/connectors/spell/events.sol @@ -8,5 +8,5 @@ contract Events { string[] connectors, bytes[] datas ); - event LogRetrySpell(string[] eventNames, bytes[] eventParams); + event LogSpellFactory(string[] eventNames, bytes[] eventParams); } diff --git a/contracts/mainnet/connectors/spell/main.sol b/contracts/mainnet/connectors/spell/main.sol index c1a92dea..34458953 100644 --- a/contracts/mainnet/connectors/spell/main.sol +++ b/contracts/mainnet/connectors/spell/main.sol @@ -12,7 +12,7 @@ import { AccountInterface } from "../../common/interfaces.sol"; import { Stores } from "../../common/stores.sol"; import { Events } from "./events.sol"; -abstract contract DSASpell is Events, Stores { +abstract contract DSASpellsResolver is Events, Stores { /** *@dev Cast spells on DSA. *@param targetDSA target DSA to cast spells on. @@ -41,7 +41,7 @@ abstract contract DSASpell is Events, Stores { *@param connectors Array of connector names. *@param datas Array of connector calldatas. */ - function retrySpell(string[] memory connectors, bytes[] memory datas) + function spellFactory(string[] memory connectors, bytes[] memory datas) external payable returns (string memory eventName, bytes memory eventParam) @@ -69,11 +69,11 @@ abstract contract DSASpell is Events, Stores { } } - eventName = "LogRetrySpell(string[],bytes[])"; + eventName = "LogSpellFactory(string[],bytes[])"; eventParam = abi.encode(_eventNames, _eventParams); } } -contract ConnectV2DSASpell is DSASpell { +contract ConnectV2DSASpell is DSASpellsResolver { string public name = "DSA-Spell-v1.0"; } diff --git a/contracts/optimism/connectors/spell/events.sol b/contracts/optimism/connectors/spell/events.sol index 036c990f..b3e455d6 100644 --- a/contracts/optimism/connectors/spell/events.sol +++ b/contracts/optimism/connectors/spell/events.sol @@ -8,5 +8,5 @@ contract Events { string[] connectors, bytes[] datas ); - event LogRetrySpell(string[] eventNames, bytes[] eventParams); + event LogSpellFactory(string[] eventNames, bytes[] eventParams); } diff --git a/contracts/optimism/connectors/spell/main.sol b/contracts/optimism/connectors/spell/main.sol index 557aeed0..c98c97d4 100644 --- a/contracts/optimism/connectors/spell/main.sol +++ b/contracts/optimism/connectors/spell/main.sol @@ -12,7 +12,7 @@ import { AccountInterface } from "../../common/interfaces.sol"; import { Stores } from "../../common/stores.sol"; import { Events } from "./events.sol"; -abstract contract DSASpell is Events, Stores { +abstract contract DSASpellsResolver is Events, Stores { /** *@dev Cast spells on DSA. *@param targetDSA target DSA to cast spells on. @@ -41,7 +41,7 @@ abstract contract DSASpell is Events, Stores { *@param connectors Array of connector names. *@param datas Array of connector calldatas. */ - function retrySpell(string[] memory connectors, bytes[] memory datas) + function spellFactory(string[] memory connectors, bytes[] memory datas) external payable returns (string memory eventName, bytes memory eventParam) @@ -69,11 +69,11 @@ abstract contract DSASpell is Events, Stores { } } - eventName = "LogRetrySpell(string[],bytes[])"; + eventName = "LogSpellFactory(string[],bytes[])"; eventParam = abi.encode(_eventNames, _eventParams); } } -contract ConnectV2DSASpellOptimism is DSASpell { +contract ConnectV2DSASpellOptimism is DSASpellsResolver { string public name = "DSA-Spell-v1.0"; } diff --git a/contracts/polygon/connectors/spell/events.sol b/contracts/polygon/connectors/spell/events.sol index 036c990f..b3e455d6 100644 --- a/contracts/polygon/connectors/spell/events.sol +++ b/contracts/polygon/connectors/spell/events.sol @@ -8,5 +8,5 @@ contract Events { string[] connectors, bytes[] datas ); - event LogRetrySpell(string[] eventNames, bytes[] eventParams); + event LogSpellFactory(string[] eventNames, bytes[] eventParams); } diff --git a/contracts/polygon/connectors/spell/main.sol b/contracts/polygon/connectors/spell/main.sol index 3d44cb3a..023a7ee7 100644 --- a/contracts/polygon/connectors/spell/main.sol +++ b/contracts/polygon/connectors/spell/main.sol @@ -12,7 +12,7 @@ import { AccountInterface } from "../../common/interfaces.sol"; import { Stores } from "../../common/stores.sol"; import { Events } from "./events.sol"; -abstract contract DSASpell is Events, Stores { +abstract contract DSASpellsResolver is Events, Stores { /** *@dev Cast spells on DSA. *@param targetDSA target DSA to cast spells on. @@ -41,7 +41,7 @@ abstract contract DSASpell is Events, Stores { *@param connectors Array of connector names. *@param datas Array of connector calldatas. */ - function retrySpell(string[] memory connectors, bytes[] memory datas) + function spellFactory(string[] memory connectors, bytes[] memory datas) external payable returns (string memory eventName, bytes memory eventParam) @@ -69,11 +69,11 @@ abstract contract DSASpell is Events, Stores { } } - eventName = "LogRetrySpell(string[],bytes[])"; + eventName = "LogSpellFactory(string[],bytes[])"; eventParam = abi.encode(_eventNames, _eventParams); } } -contract ConnectV2DSASpellPolygon is DSASpell { +contract ConnectV2DSASpellPolygon is DSASpellsResolver { string public name = "DSA-Spell-v1.0"; }