Merge branch 'task/g449_block_service' of github.com:NEMStudios/nem2-sdk-typescript-javascript into task/g449_block_service

Author: rg911

e2e/infrastructure/BlockHttp.spec.ts

@@ -95,7 +95,7 @@ describe('BlockHttp', () => {
             expect(blockInfo.height.higher).to.be.equal(0);
             expect(blockInfo.timestamp.lower).to.be.equal(0);
             expect(blockInfo.timestamp.higher).to.be.equal(0);
-
+            expect(blockInfo.beneficiaryPublicKey).not.to.be.undefined;
         });
     });
 

e2e/infrastructure/NetworkHttp.spec.ts

@@ -44,4 +44,14 @@ describe('NetworkHttp', () => {
             expect(networkName.description.toLowerCase()).to.be.not.null;
         });
     });
+
+    describe('getNetworkFees', () => {
+        it('should return network fees', async () => {
+            const fees = await networkRepository.getNetworkFees().toPromise();
+            expect(fees.averageFeeMultiplier).to.be.not.null;
+            expect(fees.highestFeeMultiplier).to.be.not.null;
+            expect(fees.lowestFeeMultiplier).to.be.not.null;
+            expect(fees.medianFeeMultiplier).to.be.not.null;
+        });
+    });
 });

package-lock.json

@@ -66,7 +66,7 @@
     "js-sha3": "^0.8.0",
     "long": "^4.0.0",
     "merkletreejs": "^0.1.7",
-    "nem2-sdk-openapi-typescript-node-client": "0.8.2",
+    "nem2-sdk-openapi-typescript-node-client": "0.8.3",
     "request": "^2.88.0",
     "request-promise-native": "^1.0.5",
     "ripemd160": "^2.0.2",

package.json

@@ -26,7 +26,7 @@ import { UInt64 } from '../model/UInt64';
 import { BlockRepository } from './BlockRepository';
 import { Http } from './Http';
 import { QueryParams } from './QueryParams';
-import { CreateTransactionFromDTO, extractBeneficiary } from './transaction/CreateTransactionFromDTO';
+import { CreateTransactionFromDTO } from './transaction/CreateTransactionFromDTO';
 
 /**
  * Blockchain http repository.
@@ -122,7 +122,7 @@ export class BlockHttp extends Http implements BlockRepository {
             dto.block.transactionsHash,
             dto.block.receiptsHash,
             dto.block.stateHash,
-            extractBeneficiary(dto, networkType),
+            dto.block.beneficiaryPublicKey ? PublicAccount.createFromPublicKey(dto.block.beneficiaryPublicKey, networkType) : undefined,
         );
     }
 

src/infrastructure/BlockHttp.ts

@@ -32,10 +32,7 @@ import { TransactionStatusError } from '../model/transaction/TransactionStatusEr
 import { TransferTransaction } from '../model/transaction/TransferTransaction';
 import { UInt64 } from '../model/UInt64';
 import { IListener } from './IListener';
-import {
-    CreateTransactionFromDTO,
-    extractBeneficiary,
-} from './transaction/CreateTransactionFromDTO';
+import { CreateTransactionFromDTO } from './transaction/CreateTransactionFromDTO';
 
 enum ListenerChannelName {
     block = 'block',
@@ -157,7 +154,7 @@ export class Listener implements IListener {
                     message.block.blockTransactionsHash,
                     message.block.blockReceiptsHash,
                     message.block.stateHash,
-                    extractBeneficiary(message, message.block.network), // passing `message` as `blockDTO`
+                    message.block.beneficiaryPublicKey,
                 ),
             });
         } else if (message.code) {

src/infrastructure/Listener.ts

@@ -17,6 +17,7 @@
 import { NetworkRoutesApi } from 'nem2-sdk-openapi-typescript-node-client';
 import { from as observableFrom, Observable, throwError } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
+import { NetworkFees } from '../model/blockchain/NetworkFees';
 import { NetworkName } from '../model/blockchain/NetworkName';
 import { NetworkType } from '../model/blockchain/NetworkType';
 import { NodeInfo } from '../model/node/NodeInfo';
@@ -71,4 +72,18 @@ export class NetworkHttp extends Http implements NetworkRepository {
             catchError((error) =>  throwError(this.errorHandling(error))),
         );
     }
+
+    /**
+     * Returns information about the average, median, highest and lower fee multiplier over the last
+     * \"numBlocksTransactionFeeStats\". The setting \"numBlocksTransactionFeeStats\" is adjustable
+     * via a configuration file (rest/resources/rest.json) per REST instance.
+     * @summary Get transaction fees information
+     */
+    public getNetworkFees(): Observable<NetworkFees> {
+        return observableFrom(this.networkRouteApi.getNetworkFees()).pipe(
+            map((({body}) =>
+                new NetworkFees(body.averageFeeMultiplier, body.medianFeeMultiplier, body.highestFeeMultiplier, body.lowestFeeMultiplier))),
+            catchError((error) =>  throwError(this.errorHandling(error))),
+        );
+    }
 }

