feat(aave-safety-module): Refactor Aave Safety Module to template pat…

…tern (#1161)

src/apps/aave-safety-module/aave-safety-module.definition.ts

@@ -20,10 +20,35 @@ export const AAVE_SAFETY_MODULE_DEFINITION = appDefinition({
   },
 
   groups: {
-    stkAave: { id: 'stk-aave', type: GroupType.TOKEN, label: 'stkAAVE' },
-    stkAbpt: { id: 'stk-abpt', type: GroupType.TOKEN, label: 'stkABPT' },
-    abpt: { id: 'abpt', type: GroupType.TOKEN, label: 'ABPT' },
-    claimable: { id: 'claimable', type: GroupType.TOKEN, label: 'Rewards' },
+    stkAave: {
+      id: 'stk-aave',
+      type: GroupType.TOKEN,
+      label: 'stkAAVE',
+    },
+
+    stkAbpt: {
+      id: 'stk-abpt',
+      type: GroupType.TOKEN,
+      label: 'stkABPT',
+    },
+
+    abpt: {
+      id: 'abpt',
+      type: GroupType.TOKEN,
+      label: 'ABPT',
+    },
+
+    stkAbptClaimable: {
+      id: 'stk-abpt-claimable',
+      type: GroupType.POSITION,
+      label: 'stkABPT Rewards',
+    },
+
+    stkAaveClaimable: {
+      id: 'stk-aave-claimable',
+      type: GroupType.POSITION,
+      label: 'stkAAVE Rewards',
+    },
   },
 
   supportedNetworks: {

src/apps/aave-safety-module/aave-safety-module.module.ts

@@ -4,21 +4,21 @@ import { AbstractApp } from '~app/app.dynamic-module';
 import { AaveSafetyModuleAppDefinition, AAVE_SAFETY_MODULE_DEFINITION } from './aave-safety-module.definition';
 import { AaveSafetyModuleContractFactory } from './contracts';
 import { EthereumAaveSafetyModuleAbptTokenFetcher } from './ethereum/aave-safety-module.abpt.token-fetcher';
-import { EthereumAaveSafetyModuleBalanceFetcher } from './ethereum/aave-safety-module.balance-fetcher';
+import { EthereumAaveSafetyModuleStkAaveClaimableContractPositionFetcher } from './ethereum/aave-safety-module.stk-aave-claimable.contract-position-fetcher';
 import { EthereumAaveSafetyModuleStkAaveTokenFetcher } from './ethereum/aave-safety-module.stk-aave.token-fetcher';
+import { EthereumAaveSafetyModuleStkAbptClaimableContractPositionFetcher } from './ethereum/aave-safety-module.stk-abpt-claimable.contract-position-fetcher';
 import { EthereumAaveSafetyModuleStkAbptTokenFetcher } from './ethereum/aave-safety-module.stk-abpt.token-fetcher';
-import { AaveSafetyModuleClaimableBalanceHelper } from './helpers/aave-safety-module.claimable.balance-helper';
 
 @Register.AppModule({
   appId: AAVE_SAFETY_MODULE_DEFINITION.id,
   providers: [
     AaveSafetyModuleAppDefinition,
     AaveSafetyModuleContractFactory,
-    AaveSafetyModuleClaimableBalanceHelper,
     EthereumAaveSafetyModuleAbptTokenFetcher,
-    EthereumAaveSafetyModuleBalanceFetcher,
     EthereumAaveSafetyModuleStkAaveTokenFetcher,
+    EthereumAaveSafetyModuleStkAaveClaimableContractPositionFetcher,
     EthereumAaveSafetyModuleStkAbptTokenFetcher,
+    EthereumAaveSafetyModuleStkAbptClaimableContractPositionFetcher,
   ],
 })
 export class AaveSafetyModuleAppModule extends AbstractApp() {}

src/apps/aave-safety-module/contracts/ethers/BalancerAbpt.ts → src/apps/aave-safety-module/contracts/ethers/AaveAbpt.ts

@@ -57,7 +57,7 @@ export declare namespace RightsManager {
   };
 }
 
-export interface BalancerAbptInterface extends utils.Interface {
+export interface AaveAbptInterface extends utils.Interface {
   functions: {
     'DECIMALS()': FunctionFragment;
     'DEFAULT_ADD_TOKEN_TIME_LOCK_IN_BLOCKS()': FunctionFragment;
@@ -441,12 +441,12 @@ export type TransferEvent = TypedEvent<[string, string, BigNumber], TransferEven
 
 export type TransferEventFilter = TypedEventFilter<TransferEvent>;
 
-export interface BalancerAbpt extends BaseContract {
+export interface AaveAbpt extends BaseContract {
   connect(signerOrProvider: Signer | Provider | string): this;
   attach(addressOrName: string): this;
   deployed(): Promise<this>;
 
-  interface: BalancerAbptInterface;
+  interface: AaveAbptInterface;
 
   queryFilter<TEvent extends TypedEvent>(
     event: TypedEventFilter<TEvent>,

src/apps/aave-safety-module/contracts/ethers/BalancerPoolToken.ts → src/apps/aave-safety-module/contracts/ethers/AaveBpt.ts

@@ -17,7 +17,7 @@ import type { FunctionFragment, Result, EventFragment } from '@ethersproject/abi
 import type { Listener, Provider } from '@ethersproject/providers';
 import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, PromiseOrValue } from './common';
 
-export interface BalancerPoolTokenInterface extends utils.Interface {
+export interface AaveBptInterface extends utils.Interface {
   functions: {
     'BONE()': FunctionFragment;
     'BPOW_PRECISION()': FunctionFragment;
@@ -492,12 +492,12 @@ export type TransferEvent = TypedEvent<[string, string, BigNumber], TransferEven
 
 export type TransferEventFilter = TypedEventFilter<TransferEvent>;
 
-export interface BalancerPoolToken extends BaseContract {
+export interface AaveBpt extends BaseContract {
   connect(signerOrProvider: Signer | Provider | string): this;
   attach(addressOrName: string): this;
   deployed(): Promise<this>;
 
-  interface: BalancerPoolTokenInterface;
+  interface: AaveBptInterface;
 
   queryFilter<TEvent extends TypedEvent>(
     event: TypedEventFilter<TEvent>,

src/apps/aave-safety-module/contracts/ethers/StakedAave.ts → src/apps/aave-safety-module/contracts/ethers/AaveStkAave.ts

@@ -31,7 +31,7 @@ export declare namespace DistributionTypes {
   };
 }
 
-export interface StakedAaveInterface extends utils.Interface {
+export interface AaveStkAaveInterface extends utils.Interface {
   functions: {
     'COOLDOWN_SECONDS()': FunctionFragment;
     'DELEGATE_BY_TYPE_TYPEHASH()': FunctionFragment;
@@ -452,12 +452,12 @@ export type UserIndexUpdatedEvent = TypedEvent<[string, string, BigNumber], User
 
 export type UserIndexUpdatedEventFilter = TypedEventFilter<UserIndexUpdatedEvent>;
 
-export interface StakedAave extends BaseContract {
+export interface AaveStkAave extends BaseContract {
   connect(signerOrProvider: Signer | Provider | string): this;
   attach(addressOrName: string): this;
   deployed(): Promise<this>;
 
-  interface: StakedAaveInterface;
+  interface: AaveStkAaveInterface;
 
   queryFilter<TEvent extends TypedEvent>(
     event: TypedEventFilter<TEvent>,

src/apps/aave-safety-module/contracts/ethers/BalancerStkAbpt.ts → src/apps/aave-safety-module/contracts/ethers/AaveStkAbpt.ts

@@ -31,7 +31,7 @@ export declare namespace DistributionTypes {
   };
 }
 
-export interface BalancerStkAbptInterface extends utils.Interface {
+export interface AaveStkAbptInterface extends utils.Interface {
   functions: {
     'COOLDOWN_SECONDS()': FunctionFragment;
     'DELEGATE_BY_TYPE_TYPEHASH()': FunctionFragment;
@@ -455,12 +455,12 @@ export type UserIndexUpdatedEvent = TypedEvent<[string, string, BigNumber], User
 
 export type UserIndexUpdatedEventFilter = TypedEventFilter<UserIndexUpdatedEvent>;
 
-export interface BalancerStkAbpt extends BaseContract {
+export interface AaveStkAbpt extends BaseContract {
   connect(signerOrProvider: Signer | Provider | string): this;
   attach(addressOrName: string): this;
   deployed(): Promise<this>;
 
-  interface: BalancerStkAbptInterface;
+  interface: AaveStkAbptInterface;
 
   queryFilter<TEvent extends TypedEvent>(
     event: TypedEventFilter<TEvent>,

src/apps/aave-safety-module/contracts/ethers/AaveStakedApyHelper.ts → src/apps/aave-safety-module/contracts/ethers/AaveStkApyHelper.ts

@@ -63,7 +63,7 @@ export declare namespace StakeUIHelperI {
   };
 }
 
-export interface AaveStakedApyHelperInterface extends utils.Interface {
+export interface AaveStkApyHelperInterface extends utils.Interface {
   functions: {
     'AAVE()': FunctionFragment;
     'BPT()': FunctionFragment;
@@ -112,12 +112,12 @@ export interface AaveStakedApyHelperInterface extends utils.Interface {
   events: {};
 }
 
-export interface AaveStakedApyHelper extends BaseContract {
+export interface AaveStkApyHelper extends BaseContract {
   connect(signerOrProvider: Signer | Provider | string): this;
   attach(addressOrName: string): this;
   deployed(): Promise<this>;
 
-  interface: AaveStakedApyHelperInterface;
+  interface: AaveStkApyHelperInterface;
 
   queryFilter<TEvent extends TypedEvent>(
     event: TypedEventFilter<TEvent>,

src/apps/aave-safety-module/contracts/ethers/factories/BalancerAbpt__factory.ts → src/apps/aave-safety-module/contracts/ethers/factories/AaveAbpt__factory.ts

@@ -4,7 +4,7 @@
 
 import { Contract, Signer, utils } from 'ethers';
 import type { Provider } from '@ethersproject/providers';
-import type { BalancerAbpt, BalancerAbptInterface } from '../BalancerAbpt';
+import type { AaveAbpt, AaveAbptInterface } from '../AaveAbpt';
 
 const _abi = [
   {
@@ -1270,12 +1270,12 @@ const _abi = [
   },
 ];
 
-export class BalancerAbpt__factory {
+export class AaveAbpt__factory {
   static readonly abi = _abi;
-  static createInterface(): BalancerAbptInterface {
-    return new utils.Interface(_abi) as BalancerAbptInterface;
+  static createInterface(): AaveAbptInterface {
+    return new utils.Interface(_abi) as AaveAbptInterface;
   }
-  static connect(address: string, signerOrProvider: Signer | Provider): BalancerAbpt {
-    return new Contract(address, _abi, signerOrProvider) as BalancerAbpt;
+  static connect(address: string, signerOrProvider: Signer | Provider): AaveAbpt {
+    return new Contract(address, _abi, signerOrProvider) as AaveAbpt;
   }
 }

src/apps/aave-safety-module/contracts/ethers/factories/BalancerPoolToken__factory.ts → src/apps/aave-safety-module/contracts/ethers/factories/AaveBpt__factory.ts

@@ -4,7 +4,7 @@
 
 import { Contract, Signer, utils } from 'ethers';
 import type { Provider } from '@ethersproject/providers';
-import type { BalancerPoolToken, BalancerPoolTokenInterface } from '../BalancerPoolToken';
+import type { AaveBpt, AaveBptInterface } from '../AaveBpt';
 
 const _abi = [
   {
@@ -1637,12 +1637,12 @@ const _abi = [
   },
 ];
 
-export class BalancerPoolToken__factory {
+export class AaveBpt__factory {
   static readonly abi = _abi;
-  static createInterface(): BalancerPoolTokenInterface {
-    return new utils.Interface(_abi) as BalancerPoolTokenInterface;
+  static createInterface(): AaveBptInterface {
+    return new utils.Interface(_abi) as AaveBptInterface;
   }
-  static connect(address: string, signerOrProvider: Signer | Provider): BalancerPoolToken {
-    return new Contract(address, _abi, signerOrProvider) as BalancerPoolToken;
+  static connect(address: string, signerOrProvider: Signer | Provider): AaveBpt {
+    return new Contract(address, _abi, signerOrProvider) as AaveBpt;
   }
 }

src/apps/aave-safety-module/contracts/ethers/factories/StakedAave__factory.ts → src/apps/aave-safety-module/contracts/ethers/factories/AaveStkAave__factory.ts

@@ -4,7 +4,7 @@
 
 import { Contract, Signer, utils } from 'ethers';
 import type { Provider } from '@ethersproject/providers';
-import type { StakedAave, StakedAaveInterface } from '../StakedAave';
+import type { AaveStkAave, AaveStkAaveInterface } from '../AaveStkAave';
 
 const _abi = [
   {
@@ -1315,12 +1315,12 @@ const _abi = [
   },
 ];
 
-export class StakedAave__factory {
+export class AaveStkAave__factory {
   static readonly abi = _abi;
-  static createInterface(): StakedAaveInterface {
-    return new utils.Interface(_abi) as StakedAaveInterface;
+  static createInterface(): AaveStkAaveInterface {
+    return new utils.Interface(_abi) as AaveStkAaveInterface;
   }
-  static connect(address: string, signerOrProvider: Signer | Provider): StakedAave {
-    return new Contract(address, _abi, signerOrProvider) as StakedAave;
+  static connect(address: string, signerOrProvider: Signer | Provider): AaveStkAave {
+    return new Contract(address, _abi, signerOrProvider) as AaveStkAave;
   }
 }

src/apps/aave-safety-module/contracts/ethers/factories/BalancerStkAbpt__factory.ts → src/apps/aave-safety-module/contracts/ethers/factories/AaveStkAbpt__factory.ts

@@ -4,7 +4,7 @@
 
 import { Contract, Signer, utils } from 'ethers';
 import type { Provider } from '@ethersproject/providers';
-import type { BalancerStkAbpt, BalancerStkAbptInterface } from '../BalancerStkAbpt';
+import type { AaveStkAbpt, AaveStkAbptInterface } from '../AaveStkAbpt';
 
 const _abi = [
   {
@@ -1331,12 +1331,12 @@ const _abi = [
   },
 ];
 
-export class BalancerStkAbpt__factory {
+export class AaveStkAbpt__factory {
   static readonly abi = _abi;
-  static createInterface(): BalancerStkAbptInterface {
-    return new utils.Interface(_abi) as BalancerStkAbptInterface;
+  static createInterface(): AaveStkAbptInterface {
+    return new utils.Interface(_abi) as AaveStkAbptInterface;
   }
-  static connect(address: string, signerOrProvider: Signer | Provider): BalancerStkAbpt {
-    return new Contract(address, _abi, signerOrProvider) as BalancerStkAbpt;
+  static connect(address: string, signerOrProvider: Signer | Provider): AaveStkAbpt {
+    return new Contract(address, _abi, signerOrProvider) as AaveStkAbpt;
   }
 }

src/apps/aave-safety-module/contracts/ethers/factories/AaveStakedApyHelper__factory.ts → src/apps/aave-safety-module/contracts/ethers/factories/AaveStkApyHelper__factory.ts

@@ -4,7 +4,7 @@
 
 import { Contract, Signer, utils } from 'ethers';
 import type { Provider } from '@ethersproject/providers';
-import type { AaveStakedApyHelper, AaveStakedApyHelperInterface } from '../AaveStakedApyHelper';
+import type { AaveStkApyHelper, AaveStkApyHelperInterface } from '../AaveStkApyHelper';
 
 const _abi = [
   {
@@ -458,12 +458,12 @@ const _abi = [
   },
 ];
 
-export class AaveStakedApyHelper__factory {
+export class AaveStkApyHelper__factory {
   static readonly abi = _abi;
-  static createInterface(): AaveStakedApyHelperInterface {
-    return new utils.Interface(_abi) as AaveStakedApyHelperInterface;
+  static createInterface(): AaveStkApyHelperInterface {
+    return new utils.Interface(_abi) as AaveStkApyHelperInterface;
   }
-  static connect(address: string, signerOrProvider: Signer | Provider): AaveStakedApyHelper {
-    return new Contract(address, _abi, signerOrProvider) as AaveStakedApyHelper;
+  static connect(address: string, signerOrProvider: Signer | Provider): AaveStkApyHelper {
+    return new Contract(address, _abi, signerOrProvider) as AaveStkApyHelper;
   }
 }

src/apps/aave-safety-module/contracts/ethers/factories/index.ts

@@ -1,8 +1,8 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
-export { AaveStakedApyHelper__factory } from './AaveStakedApyHelper__factory';
-export { BalancerAbpt__factory } from './BalancerAbpt__factory';
-export { BalancerPoolToken__factory } from './BalancerPoolToken__factory';
-export { BalancerStkAbpt__factory } from './BalancerStkAbpt__factory';
-export { StakedAave__factory } from './StakedAave__factory';
+export { AaveAbpt__factory } from './AaveAbpt__factory';
+export { AaveBpt__factory } from './AaveBpt__factory';
+export { AaveStkAave__factory } from './AaveStkAave__factory';
+export { AaveStkAbpt__factory } from './AaveStkAbpt__factory';
+export { AaveStkApyHelper__factory } from './AaveStkApyHelper__factory';

src/apps/aave-safety-module/contracts/ethers/index.ts

@@ -1,14 +1,14 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
-export type { AaveStakedApyHelper } from './AaveStakedApyHelper';
-export type { BalancerAbpt } from './BalancerAbpt';
-export type { BalancerPoolToken } from './BalancerPoolToken';
-export type { BalancerStkAbpt } from './BalancerStkAbpt';
-export type { StakedAave } from './StakedAave';
+export type { AaveAbpt } from './AaveAbpt';
+export type { AaveBpt } from './AaveBpt';
+export type { AaveStkAave } from './AaveStkAave';
+export type { AaveStkAbpt } from './AaveStkAbpt';
+export type { AaveStkApyHelper } from './AaveStkApyHelper';
 export * as factories from './factories';
-export { AaveStakedApyHelper__factory } from './factories/AaveStakedApyHelper__factory';
-export { BalancerAbpt__factory } from './factories/BalancerAbpt__factory';
-export { BalancerPoolToken__factory } from './factories/BalancerPoolToken__factory';
-export { BalancerStkAbpt__factory } from './factories/BalancerStkAbpt__factory';
-export { StakedAave__factory } from './factories/StakedAave__factory';
+export { AaveAbpt__factory } from './factories/AaveAbpt__factory';
+export { AaveBpt__factory } from './factories/AaveBpt__factory';
+export { AaveStkAave__factory } from './factories/AaveStkAave__factory';
+export { AaveStkAbpt__factory } from './factories/AaveStkAbpt__factory';
+export { AaveStkApyHelper__factory } from './factories/AaveStkApyHelper__factory';