feat: 🎸 General Transfer Manager 3.0

Author: shuffledex

src/contract_wrappers/modules/checkpoint/dividend_checkpoint_wrapper.ts

@@ -40,10 +40,6 @@ interface ChangeWalletParams extends TxParams {
   wallet: string;
 }
 
-interface ReclaimERC20Params extends TxParams {
-  tokenContract: string;
-}
-
 interface SetDefaultExcludedParams extends TxParams {
   excluded: string[];
 }
@@ -214,22 +210,6 @@ export default abstract class DividendCheckpointWrapper extends ModuleWrapper {
     return (await this.contract).unpause.sendTransactionAsync(params.txData, params.safetyFactor);
   };
 
-  public reclaimERC20 = async (params: ReclaimERC20Params) => {
-    assert.isNonZeroETHAddressHex('tokenContract', params.tokenContract);
-    assert.assert(await this.isCallerTheSecurityTokenOwner(params.txData), 'The caller must be the ST owner');
-    // require(token.transfer(msg.sender, balance), "Transfer failed");
-    return (await this.contract).reclaimERC20.sendTransactionAsync(
-      params.tokenContract,
-      params.txData,
-      params.safetyFactor,
-    );
-  };
-
-  public reclaimETH = async (params: TxParams) => {
-    assert.assert(await this.isCallerTheSecurityTokenOwner(params.txData), 'The caller must be the ST owner');
-    return (await this.contract).reclaimETH.sendTransactionAsync(params.txData, params.safetyFactor);
-  };
-
   public changeWallet = async (params: ChangeWalletParams) => {
     assert.isNonZeroETHAddressHex('wallet', params.wallet);
     assert.assert(await this.isCallerTheSecurityTokenOwner(params.txData), 'The caller must be the ST owner');

src/contract_wrappers/modules/module_wrapper.ts

@@ -1,7 +1,6 @@
 import { Module } from '@polymathnetwork/contract-artifacts';
 import { Web3Wrapper } from '@0x/web3-wrapper';
 import { ContractAbi, TxData } from 'ethereum-types';
-import { BigNumber } from '@0x/utils';
 import {
   ISecurityTokenContract,
   ModuleFactoryContract,
@@ -15,8 +14,8 @@ import { stringToBytes32 } from '../../utils/convert';
 import functionsUtils from '../../utils/functions_utils';
 import assert from '../../utils/assert';
 
-interface TakeFeeParams extends TxParams {
-  amount: BigNumber;
+interface ReclaimERC20Params extends TxParams {
+  tokenContract: string;
 }
 
 /**
@@ -86,6 +85,21 @@ export default class ModuleWrapper extends ContractWrapper {
     return (await this.contract).factory.callAsync();
   };
 
+  public reclaimETH = async (params: TxParams) => {
+    assert.assert(await this.isCallerTheSecurityTokenOwner(params.txData), 'The caller must be the ST owner');
+    return (await this.contract).reclaimETH.sendTransactionAsync(params.txData, params.safetyFactor);
+  };
+
+  public reclaimERC20 = async (params: ReclaimERC20Params) => {
+    assert.assert(await this.isCallerTheSecurityTokenOwner(params.txData), 'The caller must be the ST owner');
+    assert.isNonZeroETHAddressHex('tokenContract', params.tokenContract);
+    return (await this.contract).reclaimERC20.sendTransactionAsync(
+      params.tokenContract,
+      params.txData,
+      params.safetyFactor,
+    );
+  };
+
   protected isCallerTheSecurityTokenOwner = async (txData: Partial<TxData> | undefined): Promise<boolean> => {
     const from = await this.getCallerAddress(txData);
     return functionsUtils.checksumAddressComparision(

src/contract_wrappers/modules/sto/sto_wrapper.ts

@@ -1,4 +1,4 @@
-import {TxParams, STOBaseContract, FundRaiseType, FULL_DECIMALS} from '../../../types';
+import { TxParams, STOBaseContract, FundRaiseType, FULL_DECIMALS } from '../../../types';
 import ModuleWrapper from '../module_wrapper';
 import assert from '../../../utils/assert';
 import { weiToValue } from '../../../utils/convert';
@@ -7,10 +7,6 @@ interface FundRaiseTypesParams {
   type: FundRaiseType;
 }
 
-interface ReclaimERC20Params extends TxParams {
-  tokenContract: string;
-}
-
 /**
  * This class includes the functionality related to interacting with the all STOs contracts.
  */
@@ -36,10 +32,7 @@ export default abstract class STOWrapper extends ModuleWrapper {
    * Returns funds raised by the STO
    */
   public fundsRaised = async (params: FundRaiseTypesParams) => {
-    return weiToValue(
-      await (await this.contract).fundsRaised.callAsync(params.type),
-      FULL_DECIMALS,
-    );
+    return weiToValue(await (await this.contract).fundsRaised.callAsync(params.type), FULL_DECIMALS);
   };
 
   /**
@@ -79,16 +72,13 @@ export default abstract class STOWrapper extends ModuleWrapper {
    */
   public totalTokensSold = async () => {
     return weiToValue(
-        await (await this.contract).totalTokensSold.callAsync(),
-        await (await this.securityTokenContract()).decimals.callAsync(),
+      await (await this.contract).totalTokensSold.callAsync(),
+      await (await this.securityTokenContract()).decimals.callAsync(),
     );
   };
 
   public getRaised = async (params: FundRaiseTypesParams) => {
-    return weiToValue(
-        await (await this.contract).getRaised.callAsync(params.type),
-        FULL_DECIMALS,
-    );
+    return weiToValue(await (await this.contract).getRaised.callAsync(params.type), FULL_DECIMALS);
   };
 
   public pause = async (params: TxParams) => {
@@ -102,19 +92,4 @@ export default abstract class STOWrapper extends ModuleWrapper {
     assert.assert(await this.isCallerTheSecurityTokenOwner(params.txData), 'The caller must be the ST owner');
     return (await this.contract).unpause.sendTransactionAsync(params.txData, params.safetyFactor);
   };
-
-  public reclaimERC20 = async (params: ReclaimERC20Params) => {
-    assert.assert(await this.isCallerTheSecurityTokenOwner(params.txData), 'The caller must be the ST owner');
-    assert.isNonZeroETHAddressHex('tokenContract', params.tokenContract);
-    return (await this.contract).reclaimERC20.sendTransactionAsync(
-      params.tokenContract,
-      params.txData,
-      params.safetyFactor,
-    );
-  };
-
-  public reclaimETH = async (params: TxParams) => {
-    assert.assert(await this.isCallerTheSecurityTokenOwner(params.txData), 'The caller must be the ST owner');
-    return (await this.contract).reclaimETH.sendTransactionAsync(params.txData, params.safetyFactor);
-  };
 }