Added Account/Tokentx

sebs · sebs · commit 77c45e4c7b02 · 2019-08-27T08:03:30.000+02:00
diff --git a/src/client/ClientAccountTokentx.ts b/src/client/ClientAccountTokentx.ts
@@ -0,0 +1,113 @@
+import * as request from 'request-promise-native'
+import { Address } from '../entities/Address'
+import { ApiKey } from '../entities/Apikey'
+import { Contractaddress } from '../entities/Contractaddress'
+import { IClientAccountTokentx } from '../interfaces/Account'
+import { requestBuilder } from '../requestBuilder'
+import { ClientBase } from './ClientBase'
+
+/**
+ * Client for the account balance
+ */
+export class ClientAccountTxlist extends ClientBase implements IClientAccountTokentx  {
+  /**
+   * Api key to send with the request
+   */
+  apiKey: ApiKey
+  /**
+   * Address to lookup the account balance
+   */
+  address: Address
+  /**
+   * module of the etherscan api to request
+   */
+  module: string
+  /**
+   * action of the etherscan api to request
+   */
+  action: string
+  /**
+   * Block to start reading data
+   */
+  startblock: string
+  /**
+   * Read data to
+   */
+  endblock: string
+  /**
+   * Sort
+   */
+  sort?: string
+  /**
+   * Page
+   */
+  page?: string
+  /**
+   * startpage
+   */
+  offset?: string
+
+  constructor(
+      apiKey: ApiKey,
+      module: string,
+      action: string,
+      address: Address | Contractaddress,
+      startblock: string,
+      endblock: string,
+      sort?: string,
+      page?: string,
+      offset?: string) {
+    super()
+    this.apiKey = apiKey
+    this.module = module
+    this.action = action
+    this.address = address
+    this.startblock = startblock
+    this.endblock = endblock
+    this.sort = sort
+    this.page = page
+    this.offset = offset
+  }
+  /**
+   * Returns the serice url
+   * @returns url
+   */
+  toUrl(): string {
+
+    let params = {
+      address: this.address.toString(),
+      apiKey: this.apiKey.toString(),
+      endblock: this.endblock.toString(),
+      startblock: this.startblock.toString(),
+    }
+
+    if (this.sort) {
+      params = Object.assign(params, {
+        sort: this.sort,
+      })
+    }
+
+    if (this.page) {
+      params = Object.assign(params, {
+        page: this.page,
+      })
+    }
+
+    if (this.offset) {
+      params = Object.assign(params, {
+        offset: this.offset,
+      })
+    }
+    return requestBuilder(this.module, this.action, params)
+  }
+  /**
+   * Dies the actual request to the server
+   */
+  async request(): Promise<any> {
+    const options = {
+      uri: this.toUrl(),
+    }
+    const res = await request.get(options)
+    return this.processResult(res)
+  }
+}
diff --git a/src/entities/Address.ts b/src/entities/Address.ts
@@ -6,10 +6,6 @@ import { EntityBase } from './EntityBase'
  * A ethereum address
  */
 export class Address extends EntityBase implements IEntity {
-    /**
-     * Regular expression to validate a ethereum address
-     */
-    private regex = /0x[a-fA-F0-9]{40}/
 
     constructor(address: string) {
         super(address)
@@ -19,6 +15,7 @@ export class Address extends EntityBase implements IEntity {
      * Checks validity of the address
      */
     valid(): boolean {
-        return this.value.match(this.regex) !== null
+        const regex = /0x[a-fA-F0-9]{40}/
+        return this.value.match(regex) !== null
     }
 }
diff --git a/src/entities/Contractaddress.ts b/src/entities/Contractaddress.ts
@@ -0,0 +1,21 @@
+
+import { IEntity } from '../interfaces/Entity'
+import { EntityBase } from './EntityBase'
+
+/**
+ * A ethereum address
+ */
+export class Contractaddress extends EntityBase implements IEntity {
+
+    constructor(address: string) {
+        super(address)
+        this.errorMessage = 'Invalid Address'
+    }
+    /**
+     * Checks validity of the address
+     */
+    valid(): boolean {
+        const regex = /0x[a-fA-F0-9]{40}/
+        return this.value.match(regex) !== null
+    }
+}
diff --git a/src/interfaces/Account.ts b/src/interfaces/Account.ts
@@ -1,4 +1,5 @@
 import { Address } from '../entities/Address'
+import { Contractaddress } from '../entities/Contractaddress'
 import { IClientRequest } from './Entity'
 
 /**
@@ -64,14 +65,14 @@ export interface IClientAccountTxlistInternalTxhash extends IClientRequest {
    * Block to start reading data
    */
   startblock: string
-  /**
-   * hash of the transaction
-   */
-  txhash: string
   /**
    * Read data to
    */
   endblock: string
+  /**
+   * hash of the transaction
+   */
+  txhash: string
   /**
    * Paging actual page
    */
@@ -86,13 +87,29 @@ export interface IClientAccountTxlistInternalTxhash extends IClientRequest {
   sort?: string
 }
 
-/*
 export interface IClientAccountTokentx extends IClientRequest {
-  contractaddress: string
-  startblock?: string
-  endblock?: string
+  /**
+   * Ethereum address
+   */
+  address?: Address | Contractaddress
+  /**
+   * Block to start reading data
+   */
+  startblock: string
+  /**
+   * Read data to
+   */
+  endblock: string
+  /**
+   * Paging actual page
+   */
   page?: string
+  /**
+   * Paging start
+   */
   offset?: string
+  /**
+   * Sort Parameter
+   */
   sort?: string
 }
-*/