src/infrastructure/NetworkHttp.ts

@@ -15,6 +15,7 @@
  */
 
 import {Observable} from 'rxjs';
+import { NetworkFees } from '../model/blockchain/NetworkFees';
 import { NetworkName } from '../model/blockchain/NetworkName';
 import {NetworkType} from '../model/blockchain/NetworkType';
 
@@ -37,4 +38,11 @@ export interface NetworkRepository {
      * @return current network type name and description
      */
     getNetworkName(): Observable<NetworkName>;
+
+    /**
+     * Returns information about the average, median, highest and lower fee multiplier over the last "numBlocksTransactionFeeStats".
+     * @return the NetworkFees
+     */
+    getNetworkFees(): Observable<NetworkFees> ;
+
 }

src/infrastructure/NetworkRepository.ts

@@ -481,44 +481,3 @@ const extractMessage = (message: any): PlainMessage | EncryptedMessage => {
     }
     return msgObj;
 };
-
-/**
- * Extract beneficiary public key from DTO.
- *
- * @todo Upgrade of catapult-rest WITH catapult-service-bootstrap versioning.
- *
- * With `cow` upgrade (nemtech/catapult-server@0.3.0.2), `catapult-rest` block DTO
- * was updated and latest catapult-service-bootstrap uses the wrong block DTO.
- * This will be fixed with next catapult-server upgrade to `dragon`.
- *
- * :warning It is currently not possible to read the block's beneficiary public key
- * except when working with a local instance of `catapult-rest`.
- *
- * @param beneficiary {string | undefined} The beneficiary public key if set
- * @return {Mosaic[]}
- */
-export const extractBeneficiary = (
-    blockDTO: any,
-    networkType: NetworkType,
-): PublicAccount | undefined => {
-
-    let dtoPublicAccount: PublicAccount | undefined;
-    let dtoFieldValue: string | undefined;
-    if (blockDTO.beneficiaryPublicKey) {
-        dtoFieldValue = blockDTO.beneficiaryPublicKey;
-    } else if (blockDTO.beneficiary) {
-        dtoFieldValue = blockDTO.beneficiary;
-    }
-
-    if (! dtoFieldValue) {
-        return undefined;
-    }
-
-    try {
-        // @FIX with latest catapult-service-bootstrap version, catapult-rest still returns
-        //      a `string` formatted copy of the public *when it is set at all*.
-        dtoPublicAccount = PublicAccount.createFromPublicKey(dtoFieldValue, networkType);
-    } catch (e) { dtoPublicAccount =  undefined; }
-
-    return dtoPublicAccount;
-};

src/infrastructure/transaction/CreateTransactionFromDTO.ts

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2019 NEM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Network Fees
+ */
+export class NetworkFees {
+
+    /**
+     * @param averageFeeMultiplier - Average fee multiplier over the last \"numBlocksTransactionFeeStats\".
+     * @param medianFeeMultiplier - Median fee multiplier over the last \"numBlocksTransactionFeeStats\".
+     * @param highestFeeMultiplier - Fee multiplier applied to transactions contained in block.
+     * @param lowestFeeMultiplier - Fee multiplier applied to transactions contained in block.
+     */
+    constructor(public readonly averageFeeMultiplier: number,
+                public readonly medianFeeMultiplier: number,
+                public readonly highestFeeMultiplier: number,
+                public readonly lowestFeeMultiplier: number) {
+    }
+}