@decaf-ts/for-fabric 0.1.2 → 0.1.4

package/lib/esm/contracts/crud/crud-contract.js.map

@@ -1 +1 @@
-{"version":3,"file":"crud-contract.js","sourceRoot":"","sources":["../../../../src/contracts/crud/crud-contract.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"crud-contract.js","sourceRoot":"","sources":["../../../../src/contracts/crud/crud-contract.ts"],"names":[],"mappings":"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"}

package/lib/esm/contracts/crud/serialized-crud-contract.d.ts

@@ -1,7 +1,6 @@
 import { FabricCrudContract } from "./crud-contract";
 import { Model } from "@decaf-ts/decorator-validation";
-import { Context, Context as Ctx } from "fabric-contract-api";
-import { ContractLogger } from "../logging";
+import { Context as Ctx } from "fabric-contract-api";
 import { Constructor } from "@decaf-ts/decoration";
 /**
  * @description CRUD contract variant that serializes/deserializes payloads
@@ -17,13 +16,6 @@ import { Constructor } from "@decaf-ts/decoration";
  */
 export declare class SerializedCrudContract<M extends Model> extends FabricCrudContract<M> {
     constructor(name: string, clazz: Constructor<M>);
-    /**
-     * @description Creates a logger for a specific chaincode context
-     * @summary Returns a ContractLogger instance configured for the current context
-     * @param {Ctx} ctx - The Fabric chaincode context
-     * @return {ContractLogger} The logger instance
-     */
-    logFor(ctx: Context): ContractLogger;
     create(ctx: Ctx, model: string): Promise<string>;
     read(ctx: Ctx, key: string): Promise<string>;
     update(ctx: Ctx, model: string): Promise<string>;
@@ -31,8 +23,8 @@ export declare class SerializedCrudContract<M extends Model> extends FabricCrudC
     deleteAll(ctx: Ctx, keys: string): Promise<string>;
     readAll(ctx: Ctx, keys: string): Promise<string>;
     updateAll(ctx: Ctx, models: string): Promise<string>;
-    raw(ctx: Ctx, rawInput: string, docsOnly: boolean): Promise<any>;
+    raw(context: Ctx, rawInput: string, docsOnly: boolean): Promise<any>;
     init(ctx: Ctx): Promise<void>;
     healthcheck(ctx: Ctx): Promise<string>;
-    createAll(ctx: Ctx, models: string): Promise<string>;
+    createAll(context: Ctx, models: string): Promise<string>;
 }

package/lib/esm/contracts/crud/serialized-crud-contract.js

@@ -9,7 +9,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 import { FabricCrudContract } from "./crud-contract.js";
 import { Context as Ctx, Transaction } from "fabric-contract-api";
-import { Logging } from "@decaf-ts/logging";
 /**
  * @description CRUD contract variant that serializes/deserializes payloads
  * @summary Exposes the same CRUD operations as FabricCrudContract but takes and returns JSON strings to facilitate simple client interactions.
@@ -26,51 +25,42 @@ export class SerializedCrudContract extends FabricCrudContract {
     constructor(name, clazz) {
         super(name, clazz);
     }
-    /**
-     * @description Creates a logger for a specific chaincode context
-     * @summary Returns a ContractLogger instance configured for the current context
-     * @param {Ctx} ctx - The Fabric chaincode context
-     * @return {ContractLogger} The logger instance
-     */
-    logFor(ctx) {
-        return Logging.for(SerializedCrudContract, {}, ctx);
-    }
     async create(ctx, model) {
-        const log = this.logFor(ctx).for(this.create);
+        const { log } = await this.logCtx([ctx], this.create);
         log.info(`Creating model: ${model}`);
         const m = this.deserialize(model);
         log.info(`Model deserialized: ${JSON.stringify(m)}`);
         return this.serialize((await super.create(ctx, m)));
     }
     async read(ctx, key) {
-        const log = this.logFor(ctx).for(this.read);
+        const { log } = await this.logCtx([ctx], this.read);
         log.info(`Reading id: ${key}`);
         return this.serialize((await super.read(ctx, key)));
     }
     async update(ctx, model) {
-        const log = this.logFor(ctx).for(this.update);
+        const { log } = await this.logCtx([ctx], this.update);
         log.info(`Updating model: ${model}`);
         return this.serialize((await super.update(ctx, model)));
     }
     async delete(ctx, key) {
-        const log = this.logFor(ctx).for(this.delete);
+        const { log } = await this.logCtx([ctx], this.delete);
         log.info(`Deleting id: ${key}`);
         return this.serialize((await super.delete(ctx, key)));
     }
     async deleteAll(ctx, keys) {
         const parsedKeys = JSON.parse(keys);
-        const log = this.logFor(ctx).for(this.deleteAll);
+        const { log } = await this.logCtx([ctx], this.deleteAll);
         log.info(`deleting ${parsedKeys.length} entries from the table`);
         return JSON.stringify((await super.deleteAll(ctx, parsedKeys)).map((m) => this.serialize(m)));
     }
     async readAll(ctx, keys) {
         const parsedKeys = JSON.parse(keys);
-        const log = this.logFor(ctx).for(this.readAll);
+        const { log } = await this.logCtx([ctx], this.readAll);
         log.info(`reading ${parsedKeys.length} entries from the table`);
         return JSON.stringify((await super.readAll(ctx, parsedKeys)).map((m) => this.serialize(m)));
     }
     async updateAll(ctx, models) {
-        const log = this.logFor(ctx).for(this.updateAll);
+        const { log } = await this.logCtx([ctx], this.updateAll);
         const list = JSON.parse(models);
         const modelList = list
             .map((m) => this.deserialize(m))
@@ -78,7 +68,8 @@ export class SerializedCrudContract extends FabricCrudContract {
         log.info(`Updating ${modelList.length} entries to the table`);
         return JSON.stringify((await super.updateAll(ctx, modelList)).map((m) => this.serialize(m)));
     }
-    async raw(ctx, rawInput, docsOnly) {
+    async raw(context, rawInput, docsOnly) {
+        const { ctx } = await this.logCtx([context], this.raw);
         const parsedInput = JSON.parse(rawInput);
         return super.raw(ctx, parsedInput, docsOnly);
     }
@@ -89,14 +80,14 @@ export class SerializedCrudContract extends FabricCrudContract {
         //TODO: TRIM NOT WORKING CHECK LATER
         return JSON.stringify(await super.healthcheck(ctx));
     }
-    async createAll(ctx, models) {
-        const log = this.logFor(ctx).for(this.createAll);
+    async createAll(context, models) {
+        const { log } = await this.logCtx([context], this.createAll);
         const list = JSON.parse(models);
         const modelList = list
             .map((m) => this.deserialize(m))
             .map((m) => new this.clazz(m));
         log.info(`Adding ${modelList.length} entries to the table`);
-        return JSON.stringify((await super.createAll(ctx, modelList)).map((m) => this.serialize(m)));
+        return JSON.stringify((await super.createAll(context, modelList)).map((m) => this.serialize(m)));
     }
 }
 __decorate([

package/lib/esm/contracts/crud/serialized-crud-contract.js.map

@@ -1 +1 @@
-{"version":3,"file":"serialized-crud-contract.js","sourceRoot":"","sources":["../../../../src/contracts/crud/serialized-crud-contract.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"serialized-crud-contract.js","sourceRoot":"","sources":["../../../../src/contracts/crud/serialized-crud-contract.ts"],"names":[],"mappings":"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"}

package/lib/esm/contracts/erc20/erc20contract.d.ts

@@ -1,5 +1,6 @@
 import { Context } from "fabric-contract-api";
 import { Allowance, ERC20Token, ERC20Wallet } from "./models";
+import type { FabricContractContext } from "../ContractContext";
 import { FabricCrudContract } from "../crud/crud-contract";
 /**
  * @description ERC20 token contract base for Hyperledger Fabric
@@ -72,7 +73,7 @@ export declare abstract class FabricERC20Contract extends FabricCrudContract<ERC
      *
      * @returns {Boolean} Return whether the transfer was successful or not
      */
-    Transfer(ctx: Context, to: string, value: number): Promise<boolean>;
+    Transfer(context: Context, to: string, value: number): Promise<boolean>;
     /**
      * Transfer `value` amount of tokens from `from` to `to`.
      *
@@ -82,8 +83,8 @@ export declare abstract class FabricERC20Contract extends FabricCrudContract<ERC
      * @param {number} value The amount of token to be transferred
      * @returns {Boolean} Return whether the transfer was successful or not
      */
-    TransferFrom(ctx: Context, from: string, to: string, value: number): Promise<boolean>;
-    _transfer(ctx: Context, from: string, to: string, value: number): Promise<boolean>;
+    TransferFrom(context: Context, from: string, to: string, value: number): Promise<boolean>;
+    _transfer(from: string, to: string, value: number, ctx: FabricContractContext): Promise<boolean>;
     /**
      * Allows `spender` to spend `value` amount of tokens from the owner. New Approve calls override the previous allowance.
      * @note https://eips.ethereum.org/EIPS/eip-20
@@ -93,7 +94,7 @@ export declare abstract class FabricERC20Contract extends FabricCrudContract<ERC
      * @param {number} value The amount of tokens to be approved for transfer
      * @returns {Boolean} Return whether the approval was successful or not
      */
-    Approve(ctx: Context, spender: string, value: number): Promise<boolean>;
+    Approve(context: Context, spender: string, value: number): Promise<boolean>;
     /**
      * Returns the amount of tokens which ` ` is allowed to withdraw from `owner`.
      *
@@ -102,8 +103,8 @@ export declare abstract class FabricERC20Contract extends FabricCrudContract<ERC
      * @param {String} spender The spender who are able to transfer the tokens
      * @returns {number} Return the amount of remaining tokens allowed to spent
      */
-    Allowance(ctx: Context, owner: string, spender: string): Promise<number>;
-    _getAllowance(ctx: Context, owner: string, spender: string): Promise<Allowance>;
+    Allowance(context: Context, owner: string, spender: string): Promise<number>;
+    _getAllowance(owner: string, spender: string, ctx: FabricContractContext): Promise<Allowance>;
     /**
      * Set optional infomation for a token.
      *
@@ -113,8 +114,8 @@ export declare abstract class FabricERC20Contract extends FabricCrudContract<ERC
      * @param {String} decimals The decimals of the token
      * @param {String} totalSupply The totalSupply of the token
      */
-    Initialize(ctx: Context, token: ERC20Token): Promise<boolean>;
-    CheckInitialized(ctx: Context): Promise<void>;
+    Initialize(context: Context, token: ERC20Token): Promise<boolean>;
+    CheckInitialized(context: Context): Promise<void>;
     /**
      * Mint creates new tokens and adds them to minter's account balance
      *
@@ -122,7 +123,7 @@ export declare abstract class FabricERC20Contract extends FabricCrudContract<ERC
      * @param {number} amount amount of tokens to be minted
      * @returns {Object} The balance
      */
-    Mint(ctx: Context, amount: number): Promise<void>;
+    Mint(context: Context, amount: number): Promise<void>;
     /**
      * Burn redeem tokens from minter's account balance
      *
@@ -130,7 +131,7 @@ export declare abstract class FabricERC20Contract extends FabricCrudContract<ERC
      * @param {number} amount amount of tokens to be burned
      * @returns {Object} The balance
      */
-    Burn(ctx: Context, amount: number): Promise<void>;
+    Burn(context: Context, amount: number): Promise<void>;
     /**
      * BurnFrom redeem tokens from account allowence and balance
      *
@@ -139,7 +140,7 @@ export declare abstract class FabricERC20Contract extends FabricCrudContract<ERC
      * @param {number} amount amount of tokens to be burned
      * @returns {Object} The balance
      */
-    BurnFrom(ctx: Context, account: string, amount: number): Promise<void>;
+    BurnFrom(context: Context, account: string, amount: number): Promise<void>;
     /**
      * ClientAccountBalance returns the balance of the requesting client's account.
      *
@@ -147,5 +148,5 @@ export declare abstract class FabricERC20Contract extends FabricCrudContract<ERC
      * @returns {Number} Returns the account balance
      */
     ClientAccountBalance(ctx: Context): Promise<number>;
-    ClientAccountID(ctx: Context): Promise<string>;
+    ClientAccountID(context: Context): Promise<string>;
 }

package/lib/esm/contracts/erc20/erc20contract.js

@@ -55,8 +55,8 @@ export class FabricERC20Contract extends FabricCrudContract {
     async TokenName(ctx) {
         // Check contract options are already set first to execute the function
         await this.CheckInitialized(ctx);
-        const select = await this.tokenRepository.selectWithContext(undefined, ctx);
-        const token = (await select.execute())[0];
+        const select = await this.tokenRepository.select();
+        const token = (await select.execute(ctx))[0];
         return token.name;
     }
     /**
@@ -68,8 +68,8 @@ export class FabricERC20Contract extends FabricCrudContract {
     async Symbol(ctx) {
         // Check contract options are already set first to execute the function
         await this.CheckInitialized(ctx);
-        const select = await this.tokenRepository.selectWithContext(undefined, ctx);
-        const token = (await select.execute())[0];
+        const select = await this.tokenRepository.select();
+        const token = (await select.execute(ctx))[0];
         return token.symbol;
     }
     /**
@@ -82,8 +82,8 @@ export class FabricERC20Contract extends FabricCrudContract {
     async Decimals(ctx) {
         // Check contract options are already set first to execute the function
         await this.CheckInitialized(ctx);
-        const select = await this.tokenRepository.selectWithContext(undefined, ctx);
-        const token = (await select.execute())[0];
+        const select = await this.tokenRepository.select();
+        const token = (await select.execute(ctx))[0];
         return token.decimals;
     }
     /**
@@ -95,8 +95,8 @@ export class FabricERC20Contract extends FabricCrudContract {
     async TotalSupply(ctx) {
         // Check contract options are already set first to execute the function
         await this.CheckInitialized(ctx);
-        const select = await this.walletRepository.selectWithContext(undefined, ctx);
-        const wallets = await select.execute();
+        const select = await this.walletRepository.select();
+        const wallets = await select.execute(ctx);
         if (wallets.length == 0) {
             throw new NotFoundError(`The token ${this.getName()} does not exist`);
         }
@@ -129,11 +129,12 @@ export class FabricERC20Contract extends FabricCrudContract {
      *
      * @returns {Boolean} Return whether the transfer was successful or not
      */
-    async Transfer(ctx, to, value) {
+    async Transfer(context, to, value) {
         // Check contract options are already set first to execute the function
-        await this.CheckInitialized(ctx);
-        const from = ctx.clientIdentity.getID();
-        const transferResp = await this._transfer(ctx, from, to, value);
+        await this.CheckInitialized(context);
+        const { ctx } = await this.logCtx([context], this.Transfer);
+        const from = ctx.identity.getID();
+        const transferResp = await this._transfer(from, to, value, ctx);
         if (!transferResp) {
             throw new InternalError("Failed to transfer");
         }
@@ -148,12 +149,13 @@ export class FabricERC20Contract extends FabricCrudContract {
      * @param {number} value The amount of token to be transferred
      * @returns {Boolean} Return whether the transfer was successful or not
      */
-    async TransferFrom(ctx, from, to, value) {
+    async TransferFrom(context, from, to, value) {
         // Check contract options are already set first to execute the function
-        await this.CheckInitialized(ctx);
+        await this.CheckInitialized(context);
+        const { ctx } = await this.logCtx([context], this.BurnFrom);
         // Retrieve the allowance of the spender
-        const spender = ctx.clientIdentity.getID();
-        const allowance = await this._getAllowance(ctx, from, spender);
+        const spender = ctx.identity.getID();
+        const allowance = await this._getAllowance(from, spender, ctx);
         if (!allowance || allowance.value < 0) {
             throw new AllowanceError(`spender ${spender} has no allowance from ${from}`);
         }
@@ -169,14 +171,14 @@ export class FabricERC20Contract extends FabricCrudContract {
         });
         await this.allowanceRepository.update(newAllowance, ctx);
         //Realize the transfer
-        const transferResp = await this._transfer(ctx, from, to, value);
+        const transferResp = await this._transfer(from, to, value, ctx);
         if (!transferResp) {
             throw new InternalError("Failed to transfer");
         }
         return true;
     }
-    async _transfer(ctx, from, to, value) {
-        const logger = this.logFor(ctx).for(this._transfer);
+    async _transfer(from, to, value, ctx) {
+        const log = ctx.logger;
         if (from === to) {
             throw new AuthorizationError("cannot transfer to and from same client account");
         }
@@ -235,8 +237,9 @@ export class FabricERC20Contract extends FabricCrudContract {
         }
         // Emit the Transfer event
         const transferEvent = { from, to, value: value };
-        const eventHandler = this.repo.ObserverHandler();
-        eventHandler.updateObservers(logger, "", ERC20Events.TRANSFER, "", ctx, "", transferEvent);
+        this.repo
+            .refresh(ERC20Token, ERC20Events.TRANSFER, "", transferEvent, ctx)
+            .catch((e) => log.error(`Failed to notify transfer: ${e}`));
         return true;
     }
     /**
@@ -248,20 +251,20 @@ export class FabricERC20Contract extends FabricCrudContract {
      * @param {number} value The amount of tokens to be approved for transfer
      * @returns {Boolean} Return whether the approval was successful or not
      */
-    async Approve(ctx, spender, value) {
+    async Approve(context, spender, value) {
         // Check contract options are already set first to execute the function
-        await this.CheckInitialized(ctx);
-        const logger = this.logFor(ctx).for(this.Approve);
-        const owner = ctx.clientIdentity.getID();
-        let allowance = await this._getAllowance(ctx, owner, spender);
-        const ownerWallet = await this.walletRepository.read(owner, ctx);
+        await this.CheckInitialized(context);
+        const { ctx, ctxArgs } = await this.logCtx([context], this.Approve);
+        const owner = ctx.identity.getID();
+        let allowance = await this._getAllowance(owner, spender, ctx);
+        const ownerWallet = await this.walletRepository.read(owner, ...ctxArgs);
         if (ownerWallet.balance < value) {
             throw new BalanceError(`client account ${owner} has insufficient funds.`);
         }
         if (allowance) {
             // Overwrite the allowance
             allowance.value = value;
-            await this.allowanceRepository.update(allowance, ctx);
+            await this.allowanceRepository.update(allowance, ...ctxArgs);
         }
         else {
             allowance = new Allowance({
@@ -269,12 +272,11 @@ export class FabricERC20Contract extends FabricCrudContract {
                 spender: spender,
                 value: value,
             });
-            await this.allowanceRepository.create(allowance, ctx);
+            await this.allowanceRepository.create(allowance, ...ctxArgs);
         }
         // Emit the Approval event
         const approvalEvent = { owner, spender, value: value };
-        const eventHandler = this.repo.ObserverHandler();
-        eventHandler.updateObservers(logger, "", ERC20Events.APPROVAL, "", ctx, "", approvalEvent);
+        this.repo.refresh(ERC20Token, ERC20Events.APPROVAL, "", approvalEvent, ctx);
         return true;
     }
     /**
@@ -285,19 +287,22 @@ export class FabricERC20Contract extends FabricCrudContract {
      * @param {String} spender The spender who are able to transfer the tokens
      * @returns {number} Return the amount of remaining tokens allowed to spent
      */
-    async Allowance(ctx, owner, spender) {
+    async Allowance(context, owner, spender) {
         // Check contract options are already set first to execute the function
-        await this.CheckInitialized(ctx);
-        const allowance = await this._getAllowance(ctx, owner, spender);
+        await this.CheckInitialized(context);
+        const { ctx } = await this.logCtx([context], this.Allowance);
+        const allowance = await this._getAllowance(owner, spender, ctx);
         if (!allowance) {
             throw new AllowanceError(`spender ${spender} has no allowance from ${owner}`);
         }
         return allowance.value;
     }
-    async _getAllowance(ctx, owner, spender) {
+    async _getAllowance(owner, spender, ctx) {
         const allowanceCondition = Condition.and(Condition.attribute("owner").eq(owner), Condition.attribute("spender").eq(spender));
-        const select = await this.allowanceRepository.selectWithContext(undefined, ctx);
-        const allowance = await select.where(allowanceCondition).execute();
+        const allowance = await this.allowanceRepository
+            .select()
+            .where(allowanceCondition)
+            .execute(ctx);
         return allowance?.[0];
     }
     // ================== Extended Functions ==========================
@@ -310,21 +315,21 @@ export class FabricERC20Contract extends FabricCrudContract {
      * @param {String} decimals The decimals of the token
      * @param {String} totalSupply The totalSupply of the token
      */
-    async Initialize(ctx, token) {
+    async Initialize(context, token) {
+        const { ctx } = await this.logCtx([context], this.Initialize);
         // Check contract options are not already set, client is not authorized to change them once intitialized
-        const select = await this.tokenRepository.selectWithContext(undefined, ctx);
-        const tokens = await select.execute();
+        const tokens = await this.tokenRepository.select().execute(ctx);
         if (tokens.length > 0) {
             throw new AuthorizationError("contract options are already set, client is not authorized to change them");
         }
-        token.owner = ctx.clientIdentity.getID();
+        token.owner = ctx.identity.getID();
         await this.tokenRepository.create(token, ctx);
         return true;
     }
     // Checks that contract options have been already initialized
-    async CheckInitialized(ctx) {
-        const select = await this.tokenRepository.selectWithContext(undefined, ctx);
-        const tokens = await select.execute();
+    async CheckInitialized(context) {
+        const { ctx } = await this.logCtx([context], this.CheckInitialized);
+        const tokens = await this.tokenRepository.select().execute(ctx);
         if (tokens.length == 0) {
             throw new NotInitializedError("contract options need to be set before calling any function, call Initialize() to initialize contract");
         }
@@ -336,12 +341,12 @@ export class FabricERC20Contract extends FabricCrudContract {
      * @param {number} amount amount of tokens to be minted
      * @returns {Object} The balance
      */
-    async Mint(ctx, amount) {
+    async Mint(context, amount) {
         // Check contract options are already set first to execute the function
-        await this.CheckInitialized(ctx);
-        const logger = this.logFor(ctx).for(this.Mint);
+        await this.CheckInitialized(context);
+        const { ctx } = await this.logCtx([context], this.Mint);
         // Get ID of submitting client identity
-        const minter = ctx.clientIdentity.getID();
+        const minter = ctx.identity.getID();
         if (amount <= 0) {
             throw new ValidationError("mint amount must be a positive integer");
         }
@@ -362,7 +367,7 @@ export class FabricERC20Contract extends FabricCrudContract {
                     const newWallet = new ERC20Wallet({
                         id: minter,
                         balance: amount,
-                        token: await this.TokenName(ctx),
+                        token: await this.TokenName(context),
                     });
                     await this.walletRepository.create(newWallet, ctx);
                 }
@@ -377,7 +382,7 @@ export class FabricERC20Contract extends FabricCrudContract {
         // Emit the Transfer event
         const transferEvent = { from: "0x0", to: minter, value: amount };
         const eventHandler = this.repo.ObserverHandler();
-        eventHandler.updateObservers(logger, "", ERC20Events.TRANSFER, "", ctx, "", transferEvent);
+        eventHandler.updateObservers(ERC20Token, ERC20Events.TRANSFER, "", transferEvent, ctx);
     }
     /**
      * Burn redeem tokens from minter's account balance
@@ -386,11 +391,11 @@ export class FabricERC20Contract extends FabricCrudContract {
      * @param {number} amount amount of tokens to be burned
      * @returns {Object} The balance
      */
-    async Burn(ctx, amount) {
+    async Burn(context, amount) {
         // Check contract options are already set first to execute the function
-        await this.CheckInitialized(ctx);
-        const logger = this.logFor(ctx).for(this.Burn);
-        const minter = ctx.clientIdentity.getID();
+        await this.CheckInitialized(context);
+        const { log, ctx } = await this.logCtx([context], this.Burn);
+        const minter = ctx.identity.getID();
         const minterWallet = await this.walletRepository.read(minter, ctx);
         const currentBalance = minterWallet.balance;
         if (currentBalance < amount) {
@@ -401,11 +406,11 @@ export class FabricERC20Contract extends FabricCrudContract {
             balance: updatedBalance,
         });
         await this.walletRepository.update(updatedminter, ctx);
-        logger.info(`${amount} tokens were burned`);
+        log.info(`${amount} tokens were burned`);
         // Emit the Transfer event
         const transferEvent = { from: minter, to: "0x0", value: amount };
         const eventHandler = this.repo.ObserverHandler();
-        eventHandler.updateObservers(logger, "", ERC20Events.TRANSFER, "", ctx, "", transferEvent);
+        eventHandler.updateObservers(ERC20Token, ERC20Events.TRANSFER, "", transferEvent, ctx);
     }
     /**
      * BurnFrom redeem tokens from account allowence and balance
@@ -415,10 +420,10 @@ export class FabricERC20Contract extends FabricCrudContract {
      * @param {number} amount amount of tokens to be burned
      * @returns {Object} The balance
      */
-    async BurnFrom(ctx, account, amount) {
+    async BurnFrom(context, account, amount) {
         // Check contract options are already set first to execute the function
-        await this.CheckInitialized(ctx);
-        const logger = this.logFor(ctx).for(this.BurnFrom);
+        await this.CheckInitialized(context);
+        const { log, ctx } = await this.logCtx([context], this.BurnFrom);
         const accountWallet = await this.walletRepository.read(account, ctx);
         const currentBalance = accountWallet.balance;
         if (currentBalance < amount) {
@@ -429,11 +434,11 @@ export class FabricERC20Contract extends FabricCrudContract {
             balance: updatedBalance,
         });
         await this.walletRepository.update(updatedaccount, ctx);
-        logger.info(`${amount} tokens were berned from ${account}`);
+        log.info(`${amount} tokens were burned from ${account}`);
         // Emit the Transfer event
         const transferEvent = { from: account, to: "0x0", value: amount };
         const eventHandler = this.repo.ObserverHandler();
-        eventHandler.updateObservers(logger, "", ERC20Events.TRANSFER, "", ctx, "", transferEvent);
+        eventHandler.updateObservers(ERC20Token, ERC20Events.TRANSFER, "", transferEvent, ctx);
     }
     /**
      * ClientAccountBalance returns the balance of the requesting client's account.
@@ -455,11 +460,12 @@ export class FabricERC20Contract extends FabricCrudContract {
     // ClientAccountID returns the id of the requesting client's account.
     // In this implementation, the client account ID is the clientId itself.
     // Users can use this function to get their own account id, which they can then give to others as the payment address
-    async ClientAccountID(ctx) {
+    async ClientAccountID(context) {
         // Check contract options are already set first to execute the function
-        await this.CheckInitialized(ctx);
+        await this.CheckInitialized(context);
+        const { ctx } = await this.logCtx([context], this.ClientAccountID);
         // Get ID of submitting client identity
-        const clientAccountID = ctx.clientIdentity.getID();
+        const clientAccountID = ctx.identity.getID();
         return clientAccountID;
     }
 }
@@ -512,7 +518,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], FabricERC20Contract.prototype, "Approve", null);
 __decorate([
-    Transaction(),
+    Transaction(false),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Context, String, String]),
     __metadata("design:returntype", Promise)
@@ -551,13 +557,13 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], FabricERC20Contract.prototype, "BurnFrom", null);
 __decorate([
-    Transaction(),
+    Transaction(false),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Context]),
     __metadata("design:returntype", Promise)
 ], FabricERC20Contract.prototype, "ClientAccountBalance", null);
 __decorate([
-    Transaction(),
+    Transaction(false),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Context]),
     __metadata("design:returntype", Promise)