hyperledger-labs · udosson · Oct 14, 2021 · Oct 13, 2021
diff --git a/utility-emissions-channel/chaincode/typescript/src/index.ts b/utility-emissions-channel/chaincode/typescript/src/index.ts
@@ -13,7 +13,9 @@ import {
 import { logger, stringToBytes } from './util/util';
 
 class EmissionsChaincode {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     private methods: {
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
         [key: string]: (stub: ChaincodeStub, args: string[]) => Promise<ChaincodeResponse>;
     } = {
         importUtilityIdentifier: this.importUtilityIdentifier,

diff --git a/utility-emissions-channel/chaincode/typescript/src/lib/emissionsRecordContract.ts b/utility-emissions-channel/chaincode/typescript/src/lib/emissionsRecordContract.ts
@@ -42,7 +42,7 @@ export class EmissionsRecordContract {
         energyUseUom: string,
         url: string,
         md5: string,
-    ) {
+    ): Promise<Uint8Array> {
         // get emissions factors from eGRID database; convert energy use to emissions factor UOM; calculate energy use
         const lookup = await this.utilityLookupState.getUtilityLookupItem(utilityId);
         const factor = await this.utilityEmissionsFactorState.getEmissionsFactorByLookupItem(
@@ -154,12 +154,12 @@ export class EmissionsRecordContract {
         );
         return Buffer.from(JSON.stringify(records));
     }
-    async importUtilityFactor(factorI: UtilityEmissionsFactorInterface) {
+    async importUtilityFactor(factorI: UtilityEmissionsFactorInterface): Promise<Uint8Array> {
         const factor = new UtilityEmissionsFactor(factorI);
         await this.utilityEmissionsFactorState.addUtilityEmissionsFactor(factor, factorI.uuid);
         return factor.toBuffer();
     }
-    async updateUtilityFactor(factorI: UtilityEmissionsFactorInterface) {
+    async updateUtilityFactor(factorI: UtilityEmissionsFactorInterface): Promise<Uint8Array> {
         const factor = new UtilityEmissionsFactor(factorI);
         await this.utilityEmissionsFactorState.updateUtilityEmissionsFactor(factor, factorI.uuid);
         return factor.toBuffer();

diff --git a/utility-emissions-channel/typescript_app/src/blockchain-gateway/I-gateway.ts b/utility-emissions-channel/typescript_app/src/blockchain-gateway/I-gateway.ts
@@ -66,6 +66,20 @@ export interface IUtilityemissionchannelEmissionData {
     tokenId: string;
 }
 
+export interface IUtilityemissionchannelEmissionMetadata {
+    org: string;
+    type: string;
+    partyId: string[];
+    renewableEnergyUseAmount: number;
+    nonrenewableEnergyUseAmount: number;
+    utilityIds: string[];
+    factorSources: string[];
+    urls: string[];
+    md5s: string[];
+    fromDates: string[];
+    thruDates: string[];
+}
+
 export interface IUtilityemissionchannelGetEMissionsRecordsInput {
     utilityId: string;
     partyId: string;

diff --git a/utility-emissions-channel/typescript_app/src/blockchain-gateway/config.ts b/utility-emissions-channel/typescript_app/src/blockchain-gateway/config.ts
@@ -131,7 +131,7 @@ export default class BCGatewayConfig {
         {
             Checks.nonBlankString(ccAddress, `${fnTag} LEDGER_EMISSION_TOKEN_CONTRACT_ADDRESS`);
         }
-        const networks: { [key: number]: any } = {};
+        const networks: { [key: number]: Record<string, string> } = {};
         networks[this.__getEthNetworkID(network)] = {
             address: ccAddress,
         };

diff --git a/utility-emissions-channel/typescript_app/src/blockchain-gateway/netEmissionsTokenNetwork.ts b/utility-emissions-channel/typescript_app/src/blockchain-gateway/netEmissionsTokenNetwork.ts
@@ -26,7 +26,11 @@ export default class EthNetEmissionsTokenGateway implements IEthNetEmissionsToke
     private readonly className = 'EthNetEmissionsTokenGateway';
     private readonly tokenTypeId = 3;
     private readonly web3 = new Web3();
-    private readonly EventTokenCreatedInput: any[];
+    private readonly EventTokenCreatedInput: {
+        internalType: string;
+        name: string;
+        type: string;
+    }[];
     constructor(private readonly opts: IEthNetEmissionsTokenGatewayOptions) {
         const tokenCreatedABI = contractABI.find((value) => {
             return value.type === 'event' && value.name === 'TokenCreated';
@@ -43,7 +47,7 @@ export default class EthNetEmissionsTokenGateway implements IEthNetEmissionsToke
         ledgerLogger.debug(`${fnTag} getting signer for client`);
         const signer = this.opts.signer.ethereum(caller);
         ledgerLogger.debug(`${fnTag} calling issue method input = %o`, input);
-        let result: any;
+        let result;
         try {
             const automaticRetireDate = +input.automaticRetireDate.toFixed();
             result = await this.opts.ethClient.invokeContract({

diff --git a/utility-emissions-channel/typescript_app/src/blockchain-gateway/utilityEmissionsChannel.ts b/utility-emissions-channel/typescript_app/src/blockchain-gateway/utilityEmissionsChannel.ts
@@ -137,7 +137,9 @@ export default class UtilityemissionchannelGateway implements IUtilityemissionch
                 params: [input.utilityId, input.partyId],
             });
             ledgerLogger.debug(`${fnTag} returned emissions record data : ${resp.functionOutput}`);
-            const json: any[] = JSON.parse(resp.functionOutput);
+            const json: Record<string, IUtilityemissionchannelEmissionData>[] = JSON.parse(
+                resp.functionOutput,
+            );
             const out: IUtilityemissionchannelEmissionData[] = [];
             for (const emission of json) {
                 out.push(this.__toEmissionRecord(emission.Record));
@@ -169,7 +171,9 @@ export default class UtilityemissionchannelGateway implements IUtilityemissionch
                 params: [input.fromDate, input.thruDate],
             });
             ledgerLogger.debug(`${fnTag} returned emissions record data : ${resp.functionOutput}`);
-            const json: any[] = JSON.parse(resp.functionOutput);
+            const json: Record<string, IUtilityemissionchannelEmissionData>[] = JSON.parse(
+                resp.functionOutput,
+            );
             const out: IUtilityemissionchannelEmissionData[] = [];
             for (const emission of json) {
                 out.push(this.__toEmissionRecord(emission.Record));
@@ -183,7 +187,9 @@ export default class UtilityemissionchannelGateway implements IUtilityemissionch
         }
     }
 
-    private __toEmissionRecord(json: any): IUtilityemissionchannelEmissionData {
+    private __toEmissionRecord(
+        json: IUtilityemissionchannelEmissionData,
+    ): IUtilityemissionchannelEmissionData {
         return {
             uuid: json.uuid,
             utilityId: json.utilityId,

diff --git a/utility-emissions-channel/typescript_app/src/service/input.ts b/utility-emissions-channel/typescript_app/src/service/input.ts
@@ -1,7 +1,7 @@
 export interface Input {
-    body: any;
-    header: any;
-    query: any;
+    body: Record<string, string>;
+    header: Record<string, string>;
+    query: Record<string, string>;
     file?: Buffer;
-    params?: any;
+    params?: Record<string, string>;
 }
diff --git a/utility-emissions-channel/typescript_app/src/service/utilityEmissionsChannel.ts b/utility-emissions-channel/typescript_app/src/service/utilityEmissionsChannel.ts
@@ -7,6 +7,7 @@ import {
     ITxDetails,
     IDataChaincodeInput,
     IUtilityemissionchannelEmissionData,
+    IUtilityemissionchannelEmissionMetadata,
 } from '../blockchain-gateway/I-gateway';
 import AWSS3 from '../datasource/awsS3';
 import Joi from 'joi';
@@ -31,7 +32,7 @@ interface IRecordAuditedEmissionsTokenResponse {
     fromDate: number;
     thruDate: number;
     automaticRetireDate: string;
-    metadata: any;
+    metadata: string;
     manifest: string;
     description: string;
 }
@@ -48,7 +49,7 @@ export default class UtilityEmissionsChannelService {
         const partyId: string = input.body.partyId;
         const fromDate: string = input.body.fromDate;
         const thruDate: string = input.body.thruDate;
-        const energyUseAmount: number = input.body.energyUseAmount as number;
+        const energyUseAmount: number = parseInt(input.body.energyUseAmount);
         const energyUseUom: string = input.body.energyUseUom;
 
         const fabricCaller: IFabricTxCaller = {
@@ -346,7 +347,7 @@ export default class UtilityEmissionsChannelService {
             throw error;
         }
     }
-    private async emissionsRecordChecksum(record: any) {
+    private async emissionsRecordChecksum(record: IUtilityemissionchannelEmissionData) {
         const fnTag = `${this.className}.EmissionsRecordChecksum`;
         if (record.url && record.url.length > 0) {
             const url = record.url;
@@ -374,8 +375,14 @@ export default class UtilityEmissionsChannelService {
         }
     }
 
-    private async tokenMetadata(records: IUtilityemissionchannelEmissionData[]): Promise<any> {
-        const metadata: any = {
+    private async tokenMetadata(records: IUtilityemissionchannelEmissionData[]): Promise<{
+        metadata: IUtilityemissionchannelEmissionMetadata;
+        manifest: string;
+        quantity: number;
+        fromDate: number;
+        thruDate: number;
+    }> {
+        const metadata: IUtilityemissionchannelEmissionMetadata = {
             org: this.opts.orgName,
             type: 'Utility Emissions',
             partyId: [],