diff --git a/docs/sdk/python/human_protocol_sdk.constants.md b/docs/sdk/python/human_protocol_sdk.constants.md
index d60606cca3..aa04bfb891 100644
--- a/docs/sdk/python/human_protocol_sdk.constants.md
+++ b/docs/sdk/python/human_protocol_sdk.constants.md
@@ -31,7 +31,9 @@ Enum for KVStore keys
 #### fee *= 'fee'*
 
 #### job_types *= 'job_types'*
-#### name *= 'name'*
+
+#### operator_name *= 'name'*
+
 #### public_key *= 'public_key'*
 
 #### public_key_hash *= 'public_key_hash'*
diff --git a/docs/sdk/python/human_protocol_sdk.md b/docs/sdk/python/human_protocol_sdk.md
index 79b69427ef..dbe51d876a 100644
--- a/docs/sdk/python/human_protocol_sdk.md
+++ b/docs/sdk/python/human_protocol_sdk.md
@@ -130,6 +130,7 @@
     * [`KVStoreKeys.category`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.KVStoreKeys.category)
     * [`KVStoreKeys.fee`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.KVStoreKeys.fee)
     * [`KVStoreKeys.job_types`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.KVStoreKeys.job_types)
+    * [`KVStoreKeys.operator_name`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.KVStoreKeys.operator_name)
     * [`KVStoreKeys.public_key`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.KVStoreKeys.public_key)
     * [`KVStoreKeys.public_key_hash`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.KVStoreKeys.public_key_hash)
     * [`KVStoreKeys.registration_instructions`](human_protocol_sdk.constants.md#human_protocol_sdk.constants.KVStoreKeys.registration_instructions)
diff --git a/docs/sdk/typescript/base/classes/BaseEthersClient.md b/docs/sdk/typescript/base/classes/BaseEthersClient.md
index 15729642ca..1498d643bb 100644
--- a/docs/sdk/typescript/base/classes/BaseEthersClient.md
+++ b/docs/sdk/typescript/base/classes/BaseEthersClient.md
@@ -44,7 +44,7 @@ The network information required to connect to the contracts
 
 #### Defined in
 
-[base.ts:20](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L20)
+[base.ts:20](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L20)
 
 ## Properties
 
@@ -54,7 +54,7 @@ The network information required to connect to the contracts
 
 #### Defined in
 
-[base.ts:12](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L12)
+[base.ts:12](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L12)
 
 ***
 
@@ -64,4 +64,4 @@ The network information required to connect to the contracts
 
 #### Defined in
 
-[base.ts:11](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L11)
+[base.ts:11](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L11)
diff --git a/docs/sdk/typescript/encryption/classes/Encryption.md b/docs/sdk/typescript/encryption/classes/Encryption.md
index 45f40e0fe9..ad497bc785 100644
--- a/docs/sdk/typescript/encryption/classes/Encryption.md
+++ b/docs/sdk/typescript/encryption/classes/Encryption.md
@@ -67,7 +67,7 @@ The private key.
 
 #### Defined in
 
-[encryption.ts:66](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L66)
+[encryption.ts:66](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L66)
 
 ## Methods
 
@@ -123,7 +123,7 @@ const resultMessage = await encryption.decrypt('message');
 
 #### Defined in
 
-[encryption.ts:194](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L194)
+[encryption.ts:194](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L194)
 
 ***
 
@@ -161,7 +161,7 @@ const resultMessage = await encryption.sign('message');
 
 #### Defined in
 
-[encryption.ts:251](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L251)
+[encryption.ts:251](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L251)
 
 ***
 
@@ -230,7 +230,7 @@ const resultMessage = await encryption.signAndEncrypt('message', publicKeys);
 
 #### Defined in
 
-[encryption.ts:142](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L142)
+[encryption.ts:142](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L142)
 
 ***
 
@@ -262,4 +262,4 @@ Optional: The passphrase for the private key.
 
 #### Defined in
 
-[encryption.ts:77](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L77)
+[encryption.ts:77](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L77)
diff --git a/docs/sdk/typescript/encryption/classes/EncryptionUtils.md b/docs/sdk/typescript/encryption/classes/EncryptionUtils.md
index 8c6e538cfa..792fdc1c3a 100644
--- a/docs/sdk/typescript/encryption/classes/EncryptionUtils.md
+++ b/docs/sdk/typescript/encryption/classes/EncryptionUtils.md
@@ -103,7 +103,7 @@ const result = await EncryptionUtils.encrypt('message', publicKeys);
 
 #### Defined in
 
-[encryption.ts:444](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L444)
+[encryption.ts:444](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L444)
 
 ***
 
@@ -152,7 +152,7 @@ const result = await EncryptionUtils.generateKeyPair(name, email, passphrase);
 
 #### Defined in
 
-[encryption.ts:382](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L382)
+[encryption.ts:382](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L382)
 
 ***
 
@@ -186,7 +186,7 @@ const signedData = await EncryptionUtils.getSignedData('message');
 
 #### Defined in
 
-[encryption.ts:351](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L351)
+[encryption.ts:351](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L351)
 
 ***
 
@@ -236,7 +236,7 @@ if (isEncrypted) {
 
 #### Defined in
 
-[encryption.ts:494](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L494)
+[encryption.ts:494](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L494)
 
 ***
 
@@ -288,4 +288,4 @@ const result = await EncryptionUtils.verify('message', publicKey);
 
 #### Defined in
 
-[encryption.ts:318](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L318)
+[encryption.ts:318](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/encryption.ts#L318)
diff --git a/docs/sdk/typescript/enums/enumerations/ChainId.md b/docs/sdk/typescript/enums/enumerations/ChainId.md
index b24542d6e3..1efccc3645 100644
--- a/docs/sdk/typescript/enums/enumerations/ChainId.md
+++ b/docs/sdk/typescript/enums/enumerations/ChainId.md
@@ -14,7 +14,7 @@
 
 #### Defined in
 
-[enums.ts:2](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L2)
+[enums.ts:2](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L2)
 
 ***
 
@@ -24,7 +24,7 @@
 
 #### Defined in
 
-[enums.ts:5](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L5)
+[enums.ts:5](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L5)
 
 ***
 
@@ -34,7 +34,7 @@
 
 #### Defined in
 
-[enums.ts:6](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L6)
+[enums.ts:6](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L6)
 
 ***
 
@@ -44,7 +44,7 @@
 
 #### Defined in
 
-[enums.ts:9](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L9)
+[enums.ts:9](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L9)
 
 ***
 
@@ -54,7 +54,7 @@
 
 #### Defined in
 
-[enums.ts:3](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L3)
+[enums.ts:3](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L3)
 
 ***
 
@@ -64,7 +64,7 @@
 
 #### Defined in
 
-[enums.ts:7](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L7)
+[enums.ts:7](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L7)
 
 ***
 
@@ -74,7 +74,7 @@
 
 #### Defined in
 
-[enums.ts:8](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L8)
+[enums.ts:8](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L8)
 
 ***
 
@@ -84,4 +84,4 @@
 
 #### Defined in
 
-[enums.ts:4](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L4)
+[enums.ts:4](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L4)
diff --git a/docs/sdk/typescript/enums/enumerations/LeaderCategory.md b/docs/sdk/typescript/enums/enumerations/LeaderCategory.md
index e5c2652381..0d9fb3b66f 100644
--- a/docs/sdk/typescript/enums/enumerations/LeaderCategory.md
+++ b/docs/sdk/typescript/enums/enumerations/LeaderCategory.md
@@ -14,7 +14,7 @@
 
 #### Defined in
 
-[enums.ts:18](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L18)
+[enums.ts:18](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L18)
 
 ***
 
@@ -24,4 +24,4 @@
 
 #### Defined in
 
-[enums.ts:19](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L19)
+[enums.ts:19](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L19)
diff --git a/docs/sdk/typescript/enums/enumerations/OrderDirection.md b/docs/sdk/typescript/enums/enumerations/OrderDirection.md
index 38f2242b3d..84c990770b 100644
--- a/docs/sdk/typescript/enums/enumerations/OrderDirection.md
+++ b/docs/sdk/typescript/enums/enumerations/OrderDirection.md
@@ -14,7 +14,7 @@
 
 #### Defined in
 
-[enums.ts:13](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L13)
+[enums.ts:13](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L13)
 
 ***
 
@@ -24,4 +24,4 @@
 
 #### Defined in
 
-[enums.ts:14](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L14)
+[enums.ts:14](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/enums.ts#L14)
diff --git a/docs/sdk/typescript/escrow/classes/EscrowClient.md b/docs/sdk/typescript/escrow/classes/EscrowClient.md
index cbc0f8e30a..435f315547 100644
--- a/docs/sdk/typescript/escrow/classes/EscrowClient.md
+++ b/docs/sdk/typescript/escrow/classes/EscrowClient.md
@@ -110,7 +110,7 @@ The network information required to connect to the Escrow contract
 
 #### Defined in
 
-[escrow.ts:143](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L143)
+[escrow.ts:143](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L143)
 
 ## Properties
 
@@ -124,7 +124,7 @@ The network information required to connect to the Escrow contract
 
 #### Defined in
 
-[base.ts:12](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L12)
+[base.ts:12](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L12)
 
 ***
 
@@ -138,7 +138,7 @@ The network information required to connect to the Escrow contract
 
 #### Defined in
 
-[base.ts:11](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L11)
+[base.ts:11](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L11)
 
 ## Methods
 
@@ -195,7 +195,7 @@ await escrowClient.addTrustedHandlers('0x62dD51230A30401C455c8398d06F85e4EaB6309
 
 #### Defined in
 
-[escrow.ts:771](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L771)
+[escrow.ts:771](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L771)
 
 ***
 
@@ -287,7 +287,7 @@ await escrowClient.bulkPayOut('0x62dD51230A30401C455c8398d06F85e4EaB6309f', reci
 
 #### Defined in
 
-[escrow.ts:604](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L604)
+[escrow.ts:604](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L604)
 
 ***
 
@@ -337,7 +337,7 @@ await escrowClient.cancel('0x62dD51230A30401C455c8398d06F85e4EaB6309f');
 
 #### Defined in
 
-[escrow.ts:685](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L685)
+[escrow.ts:685](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L685)
 
 ***
 
@@ -387,7 +387,7 @@ await escrowClient.complete('0x62dD51230A30401C455c8398d06F85e4EaB6309f');
 
 #### Defined in
 
-[escrow.ts:543](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L543)
+[escrow.ts:543](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L543)
 
 ***
 
@@ -483,7 +483,7 @@ console.log('Tx hash:', ethers.keccak256(signedTransaction));
 
 #### Defined in
 
-[escrow.ts:940](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L940)
+[escrow.ts:940](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L940)
 
 ***
 
@@ -548,7 +548,7 @@ const escrowAddress = await escrowClient.createEscrow(tokenAddress, trustedHandl
 
 #### Defined in
 
-[escrow.ts:223](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L223)
+[escrow.ts:223](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L223)
 
 ***
 
@@ -603,7 +603,7 @@ await escrowClient.fund('0x62dD51230A30401C455c8398d06F85e4EaB6309f', amount);
 
 #### Defined in
 
-[escrow.ts:414](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L414)
+[escrow.ts:414](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L414)
 
 ***
 
@@ -643,7 +643,7 @@ const balance = await escrowClient.getBalance('0x62dD51230A30401C455c8398d06F85e
 
 #### Defined in
 
-[escrow.ts:1085](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1085)
+[escrow.ts:1085](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1085)
 
 ***
 
@@ -683,7 +683,7 @@ const oracleAddress = await escrowClient.getExchangeOracleAddress('0x62dD51230A3
 
 #### Defined in
 
-[escrow.ts:1471](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1471)
+[escrow.ts:1471](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1471)
 
 ***
 
@@ -723,7 +723,7 @@ const factoryAddress = await escrowClient.getFactoryAddress('0x62dD51230A30401C4
 
 #### Defined in
 
-[escrow.ts:1509](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1509)
+[escrow.ts:1509](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1509)
 
 ***
 
@@ -763,7 +763,7 @@ const intermediateResultsUrl = await escrowClient.getIntermediateResultsUrl('0x6
 
 #### Defined in
 
-[escrow.ts:1243](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1243)
+[escrow.ts:1243](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1243)
 
 ***
 
@@ -803,7 +803,7 @@ const jobLauncherAddress = await escrowClient.getJobLauncherAddress('0x62dD51230
 
 #### Defined in
 
-[escrow.ts:1395](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1395)
+[escrow.ts:1395](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1395)
 
 ***
 
@@ -843,7 +843,7 @@ const manifestHash = await escrowClient.getManifestHash('0x62dD51230A30401C455c8
 
 #### Defined in
 
-[escrow.ts:1129](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1129)
+[escrow.ts:1129](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1129)
 
 ***
 
@@ -883,7 +883,7 @@ const manifestUrl = await escrowClient.getManifestUrl('0x62dD51230A30401C455c839
 
 #### Defined in
 
-[escrow.ts:1167](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1167)
+[escrow.ts:1167](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1167)
 
 ***
 
@@ -923,7 +923,7 @@ const oracleAddress = await escrowClient.getRecordingOracleAddress('0x62dD51230A
 
 #### Defined in
 
-[escrow.ts:1357](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1357)
+[escrow.ts:1357](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1357)
 
 ***
 
@@ -963,7 +963,7 @@ const oracleAddress = await escrowClient.getReputationOracleAddress('0x62dD51230
 
 #### Defined in
 
-[escrow.ts:1433](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1433)
+[escrow.ts:1433](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1433)
 
 ***
 
@@ -1003,7 +1003,7 @@ const resultsUrl = await escrowClient.getResultsUrl('0x62dD51230A30401C455c8398d
 
 #### Defined in
 
-[escrow.ts:1205](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1205)
+[escrow.ts:1205](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1205)
 
 ***
 
@@ -1043,7 +1043,7 @@ const status = await escrowClient.getStatus('0x62dD51230A30401C455c8398d06F85e4E
 
 #### Defined in
 
-[escrow.ts:1319](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1319)
+[escrow.ts:1319](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1319)
 
 ***
 
@@ -1083,7 +1083,7 @@ const tokenAddress = await escrowClient.getTokenAddress('0x62dD51230A30401C455c8
 
 #### Defined in
 
-[escrow.ts:1281](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1281)
+[escrow.ts:1281](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1281)
 
 ***
 
@@ -1150,7 +1150,7 @@ await escrowClient.setup(escrowAddress, escrowConfig);
 
 #### Defined in
 
-[escrow.ts:304](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L304)
+[escrow.ts:304](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L304)
 
 ***
 
@@ -1212,7 +1212,7 @@ await escrowClient.storeResults('0x62dD51230A30401C455c8398d06F85e4EaB6309f', 'h
 
 #### Defined in
 
-[escrow.ts:479](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L479)
+[escrow.ts:479](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L479)
 
 ***
 
@@ -1271,7 +1271,7 @@ await escrowClient.withdraw(
 
 #### Defined in
 
-[escrow.ts:837](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L837)
+[escrow.ts:837](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L837)
 
 ***
 
@@ -1305,4 +1305,4 @@ Thrown if the network's chainId is not supported
 
 #### Defined in
 
-[escrow.ts:161](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L161)
+[escrow.ts:161](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L161)
diff --git a/docs/sdk/typescript/escrow/classes/EscrowUtils.md b/docs/sdk/typescript/escrow/classes/EscrowUtils.md
index 5fdb6dca3d..3893d00b9e 100644
--- a/docs/sdk/typescript/escrow/classes/EscrowUtils.md
+++ b/docs/sdk/typescript/escrow/classes/EscrowUtils.md
@@ -125,7 +125,7 @@ const escrowData = new EscrowUtils.getEscrow(ChainId.POLYGON_AMOY, "0x1234567890
 
 #### Defined in
 
-[escrow.ts:1773](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1773)
+[escrow.ts:1773](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1773)
 
 ***
 
@@ -239,7 +239,7 @@ const escrowDatas = await EscrowUtils.getEscrows(filters);
 
 #### Defined in
 
-[escrow.ts:1655](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1655)
+[escrow.ts:1655](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1655)
 
 ***
 
@@ -357,4 +357,4 @@ import { ChainId, EscrowUtils, EscrowStatus } from '@human-protocol/sdk';
 
 #### Defined in
 
-[escrow.ts:1860](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1860)
+[escrow.ts:1860](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts#L1860)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/DailyEscrowData.md b/docs/sdk/typescript/graphql/types/type-aliases/DailyEscrowData.md
index 1bee222dcb..03b3b60023 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/DailyEscrowData.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/DailyEscrowData.md
@@ -36,4 +36,4 @@
 
 ## Defined in
 
-[graphql/types.ts:83](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L83)
+[graphql/types.ts:83](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L83)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/DailyHMTData.md b/docs/sdk/typescript/graphql/types/type-aliases/DailyHMTData.md
index 2e24513369..e35fe81535 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/DailyHMTData.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/DailyHMTData.md
@@ -32,4 +32,4 @@
 
 ## Defined in
 
-[graphql/types.ts:127](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L127)
+[graphql/types.ts:127](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L127)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/DailyPaymentData.md b/docs/sdk/typescript/graphql/types/type-aliases/DailyPaymentData.md
index 62188f64ba..a4918ee4c9 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/DailyPaymentData.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/DailyPaymentData.md
@@ -28,4 +28,4 @@
 
 ## Defined in
 
-[graphql/types.ts:106](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L106)
+[graphql/types.ts:106](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L106)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/DailyTaskData.md b/docs/sdk/typescript/graphql/types/type-aliases/DailyTaskData.md
index dd55e33f88..8a28061766 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/DailyTaskData.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/DailyTaskData.md
@@ -24,4 +24,4 @@
 
 ## Defined in
 
-[graphql/types.ts:148](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L148)
+[graphql/types.ts:148](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L148)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/DailyWorkerData.md b/docs/sdk/typescript/graphql/types/type-aliases/DailyWorkerData.md
index 90200e4136..e2ec52c873 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/DailyWorkerData.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/DailyWorkerData.md
@@ -20,4 +20,4 @@
 
 ## Defined in
 
-[graphql/types.ts:97](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L97)
+[graphql/types.ts:97](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L97)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/EscrowData.md b/docs/sdk/typescript/graphql/types/type-aliases/EscrowData.md
index 79fd7ec883..43b65782b0 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/EscrowData.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/EscrowData.md
@@ -88,4 +88,4 @@
 
 ## Defined in
 
-[graphql/types.ts:3](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L3)
+[graphql/types.ts:3](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L3)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/EscrowStatistics.md b/docs/sdk/typescript/graphql/types/type-aliases/EscrowStatistics.md
index 720304b7f5..577db99331 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/EscrowStatistics.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/EscrowStatistics.md
@@ -20,4 +20,4 @@
 
 ## Defined in
 
-[graphql/types.ts:92](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L92)
+[graphql/types.ts:92](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L92)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/EscrowStatisticsData.md b/docs/sdk/typescript/graphql/types/type-aliases/EscrowStatisticsData.md
index ba97638549..835c5e7d0f 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/EscrowStatisticsData.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/EscrowStatisticsData.md
@@ -52,4 +52,4 @@
 
 ## Defined in
 
-[graphql/types.ts:42](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L42)
+[graphql/types.ts:42](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L42)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/EventDayData.md b/docs/sdk/typescript/graphql/types/type-aliases/EventDayData.md
index 97b39ca723..a0e78761dd 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/EventDayData.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/EventDayData.md
@@ -84,4 +84,4 @@
 
 ## Defined in
 
-[graphql/types.ts:55](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L55)
+[graphql/types.ts:55](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L55)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/HMTHolder.md b/docs/sdk/typescript/graphql/types/type-aliases/HMTHolder.md
index 6e48e613f5..fbf56d94e5 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/HMTHolder.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/HMTHolder.md
@@ -20,4 +20,4 @@
 
 ## Defined in
 
-[graphql/types.ts:122](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L122)
+[graphql/types.ts:122](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L122)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/HMTHolderData.md b/docs/sdk/typescript/graphql/types/type-aliases/HMTHolderData.md
index 7f25b4adcb..8f40153e52 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/HMTHolderData.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/HMTHolderData.md
@@ -20,4 +20,4 @@
 
 ## Defined in
 
-[graphql/types.ts:117](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L117)
+[graphql/types.ts:117](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L117)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/HMTStatistics.md b/docs/sdk/typescript/graphql/types/type-aliases/HMTStatistics.md
index 33ce898338..e74b7ce592 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/HMTStatistics.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/HMTStatistics.md
@@ -24,4 +24,4 @@
 
 ## Defined in
 
-[graphql/types.ts:135](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L135)
+[graphql/types.ts:135](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L135)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/HMTStatisticsData.md b/docs/sdk/typescript/graphql/types/type-aliases/HMTStatisticsData.md
index b46e10d969..9f8a624494 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/HMTStatisticsData.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/HMTStatisticsData.md
@@ -36,4 +36,4 @@
 
 ## Defined in
 
-[graphql/types.ts:33](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L33)
+[graphql/types.ts:33](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L33)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/IMData.md b/docs/sdk/typescript/graphql/types/type-aliases/IMData.md
index b9433eca18..2821bb1fb8 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/IMData.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/IMData.md
@@ -10,4 +10,4 @@
 
 ## Defined in
 
-[graphql/types.ts:146](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L146)
+[graphql/types.ts:146](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L146)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/IMDataEntity.md b/docs/sdk/typescript/graphql/types/type-aliases/IMDataEntity.md
index 328d47a8e1..2b79e36d91 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/IMDataEntity.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/IMDataEntity.md
@@ -20,4 +20,4 @@
 
 ## Defined in
 
-[graphql/types.ts:141](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L141)
+[graphql/types.ts:141](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L141)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/KVStoreData.md b/docs/sdk/typescript/graphql/types/type-aliases/KVStoreData.md
index 609bef90c1..e05007b07a 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/KVStoreData.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/KVStoreData.md
@@ -36,4 +36,4 @@
 
 ## Defined in
 
-[graphql/types.ts:165](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L165)
+[graphql/types.ts:165](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L165)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/PaymentStatistics.md b/docs/sdk/typescript/graphql/types/type-aliases/PaymentStatistics.md
index 1f726ff2f9..0f487ec610 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/PaymentStatistics.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/PaymentStatistics.md
@@ -16,4 +16,4 @@
 
 ## Defined in
 
-[graphql/types.ts:113](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L113)
+[graphql/types.ts:113](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L113)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/PayoutData.md b/docs/sdk/typescript/graphql/types/type-aliases/PayoutData.md
index 4138004eef..776a20f9d1 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/PayoutData.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/PayoutData.md
@@ -32,4 +32,4 @@
 
 ## Defined in
 
-[graphql/types.ts:25](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L25)
+[graphql/types.ts:25](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L25)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/RewardAddedEventData.md b/docs/sdk/typescript/graphql/types/type-aliases/RewardAddedEventData.md
index f6da861c19..4650dc235f 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/RewardAddedEventData.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/RewardAddedEventData.md
@@ -28,4 +28,4 @@
 
 ## Defined in
 
-[graphql/types.ts:76](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L76)
+[graphql/types.ts:76](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L76)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/StatusEvent.md b/docs/sdk/typescript/graphql/types/type-aliases/StatusEvent.md
index b871873bd5..b1f671dee5 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/StatusEvent.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/StatusEvent.md
@@ -28,4 +28,4 @@
 
 ## Defined in
 
-[graphql/types.ts:158](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L158)
+[graphql/types.ts:158](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L158)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/TaskStatistics.md b/docs/sdk/typescript/graphql/types/type-aliases/TaskStatistics.md
index 0dcca95e06..b67df1577f 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/TaskStatistics.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/TaskStatistics.md
@@ -16,4 +16,4 @@
 
 ## Defined in
 
-[graphql/types.ts:154](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L154)
+[graphql/types.ts:154](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L154)
diff --git a/docs/sdk/typescript/graphql/types/type-aliases/WorkerStatistics.md b/docs/sdk/typescript/graphql/types/type-aliases/WorkerStatistics.md
index 905799afb5..3c3db6091b 100644
--- a/docs/sdk/typescript/graphql/types/type-aliases/WorkerStatistics.md
+++ b/docs/sdk/typescript/graphql/types/type-aliases/WorkerStatistics.md
@@ -16,4 +16,4 @@
 
 ## Defined in
 
-[graphql/types.ts:102](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L102)
+[graphql/types.ts:102](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/graphql/types.ts#L102)
diff --git a/docs/sdk/typescript/interfaces/interfaces/IEscrowConfig.md b/docs/sdk/typescript/interfaces/interfaces/IEscrowConfig.md
index 5c9c7dbd44..bcc0f28edb 100644
--- a/docs/sdk/typescript/interfaces/interfaces/IEscrowConfig.md
+++ b/docs/sdk/typescript/interfaces/interfaces/IEscrowConfig.md
@@ -14,7 +14,7 @@
 
 #### Defined in
 
-[interfaces.ts:86](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L86)
+[interfaces.ts:86](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L86)
 
 ***
 
@@ -24,7 +24,7 @@
 
 #### Defined in
 
-[interfaces.ts:89](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L89)
+[interfaces.ts:89](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L89)
 
 ***
 
@@ -34,7 +34,7 @@
 
 #### Defined in
 
-[interfaces.ts:91](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L91)
+[interfaces.ts:91](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L91)
 
 ***
 
@@ -44,7 +44,7 @@
 
 #### Defined in
 
-[interfaces.ts:90](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L90)
+[interfaces.ts:90](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L90)
 
 ***
 
@@ -54,7 +54,7 @@
 
 #### Defined in
 
-[interfaces.ts:84](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L84)
+[interfaces.ts:84](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L84)
 
 ***
 
@@ -64,7 +64,7 @@
 
 #### Defined in
 
-[interfaces.ts:87](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L87)
+[interfaces.ts:87](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L87)
 
 ***
 
@@ -74,7 +74,7 @@
 
 #### Defined in
 
-[interfaces.ts:85](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L85)
+[interfaces.ts:85](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L85)
 
 ***
 
@@ -84,4 +84,4 @@
 
 #### Defined in
 
-[interfaces.ts:88](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L88)
+[interfaces.ts:88](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L88)
diff --git a/docs/sdk/typescript/interfaces/interfaces/IEscrowsFilter.md b/docs/sdk/typescript/interfaces/interfaces/IEscrowsFilter.md
index 7bc0dcd8f8..c3e2f92732 100644
--- a/docs/sdk/typescript/interfaces/interfaces/IEscrowsFilter.md
+++ b/docs/sdk/typescript/interfaces/interfaces/IEscrowsFilter.md
@@ -18,7 +18,7 @@
 
 #### Defined in
 
-[interfaces.ts:80](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L80)
+[interfaces.ts:80](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L80)
 
 ***
 
@@ -28,7 +28,7 @@
 
 #### Defined in
 
-[interfaces.ts:75](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L75)
+[interfaces.ts:75](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L75)
 
 ***
 
@@ -42,7 +42,7 @@
 
 #### Defined in
 
-[interfaces.ts:157](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L157)
+[interfaces.ts:157](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L157)
 
 ***
 
@@ -52,7 +52,7 @@
 
 #### Defined in
 
-[interfaces.ts:78](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L78)
+[interfaces.ts:78](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L78)
 
 ***
 
@@ -62,7 +62,7 @@
 
 #### Defined in
 
-[interfaces.ts:76](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L76)
+[interfaces.ts:76](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L76)
 
 ***
 
@@ -72,7 +72,7 @@
 
 #### Defined in
 
-[interfaces.ts:72](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L72)
+[interfaces.ts:72](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L72)
 
 ***
 
@@ -86,7 +86,7 @@
 
 #### Defined in
 
-[interfaces.ts:159](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L159)
+[interfaces.ts:159](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L159)
 
 ***
 
@@ -96,7 +96,7 @@
 
 #### Defined in
 
-[interfaces.ts:74](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L74)
+[interfaces.ts:74](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L74)
 
 ***
 
@@ -106,7 +106,7 @@
 
 #### Defined in
 
-[interfaces.ts:73](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L73)
+[interfaces.ts:73](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L73)
 
 ***
 
@@ -120,7 +120,7 @@
 
 #### Defined in
 
-[interfaces.ts:158](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L158)
+[interfaces.ts:158](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L158)
 
 ***
 
@@ -130,7 +130,7 @@
 
 #### Defined in
 
-[interfaces.ts:77](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L77)
+[interfaces.ts:77](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L77)
 
 ***
 
@@ -140,4 +140,4 @@
 
 #### Defined in
 
-[interfaces.ts:79](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L79)
+[interfaces.ts:79](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L79)
diff --git a/docs/sdk/typescript/interfaces/interfaces/IHMTHoldersParams.md b/docs/sdk/typescript/interfaces/interfaces/IHMTHoldersParams.md
index d1ddb2de19..87ac94c4da 100644
--- a/docs/sdk/typescript/interfaces/interfaces/IHMTHoldersParams.md
+++ b/docs/sdk/typescript/interfaces/interfaces/IHMTHoldersParams.md
@@ -18,7 +18,7 @@
 
 #### Defined in
 
-[interfaces.ts:107](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L107)
+[interfaces.ts:107](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L107)
 
 ***
 
@@ -32,7 +32,7 @@
 
 #### Defined in
 
-[interfaces.ts:157](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L157)
+[interfaces.ts:157](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L157)
 
 ***
 
@@ -46,7 +46,7 @@
 
 #### Defined in
 
-[interfaces.ts:159](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L159)
+[interfaces.ts:159](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L159)
 
 ***
 
@@ -60,4 +60,4 @@
 
 #### Defined in
 
-[interfaces.ts:158](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L158)
+[interfaces.ts:158](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L158)
diff --git a/docs/sdk/typescript/interfaces/interfaces/IKVStore.md b/docs/sdk/typescript/interfaces/interfaces/IKVStore.md
index e61f6e8db1..d3db4b5d0a 100644
--- a/docs/sdk/typescript/interfaces/interfaces/IKVStore.md
+++ b/docs/sdk/typescript/interfaces/interfaces/IKVStore.md
@@ -14,7 +14,7 @@
 
 #### Defined in
 
-[interfaces.ts:118](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L118)
+[interfaces.ts:118](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L118)
 
 ***
 
@@ -24,4 +24,4 @@
 
 #### Defined in
 
-[interfaces.ts:119](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L119)
+[interfaces.ts:119](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L119)
diff --git a/docs/sdk/typescript/interfaces/interfaces/IKeyPair.md b/docs/sdk/typescript/interfaces/interfaces/IKeyPair.md
index 1bec3a4542..3c6aade6bb 100644
--- a/docs/sdk/typescript/interfaces/interfaces/IKeyPair.md
+++ b/docs/sdk/typescript/interfaces/interfaces/IKeyPair.md
@@ -14,7 +14,7 @@
 
 #### Defined in
 
-[interfaces.ts:97](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L97)
+[interfaces.ts:97](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L97)
 
 ***
 
@@ -24,7 +24,7 @@
 
 #### Defined in
 
-[interfaces.ts:95](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L95)
+[interfaces.ts:95](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L95)
 
 ***
 
@@ -34,7 +34,7 @@
 
 #### Defined in
 
-[interfaces.ts:96](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L96)
+[interfaces.ts:96](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L96)
 
 ***
 
@@ -44,4 +44,4 @@
 
 #### Defined in
 
-[interfaces.ts:98](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L98)
+[interfaces.ts:98](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L98)
diff --git a/docs/sdk/typescript/interfaces/interfaces/ILeader.md b/docs/sdk/typescript/interfaces/interfaces/ILeader.md
index 0e5a493122..a83e5c8d3a 100644
--- a/docs/sdk/typescript/interfaces/interfaces/ILeader.md
+++ b/docs/sdk/typescript/interfaces/interfaces/ILeader.md
@@ -14,7 +14,7 @@
 
 #### Defined in
 
-[interfaces.ts:12](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L12)
+[interfaces.ts:12](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L12)
 
 ***
 
@@ -24,7 +24,7 @@
 
 #### Defined in
 
-[interfaces.ts:19](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L19)
+[interfaces.ts:19](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L19)
 
 ***
 
@@ -34,7 +34,7 @@
 
 #### Defined in
 
-[interfaces.ts:14](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L14)
+[interfaces.ts:14](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L14)
 
 ***
 
@@ -44,7 +44,7 @@
 
 #### Defined in
 
-[interfaces.ts:17](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L17)
+[interfaces.ts:17](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L17)
 
 ***
 
@@ -54,7 +54,7 @@
 
 #### Defined in
 
-[interfaces.ts:13](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L13)
+[interfaces.ts:13](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L13)
 
 ***
 
@@ -64,7 +64,7 @@
 
 #### Defined in
 
-[interfaces.ts:16](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L16)
+[interfaces.ts:16](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L16)
 
 ***
 
@@ -74,7 +74,7 @@
 
 #### Defined in
 
-[interfaces.ts:31](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L31)
+[interfaces.ts:31](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L31)
 
 ***
 
@@ -84,7 +84,7 @@
 
 #### Defined in
 
-[interfaces.ts:11](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L11)
+[interfaces.ts:11](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L11)
 
 ***
 
@@ -94,7 +94,7 @@
 
 #### Defined in
 
-[interfaces.ts:21](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L21)
+[interfaces.ts:21](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L21)
 
 ***
 
@@ -104,7 +104,7 @@
 
 #### Defined in
 
-[interfaces.ts:10](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L10)
+[interfaces.ts:10](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L10)
 
 ***
 
@@ -114,7 +114,7 @@
 
 #### Defined in
 
-[interfaces.ts:26](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L26)
+[interfaces.ts:26](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L26)
 
 ***
 
@@ -124,7 +124,7 @@
 
 #### Defined in
 
-[interfaces.ts:15](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L15)
+[interfaces.ts:15](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L15)
 
 ***
 
@@ -134,7 +134,7 @@
 
 #### Defined in
 
-[interfaces.ts:30](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L30)
+[interfaces.ts:30](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L30)
 
 ***
 
@@ -144,7 +144,7 @@
 
 #### Defined in
 
-[interfaces.ts:22](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L22)
+[interfaces.ts:22](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L22)
 
 ***
 
@@ -154,7 +154,7 @@
 
 #### Defined in
 
-[interfaces.ts:28](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L28)
+[interfaces.ts:28](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L28)
 
 ***
 
@@ -164,7 +164,7 @@
 
 #### Defined in
 
-[interfaces.ts:27](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L27)
+[interfaces.ts:27](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L27)
 
 ***
 
@@ -174,7 +174,7 @@
 
 #### Defined in
 
-[interfaces.ts:29](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L29)
+[interfaces.ts:29](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L29)
 
 ***
 
@@ -184,7 +184,7 @@
 
 #### Defined in
 
-[interfaces.ts:18](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L18)
+[interfaces.ts:18](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L18)
 
 ***
 
@@ -194,7 +194,7 @@
 
 #### Defined in
 
-[interfaces.ts:20](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L20)
+[interfaces.ts:20](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L20)
 
 ***
 
@@ -204,7 +204,7 @@
 
 #### Defined in
 
-[interfaces.ts:25](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L25)
+[interfaces.ts:25](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L25)
 
 ***
 
@@ -214,7 +214,7 @@
 
 #### Defined in
 
-[interfaces.ts:23](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L23)
+[interfaces.ts:23](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L23)
 
 ***
 
@@ -224,4 +224,4 @@
 
 #### Defined in
 
-[interfaces.ts:24](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L24)
+[interfaces.ts:24](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L24)
diff --git a/docs/sdk/typescript/interfaces/interfaces/ILeaderSubgraph.md b/docs/sdk/typescript/interfaces/interfaces/ILeaderSubgraph.md
index c26b7dd7ef..612304ecfc 100644
--- a/docs/sdk/typescript/interfaces/interfaces/ILeaderSubgraph.md
+++ b/docs/sdk/typescript/interfaces/interfaces/ILeaderSubgraph.md
@@ -22,7 +22,7 @@
 
 #### Defined in
 
-[interfaces.ts:12](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L12)
+[interfaces.ts:12](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L12)
 
 ***
 
@@ -36,7 +36,7 @@
 
 #### Defined in
 
-[interfaces.ts:19](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L19)
+[interfaces.ts:19](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L19)
 
 ***
 
@@ -50,7 +50,7 @@
 
 #### Defined in
 
-[interfaces.ts:14](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L14)
+[interfaces.ts:14](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L14)
 
 ***
 
@@ -64,7 +64,7 @@
 
 #### Defined in
 
-[interfaces.ts:17](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L17)
+[interfaces.ts:17](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L17)
 
 ***
 
@@ -78,7 +78,7 @@
 
 #### Defined in
 
-[interfaces.ts:13](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L13)
+[interfaces.ts:13](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L13)
 
 ***
 
@@ -92,7 +92,7 @@
 
 #### Defined in
 
-[interfaces.ts:16](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L16)
+[interfaces.ts:16](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L16)
 
 ***
 
@@ -106,7 +106,7 @@
 
 #### Defined in
 
-[interfaces.ts:31](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L31)
+[interfaces.ts:31](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L31)
 
 ***
 
@@ -120,7 +120,7 @@
 
 #### Defined in
 
-[interfaces.ts:21](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L21)
+[interfaces.ts:21](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L21)
 
 ***
 
@@ -134,7 +134,7 @@
 
 #### Defined in
 
-[interfaces.ts:10](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L10)
+[interfaces.ts:10](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L10)
 
 ***
 
@@ -144,7 +144,7 @@
 
 #### Defined in
 
-[interfaces.ts:36](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L36)
+[interfaces.ts:36](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L36)
 
 ***
 
@@ -158,7 +158,7 @@
 
 #### Defined in
 
-[interfaces.ts:15](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L15)
+[interfaces.ts:15](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L15)
 
 ***
 
@@ -172,7 +172,7 @@
 
 #### Defined in
 
-[interfaces.ts:30](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L30)
+[interfaces.ts:30](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L30)
 
 ***
 
@@ -186,7 +186,7 @@
 
 #### Defined in
 
-[interfaces.ts:22](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L22)
+[interfaces.ts:22](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L22)
 
 ***
 
@@ -200,7 +200,7 @@
 
 #### Defined in
 
-[interfaces.ts:28](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L28)
+[interfaces.ts:28](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L28)
 
 ***
 
@@ -214,7 +214,7 @@
 
 #### Defined in
 
-[interfaces.ts:27](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L27)
+[interfaces.ts:27](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L27)
 
 ***
 
@@ -224,7 +224,7 @@
 
 #### Defined in
 
-[interfaces.ts:37](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L37)
+[interfaces.ts:37](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L37)
 
 ***
 
@@ -238,7 +238,7 @@
 
 #### Defined in
 
-[interfaces.ts:18](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L18)
+[interfaces.ts:18](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L18)
 
 ***
 
@@ -252,7 +252,7 @@
 
 #### Defined in
 
-[interfaces.ts:20](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L20)
+[interfaces.ts:20](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L20)
 
 ***
 
@@ -266,7 +266,7 @@
 
 #### Defined in
 
-[interfaces.ts:25](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L25)
+[interfaces.ts:25](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L25)
 
 ***
 
@@ -280,7 +280,7 @@
 
 #### Defined in
 
-[interfaces.ts:23](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L23)
+[interfaces.ts:23](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L23)
 
 ***
 
@@ -294,4 +294,4 @@
 
 #### Defined in
 
-[interfaces.ts:24](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L24)
+[interfaces.ts:24](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L24)
diff --git a/docs/sdk/typescript/interfaces/interfaces/ILeadersFilter.md b/docs/sdk/typescript/interfaces/interfaces/ILeadersFilter.md
index 8831bc95d0..11a96b4695 100644
--- a/docs/sdk/typescript/interfaces/interfaces/ILeadersFilter.md
+++ b/docs/sdk/typescript/interfaces/interfaces/ILeadersFilter.md
@@ -18,7 +18,7 @@
 
 #### Defined in
 
-[interfaces.ts:41](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L41)
+[interfaces.ts:41](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L41)
 
 ***
 
@@ -32,7 +32,7 @@
 
 #### Defined in
 
-[interfaces.ts:157](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L157)
+[interfaces.ts:157](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L157)
 
 ***
 
@@ -42,7 +42,7 @@
 
 #### Defined in
 
-[interfaces.ts:43](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L43)
+[interfaces.ts:43](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L43)
 
 ***
 
@@ -52,7 +52,7 @@
 
 #### Defined in
 
-[interfaces.ts:44](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L44)
+[interfaces.ts:44](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L44)
 
 ***
 
@@ -66,7 +66,7 @@
 
 #### Defined in
 
-[interfaces.ts:159](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L159)
+[interfaces.ts:159](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L159)
 
 ***
 
@@ -76,7 +76,7 @@
 
 #### Defined in
 
-[interfaces.ts:42](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L42)
+[interfaces.ts:42](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L42)
 
 ***
 
@@ -90,4 +90,4 @@
 
 #### Defined in
 
-[interfaces.ts:158](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L158)
+[interfaces.ts:158](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L158)
diff --git a/docs/sdk/typescript/interfaces/interfaces/IOperator.md b/docs/sdk/typescript/interfaces/interfaces/IOperator.md
index 8f0a2138fe..ef585bcb1f 100644
--- a/docs/sdk/typescript/interfaces/interfaces/IOperator.md
+++ b/docs/sdk/typescript/interfaces/interfaces/IOperator.md
@@ -14,7 +14,7 @@
 
 #### Defined in
 
-[interfaces.ts:59](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L59)
+[interfaces.ts:59](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L59)
 
 ***
 
@@ -24,7 +24,7 @@
 
 #### Defined in
 
-[interfaces.ts:62](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L62)
+[interfaces.ts:62](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L62)
 
 ***
 
@@ -34,7 +34,7 @@
 
 #### Defined in
 
-[interfaces.ts:64](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L64)
+[interfaces.ts:64](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L64)
 
 ***
 
@@ -44,7 +44,7 @@
 
 #### Defined in
 
-[interfaces.ts:63](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L63)
+[interfaces.ts:63](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L63)
 
 ***
 
@@ -54,7 +54,7 @@
 
 #### Defined in
 
-[interfaces.ts:60](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L60)
+[interfaces.ts:60](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L60)
 
 ***
 
@@ -64,4 +64,4 @@
 
 #### Defined in
 
-[interfaces.ts:61](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L61)
+[interfaces.ts:61](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L61)
diff --git a/docs/sdk/typescript/interfaces/interfaces/IOperatorSubgraph.md b/docs/sdk/typescript/interfaces/interfaces/IOperatorSubgraph.md
index 95b8787b77..33e2c9d4e7 100644
--- a/docs/sdk/typescript/interfaces/interfaces/IOperatorSubgraph.md
+++ b/docs/sdk/typescript/interfaces/interfaces/IOperatorSubgraph.md
@@ -22,7 +22,7 @@
 
 #### Defined in
 
-[interfaces.ts:59](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L59)
+[interfaces.ts:59](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L59)
 
 ***
 
@@ -32,7 +32,7 @@
 
 #### Defined in
 
-[interfaces.ts:68](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L68)
+[interfaces.ts:68](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L68)
 
 ***
 
@@ -46,7 +46,7 @@
 
 #### Defined in
 
-[interfaces.ts:64](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L64)
+[interfaces.ts:64](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L64)
 
 ***
 
@@ -60,7 +60,7 @@
 
 #### Defined in
 
-[interfaces.ts:63](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L63)
+[interfaces.ts:63](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L63)
 
 ***
 
@@ -74,7 +74,7 @@
 
 #### Defined in
 
-[interfaces.ts:60](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L60)
+[interfaces.ts:60](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L60)
 
 ***
 
@@ -88,4 +88,4 @@
 
 #### Defined in
 
-[interfaces.ts:61](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L61)
+[interfaces.ts:61](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L61)
diff --git a/docs/sdk/typescript/interfaces/interfaces/IPagination.md b/docs/sdk/typescript/interfaces/interfaces/IPagination.md
index b86ac64880..55ce72b6f2 100644
--- a/docs/sdk/typescript/interfaces/interfaces/IPagination.md
+++ b/docs/sdk/typescript/interfaces/interfaces/IPagination.md
@@ -22,7 +22,7 @@
 
 #### Defined in
 
-[interfaces.ts:157](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L157)
+[interfaces.ts:157](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L157)
 
 ***
 
@@ -32,7 +32,7 @@
 
 #### Defined in
 
-[interfaces.ts:159](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L159)
+[interfaces.ts:159](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L159)
 
 ***
 
@@ -42,4 +42,4 @@
 
 #### Defined in
 
-[interfaces.ts:158](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L158)
+[interfaces.ts:158](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L158)
diff --git a/docs/sdk/typescript/interfaces/interfaces/IPayoutFilter.md b/docs/sdk/typescript/interfaces/interfaces/IPayoutFilter.md
index a15b6da6ec..51d87cff71 100644
--- a/docs/sdk/typescript/interfaces/interfaces/IPayoutFilter.md
+++ b/docs/sdk/typescript/interfaces/interfaces/IPayoutFilter.md
@@ -14,7 +14,7 @@
 
 #### Defined in
 
-[interfaces.ts:111](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L111)
+[interfaces.ts:111](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L111)
 
 ***
 
@@ -24,7 +24,7 @@
 
 #### Defined in
 
-[interfaces.ts:113](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L113)
+[interfaces.ts:113](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L113)
 
 ***
 
@@ -34,7 +34,7 @@
 
 #### Defined in
 
-[interfaces.ts:112](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L112)
+[interfaces.ts:112](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L112)
 
 ***
 
@@ -44,4 +44,4 @@
 
 #### Defined in
 
-[interfaces.ts:114](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L114)
+[interfaces.ts:114](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L114)
diff --git a/docs/sdk/typescript/interfaces/interfaces/IReputationNetwork.md b/docs/sdk/typescript/interfaces/interfaces/IReputationNetwork.md
index 96d7a7c321..47ecf4acf2 100644
--- a/docs/sdk/typescript/interfaces/interfaces/IReputationNetwork.md
+++ b/docs/sdk/typescript/interfaces/interfaces/IReputationNetwork.md
@@ -14,7 +14,7 @@
 
 #### Defined in
 
-[interfaces.ts:49](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L49)
+[interfaces.ts:49](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L49)
 
 ***
 
@@ -24,7 +24,7 @@
 
 #### Defined in
 
-[interfaces.ts:48](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L48)
+[interfaces.ts:48](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L48)
 
 ***
 
@@ -34,4 +34,4 @@
 
 #### Defined in
 
-[interfaces.ts:50](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L50)
+[interfaces.ts:50](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L50)
diff --git a/docs/sdk/typescript/interfaces/interfaces/IReputationNetworkSubgraph.md b/docs/sdk/typescript/interfaces/interfaces/IReputationNetworkSubgraph.md
index 5b8bb90174..b25744c18b 100644
--- a/docs/sdk/typescript/interfaces/interfaces/IReputationNetworkSubgraph.md
+++ b/docs/sdk/typescript/interfaces/interfaces/IReputationNetworkSubgraph.md
@@ -22,7 +22,7 @@
 
 #### Defined in
 
-[interfaces.ts:49](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L49)
+[interfaces.ts:49](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L49)
 
 ***
 
@@ -36,7 +36,7 @@
 
 #### Defined in
 
-[interfaces.ts:48](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L48)
+[interfaces.ts:48](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L48)
 
 ***
 
@@ -46,4 +46,4 @@
 
 #### Defined in
 
-[interfaces.ts:55](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L55)
+[interfaces.ts:55](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L55)
diff --git a/docs/sdk/typescript/interfaces/interfaces/IReward.md b/docs/sdk/typescript/interfaces/interfaces/IReward.md
index a4a4433af8..aeb5c6a527 100644
--- a/docs/sdk/typescript/interfaces/interfaces/IReward.md
+++ b/docs/sdk/typescript/interfaces/interfaces/IReward.md
@@ -14,7 +14,7 @@
 
 #### Defined in
 
-[interfaces.ts:6](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L6)
+[interfaces.ts:6](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L6)
 
 ***
 
@@ -24,4 +24,4 @@
 
 #### Defined in
 
-[interfaces.ts:5](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L5)
+[interfaces.ts:5](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L5)
diff --git a/docs/sdk/typescript/interfaces/interfaces/IStatisticsFilter.md b/docs/sdk/typescript/interfaces/interfaces/IStatisticsFilter.md
index b70dc5b1c1..a462d7580e 100644
--- a/docs/sdk/typescript/interfaces/interfaces/IStatisticsFilter.md
+++ b/docs/sdk/typescript/interfaces/interfaces/IStatisticsFilter.md
@@ -22,7 +22,7 @@
 
 #### Defined in
 
-[interfaces.ts:157](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L157)
+[interfaces.ts:157](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L157)
 
 ***
 
@@ -32,7 +32,7 @@
 
 #### Defined in
 
-[interfaces.ts:102](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L102)
+[interfaces.ts:102](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L102)
 
 ***
 
@@ -46,7 +46,7 @@
 
 #### Defined in
 
-[interfaces.ts:159](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L159)
+[interfaces.ts:159](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L159)
 
 ***
 
@@ -60,7 +60,7 @@
 
 #### Defined in
 
-[interfaces.ts:158](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L158)
+[interfaces.ts:158](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L158)
 
 ***
 
@@ -70,4 +70,4 @@
 
 #### Defined in
 
-[interfaces.ts:103](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L103)
+[interfaces.ts:103](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L103)
diff --git a/docs/sdk/typescript/interfaces/interfaces/ITransaction.md b/docs/sdk/typescript/interfaces/interfaces/ITransaction.md
index a9d9a12827..3056caaf81 100644
--- a/docs/sdk/typescript/interfaces/interfaces/ITransaction.md
+++ b/docs/sdk/typescript/interfaces/interfaces/ITransaction.md
@@ -14,7 +14,7 @@
 
 #### Defined in
 
-[interfaces.ts:133](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L133)
+[interfaces.ts:133](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L133)
 
 ***
 
@@ -24,7 +24,7 @@
 
 #### Defined in
 
-[interfaces.ts:141](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L141)
+[interfaces.ts:141](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L141)
 
 ***
 
@@ -34,7 +34,7 @@
 
 #### Defined in
 
-[interfaces.ts:135](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L135)
+[interfaces.ts:135](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L135)
 
 ***
 
@@ -44,7 +44,7 @@
 
 #### Defined in
 
-[interfaces.ts:143](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L143)
+[interfaces.ts:143](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L143)
 
 ***
 
@@ -54,7 +54,7 @@
 
 #### Defined in
 
-[interfaces.ts:139](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L139)
+[interfaces.ts:139](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L139)
 
 ***
 
@@ -64,7 +64,7 @@
 
 #### Defined in
 
-[interfaces.ts:140](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L140)
+[interfaces.ts:140](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L140)
 
 ***
 
@@ -74,7 +74,7 @@
 
 #### Defined in
 
-[interfaces.ts:137](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L137)
+[interfaces.ts:137](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L137)
 
 ***
 
@@ -84,7 +84,7 @@
 
 #### Defined in
 
-[interfaces.ts:136](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L136)
+[interfaces.ts:136](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L136)
 
 ***
 
@@ -94,7 +94,7 @@
 
 #### Defined in
 
-[interfaces.ts:142](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L142)
+[interfaces.ts:142](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L142)
 
 ***
 
@@ -104,7 +104,7 @@
 
 #### Defined in
 
-[interfaces.ts:134](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L134)
+[interfaces.ts:134](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L134)
 
 ***
 
@@ -114,4 +114,4 @@
 
 #### Defined in
 
-[interfaces.ts:138](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L138)
+[interfaces.ts:138](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L138)
diff --git a/docs/sdk/typescript/interfaces/interfaces/ITransactionsFilter.md b/docs/sdk/typescript/interfaces/interfaces/ITransactionsFilter.md
index fd469183a8..97202e6e13 100644
--- a/docs/sdk/typescript/interfaces/interfaces/ITransactionsFilter.md
+++ b/docs/sdk/typescript/interfaces/interfaces/ITransactionsFilter.md
@@ -18,7 +18,7 @@
 
 #### Defined in
 
-[interfaces.ts:147](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L147)
+[interfaces.ts:147](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L147)
 
 ***
 
@@ -28,7 +28,7 @@
 
 #### Defined in
 
-[interfaces.ts:149](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L149)
+[interfaces.ts:149](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L149)
 
 ***
 
@@ -38,7 +38,7 @@
 
 #### Defined in
 
-[interfaces.ts:151](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L151)
+[interfaces.ts:151](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L151)
 
 ***
 
@@ -52,7 +52,7 @@
 
 #### Defined in
 
-[interfaces.ts:157](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L157)
+[interfaces.ts:157](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L157)
 
 ***
 
@@ -62,7 +62,7 @@
 
 #### Defined in
 
-[interfaces.ts:152](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L152)
+[interfaces.ts:152](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L152)
 
 ***
 
@@ -76,7 +76,7 @@
 
 #### Defined in
 
-[interfaces.ts:159](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L159)
+[interfaces.ts:159](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L159)
 
 ***
 
@@ -90,7 +90,7 @@
 
 #### Defined in
 
-[interfaces.ts:158](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L158)
+[interfaces.ts:158](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L158)
 
 ***
 
@@ -100,7 +100,7 @@
 
 #### Defined in
 
-[interfaces.ts:148](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L148)
+[interfaces.ts:148](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L148)
 
 ***
 
@@ -110,7 +110,7 @@
 
 #### Defined in
 
-[interfaces.ts:150](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L150)
+[interfaces.ts:150](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L150)
 
 ***
 
@@ -120,4 +120,4 @@
 
 #### Defined in
 
-[interfaces.ts:153](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L153)
+[interfaces.ts:153](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L153)
diff --git a/docs/sdk/typescript/interfaces/interfaces/InternalTransaction.md b/docs/sdk/typescript/interfaces/interfaces/InternalTransaction.md
index 83cb9b2491..da7814846f 100644
--- a/docs/sdk/typescript/interfaces/interfaces/InternalTransaction.md
+++ b/docs/sdk/typescript/interfaces/interfaces/InternalTransaction.md
@@ -14,7 +14,7 @@
 
 #### Defined in
 
-[interfaces.ts:128](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L128)
+[interfaces.ts:128](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L128)
 
 ***
 
@@ -24,7 +24,7 @@
 
 #### Defined in
 
-[interfaces.ts:123](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L123)
+[interfaces.ts:123](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L123)
 
 ***
 
@@ -34,7 +34,7 @@
 
 #### Defined in
 
-[interfaces.ts:126](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L126)
+[interfaces.ts:126](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L126)
 
 ***
 
@@ -44,7 +44,7 @@
 
 #### Defined in
 
-[interfaces.ts:127](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L127)
+[interfaces.ts:127](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L127)
 
 ***
 
@@ -54,7 +54,7 @@
 
 #### Defined in
 
-[interfaces.ts:124](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L124)
+[interfaces.ts:124](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L124)
 
 ***
 
@@ -64,7 +64,7 @@
 
 #### Defined in
 
-[interfaces.ts:129](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L129)
+[interfaces.ts:129](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L129)
 
 ***
 
@@ -74,4 +74,4 @@
 
 #### Defined in
 
-[interfaces.ts:125](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L125)
+[interfaces.ts:125](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L125)
diff --git a/docs/sdk/typescript/interfaces/interfaces/StakerInfo.md b/docs/sdk/typescript/interfaces/interfaces/StakerInfo.md
index a8c1d62a94..ec38c0ce6b 100644
--- a/docs/sdk/typescript/interfaces/interfaces/StakerInfo.md
+++ b/docs/sdk/typescript/interfaces/interfaces/StakerInfo.md
@@ -14,7 +14,7 @@
 
 #### Defined in
 
-[interfaces.ts:164](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L164)
+[interfaces.ts:164](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L164)
 
 ***
 
@@ -24,7 +24,7 @@
 
 #### Defined in
 
-[interfaces.ts:165](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L165)
+[interfaces.ts:165](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L165)
 
 ***
 
@@ -34,7 +34,7 @@
 
 #### Defined in
 
-[interfaces.ts:163](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L163)
+[interfaces.ts:163](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L163)
 
 ***
 
@@ -44,4 +44,4 @@
 
 #### Defined in
 
-[interfaces.ts:166](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L166)
+[interfaces.ts:166](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/interfaces.ts#L166)
diff --git a/docs/sdk/typescript/kvstore/classes/KVStoreClient.md b/docs/sdk/typescript/kvstore/classes/KVStoreClient.md
index c6cfd5ffaf..6d522d8429 100644
--- a/docs/sdk/typescript/kvstore/classes/KVStoreClient.md
+++ b/docs/sdk/typescript/kvstore/classes/KVStoreClient.md
@@ -110,7 +110,7 @@ The network information required to connect to the KVStore contract
 
 #### Defined in
 
-[kvstore.ts:108](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L108)
+[kvstore.ts:108](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L108)
 
 ## Properties
 
@@ -124,7 +124,7 @@ The network information required to connect to the KVStore contract
 
 #### Defined in
 
-[base.ts:12](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L12)
+[base.ts:12](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L12)
 
 ***
 
@@ -138,7 +138,7 @@ The network information required to connect to the KVStore contract
 
 #### Defined in
 
-[base.ts:11](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L11)
+[base.ts:11](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L11)
 
 ## Methods
 
@@ -194,7 +194,7 @@ await kvstoreClient.set('Role', 'RecordingOracle');
 
 #### Defined in
 
-[kvstore.ts:171](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L171)
+[kvstore.ts:171](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L171)
 
 ***
 
@@ -252,7 +252,7 @@ await kvstoreClient.setBulk(keys, values);
 
 #### Defined in
 
-[kvstore.ts:214](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L214)
+[kvstore.ts:214](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L214)
 
 ***
 
@@ -307,7 +307,7 @@ await kvstoreClient.setFileUrlAndHash('linkedin.com/example', 'linkedin_url');
 
 #### Defined in
 
-[kvstore.ts:257](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L257)
+[kvstore.ts:257](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L257)
 
 ***
 
@@ -341,4 +341,4 @@ The Runner object to interact with the Ethereum network
 
 #### Defined in
 
-[kvstore.ts:126](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L126)
+[kvstore.ts:126](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L126)
diff --git a/docs/sdk/typescript/kvstore/classes/KVStoreUtils.md b/docs/sdk/typescript/kvstore/classes/KVStoreUtils.md
index cf03ded001..76d682b060 100644
--- a/docs/sdk/typescript/kvstore/classes/KVStoreUtils.md
+++ b/docs/sdk/typescript/kvstore/classes/KVStoreUtils.md
@@ -108,7 +108,7 @@ console.log(value);
 
 #### Defined in
 
-[kvstore.ts:389](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L389)
+[kvstore.ts:389](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L389)
 
 ***
 
@@ -158,7 +158,7 @@ console.log(url);
 
 #### Defined in
 
-[kvstore.ts:436](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L436)
+[kvstore.ts:436](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L436)
 
 ***
 
@@ -207,7 +207,7 @@ console.log(kvStoreData);
 
 #### Defined in
 
-[kvstore.ts:337](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L337)
+[kvstore.ts:337](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L337)
 
 ***
 
@@ -251,4 +251,4 @@ console.log(publicKey);
 
 #### Defined in
 
-[kvstore.ts:496](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L496)
+[kvstore.ts:496](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/kvstore.ts#L496)
diff --git a/docs/sdk/typescript/operator/classes/OperatorUtils.md b/docs/sdk/typescript/operator/classes/OperatorUtils.md
index ecffc2025a..b35ff5016c 100644
--- a/docs/sdk/typescript/operator/classes/OperatorUtils.md
+++ b/docs/sdk/typescript/operator/classes/OperatorUtils.md
@@ -54,7 +54,7 @@ const leader = await OperatorUtils.getLeader(ChainId.POLYGON_AMOY, '0x62dD51230A
 
 #### Defined in
 
-[operator.ts:44](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/operator.ts#L44)
+[operator.ts:44](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/operator.ts#L44)
 
 ***
 
@@ -91,7 +91,7 @@ const leaders = await OperatorUtils.getLeaders(filter);
 
 #### Defined in
 
-[operator.ts:107](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/operator.ts#L107)
+[operator.ts:107](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/operator.ts#L107)
 
 ***
 
@@ -137,7 +137,7 @@ const operators = await OperatorUtils.getReputationNetworkOperators(ChainId.POLY
 
 #### Defined in
 
-[operator.ts:186](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/operator.ts#L186)
+[operator.ts:186](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/operator.ts#L186)
 
 ***
 
@@ -177,4 +177,4 @@ const rewards = await OperatorUtils.getRewards(ChainId.POLYGON_AMOY, '0x62dD5123
 
 #### Defined in
 
-[operator.ts:236](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/operator.ts#L236)
+[operator.ts:236](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/operator.ts#L236)
diff --git a/docs/sdk/typescript/staking/classes/StakingClient.md b/docs/sdk/typescript/staking/classes/StakingClient.md
index 4cb377bb88..ca676e60f0 100644
--- a/docs/sdk/typescript/staking/classes/StakingClient.md
+++ b/docs/sdk/typescript/staking/classes/StakingClient.md
@@ -110,7 +110,7 @@ The network information required to connect to the Staking contract
 
 #### Defined in
 
-[staking.ts:108](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L108)
+[staking.ts:108](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L108)
 
 ## Properties
 
@@ -120,7 +120,7 @@ The network information required to connect to the Staking contract
 
 #### Defined in
 
-[staking.ts:100](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L100)
+[staking.ts:100](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L100)
 
 ***
 
@@ -134,7 +134,7 @@ The network information required to connect to the Staking contract
 
 #### Defined in
 
-[base.ts:12](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L12)
+[base.ts:12](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L12)
 
 ***
 
@@ -148,7 +148,7 @@ The network information required to connect to the Staking contract
 
 #### Defined in
 
-[base.ts:11](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L11)
+[base.ts:11](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/base.ts#L11)
 
 ***
 
@@ -158,7 +158,7 @@ The network information required to connect to the Staking contract
 
 #### Defined in
 
-[staking.ts:99](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L99)
+[staking.ts:99](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L99)
 
 ***
 
@@ -168,7 +168,7 @@ The network information required to connect to the Staking contract
 
 #### Defined in
 
-[staking.ts:98](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L98)
+[staking.ts:98](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L98)
 
 ## Methods
 
@@ -217,7 +217,7 @@ await stakingClient.approveStake(amount);
 
 #### Defined in
 
-[staking.ts:193](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L193)
+[staking.ts:193](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L193)
 
 ***
 
@@ -255,7 +255,7 @@ console.log(stakingInfo.tokensStaked);
 
 #### Defined in
 
-[staking.ts:435](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L435)
+[staking.ts:435](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L435)
 
 ***
 
@@ -322,7 +322,7 @@ await stakingClient.slash('0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266', '0xf39Fd
 
 #### Defined in
 
-[staking.ts:373](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L373)
+[staking.ts:373](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L373)
 
 ***
 
@@ -374,7 +374,7 @@ await stakingClient.stake(amount);
 
 #### Defined in
 
-[staking.ts:247](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L247)
+[staking.ts:247](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L247)
 
 ***
 
@@ -425,7 +425,7 @@ await stakingClient.unstake(amount);
 
 #### Defined in
 
-[staking.ts:291](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L291)
+[staking.ts:291](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L291)
 
 ***
 
@@ -469,7 +469,7 @@ await stakingClient.withdraw();
 
 #### Defined in
 
-[staking.ts:336](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L336)
+[staking.ts:336](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L336)
 
 ***
 
@@ -503,4 +503,4 @@ The Runner object to interact with the Ethereum network
 
 #### Defined in
 
-[staking.ts:136](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L136)
+[staking.ts:136](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/staking.ts#L136)
diff --git a/docs/sdk/typescript/statistics/classes/StatisticsClient.md b/docs/sdk/typescript/statistics/classes/StatisticsClient.md
index 048b4e33bf..d687f10c01 100644
--- a/docs/sdk/typescript/statistics/classes/StatisticsClient.md
+++ b/docs/sdk/typescript/statistics/classes/StatisticsClient.md
@@ -59,7 +59,7 @@ The network information required to connect to the Statistics contract
 
 #### Defined in
 
-[statistics.ts:67](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L67)
+[statistics.ts:67](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L67)
 
 ## Properties
 
@@ -69,7 +69,7 @@ The network information required to connect to the Statistics contract
 
 #### Defined in
 
-[statistics.ts:59](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L59)
+[statistics.ts:59](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L59)
 
 ***
 
@@ -79,7 +79,7 @@ The network information required to connect to the Statistics contract
 
 #### Defined in
 
-[statistics.ts:60](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L60)
+[statistics.ts:60](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L60)
 
 ## Methods
 
@@ -147,7 +147,7 @@ const escrowStatisticsApril = await statisticsClient.getEscrowStatistics({
 
 #### Defined in
 
-[statistics.ts:120](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L120)
+[statistics.ts:120](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L120)
 
 ***
 
@@ -214,7 +214,7 @@ console.log('HMT statistics from 5/8 - 6/8:', hmtStatisticsRange);
 
 #### Defined in
 
-[statistics.ts:478](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L478)
+[statistics.ts:478](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L478)
 
 ***
 
@@ -259,7 +259,7 @@ console.log('HMT holders:', hmtHolders.map((h) => ({
 
 #### Defined in
 
-[statistics.ts:407](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L407)
+[statistics.ts:407](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L407)
 
 ***
 
@@ -300,7 +300,7 @@ console.log('HMT statistics:', {
 
 #### Defined in
 
-[statistics.ts:364](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L364)
+[statistics.ts:364](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L364)
 
 ***
 
@@ -386,7 +386,7 @@ console.log(
 
 #### Defined in
 
-[statistics.ts:300](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L300)
+[statistics.ts:300](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L300)
 
 ***
 
@@ -449,4 +449,4 @@ const workerStatisticsApril = await statisticsClient.getWorkerStatistics({
 
 #### Defined in
 
-[statistics.ts:204](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L204)
+[statistics.ts:204](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/statistics.ts#L204)
diff --git a/docs/sdk/typescript/storage/classes/StorageClient.md b/docs/sdk/typescript/storage/classes/StorageClient.md
index f726bb772d..4aa78eddb7 100644
--- a/docs/sdk/typescript/storage/classes/StorageClient.md
+++ b/docs/sdk/typescript/storage/classes/StorageClient.md
@@ -81,7 +81,7 @@ Optional. Cloud storage access data. If credentials are not provided - use anony
 
 #### Defined in
 
-[storage.ts:73](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/storage.ts#L73)
+[storage.ts:73](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/storage.ts#L73)
 
 ## Methods
 
@@ -127,7 +127,7 @@ const exists = await storageClient.bucketExists('bucket-name');
 
 #### Defined in
 
-[storage.ts:262](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/storage.ts#L262)
+[storage.ts:262](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/storage.ts#L262)
 
 ***
 
@@ -177,7 +177,7 @@ const files = await storageClient.downloadFiles(keys, 'bucket-name');
 
 #### Defined in
 
-[storage.ts:112](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/storage.ts#L112)
+[storage.ts:112](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/storage.ts#L112)
 
 ***
 
@@ -223,7 +223,7 @@ const fileNames = await storageClient.listObjects('bucket-name');
 
 #### Defined in
 
-[storage.ts:292](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/storage.ts#L292)
+[storage.ts:292](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/storage.ts#L292)
 
 ***
 
@@ -278,7 +278,7 @@ const uploadedFiles = await storageClient.uploadFiles(files, 'bucket-name');
 
 #### Defined in
 
-[storage.ts:198](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/storage.ts#L198)
+[storage.ts:198](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/storage.ts#L198)
 
 ***
 
@@ -312,4 +312,4 @@ const file = await StorageClient.downloadFileFromUrl('http://localhost/file.json
 
 #### Defined in
 
-[storage.ts:146](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/storage.ts#L146)
+[storage.ts:146](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/storage.ts#L146)
diff --git a/docs/sdk/typescript/transaction/classes/TransactionUtils.md b/docs/sdk/typescript/transaction/classes/TransactionUtils.md
index 1663b68b19..0ccd68e25f 100644
--- a/docs/sdk/typescript/transaction/classes/TransactionUtils.md
+++ b/docs/sdk/typescript/transaction/classes/TransactionUtils.md
@@ -54,7 +54,7 @@ const transaction = await TransactionUtils.getTransaction(ChainId.POLYGON, '0x62
 
 #### Defined in
 
-[transaction.ts:34](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/transaction.ts#L34)
+[transaction.ts:34](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/transaction.ts#L34)
 
 ***
 
@@ -127,4 +127,4 @@ const transactions = await TransactionUtils.getTransactions(filter);
 
 #### Defined in
 
-[transaction.ts:109](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/transaction.ts#L109)
+[transaction.ts:109](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/transaction.ts#L109)
diff --git a/docs/sdk/typescript/types/enumerations/EscrowStatus.md b/docs/sdk/typescript/types/enumerations/EscrowStatus.md
index 6ce3379426..935b608636 100644
--- a/docs/sdk/typescript/types/enumerations/EscrowStatus.md
+++ b/docs/sdk/typescript/types/enumerations/EscrowStatus.md
@@ -18,7 +18,7 @@ Escrow is cancelled.
 
 #### Defined in
 
-[types.ts:32](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L32)
+[types.ts:32](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L32)
 
 ***
 
@@ -30,7 +30,7 @@ Escrow is finished.
 
 #### Defined in
 
-[types.ts:28](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L28)
+[types.ts:28](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L28)
 
 ***
 
@@ -42,7 +42,7 @@ Escrow is launched.
 
 #### Defined in
 
-[types.ts:12](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L12)
+[types.ts:12](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L12)
 
 ***
 
@@ -54,7 +54,7 @@ Escrow is fully paid.
 
 #### Defined in
 
-[types.ts:24](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L24)
+[types.ts:24](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L24)
 
 ***
 
@@ -66,7 +66,7 @@ Escrow is partially paid out.
 
 #### Defined in
 
-[types.ts:20](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L20)
+[types.ts:20](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L20)
 
 ***
 
@@ -78,4 +78,4 @@ Escrow is funded, and waiting for the results to be submitted.
 
 #### Defined in
 
-[types.ts:16](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L16)
+[types.ts:16](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L16)
diff --git a/docs/sdk/typescript/types/type-aliases/EscrowCancel.md b/docs/sdk/typescript/types/type-aliases/EscrowCancel.md
index 679a257da6..084b9c436b 100644
--- a/docs/sdk/typescript/types/type-aliases/EscrowCancel.md
+++ b/docs/sdk/typescript/types/type-aliases/EscrowCancel.md
@@ -26,4 +26,4 @@ The hash of the transaction associated with the escrow cancellation.
 
 ## Defined in
 
-[types.ts:145](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L145)
+[types.ts:145](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L145)
diff --git a/docs/sdk/typescript/types/type-aliases/EscrowWithdraw.md b/docs/sdk/typescript/types/type-aliases/EscrowWithdraw.md
index c64abc0b3e..c12e0205f1 100644
--- a/docs/sdk/typescript/types/type-aliases/EscrowWithdraw.md
+++ b/docs/sdk/typescript/types/type-aliases/EscrowWithdraw.md
@@ -32,4 +32,4 @@ The hash of the transaction associated with the escrow withdrawal.
 
 ## Defined in
 
-[types.ts:159](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L159)
+[types.ts:159](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L159)
diff --git a/docs/sdk/typescript/types/type-aliases/NetworkData.md b/docs/sdk/typescript/types/type-aliases/NetworkData.md
index 3cbac50b7f..eac2669da8 100644
--- a/docs/sdk/typescript/types/type-aliases/NetworkData.md
+++ b/docs/sdk/typescript/types/type-aliases/NetworkData.md
@@ -80,4 +80,4 @@ Network title
 
 ## Defined in
 
-[types.ts:95](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L95)
+[types.ts:95](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L95)
diff --git a/docs/sdk/typescript/types/type-aliases/StorageCredentials.md b/docs/sdk/typescript/types/type-aliases/StorageCredentials.md
index a38e4fa260..271aca0164 100644
--- a/docs/sdk/typescript/types/type-aliases/StorageCredentials.md
+++ b/docs/sdk/typescript/types/type-aliases/StorageCredentials.md
@@ -30,4 +30,4 @@ StorageClient is deprecated. Use Minio.Client directly.
 
 ## Defined in
 
-[types.ts:40](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L40)
+[types.ts:40](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L40)
diff --git a/docs/sdk/typescript/types/type-aliases/StorageParams.md b/docs/sdk/typescript/types/type-aliases/StorageParams.md
index d7f39bf639..4a0abd700b 100644
--- a/docs/sdk/typescript/types/type-aliases/StorageParams.md
+++ b/docs/sdk/typescript/types/type-aliases/StorageParams.md
@@ -40,4 +40,4 @@ StorageClient is deprecated. Use Minio.Client directly.
 
 ## Defined in
 
-[types.ts:54](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L54)
+[types.ts:54](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L54)
diff --git a/docs/sdk/typescript/types/type-aliases/TransactionLikeWithNonce.md b/docs/sdk/typescript/types/type-aliases/TransactionLikeWithNonce.md
index 99d8015136..b367900e4b 100644
--- a/docs/sdk/typescript/types/type-aliases/TransactionLikeWithNonce.md
+++ b/docs/sdk/typescript/types/type-aliases/TransactionLikeWithNonce.md
@@ -16,4 +16,4 @@
 
 ## Defined in
 
-[types.ts:174](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L174)
+[types.ts:174](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L174)
diff --git a/docs/sdk/typescript/types/type-aliases/UploadFile.md b/docs/sdk/typescript/types/type-aliases/UploadFile.md
index 802fc11ec0..0d4750c677 100644
--- a/docs/sdk/typescript/types/type-aliases/UploadFile.md
+++ b/docs/sdk/typescript/types/type-aliases/UploadFile.md
@@ -32,4 +32,4 @@ Uploaded object URL
 
 ## Defined in
 
-[types.ts:77](https://github.com/humanprotocol/human-protocol/blob/000ef2f7891c6788228277729f8de9c3a0456a70/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L77)
+[types.ts:77](https://github.com/humanprotocol/human-protocol/blob/b718aa9d178d605c5b27fec98a4e6afa6f1db599/packages/sdk/typescript/human-protocol-sdk/src/types.ts#L77)
diff --git a/package.json b/package.json
index 2186faff70..212470ae4a 100644
--- a/package.json
+++ b/package.json
@@ -27,18 +27,18 @@
     "@types/node": "^22.10.5",
     "@typescript-eslint/eslint-plugin": "^5.43.0",
     "@typescript-eslint/parser": "^5.43.0",
-    "@typescript-eslint/utils": "^8.4.0",
-    "concurrently": "^8.2.2",
+    "@typescript-eslint/utils": "^8.22.0",
+    "concurrently": "^9.1.2",
     "dotenv": "^16.3.2",
     "eslint": "^8.55.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-jest": "^28.6.0",
     "eslint-plugin-prettier": "^5.2.1",
-    "ethers": "^6.12.1",
+    "ethers": "^6.13.5",
     "husky": "^9.1.6",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
-    "lint-staged": "^15.3.0",
+    "lint-staged": "^15.4.3",
     "prettier": "^3.4.2",
     "ts-jest": "^29.2.5",
     "ts-node": "^10.9.2",
diff --git a/packages/apps/dashboard/client/package.json b/packages/apps/dashboard/client/package.json
index c869ab3c16..a1a789fdb0 100644
--- a/packages/apps/dashboard/client/package.json
+++ b/packages/apps/dashboard/client/package.json
@@ -10,11 +10,13 @@
     "test": "vitest -u",
     "build": "tsc && vite build",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "vercel-build": "yarn workspace @human-protocol/sdk build && yarn build"
   },
   "dependencies": {
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.5",
+    "@human-protocol/sdk": "*",
     "@mui/icons-material": "^6.2.0",
     "@mui/material": "^5.15.18",
     "@mui/styled-engine-sc": "6.4.0",
@@ -36,6 +38,7 @@
     "styled-components": "^6.1.11",
     "swiper": "^11.1.3",
     "use-debounce": "^10.0.2",
+    "vite-plugin-node-polyfills": "^0.23.0",
     "zod": "^3.23.8",
     "zustand": "^4.5.4"
   },
diff --git a/packages/apps/dashboard/client/src/features/Leaderboard/components/EntityIcon.tsx b/packages/apps/dashboard/client/src/features/Leaderboard/components/EntityIcon.tsx
index e2b00026cd..6c81ee7511 100644
--- a/packages/apps/dashboard/client/src/features/Leaderboard/components/EntityIcon.tsx
+++ b/packages/apps/dashboard/client/src/features/Leaderboard/components/EntityIcon.tsx
@@ -3,19 +3,18 @@ import HumanIcon from '@components/Icons/HumanIcon';
 import { JobLauncher } from '@components/Icons/JobLauncher';
 import { RecordingOracle } from '@components/Icons/RecordingOracle';
 import { ReputationOracle } from '@components/Icons/ReputationOracle';
+import { Role } from '@human-protocol/sdk';
 
 export const EntityIcon: React.FC<{ role: string }> = ({ role }) => {
   switch (role) {
-    case 'Job Launcher':
+    case Role.JobLauncher:
       return <JobLauncher />;
-    case 'Recording Oracle':
+    case Role.RecordingOracle:
       return <RecordingOracle />;
-    case 'Reputation Oracle':
+    case Role.ReputationOracle:
       return <ReputationOracle />;
-    case 'Exchange Oracle':
+    case Role.ExchangeOracle:
       return <ExchangeOracleIcon />;
-    case 'HUMAN App':
-      return <HumanIcon />;
     default:
       return <HumanIcon />;
   }
diff --git a/packages/apps/dashboard/client/src/features/Leaderboard/components/RoleCell.tsx b/packages/apps/dashboard/client/src/features/Leaderboard/components/RoleCell.tsx
index 0c11b729a4..56a154a708 100644
--- a/packages/apps/dashboard/client/src/features/Leaderboard/components/RoleCell.tsx
+++ b/packages/apps/dashboard/client/src/features/Leaderboard/components/RoleCell.tsx
@@ -3,6 +3,7 @@ import { Launch as LaunchIcon } from '@mui/icons-material';
 import { useBreakPoints } from '@utils/hooks/use-is-mobile';
 import { Link } from 'react-router-dom';
 import { EntityIcon } from './EntityIcon';
+import { CaseConverter } from '@utils/case-converter';
 
 const Wrapper = ({
   children,
@@ -40,7 +41,7 @@ export const RoleCell = ({
   const {
     mobile: { isMobile },
   } = useBreakPoints();
-
+  const humanReadableRole = CaseConverter.convertSnakeToHumanReadable(role);
   return (
     <Box display="flex" alignItems="center" gap={1} height="100%">
       <Wrapper websiteUrl={websiteUrl}>
@@ -56,7 +57,7 @@ export const RoleCell = ({
                   whiteSpace: isMobile ? 'wrap' : 'nowrap',
                 }}
               >
-                {name ?? role}
+                {name ?? humanReadableRole}
               </Typography>
               {websiteUrl ? <LaunchIcon fontSize="small" /> : null}
             </Box>
@@ -69,7 +70,7 @@ export const RoleCell = ({
                   whiteSpace: isMobile ? 'wrap' : 'nowrap',
                 }}
               >
-                {role}
+                {humanReadableRole}
               </Typography>
             ) : null}
           </Box>
diff --git a/packages/apps/dashboard/client/src/pages/SearchResults/RoleDetails/RoleDetails.tsx b/packages/apps/dashboard/client/src/pages/SearchResults/RoleDetails/RoleDetails.tsx
index 5e050e1a85..3ef6723c0f 100644
--- a/packages/apps/dashboard/client/src/pages/SearchResults/RoleDetails/RoleDetails.tsx
+++ b/packages/apps/dashboard/client/src/pages/SearchResults/RoleDetails/RoleDetails.tsx
@@ -6,11 +6,10 @@ import Stack from '@mui/material/Stack';
 import IconButton from '@mui/material/IconButton';
 import ReputationOracleIcon from '@assets/icons/reputation-oracle.svg';
 import ExchangeOracleIcon from '@assets/icons/exchange-oracle.svg';
-import HumanAppIcon from '@assets/icons/human-app.svg';
 import JobLauncherIcon from '@assets/icons/job-launcher.svg';
 import RecordingOracleIcon from '@assets/icons/recording-oracle.svg';
 import HelpOutlineIcon from '@mui/icons-material/HelpOutline';
-import { AddressDetailsLeader, Roles } from '@services/api/use-address-details';
+import { AddressDetailsLeader } from '@services/api/use-address-details';
 import { getNetwork } from '@utils/config/networks';
 import { useWalletSearch } from '@utils/hooks/use-wallet-search';
 import { RoleDetailsEscrowsTable } from '@pages/SearchResults/RoleDetails/RoleDetailsEscrows/RoleDetailsEscrowsTable';
@@ -18,6 +17,7 @@ import { Reputation } from '@services/api/use-leaderboard-details';
 import { env } from '@helpers/env';
 import { FormatNumberWithDecimals } from '@components/Home/FormatNumber';
 import CustomTooltip from '@components/CustomTooltip';
+import { Role } from '@human-protocol/sdk';
 
 interface RoleInfoProps {
   title: string;
@@ -55,9 +55,9 @@ const RenderRoleDetailsInfo = ({
   }
 
   const roleDetailsInfo: Partial<
-    Record<Roles, { title: string; points: string[] }>
+    Record<string, { title: string; points: string[] }>
   > = {
-    [Roles.reputationOracle]: {
+    [Role.ReputationOracle]: {
       title: 'Reputation Oracle',
       points: [
         'The Reputation Oracle is the trust engine of HUMAN Protocol.',
@@ -65,7 +65,7 @@ const RenderRoleDetailsInfo = ({
         "It's the final seal of quality and trust within the ecosystem.",
       ],
     },
-    [Roles.recordingOracle]: {
+    [Role.RecordingOracle]: {
       title: 'Recording Oracle',
       points: [
         'The Recording Oracle is where task solutions get the green light.',
@@ -73,14 +73,14 @@ const RenderRoleDetailsInfo = ({
         "From quality checks to reputation adjustments, it's the assurance you need for dependable results.",
       ],
     },
-    [Roles.exchangeOracle]: {
+    [Role.ExchangeOracle]: {
       title: 'Exchange Oracle',
       points: [
         "The Exchange Oracle is the HUMAN Protocol's powerhouse, directing tasks to skilled workers and ensuring smooth communication.",
         'It validates solutions, provides job updates, and handles cancellations, streamlining the job lifecycle.',
       ],
     },
-    [Roles.jobLauncher]: {
+    [Role.JobLauncher]: {
       title: 'Job Launcher',
       points: [
         'The Job Launcher is a tool that allows anybody to create and launch jobs, to be distributed as tasks through the HUMAN App.',
@@ -154,11 +154,10 @@ const renderReputationTitle = (reputation: Reputation) => {
 const renderRoleIcon = (role: AddressDetailsLeader['role']) => {
   if (!role) return null;
   const roleIcons = {
-    [Roles.reputationOracle]: <ReputationOracleIcon />,
-    [Roles.exchangeOracle]: <ExchangeOracleIcon />,
-    [Roles.humanApp]: <HumanAppIcon />,
-    [Roles.jobLauncher]: <JobLauncherIcon />,
-    [Roles.recordingOracle]: <RecordingOracleIcon />,
+    [Role.ReputationOracle]: <ReputationOracleIcon />,
+    [Role.ExchangeOracle]: <ExchangeOracleIcon />,
+    [Role.JobLauncher]: <JobLauncherIcon />,
+    [Role.RecordingOracle]: <RecordingOracleIcon />,
   };
 
   return roleIcons[role];
diff --git a/packages/apps/dashboard/client/src/services/api/use-address-details.tsx b/packages/apps/dashboard/client/src/services/api/use-address-details.tsx
index fb61b47f59..14c443170a 100644
--- a/packages/apps/dashboard/client/src/services/api/use-address-details.tsx
+++ b/packages/apps/dashboard/client/src/services/api/use-address-details.tsx
@@ -5,6 +5,7 @@ import { apiPaths } from '../api-paths';
 import { useWalletSearch } from '@utils/hooks/use-wallet-search';
 import { validateResponse } from '../validate-response';
 import { reputationSchema } from '@services/api/use-leaderboard-details';
+import { Role } from '@human-protocol/sdk';
 
 const transformOptionalTokenAmount = (
   value: string | undefined | null,
@@ -63,19 +64,18 @@ const escrowSchema = z.object({
 
 export type AddressDetailsEscrowSchema = z.infer<typeof escrowSchema>;
 
-export enum Roles {
-  jobLauncher = 'Job Launcher',
-  exchangeOracle = 'Exchange Oracle',
-  humanApp = 'Human App',
-  recordingOracle = 'Recording Oracle',
-  reputationOracle = 'Reputation Oracle',
-}
-
 const leaderSchema = z.object({
   chainId: z.number(),
   address: z.string(),
   balance: z.string().transform(transformOptionalTokenAmount),
-  role: z.nativeEnum(Roles).nullable(),
+  role: z
+    .enum([
+      Role.JobLauncher,
+      Role.ExchangeOracle,
+      Role.RecordingOracle,
+      Role.ReputationOracle,
+    ])
+    .nullable(),
   amountStaked: z.string().optional().transform(transformOptionalTokenAmount),
   amountLocked: z.string().optional().transform(transformOptionalTokenAmount),
   lockedUntilTimestamp: z.string().optional(),
diff --git a/packages/apps/dashboard/client/src/utils/case-converter.ts b/packages/apps/dashboard/client/src/utils/case-converter.ts
new file mode 100644
index 0000000000..d17b45eaf0
--- /dev/null
+++ b/packages/apps/dashboard/client/src/utils/case-converter.ts
@@ -0,0 +1,8 @@
+export class CaseConverter {
+  static convertSnakeToHumanReadable(string: string): string {
+    return string
+      .split('_')
+      .map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())
+      .join(' ');
+  }
+}
diff --git a/packages/apps/dashboard/client/vite.config.ts b/packages/apps/dashboard/client/vite.config.ts
index 0041973c56..accd21e3a9 100644
--- a/packages/apps/dashboard/client/vite.config.ts
+++ b/packages/apps/dashboard/client/vite.config.ts
@@ -2,6 +2,7 @@ import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
 import * as path from 'path';
 import svgr from 'vite-plugin-svgr';
+import { nodePolyfills } from 'vite-plugin-node-polyfills';
 
 // https://vitejs.dev/config/
 export default defineConfig({
@@ -11,6 +12,9 @@ export default defineConfig({
       include: '**/*.svg',
       exclude: 'src/assets/icons/excluded/**/*.svg',
     }),
+    nodePolyfills({
+      protocolImports: true,
+    }),
   ],
   resolve: {
     alias: {
@@ -23,6 +27,14 @@ export default defineConfig({
       '@services': path.resolve(__dirname, './src/services'),
     },
   },
+  optimizeDeps: {
+    include: ['@human-protocol/sdk'],
+  },
+  build: {
+    commonjsOptions: {
+      include: [/core/, /human-protocol-sdk/, /node_modules/],
+    },
+  },
   server: {
     port: 3001,
   },
diff --git a/packages/apps/dashboard/server/src/common/enums/roles.ts b/packages/apps/dashboard/server/src/common/enums/roles.ts
deleted file mode 100644
index 1a68ff2cf0..0000000000
--- a/packages/apps/dashboard/server/src/common/enums/roles.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export enum OracleRole {
-  JOB_LAUNCHER = 'job_launcher',
-  EXCHANGE_ORACLE = 'exchange_oracle',
-  RECORDING_ORACLE = 'recording_oracle',
-  REPUTATION_ORACLE = 'reputation_oracle',
-}
-
-export enum SubgraphOracleRole {
-  JOB_LAUNCHER = 'Job Launcher',
-  EXCHANGE_ORACLE = 'Exchange Oracle',
-  RECORDING_ORACLE = 'Reputation Oracle',
-  REPUTATION_ORACLE = 'Recording Oracle',
-}
diff --git a/packages/apps/dashboard/server/src/modules/details/details.service.ts b/packages/apps/dashboard/server/src/modules/details/details.service.ts
index e87e312afe..66631e50ab 100644
--- a/packages/apps/dashboard/server/src/modules/details/details.service.ts
+++ b/packages/apps/dashboard/server/src/modules/details/details.service.ts
@@ -23,7 +23,6 @@ import { firstValueFrom } from 'rxjs';
 import { HMToken__factory } from '@human-protocol/core/typechain-types';
 import { ethers } from 'ethers';
 import { NetworkConfigService } from '../../common/config/network-config.service';
-import { OracleRole, SubgraphOracleRole } from '../../common/enums/roles';
 import { LeadersOrderBy } from '../../common/enums/leader';
 import { ReputationLevel } from '../../common/enums/reputation';
 import {
@@ -210,10 +209,10 @@ export class DetailsService {
       chainId,
       minAmountStaked: MIN_AMOUNT_STAKED,
       roles: [
-        SubgraphOracleRole.JOB_LAUNCHER,
-        SubgraphOracleRole.EXCHANGE_ORACLE,
-        SubgraphOracleRole.RECORDING_ORACLE,
-        SubgraphOracleRole.REPUTATION_ORACLE,
+        Role.JobLauncher,
+        Role.ExchangeOracle,
+        Role.RecordingOracle,
+        Role.ReputationOracle,
       ],
     };
 
@@ -242,10 +241,10 @@ export class DetailsService {
             params: {
               chain_id: chainId,
               roles: [
-                OracleRole.JOB_LAUNCHER,
-                OracleRole.EXCHANGE_ORACLE,
-                OracleRole.RECORDING_ORACLE,
-                OracleRole.REPUTATION_ORACLE,
+                Role.JobLauncher,
+                Role.ExchangeOracle,
+                Role.RecordingOracle,
+                Role.ReputationOracle,
               ],
             },
           },
@@ -272,10 +271,10 @@ export class DetailsService {
             params: {
               chain_id: chainId,
               roles: [
-                OracleRole.JOB_LAUNCHER,
-                OracleRole.EXCHANGE_ORACLE,
-                OracleRole.RECORDING_ORACLE,
-                OracleRole.REPUTATION_ORACLE,
+                Role.JobLauncher,
+                Role.ExchangeOracle,
+                Role.RecordingOracle,
+                Role.ReputationOracle,
               ],
               ...(orderBy &&
                 orderBy === LeadersOrderBy.REPUTATION && {
diff --git a/packages/apps/fortune/exchange-oracle/client/index.html b/packages/apps/fortune/exchange-oracle/client/index.html
index 64790de800..f1c77b7a09 100644
--- a/packages/apps/fortune/exchange-oracle/client/index.html
+++ b/packages/apps/fortune/exchange-oracle/client/index.html
@@ -5,7 +5,7 @@
     <link rel="icon" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
-    <meta name="description" content="Human Protocol Job Launcher" />
+    <meta name="description" content="Human Protocol Exchange Oracle" />
     <link rel="apple-touch-icon" href="/logo192.png" />
     <!--
       manifest.json provides metadata used when your web app is installed on a
diff --git a/packages/apps/fortune/exchange-oracle/client/package.json b/packages/apps/fortune/exchange-oracle/client/package.json
index 094b9322bc..30f1b25d4b 100644
--- a/packages/apps/fortune/exchange-oracle/client/package.json
+++ b/packages/apps/fortune/exchange-oracle/client/package.json
@@ -32,7 +32,7 @@
     "@tanstack/react-query": "^5.60.5",
     "@tanstack/react-query-persist-client": "^5.51.11",
     "axios": "^1.7.2",
-    "ethers": "^6.13.1",
+    "ethers": "^6.13.5",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-router-dom": "^6.24.1",
diff --git a/packages/apps/human-app/frontend/package.json b/packages/apps/human-app/frontend/package.json
index 5a0e437ffb..f132098727 100644
--- a/packages/apps/human-app/frontend/package.json
+++ b/packages/apps/human-app/frontend/package.json
@@ -29,7 +29,7 @@
     "@synaps-io/verify-sdk": "^4.0.45",
     "@tanstack/react-query": "^5.61.0",
     "date-fns": "^4.1.0",
-    "ethers": "^6.12.0",
+    "ethers": "^6.13.5",
     "i18next": "^23.8.2",
     "jwt-decode": "^4.0.0",
     "lodash": "^4.17.21",
@@ -71,7 +71,7 @@
     "eslint-plugin-react-refresh": "^0.4.11",
     "husky": "^9.1.6",
     "jsdom": "^25.0.1",
-    "lint-staged": "^15.3.0",
+    "lint-staged": "^15.4.3",
     "prettier": "^3.4.2",
     "typescript": "^5.6.3",
     "vite": "^5.4.7",
diff --git a/packages/apps/human-app/frontend/src/modules/worker/hcaptcha-labeling/components/index.ts b/packages/apps/human-app/frontend/src/modules/worker/hcaptcha-labeling/components/index.ts
new file mode 100644
index 0000000000..d36cf6b6e7
--- /dev/null
+++ b/packages/apps/human-app/frontend/src/modules/worker/hcaptcha-labeling/components/index.ts
@@ -0,0 +1,3 @@
+export * from './user-stats-accordion';
+export * from './user-stats-details';
+export * from './user-stats-drawer';
diff --git a/packages/apps/human-app/frontend/src/modules/worker/components/hcaptcha-labeling/user-stats-accordion.tsx b/packages/apps/human-app/frontend/src/modules/worker/hcaptcha-labeling/components/user-stats-accordion.tsx
similarity index 92%
rename from packages/apps/human-app/frontend/src/modules/worker/components/hcaptcha-labeling/user-stats-accordion.tsx
rename to packages/apps/human-app/frontend/src/modules/worker/hcaptcha-labeling/components/user-stats-accordion.tsx
index df817e5d34..f5b6e6c725 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/components/hcaptcha-labeling/user-stats-accordion.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/hcaptcha-labeling/components/user-stats-accordion.tsx
@@ -6,14 +6,14 @@ import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
 import Grid from '@mui/material/Grid';
 import { useEffect } from 'react';
 import { t } from 'i18next';
-import { UserStatsDetails } from '@/modules/worker/components/hcaptcha-labeling/user-stats-details';
-import { useHCaptchaUserStats } from '@/modules/worker/services/hcaptcha-user-stats';
 import {
   TopNotificationType,
   useNotification,
 } from '@/shared/hooks/use-notification';
 import { getErrorMessageForError } from '@/shared/errors';
 import { useColorMode } from '@/shared/contexts/color-mode';
+import { useHCaptchaUserStats } from '../hooks';
+import { UserStatsDetails } from './user-stats-details';
 
 const accordionWidth = { width: '284px' };
 
diff --git a/packages/apps/human-app/frontend/src/modules/worker/components/hcaptcha-labeling/user-stats-details.tsx b/packages/apps/human-app/frontend/src/modules/worker/hcaptcha-labeling/components/user-stats-details.tsx
similarity index 97%
rename from packages/apps/human-app/frontend/src/modules/worker/components/hcaptcha-labeling/user-stats-details.tsx
rename to packages/apps/human-app/frontend/src/modules/worker/hcaptcha-labeling/components/user-stats-details.tsx
index 205d7ede42..f4982699d6 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/components/hcaptcha-labeling/user-stats-details.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/hcaptcha-labeling/components/user-stats-details.tsx
@@ -1,17 +1,17 @@
 import { Divider, Grid, Typography } from '@mui/material';
 import { t } from 'i18next';
 import { RefreshIcon } from '@/shared/components/ui/icons';
-import type { HCaptchaUserStatsSuccess } from '@/modules/worker/services/hcaptcha-user-stats';
-import { useColorMode } from '@/shared/contexts/color-mode';
 import { onlyDarkModeColor } from '@/shared/styles/dark-color-palette';
+import { useColorMode } from '@/shared/contexts/color-mode';
+import { type HCaptchaUserStatsSuccess } from '../hooks/use-hcaptcha-user-stats';
 
 export function UserStatsDetails({
   stats,
   refetch,
-}: {
+}: Readonly<{
   stats: HCaptchaUserStatsSuccess;
   refetch: () => void;
-}) {
+}>) {
   const { colorPalette, isDarkMode } = useColorMode();
   const statsColor = isDarkMode
     ? onlyDarkModeColor.additionalTextColor
diff --git a/packages/apps/human-app/frontend/src/modules/worker/components/hcaptcha-labeling/user-stats-drawer.tsx b/packages/apps/human-app/frontend/src/modules/worker/hcaptcha-labeling/components/user-stats-drawer.tsx
similarity index 86%
rename from packages/apps/human-app/frontend/src/modules/worker/components/hcaptcha-labeling/user-stats-drawer.tsx
rename to packages/apps/human-app/frontend/src/modules/worker/hcaptcha-labeling/components/user-stats-drawer.tsx
index bb9f815674..de0f0c4f19 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/components/hcaptcha-labeling/user-stats-drawer.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/hcaptcha-labeling/components/user-stats-drawer.tsx
@@ -3,12 +3,11 @@ import Drawer from '@mui/material/Drawer';
 import CssBaseline from '@mui/material/CssBaseline';
 import { Grid, Typography } from '@mui/material';
 import { t } from 'i18next';
-import { UserStatsDetails } from '@/modules/worker/components/hcaptcha-labeling/user-stats-details';
-import type { HCaptchaUserStatsSuccess } from '@/modules/worker/services/hcaptcha-user-stats';
-import { useHCaptchaUserStats } from '@/modules/worker/services/hcaptcha-user-stats';
 import { Loader } from '@/shared/components/ui/loader';
 import { Alert } from '@/shared/components/ui/alert';
 import { getErrorMessageForError } from '@/shared/errors';
+import { type HCaptchaUserStatsSuccess, useHCaptchaUserStats } from '../hooks';
+import { UserStatsDetails } from './user-stats-details';
 
 export interface UserStatsDrawerNavigationProps {
   isOpen: boolean;
@@ -17,10 +16,10 @@ export interface UserStatsDrawerNavigationProps {
 function UserStatsDrawerContent({
   stats,
   refetch,
-}: {
+}: Readonly<{
   stats: HCaptchaUserStatsSuccess;
   refetch: () => void;
-}) {
+}>) {
   return (
     <>
       <Typography variant="mobileHeaderLarge">
@@ -31,7 +30,9 @@ function UserStatsDrawerContent({
   );
 }
 
-export function UserStatsDrawer({ isOpen }: UserStatsDrawerNavigationProps) {
+export function UserStatsDrawer({
+  isOpen,
+}: Readonly<UserStatsDrawerNavigationProps>) {
   const {
     data: hcaptchaUserStats,
     error: hcaptchaUserStatsError,
diff --git a/packages/apps/human-app/frontend/src/modules/worker/views/hcaptcha-labeling/enable-labeler.page.tsx b/packages/apps/human-app/frontend/src/modules/worker/hcaptcha-labeling/enable-labeler.page.tsx
similarity index 98%
rename from packages/apps/human-app/frontend/src/modules/worker/views/hcaptcha-labeling/enable-labeler.page.tsx
rename to packages/apps/human-app/frontend/src/modules/worker/hcaptcha-labeling/enable-labeler.page.tsx
index f4c7e18a7e..3ddfdf07bd 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/views/hcaptcha-labeling/enable-labeler.page.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/hcaptcha-labeling/enable-labeler.page.tsx
@@ -12,7 +12,7 @@ import { breakpoints } from '@/shared/styles/breakpoints';
 import { useAuthenticatedUser } from '@/modules/auth/hooks/use-authenticated-user';
 import { routerPaths } from '@/router/router-paths';
 
-export function EnableLabeler() {
+export function EnableLabelerPage() {
   const isMobile = useIsMobile();
   const { user } = useAuthenticatedUser();
   const { mutate, error, isError, isPending } =
diff --git a/packages/apps/human-app/frontend/src/modules/worker/views/hcaptcha-labeling/hcaptcha-labeling.page.tsx b/packages/apps/human-app/frontend/src/modules/worker/hcaptcha-labeling/hcaptcha-labeling.page.tsx
similarity index 97%
rename from packages/apps/human-app/frontend/src/modules/worker/views/hcaptcha-labeling/hcaptcha-labeling.page.tsx
rename to packages/apps/human-app/frontend/src/modules/worker/hcaptcha-labeling/hcaptcha-labeling.page.tsx
index 495b7cbfda..e042ca0c2d 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/views/hcaptcha-labeling/hcaptcha-labeling.page.tsx
+++ b/packages/apps/human-app/frontend/src/modules/worker/hcaptcha-labeling/hcaptcha-labeling.page.tsx
@@ -8,13 +8,7 @@ import { useIsMobile } from '@/shared/hooks/use-is-mobile';
 import { env } from '@/shared/env';
 import { breakpoints } from '@/shared/styles/breakpoints';
 import { Counter } from '@/shared/components/ui/counter';
-import { useHCaptchaUserStats } from '@/modules/worker/services/hcaptcha-user-stats';
-import {
-  PageCardError,
-  PageCardLoader,
-} from '@/shared/components/ui/page-card';
 import { getErrorMessageForError } from '@/shared/errors';
-import { useDailyHmtSpent } from '@/modules/worker/services/daily-hmt-spent';
 import { getTomorrowDate } from '@/shared/helpers/date';
 import { useSolveHCaptchaMutation } from '@/modules/worker/services/solve-hcaptcha';
 import { useAuthenticatedUser } from '@/modules/auth/hooks/use-authenticated-user';
@@ -22,6 +16,11 @@ import { useHCaptchaLabelingNotifications } from '@/modules/worker/hooks/use-hca
 import { useColorMode } from '@/shared/contexts/color-mode';
 import { onlyDarkModeColor } from '@/shared/styles/dark-color-palette';
 import { routerPaths } from '@/router/router-paths';
+import {
+  PageCardLoader,
+  PageCardError,
+} from '@/shared/components/ui/page-card';
+import { useHCaptchaUserStats, useDailyHmtSpent } from './hooks';
 
 export function HcaptchaLabelingPage() {
   const { colorPalette, isDarkMode } = useColorMode();
diff --git a/packages/apps/human-app/frontend/src/modules/worker/hcaptcha-labeling/hooks/index.ts b/packages/apps/human-app/frontend/src/modules/worker/hcaptcha-labeling/hooks/index.ts
new file mode 100644
index 0000000000..3c49984671
--- /dev/null
+++ b/packages/apps/human-app/frontend/src/modules/worker/hcaptcha-labeling/hooks/index.ts
@@ -0,0 +1,2 @@
+export * from './use-daily-hmt-spent';
+export * from './use-hcaptcha-user-stats';
diff --git a/packages/apps/human-app/frontend/src/modules/worker/services/daily-hmt-spent.ts b/packages/apps/human-app/frontend/src/modules/worker/hcaptcha-labeling/hooks/use-daily-hmt-spent.ts
similarity index 64%
rename from packages/apps/human-app/frontend/src/modules/worker/services/daily-hmt-spent.ts
rename to packages/apps/human-app/frontend/src/modules/worker/hcaptcha-labeling/hooks/use-daily-hmt-spent.ts
index 9e46875b7e..c3b748a676 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/services/daily-hmt-spent.ts
+++ b/packages/apps/human-app/frontend/src/modules/worker/hcaptcha-labeling/hooks/use-daily-hmt-spent.ts
@@ -1,15 +1,15 @@
 import { z } from 'zod';
 import { useQuery } from '@tanstack/react-query';
-import { apiPaths } from '@/api/api-paths';
 import { apiClient } from '@/api/api-client';
+import { apiPaths } from '@/api/api-paths';
 
 const dailyHmtSpentSchema = z.object({
   spend: z.number(),
 });
 
-export type DailyHmtSpentSchemaSuccess = z.infer<typeof dailyHmtSpentSchema>;
+type DailyHmtSpentResponse = z.infer<typeof dailyHmtSpentSchema>;
 
-export async function getDailyHmtSpent() {
+async function fetchDailyHmtSpent(): Promise<DailyHmtSpentResponse> {
   return apiClient(apiPaths.worker.dailyHmtSpend.path, {
     successSchema: dailyHmtSpentSchema,
     authenticated: true,
@@ -18,8 +18,8 @@ export async function getDailyHmtSpent() {
 }
 
 export function useDailyHmtSpent() {
-  return useQuery({
-    queryFn: getDailyHmtSpent,
-    queryKey: ['getDailyHmtSpent'],
+  return useQuery<DailyHmtSpentResponse>({
+    queryKey: ['dailyHmtSpent'],
+    queryFn: fetchDailyHmtSpent,
   });
 }
diff --git a/packages/apps/human-app/frontend/src/modules/worker/services/hcaptcha-user-stats.ts b/packages/apps/human-app/frontend/src/modules/worker/hcaptcha-labeling/hooks/use-hcaptcha-user-stats.ts
similarity index 95%
rename from packages/apps/human-app/frontend/src/modules/worker/services/hcaptcha-user-stats.ts
rename to packages/apps/human-app/frontend/src/modules/worker/hcaptcha-labeling/hooks/use-hcaptcha-user-stats.ts
index 095c64ad01..96b4ae996a 100644
--- a/packages/apps/human-app/frontend/src/modules/worker/services/hcaptcha-user-stats.ts
+++ b/packages/apps/human-app/frontend/src/modules/worker/hcaptcha-labeling/hooks/use-hcaptcha-user-stats.ts
@@ -25,7 +25,7 @@ const hcaptchaUserStatsSchema = z.object({
 
 export type HCaptchaUserStatsSuccess = z.infer<typeof hcaptchaUserStatsSchema>;
 
-export async function getHCaptchaUsersStats() {
+async function getHCaptchaUsersStats() {
   return apiClient(apiPaths.worker.hCaptchaUserStats.path, {
     authenticated: true,
     successSchema: hcaptchaUserStatsSchema,
diff --git a/packages/apps/human-app/frontend/src/modules/worker/hcaptcha-labeling/index.ts b/packages/apps/human-app/frontend/src/modules/worker/hcaptcha-labeling/index.ts
new file mode 100644
index 0000000000..af6d89244b
--- /dev/null
+++ b/packages/apps/human-app/frontend/src/modules/worker/hcaptcha-labeling/index.ts
@@ -0,0 +1,4 @@
+export * from './enable-labeler.page';
+export * from './hcaptcha-labeling.page';
+export * from './components/user-stats-accordion';
+export * from './components/user-stats-drawer';
diff --git a/packages/apps/human-app/frontend/src/modules/worker/views/protected/protected.page.tsx b/packages/apps/human-app/frontend/src/modules/worker/views/protected/protected.page.tsx
deleted file mode 100644
index 9156a566cf..0000000000
--- a/packages/apps/human-app/frontend/src/modules/worker/views/protected/protected.page.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import Box from '@mui/material/Box';
-
-export function ProtectedPage() {
-  return (
-    <Box>
-      <div>ProtectedPage</div>
-    </Box>
-  );
-}
diff --git a/packages/apps/human-app/frontend/src/router/router.tsx b/packages/apps/human-app/frontend/src/router/router.tsx
index becd779158..8cd33fcf46 100644
--- a/packages/apps/human-app/frontend/src/router/router.tsx
+++ b/packages/apps/human-app/frontend/src/router/router.tsx
@@ -17,8 +17,8 @@ import {
 } from '@/shared/components/layout/drawer-menu-items/drawer-menu-items-worker';
 import { operatorDrawerBottomMenuItems } from '@/shared/components/layout/drawer-menu-items/drawer-menu-items-operator';
 import { browserAuthProvider } from '@/shared/contexts/browser-auth-provider';
-import { UserStatsDrawer } from '@/modules/worker/components/hcaptcha-labeling/user-stats-drawer';
 import { useAuth } from '@/modules/auth/hooks/use-auth';
+import { UserStatsDrawer } from '@/modules/worker/hcaptcha-labeling';
 import { routerPaths } from './router-paths';
 
 export function Router() {
diff --git a/packages/apps/human-app/frontend/src/router/routes.tsx b/packages/apps/human-app/frontend/src/router/routes.tsx
index e14826d913..51353392bd 100644
--- a/packages/apps/human-app/frontend/src/router/routes.tsx
+++ b/packages/apps/human-app/frontend/src/router/routes.tsx
@@ -1,7 +1,5 @@
 import type { RouteProps } from 'react-router-dom';
 import { t } from 'i18next';
-import { ProtectedPage } from '@/modules/worker/views/protected/protected.page';
-import { SignInWorkerPage } from '@/modules/signin/worker';
 import { routerPaths } from '@/router/router-paths';
 import { SendResetLinkWorkerSuccessPage } from '@/modules/worker/views/send-reset-link/send-reset-link-success.page';
 import { ResetPasswordWorkerPage } from '@/modules/worker/views/reset-password/reset-password.page';
@@ -9,9 +7,6 @@ import { SendResetLinkWorkerPage } from '@/modules/worker/views/send-reset-link/
 import { ResetPasswordWorkerSuccessPage } from '@/modules/worker/views/reset-password/reset-password-success.page';
 import { JobsDiscoveryPage } from '@/modules/worker/views/jobs-discovery/jobs-discovery.page';
 import { JobsPage } from '@/modules/worker/views/jobs/jobs.page';
-import { EnableLabeler } from '@/modules/worker/views/hcaptcha-labeling/enable-labeler.page';
-import { HcaptchaLabelingPage } from '@/modules/worker/views/hcaptcha-labeling/hcaptcha-labeling.page';
-import { UserStatsAccordion } from '@/modules/worker/components/hcaptcha-labeling/user-stats-accordion';
 import { env } from '@/shared/env';
 import { RegistrationPage } from '@/modules/worker/views/registration/registration.page';
 import { WorkerProfilePage } from '@/modules/worker/components/profile/profile.page';
@@ -31,7 +26,13 @@ import { ConnectWalletOperatorPage } from '@/modules/operator/views/sign-up/conn
 import { OperatorProfilePage } from '@/modules/operator/views/profile/profile.page';
 import { Playground } from '@/modules/playground/views/playground.page';
 import { HomePage } from '@/modules/homepage/views/home.page';
+import {
+  HcaptchaLabelingPage,
+  UserStatsAccordion,
+  EnableLabelerPage,
+} from '@/modules/worker/hcaptcha-labeling';
 import { SignUpWorkerPage } from '@/modules/signup/worker';
+import { SignInWorkerPage } from '@/modules/signin/worker';
 
 export const unprotectedRoutes: RouteProps[] = [
   {
@@ -84,16 +85,6 @@ export const protectedRoutes: {
   routerProps: RouteProps;
   pageHeaderProps: PageHeaderProps;
 }[] = [
-  {
-    routerProps: {
-      path: '/protected',
-      element: <ProtectedPage />,
-    },
-    pageHeaderProps: {
-      headerIcon: <ProfileIcon />,
-      headerText: t('protectedPagesHeaders.profile'),
-    },
-  },
   {
     routerProps: {
       path: routerPaths.worker.jobsDiscovery,
@@ -152,7 +143,7 @@ export const protectedRoutes: {
   {
     routerProps: {
       path: routerPaths.worker.enableLabeler,
-      element: <EnableLabeler />,
+      element: <EnableLabelerPage />,
     },
     pageHeaderProps: {
       headerIcon: <HandIcon />,
diff --git a/packages/apps/human-app/server/package.json b/packages/apps/human-app/server/package.json
index b8a6db3c0c..b24c0329b1 100644
--- a/packages/apps/human-app/server/package.json
+++ b/packages/apps/human-app/server/package.json
@@ -33,12 +33,12 @@
     "@nestjs/platform-express": "^10.3.10",
     "@nestjs/schedule": "^4.0.1",
     "@nestjs/swagger": "^7.4.2",
-    "@nestjs/terminus": "^10.2.3",
+    "@nestjs/terminus": "^11.0.0",
     "cache-manager": "^5.4.0",
     "cache-manager-redis-yet": "^5.1.5",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
-    "ethers": "^6.12.1",
+    "ethers": "^6.13.5",
     "joi": "^17.13.3",
     "jsonwebtoken": "^9.0.2",
     "jwt-decode": "^4.0.0",
diff --git a/packages/apps/human-app/server/src/common/config/environment-config.service.spec.ts b/packages/apps/human-app/server/src/common/config/environment-config.service.spec.ts
index 2e0b9e0a68..449dd9743e 100644
--- a/packages/apps/human-app/server/src/common/config/environment-config.service.spec.ts
+++ b/packages/apps/human-app/server/src/common/config/environment-config.service.spec.ts
@@ -25,7 +25,9 @@ describe('EnvironmentConfigService', () => {
   });
 
   it('should return an array of valid ChainIds when CHAIN_IDS_ENABLED is valid', () => {
-    (configService.getOrThrow as jest.Mock).mockReturnValue('1, 11155111, 80002');
+    (configService.getOrThrow as jest.Mock).mockReturnValue(
+      '1, 11155111, 80002',
+    );
 
     const result = service.chainIdsEnabled;
 
diff --git a/packages/apps/human-app/server/src/common/config/gateway-config.service.ts b/packages/apps/human-app/server/src/common/config/gateway-config.service.ts
index 7a692a6425..1feec7deec 100644
--- a/packages/apps/human-app/server/src/common/config/gateway-config.service.ts
+++ b/packages/apps/human-app/server/src/common/config/gateway-config.service.ts
@@ -27,7 +27,7 @@ export class GatewayConfigService {
           url: this.envConfig.reputationOracleUrl,
           endpoints: {
             [ReputationOracleEndpoints.WORKER_SIGNUP]: {
-              endpoint: '/auth/signup',
+              endpoint: '/auth/web2/signup',
               method: HttpMethod.POST,
               headers: this.JSON_HEADER,
             },
@@ -37,7 +37,7 @@ export class GatewayConfigService {
               headers: this.JSON_HEADER,
             },
             [ReputationOracleEndpoints.WORKER_SIGNIN]: {
-              endpoint: '/auth/signin',
+              endpoint: '/auth/web2/signin',
               method: HttpMethod.POST,
               headers: this.JSON_HEADER,
             },
@@ -47,22 +47,22 @@ export class GatewayConfigService {
               headers: this.JSON_HEADER,
             },
             [ReputationOracleEndpoints.EMAIL_VERIFICATION]: {
-              endpoint: '/auth/email-verification',
+              endpoint: '/auth/web2/verify-email',
               method: HttpMethod.POST,
               headers: this.JSON_HEADER,
             },
             [ReputationOracleEndpoints.RESEND_EMAIL_VERIFICATION]: {
-              endpoint: '/auth/resend-email-verification',
+              endpoint: '/auth/web2/resend-verification-email',
               method: HttpMethod.POST,
               headers: this.JSON_HEADER,
             },
             [ReputationOracleEndpoints.FORGOT_PASSWORD]: {
-              endpoint: '/auth/forgot-password',
+              endpoint: '/auth/web2/forgot-password',
               method: HttpMethod.POST,
               headers: this.JSON_HEADER,
             },
             [ReputationOracleEndpoints.RESTORE_PASSWORD]: {
-              endpoint: '/auth/restore-password',
+              endpoint: '/auth/web2/restore-password',
               method: HttpMethod.POST,
               headers: this.JSON_HEADER,
             },
diff --git a/packages/apps/human-app/server/src/modules/oracle-discovery/spec/oracle-discovery.service.spec.ts b/packages/apps/human-app/server/src/modules/oracle-discovery/spec/oracle-discovery.service.spec.ts
index 7d041cc051..9005f40ec0 100644
--- a/packages/apps/human-app/server/src/modules/oracle-discovery/spec/oracle-discovery.service.spec.ts
+++ b/packages/apps/human-app/server/src/modules/oracle-discovery/spec/oracle-discovery.service.spec.ts
@@ -1,4 +1,4 @@
-import { ChainId, OperatorUtils } from '@human-protocol/sdk';
+import { ChainId, OperatorUtils, Role } from '@human-protocol/sdk';
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
 import { ConfigModule } from '@nestjs/config';
 import { Test } from '@nestjs/testing';
@@ -29,7 +29,7 @@ jest.mock('@human-protocol/sdk', () => {
 });
 
 describe('OracleDiscoveryService', () => {
-  const EXCHANGE_ORACLE = 'Exchange Oracle';
+  const EXCHANGE_ORACLE = Role.ExchangeOracle;
   const EXPECTED_CHAIN_IDS = [ChainId.POLYGON_AMOY, ChainId.BSC_TESTNET];
   const REPUTATION_ORACLE_ADDRESS = 'the_oracle';
   const TTL = '300';
diff --git a/packages/apps/human-app/server/src/modules/password-reset/model/restore-password.model.ts b/packages/apps/human-app/server/src/modules/password-reset/model/restore-password.model.ts
index 4b7bfc8a8a..b9f63b3c3e 100644
--- a/packages/apps/human-app/server/src/modules/password-reset/model/restore-password.model.ts
+++ b/packages/apps/human-app/server/src/modules/password-reset/model/restore-password.model.ts
@@ -32,5 +32,5 @@ export class RestorePasswordData {
   @AutoMap()
   token: string;
   @AutoMap()
-  hCaptchaToken: string;
+  h_captcha_token: string;
 }
diff --git a/packages/apps/human-app/server/src/modules/password-reset/spec/password-reset.fixtures.ts b/packages/apps/human-app/server/src/modules/password-reset/spec/password-reset.fixtures.ts
index bf95340534..b913af814f 100644
--- a/packages/apps/human-app/server/src/modules/password-reset/spec/password-reset.fixtures.ts
+++ b/packages/apps/human-app/server/src/modules/password-reset/spec/password-reset.fixtures.ts
@@ -44,5 +44,5 @@ export const restorePasswordCommandFixture: RestorePasswordCommand = {
 export const restorePasswordDataFixture: RestorePasswordData = {
   password: PASSWORD,
   token: TOKEN,
-  hCaptchaToken: H_CAPTCHA_TOKEN,
+  h_captcha_token: H_CAPTCHA_TOKEN,
 };
diff --git a/packages/apps/job-launcher/client/package.json b/packages/apps/job-launcher/client/package.json
index 3a4b23a3a1..8826196ad9 100644
--- a/packages/apps/job-launcher/client/package.json
+++ b/packages/apps/job-launcher/client/package.json
@@ -20,7 +20,7 @@
     "axios": "^1.1.3",
     "copy-to-clipboard": "^3.3.3",
     "dayjs": "^1.11.12",
-    "ethers": "^6.12.1",
+    "ethers": "^6.13.5",
     "file-saver": "^2.0.5",
     "formik": "^2.4.2",
     "jwt-decode": "^4.0.0",
@@ -36,7 +36,7 @@
     "wagmi": "^2.14.6",
     "web-vitals": "^4.2.2",
     "xml2js": "^0.6.2",
-    "yup": "^1.2.0"
+    "yup": "^1.6.1"
   },
   "scripts": {
     "lint": "eslint \"**/*.{ts,tsx}\"",
diff --git a/packages/apps/job-launcher/server/package.json b/packages/apps/job-launcher/server/package.json
index 875d27aa6f..24a3f9c169 100644
--- a/packages/apps/job-launcher/server/package.json
+++ b/packages/apps/job-launcher/server/package.json
@@ -40,7 +40,7 @@
     "@nestjs/schedule": "^4.0.1",
     "@nestjs/serve-static": "^4.0.1",
     "@nestjs/swagger": "^7.4.2",
-    "@nestjs/terminus": "^10.2.1",
+    "@nestjs/terminus": "^11.0.0",
     "@nestjs/typeorm": "^10.0.1",
     "@sendgrid/mail": "^8.1.3",
     "@types/passport-jwt": "^4.0.1",
diff --git a/packages/apps/job-launcher/server/src/modules/qualification/qualification.service.ts b/packages/apps/job-launcher/server/src/modules/qualification/qualification.service.ts
index 9a9d76888f..9e51d255fc 100644
--- a/packages/apps/job-launcher/server/src/modules/qualification/qualification.service.ts
+++ b/packages/apps/job-launcher/server/src/modules/qualification/qualification.service.ts
@@ -43,7 +43,7 @@ export class QualificationService {
 
       const { data } = await firstValueFrom(
         this.httpService.get<QualificationDto[]>(
-          `${reputationOracleUrl}/qualification`,
+          `${reputationOracleUrl}/qualifications`,
         ),
       );
 
diff --git a/packages/apps/reputation-oracle/server/.env.example b/packages/apps/reputation-oracle/server/.env.example
index c66ed4527d..f2b20e3467 100644
--- a/packages/apps/reputation-oracle/server/.env.example
+++ b/packages/apps/reputation-oracle/server/.env.example
@@ -44,10 +44,10 @@ S3_SECRET_KEY=devdevdev
 S3_BUCKET=reputation
 S3_USE_SSL=false
 
-# Sendgrid
-SENDGRID_API_KEY=SG.testkey
-SENDGRID_FROM_EMAIL=test@example.com
-SENDGRID_FROM_NAME="Reputation oracle"
+# Email
+SENDGRID_API_KEY=
+EMAIL_FROM=test@example.com
+EMAIL_FROM_NAME="Reputation oracle"
 
 # Web3
 WEB3_ENV=testnet
diff --git a/packages/apps/reputation-oracle/server/.eslintrc.js b/packages/apps/reputation-oracle/server/.eslintrc.js
index 259de13c73..4517e5977d 100644
--- a/packages/apps/reputation-oracle/server/.eslintrc.js
+++ b/packages/apps/reputation-oracle/server/.eslintrc.js
@@ -21,5 +21,14 @@ module.exports = {
     '@typescript-eslint/explicit-function-return-type': 'off',
     '@typescript-eslint/explicit-module-boundary-types': 'off',
     '@typescript-eslint/no-explicit-any': 'off',
+    '@typescript-eslint/no-unused-vars': ['error', {
+      "args": "all",
+      "argsIgnorePattern": "^_",
+      "caughtErrors": "all",
+      "caughtErrorsIgnorePattern": "^noop",
+      "destructuredArrayIgnorePattern": "^_",
+      "varsIgnorePattern": "^_",
+      "ignoreRestSiblings": true
+    }]
   },
 };
diff --git a/packages/apps/reputation-oracle/server/jest.config.ts b/packages/apps/reputation-oracle/server/jest.config.ts
index 660e5a6e07..92a01987a8 100644
--- a/packages/apps/reputation-oracle/server/jest.config.ts
+++ b/packages/apps/reputation-oracle/server/jest.config.ts
@@ -1,3 +1,5 @@
+process.env['GIT_HASH'] = 'test_value_hardcoded_in_jest_config';
+
 module.exports = {
   coverageDirectory: '../coverage',
   collectCoverageFrom: ['**/*.(t|j)s'],
@@ -12,4 +14,4 @@ module.exports = {
     '^uuid$': require.resolve('uuid'),
     '^typeorm$': require.resolve('typeorm'),
   },
-};
\ No newline at end of file
+};
diff --git a/packages/apps/reputation-oracle/server/package.json b/packages/apps/reputation-oracle/server/package.json
index 3a246b25c5..85c39c17e1 100644
--- a/packages/apps/reputation-oracle/server/package.json
+++ b/packages/apps/reputation-oracle/server/package.json
@@ -42,7 +42,7 @@
     "@nestjs/schedule": "^4.0.1",
     "@nestjs/serve-static": "^4.0.2",
     "@nestjs/swagger": "^7.4.2",
-    "@nestjs/terminus": "^10.2.1",
+    "@nestjs/terminus": "^11.0.0",
     "@nestjs/typeorm": "^10.0.1",
     "@sendgrid/mail": "^8.1.3",
     "@types/json-stable-stringify": "^1.0.36",
@@ -52,7 +52,7 @@
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
     "dotenv": "^16.3.2",
-    "ethers": "^6.13.1",
+    "ethers": "^6.13.5",
     "helmet": "^7.1.0",
     "joi": "^17.13.3",
     "json-stable-stringify": "^1.1.1",
@@ -61,6 +61,7 @@
     "passport": "^0.7.0",
     "passport-jwt": "^4.0.1",
     "pg": "8.13.1",
+    "pino": "^9.6.0",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.2.0",
     "typeorm": "^0.3.16",
@@ -68,6 +69,7 @@
     "zxcvbn": "^4.4.2"
   },
   "devDependencies": {
+    "@faker-js/faker": "^9.4.0",
     "@golevelup/ts-jest": "^0.6.1",
     "@nestjs/cli": "^10.3.2",
     "@nestjs/schematics": "^10.1.3",
@@ -87,6 +89,7 @@
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
     "jest": "29.7.0",
+    "pino-pretty": "^13.0.0",
     "prettier": "^3.4.2",
     "source-map-support": "^0.5.20",
     "supertest": "^7.0.0",
diff --git a/packages/apps/reputation-oracle/server/src/app.module.ts b/packages/apps/reputation-oracle/server/src/app.module.ts
index d9e3963b3f..5b841bf230 100644
--- a/packages/apps/reputation-oracle/server/src/app.module.ts
+++ b/packages/apps/reputation-oracle/server/src/app.module.ts
@@ -23,6 +23,7 @@ import { QualificationModule } from './modules/qualification/qualification.modul
 import { EscrowCompletionModule } from './modules/escrow-completion/escrow-completion.module';
 import { WebhookIncomingModule } from './modules/webhook/webhook-incoming.module';
 import { WebhookOutgoingModule } from './modules/webhook/webhook-outgoing.module';
+import { EmailModule } from './modules/email/module';
 
 @Module({
   providers: [
@@ -68,6 +69,7 @@ import { WebhookOutgoingModule } from './modules/webhook/webhook-outgoing.module
     HCaptchaModule,
     QualificationModule,
     EscrowCompletionModule,
+    EmailModule,
   ],
   controllers: [AppController],
 })
diff --git a/packages/apps/reputation-oracle/server/src/common/config/config.module.ts b/packages/apps/reputation-oracle/server/src/common/config/config.module.ts
index 9d1e491335..dcbfed9515 100644
--- a/packages/apps/reputation-oracle/server/src/common/config/config.module.ts
+++ b/packages/apps/reputation-oracle/server/src/common/config/config.module.ts
@@ -6,7 +6,7 @@ import { ServerConfigService } from './server-config.service';
 import { DatabaseConfigService } from './database-config.service';
 import { PGPConfigService } from './pgp-config.service';
 import { S3ConfigService } from './s3-config.service';
-import { SendgridConfigService } from './sendgrid-config.service';
+import { EmailConfigService } from './email-config.service';
 import { Web3ConfigService } from './web3-config.service';
 import { ReputationConfigService } from './reputation-config.service';
 import { KycConfigService } from './kyc-config.service';
@@ -23,7 +23,7 @@ import { HCaptchaConfigService } from './hcaptcha-config.service';
     Web3ConfigService,
     S3ConfigService,
     ReputationConfigService,
-    SendgridConfigService,
+    EmailConfigService,
     KycConfigService,
     PGPConfigService,
     NetworkConfigService,
@@ -37,7 +37,7 @@ import { HCaptchaConfigService } from './hcaptcha-config.service';
     Web3ConfigService,
     S3ConfigService,
     ReputationConfigService,
-    SendgridConfigService,
+    EmailConfigService,
     KycConfigService,
     PGPConfigService,
     NetworkConfigService,
diff --git a/packages/apps/reputation-oracle/server/src/common/config/email-config.service.ts b/packages/apps/reputation-oracle/server/src/common/config/email-config.service.ts
new file mode 100644
index 0000000000..44c04c84ac
--- /dev/null
+++ b/packages/apps/reputation-oracle/server/src/common/config/email-config.service.ts
@@ -0,0 +1,35 @@
+import { Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+
+@Injectable()
+export class EmailConfigService {
+  constructor(private configService: ConfigService) {}
+
+  /**
+   * The API key used for authenticating requests to the email provider API.
+   * Should be overridden in stagin/production environments.
+   * Default: 'disabled'
+   */
+  get apiKey(): string {
+    return this.configService.get<string>('SENDGRID_API_KEY', 'disabled');
+  }
+
+  /**
+   * The email address that will be used as the sender's address in emails.
+   * Default: 'app@humanprotocol.org'
+   */
+  get from(): string {
+    return this.configService.get<string>(
+      'EMAIL_FROM',
+      'app@humanprotocol.org',
+    );
+  }
+
+  /**
+   * The name that will be used as the sender's name in emails.
+   * Default: 'Human Protocol'
+   */
+  get fromName(): string {
+    return this.configService.get<string>('EMAIL_FROM_NAME', 'Human Protocol');
+  }
+}
diff --git a/packages/apps/reputation-oracle/server/src/common/config/env-schema.ts b/packages/apps/reputation-oracle/server/src/common/config/env-schema.ts
index 98609817c7..11142ebb4d 100644
--- a/packages/apps/reputation-oracle/server/src/common/config/env-schema.ts
+++ b/packages/apps/reputation-oracle/server/src/common/config/env-schema.ts
@@ -54,10 +54,10 @@ export const envValidator = Joi.object({
   S3_SECRET_KEY: Joi.string().required(),
   S3_BUCKET: Joi.string(),
   S3_USE_SSL: Joi.string(),
-  // SendGrid
-  SENDGRID_API_KEY: Joi.string().required(),
-  SENDGRID_FROM_EMAIL: Joi.string(),
-  SENDGRID_FROM_NAME: Joi.string(),
+  // Email
+  SENDGRID_API_KEY: Joi.string(),
+  EMAIL_FROM: Joi.string(),
+  EMAIL_FROM_NAME: Joi.string(),
   // Reputation Level
   REPUTATION_LEVEL_LOW: Joi.number(),
   REPUTATION_LEVEL_HIGH: Joi.number(),
diff --git a/packages/apps/reputation-oracle/server/src/common/config/sendgrid-config.service.ts b/packages/apps/reputation-oracle/server/src/common/config/sendgrid-config.service.ts
deleted file mode 100644
index 3744e6db73..0000000000
--- a/packages/apps/reputation-oracle/server/src/common/config/sendgrid-config.service.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
-import { SENDGRID_API_KEY_DISABLED } from '../constants';
-
-@Injectable()
-export class SendgridConfigService {
-  constructor(private configService: ConfigService) {}
-
-  /**
-   * The API key used for authenticating requests to the SendGrid API.
-   * Default: 'sendgrid-disabled'
-   */
-  get apiKey(): string {
-    return this.configService.get<string>(
-      'SENDGRID_API_KEY',
-      SENDGRID_API_KEY_DISABLED,
-    );
-  }
-
-  /**
-   * The email address that will be used as the sender's address in emails sent via SendGrid.
-   * Default: 'app@humanprotocol.org'
-   */
-  get fromEmail(): string {
-    return this.configService.get<string>(
-      'SENDGRID_FROM_EMAIL',
-      'app@humanprotocol.org',
-    );
-  }
-
-  /**
-   * The name that will be used as the sender's name in emails sent via SendGrid.
-   * Default: 'Human Protocol'
-   */
-  get fromName(): string {
-    return this.configService.get<string>(
-      'SENDGRID_FROM_NAME',
-      'Human Protocol',
-    );
-  }
-}
diff --git a/packages/apps/reputation-oracle/server/src/common/config/server-config.service.ts b/packages/apps/reputation-oracle/server/src/common/config/server-config.service.ts
index 8da3895f8f..7ee50bbc58 100644
--- a/packages/apps/reputation-oracle/server/src/common/config/server-config.service.ts
+++ b/packages/apps/reputation-oracle/server/src/common/config/server-config.service.ts
@@ -13,6 +13,10 @@ export class ServerConfigService {
     return this.configService.get<string>('NODE_ENV', 'development');
   }
 
+  get gitHash(): string {
+    return this.configService.get<string>('GIT_HASH', '');
+  }
+
   /**
    * The hostname or IP address on which the server will run.
    * Default: 'localhost'
diff --git a/packages/apps/reputation-oracle/server/src/common/constants/index.ts b/packages/apps/reputation-oracle/server/src/common/constants/index.ts
index b607e7fb49..8b71b9b341 100644
--- a/packages/apps/reputation-oracle/server/src/common/constants/index.ts
+++ b/packages/apps/reputation-oracle/server/src/common/constants/index.ts
@@ -1,20 +1,16 @@
 import { JobRequestType } from '../enums';
 
-export const SERVICE_NAME = 'App';
+export enum Environment {
+  DEVELOPMENT = 'development',
+  TEST = 'test',
+  STAGING = 'staging',
+  PRODUCTION = 'production',
+}
 export const NS = 'hmt';
 export const RETRIES_COUNT_THRESHOLD = 3;
 export const INITIAL_REPUTATION = 0;
 export const JWT_PREFIX = 'bearer ';
 export const JWT_STRATEGY_NAME = 'jwt-http';
-export const SENDGRID_API_KEY_REGEX =
-  /^SG\.[A-Za-z0-9-_]{22}\.[A-Za-z0-9-_]{43}$/;
-export const SENDGRID_API_KEY_DISABLED = 'sendgrid-disabled';
-
-export const SENDGRID_TEMPLATES = {
-  signup: 'd-ca99cc7410aa4e6dab3e6042d5ecb9a3',
-  resetPassword: 'd-3ac74546352a4e1abdd1689947632c22',
-  passwordChanged: 'd-ca0ac7e6fff845829cd0167af09f25cf',
-};
 
 export const CVAT_RESULTS_ANNOTATIONS_FILENAME = 'resulting_annotations.zip';
 export const CVAT_VALIDATION_META_FILENAME = 'validation_meta.json';
@@ -30,7 +26,8 @@ export const CVAT_JOB_TYPES = [
 
 export const HEADER_SIGNATURE_KEY = 'human-signature';
 
-export const RESEND_EMAIL_VERIFICATION_PATH = '/auth/resend-email-verification';
+export const RESEND_EMAIL_VERIFICATION_PATH =
+  '/auth/web2/resend-verification-email';
 export const LOGOUT_PATH = '/auth/logout';
 
 export const BACKOFF_INTERVAL_SECONDS = 120;
diff --git a/packages/apps/reputation-oracle/server/src/common/decorators/index.ts b/packages/apps/reputation-oracle/server/src/common/decorators/index.ts
index 3878e7f27f..00df47fd20 100644
--- a/packages/apps/reputation-oracle/server/src/common/decorators/index.ts
+++ b/packages/apps/reputation-oracle/server/src/common/decorators/index.ts
@@ -1,3 +1,3 @@
 export * from './public';
 export * from './roles';
-export * from './enums';
+export * from './validation';
diff --git a/packages/apps/reputation-oracle/server/src/common/decorators/enums.ts b/packages/apps/reputation-oracle/server/src/common/decorators/validation.ts
similarity index 61%
rename from packages/apps/reputation-oracle/server/src/common/decorators/enums.ts
rename to packages/apps/reputation-oracle/server/src/common/decorators/validation.ts
index e6d3bf29ad..a6cd51f277 100644
--- a/packages/apps/reputation-oracle/server/src/common/decorators/enums.ts
+++ b/packages/apps/reputation-oracle/server/src/common/decorators/validation.ts
@@ -1,7 +1,11 @@
+/* eslint-disable prettier/prettier */
+import { applyDecorators } from '@nestjs/common';
+import { Transform } from 'class-transformer';
 import {
   registerDecorator,
   ValidationOptions,
   ValidationArguments,
+  IsEmail,
 } from 'class-validator';
 import 'reflect-metadata';
 
@@ -50,3 +54,34 @@ export function IsEnumCaseInsensitive(
     });
   };
 }
+
+export function LowercasedEmail() {
+  return applyDecorators(
+    IsEmail(),
+    Transform(({ value }: { value: string }) => value.toLowerCase()),
+  );
+}
+
+export function IsValidWeb3Signature(validationOptions?: ValidationOptions) {
+  return function (object: object, propertyName: string) {
+    registerDecorator({
+      name: 'isValidWeb3Signature',
+      target: object.constructor,
+      propertyName: propertyName,
+      options: validationOptions,
+      validator: {
+        validate(value: any) {
+          if (typeof value !== 'string') {
+            return false;
+          }
+
+          const regex = /^0x[a-fA-F0-9]{130}$/;
+          return regex.test(value);
+        },
+        defaultMessage(args: ValidationArguments) {
+          return `${args.property} must be a valid Ethereum Web3 signature in hex format starting with "0x"`;
+        },
+      },
+    });
+  };
+}
diff --git a/packages/apps/reputation-oracle/server/src/common/exceptions/exception.filter.ts b/packages/apps/reputation-oracle/server/src/common/exceptions/exception.filter.ts
index 294d36cb0d..89935a2581 100644
--- a/packages/apps/reputation-oracle/server/src/common/exceptions/exception.filter.ts
+++ b/packages/apps/reputation-oracle/server/src/common/exceptions/exception.filter.ts
@@ -3,15 +3,15 @@ import {
   Catch,
   ExceptionFilter as IExceptionFilter,
   HttpStatus,
-  Logger,
   HttpException,
 } from '@nestjs/common';
 import { Request, Response } from 'express';
 import { DatabaseError } from '../errors/database';
+import logger from '../../logger';
 
 @Catch()
 export class ExceptionFilter implements IExceptionFilter {
-  private logger = new Logger(ExceptionFilter.name);
+  private readonly logger = logger.child({ context: ExceptionFilter.name });
 
   catch(exception: any, host: ArgumentsHost) {
     const ctx = host.switchToHttp();
@@ -19,41 +19,36 @@ export class ExceptionFilter implements IExceptionFilter {
     const request = ctx.getRequest<Request>();
 
     let status = HttpStatus.INTERNAL_SERVER_ERROR;
-    let message = 'Internal server error';
+    const responseBody: { message: string; [x: string]: unknown } = {
+      message: 'Internal server error',
+    };
 
     if (exception instanceof DatabaseError) {
       status = HttpStatus.UNPROCESSABLE_ENTITY;
-      message = exception.message;
+      responseBody.message = exception.message;
 
-      this.logger.error(
-        `Database error: ${exception.message}`,
-        exception.stack,
-      );
-      // Temp hack for the in progress exception handling refactoring
+      this.logger.error('Database error', exception);
     } else if (exception instanceof HttpException) {
-      /**
-       * TODO: align this with common response schema
-       * to avoid missing properties
-       */
-      return response
-        .status(exception.getStatus())
-        .json(exception.getResponse());
-    } else {
-      if (exception.statusCode === HttpStatus.BAD_REQUEST) {
-        status = exception.statusCode;
-        message = exception.message;
+      status = exception.getStatus();
+      const exceptionResponse = exception.getResponse();
+      if (typeof exceptionResponse === 'string') {
+        responseBody.message = exceptionResponse;
+      } else {
+        Object.assign(responseBody, exceptionResponse);
       }
-      this.logger.error(
-        `Unhandled exception: ${exception.message}`,
-        exception.stack,
-      );
+    } else {
+      this.logger.error('Unhandled exception', exception);
     }
 
-    response.status(status).json({
-      statusCode: status,
-      timestamp: new Date().toISOString(),
-      message: message,
-      path: request.url,
-    });
+    response.status(status).json(
+      Object.assign(
+        {
+          status_code: status,
+          path: request.url,
+          timestamp: new Date().toISOString(),
+        },
+        responseBody,
+      ),
+    );
   }
 }
diff --git a/packages/apps/reputation-oracle/server/src/common/guards/hcaptcha.ts b/packages/apps/reputation-oracle/server/src/common/guards/hcaptcha.ts
index 02cc60a07e..5b9a169ed3 100644
--- a/packages/apps/reputation-oracle/server/src/common/guards/hcaptcha.ts
+++ b/packages/apps/reputation-oracle/server/src/common/guards/hcaptcha.ts
@@ -4,7 +4,6 @@ import {
   ExecutionContext,
   HttpStatus,
   HttpException,
-  Logger,
 } from '@nestjs/common';
 import { Request } from 'express';
 import { HCaptchaService } from '../../integrations/hcaptcha/hcaptcha.service';
@@ -12,7 +11,6 @@ import { AuthConfigService } from '../config/auth-config.service';
 
 @Injectable()
 export class HCaptchaGuard implements CanActivate {
-  logger = new Logger(HCaptchaGuard.name);
   constructor(
     private readonly hCaptchaService: HCaptchaService,
     private readonly authConfigSerice: AuthConfigService,
@@ -21,10 +19,13 @@ export class HCaptchaGuard implements CanActivate {
     const request: Request = context.switchToHttp().getRequest();
 
     const { body } = request;
+    /**
+     * Guards called before interceptors,
+     * so we need to access body params as is
+     */
     const hCaptchaToken = body['h_captcha_token'];
-
     // TODO: Remove 27-45 lines once we figure out how to replace human app user
-    if (request.path === '/auth/signin') {
+    if (request.path === '/auth/web2/signin') {
       const email = body['email'];
       // Checking email here to avoid unnecessary db calls
       if (email === this.authConfigSerice.humanAppEmail) {
@@ -33,30 +34,17 @@ export class HCaptchaGuard implements CanActivate {
     }
 
     if (!hCaptchaToken) {
-      const message = 'hCaptcha token not provided';
-      this.logger.error(message, request.path);
       throw new HttpException(
-        {
-          statusCode: HttpStatus.BAD_REQUEST,
-          message,
-          timestamp: new Date().toISOString(),
-        },
+        'hCaptcha token not provided',
         HttpStatus.BAD_REQUEST,
       );
     }
 
-    const captchaVerificationResult = await this.hCaptchaService.verifyToken({
+    const isTokenValid = await this.hCaptchaService.verifyToken({
       token: hCaptchaToken,
     });
-    if (!captchaVerificationResult.success) {
-      throw new HttpException(
-        {
-          statusCode: HttpStatus.BAD_REQUEST,
-          message: 'Invalid hCaptcha token',
-          timestamp: new Date().toISOString(),
-        },
-        HttpStatus.BAD_REQUEST,
-      );
+    if (!isTokenValid) {
+      throw new HttpException('Invalid hCaptcha token', HttpStatus.BAD_REQUEST);
     }
 
     return true;
diff --git a/packages/apps/reputation-oracle/server/src/common/guards/jwt.auth.ts b/packages/apps/reputation-oracle/server/src/common/guards/jwt.auth.ts
index d7d4e1378b..8ac1c832d0 100644
--- a/packages/apps/reputation-oracle/server/src/common/guards/jwt.auth.ts
+++ b/packages/apps/reputation-oracle/server/src/common/guards/jwt.auth.ts
@@ -21,7 +21,7 @@ export class JwtAuthGuard
   public async canActivate(context: ExecutionContext): Promise<boolean> {
     // `super` has to be called to set `user` on `request`
     // see https://github.com/nestjs/passport/blob/master/lib/auth.guard.ts
-    return (super.canActivate(context) as Promise<boolean>).catch((e) => {
+    return (super.canActivate(context) as Promise<boolean>).catch((_error) => {
       const isPublic = this.reflector.getAllAndOverride<boolean>('isPublic', [
         context.getHandler(),
         context.getClass(),
@@ -31,14 +31,7 @@ export class JwtAuthGuard
         return true;
       }
 
-      throw new HttpException(
-        {
-          statusCode: HttpStatus.UNAUTHORIZED,
-          message: 'Unauthorized',
-          timestamp: new Date().toISOString(),
-        },
-        HttpStatus.UNAUTHORIZED,
-      );
+      throw new HttpException('Unauthorized', HttpStatus.UNAUTHORIZED);
     });
   }
 }
diff --git a/packages/apps/reputation-oracle/server/src/common/guards/kyc-webhook.auth.ts b/packages/apps/reputation-oracle/server/src/common/guards/kyc-webhook.auth.ts
index aed6c26f3e..c590bf20ce 100644
--- a/packages/apps/reputation-oracle/server/src/common/guards/kyc-webhook.auth.ts
+++ b/packages/apps/reputation-oracle/server/src/common/guards/kyc-webhook.auth.ts
@@ -4,7 +4,6 @@ import {
   ExecutionContext,
   HttpStatus,
   HttpException,
-  Logger,
 } from '@nestjs/common';
 import { Request } from 'express';
 import { createHmac } from 'crypto';
@@ -12,7 +11,6 @@ import { KycConfigService } from '../config/kyc-config.service';
 
 @Injectable()
 export class KycWebhookAuthGuard implements CanActivate {
-  logger = new Logger(KycWebhookAuthGuard.name);
   constructor(private readonly kycConfigService: KycConfigService) {}
   canActivate(context: ExecutionContext): boolean {
     const request: Request = context.switchToHttp().getRequest();
@@ -22,15 +20,9 @@ export class KycWebhookAuthGuard implements CanActivate {
     const hmacSignature = headers['x-hmac-signature'];
 
     if (!hmacSignature) {
-      const message = 'HMAC Signature not provided';
-      this.logger.error(message, request.path);
       throw new HttpException(
-        {
-          statusCode: HttpStatus.UNAUTHORIZED,
-          message,
-          timestamp: new Date().toISOString(),
-        },
-        HttpStatus.UNAUTHORIZED,
+        'HMAC Signature not provided',
+        HttpStatus.BAD_REQUEST,
       );
     }
 
@@ -45,14 +37,8 @@ export class KycWebhookAuthGuard implements CanActivate {
       signedPayload !== hmacSignature ||
       this.kycConfigService.apiKey !== apiKey
     ) {
-      const message = 'HMAC Signature does not match';
-      this.logger.error(message, request.path);
       throw new HttpException(
-        {
-          statusCode: HttpStatus.UNAUTHORIZED,
-          message,
-          timestamp: new Date().toISOString(),
-        },
+        'HMAC Signature does not match',
         HttpStatus.UNAUTHORIZED,
       );
     }
diff --git a/packages/apps/reputation-oracle/server/src/common/guards/roles.auth.ts b/packages/apps/reputation-oracle/server/src/common/guards/roles.auth.ts
index 379bf35ec1..857f50a8d2 100644
--- a/packages/apps/reputation-oracle/server/src/common/guards/roles.auth.ts
+++ b/packages/apps/reputation-oracle/server/src/common/guards/roles.auth.ts
@@ -30,13 +30,6 @@ export class RolesAuthGuard implements CanActivate {
       return true;
     }
 
-    throw new HttpException(
-      {
-        statusCode: HttpStatus.UNAUTHORIZED,
-        message: 'Unauthorized',
-        timestamp: new Date().toISOString(),
-      },
-      HttpStatus.UNAUTHORIZED,
-    );
+    throw new HttpException('Unauthorized', HttpStatus.UNAUTHORIZED);
   }
 }
diff --git a/packages/apps/reputation-oracle/server/src/common/guards/signature.auth.spec.ts b/packages/apps/reputation-oracle/server/src/common/guards/signature.auth.spec.ts
index c32d407d86..f9e9380fb3 100644
--- a/packages/apps/reputation-oracle/server/src/common/guards/signature.auth.spec.ts
+++ b/packages/apps/reputation-oracle/server/src/common/guards/signature.auth.spec.ts
@@ -84,11 +84,7 @@ describe('SignatureAuthGuard', () => {
         catchedError = error;
       }
       expect(catchedError).toBeInstanceOf(HttpException);
-      expect(catchedError.response).toHaveProperty(
-        'message',
-        'Invalid web3 signature',
-      );
-      expect(catchedError.response).toHaveProperty('timestamp');
+      expect(catchedError).toHaveProperty('message', 'Invalid web3 signature');
       expect(catchedError).toHaveProperty('status', HttpStatus.UNAUTHORIZED);
     });
 
@@ -101,11 +97,7 @@ describe('SignatureAuthGuard', () => {
         catchedError = error;
       }
       expect(catchedError).toBeInstanceOf(HttpException);
-      expect(catchedError.response).toHaveProperty(
-        'message',
-        'Invalid web3 signature',
-      );
-      expect(catchedError.response).toHaveProperty('timestamp');
+      expect(catchedError).toHaveProperty('message', 'Invalid web3 signature');
       expect(catchedError).toHaveProperty('status', HttpStatus.UNAUTHORIZED);
     });
   });
diff --git a/packages/apps/reputation-oracle/server/src/common/guards/signature.auth.ts b/packages/apps/reputation-oracle/server/src/common/guards/signature.auth.ts
index 6df42fbf22..9ec08e5d6e 100644
--- a/packages/apps/reputation-oracle/server/src/common/guards/signature.auth.ts
+++ b/packages/apps/reputation-oracle/server/src/common/guards/signature.auth.ts
@@ -4,7 +4,6 @@ import {
   HttpException,
   HttpStatus,
   Injectable,
-  Logger,
 } from '@nestjs/common';
 import { verifySignature } from '../utils/signature';
 import { HEADER_SIGNATURE_KEY } from '../constants';
@@ -13,7 +12,6 @@ import { AuthSignatureRole } from '../enums/role';
 
 @Injectable()
 export class SignatureAuthGuard implements CanActivate {
-  logger = new Logger(SignatureAuthGuard.name);
   constructor(private role: AuthSignatureRole[]) {}
 
   public async canActivate(context: ExecutionContext): Promise<boolean> {
@@ -45,14 +43,8 @@ export class SignatureAuthGuard implements CanActivate {
     const isVerified = verifySignature(data, signature, oracleAdresses);
 
     if (!isVerified) {
-      const message = 'Invalid web3 signature';
-      this.logger.error(message, request.path);
       throw new HttpException(
-        {
-          statusCode: HttpStatus.UNAUTHORIZED,
-          message,
-          timestamp: new Date().toISOString(),
-        },
+        'Invalid web3 signature',
         HttpStatus.UNAUTHORIZED,
       );
     }
diff --git a/packages/apps/reputation-oracle/server/src/common/interceptors/transform-enum.interceptor.spec.ts b/packages/apps/reputation-oracle/server/src/common/interceptors/transform-enum.interceptor.spec.ts
index 7dee960c9e..fd3ae360a1 100644
--- a/packages/apps/reputation-oracle/server/src/common/interceptors/transform-enum.interceptor.spec.ts
+++ b/packages/apps/reputation-oracle/server/src/common/interceptors/transform-enum.interceptor.spec.ts
@@ -62,7 +62,7 @@ describe('TransformEnumInterceptor', () => {
     };
 
     // Mock Reflect.getMetadata to return DTO and Enum types
-    Reflect.getMetadata = jest.fn((metadataKey, target, propertyKey) => {
+    Reflect.getMetadata = jest.fn((metadataKey, _target, propertyKey) => {
       // Mock design:paramtypes to return MockDto as the parameter type
       if (metadataKey === 'design:paramtypes') {
         return [MockDto];
diff --git a/packages/apps/reputation-oracle/server/src/common/pipes/validation.ts b/packages/apps/reputation-oracle/server/src/common/pipes/validation.ts
index 702e9fe044..4b1a5e3656 100644
--- a/packages/apps/reputation-oracle/server/src/common/pipes/validation.ts
+++ b/packages/apps/reputation-oracle/server/src/common/pipes/validation.ts
@@ -21,11 +21,7 @@ export class HttpValidationPipe extends ValidationPipe {
           .flat();
 
         return new HttpException(
-          {
-            statusCode: HttpStatus.BAD_REQUEST,
-            message: errorMessages.join(', '),
-            timestamp: new Date().toISOString(),
-          },
+          errorMessages.join(', '),
           HttpStatus.BAD_REQUEST,
         );
       },
diff --git a/packages/apps/reputation-oracle/server/src/common/utils/environment.ts b/packages/apps/reputation-oracle/server/src/common/utils/environment.ts
new file mode 100644
index 0000000000..f9ec4c4c59
--- /dev/null
+++ b/packages/apps/reputation-oracle/server/src/common/utils/environment.ts
@@ -0,0 +1,8 @@
+import { Environment } from '../constants';
+
+export function isDevelopmentEnv(): boolean {
+  return (
+    process.env.NODE_ENV === Environment.DEVELOPMENT ||
+    process.env.NODE_ENV === Environment.TEST
+  );
+}
diff --git a/packages/apps/reputation-oracle/server/src/common/utils/signature.ts b/packages/apps/reputation-oracle/server/src/common/utils/signature.ts
index a6d06bdef4..7e76a417b0 100644
--- a/packages/apps/reputation-oracle/server/src/common/utils/signature.ts
+++ b/packages/apps/reputation-oracle/server/src/common/utils/signature.ts
@@ -36,7 +36,7 @@ export function recoverSigner(
 
   try {
     return ethers.verifyMessage(message, signature);
-  } catch (e) {
+  } catch (noop) {
     return '';
   }
 }
diff --git a/packages/apps/reputation-oracle/server/src/integrations/hcaptcha/hcaptcha.module.ts b/packages/apps/reputation-oracle/server/src/integrations/hcaptcha/hcaptcha.module.ts
index 51dfb26283..e910e81db5 100644
--- a/packages/apps/reputation-oracle/server/src/integrations/hcaptcha/hcaptcha.module.ts
+++ b/packages/apps/reputation-oracle/server/src/integrations/hcaptcha/hcaptcha.module.ts
@@ -1,11 +1,11 @@
-import { Logger, Module } from '@nestjs/common';
+import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { HCaptchaService } from './hcaptcha.service';
 import { HttpModule } from '@nestjs/axios';
 
 @Module({
   imports: [ConfigModule, HttpModule],
-  providers: [Logger, HCaptchaService],
+  providers: [HCaptchaService],
   exports: [HCaptchaService],
 })
 export class HCaptchaModule {}
diff --git a/packages/apps/reputation-oracle/server/src/integrations/hcaptcha/hcaptcha.service.spec.ts b/packages/apps/reputation-oracle/server/src/integrations/hcaptcha/hcaptcha.service.spec.ts
index 7576ea81a6..b941f914e6 100644
--- a/packages/apps/reputation-oracle/server/src/integrations/hcaptcha/hcaptcha.service.spec.ts
+++ b/packages/apps/reputation-oracle/server/src/integrations/hcaptcha/hcaptcha.service.spec.ts
@@ -83,7 +83,7 @@ describe('hCaptchaService', () => {
 
       const result = await hcaptchaService.verifyToken(mockData);
 
-      expect(result).toEqual(mockResponseData);
+      expect(result).toEqual(true);
       expect(httpService.post).toHaveBeenCalledWith(
         `${MOCK_HCAPTCHA_PROTECTION_URL}/siteverify`,
         {},
@@ -116,7 +116,7 @@ describe('hCaptchaService', () => {
 
       const result = await hcaptchaService.verifyToken(mockData);
 
-      expect(result).toEqual(mockResponseData);
+      expect(result).toEqual(true);
       expect(httpService.post).toHaveBeenCalledWith(
         `${MOCK_HCAPTCHA_PROTECTION_URL}/siteverify`,
         {},
@@ -147,7 +147,7 @@ describe('hCaptchaService', () => {
 
       const result = await hcaptchaService.verifyToken(mockData);
 
-      expect(result).toEqual(mockResponseData);
+      expect(result).toEqual(true);
       expect(httpService.post).toHaveBeenCalledWith(
         `${MOCK_HCAPTCHA_PROTECTION_URL}/siteverify`,
         {},
@@ -180,7 +180,7 @@ describe('hCaptchaService', () => {
 
       const result = await hcaptchaService.verifyToken(mockData);
 
-      expect(result).toEqual(mockResponseData);
+      expect(result).toEqual(true);
       expect(httpService.post).toHaveBeenCalledWith(
         `${MOCK_HCAPTCHA_PROTECTION_URL}/siteverify`,
         {},
diff --git a/packages/apps/reputation-oracle/server/src/integrations/hcaptcha/hcaptcha.service.ts b/packages/apps/reputation-oracle/server/src/integrations/hcaptcha/hcaptcha.service.ts
index e21f2a8fa6..9d349ec7ff 100644
--- a/packages/apps/reputation-oracle/server/src/integrations/hcaptcha/hcaptcha.service.ts
+++ b/packages/apps/reputation-oracle/server/src/integrations/hcaptcha/hcaptcha.service.ts
@@ -1,28 +1,24 @@
-import { Injectable, Logger } from '@nestjs/common';
+import { HttpService } from '@nestjs/axios';
+import { Injectable } from '@nestjs/common';
+import { firstValueFrom } from 'rxjs';
 import {
   hCaptchaGetLabeler,
   hCaptchaRegisterLabeler,
   hCaptchaVerifyToken,
 } from './hcaptcha.dto';
-import { HttpService } from '@nestjs/axios';
-import { firstValueFrom } from 'rxjs';
 import { HCaptchaConfigService } from '../../common/config/hcaptcha-config.service';
+import logger from '../../logger';
 
 @Injectable()
 export class HCaptchaService {
-  private readonly logger = new Logger(HCaptchaService.name);
+  private readonly logger = logger.child({ context: HCaptchaService.name });
 
   constructor(
     private httpService: HttpService,
     private readonly hcaptchaConfigService: HCaptchaConfigService,
   ) {}
 
-  /**
-   * Verifies the hCaptcha token.
-   * @param {hCaptchaVerifyToken} data - The data required for token verification.
-   * @returns {Promise<any>} - The verification result.
-   */
-  public async verifyToken(data: hCaptchaVerifyToken): Promise<any> {
+  public async verifyToken(data: hCaptchaVerifyToken): Promise<boolean> {
     try {
       const { ip, token } = data;
 
@@ -44,19 +40,19 @@ export class HCaptchaService {
         ),
       );
 
-      if (
-        response &&
-        response.data.success === true &&
-        response.status === 200
-      ) {
-        return response.data;
-      } else if (response && response.data.success === false) {
-        this.logger.error(
-          `Error occurred during token verification: ${response.data['error-codes']}`,
-        );
+      /**
+       * WARN: Only this case is considered as "valid token"
+       * since anything can change on hCaptcha side
+       */
+      if (response?.status === 200 && response.data.success === true) {
+        return true;
+      } else if (response?.data.success === false) {
+        this.logger.warn('Error occurred during token verification', {
+          errorCodes: response.data['error-codes'],
+        });
       }
     } catch (error) {
-      this.logger.error(`Error occurred during token verification: ${error}`);
+      this.logger.error('Error occurred during token verification', error);
     }
 
     return false;
@@ -72,7 +68,7 @@ export class HCaptchaService {
       const { ip, email, language, country, address } = data;
 
       if (!country) {
-        this.logger.error(`Country is not set for the user`);
+        this.logger.warn(`Country is not set for the user`);
       }
 
       const queryParams: any = {
@@ -99,10 +95,10 @@ export class HCaptchaService {
         return true;
       }
     } catch (error) {
-      this.logger.error(
-        `Error occurred during labeling registration. User: ${data.email}`,
+      this.logger.error('Error occurred during labeling registration', {
         error,
-      );
+        userEmail: data.email,
+      });
     }
 
     return false;
@@ -130,10 +126,10 @@ export class HCaptchaService {
         return response.data;
       }
     } catch (error) {
-      this.logger.error(
-        `Error occurred while retrieving labeler data. User: ${data.email}`,
+      this.logger.error(`Error occurred while retrieving labeler data`, {
         error,
-      );
+        userEmail: data.email,
+      });
     }
 
     return null;
diff --git a/packages/apps/reputation-oracle/server/src/logger/README.md b/packages/apps/reputation-oracle/server/src/logger/README.md
new file mode 100644
index 0000000000..5a8c41198d
--- /dev/null
+++ b/packages/apps/reputation-oracle/server/src/logger/README.md
@@ -0,0 +1,86 @@
+Custom logger implementation for use in Node.js HUMAN apps.
+
+Provides standartized API and writes logs in pre-defined JSON format:
+```json
+{
+  "level": "debug",
+  "message": "Some info about error",
+  "timestamp": 1738937400037,
+  "error": {
+    "kind": "CustomError",
+    "message": "Message from custom error",
+    "stack": "CustomError: Message from custom error\n    at process.processTicksAndRejections (node:internal/process/task_queues:95:5)",
+    "customErrorProp": "error-detail-prop"
+  }
+  // ...merging meta
+}
+```
+:information_source: Error formatting is done only for error argument and "error" context property.
+
+Pretty-printing is enabled for local/development environment by default.
+
+### Usage examples
+At the moment preferred underlying logger is `pino`. Corresponding file exports `createLogger` factory function that is used to create pre-configured default logger intance, that has service/app name and environment bound to all log messages.
+
+Import the pre-defined logger
+```ts
+import logger from '<relative_path_to>/logger';
+```
+then use it as per API contract: with log message first and any useful detail in log meta
+:information_source: If meta is not a plain object and not an error - it is being logged as "meta" property
+```ts
+// to log simple message
+logger.info('Info without any context');
+
+// to log message with some context info
+loger.info('New user registered', {
+  userAgent,
+  country,
+  ip,
+  email,
+});
+
+// to log error
+logger.error('Something went wrong', error);
+
+// or error with some extra context
+logger.error('Error updating some entity', {
+  error,
+  entityId: 42,
+  ...extra
+});
+
+// to log anything
+logger.debug('Show me value', someValue);
+```
+
+If needed, you can create named logger
+```ts
+const utilsLogger = logger.child({ name: 'UtilsLogger' })
+// ....
+utilsLogger.debug('input params', args);
+/*
+{
+  "level": "debug",
+  "logger": "UtilsLogger",
+  "message": "input params",
+  "timestamp": 1738937400037
+  ...
+}
+*/
+```
+or bind a "context" (or any other) prop to it
+```ts
+const contextLogger = logger.child({ context: 'SomeService' })
+// ....
+contextLogger.info('Helpful info', context);
+/*
+{
+  "level": "debug",
+  "context": "SomeService",
+  "message": "Helpful info",
+  "timestamp": 1738937400037,
+  ...
+}
+*/
+```
\ No newline at end of file
diff --git a/packages/apps/reputation-oracle/server/src/logger/__mocks__/index.ts b/packages/apps/reputation-oracle/server/src/logger/__mocks__/index.ts
new file mode 100644
index 0000000000..fffaf78cd1
--- /dev/null
+++ b/packages/apps/reputation-oracle/server/src/logger/__mocks__/index.ts
@@ -0,0 +1,11 @@
+import { Logger } from '../types';
+
+const logger: Logger = {
+  child: jest.fn(() => logger),
+  info: jest.fn(),
+  debug: jest.fn(),
+  error: jest.fn(),
+  warn: jest.fn(),
+};
+
+export default logger;
diff --git a/packages/apps/reputation-oracle/server/src/logger/abstract-logger.ts b/packages/apps/reputation-oracle/server/src/logger/abstract-logger.ts
new file mode 100644
index 0000000000..2bf1f7f493
--- /dev/null
+++ b/packages/apps/reputation-oracle/server/src/logger/abstract-logger.ts
@@ -0,0 +1,113 @@
+import { ChildBindings, Logger, LogLevel, LogMeta, LogRecord } from './types';
+
+function isPlainObject(maybeObj: unknown): maybeObj is LogMeta {
+  return Object.prototype.toString.call(maybeObj) === '[object Object]';
+}
+
+function isValidLoggerName(maybeName: unknown): maybeName is string {
+  return typeof maybeName === 'string' && maybeName.length > 0;
+}
+
+function serializeError(error: Error) {
+  const { name, message, stack, ...errorProps } = error;
+
+  return {
+    kind: name,
+    message,
+    stack,
+    ...errorProps,
+  };
+}
+
+abstract class LoggerWrapper implements Logger {
+  protected readonly bindings: LogMeta;
+  private readonly name?: string;
+
+  constructor(bindings: LogMeta = {}) {
+    if (!isPlainObject(bindings)) {
+      throw new Error('Logger bindings must be a plain object');
+    }
+
+    const { name, ..._bindings } = bindings;
+
+    this.bindings = _bindings;
+
+    if (name && isValidLoggerName(name)) {
+      this.name = name;
+    }
+  }
+
+  debug(message: string, errorOrMeta?: unknown): void {
+    this.log(LogLevel.DEBUG, message, errorOrMeta);
+  }
+
+  info(message: string, errorOrMeta?: unknown): void {
+    this.log(LogLevel.INFO, message, errorOrMeta);
+  }
+
+  warn(message: string, errorOrMeta?: unknown): void {
+    this.log(LogLevel.WARN, message, errorOrMeta);
+  }
+
+  error(message: string, errorOrMeta?: unknown): void {
+    this.log(LogLevel.ERROR, message, errorOrMeta);
+  }
+
+  child(bindings: ChildBindings): Logger {
+    if (!isPlainObject(bindings)) {
+      throw new Error('Log bindings required for child logger');
+    }
+
+    return this.createChild(bindings);
+  }
+
+  protected abstract createChild(bindings: LogMeta): Logger;
+
+  private log(level: LogLevel, message: string, errorOrMeta?: unknown): void {
+    const logMessage = typeof message === 'string' ? message : `${message}`;
+
+    let metaArgument: LogMeta;
+    if (errorOrMeta === undefined) {
+      metaArgument = {};
+    } else if (errorOrMeta instanceof Error) {
+      metaArgument = {
+        error: serializeError(errorOrMeta),
+      };
+    } else if (isPlainObject(errorOrMeta)) {
+      const { error, ...meta } = errorOrMeta;
+      metaArgument = meta;
+      if (error instanceof Error) {
+        Object.assign(metaArgument, {
+          error: serializeError(error),
+        });
+      } else if (error !== undefined) {
+        metaArgument.error = error;
+      }
+    } else {
+      /**
+       * Fallback in case somebody uses log in a wrong way
+       */
+      metaArgument = {
+        meta: errorOrMeta,
+      };
+    }
+
+    const enrichedMeta: LogRecord = {
+      ...this.bindings,
+      ...metaArgument,
+      level,
+      message: logMessage,
+      timestamp: Date.now(),
+    };
+
+    if (this.name) {
+      enrichedMeta.logger = this.name;
+    }
+
+    this.callLogger(level, enrichedMeta);
+  }
+
+  protected abstract callLogger(level: LogLevel, log: LogRecord): void;
+}
+
+export default LoggerWrapper;
diff --git a/packages/apps/reputation-oracle/server/src/logger/index.ts b/packages/apps/reputation-oracle/server/src/logger/index.ts
new file mode 100644
index 0000000000..c3e6ee3e20
--- /dev/null
+++ b/packages/apps/reputation-oracle/server/src/logger/index.ts
@@ -0,0 +1,25 @@
+import { createLogger } from './pino-logger';
+import NestLogger from './nest-logger';
+import { LogLevel } from './types';
+
+const environment = process.env.NODE_ENV || 'local';
+const isDevEnvironment = ['development', 'local'].includes(environment);
+
+const defaultLogger = createLogger(
+  {
+    name: 'DefaultLogger',
+    level: isDevEnvironment ? LogLevel.DEBUG : LogLevel.INFO,
+    pretty: isDevEnvironment,
+    disabled: environment === 'test',
+  },
+  {
+    environment,
+    service: 'reputation-oracle',
+  },
+);
+
+export const nestLoggerOverride = new NestLogger(
+  defaultLogger.child({ name: 'NestLogger' }),
+);
+
+export default defaultLogger;
diff --git a/packages/apps/reputation-oracle/server/src/logger/nest-logger.ts b/packages/apps/reputation-oracle/server/src/logger/nest-logger.ts
new file mode 100644
index 0000000000..a8347d52b7
--- /dev/null
+++ b/packages/apps/reputation-oracle/server/src/logger/nest-logger.ts
@@ -0,0 +1,93 @@
+import { LoggerService } from '@nestjs/common';
+import { Logger, LogLevel, LogMeta } from './types';
+
+class NestLogger implements LoggerService {
+  constructor(private readonly loggerInstance: Logger) {}
+
+  log(message: any, ...optionalParams: any[]) {
+    this.callLogger(LogLevel.INFO, message, ...optionalParams);
+  }
+
+  warn(message: any, ...optionalParams: any[]) {
+    this.callLogger(LogLevel.WARN, message, ...optionalParams);
+  }
+
+  error(message: any, ...optionalParams: any[]) {
+    let _message: any;
+    let _optionalParams: any[];
+
+    const firstParam = optionalParams[0] || '';
+    if (
+      typeof message === 'string' &&
+      typeof firstParam === 'string' &&
+      /\n\s+at\s.+:\d+:\d+/.test(firstParam)
+    ) {
+      /**
+       * It's a case when logger called as
+       * logger.error(error.message, error.stack)
+       */
+      const error = new Error(message);
+      error.stack = firstParam;
+
+      _message = error;
+      _optionalParams = optionalParams.slice(1);
+    } else {
+      _message = message;
+      if (optionalParams.length === 2 && optionalParams[0] === undefined) {
+        /**
+         * It's a case when logger called as
+         * logger.error(message)
+         *
+         * In this case Nest adds `undefined` "stack"
+         * as second param
+         */
+        _optionalParams = [optionalParams[1]];
+      } else {
+        _optionalParams = optionalParams;
+      }
+    }
+
+    this.callLogger(LogLevel.ERROR, _message, ..._optionalParams);
+  }
+
+  private callLogger(
+    level: LogLevel,
+    message: unknown,
+    ...optionalParams: unknown[]
+  ): void {
+    const logMeta: LogMeta = {};
+
+    let params: unknown[] = [];
+    // Nest always add "context" as last param
+    if (optionalParams.length) {
+      const lastParam = optionalParams.at(-1);
+      if (typeof lastParam === 'string') {
+        logMeta.context = lastParam;
+        params = optionalParams.slice(0, -1);
+      } else {
+        params = optionalParams;
+      }
+    }
+
+    // Case when Nest logs something other than context
+    if (params.length) {
+      logMeta.messages = params;
+    }
+
+    let _message = `unspecified nest ${level}`.toUpperCase();
+    // Case when Nest logs just one argument: object
+    if (typeof message === 'object') {
+      if (message instanceof Error) {
+        logMeta.error = message;
+      } else {
+        Object.assign(logMeta, message);
+      }
+    } else if (message !== undefined) {
+      _message = message.toString();
+    }
+
+    this.loggerInstance[level](_message, logMeta);
+  }
+}
+
+export default NestLogger;
diff --git a/packages/apps/reputation-oracle/server/src/logger/pino-logger.ts b/packages/apps/reputation-oracle/server/src/logger/pino-logger.ts
new file mode 100644
index 0000000000..09d0a055df
--- /dev/null
+++ b/packages/apps/reputation-oracle/server/src/logger/pino-logger.ts
@@ -0,0 +1,63 @@
+import pino from 'pino';
+import LoggerWrapper from './abstract-logger';
+import {
+  ChildBindings,
+  LogMeta,
+  Logger,
+  LogLevel,
+  LoggerOptions,
+  LogRecord,
+} from './types';
+
+export class WrappedPino extends LoggerWrapper {
+  constructor(
+    private readonly pinoLogger: pino.Logger,
+    bindings?: LogMeta,
+  ) {
+    super(bindings);
+  }
+
+  protected createChild(bindings: ChildBindings): Logger {
+    return new WrappedPino(this.pinoLogger, {
+      ...this.bindings,
+      ...bindings,
+    });
+  }
+
+  protected callLogger(level: LogLevel, log: LogRecord): void {
+    const _log: Partial<LogRecord> = { ...log };
+
+    delete _log.level;
+
+    this.pinoLogger[level](_log);
+  }
+}
+
+const pinoLogLevelFormatter = (label: string) => ({ level: label });
+
+export function createLogger(
+  { name, level, pretty, disabled }: LoggerOptions,
+  bindings: LogMeta = {},
+): WrappedPino {
+  const pinoLogger = pino({
+    base: null,
+    level: level || LogLevel.INFO,
+    enabled: disabled !== true,
+    timestamp: false,
+    formatters: {
+      level: pinoLogLevelFormatter,
+    },
+    transport: pretty
+      ? {
+          target: 'pino-pretty',
+          options: {
+            messageKey: 'message',
+            translateTime: "SYS:yyyy-mm-dd, HH:MM:ss'Z'",
+            colorize: true,
+          },
+        }
+      : undefined,
+  });
+
+  return new WrappedPino(pinoLogger, { ...bindings, name });
+}
diff --git a/packages/apps/reputation-oracle/server/src/logger/types.ts b/packages/apps/reputation-oracle/server/src/logger/types.ts
new file mode 100644
index 0000000000..4c5eb3fe1f
--- /dev/null
+++ b/packages/apps/reputation-oracle/server/src/logger/types.ts
@@ -0,0 +1,38 @@
+export enum LogLevel {
+  DEBUG = 'debug',
+  INFO = 'info',
+  WARN = 'warn',
+  ERROR = 'error',
+}
+
+export type LogMeta = Record<string, unknown>;
+
+export type LogRecord = {
+  logger?: string;
+  level: `${LogLevel}`;
+  message: string;
+  timestamp: number;
+} & LogMeta;
+
+type LogFn = {
+  (message: string, meta?: LogMeta): void;
+  (message: string, error: Error): void;
+  (message: string, errorOrMeta?: unknown): void;
+};
+
+export type ChildBindings = { name?: string } & LogMeta;
+
+export interface Logger {
+  debug: LogFn;
+  info: LogFn;
+  warn: LogFn;
+  error: LogFn;
+  child: (bindings: ChildBindings) => Logger;
+}
+
+export type LoggerOptions = {
+  name?: string;
+  pretty?: boolean;
+  level?: `${LogLevel}`;
+  disabled?: boolean;
+};
diff --git a/packages/apps/reputation-oracle/server/src/main.ts b/packages/apps/reputation-oracle/server/src/main.ts
index 00f956b7bf..6ec2f8e331 100644
--- a/packages/apps/reputation-oracle/server/src/main.ts
+++ b/packages/apps/reputation-oracle/server/src/main.ts
@@ -7,10 +7,12 @@ import helmet from 'helmet';
 import { AppModule } from './app.module';
 import { useContainer } from 'class-validator';
 import { ServerConfigService } from './common/config/server-config.service';
+import { nestLoggerOverride } from './logger';
 
 async function bootstrap() {
   const app = await NestFactory.create<INestApplication>(AppModule, {
     cors: true,
+    logger: nestLoggerOverride,
   });
   useContainer(app.select(AppModule), { fallbackOnErrors: true });
 
diff --git a/packages/apps/reputation-oracle/server/src/modules/auth/auth.controller.ts b/packages/apps/reputation-oracle/server/src/modules/auth/auth.controller.ts
index 4a3105f660..9de46ac4a6 100644
--- a/packages/apps/reputation-oracle/server/src/modules/auth/auth.controller.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/auth/auth.controller.ts
@@ -9,27 +9,14 @@ import {
   Body,
   ClassSerializerInterceptor,
   Controller,
-  HttpCode,
   Post,
   Req,
   UseGuards,
   UseInterceptors,
-  Logger,
   UseFilters,
+  HttpCode,
 } from '@nestjs/common';
 import { Public } from '../../common/decorators';
-import { UserCreateDto } from '../user/user.dto';
-import {
-  AuthDto,
-  ForgotPasswordDto,
-  ResendEmailVerificationDto,
-  RestorePasswordDto,
-  SignInDto,
-  VerifyEmailDto,
-  Web3SignUpDto,
-  Web3SignInDto,
-  RefreshDto,
-} from './auth.dto';
 import { AuthService } from './auth.service';
 import { JwtAuthGuard } from '../../common/guards';
 import { HCaptchaGuard } from '../../common/guards/hcaptcha';
@@ -37,244 +24,212 @@ import { RequestWithUser } from '../../common/types';
 import { TokenRepository } from './token.repository';
 import { TokenType } from './token.entity';
 import { AuthControllerErrorsFilter } from './auth.error.filter';
+import {
+  ForgotPasswordDto,
+  SuccessAuthDto,
+  RefreshDto,
+  ResendVerificationEmailDto,
+  RestorePasswordDto,
+  VerifyEmailDto,
+  Web2SignUpDto,
+  Web2SignInDto,
+  Web3SignInDto,
+  Web3SignUpDto,
+} from './dto';
 
 @ApiTags('Auth')
-@ApiResponse({
-  status: 400,
-  description: 'Bad Request. Invalid input parameters.',
-})
-@ApiResponse({
-  status: 401,
-  description: 'Unauthorized. Missing or invalid credentials.',
-})
-@ApiResponse({
-  status: 404,
-  description: 'Not Found. Could not find the requested content.',
-})
-@ApiResponse({
-  status: 422,
-  description: 'Unprocessable entity.',
-})
 @Controller('/auth')
 @UseFilters(AuthControllerErrorsFilter)
 export class AuthJwtController {
-  private readonly logger = new Logger(AuthJwtController.name);
-
   constructor(
     private readonly authService: AuthService,
     private readonly tokenRepository: TokenRepository,
   ) {}
 
-  @Public()
-  @Post('/signup')
-  @UseGuards(HCaptchaGuard)
-  @UseInterceptors(ClassSerializerInterceptor)
   @ApiOperation({
-    summary: 'User Signup',
-    description: 'Endpoint to register a new user.',
+    summary: 'User signup',
+    description: 'Endpoint to register a new user',
   })
-  @ApiBody({ type: UserCreateDto })
+  @ApiBody({ type: Web2SignUpDto })
   @ApiResponse({
     status: 200,
     description: 'User registered successfully',
   })
   @ApiResponse({
-    status: 400,
-    description: 'Bad Request. Invalid input parameters.',
+    status: 409,
+    description: 'User with provided email already registered',
   })
-  public async signup(@Body() data: UserCreateDto): Promise<void> {
-    await this.authService.signup(data);
-    return;
-  }
-
   @Public()
-  @Post('/signin')
   @UseGuards(HCaptchaGuard)
+  @UseInterceptors(ClassSerializerInterceptor)
+  @Post('/web2/signup')
   @HttpCode(200)
+  async signup(@Body() data: Web2SignUpDto): Promise<void> {
+    await this.authService.signup(data);
+  }
+
   @ApiOperation({
-    summary: 'User Signin',
-    description: 'Endpoint for user authentication.',
+    summary: 'User signin',
+    description: 'Endpoint for user authentication',
   })
-  @ApiBody({ type: SignInDto })
+  @ApiBody({ type: Web2SignInDto })
   @ApiResponse({
     status: 200,
     description: 'User authenticated successfully',
-    type: AuthDto,
-  })
-  @ApiResponse({
-    status: 401,
-    description: 'Unauthorized. Missing or invalid credentials.',
+    type: SuccessAuthDto,
   })
-  @ApiResponse({
-    status: 404,
-    description: 'Not Found. Could not find the requested content.',
-  })
-  public signin(@Body() data: SignInDto): Promise<AuthDto> {
-    return this.authService.signin(data);
+  @Public()
+  @UseGuards(HCaptchaGuard)
+  @Post('/web2/signin')
+  @HttpCode(200)
+  async signin(@Body() data: Web2SignInDto): Promise<SuccessAuthDto> {
+    const authTokens = await this.authService.signin(data);
+    return authTokens;
   }
 
-  @Public()
-  @Post('/web3/signup')
   @ApiOperation({
-    summary: 'Web3 User Signup',
-    description: 'Endpoint for Web3 user registration.',
+    summary: 'Forgot password',
+    description: 'Endpoint to initiate the password reset process',
   })
-  @ApiBody({ type: Web3SignUpDto })
+  @ApiBody({ type: ForgotPasswordDto })
   @ApiResponse({
     status: 200,
-    description: 'User registered successfully',
-    type: AuthDto,
-  })
-  @ApiResponse({
-    status: 401,
-    description: 'Unauthorized. Missing or invalid credentials.',
+    description: 'Password reset email sent successfully',
   })
-  public async web3SignUp(@Body() data: Web3SignUpDto): Promise<AuthDto> {
-    return this.authService.web3Signup(data);
-  }
-
   @Public()
-  @Post('/web3/signin')
+  @UseGuards(HCaptchaGuard)
+  @Post('/web2/forgot-password')
   @HttpCode(200)
+  async forgotPassword(@Body() data: ForgotPasswordDto): Promise<void> {
+    await this.authService.forgotPassword(data);
+  }
+
   @ApiOperation({
-    summary: 'Web3 User Signin',
-    description: 'Endpoint for Web3 user authentication.',
+    summary: 'Restore password',
+    description: 'Endpoint to restore the user password after reset',
   })
-  @ApiBody({ type: Web3SignInDto })
+  @ApiBody({ type: RestorePasswordDto })
   @ApiResponse({
     status: 200,
-    description: 'User authenticated successfully',
-    type: AuthDto,
-  })
-  @ApiResponse({
-    status: 401,
-    description: 'Unauthorized. Missing or invalid credentials.',
+    description: 'Password restored successfully',
   })
-  public async web3SignIn(@Body() data: Web3SignInDto): Promise<AuthDto> {
-    return this.authService.web3Signin(data);
-  }
   @Public()
+  @UseGuards(HCaptchaGuard)
+  @Post('/web2/restore-password')
   @HttpCode(200)
-  @Post('/refresh')
-  @ApiBody({ type: RefreshDto })
+  async restorePassword(@Body() data: RestorePasswordDto): Promise<void> {
+    await this.authService.restorePassword(data);
+  }
+
   @ApiOperation({
-    summary: 'Refresh Token',
-    description: 'Endpoint to refresh the authentication token.',
+    summary: 'Email verification',
+    description: 'Endpoint to verify the user email address',
   })
+  @ApiBody({ type: VerifyEmailDto })
   @ApiResponse({
     status: 200,
-    description: 'Token refreshed successfully',
-    type: AuthDto,
+    description: 'Email successfully verified',
   })
-  async refreshToken(@Body() data: RefreshDto): Promise<AuthDto> {
-    return this.authService.refresh(data);
+  @Public()
+  @Post('/web2/verify-email')
+  @HttpCode(200)
+  async emailVerification(@Body() data: VerifyEmailDto): Promise<void> {
+    await this.authService.emailVerification(data);
   }
 
-  @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
-  @HttpCode(204)
-  @Post('/logout')
   @ApiOperation({
-    summary: 'User Logout',
-    description: 'Endpoint to log out the user.',
+    summary: 'Resend verification email',
+    description: 'Endpoint to resend the verification email',
   })
+  @ApiBody({ type: ResendVerificationEmailDto })
   @ApiResponse({
-    status: 204,
-    description: 'User logged out successfully',
+    status: 200,
+    description: 'Verification email resent successfully',
   })
-  public async logout(@Req() request: RequestWithUser): Promise<void> {
-    await this.tokenRepository.deleteOneByTypeAndUserId(
-      TokenType.REFRESH,
-      request.user.id,
-    );
+  @ApiBearerAuth()
+  @UseGuards(HCaptchaGuard, JwtAuthGuard)
+  @Post('/web2/resend-verification-email')
+  @HttpCode(200)
+  async resendEmailVerification(
+    @Body() data: ResendVerificationEmailDto,
+  ): Promise<void> {
+    await this.authService.resendEmailVerification(data);
   }
 
-  @Public()
-  @Post('/forgot-password')
-  @UseGuards(HCaptchaGuard)
-  @HttpCode(204)
   @ApiOperation({
-    summary: 'Forgot Password',
-    description: 'Endpoint to initiate the password reset process.',
-  })
-  @ApiBody({ type: ForgotPasswordDto })
-  @ApiResponse({
-    status: 204,
-    description: 'Password reset email sent successfully',
+    summary: 'Web3 user signup',
+    description: 'Endpoint for Web3 user registration',
   })
+  @ApiBody({ type: Web3SignUpDto })
   @ApiResponse({
-    status: 401,
-    description: 'Unauthorized. Missing or invalid credentials.',
+    status: 200,
+    description: 'User registered successfully',
+    type: SuccessAuthDto,
   })
   @ApiResponse({
-    status: 404,
-    description: 'Not Found. Could not find the requested content.',
+    status: 409,
+    description: 'User with provided address already registered',
   })
-  public forgotPassword(@Body() data: ForgotPasswordDto): Promise<void> {
-    return this.authService.forgotPassword(data);
+  @Public()
+  @Post('/web3/signup')
+  @HttpCode(200)
+  async web3SignUp(@Body() data: Web3SignUpDto): Promise<SuccessAuthDto> {
+    const authTokens = await this.authService.web3Signup(data);
+    return authTokens;
   }
 
-  @Public()
-  @Post('/restore-password')
-  @UseGuards(HCaptchaGuard)
-  @HttpCode(204)
   @ApiOperation({
-    summary: 'Restore Password',
-    description: 'Endpoint to restore the user password after reset.',
-  })
-  @ApiBody({ type: RestorePasswordDto })
-  @ApiResponse({
-    status: 204,
-    description: 'Password restored successfully',
+    summary: 'Web3 user signin',
+    description: 'Endpoint for Web3 user authentication',
   })
+  @ApiBody({ type: Web3SignInDto })
   @ApiResponse({
-    status: 404,
-    description: 'Not Found. Could not find the requested content.',
+    status: 200,
+    description: 'User authenticated successfully',
+    type: SuccessAuthDto,
   })
-  public restorePassword(@Body() data: RestorePasswordDto): Promise<void> {
-    return this.authService.restorePassword(data);
-  }
-
   @Public()
+  @Post('/web3/signin')
   @HttpCode(200)
-  @Post('/email-verification')
+  async web3SignIn(@Body() data: Web3SignInDto): Promise<SuccessAuthDto> {
+    const authTokens = await this.authService.web3Signin(data);
+    return authTokens;
+  }
+
+  @ApiBody({ type: RefreshDto })
   @ApiOperation({
-    summary: 'Email Verification',
-    description: 'Endpoint to verify the user email address.',
+    summary: 'Refresh token',
+    description: 'Endpoint to refresh the authentication token.',
   })
-  @ApiBody({ type: VerifyEmailDto })
   @ApiResponse({
     status: 200,
-    description: 'Email verification successful',
-  })
-  @ApiResponse({
-    status: 404,
-    description: 'Not Found. Could not find the requested content.',
+    description: 'Token refreshed successfully',
+    type: SuccessAuthDto,
   })
-  public async emailVerification(@Body() data: VerifyEmailDto): Promise<void> {
-    await this.authService.emailVerification(data);
+  @Public()
+  @Post('/refresh')
+  @HttpCode(200)
+  async refreshToken(@Body() data: RefreshDto): Promise<SuccessAuthDto> {
+    const authTokens = await this.authService.refresh(data);
+    return authTokens;
   }
 
-  @ApiBearerAuth()
-  @UseGuards(HCaptchaGuard, JwtAuthGuard)
-  @HttpCode(204)
-  @Post('/resend-email-verification')
   @ApiOperation({
-    summary: 'Resend Email Verification',
-    description: 'Endpoint to resend the email verification link.',
-  })
-  @ApiBody({ type: ResendEmailVerificationDto })
-  @ApiResponse({
-    status: 204,
-    description: 'Email verification resent successfully',
+    summary: 'User logout',
+    description: 'Endpoint to log out the user',
   })
   @ApiResponse({
-    status: 404,
-    description: 'Not Found. Could not find the requested content.',
+    status: 200,
+    description: 'User logged out successfully',
   })
-  public resendEmailVerification(
-    @Body() data: ResendEmailVerificationDto,
-  ): Promise<void> {
-    return this.authService.resendEmailVerification(data);
+  @ApiBearerAuth()
+  @UseGuards(JwtAuthGuard)
+  @Post('/logout')
+  @HttpCode(200)
+  async logout(@Req() request: RequestWithUser): Promise<void> {
+    await this.tokenRepository.deleteOneByTypeAndUserId(
+      TokenType.REFRESH,
+      request.user.id,
+    );
   }
 }
diff --git a/packages/apps/reputation-oracle/server/src/modules/auth/auth.dto.ts b/packages/apps/reputation-oracle/server/src/modules/auth/auth.dto.ts
deleted file mode 100644
index 439038c97b..0000000000
--- a/packages/apps/reputation-oracle/server/src/modules/auth/auth.dto.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
-import { Transform } from 'class-transformer';
-import {
-  IsEmail,
-  IsEthereumAddress,
-  IsString,
-  IsUUID,
-  IsOptional,
-  MinLength,
-} from 'class-validator';
-import { TokenType } from '../auth/token.entity';
-import { UserEntity } from '../user/user.entity';
-import { Role } from '../../common/enums/user';
-import { IsEnumCaseInsensitive } from '../../common/decorators';
-
-export class ForgotPasswordDto {
-  @ApiProperty()
-  @IsEmail()
-  @Transform(({ value }: { value: string }) => value.toLowerCase())
-  public email: string;
-
-  @ApiProperty({ name: 'h_captcha_token' })
-  @IsString()
-  public hCaptchaToken: string;
-}
-
-export class SignInDto {
-  @ApiProperty()
-  @IsEmail()
-  @Transform(({ value }: { value: string }) => value.toLowerCase())
-  public email: string;
-
-  @ApiProperty()
-  @IsString()
-  public password: string;
-
-  @ApiPropertyOptional({ name: 'h_captcha_token' })
-  @IsOptional()
-  @IsString()
-  public hCaptchaToken?: string;
-}
-
-export class RefreshDto {
-  @ApiProperty({ name: 'refresh_token' })
-  @IsUUID()
-  public refreshToken: string;
-}
-
-export class ValidatePasswordDto {
-  @MinLength(8, {
-    message: 'Password must be at least 8 characters long.',
-  })
-  @ApiProperty()
-  public password: string;
-}
-
-export class ResendEmailVerificationDto {
-  @ApiProperty()
-  @IsEmail()
-  @Transform(({ value }: { value: string }) => value.toLowerCase())
-  public email: string;
-
-  @ApiProperty({ name: 'h_captcha_token' })
-  @IsString()
-  public hCaptchaToken: string;
-}
-
-export class RestorePasswordDto extends ValidatePasswordDto {
-  @ApiProperty()
-  @IsString()
-  public token: string;
-
-  @ApiProperty({ name: 'h_captcha_token' })
-  @IsString()
-  public hCaptchaToken: string;
-}
-
-export class VerifyEmailDto {
-  @ApiProperty()
-  @IsString()
-  public token: string;
-}
-
-export class AuthDto {
-  @ApiProperty({ name: 'refresh_token' })
-  @IsString()
-  public refreshToken: string;
-
-  @ApiProperty({ name: 'access_token' })
-  @IsString()
-  public accessToken: string;
-}
-
-export class AuthCreateDto {
-  public user: UserEntity;
-  public refreshToken: string;
-  public accessToken: string;
-}
-
-export class AuthUpdateDto {
-  public refreshToken: string;
-  public accessToken: string;
-}
-
-export class TokenCreateDto {
-  public tokenType: TokenType;
-  public user: UserEntity;
-}
-
-export class Web3SignUpDto {
-  @ApiProperty()
-  @IsString()
-  public signature: string;
-
-  @ApiProperty({
-    enum: Role,
-  })
-  @IsEnumCaseInsensitive(Role)
-  public type: Role;
-
-  @ApiProperty()
-  @IsString()
-  @IsEthereumAddress()
-  public address: string;
-}
-
-export class Web3SignInDto {
-  @ApiProperty()
-  @IsString()
-  @IsEthereumAddress()
-  public address: string;
-
-  @ApiProperty()
-  @IsString()
-  public signature: string;
-}
diff --git a/packages/apps/reputation-oracle/server/src/modules/auth/auth.error.filter.ts b/packages/apps/reputation-oracle/server/src/modules/auth/auth.error.filter.ts
index 64f6072ed2..3274dea31e 100644
--- a/packages/apps/reputation-oracle/server/src/modules/auth/auth.error.filter.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/auth/auth.error.filter.ts
@@ -3,7 +3,6 @@ import {
   Catch,
   ArgumentsHost,
   HttpStatus,
-  Logger,
 } from '@nestjs/common';
 import { Request, Response } from 'express';
 
@@ -14,6 +13,8 @@ import {
   InvalidOperatorSignupDataError,
 } from './auth.error';
 
+import logger from '../../logger';
+
 type AuthControllerError =
   | AuthError
   | DuplicatedUserEmailError
@@ -27,24 +28,26 @@ type AuthControllerError =
   InvalidOperatorSignupDataError,
 )
 export class AuthControllerErrorsFilter implements ExceptionFilter {
-  private logger = new Logger(AuthControllerErrorsFilter.name);
+  private readonly logger = logger.child({
+    context: AuthControllerErrorsFilter.name,
+  });
+
   catch(exception: AuthControllerError, host: ArgumentsHost) {
     const ctx = host.switchToHttp();
     const response = ctx.getResponse<Response>();
     const request = ctx.getRequest<Request>();
     let status = HttpStatus.UNAUTHORIZED;
 
-    let logContext: string | undefined;
-    if (exception instanceof DuplicatedUserEmailError) {
+    if (
+      exception instanceof DuplicatedUserEmailError ||
+      exception instanceof DuplicatedUserAddressError
+    ) {
       status = HttpStatus.CONFLICT;
-      logContext = exception.email;
+      this.logger.error('Auth conflict', exception);
     } else if (exception instanceof InvalidOperatorSignupDataError) {
       status = HttpStatus.BAD_REQUEST;
-      logContext = exception.detail;
     }
 
-    this.logger.error(exception.message, exception.stack, logContext);
-
     return response.status(status).json({
       message: exception.message,
       timestamp: new Date().toISOString(),
diff --git a/packages/apps/reputation-oracle/server/src/modules/auth/auth.module.ts b/packages/apps/reputation-oracle/server/src/modules/auth/auth.module.ts
index 342c940824..82d222df16 100644
--- a/packages/apps/reputation-oracle/server/src/modules/auth/auth.module.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/auth/auth.module.ts
@@ -6,11 +6,11 @@ import { JwtHttpStrategy } from './strategy';
 import { AuthService } from './auth.service';
 import { AuthJwtController } from './auth.controller';
 import { TokenRepository } from './token.repository';
-import { SendGridModule } from '../sendgrid/sendgrid.module';
 import { UserRepository } from '../user/user.repository';
 import { Web3Module } from '../web3/web3.module';
 import { AuthConfigService } from '../../common/config/auth-config.service';
 import { HCaptchaModule } from '../../integrations/hcaptcha/hcaptcha.module';
+import { EmailModule } from '../email/module';
 
 @Module({
   imports: [
@@ -25,9 +25,9 @@ import { HCaptchaModule } from '../../integrations/hcaptcha/hcaptcha.module';
         },
       }),
     }),
-    SendGridModule,
     Web3Module,
     HCaptchaModule,
+    EmailModule,
   ],
   providers: [JwtHttpStrategy, AuthService, TokenRepository, UserRepository],
   controllers: [AuthJwtController],
diff --git a/packages/apps/reputation-oracle/server/src/modules/auth/auth.service.spec.ts b/packages/apps/reputation-oracle/server/src/modules/auth/auth.service.spec.ts
index 20d7f3d23f..ec02abe317 100644
--- a/packages/apps/reputation-oracle/server/src/modules/auth/auth.service.spec.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/auth/auth.service.spec.ts
@@ -1,12 +1,16 @@
-import { Test } from '@nestjs/testing';
-import { AuthService } from './auth.service';
-import { TokenRepository } from './token.repository';
-import { HttpService } from '@nestjs/axios';
 import { createMock } from '@golevelup/ts-jest';
-import { UserRepository } from '../user/user.repository';
+import {
+  ChainId,
+  KVStoreClient,
+  KVStoreUtils,
+  Role as SDKRole,
+} from '@human-protocol/sdk';
+import { HttpService } from '@nestjs/axios';
+import { ConfigService } from '@nestjs/config';
 import { JwtService } from '@nestjs/jwt';
-import { UserService } from '../user/user.service';
-import { UserEntity } from '../user/user.entity';
+import { Test } from '@nestjs/testing';
+import { faker } from '@faker-js/faker';
+import { v4 } from 'uuid';
 import {
   MOCK_ACCESS_TOKEN,
   MOCK_ADDRESS,
@@ -19,29 +23,26 @@ import {
   MOCK_REFRESH_TOKEN,
   mockConfig,
 } from '../../../test/constants';
-import { TokenEntity, TokenType } from './token.entity';
-import { v4 } from 'uuid';
-import { UserStatus, Role } from '../../common/enums/user';
-import { SendGridService } from '../sendgrid/sendgrid.service';
-import { SENDGRID_TEMPLATES, SERVICE_NAME } from '../../common/constants';
+import { AuthConfigService } from '../../common/config/auth-config.service';
+import { HCaptchaConfigService } from '../../common/config/hcaptcha-config.service';
+import { NetworkConfigService } from '../../common/config/network-config.service';
+import { ServerConfigService } from '../../common/config/server-config.service';
+import { Web3ConfigService } from '../../common/config/web3-config.service';
+import { JobRequestType } from '../../common/enums';
+import { Role, UserStatus } from '../../common/enums/user';
+import { SignatureType } from '../../common/enums/web3';
 import {
   generateNonce,
-  signMessage,
   prepareSignatureBody,
+  signMessage,
 } from '../../common/utils/signature';
-import { Web3Service } from '../web3/web3.service';
-import { ChainId, KVStoreClient, KVStoreUtils } from '@human-protocol/sdk';
-import { PrepareSignatureDto } from '../user/user.dto';
-import { SignatureType } from '../../common/enums/web3';
-import { AuthConfigService } from '../../common/config/auth-config.service';
-import { ServerConfigService } from '../../common/config/server-config.service';
-import { Web3ConfigService } from '../../common/config/web3-config.service';
-import { ConfigService } from '@nestjs/config';
-import { SiteKeyRepository } from '../user/site-key.repository';
 import { HCaptchaService } from '../../integrations/hcaptcha/hcaptcha.service';
-import { HCaptchaConfigService } from '../../common/config/hcaptcha-config.service';
-import { NetworkConfigService } from '../../common/config/network-config.service';
-import { JobRequestType } from '../../common/enums';
+import { SiteKeyRepository } from '../user/site-key.repository';
+import { PrepareSignatureDto } from '../user/user.dto';
+import { UserEntity } from '../user/user.entity';
+import { UserRepository } from '../user/user.repository';
+import { UserService } from '../user/user.service';
+import { Web3Service } from '../web3/web3.service';
 import {
   AuthError,
   AuthErrorMessage,
@@ -51,6 +52,11 @@ import {
   InvalidOperatorRoleError,
   InvalidOperatorUrlError,
 } from './auth.error';
+import { AuthService } from './auth.service';
+import { TokenEntity, TokenType } from './token.entity';
+import { TokenRepository } from './token.repository';
+import { EmailService } from '../email/email.service';
+import { EmailAction } from '../email/constants';
 
 jest.mock('@human-protocol/sdk', () => ({
   ...jest.requireActual('@human-protocol/sdk'),
@@ -81,7 +87,7 @@ describe('AuthService', () => {
   let userService: UserService;
   let userRepository: UserRepository;
   let jwtService: JwtService;
-  let sendGridService: SendGridService;
+  let emailService: EmailService;
   let web3Service: Web3Service;
   let authConfigService: AuthConfigService;
   let hcaptchaService: HCaptchaService;
@@ -126,7 +132,7 @@ describe('AuthService', () => {
           useValue: createMock<SiteKeyRepository>(),
         },
         { provide: HttpService, useValue: createMock<HttpService>() },
-        { provide: SendGridService, useValue: createMock<SendGridService>() },
+        { provide: EmailService, useValue: createMock<EmailService>() },
         {
           provide: Web3Service,
           useValue: {
@@ -143,7 +149,7 @@ describe('AuthService', () => {
     userService = moduleRef.get<UserService>(UserService);
     userRepository = moduleRef.get<UserRepository>(UserRepository);
     jwtService = moduleRef.get<JwtService>(JwtService);
-    sendGridService = moduleRef.get<SendGridService>(SendGridService);
+    emailService = moduleRef.get<EmailService>(EmailService);
     web3Service = moduleRef.get<Web3Service>(Web3Service);
     authConfigService = moduleRef.get<AuthConfigService>(AuthConfigService);
     hcaptchaService = moduleRef.get<HCaptchaService>(HCaptchaService);
@@ -248,12 +254,12 @@ describe('AuthService', () => {
       expect(result).toBe(userEntity);
     });
 
-    it("should call sendGridService sendEmail if user's email is valid", async () => {
-      sendGridService.sendEmail = jest.fn();
+    it("should call emailService sendEmail if user's email is valid", async () => {
+      emailService.sendEmail = jest.fn();
 
       await authService.signup(userCreateDto);
 
-      expect(sendGridService.sendEmail).toHaveBeenCalled();
+      expect(emailService.sendEmail).toHaveBeenCalled();
     });
 
     it('should fail if the user already exists', async () => {
@@ -359,7 +365,7 @@ describe('AuthService', () => {
           }),
         ).resolves.toBeUndefined();
 
-        expect(sendGridService.sendEmail).not.toHaveBeenCalledWith();
+        expect(emailService.sendEmail).not.toHaveBeenCalledWith();
       });
 
       it('should remove existing token if it exists', async () => {
@@ -373,51 +379,37 @@ describe('AuthService', () => {
       });
 
       it('should create a new token and send email', async () => {
-        sendGridService.sendEmail = jest.fn();
-        const email = 'user@example.com';
+        emailService.sendEmail = jest.fn();
+        const email = faker.internet.email();
 
         await authService.forgotPassword({ email, hCaptchaToken: 'token' });
 
-        expect(sendGridService.sendEmail).toHaveBeenCalledWith(
-          expect.objectContaining({
-            personalizations: [
-              {
-                dynamicTemplateData: {
-                  service_name: SERVICE_NAME,
-                  url: expect.stringContaining(
-                    `${MOCK_FE_URL}/reset-password?token=`,
-                  ),
-                },
-                to: email,
-              },
-            ],
-            templateId: SENDGRID_TEMPLATES.resetPassword,
-          }),
+        expect(emailService.sendEmail).toHaveBeenCalledWith(
+          email,
+          EmailAction.RESET_PASSWORD,
+          {
+            url: expect.stringContaining(
+              `${MOCK_FE_URL}/reset-password?token=`,
+            ),
+          },
         );
       });
 
       it('should create a new token and send email if user is not active', async () => {
-        sendGridService.sendEmail = jest.fn();
+        emailService.sendEmail = jest.fn();
         userEntity.status = UserStatus.PENDING;
-        const email = 'user@example.com';
+        const email = faker.internet.email();
 
         await authService.forgotPassword({ email, hCaptchaToken: 'token' });
 
-        expect(sendGridService.sendEmail).toHaveBeenCalledWith(
-          expect.objectContaining({
-            personalizations: [
-              {
-                dynamicTemplateData: {
-                  service_name: SERVICE_NAME,
-                  url: expect.stringContaining(
-                    `${MOCK_FE_URL}/reset-password?token=`,
-                  ),
-                },
-                to: email,
-              },
-            ],
-            templateId: SENDGRID_TEMPLATES.resetPassword,
-          }),
+        expect(emailService.sendEmail).toHaveBeenCalledWith(
+          email,
+          EmailAction.RESET_PASSWORD,
+          {
+            url: expect.stringContaining(
+              `${MOCK_FE_URL}/reset-password?token=`,
+            ),
+          },
         );
       });
     });
@@ -438,7 +430,7 @@ describe('AuthService', () => {
 
       beforeEach(() => {
         findTokenMock = jest.spyOn(tokenRepository, 'findOneByUuidAndType');
-        sendGridService.sendEmail = jest.fn();
+        emailService.sendEmail = jest.fn();
       });
 
       afterEach(() => {
@@ -480,7 +472,7 @@ describe('AuthService', () => {
         );
         findTokenMock.mockResolvedValue(tokenEntity as TokenEntity);
         userService.updatePassword = jest.fn();
-        sendGridService.sendEmail = jest.fn();
+        emailService.sendEmail = jest.fn();
 
         const updatePasswordMock = jest.spyOn(userService, 'updatePassword');
 
@@ -491,7 +483,7 @@ describe('AuthService', () => {
         });
 
         expect(updatePasswordMock).toHaveBeenCalled();
-        expect(sendGridService.sendEmail).toHaveBeenCalled();
+        expect(emailService.sendEmail).toHaveBeenCalled();
         expect(tokenRepository.deleteOne).toHaveBeenCalled();
       });
     });
@@ -580,7 +572,7 @@ describe('AuthService', () => {
           }),
         ).resolves.toBeUndefined();
 
-        expect(sendGridService.sendEmail).not.toHaveBeenCalledWith();
+        expect(emailService.sendEmail).not.toHaveBeenCalledWith();
       });
 
       it('should exit early w/o action if user is not pending', () => {
@@ -593,34 +585,27 @@ describe('AuthService', () => {
           }),
         ).resolves.toBeUndefined();
 
-        expect(sendGridService.sendEmail).not.toHaveBeenCalledWith();
+        expect(emailService.sendEmail).not.toHaveBeenCalledWith();
       });
 
       it('should create token and send email', async () => {
         findOneByEmailMock.mockResolvedValue(userEntity);
         findTokenMock.mockResolvedValueOnce(null);
-        sendGridService.sendEmail = jest.fn();
-        const email = 'user@example.com';
+        emailService.sendEmail = jest.fn();
+        const email = faker.internet.email();
 
         await authService.resendEmailVerification({
           email,
-          hCaptchaToken: 'token',
+          hCaptchaToken: faker.string.alphanumeric(),
         });
 
         expect(createTokenMock).toHaveBeenCalled();
-        expect(sendGridService.sendEmail).toHaveBeenCalledWith(
-          expect.objectContaining({
-            personalizations: [
-              {
-                dynamicTemplateData: {
-                  service_name: SERVICE_NAME,
-                  url: expect.stringContaining('/verify?token='),
-                },
-                to: email,
-              },
-            ],
-            templateId: SENDGRID_TEMPLATES.signup,
-          }),
+        expect(emailService.sendEmail).toHaveBeenCalledWith(
+          email,
+          EmailAction.SIGNUP,
+          {
+            url: expect.stringContaining(`${MOCK_FE_URL}/verify?token=`),
+          },
         );
       });
     });
@@ -751,7 +736,7 @@ describe('AuthService', () => {
           }));
           KVStoreUtils.get = jest
             .fn()
-            .mockResolvedValueOnce('Job Launcher')
+            .mockResolvedValueOnce(SDKRole.JobLauncher)
             .mockResolvedValueOnce('url')
             .mockResolvedValueOnce(1)
             .mockResolvedValueOnce(JobRequestType.FORTUNE);
@@ -805,7 +790,9 @@ describe('AuthService', () => {
           ).rejects.toThrow(new InvalidOperatorRoleError(''));
         });
         it('should throw if fee is not in KVStore', async () => {
-          KVStoreUtils.get = jest.fn().mockResolvedValueOnce('Job Launcher');
+          KVStoreUtils.get = jest
+            .fn()
+            .mockResolvedValueOnce(SDKRole.JobLauncher);
 
           const signature = await signMessage(preSignUpData, MOCK_PRIVATE_KEY);
 
@@ -820,7 +807,7 @@ describe('AuthService', () => {
         it('should throw if url is not in KVStore', async () => {
           KVStoreUtils.get = jest
             .fn()
-            .mockResolvedValueOnce('Job Launcher')
+            .mockResolvedValueOnce(SDKRole.JobLauncher)
             .mockResolvedValueOnce('url');
 
           const signature = await signMessage(preSignUpData, MOCK_PRIVATE_KEY);
@@ -836,7 +823,7 @@ describe('AuthService', () => {
         it('should throw if job type is not in KVStore', async () => {
           KVStoreUtils.get = jest
             .fn()
-            .mockResolvedValueOnce('Job Launcher')
+            .mockResolvedValueOnce(SDKRole.JobLauncher)
             .mockResolvedValueOnce('url')
             .mockResolvedValueOnce(1);
 
diff --git a/packages/apps/reputation-oracle/server/src/modules/auth/auth.service.ts b/packages/apps/reputation-oracle/server/src/modules/auth/auth.service.ts
index fce62a5e1d..94ad08285f 100644
--- a/packages/apps/reputation-oracle/server/src/modules/auth/auth.service.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/auth/auth.service.ts
@@ -6,25 +6,11 @@ import {
   Role as UserRole,
   UserStatus,
 } from '../../common/enums/user';
-import { UserCreateDto } from '../user/user.dto';
 import { UserEntity } from '../user/user.entity';
 import { UserService } from '../user/user.service';
-import {
-  AuthDto,
-  ForgotPasswordDto,
-  RefreshDto,
-  ResendEmailVerificationDto,
-  RestorePasswordDto,
-  SignInDto,
-  VerifyEmailDto,
-  Web3SignInDto,
-  Web3SignUpDto,
-} from './auth.dto';
 import { TokenEntity, TokenType } from './token.entity';
 import { TokenRepository } from './token.repository';
 import { verifySignature } from '../../common/utils/signature';
-import { SendGridService } from '../sendgrid/sendgrid.service';
-import { SENDGRID_TEMPLATES, SERVICE_NAME } from '../../common/constants';
 import { Web3Service } from '../web3/web3.service';
 import {
   ChainId,
@@ -50,6 +36,21 @@ import {
   InvalidOperatorRoleError,
   InvalidOperatorUrlError,
 } from './auth.error';
+import {
+  ForgotPasswordDto,
+  SuccessAuthDto,
+  RefreshDto,
+  Web2SignUpDto,
+  Web2SignInDto,
+  Web3SignInDto,
+  Web3SignUpDto,
+  RestorePasswordDto,
+  VerifyEmailDto,
+  ResendVerificationEmailDto,
+} from './dto';
+
+import { EmailService } from '../email/email.service';
+import { EmailAction } from '../email/constants';
 
 @Injectable()
 export class AuthService {
@@ -62,12 +63,15 @@ export class AuthService {
     private readonly serverConfigService: ServerConfigService,
     private readonly authConfigService: AuthConfigService,
     private readonly web3ConfigService: Web3ConfigService,
-    private readonly sendgridService: SendGridService,
+    private readonly emailService: EmailService,
     private readonly web3Service: Web3Service,
     private readonly userRepository: UserRepository,
   ) {}
 
-  public async signin({ email, password }: SignInDto): Promise<AuthDto> {
+  public async signin({
+    email,
+    password,
+  }: Web2SignInDto): Promise<SuccessAuthDto> {
     const userEntity = await this.userRepository.findOneByEmail(email);
     if (!userEntity) {
       throw new AuthError(AuthErrorMessage.INVALID_CREDENTIALS);
@@ -80,7 +84,7 @@ export class AuthService {
     return this.auth(userEntity);
   }
 
-  public async signup(data: UserCreateDto): Promise<UserEntity> {
+  public async signup(data: Web2SignUpDto): Promise<UserEntity> {
     const storedUser = await this.userRepository.findOneByEmail(data.email);
     if (storedUser) {
       throw new DuplicatedUserEmailError(data.email);
@@ -96,24 +100,14 @@ export class AuthService {
     );
 
     await this.tokenRepository.createUnique(tokenEntity);
-
-    await this.sendgridService.sendEmail({
-      personalizations: [
-        {
-          to: data.email,
-          dynamicTemplateData: {
-            service_name: SERVICE_NAME,
-            url: `${this.serverConfigService.feURL}/verify?token=${tokenEntity.uuid}`,
-          },
-        },
-      ],
-      templateId: SENDGRID_TEMPLATES.signup,
+    await this.emailService.sendEmail(data.email, EmailAction.SIGNUP, {
+      url: `${this.serverConfigService.feURL}/verify?token=${tokenEntity.uuid}`,
     });
 
     return userEntity;
   }
 
-  public async refresh(data: RefreshDto): Promise<AuthDto> {
+  public async refresh(data: RefreshDto): Promise<SuccessAuthDto> {
     const tokenEntity = await this.tokenRepository.findOneByUuidAndType(
       data.refreshToken,
       TokenType.REFRESH,
@@ -130,7 +124,7 @@ export class AuthService {
     return this.auth(tokenEntity.user);
   }
 
-  public async auth(userEntity: UserEntity): Promise<AuthDto> {
+  public async auth(userEntity: UserEntity): Promise<SuccessAuthDto> {
     const refreshTokenEntity =
       await this.tokenRepository.findOneByUserIdAndType(
         userEntity.id,
@@ -233,18 +227,8 @@ export class AuthService {
     );
 
     await this.tokenRepository.createUnique(tokenEntity);
-
-    await this.sendgridService.sendEmail({
-      personalizations: [
-        {
-          to: data.email,
-          dynamicTemplateData: {
-            service_name: SERVICE_NAME,
-            url: `${this.serverConfigService.feURL}/reset-password?token=${tokenEntity.uuid}`,
-          },
-        },
-      ],
-      templateId: SENDGRID_TEMPLATES.resetPassword,
+    await this.emailService.sendEmail(data.email, EmailAction.RESET_PASSWORD, {
+      url: `${this.serverConfigService.feURL}/reset-password?token=${tokenEntity.uuid}`,
     });
   }
 
@@ -262,18 +246,11 @@ export class AuthService {
       throw new AuthError(AuthErrorMessage.REFRESH_TOKEN_EXPIRED);
     }
 
-    await this.userService.updatePassword(tokenEntity.user, data);
-    await this.sendgridService.sendEmail({
-      personalizations: [
-        {
-          to: tokenEntity.user.email,
-          dynamicTemplateData: {
-            service_name: SERVICE_NAME,
-          },
-        },
-      ],
-      templateId: SENDGRID_TEMPLATES.passwordChanged,
-    });
+    await this.userService.updatePassword(tokenEntity.user, data.password);
+    await this.emailService.sendEmail(
+      tokenEntity.user.email,
+      EmailAction.PASSWORD_CHANGED,
+    );
 
     await this.tokenRepository.deleteOne(tokenEntity);
   }
@@ -297,7 +274,7 @@ export class AuthService {
   }
 
   public async resendEmailVerification(
-    data: ResendEmailVerificationDto,
+    data: ResendVerificationEmailDto,
   ): Promise<void> {
     const userEntity = await this.userRepository.findOneByEmail(data.email);
     if (!userEntity || userEntity.status !== UserStatus.PENDING) {
@@ -322,22 +299,12 @@ export class AuthService {
     );
 
     await this.tokenRepository.createUnique(tokenEntity);
-
-    await this.sendgridService.sendEmail({
-      personalizations: [
-        {
-          to: data.email,
-          dynamicTemplateData: {
-            service_name: SERVICE_NAME,
-            url: `${this.serverConfigService.feURL}/verify?token=${tokenEntity.uuid}`,
-          },
-        },
-      ],
-      templateId: SENDGRID_TEMPLATES.signup,
+    await this.emailService.sendEmail(data.email, EmailAction.SIGNUP, {
+      url: `${this.serverConfigService.feURL}/verify?token=${tokenEntity.uuid}`,
     });
   }
 
-  public async web3Signup(data: Web3SignUpDto): Promise<AuthDto> {
+  public async web3Signup(data: Web3SignUpDto): Promise<SuccessAuthDto> {
     const preSignUpData = prepareSignatureBody({
       from: data.address,
       to: this.web3Service.getOperatorAddress(),
@@ -423,7 +390,7 @@ export class AuthService {
     return this.auth(userEntity);
   }
 
-  public async web3Signin(data: Web3SignInDto): Promise<AuthDto> {
+  public async web3Signin(data: Web3SignInDto): Promise<SuccessAuthDto> {
     const userEntity = await this.userRepository.findOneByAddress(data.address);
 
     if (!userEntity) {
diff --git a/packages/apps/reputation-oracle/server/src/modules/auth/dto/email-verification.dto.ts b/packages/apps/reputation-oracle/server/src/modules/auth/dto/email-verification.dto.ts
new file mode 100644
index 0000000000..36a3f2da4b
--- /dev/null
+++ b/packages/apps/reputation-oracle/server/src/modules/auth/dto/email-verification.dto.ts
@@ -0,0 +1,19 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsString, IsUUID } from 'class-validator';
+import { LowercasedEmail } from '../../../common/decorators';
+
+export class ResendVerificationEmailDto {
+  @ApiProperty()
+  @LowercasedEmail()
+  public email: string;
+
+  @ApiProperty({ name: 'h_captcha_token' })
+  @IsString()
+  public hCaptchaToken: string;
+}
+
+export class VerifyEmailDto {
+  @ApiProperty()
+  @IsUUID()
+  public token: string;
+}
diff --git a/packages/apps/reputation-oracle/server/src/modules/auth/dto/index.ts b/packages/apps/reputation-oracle/server/src/modules/auth/dto/index.ts
new file mode 100644
index 0000000000..cee91b57db
--- /dev/null
+++ b/packages/apps/reputation-oracle/server/src/modules/auth/dto/index.ts
@@ -0,0 +1,5 @@
+export * from './sign-in.dto';
+export * from './sign-up.dto';
+export { RefreshDto } from './refresh.dto';
+export * from './email-verification.dto';
+export { ForgotPasswordDto, RestorePasswordDto } from './password.dto';
diff --git a/packages/apps/reputation-oracle/server/src/modules/auth/dto/password.dto.ts b/packages/apps/reputation-oracle/server/src/modules/auth/dto/password.dto.ts
new file mode 100644
index 0000000000..1d20033074
--- /dev/null
+++ b/packages/apps/reputation-oracle/server/src/modules/auth/dto/password.dto.ts
@@ -0,0 +1,37 @@
+import { applyDecorators } from '@nestjs/common';
+import { ApiProperty } from '@nestjs/swagger';
+import { IsString, MinLength } from 'class-validator';
+import { LowercasedEmail } from '../../../common/decorators';
+
+export function ValidPassword() {
+  return applyDecorators(
+    IsString(),
+    MinLength(8, {
+      message: 'Password must be at least 8 characters long.',
+    }),
+  );
+}
+
+export class ForgotPasswordDto {
+  @ApiProperty()
+  @LowercasedEmail()
+  public email: string;
+
+  @ApiProperty({ name: 'h_captcha_token' })
+  @IsString()
+  public hCaptchaToken: string;
+}
+
+export class RestorePasswordDto {
+  @ApiProperty()
+  @ValidPassword()
+  public password: string;
+
+  @ApiProperty()
+  @IsString()
+  public token: string;
+
+  @ApiProperty({ name: 'h_captcha_token' })
+  @IsString()
+  public hCaptchaToken: string;
+}
diff --git a/packages/apps/reputation-oracle/server/src/modules/auth/dto/refresh.dto.ts b/packages/apps/reputation-oracle/server/src/modules/auth/dto/refresh.dto.ts
new file mode 100644
index 0000000000..29897e11ab
--- /dev/null
+++ b/packages/apps/reputation-oracle/server/src/modules/auth/dto/refresh.dto.ts
@@ -0,0 +1,8 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsUUID } from 'class-validator';
+
+export class RefreshDto {
+  @ApiProperty({ name: 'refresh_token' })
+  @IsUUID()
+  public refreshToken: string;
+}
diff --git a/packages/apps/reputation-oracle/server/src/modules/auth/dto/sign-in.dto.ts b/packages/apps/reputation-oracle/server/src/modules/auth/dto/sign-in.dto.ts
new file mode 100644
index 0000000000..759e1cbe51
--- /dev/null
+++ b/packages/apps/reputation-oracle/server/src/modules/auth/dto/sign-in.dto.ts
@@ -0,0 +1,41 @@
+import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
+import {
+  IsValidWeb3Signature,
+  LowercasedEmail,
+} from '../../../common/decorators';
+import { IsEthereumAddress, IsOptional, IsString } from 'class-validator';
+
+export class Web2SignInDto {
+  @ApiProperty()
+  @LowercasedEmail()
+  public email: string;
+
+  @ApiProperty()
+  @IsString()
+  public password: string;
+
+  @ApiPropertyOptional({ name: 'h_captcha_token' })
+  @IsOptional()
+  @IsString()
+  public hCaptchaToken?: string;
+}
+
+export class Web3SignInDto {
+  @ApiProperty()
+  @IsEthereumAddress()
+  public address: string;
+
+  @ApiProperty()
+  @IsValidWeb3Signature()
+  public signature: string;
+}
+
+export class SuccessAuthDto {
+  @ApiProperty({ name: 'access_token' })
+  @IsString()
+  public accessToken: string;
+
+  @ApiProperty({ name: 'refresh_token' })
+  @IsString()
+  public refreshToken: string;
+}
diff --git a/packages/apps/reputation-oracle/server/src/modules/auth/dto/sign-up.dto.ts b/packages/apps/reputation-oracle/server/src/modules/auth/dto/sign-up.dto.ts
new file mode 100644
index 0000000000..b9ae0a7321
--- /dev/null
+++ b/packages/apps/reputation-oracle/server/src/modules/auth/dto/sign-up.dto.ts
@@ -0,0 +1,39 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsEthereumAddress, IsString } from 'class-validator';
+import {
+  IsEnumCaseInsensitive,
+  IsValidWeb3Signature,
+  LowercasedEmail,
+} from '../../../common/decorators';
+import { Role } from '../../../common/enums/user';
+import { ValidPassword } from './password.dto';
+
+export class Web2SignUpDto {
+  @ApiProperty()
+  @LowercasedEmail()
+  public email: string;
+
+  @ApiProperty()
+  @ValidPassword()
+  public password: string;
+
+  @ApiProperty({ name: 'h_captcha_token' })
+  @IsString()
+  public hCaptchaToken: string;
+}
+
+export class Web3SignUpDto {
+  @ApiProperty()
+  @IsValidWeb3Signature()
+  public signature: string;
+
+  @ApiProperty({
+    enum: Role,
+  })
+  @IsEnumCaseInsensitive(Role)
+  public type: Role;
+
+  @ApiProperty()
+  @IsEthereumAddress()
+  public address: string;
+}
diff --git a/packages/apps/reputation-oracle/server/src/modules/cron-job/cron-job.service.spec.ts b/packages/apps/reputation-oracle/server/src/modules/cron-job/cron-job.service.spec.ts
index 2039c85fe8..b4494e5e5b 100644
--- a/packages/apps/reputation-oracle/server/src/modules/cron-job/cron-job.service.spec.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/cron-job/cron-job.service.spec.ts
@@ -1,6 +1,5 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { CronJobService } from './cron-job.service';
-import { Logger } from '@nestjs/common';
 import { CronJobRepository } from './cron-job.repository';
 import { CronJobEntity } from './cron-job.entity';
 import { CronJobType } from '../../common/enums/cron-job';
@@ -47,13 +46,6 @@ describe('CronJobService', () => {
             processAwaitingPayouts: jest.fn(),
           },
         },
-        {
-          provide: Logger,
-          useValue: {
-            log: jest.fn(),
-            error: jest.fn(),
-          },
-        },
       ],
     }).compile();
 
diff --git a/packages/apps/reputation-oracle/server/src/modules/cron-job/cron-job.service.ts b/packages/apps/reputation-oracle/server/src/modules/cron-job/cron-job.service.ts
index 4616cda490..b6a1a61e24 100644
--- a/packages/apps/reputation-oracle/server/src/modules/cron-job/cron-job.service.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/cron-job/cron-job.service.ts
@@ -1,17 +1,18 @@
-import { Injectable, Logger } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
+import { Cron } from '@nestjs/schedule';
 
 import { CronJobType } from '../../common/enums/cron-job';
 
 import { CronJobEntity } from './cron-job.entity';
 import { CronJobRepository } from './cron-job.repository';
-import { Cron } from '@nestjs/schedule';
 import { WebhookIncomingService } from '../webhook/webhook-incoming.service';
 import { WebhookOutgoingService } from '../webhook/webhook-outgoing.service';
 import { EscrowCompletionService } from '../escrow-completion/escrow-completion.service';
+import logger from '../../logger';
 
 @Injectable()
 export class CronJobService {
-  private readonly logger = new Logger(CronJobService.name);
+  private readonly logger = logger.child({ context: CronJobService.name });
 
   constructor(
     private readonly cronJobRepository: CronJobRepository,
@@ -52,7 +53,7 @@ export class CronJobService {
       return false;
     }
 
-    this.logger.log('Previous cron job is not completed yet');
+    this.logger.info('Previous cron job is not completed yet', { cronJobType });
     return true;
   }
 
@@ -88,18 +89,18 @@ export class CronJobService {
       return;
     }
 
-    this.logger.log('Pending incoming webhooks START');
+    this.logger.info('Pending incoming webhooks START');
     const cronJob = await this.startCronJob(
       CronJobType.ProcessPendingIncomingWebhook,
     );
 
     try {
       await this.webhookIncomingService.processPendingIncomingWebhooks();
-    } catch (e) {
-      this.logger.error(e);
+    } catch (error) {
+      this.logger.error('Error processing pending incoming webhooks', error);
     }
 
-    this.logger.log('Pending incoming webhooks STOP');
+    this.logger.info('Pending incoming webhooks STOP');
     await this.completeCronJob(cronJob);
   }
 
@@ -119,18 +120,18 @@ export class CronJobService {
       return;
     }
 
-    this.logger.log('Pending escrow completion tracking START');
+    this.logger.info('Pending escrow completion tracking START');
     const cronJob = await this.startCronJob(
       CronJobType.ProcessPendingEscrowCompletionTracking,
     );
 
     try {
       await this.escrowCompletionService.processPendingEscrowCompletion();
-    } catch (e) {
-      this.logger.error(e);
+    } catch (error) {
+      this.logger.error('Error processing pending escrow completion', error);
     }
 
-    this.logger.log('Pending escrow completion tracking STOP');
+    this.logger.info('Pending escrow completion tracking STOP');
     await this.completeCronJob(cronJob);
   }
 
@@ -149,18 +150,18 @@ export class CronJobService {
       return;
     }
 
-    this.logger.log('Paid escrow completion tracking START');
+    this.logger.info('Paid escrow completion tracking START');
     const cronJob = await this.startCronJob(
       CronJobType.ProcessPaidEscrowCompletionTracking,
     );
 
     try {
       await this.escrowCompletionService.processPaidEscrowCompletion();
-    } catch (e) {
-      this.logger.error(e);
+    } catch (error) {
+      this.logger.error('Error processing paid escrow completion', error);
     }
 
-    this.logger.log('Paid escrow completion tracking STOP');
+    this.logger.info('Paid escrow completion tracking STOP');
     await this.completeCronJob(cronJob);
   }
 
@@ -174,18 +175,18 @@ export class CronJobService {
     if (await this.isCronJobRunning(CronJobType.ProcessPendingOutgoingWebhook))
       return;
 
-    this.logger.log('Pending outgoing webhooks START');
+    this.logger.info('Pending outgoing webhooks START');
     const cronJob = await this.startCronJob(
       CronJobType.ProcessPendingOutgoingWebhook,
     );
 
     try {
       await this.webhookOutgoingService.processPendingOutgoingWebhooks();
-    } catch (err) {
-      this.logger.error(err);
+    } catch (error) {
+      this.logger.error('Error processing pending outgoing webhooks', error);
     }
 
-    this.logger.log('Pending outgoing webhooks STOP');
+    this.logger.info('Pending outgoing webhooks STOP');
     await this.completeCronJob(cronJob);
   }
 
@@ -203,18 +204,18 @@ export class CronJobService {
       return;
     }
 
-    this.logger.log('Awaiting payouts escrow completion tracking START');
+    this.logger.info('Awaiting payouts processing START');
     const cronJob = await this.startCronJob(
       CronJobType.ProcessAwaitingEscrowPayouts,
     );
 
     try {
       await this.escrowCompletionService.processAwaitingPayouts();
-    } catch (e) {
-      this.logger.error(e);
+    } catch (error) {
+      this.logger.error('Error processing awaiting payouts', error);
     }
 
-    this.logger.log('Awaiting payouts escrow completion tracking STOP');
+    this.logger.info('Awaiting payouts processing STOP');
     await this.completeCronJob(cronJob);
   }
 }
diff --git a/packages/apps/reputation-oracle/server/src/modules/email/constants.ts b/packages/apps/reputation-oracle/server/src/modules/email/constants.ts
new file mode 100644
index 0000000000..457e939685
--- /dev/null
+++ b/packages/apps/reputation-oracle/server/src/modules/email/constants.ts
@@ -0,0 +1,8 @@
+export enum EmailAction {
+  SIGNUP = 'signup',
+  RESET_PASSWORD = 'reset_password',
+  PASSWORD_CHANGED = 'password_changed',
+}
+
+export const SENDGRID_API_KEY_REGEX =
+  /^SG\.[A-Za-z0-9-_]{22}\.[A-Za-z0-9-_]{43}$/;
diff --git a/packages/apps/reputation-oracle/server/src/modules/email/email.service.ts b/packages/apps/reputation-oracle/server/src/modules/email/email.service.ts
new file mode 100644
index 0000000000..086cf26af8
--- /dev/null
+++ b/packages/apps/reputation-oracle/server/src/modules/email/email.service.ts
@@ -0,0 +1,9 @@
+import { EmailAction } from './constants';
+
+export abstract class EmailService {
+  abstract sendEmail(
+    to: string,
+    action: EmailAction,
+    payload?: Record<string, any>,
+  ): Promise<void>;
+}
diff --git a/packages/apps/reputation-oracle/server/src/modules/email/module.ts b/packages/apps/reputation-oracle/server/src/modules/email/module.ts
new file mode 100644
index 0000000000..193c27a6f3
--- /dev/null
+++ b/packages/apps/reputation-oracle/server/src/modules/email/module.ts
@@ -0,0 +1,19 @@
+import { Module } from '@nestjs/common';
+import { ConfigModule } from '@nestjs/config';
+import { MailService } from '@sendgrid/mail';
+import { SendgridEmailService } from './sendgrid.service';
+import { EmailService } from './email.service';
+
+@Module({
+  imports: [ConfigModule],
+  providers: [
+    SendgridEmailService,
+    MailService,
+    {
+      provide: EmailService,
+      useClass: SendgridEmailService,
+    },
+  ],
+  exports: [EmailService],
+})
+export class EmailModule {}
diff --git a/packages/apps/reputation-oracle/server/src/modules/email/sendgrid.service.spec.ts b/packages/apps/reputation-oracle/server/src/modules/email/sendgrid.service.spec.ts
new file mode 100644
index 0000000000..5cf2fe2ae0
--- /dev/null
+++ b/packages/apps/reputation-oracle/server/src/modules/email/sendgrid.service.spec.ts
@@ -0,0 +1,145 @@
+jest.mock('../../logger');
+
+import { faker } from '@faker-js/faker';
+import { Test, TestingModule } from '@nestjs/testing';
+import { MailService } from '@sendgrid/mail';
+
+import * as environmentUtils from '../../common/utils/environment';
+import { SENDGRID_TEMPLATES, SERVICE_NAME } from './sendgrid.service';
+import logger from '../../logger';
+import { getTemplateId } from './sendgrid.service';
+import { EmailAction } from './constants';
+import { EmailConfigService } from '../../common/config/email-config.service';
+import { SendgridEmailService } from './sendgrid.service';
+
+const mockMailService = {
+  setApiKey: jest.fn(),
+  send: jest.fn(),
+};
+
+const mockEmailConfigService = {
+  apiKey: `SG.${faker.string.alphanumeric(22)}.${faker.string.alphanumeric(43)}`,
+  from: faker.internet.email(),
+  fromName: faker.string.alpha(),
+};
+
+const spyOnIsDevelopmentEnv = jest
+  .spyOn(environmentUtils, 'isDevelopmentEnv')
+  .mockReturnValue(false);
+
+describe('SendgridEmailService', () => {
+  let service: SendgridEmailService;
+
+  beforeAll(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [
+        SendgridEmailService,
+        { provide: MailService, useValue: mockMailService },
+        { provide: EmailConfigService, useValue: mockEmailConfigService },
+      ],
+    }).compile();
+
+    service = module.get<SendgridEmailService>(SendgridEmailService);
+  });
+
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  describe('Initialization', () => {
+    it('should initialize and set API key in staging/production mode', () => {
+      new SendgridEmailService(
+        mockMailService as any,
+        mockEmailConfigService as any,
+      );
+      expect(mockMailService.setApiKey).toHaveBeenCalledWith(
+        mockEmailConfigService.apiKey,
+      );
+    });
+
+    it('should throw an error for invalid API key in staging/production mode', () => {
+      const invalidConfig = {
+        ...mockEmailConfigService,
+        apiKey: faker.string.alphanumeric(),
+      };
+      expect(
+        () =>
+          new SendgridEmailService(
+            mockMailService as any,
+            invalidConfig as any,
+          ),
+      ).toThrow('Invalid SendGrid API key');
+    });
+  });
+
+  describe('sendEmail', () => {
+    const to = faker.internet.email();
+    const payload = { url: faker.internet.url() };
+
+    it('should log email in development mode without sending', async () => {
+      spyOnIsDevelopmentEnv.mockReturnValueOnce(true);
+
+      await service.sendEmail(to, EmailAction.SIGNUP, payload);
+      expect(logger.debug).toHaveBeenCalledWith(
+        'Email sent (development mode):',
+        {
+          to,
+          action: EmailAction.SIGNUP,
+          payload,
+        },
+      );
+      expect(mockMailService.send).not.toHaveBeenCalled();
+    });
+
+    it('should send email in staging/production mode', async () => {
+      await service.sendEmail(to, EmailAction.SIGNUP, payload);
+
+      expect(mockMailService.send).toHaveBeenCalledTimes(1);
+      expect(mockMailService.send).toHaveBeenCalledWith({
+        from: {
+          email: mockEmailConfigService.from,
+          name: mockEmailConfigService.fromName,
+        },
+        to,
+        templateId: SENDGRID_TEMPLATES.signup,
+        dynamicTemplateData: {
+          service_name: SERVICE_NAME,
+          ...payload,
+        },
+      });
+    });
+
+    it('should log and throw error if sending fails', async () => {
+      const error = new Error('SendGrid error');
+      mockMailService.send.mockRejectedValueOnce(error);
+
+      await expect(
+        service.sendEmail(to, EmailAction.SIGNUP, payload),
+      ).rejects.toThrow('Failed to send email');
+      expect(logger.error).toHaveBeenCalledWith('Failed to send email', {
+        error,
+        to,
+        action: EmailAction.SIGNUP,
+        payload,
+      });
+    });
+  });
+
+  describe('getTemplateId', () => {
+    it('should return correct template id for SIGNUP', () => {
+      expect(getTemplateId(EmailAction.SIGNUP)).toBe(SENDGRID_TEMPLATES.signup);
+    });
+
+    it('should return correct template id for RESET_PASSWORD', () => {
+      expect(getTemplateId(EmailAction.RESET_PASSWORD)).toBe(
+        SENDGRID_TEMPLATES.resetPassword,
+      );
+    });
+
+    it('should return correct template id for PASSWORD_CHANGED', () => {
+      expect(getTemplateId(EmailAction.PASSWORD_CHANGED)).toBe(
+        SENDGRID_TEMPLATES.passwordChanged,
+      );
+    });
+  });
+});
diff --git a/packages/apps/reputation-oracle/server/src/modules/email/sendgrid.service.ts b/packages/apps/reputation-oracle/server/src/modules/email/sendgrid.service.ts
new file mode 100644
index 0000000000..bf3d81adf9
--- /dev/null
+++ b/packages/apps/reputation-oracle/server/src/modules/email/sendgrid.service.ts
@@ -0,0 +1,92 @@
+import { Injectable } from '@nestjs/common';
+import { MailService } from '@sendgrid/mail';
+
+import { EmailService } from './email.service';
+import { EmailAction, SENDGRID_API_KEY_REGEX } from './constants';
+import logger from '../../logger';
+import { EmailConfigService } from '../../common/config/email-config.service';
+import { isDevelopmentEnv } from '../../common/utils/environment';
+
+export const SENDGRID_TEMPLATES = {
+  signup: 'd-ca99cc7410aa4e6dab3e6042d5ecb9a3',
+  resetPassword: 'd-3ac74546352a4e1abdd1689947632c22',
+  passwordChanged: 'd-ca0ac7e6fff845829cd0167af09f25cf',
+};
+export const SERVICE_NAME = 'App';
+
+export function getTemplateId(action: EmailAction): string {
+  switch (action) {
+    case EmailAction.SIGNUP:
+      return SENDGRID_TEMPLATES.signup;
+    case EmailAction.RESET_PASSWORD:
+      return SENDGRID_TEMPLATES.resetPassword;
+    case EmailAction.PASSWORD_CHANGED:
+      return SENDGRID_TEMPLATES.passwordChanged;
+  }
+}
+
+@Injectable()
+export class SendgridEmailService extends EmailService {
+  private readonly logger = logger.child({
+    context: SendgridEmailService.name,
+  });
+  constructor(
+    private readonly mailService: MailService,
+    private readonly emailConfigService: EmailConfigService,
+  ) {
+    super();
+    if (!isDevelopmentEnv()) {
+      if (!SENDGRID_API_KEY_REGEX.test(this.emailConfigService.apiKey)) {
+        throw new Error('Invalid SendGrid API key');
+      }
+      this.mailService.setApiKey(emailConfigService.apiKey);
+    }
+  }
+
+  async sendEmail(
+    to: string,
+    action: EmailAction,
+    payload?: Record<string, any>,
+  ): Promise<void> {
+    if (isDevelopmentEnv()) {
+      /**
+       * Logging email data upon local development
+       */
+      this.logger.debug('Email sent (development mode):', {
+        to,
+        action,
+        payload,
+      });
+      return;
+    }
+    const from = {
+      email: this.emailConfigService.from,
+      name: this.emailConfigService.fromName,
+    };
+
+    const templateId = getTemplateId(action);
+    const dynamicTemplateData = {
+      service_name: SERVICE_NAME,
+      ...payload,
+    };
+    try {
+      await this.mailService.send({
+        from,
+        to,
+        templateId,
+        dynamicTemplateData,
+      });
+    } catch (error) {
+      const errorMessage = 'Failed to send email';
+
+      this.logger.error(errorMessage, {
+        error,
+        to,
+        action,
+        payload,
+      });
+
+      throw new Error(errorMessage);
+    }
+  }
+}
diff --git a/packages/apps/reputation-oracle/server/src/modules/escrow-completion/escrow-completion.module.ts b/packages/apps/reputation-oracle/server/src/modules/escrow-completion/escrow-completion.module.ts
index 7dd0b404b9..bb1728f260 100644
--- a/packages/apps/reputation-oracle/server/src/modules/escrow-completion/escrow-completion.module.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/escrow-completion/escrow-completion.module.ts
@@ -1,4 +1,4 @@
-import { Logger, Module } from '@nestjs/common';
+import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { EscrowCompletionRepository } from './escrow-completion.repository';
 import { EscrowCompletionService } from './escrow-completion.service';
@@ -17,7 +17,6 @@ import { EscrowPayoutsBatchRepository } from './escrow-payouts-batch.repository'
     WebhookOutgoingModule,
   ],
   providers: [
-    Logger,
     EscrowCompletionService,
     EscrowCompletionRepository,
     EscrowPayoutsBatchRepository,
diff --git a/packages/apps/reputation-oracle/server/src/modules/escrow-completion/escrow-completion.repository.ts b/packages/apps/reputation-oracle/server/src/modules/escrow-completion/escrow-completion.repository.ts
index 2b2493264e..ea511e65b1 100644
--- a/packages/apps/reputation-oracle/server/src/modules/escrow-completion/escrow-completion.repository.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/escrow-completion/escrow-completion.repository.ts
@@ -1,4 +1,4 @@
-import { Injectable, Logger } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { BaseRepository } from '../../database/base.repository';
 import { DataSource, LessThanOrEqual } from 'typeorm';
 import { ServerConfigService } from '../../common/config/server-config.service';
@@ -7,7 +7,6 @@ import { EscrowCompletionStatus } from '../../common/enums';
 
 @Injectable()
 export class EscrowCompletionRepository extends BaseRepository<EscrowCompletionEntity> {
-  private readonly logger = new Logger(EscrowCompletionRepository.name);
   constructor(
     private dataSource: DataSource,
     public readonly serverConfigService: ServerConfigService,
diff --git a/packages/apps/reputation-oracle/server/src/modules/escrow-completion/escrow-completion.service.spec.ts b/packages/apps/reputation-oracle/server/src/modules/escrow-completion/escrow-completion.service.spec.ts
index d8c9247b6c..e8a9d4ff00 100644
--- a/packages/apps/reputation-oracle/server/src/modules/escrow-completion/escrow-completion.service.spec.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/escrow-completion/escrow-completion.service.spec.ts
@@ -367,7 +367,11 @@ describe('escrowCompletionService', () => {
         }),
       );
       expect(loggerErrorSpy).toHaveBeenCalledWith(
-        expect.stringContaining(`Error message: ${error.message}`),
+        'Failed to process pending escrow completion',
+        {
+          error,
+          escrowCompletionEntityId: expect.any(Number),
+        },
       );
     });
 
@@ -513,7 +517,11 @@ describe('escrowCompletionService', () => {
         }),
       );
       expect(loggerErrorSpy).toHaveBeenCalledWith(
-        expect.stringContaining(`Error message: ${error.message}`),
+        'Failed to process paid escrow completion',
+        {
+          error,
+          escrowCompletionEntityId: expect.any(Number),
+        },
       );
     });
 
diff --git a/packages/apps/reputation-oracle/server/src/modules/escrow-completion/escrow-completion.service.ts b/packages/apps/reputation-oracle/server/src/modules/escrow-completion/escrow-completion.service.ts
index bf27ad853e..756d8aa95f 100644
--- a/packages/apps/reputation-oracle/server/src/modules/escrow-completion/escrow-completion.service.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/escrow-completion/escrow-completion.service.ts
@@ -3,7 +3,7 @@ import crypto from 'crypto';
 import { ethers } from 'ethers';
 import stringify from 'json-stable-stringify';
 import _ from 'lodash';
-import { Injectable, Logger } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { EscrowCompletionStatus, EventType } from '../../common/enums';
 import { ServerConfigService } from '../../common/config/server-config.service';
 import { EscrowCompletionRepository } from './escrow-completion.repository';
@@ -29,10 +29,13 @@ import { isDuplicatedError } from '../../common/utils/database';
 import { CalculatedPayout } from '../payout/payout.interface';
 import { EscrowPayoutsBatchEntity } from './escrow-payouts-batch.entity';
 import { EscrowPayoutsBatchRepository } from './escrow-payouts-batch.repository';
+import logger from '../../logger';
 
 @Injectable()
 export class EscrowCompletionService {
-  private readonly logger = new Logger(WebhookIncomingService.name);
+  private readonly logger = logger.child({
+    context: WebhookIncomingService.name,
+  });
 
   constructor(
     private readonly escrowCompletionRepository: EscrowCompletionRepository,
@@ -164,13 +167,14 @@ export class EscrowCompletionService {
         escrowCompletionEntity.status = EscrowCompletionStatus.AWAITING_PAYOUTS;
         await this.escrowCompletionRepository.updateOne(escrowCompletionEntity);
       } catch (error) {
-        const failureDetail = `Error message: ${error.message})`;
-        this.logger.error(
-          `Failed to process pending escrow completion. Escrow completion ID: ${escrowCompletionEntity.id}. ${failureDetail}.`,
-        );
+        this.logger.error('Failed to process pending escrow completion', {
+          error,
+          escrowCompletionEntityId: escrowCompletionEntity.id,
+        });
+
         await this.handleEscrowCompletionError(
           escrowCompletionEntity,
-          failureDetail,
+          `Error message: ${error.message})`,
         );
         continue;
       }
@@ -240,20 +244,25 @@ export class EscrowCompletionService {
               webhookPayload,
               webhookUrl,
             );
-          } catch (err) {
-            if (isDuplicatedError(err)) {
+          } catch (error) {
+            if (isDuplicatedError(error)) {
               /**
                * Already created. Noop.
                */
               continue;
             } else {
-              const failureDetail = `Failed to create outgoing webhook for oracle. Address: ${oracleAddress}. Error message: ${err.message}`;
               this.logger.error(
-                `${failureDetail}. Escrow completion ID: ${escrowCompletionEntity.id}.`,
+                'Failed to create outgoing webhook for oracle',
+                {
+                  error,
+                  escrowCompletionEntityId: escrowCompletionEntity.id,
+                  oracleAddress,
+                },
               );
+
               await this.handleEscrowCompletionError(
                 escrowCompletionEntity,
-                failureDetail,
+                `Failed to create outgoing webhook for oracle. Address: ${oracleAddress}.`,
               );
               allWebhooksCreated = false;
               break;
@@ -268,14 +277,15 @@ export class EscrowCompletionService {
             escrowCompletionEntity,
           );
         }
-      } catch (err) {
-        const failureDetail = `Error message: ${err.message}`;
-        this.logger.error(
-          `Failed to process paid escrow completion. Escrow completion ID: ${escrowCompletionEntity.id}. ${failureDetail}.`,
-        );
+      } catch (error) {
+        this.logger.error('Failed to process paid escrow completion', {
+          error,
+          escrowCompletionEntityId: escrowCompletionEntity.id,
+        });
+
         await this.handleEscrowCompletionError(
           escrowCompletionEntity,
-          failureDetail,
+          `Error message: ${error.message}`,
         );
       }
     }
@@ -326,10 +336,10 @@ export class EscrowCompletionService {
               payoutsBatch,
             );
           } catch (error) {
-            this.logger.error(
-              `Failed to process payouts batch. Batch ID: ${payoutsBatch.id}`,
-              error.message,
-            );
+            this.logger.error(`Failed to process payouts batch`, {
+              error,
+              payoutsBatchId: payoutsBatch.id,
+            });
             hasFailedPayouts = true;
           }
         }
@@ -343,13 +353,14 @@ export class EscrowCompletionService {
           );
         }
       } catch (error) {
-        const failureDetail = `Error message: ${error.message}`;
-        this.logger.error(
-          `Failed to process payouts. Escrow completion ID: ${escrowCompletionEntity.id}. ${failureDetail}.`,
-        );
+        this.logger.error('Failed to process payouts', {
+          error,
+          escrowCompletionEntityId: escrowCompletionEntity.id,
+        });
+
         await this.handleEscrowCompletionError(
           escrowCompletionEntity,
-          failureDetail,
+          `Error message: ${error.message}`,
         );
         continue;
       }
diff --git a/packages/apps/reputation-oracle/server/src/modules/escrow-completion/escrow-payouts-batch.repository.ts b/packages/apps/reputation-oracle/server/src/modules/escrow-completion/escrow-payouts-batch.repository.ts
index a6491aa756..a8d57bbbe8 100644
--- a/packages/apps/reputation-oracle/server/src/modules/escrow-completion/escrow-payouts-batch.repository.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/escrow-completion/escrow-payouts-batch.repository.ts
@@ -1,11 +1,10 @@
-import { Injectable, Logger } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { BaseRepository } from '../../database/base.repository';
 import { DataSource } from 'typeorm';
 import { EscrowPayoutsBatchEntity } from './escrow-payouts-batch.entity';
 
 @Injectable()
 export class EscrowPayoutsBatchRepository extends BaseRepository<EscrowPayoutsBatchEntity> {
-  private readonly logger = new Logger(EscrowPayoutsBatchRepository.name);
   constructor(private dataSource: DataSource) {
     super(EscrowPayoutsBatchEntity, dataSource);
   }
diff --git a/packages/apps/reputation-oracle/server/src/modules/health/dto/ping-response.dto.ts b/packages/apps/reputation-oracle/server/src/modules/health/dto/ping-response.dto.ts
new file mode 100644
index 0000000000..cd190171ab
--- /dev/null
+++ b/packages/apps/reputation-oracle/server/src/modules/health/dto/ping-response.dto.ts
@@ -0,0 +1,9 @@
+import { ApiProperty } from '@nestjs/swagger';
+
+export class PingResponseDto {
+  @ApiProperty({ name: 'app_name' })
+  public appName: string;
+
+  @ApiProperty({ name: 'git_hash' })
+  public gitHash: string;
+}
diff --git a/packages/apps/reputation-oracle/server/src/modules/health/health.controller.ts b/packages/apps/reputation-oracle/server/src/modules/health/health.controller.ts
index 4c3277bcdc..252594e62f 100644
--- a/packages/apps/reputation-oracle/server/src/modules/health/health.controller.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/health/health.controller.ts
@@ -1,4 +1,5 @@
 import { Controller, Get } from '@nestjs/common';
+import { ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger';
 import {
   HealthCheck,
   HealthCheckResult,
@@ -6,24 +7,49 @@ import {
   HealthIndicatorResult,
   TypeOrmHealthIndicator,
 } from '@nestjs/terminus';
+import packageJson from '../../../package.json';
 import { Public } from '../../common/decorators';
-import { ApiOperation, ApiTags } from '@nestjs/swagger';
+import { ServerConfigService } from '../../common/config/server-config.service';
+import { PingResponseDto } from './dto/ping-response.dto';
 
 @Public()
 @ApiTags('Health')
-@Controller('/health')
+@Controller('health')
 export class HealthController {
   constructor(
+    private readonly serverConfigService: ServerConfigService,
     private readonly health: HealthCheckService,
     private readonly db: TypeOrmHealthIndicator,
   ) {}
 
-  @Get()
-  @HealthCheck()
   @ApiOperation({
-    summary: 'Health Check',
+    summary: 'Service ping',
+    description:
+      'Endpoint to ping service via HTTP in order to make sure it is accesible and serves proper version',
+  })
+  @ApiResponse({
+    status: 200,
+    description: 'Service is reachable',
+    type: PingResponseDto,
+  })
+  @ApiResponse({
+    status: '5XX',
+    description: 'Service is not reachable/running',
+  })
+  @Get('/ping')
+  async ping(): Promise<PingResponseDto> {
+    return {
+      appName: packageJson.name,
+      gitHash: this.serverConfigService.gitHash,
+    };
+  }
+
+  @ApiOperation({
+    summary: 'Health check',
     description: 'Endpoint to perform health checks for the application.',
   })
+  @HealthCheck()
+  @Get('/check')
   readiness(): Promise<HealthCheckResult> {
     return this.health.check([
       async (): Promise<HealthIndicatorResult> =>
diff --git a/packages/apps/reputation-oracle/server/src/modules/kyc/kyc.controller.ts b/packages/apps/reputation-oracle/server/src/modules/kyc/kyc.controller.ts
index cbd7493ee8..6993861245 100644
--- a/packages/apps/reputation-oracle/server/src/modules/kyc/kyc.controller.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/kyc/kyc.controller.ts
@@ -23,35 +23,33 @@ import { KycService } from './kyc.service';
 import { KycWebhookAuthGuard } from '../../common/guards/kyc-webhook.auth';
 import { KycErrorFilter } from './kyc.error.filter';
 
-@ApiTags('Kyc')
+@ApiTags('KYC')
 @Controller('/kyc')
 @UseFilters(KycErrorFilter)
 export class KycController {
   constructor(private readonly kycService: KycService) {}
 
-  @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
-  @Post('/start')
-  @HttpCode(200)
   @ApiOperation({
-    summary: 'Start Kyc',
-    description: 'Endpoint to start Kyc process for the user.',
+    summary: 'Start KYC',
+    description: 'Endpoint to start KYC process for the user',
   })
   @ApiResponse({
     status: 200,
-    description: 'Kyc session started successfully',
+    description: 'KYC session started successfully',
     type: KycSessionDto,
   })
+  @ApiBearerAuth()
+  @UseGuards(JwtAuthGuard)
+  @Post('/start')
+  @HttpCode(200)
   async startKyc(@Req() request: RequestWithUser): Promise<KycSessionDto> {
-    return this.kycService.initSession(request.user);
+    const kycSessionData = await this.kycService.initSession(request.user);
+    return kycSessionData;
   }
 
-  @Post('/update')
-  @UseGuards(KycWebhookAuthGuard)
-  @HttpCode(200)
   @ApiOperation({
-    summary: 'Update Kyc status',
-    description: 'Endpoint to update Kyc process for the user.',
+    summary: 'Update KYC status',
+    description: 'Endpoint to update KYC process for the user',
   })
   @ApiHeader({
     name: 'x-auth-client',
@@ -74,14 +72,13 @@ export class KycController {
     status: 200,
     description: 'Kyc status updated successfully',
   })
-  public updateKycStatus(@Body() data: KycStatusDto): Promise<void> {
-    return this.kycService.updateKycStatus(data);
+  @Post('/update')
+  @UseGuards(KycWebhookAuthGuard)
+  @HttpCode(200)
+  async updateKycStatus(@Body() data: KycStatusDto): Promise<void> {
+    await this.kycService.updateKycStatus(data);
   }
 
-  @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
-  @Get('/on-chain')
-  @HttpCode(200)
   @ApiOperation({
     summary: 'Get Signed Address',
     description: 'Endpoint to get a signed address for the KYC process.',
@@ -91,9 +88,16 @@ export class KycController {
     description: 'KYC signed address generated successfully',
     type: KycSignedAddressDto,
   })
+  @ApiBearerAuth()
+  @UseGuards(JwtAuthGuard)
+  @Get('/on-chain')
+  @HttpCode(200)
   async getSignedAddress(
     @Req() request: RequestWithUser,
   ): Promise<KycSignedAddressDto> {
-    return this.kycService.getSignedAddress(request.user);
+    const signedAddressData = await this.kycService.getSignedAddress(
+      request.user,
+    );
+    return signedAddressData;
   }
 }
diff --git a/packages/apps/reputation-oracle/server/src/modules/kyc/kyc.error.filter.ts b/packages/apps/reputation-oracle/server/src/modules/kyc/kyc.error.filter.ts
index bc9ac74c27..0f7c30df04 100644
--- a/packages/apps/reputation-oracle/server/src/modules/kyc/kyc.error.filter.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/kyc/kyc.error.filter.ts
@@ -3,22 +3,23 @@ import {
   Catch,
   ArgumentsHost,
   HttpStatus,
-  Logger,
 } from '@nestjs/common';
 import { Request, Response } from 'express';
 
 import { KycError } from './kyc.error';
+import logger from '../../logger';
 
 @Catch(KycError)
 export class KycErrorFilter implements ExceptionFilter {
-  private logger = new Logger(KycErrorFilter.name);
+  private readonly logger = logger.child({ context: KycErrorFilter.name });
+
   catch(exception: KycError, host: ArgumentsHost) {
     const ctx = host.switchToHttp();
     const response = ctx.getResponse<Response>();
     const request = ctx.getRequest<Request>();
     const status = HttpStatus.BAD_REQUEST;
 
-    this.logger.error(exception.message, exception.stack, exception.userId);
+    this.logger.error('KYC error', exception);
 
     return response.status(status).json({
       message: exception.message,
diff --git a/packages/apps/reputation-oracle/server/src/modules/kyc/kyc.repository.ts b/packages/apps/reputation-oracle/server/src/modules/kyc/kyc.repository.ts
index d3a51071d7..223a69f6fb 100644
--- a/packages/apps/reputation-oracle/server/src/modules/kyc/kyc.repository.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/kyc/kyc.repository.ts
@@ -1,12 +1,10 @@
-import { Injectable, Logger } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { DataSource } from 'typeorm';
 import { BaseRepository } from '../../database/base.repository';
 import { KycEntity } from './kyc.entity';
 
 @Injectable()
 export class KycRepository extends BaseRepository<KycEntity> {
-  private readonly logger = new Logger(KycRepository.name);
-
   constructor(private dataSource: DataSource) {
     super(KycEntity, dataSource);
   }
diff --git a/packages/apps/reputation-oracle/server/src/modules/payout/payout.module.ts b/packages/apps/reputation-oracle/server/src/modules/payout/payout.module.ts
index 9e858f3c14..838e554113 100644
--- a/packages/apps/reputation-oracle/server/src/modules/payout/payout.module.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/payout/payout.module.ts
@@ -1,4 +1,4 @@
-import { Logger, Module } from '@nestjs/common';
+import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 
 import { PayoutService } from './payout.service';
@@ -8,7 +8,7 @@ import { StorageModule } from '../storage/storage.module';
 
 @Module({
   imports: [ConfigModule, ReputationModule, Web3Module, StorageModule],
-  providers: [Logger, PayoutService],
+  providers: [PayoutService],
   exports: [PayoutService],
 })
 export class PayoutModule {}
diff --git a/packages/apps/reputation-oracle/server/src/modules/payout/payout.service.ts b/packages/apps/reputation-oracle/server/src/modules/payout/payout.service.ts
index 47d4482fce..2b5bbdc03e 100644
--- a/packages/apps/reputation-oracle/server/src/modules/payout/payout.service.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/payout/payout.service.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
-import { Inject, Injectable, Logger } from '@nestjs/common';
+import { Inject, Injectable } from '@nestjs/common';
 import { ChainId, EscrowClient } from '@human-protocol/sdk';
 
 import {
@@ -29,7 +29,6 @@ import { MissingManifestUrlError } from '../../common/errors/manifest';
 
 @Injectable()
 export class PayoutService {
-  private readonly logger = new Logger(PayoutService.name);
   constructor(
     @Inject(StorageService)
     private readonly storageService: StorageService,
diff --git a/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.controller.spec.ts b/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.controller.spec.ts
index f8c23b8e80..3a1235ba42 100644
--- a/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.controller.spec.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.controller.spec.ts
@@ -1,12 +1,7 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { QualificationController } from './qualification.controller';
 import { QualificationService } from './qualification.service';
-import {
-  CreateQualificationDto,
-  AssignQualificationDto,
-  UnassignQualificationDto,
-  QualificationDto,
-} from './qualification.dto';
+import { CreateQualificationDto, QualificationDto } from './qualification.dto';
 
 describe('QualificationController', () => {
   let qualificationController: QualificationController;
@@ -42,13 +37,13 @@ describe('QualificationController', () => {
         reference: 'test-ref',
         title: 'Test Title',
         description: 'Test Description',
-        expiresAt: new Date(),
+        expiresAt: new Date().toISOString(),
       };
       const result: QualificationDto = {
         reference: 'test-ref',
         title: 'Test Title',
         description: 'Test Description',
-        expiresAt: new Date(createQualificationDto.expiresAt!),
+        expiresAt: createQualificationDto.expiresAt,
       };
 
       jest
@@ -73,7 +68,6 @@ describe('QualificationController', () => {
         reference: 'test-ref',
         title: 'Test Title',
         description: 'Test Description',
-        expiresAt: null,
       };
 
       jest
@@ -96,7 +90,7 @@ describe('QualificationController', () => {
           reference: 'test-ref',
           title: 'Test Title',
           description: 'Test Description',
-          expiresAt: new Date(),
+          expiresAt: new Date().toISOString(),
         },
       ];
 
@@ -111,32 +105,30 @@ describe('QualificationController', () => {
 
   describe('assign', () => {
     it('should assign a qualification to users', async () => {
-      const assignQualificationDto: AssignQualificationDto = {
-        reference: 'test-ref',
-        workerAddresses: ['0x123'],
-      };
+      const reference = 'test-ref';
+      const workerAddresses = ['0x123'];
 
       jest.spyOn(qualificationService, 'assign').mockResolvedValue();
 
-      await qualificationController.assign(assignQualificationDto);
+      await qualificationController.assign(reference, { workerAddresses });
       expect(qualificationService.assign).toHaveBeenCalledWith(
-        assignQualificationDto,
+        reference,
+        workerAddresses,
       );
     });
   });
 
   describe('unassign', () => {
     it('should unassign a qualification from users', async () => {
-      const unassignQualificationDto: UnassignQualificationDto = {
-        reference: 'test-ref',
-        workerAddresses: ['0x123'],
-      };
+      const reference = 'test-ref';
+      const workerAddresses = ['0x123'];
 
       jest.spyOn(qualificationService, 'unassign').mockResolvedValue();
 
-      await qualificationController.unassign(unassignQualificationDto);
+      await qualificationController.unassign(reference, { workerAddresses });
       expect(qualificationService.unassign).toHaveBeenCalledWith(
-        unassignQualificationDto,
+        reference,
+        workerAddresses,
       );
     });
   });
@@ -147,7 +139,7 @@ describe('QualificationController', () => {
 
       jest.spyOn(qualificationService, 'delete').mockResolvedValue();
 
-      await qualificationController.delete(reference);
+      await qualificationController.deleteQualification(reference);
       expect(qualificationService.delete).toHaveBeenCalledWith(reference);
     });
   });
diff --git a/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.controller.ts b/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.controller.ts
index fb3a5a67eb..1b39c55f5b 100644
--- a/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.controller.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.controller.ts
@@ -9,12 +9,6 @@ import {
   HttpCode,
   UseFilters,
 } from '@nestjs/common';
-import {
-  CreateQualificationDto,
-  AssignQualificationDto,
-  UnassignQualificationDto,
-} from './qualification.dto';
-
 import {
   ApiBearerAuth,
   ApiTags,
@@ -22,91 +16,125 @@ import {
   ApiResponse,
   ApiBody,
 } from '@nestjs/swagger';
+
+import {
+  CreateQualificationDto,
+  AssignQualificationDto,
+  UnassignQualificationDto,
+  QualificationDto,
+} from './qualification.dto';
 import { QualificationErrorFilter } from './qualification.error.filter';
 import { JwtAuthGuard, RolesAuthGuard } from '../../common/guards';
 import { QualificationService } from './qualification.service';
 import { Roles } from '../../common/decorators';
 import { Role } from '../../common/enums/user';
 
-// TODO: Revisit methods and status codes.
-
 @ApiTags('Qualification')
-@Controller('qualification')
+@Controller('qualifications')
 @ApiBearerAuth()
 @UseFilters(QualificationErrorFilter)
 export class QualificationController {
   constructor(private readonly qualificationService: QualificationService) {}
 
-  @Post()
-  @UseGuards(JwtAuthGuard, RolesAuthGuard)
-  @Roles(Role.ADMIN)
-  @HttpCode(201)
   @ApiOperation({ summary: 'Create a new qualification' })
   @ApiBody({ type: CreateQualificationDto })
   @ApiResponse({
     status: 201,
     description: 'Qualification created successfully',
+    type: QualificationDto,
   })
-  @ApiResponse({ status: 400, description: 'Bad Request' })
-  create(@Body() createQualificationDto: CreateQualificationDto) {
-    return this.qualificationService.createQualification(
+  @UseGuards(JwtAuthGuard, RolesAuthGuard)
+  @Roles(Role.ADMIN)
+  @Post()
+  @HttpCode(201)
+  /**
+   * TODO: revisit DTO validation when
+   * refactoring business logic
+   */
+  async create(
+    @Body() createQualificationDto: CreateQualificationDto,
+  ): Promise<QualificationDto> {
+    const qualification = await this.qualificationService.createQualification(
       createQualificationDto,
     );
+    return qualification;
   }
 
+  @ApiOperation({ summary: 'Get list of qualifications' })
+  @ApiResponse({
+    status: 200,
+    description: 'List of qualifications',
+    type: QualificationDto,
+    isArray: true,
+  })
   @Get()
   @HttpCode(200)
-  @ApiOperation({ summary: 'Get list of qualifications' })
-  @ApiResponse({ status: 200, description: 'List of qualifications' })
-  getQualifications() {
-    return this.qualificationService.getQualifications();
+  async getQualifications(): Promise<QualificationDto[]> {
+    /**
+     * TODO: Refactor this endpoint to support pagination
+     */
+    const qualifications = await this.qualificationService.getQualifications();
+    return qualifications;
   }
 
-  @Post('/assign')
+  @ApiOperation({ summary: 'Delete a qualification' })
+  @ApiResponse({
+    status: 204,
+    description: 'Qualification deleted successfully',
+  })
+  @ApiResponse({
+    status: 422,
+    description: 'Cannot delete qualification',
+  })
   @UseGuards(JwtAuthGuard, RolesAuthGuard)
   @Roles(Role.ADMIN)
-  @HttpCode(201)
+  @Delete('/:reference')
+  @HttpCode(204)
+  async deleteQualification(
+    @Param('reference') reference: string,
+  ): Promise<void> {
+    await this.qualificationService.delete(reference);
+  }
+
   @ApiOperation({ summary: 'Assign a qualification to users' })
   @ApiBody({ type: AssignQualificationDto })
   @ApiResponse({
-    status: 201,
+    status: 200,
     description: 'Qualification assigned successfully',
   })
-  @ApiResponse({ status: 400, description: 'Bad Request' })
-  @ApiResponse({ status: 404, description: 'Not Found' })
-  @ApiResponse({ status: 422, description: 'Unprocessable entity' })
-  assign(@Body() assignQualificationDto: AssignQualificationDto) {
-    return this.qualificationService.assign(assignQualificationDto);
-  }
-
-  @Delete('/unassign')
+  @ApiResponse({ status: 422, description: 'No users found for operation' })
   @UseGuards(JwtAuthGuard, RolesAuthGuard)
   @Roles(Role.ADMIN)
+  @Post('/:reference/assign')
   @HttpCode(200)
+  async assign(
+    @Param('reference') reference: string,
+    @Body() assignQualificationDto: AssignQualificationDto,
+  ): Promise<void> {
+    await this.qualificationService.assign(
+      reference,
+      assignQualificationDto.workerAddresses,
+    );
+  }
+
   @ApiOperation({ summary: 'Unassign a qualification from users' })
   @ApiBody({ type: UnassignQualificationDto })
   @ApiResponse({
     status: 200,
     description: 'Qualification unassigned successfully',
   })
-  @ApiResponse({ status: 400, description: 'Bad Request' })
-  @ApiResponse({ status: 404, description: 'Not Found' })
-  @ApiResponse({ status: 422, description: 'Unprocessable entity' })
-  unassign(@Body() unassignQualificationDto: UnassignQualificationDto) {
-    return this.qualificationService.unassign(unassignQualificationDto);
-  }
-
-  @Delete('/:reference')
+  @ApiResponse({ status: 422, description: 'No users found for operation' })
   @UseGuards(JwtAuthGuard, RolesAuthGuard)
   @Roles(Role.ADMIN)
+  @Post('/:reference/unassign')
   @HttpCode(200)
-  @ApiOperation({ summary: 'Delete a qualification' })
-  @ApiResponse({
-    status: 200,
-    description: 'Qualification deleted successfully',
-  })
-  @ApiResponse({ status: 404, description: 'Qualification not found' })
-  delete(@Param('reference') reference: string) {
-    return this.qualificationService.delete(reference);
+  async unassign(
+    @Param('reference') reference: string,
+    @Body() unassignQualificationDto: UnassignQualificationDto,
+  ): Promise<void> {
+    await this.qualificationService.unassign(
+      reference,
+      unassignQualificationDto.workerAddresses,
+    );
   }
 }
diff --git a/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.dto.ts b/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.dto.ts
index 07566da170..40f7d1371d 100644
--- a/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.dto.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.dto.ts
@@ -7,10 +7,14 @@ import {
 } from 'class-validator';
 
 export class QualificationDto {
+  @ApiProperty()
   public reference: string;
+  @ApiProperty()
   public title: string;
+  @ApiProperty()
   public description: string;
-  public expiresAt?: Date | null;
+  @ApiPropertyOptional({ name: 'expires_at' })
+  public expiresAt?: string;
 }
 
 export class CreateQualificationDto {
@@ -29,24 +33,16 @@ export class CreateQualificationDto {
   @ApiPropertyOptional({ name: 'expires_at' })
   @IsOptional()
   @IsDateString()
-  public expiresAt?: Date;
+  public expiresAt?: string;
 }
 
 export class AssignQualificationDto {
-  @ApiProperty()
-  @IsString()
-  public reference: string;
-
   @ApiProperty({ name: 'worker_addresses' })
   @IsEthereumAddress({ each: true })
   public workerAddresses: string[];
 }
 
 export class UnassignQualificationDto {
-  @ApiProperty()
-  @IsString()
-  public reference: string;
-
   @ApiProperty({ name: 'worker_addresses' })
   @IsEthereumAddress({ each: true })
   public workerAddresses: string[];
diff --git a/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.error.filter.ts b/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.error.filter.ts
index b76718e881..051299e0f3 100644
--- a/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.error.filter.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.error.filter.ts
@@ -3,7 +3,6 @@ import {
   Catch,
   ArgumentsHost,
   HttpStatus,
-  Logger,
 } from '@nestjs/common';
 import { Request, Response } from 'express';
 
@@ -11,10 +10,14 @@ import {
   QualificationError,
   QualificationErrorMessage,
 } from './qualification.error';
+import logger from '../../logger';
 
 @Catch(QualificationError)
 export class QualificationErrorFilter implements ExceptionFilter {
-  private logger = new Logger(QualificationErrorFilter.name);
+  private readonly logger = logger.child({
+    context: QualificationErrorFilter.name,
+  });
+
   catch(exception: QualificationError, host: ArgumentsHost) {
     const ctx = host.switchToHttp();
     const response = ctx.getResponse<Response>();
@@ -24,12 +27,15 @@ export class QualificationErrorFilter implements ExceptionFilter {
     if (exception.message === QualificationErrorMessage.NOT_FOUND) {
       status = HttpStatus.NOT_FOUND;
     } else if (
-      exception.message === QualificationErrorMessage.NO_WORKERS_FOUND
+      [
+        QualificationErrorMessage.NO_WORKERS_FOUND,
+        QualificationErrorMessage.CANNOT_DETELE_ASSIGNED_QUALIFICATION,
+      ].includes(exception.message as QualificationErrorMessage)
     ) {
       status = HttpStatus.UNPROCESSABLE_ENTITY;
     }
 
-    this.logger.error(exception.message, exception.stack, exception.reference);
+    this.logger.error('Qualification error', exception);
 
     return response.status(status).json({
       message: exception.message,
diff --git a/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.module.ts b/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.module.ts
index 3f67454aa8..eef848d31c 100644
--- a/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.module.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.module.ts
@@ -1,4 +1,4 @@
-import { Logger, Module } from '@nestjs/common';
+import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { QualificationService } from './qualification.service';
 import { QualificationRepository } from './qualification.repository';
@@ -7,12 +7,7 @@ import { QualificationController } from './qualification.controller';
 
 @Module({
   imports: [ConfigModule],
-  providers: [
-    Logger,
-    QualificationService,
-    QualificationRepository,
-    UserRepository,
-  ],
+  providers: [QualificationService, QualificationRepository, UserRepository],
   controllers: [QualificationController],
   exports: [QualificationService],
 })
diff --git a/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.repository.ts b/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.repository.ts
index a0141e3dda..814904ac0d 100644
--- a/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.repository.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.repository.ts
@@ -1,4 +1,4 @@
-import { Injectable, Logger } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { BaseRepository } from '../../database/base.repository';
 import { DataSource, In, IsNull, MoreThan } from 'typeorm';
 import { QualificationEntity } from './qualification.entity';
@@ -7,8 +7,6 @@ import { UserQualificationEntity } from './user-qualification.entity';
 
 @Injectable()
 export class QualificationRepository extends BaseRepository<QualificationEntity> {
-  private readonly logger = new Logger(QualificationRepository.name);
-
   constructor(private dataSource: DataSource) {
     super(QualificationEntity, dataSource);
   }
diff --git a/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.service.spec.ts b/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.service.spec.ts
index 649318d949..becbafe035 100644
--- a/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.service.spec.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.service.spec.ts
@@ -7,11 +7,7 @@ import {
   QualificationError,
   QualificationErrorMessage,
 } from './qualification.error';
-import {
-  CreateQualificationDto,
-  AssignQualificationDto,
-  UnassignQualificationDto,
-} from './qualification.dto';
+import { CreateQualificationDto } from './qualification.dto';
 import { QualificationEntity } from './qualification.entity';
 import { UserEntity } from '../user/user.entity';
 import { UserQualificationEntity } from './user-qualification.entity';
@@ -63,7 +59,7 @@ describe('QualificationService', () => {
         reference: 'ref1',
         title: 'title1',
         description: 'desc1',
-        expiresAt: new Date('2025-12-31'),
+        expiresAt: '2025-12-31T00:00:00.000Z',
       };
 
       const qualificationEntity = new QualificationEntity();
@@ -86,7 +82,7 @@ describe('QualificationService', () => {
         reference: createQualificationDto.reference,
         title: createQualificationDto.title,
         description: createQualificationDto.description,
-        expiresAt: new Date(createQualificationDto.expiresAt!),
+        expiresAt: createQualificationDto.expiresAt,
       });
     });
 
@@ -115,7 +111,6 @@ describe('QualificationService', () => {
         reference: createQualificationDto.reference,
         title: createQualificationDto.title,
         description: createQualificationDto.description,
-        expiresAt: null,
       });
     });
 
@@ -124,7 +119,7 @@ describe('QualificationService', () => {
         reference: 'ref1',
         title: 'title1',
         description: 'desc1',
-        expiresAt: new Date('2000-01-01'),
+        expiresAt: '2000-01-01T00:00:00.000Z',
       };
 
       const errorMessage =
@@ -148,7 +143,7 @@ describe('QualificationService', () => {
         reference: 'ref1',
         title: 'title1',
         description: 'desc1',
-        expiresAt: new Date('2025-12-31'),
+        expiresAt: '2025-12-31T00:00:00.000Z',
       };
 
       qualificationRepository.createUnique = jest
@@ -168,7 +163,6 @@ describe('QualificationService', () => {
           reference: 'ref1',
           title: 'title1',
           description: 'desc1',
-          expiresAt: null,
         },
       ];
       qualificationRepository.getQualifications = jest
@@ -186,7 +180,6 @@ describe('QualificationService', () => {
           reference: 'ref1',
           title: 'title1',
           description: 'desc1',
-          expiresAt: null,
         },
       ];
       qualificationRepository.getQualifications = jest
@@ -235,13 +228,11 @@ describe('QualificationService', () => {
     });
 
     it('should assign users to a qualification', async () => {
-      const assignQualificationDto: AssignQualificationDto = {
-        reference: 'ref1',
-        workerAddresses: ['address1'],
-      };
+      const reference = 'ref1';
+      const workerAddresses = ['address1'];
 
       const qualificationEntity = new QualificationEntity();
-      qualificationEntity.reference = 'ref1';
+      qualificationEntity.reference = reference;
       qualificationEntity.userQualifications = [];
 
       qualificationRepository.findByReference = jest
@@ -251,7 +242,7 @@ describe('QualificationService', () => {
         .fn()
         .mockResolvedValue([{ id: 1 }]);
 
-      await qualificationService.assign(assignQualificationDto);
+      await qualificationService.assign(reference, workerAddresses);
 
       expect(
         qualificationRepository.saveUserQualifications,
@@ -259,13 +250,11 @@ describe('QualificationService', () => {
     });
 
     it('should assign users to a qualification with null expiresAt', async () => {
-      const assignQualificationDto: AssignQualificationDto = {
-        reference: 'ref1',
-        workerAddresses: ['address1'],
-      };
+      const reference = 'ref1';
+      const workerAddresses = ['address1'];
 
       const qualificationEntity = new QualificationEntity();
-      qualificationEntity.reference = 'ref1';
+      qualificationEntity.reference = reference;
       qualificationEntity.expiresAt = null;
       qualificationEntity.userQualifications = [];
 
@@ -276,7 +265,7 @@ describe('QualificationService', () => {
         .fn()
         .mockResolvedValue([{ id: 1 }]);
 
-      await qualificationService.assign(assignQualificationDto);
+      await qualificationService.assign(reference, workerAddresses);
 
       expect(
         qualificationRepository.saveUserQualifications,
@@ -288,12 +277,7 @@ describe('QualificationService', () => {
         .fn()
         .mockResolvedValue(null);
 
-      await expect(
-        qualificationService.assign({
-          reference: 'ref1',
-          workerAddresses: [],
-        }),
-      ).rejects.toThrow(
+      await expect(qualificationService.assign('ref1', [])).rejects.toThrow(
         new QualificationError(QualificationErrorMessage.NOT_FOUND, 'ref1'),
       );
     });
@@ -305,13 +289,11 @@ describe('QualificationService', () => {
     });
 
     it('should unassign users from a qualification', async () => {
-      const unassignQualificationDto: UnassignQualificationDto = {
-        reference: 'ref1',
-        workerAddresses: ['address1'],
-      };
+      const reference = 'ref1';
+      const workerAddresses = ['address1'];
 
       const qualificationEntity = new QualificationEntity();
-      qualificationEntity.reference = 'ref1';
+      qualificationEntity.reference = reference;
       qualificationEntity.userQualifications = [
         { id: 1 } as UserQualificationEntity,
       ];
@@ -323,7 +305,7 @@ describe('QualificationService', () => {
         .fn()
         .mockResolvedValue([{ id: 1 }]);
 
-      await qualificationService.unassign(unassignQualificationDto);
+      await qualificationService.unassign(reference, workerAddresses);
 
       expect(
         qualificationRepository.saveUserQualifications,
@@ -331,13 +313,11 @@ describe('QualificationService', () => {
     });
 
     it('should unassign users from a qualification with null expiresAt', async () => {
-      const unassignQualificationDto: UnassignQualificationDto = {
-        reference: 'ref1',
-        workerAddresses: ['address1'],
-      };
+      const reference = 'ref1';
+      const workerAddresses = ['address1'];
 
       const qualificationEntity = new QualificationEntity();
-      qualificationEntity.reference = 'ref1';
+      qualificationEntity.reference = reference;
       qualificationEntity.expiresAt = null;
       qualificationEntity.userQualifications = [
         { id: 1 } as UserQualificationEntity,
@@ -350,7 +330,7 @@ describe('QualificationService', () => {
         .fn()
         .mockResolvedValue([{ id: 1 }]);
 
-      await qualificationService.unassign(unassignQualificationDto);
+      await qualificationService.unassign(reference, workerAddresses);
 
       expect(
         qualificationRepository.saveUserQualifications,
@@ -362,12 +342,7 @@ describe('QualificationService', () => {
         .fn()
         .mockResolvedValue(null);
 
-      await expect(
-        qualificationService.unassign({
-          reference: 'ref1',
-          workerAddresses: [],
-        }),
-      ).rejects.toThrow(
+      await expect(qualificationService.unassign('ref1', [])).rejects.toThrow(
         new QualificationError(QualificationErrorMessage.NOT_FOUND, 'ref1'),
       );
     });
diff --git a/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.service.ts b/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.service.ts
index 4d8775b4a8..4dd55aa189 100644
--- a/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.service.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/qualification/qualification.service.ts
@@ -1,10 +1,5 @@
-import { Injectable, Logger } from '@nestjs/common';
-import {
-  CreateQualificationDto,
-  AssignQualificationDto,
-  UnassignQualificationDto,
-  QualificationDto,
-} from './qualification.dto';
+import { Injectable } from '@nestjs/common';
+import { CreateQualificationDto, QualificationDto } from './qualification.dto';
 import { QualificationEntity } from './qualification.entity';
 import { QualificationRepository } from './qualification.repository';
 import { UserEntity } from '../user/user.entity';
@@ -16,10 +11,13 @@ import {
   QualificationError,
   QualificationErrorMessage,
 } from './qualification.error';
+import logger from '../../logger';
 
 @Injectable()
 export class QualificationService {
-  private readonly logger = new Logger(QualificationService.name);
+  private readonly logger = logger.child({
+    context: QualificationService.name,
+  });
 
   constructor(
     private readonly qualificationRepository: QualificationRepository,
@@ -67,7 +65,7 @@ export class QualificationService {
       reference: newQualification.reference,
       title: newQualification.title,
       description: newQualification.description,
-      expiresAt: newQualification.expiresAt || null,
+      expiresAt: newQualification.expiresAt?.toISOString(),
     };
   }
 
@@ -81,11 +79,11 @@ export class QualificationService {
           reference: qualificationEntity.reference,
           title: qualificationEntity.title,
           description: qualificationEntity.description,
-          expiresAt: qualificationEntity.expiresAt,
+          expiresAt: qualificationEntity.expiresAt?.toISOString(),
         };
       });
     } catch (error) {
-      this.logger.log(`Failed to fetch qualifications: ${error.message}`);
+      this.logger.warn('Failed to fetch qualifications', error);
       return [];
     }
   }
@@ -108,12 +106,13 @@ export class QualificationService {
       );
     }
 
-    return this.qualificationRepository.deleteOne(qualificationEntity);
+    await this.qualificationRepository.deleteOne(qualificationEntity);
   }
 
-  public async assign(dto: AssignQualificationDto): Promise<void> {
-    const { reference, workerAddresses } = dto;
-
+  public async assign(
+    reference: string,
+    workerAddresses: string[],
+  ): Promise<void> {
     const qualificationEntity =
       await this.qualificationRepository.findByReference(reference);
 
@@ -152,9 +151,10 @@ export class QualificationService {
     );
   }
 
-  public async unassign(dto: UnassignQualificationDto): Promise<void> {
-    const { reference, workerAddresses } = dto;
-
+  public async unassign(
+    reference: string,
+    workerAddresses: string[],
+  ): Promise<void> {
     const qualificationEntity =
       await this.qualificationRepository.findByReference(reference);
 
diff --git a/packages/apps/reputation-oracle/server/src/modules/reputation/reputation.controller.ts b/packages/apps/reputation-oracle/server/src/modules/reputation/reputation.controller.ts
index ba1b21d921..a05a17d8ff 100644
--- a/packages/apps/reputation-oracle/server/src/modules/reputation/reputation.controller.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/reputation/reputation.controller.ts
@@ -23,7 +23,6 @@ import { ReputationErrorFilter } from './reputation.error.filter';
 export class ReputationController {
   constructor(private readonly reputationService: ReputationService) {}
 
-  @Get()
   @ApiOperation({
     summary: 'Get All Reputations',
     description: 'Endpoint to get all reputations.',
@@ -40,11 +39,12 @@ export class ReputationController {
     type: ReputationDto,
     isArray: true,
   })
-  public async getReputations(
+  @Get()
+  async getReputations(
     @Query() query: ReputationGetAllQueryDto,
   ): Promise<ReputationDto[]> {
     const { chainId, roles, orderBy, orderDirection, first, skip } = query;
-    return this.reputationService.getReputations(
+    const reputations = await this.reputationService.getReputations(
       chainId,
       roles,
       orderBy,
@@ -52,22 +52,22 @@ export class ReputationController {
       first,
       skip,
     );
+    return reputations;
   }
 
-  @Get('/:address')
   @ApiOperation({
-    summary: 'Get Reputation by Address',
-    description: 'Endpoint to get reputation by address.',
+    summary: 'Get reputation by address',
+    description: 'Endpoint to get reputation by address',
   })
   @ApiParam({
     name: 'address',
-    description: 'Address for the reputation query.',
+    description: 'Address for the reputation query',
     type: String,
     required: true,
   })
   @ApiQuery({
     name: 'chain_id',
-    description: 'Chain ID for filtering the reputation.',
+    description: 'Chain ID for filtering the reputation',
     type: Number,
     required: true,
   })
@@ -78,15 +78,24 @@ export class ReputationController {
   })
   @ApiResponse({
     status: 404,
-    description: 'Not Found. Could not find the requested content.',
+    description: 'Not Found. Could not find the requested content',
   })
-  public async getReputation(
+  /**
+   * TODO: Refactor its usages to be part of getAll endpoint
+   * where you pass single address and delete this route
+   */
+  @Get('/:address')
+  async getReputation(
     @Param() params: ReputationGetParamsDto,
     @Query() query: ReputationGetQueryDto,
   ): Promise<ReputationDto> {
     const { chainId } = query;
     const { address } = params;
 
-    return this.reputationService.getReputation(chainId, address);
+    const reputation = await this.reputationService.getReputation(
+      chainId,
+      address,
+    );
+    return reputation;
   }
 }
diff --git a/packages/apps/reputation-oracle/server/src/modules/reputation/reputation.error.filter.ts b/packages/apps/reputation-oracle/server/src/modules/reputation/reputation.error.filter.ts
index ba0c775f6b..a568c2b9fa 100644
--- a/packages/apps/reputation-oracle/server/src/modules/reputation/reputation.error.filter.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/reputation/reputation.error.filter.ts
@@ -3,15 +3,18 @@ import {
   Catch,
   ArgumentsHost,
   HttpStatus,
-  Logger,
 } from '@nestjs/common';
 import { Request, Response } from 'express';
 
 import { ReputationError, ReputationErrorMessage } from './reputation.error';
+import logger from '../../logger';
 
 @Catch(ReputationError)
 export class ReputationErrorFilter implements ExceptionFilter {
-  private logger = new Logger(ReputationErrorFilter.name);
+  private readonly logger = logger.child({
+    context: ReputationErrorFilter.name,
+  });
+
   catch(exception: ReputationError, host: ArgumentsHost) {
     const ctx = host.switchToHttp();
     const response = ctx.getResponse<Response>();
@@ -22,11 +25,7 @@ export class ReputationErrorFilter implements ExceptionFilter {
       status = HttpStatus.NOT_FOUND;
     }
 
-    this.logger.error(
-      exception.message,
-      exception.stack,
-      `${exception.chainId} - ${exception.address}`,
-    );
+    this.logger.error('Reputation error', exception);
 
     return response.status(status).json({
       message: exception.message,
diff --git a/packages/apps/reputation-oracle/server/src/modules/reputation/reputation.module.ts b/packages/apps/reputation-oracle/server/src/modules/reputation/reputation.module.ts
index 0bd6527cb6..f8ffe20a78 100644
--- a/packages/apps/reputation-oracle/server/src/modules/reputation/reputation.module.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/reputation/reputation.module.ts
@@ -1,4 +1,4 @@
-import { Logger, Module } from '@nestjs/common';
+import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 
 import { ReputationService } from './reputation.service';
@@ -11,7 +11,7 @@ import { Web3Module } from '../web3/web3.module';
 @Module({
   imports: [ConfigModule, HttpModule, StorageModule, Web3Module],
   controllers: [ReputationController],
-  providers: [Logger, ReputationService, ReputationRepository],
+  providers: [ReputationService, ReputationRepository],
   exports: [ReputationService],
 })
 export class ReputationModule {}
diff --git a/packages/apps/reputation-oracle/server/src/modules/reputation/reputation.repository.ts b/packages/apps/reputation-oracle/server/src/modules/reputation/reputation.repository.ts
index 3d9421347d..34c0dc8cf9 100644
--- a/packages/apps/reputation-oracle/server/src/modules/reputation/reputation.repository.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/reputation/reputation.repository.ts
@@ -1,5 +1,5 @@
 import { ChainId } from '@human-protocol/sdk';
-import { Injectable, Logger } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { DataSource, ILike, In } from 'typeorm';
 import { BaseRepository } from '../../database/base.repository';
 import { ReputationEntity } from './reputation.entity';
@@ -11,8 +11,6 @@ import {
 
 @Injectable()
 export class ReputationRepository extends BaseRepository<ReputationEntity> {
-  private readonly logger = new Logger(ReputationRepository.name);
-
   constructor(private dataSource: DataSource) {
     super(ReputationEntity, dataSource);
   }
diff --git a/packages/apps/reputation-oracle/server/src/modules/sendgrid/sendgrid.module.ts b/packages/apps/reputation-oracle/server/src/modules/sendgrid/sendgrid.module.ts
deleted file mode 100644
index f1a1c2a3d1..0000000000
--- a/packages/apps/reputation-oracle/server/src/modules/sendgrid/sendgrid.module.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Global, Module } from '@nestjs/common';
-import { ConfigModule } from '@nestjs/config';
-import { MailService } from '@sendgrid/mail';
-
-import { SendGridService } from './sendgrid.service';
-
-@Global()
-@Module({
-  imports: [ConfigModule],
-  providers: [SendGridService, MailService],
-  exports: [SendGridService],
-})
-export class SendGridModule {}
diff --git a/packages/apps/reputation-oracle/server/src/modules/sendgrid/sendgrid.service.spec.ts b/packages/apps/reputation-oracle/server/src/modules/sendgrid/sendgrid.service.spec.ts
deleted file mode 100644
index 8c4dfc3d04..0000000000
--- a/packages/apps/reputation-oracle/server/src/modules/sendgrid/sendgrid.service.spec.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-import { ConfigService } from '@nestjs/config';
-import { Test } from '@nestjs/testing';
-import { SendGridService } from './sendgrid.service';
-import { MailService } from '@sendgrid/mail';
-import { MOCK_SENDGRID_API_KEY, mockConfig } from '../../../test/constants';
-import { SendgridConfigService } from '../../common/config/sendgrid-config.service';
-
-describe('SendGridService', () => {
-  let sendGridService: SendGridService;
-  let mailService: MailService;
-  let sendgridConfigService: SendgridConfigService;
-
-  jest
-    .spyOn(SendgridConfigService.prototype, 'apiKey', 'get')
-    .mockReturnValue(MOCK_SENDGRID_API_KEY);
-
-  beforeAll(async () => {
-    const mockMailService = {
-      send: jest.fn(),
-      setApiKey: jest.fn(),
-    };
-
-    const app = await Test.createTestingModule({
-      providers: [
-        {
-          provide: ConfigService,
-          useValue: {
-            get: jest.fn((key: string) => mockConfig[key]),
-            getOrThrow: jest.fn((key: string) => {
-              if (!mockConfig[key]) {
-                throw new Error(`Configuration key "${key}" does not exist`);
-              }
-              return mockConfig[key];
-            }),
-          },
-        },
-        SendGridService,
-        {
-          provide: MailService,
-          useValue: mockMailService,
-        },
-        SendgridConfigService,
-      ],
-    }).compile();
-    sendGridService = app.get<SendGridService>(SendGridService);
-    mailService = app.get(MailService);
-    sendgridConfigService = app.get(SendgridConfigService);
-  });
-
-  describe('sendEmail', () => {
-    it('should send email', async () => {
-      const mock = jest
-        .spyOn(mailService, 'send')
-        .mockImplementationOnce(async () => {
-          return [{} as any, {}];
-        });
-      await sendGridService.sendEmail({
-        to: 'test@example.com',
-        from: 'test@example.com',
-        subject: 'Sending with SendGrid is Fun',
-        text: 'and easy to do anywhere, even with Node.js',
-        html: '<strong>and easy to do anywhere, even with Node.js</strong>',
-      });
-      expect(mock).toHaveBeenCalled();
-    });
-
-    it('should send email from default address', async () => {
-      const mock = jest
-        .spyOn(mailService, 'send')
-        .mockImplementationOnce(async () => {
-          return [{} as any, {}];
-        });
-      await sendGridService.sendEmail({
-        to: 'test@example.com',
-        subject: 'Sending with SendGrid is Fun',
-        text: 'and easy to do anywhere, even with Node.js',
-        html: '<strong>and easy to do anywhere, even with Node.js</strong>',
-      });
-
-      expect(mock).toHaveBeenCalledWith(
-        expect.objectContaining({
-          from: 'test@example.com',
-        }),
-      );
-    });
-
-    it("should throw error if email wasn't sent", async () => {
-      jest.spyOn(mailService, 'send').mockImplementationOnce(async () => {
-        throw new Error('Mail service error');
-      });
-
-      await expect(
-        sendGridService.sendEmail({
-          to: 'test@example.com',
-          subject: 'Sending with SendGrid is Fun',
-          text: 'and easy to do anywhere, even with Node.js',
-          html: '<strong>and easy to do anywhere, even with Node.js</strong>',
-        }),
-      ).rejects.toThrow('Failed to send email');
-    });
-  });
-
-  describe('constructor', () => {
-    it('should initialize SendGridService with valid API key', () => {
-      sendGridService = new SendGridService(mailService, sendgridConfigService);
-
-      expect(mailService.setApiKey).toHaveBeenCalledWith(MOCK_SENDGRID_API_KEY);
-    });
-
-    it('should throw an error with invalid API key', async () => {
-      const invalidApiKey = 'invalid-api-key';
-      jest
-        .spyOn(sendgridConfigService, 'apiKey', 'get')
-        .mockReturnValue(invalidApiKey);
-
-      expect(() => {
-        sendGridService = new SendGridService(
-          mailService,
-          sendgridConfigService,
-        );
-      }).toThrow('Invalid SendGrid API key');
-    });
-  });
-});
diff --git a/packages/apps/reputation-oracle/server/src/modules/sendgrid/sendgrid.service.ts b/packages/apps/reputation-oracle/server/src/modules/sendgrid/sendgrid.service.ts
deleted file mode 100644
index a49e6ec4b5..0000000000
--- a/packages/apps/reputation-oracle/server/src/modules/sendgrid/sendgrid.service.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-import { MailDataRequired, MailService } from '@sendgrid/mail';
-import {
-  SENDGRID_API_KEY_DISABLED,
-  SENDGRID_API_KEY_REGEX,
-} from '../../common/constants';
-import { SendgridConfigService } from '../../common/config/sendgrid-config.service';
-
-@Injectable()
-export class SendGridService {
-  private readonly logger = new Logger(SendGridService.name);
-
-  constructor(
-    private readonly mailService: MailService,
-    private readonly sendgridConfigService: SendgridConfigService,
-  ) {
-    if (this.sendgridConfigService.apiKey === SENDGRID_API_KEY_DISABLED) {
-      return;
-    }
-
-    if (!SENDGRID_API_KEY_REGEX.test(this.sendgridConfigService.apiKey)) {
-      throw new Error('Invalid SendGrid API key');
-    }
-
-    this.mailService.setApiKey(this.sendgridConfigService.apiKey);
-  }
-
-  async sendEmail({
-    from = {
-      email: this.sendgridConfigService.fromEmail,
-      name: this.sendgridConfigService.fromName,
-    },
-    templateId = '',
-    personalizations,
-    ...emailData
-  }: Partial<MailDataRequired>): Promise<void> {
-    try {
-      if (this.sendgridConfigService.apiKey === SENDGRID_API_KEY_DISABLED) {
-        this.logger.debug(personalizations);
-        return;
-      }
-
-      await this.mailService.send({
-        from,
-        templateId,
-        personalizations,
-        ...emailData,
-      });
-      this.logger.log('Email sent successfully');
-      return;
-    } catch (error) {
-      const errorMessage = 'Failed to send email';
-      this.logger.error(errorMessage, error.messages, error.stack);
-      throw new Error(errorMessage);
-    }
-  }
-}
diff --git a/packages/apps/reputation-oracle/server/src/modules/storage/storage.service.ts b/packages/apps/reputation-oracle/server/src/modules/storage/storage.service.ts
index 61f9edd17e..f866f181f7 100644
--- a/packages/apps/reputation-oracle/server/src/modules/storage/storage.service.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/storage/storage.service.ts
@@ -5,7 +5,7 @@ import {
   EscrowClient,
   KVStoreUtils,
 } from '@human-protocol/sdk';
-import { HttpStatus, Injectable, Logger } from '@nestjs/common';
+import { HttpStatus, Injectable } from '@nestjs/common';
 import axios from 'axios';
 import * as Minio from 'minio';
 import crypto from 'crypto';
@@ -20,10 +20,12 @@ import {
   FileNotFoundError,
   InvalidFileUrl,
 } from './storage.errors';
+import logger from '../../logger';
 
 @Injectable()
 export class StorageService {
-  private readonly logger = new Logger(StorageService.name);
+  private readonly logger = logger.child({ context: StorageService.name });
+
   public readonly minioClient: Minio.Client;
 
   constructor(
@@ -137,11 +139,10 @@ export class StorageService {
 
       return jsonLikeData;
     } catch (error) {
-      this.logger.error(
-        `Error downloading json like data ${url}:`,
-        error.message,
-        error.stack,
-      );
+      this.logger.error('Error downloading json like data', {
+        error,
+        url,
+      });
       return [];
     }
   }
@@ -168,17 +169,16 @@ export class StorageService {
       // Check if the file already exists in the bucket
       try {
         await this.minioClient.statObject(this.s3ConfigService.bucket, key);
-        this.logger.log(
-          `File with key ${key} already exists. Skipping upload.`,
-        );
+        this.logger.info('File already exist. Skipping upload', {
+          fileKey: key,
+        });
         return { url: this.getUrl(key), hash };
       } catch (error) {
         if (!isNotFoundError(error)) {
-          this.logger.error(
-            'Error checking if file exists:',
-            error.message,
-            error.stack,
-          );
+          this.logger.error('Error checking if file exists', {
+            error,
+            fileKey: key,
+          });
           throw new Error('Error accessing storage');
         }
       }
@@ -194,7 +194,7 @@ export class StorageService {
       );
 
       return { url: this.getUrl(key), hash };
-    } catch (error) {
+    } catch (noop) {
       throw new Error('File not uploaded');
     }
   }
@@ -227,17 +227,16 @@ export class StorageService {
       // Check if the file already exists in the bucket
       try {
         await this.minioClient.statObject(this.s3ConfigService.bucket, key);
-        this.logger.log(
-          `File with key ${key} already exists. Skipping upload.`,
-        );
+        this.logger.info('File already exist. Skipping upload', {
+          fileKey: key,
+        });
         return { url: this.getUrl(key), hash };
       } catch (error) {
         if (!isNotFoundError(error)) {
-          this.logger.error(
-            'Error checking if file exists:',
-            error.message,
-            error.stack,
-          );
+          this.logger.error('Error checking if file exists', {
+            error,
+            fileKey: key,
+          });
           throw new Error('Error accessing storage');
         }
       }
@@ -257,7 +256,12 @@ export class StorageService {
         hash,
       };
     } catch (error) {
-      this.logger.error('Error copying file:', error.message, error.stack);
+      this.logger.error('Error copying file', {
+        error,
+        url,
+        escrowAddress,
+        chainId,
+      });
       throw new Error('File not uploaded');
     }
   }
diff --git a/packages/apps/reputation-oracle/server/src/modules/user/user.controller.ts b/packages/apps/reputation-oracle/server/src/modules/user/user.controller.ts
index e1917f9eda..a968f52109 100644
--- a/packages/apps/reputation-oracle/server/src/modules/user/user.controller.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/user/user.controller.ts
@@ -39,6 +39,14 @@ import { UserRepository } from './user.repository';
 import { SignatureType } from '../../common/enums/web3';
 import { UserErrorFilter } from './user.error.filter';
 
+/**
+ * TODO:
+ * 1) Refactor this module to have separate 'workers` and `operators` sub-resources
+ *  - use `/:userId` for worker sub-resources;
+ *  - use `/:evmAddress` for operator sub-resources
+ *  - move all "controller" resources to be accessible by user ref, e.g. /workers/:userId/register-labeler
+ * 2) Move "prepare-signature" out of this module
+ */
 @ApiTags('User')
 @Controller('/user')
 @UseFilters(UserErrorFilter)
@@ -50,31 +58,19 @@ export class UserController {
     private readonly userRepository: UserRepository,
   ) {}
 
-  @Post('/register-labeler')
-  @HttpCode(200)
-  @UseGuards(JwtAuthGuard)
   @ApiOperation({
-    summary: 'Register Labeler',
-    description: 'Endpoint to register user as a labeler on hcaptcha services.',
+    summary: 'Register labeler',
+    description: 'Endpoint to register user as a labeler on hCaptcha services',
   })
   @ApiResponse({
     status: 200,
     description: 'Labeler registered successfully',
     type: RegisterLabelerResponseDto,
   })
-  @ApiResponse({
-    status: 400,
-    description: 'Bad Request. Invalid input parameters.',
-  })
-  @ApiResponse({
-    status: 401,
-    description: 'Unauthorized. Missing or invalid credentials.',
-  })
-  @ApiResponse({
-    status: 404,
-    description: 'Not Found. Could not find the requested content.',
-  })
-  public async registerLabeler(
+  @UseGuards(JwtAuthGuard)
+  @Post('/register-labeler')
+  @HttpCode(200)
+  async registerLabeler(
     @Req() request: RequestWithUser,
   ): Promise<RegisterLabelerResponseDto> {
     const siteKey = await this.userService.registerLabeler(request.user);
@@ -82,12 +78,9 @@ export class UserController {
     return { siteKey };
   }
 
-  @Post('/register-address')
-  @HttpCode(200)
-  @UseGuards(JwtAuthGuard)
   @ApiOperation({
-    summary: 'Register Blockchain Address',
-    description: 'Endpoint to register blockchain address.',
+    summary: 'Register worker address',
+    description: 'Endpoint to register blockchain address for worker',
   })
   @ApiBody({ type: RegisterAddressRequestDto })
   @ApiResponse({
@@ -96,77 +89,65 @@ export class UserController {
     type: KycSignedAddressDto,
   })
   @ApiResponse({
-    status: 400,
-    description: 'Bad Request. Invalid input parameters.',
+    status: 409,
+    description: 'Provided address already registered',
   })
-  @ApiResponse({
-    status: 401,
-    description: 'Unauthorized. Missing or invalid credentials.',
-  })
-  @ApiResponse({
-    status: 404,
-    description: 'Not Found. Could not find the requested content.',
-  })
-  public async registerAddress(
+  @UseGuards(JwtAuthGuard)
+  @Post('/register-address')
+  @HttpCode(200)
+  async registerAddress(
     @Req() request: RequestWithUser,
     @Body() data: RegisterAddressRequestDto,
   ): Promise<KycSignedAddressDto> {
-    return this.userService.registerAddress(request.user, data);
+    const registrationResult = await this.userService.registerAddress(
+      request.user,
+      data,
+    );
+    return registrationResult;
   }
 
-  @Post('/enable-operator')
-  @HttpCode(204)
-  @UseGuards(JwtAuthGuard)
   @ApiOperation({
     summary: 'Enable an operator',
-    description: 'Endpoint to enable an operator.',
+    description: 'Endpoint to enable an operator',
   })
   @ApiBody({ type: EnableOperatorDto })
   @ApiResponse({
-    status: 204,
+    status: 200,
     description: 'Operator enabled succesfully',
   })
-  @ApiResponse({
-    status: 404,
-    description: 'Not Found. Could not find the requested content.',
-  })
-  public enableOperator(
+  @UseGuards(JwtAuthGuard)
+  @Post('/enable-operator')
+  @HttpCode(200)
+  async enableOperator(
     @Body() data: EnableOperatorDto,
     @Request() req: RequestWithUser,
   ): Promise<void> {
-    return this.userService.enableOperator(req.user, data.signature);
+    await this.userService.enableOperator(req.user, data.signature);
   }
 
-  @Post('/disable-operator')
-  @HttpCode(204)
-  @UseGuards(JwtAuthGuard)
   @ApiOperation({
-    summary: 'Disable an operator',
-    description: 'Endpoint to disable an operator.',
+    summary: 'Disable operator',
+    description: 'Endpoint to disable operator',
   })
   @ApiBody({ type: DisableOperatorDto })
   @ApiResponse({
-    status: 204,
+    status: 200,
     description: 'Operator disabled succesfully',
   })
-  @ApiResponse({
-    status: 404,
-    description: 'Not Found. Could not find the requested content.',
-  })
-  public disableOperator(
+  @UseGuards(JwtAuthGuard)
+  @Post('/disable-operator')
+  @HttpCode(200)
+  async disableOperator(
     @Body() data: DisableOperatorDto,
     @Request() req: RequestWithUser,
   ): Promise<void> {
-    return this.userService.disableOperator(req.user, data.signature);
+    await this.userService.disableOperator(req.user, data.signature);
   }
 
-  @Public()
-  @Post('/prepare-signature')
-  @UseGuards(JwtAuthGuard)
   @ApiOperation({
     summary: 'Web3 signature body',
     description:
-      'Endpoint for generating typed structured data objects compliant with EIP-712. The generated object should be convertible to a string format to ensure compatibility with signature mechanisms.',
+      'Endpoint for generating typed structured data objects compliant with EIP-712. The generated object should be convertible to a string format to ensure compatibility with signature mechanisms',
   })
   @ApiBody({ type: PrepareSignatureDto })
   @ApiResponse({
@@ -174,32 +155,31 @@ export class UserController {
     description: 'Typed structured data object generated successfully',
     type: SignatureBodyDto,
   })
-  @ApiResponse({
-    status: 401,
-    description: 'Unauthorized. Missing or invalid credentials.',
-  })
-  public async prepareSignature(
+  @Public()
+  @Post('/prepare-signature')
+  @HttpCode(200)
+  async prepareSignature(
     @Body() data: PrepareSignatureDto,
   ): Promise<SignatureBodyDto> {
     let nonce;
     if (data.type === SignatureType.SIGNIN) {
       nonce = (await this.userRepository.findOneByAddress(data.address))?.nonce;
     }
-    return prepareSignatureBody({
+
+    const preparedSignatureBody = await prepareSignatureBody({
       from: data.address,
       to: this.web3Service.getOperatorAddress(),
       contents: data.type,
       nonce,
     });
+
+    return preparedSignatureBody;
   }
 
-  @Post('/exchange-oracle-registration')
-  @HttpCode(200)
-  @UseGuards(HCaptchaGuard, JwtAuthGuard)
   @ApiOperation({
     summary: 'Notifies registration in Exchange Oracle completed',
     description:
-      'Notifies that the registration process in a Exchange Oracle has been completed by the user.',
+      'Notifies that the registration process in a Exchange Oracle has been completed by the user',
   })
   @ApiBody({ type: RegistrationInExchangeOracleDto })
   @ApiResponse({
@@ -207,15 +187,10 @@ export class UserController {
     description: 'Oracle registered successfully',
     type: RegistrationInExchangeOracleDto,
   })
-  @ApiResponse({
-    status: 400,
-    description: 'Bad Request. Invalid input parameters.',
-  })
-  @ApiResponse({
-    status: 401,
-    description: 'Unauthorized. Missing or invalid credentials.',
-  })
-  public async registrationInExchangeOracle(
+  @UseGuards(HCaptchaGuard, JwtAuthGuard)
+  @Post('/exchange-oracle-registration')
+  @HttpCode(200)
+  async registrationInExchangeOracle(
     @Req() request: RequestWithUser,
     @Body() data: RegistrationInExchangeOracleDto,
   ): Promise<RegistrationInExchangeOracleResponseDto> {
@@ -227,9 +202,6 @@ export class UserController {
     return { oracleAddress: data.oracleAddress };
   }
 
-  @Get('/exchange-oracle-registration')
-  @HttpCode(200)
-  @UseGuards(JwtAuthGuard)
   @ApiOperation({
     summary: 'Retrieves Exchange Oracles the user is registered in',
     description:
@@ -244,11 +216,14 @@ export class UserController {
     status: 401,
     description: 'Unauthorized. Missing or invalid credentials.',
   })
-  public async getRegistrationInExchangeOracles(
+  @UseGuards(JwtAuthGuard)
+  @Get('/exchange-oracle-registration')
+  async getRegistrationInExchangeOracles(
     @Req() request: RequestWithUser,
   ): Promise<RegistrationInExchangeOraclesDto> {
     const oracleAddresses =
       await this.userService.getRegistrationInExchangeOracles(request.user);
+
     return { oracleAddresses };
   }
 }
diff --git a/packages/apps/reputation-oracle/server/src/modules/user/user.dto.ts b/packages/apps/reputation-oracle/server/src/modules/user/user.dto.ts
index f282b53f3e..ee2e2cd2e6 100644
--- a/packages/apps/reputation-oracle/server/src/modules/user/user.dto.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/user/user.dto.ts
@@ -1,54 +1,8 @@
-import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
-import {
-  IsEmail,
-  IsEthereumAddress,
-  IsOptional,
-  IsString,
-} from 'class-validator';
-import { Transform } from 'class-transformer';
-import { UserStatus, Role } from '../../common/enums/user';
-import { ValidatePasswordDto } from '../auth/auth.dto';
+import { ApiProperty } from '@nestjs/swagger';
+import { IsEthereumAddress, IsOptional, IsString } from 'class-validator';
 import { SignatureType } from '../../common/enums/web3';
 import { IsEnumCaseInsensitive } from '../../common/decorators';
 
-export class UserCreateDto extends ValidatePasswordDto {
-  @ApiProperty()
-  @IsEmail()
-  @Transform(({ value }: { value: string }) => value.toLowerCase())
-  public email: string;
-
-  @ApiProperty({ name: 'h_captcha_token' })
-  @IsString()
-  public hCaptchaToken: string;
-}
-
-export class UserDto extends UserCreateDto {
-  public type: Role;
-  public status: UserStatus;
-}
-
-export class Web3UserDto {
-  public evmAddress: string;
-  public nonce: string;
-  public type: Role;
-  public status: UserStatus;
-}
-
-export class UserUpdateDto {
-  @ApiPropertyOptional()
-  @IsOptional()
-  @IsEmail()
-  @Transform(({ value }: { value: string }) => value.toLowerCase())
-  public email?: string;
-
-  @ApiPropertyOptional({
-    enum: UserStatus,
-  })
-  @IsOptional()
-  @IsEnumCaseInsensitive(UserStatus)
-  public status?: UserStatus;
-}
-
 export class RegisterLabelerResponseDto {
   @ApiProperty({ name: 'site_key' })
   @IsString()
@@ -125,9 +79,11 @@ export class RegistrationInExchangeOracleDto {
 }
 
 export class RegistrationInExchangeOracleResponseDto {
+  @ApiProperty({ name: 'oracle_address' })
   public oracleAddress: string;
 }
 
 export class RegistrationInExchangeOraclesDto {
+  @ApiProperty({ name: 'oracle_addresses' })
   public oracleAddresses: string[];
 }
diff --git a/packages/apps/reputation-oracle/server/src/modules/user/user.error.filter.ts b/packages/apps/reputation-oracle/server/src/modules/user/user.error.filter.ts
index bbd2556429..1131671e47 100644
--- a/packages/apps/reputation-oracle/server/src/modules/user/user.error.filter.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/user/user.error.filter.ts
@@ -3,7 +3,6 @@ import {
   Catch,
   ArgumentsHost,
   HttpStatus,
-  Logger,
 } from '@nestjs/common';
 import { Request, Response } from 'express';
 
@@ -12,6 +11,7 @@ import {
   DuplicatedWalletAddressError,
   InvalidWeb3SignatureError,
 } from './user.error';
+import logger from '../../logger';
 
 type UserControllerError =
   | UserError
@@ -20,7 +20,8 @@ type UserControllerError =
 
 @Catch(UserError, DuplicatedWalletAddressError, InvalidWeb3SignatureError)
 export class UserErrorFilter implements ExceptionFilter {
-  private logger = new Logger(UserErrorFilter.name);
+  private readonly logger = logger.child({ context: UserErrorFilter.name });
+
   catch(exception: UserControllerError, host: ArgumentsHost) {
     const ctx = host.switchToHttp();
     const response = ctx.getResponse<Response>();
@@ -31,7 +32,7 @@ export class UserErrorFilter implements ExceptionFilter {
       status = HttpStatus.CONFLICT;
     }
 
-    this.logger.error(exception.message, exception.stack, exception.userId);
+    this.logger.error('User error', exception);
 
     return response.status(status).json({
       message: exception.message,
diff --git a/packages/apps/reputation-oracle/server/src/modules/user/user.module.ts b/packages/apps/reputation-oracle/server/src/modules/user/user.module.ts
index 3e26900305..11db88ff44 100644
--- a/packages/apps/reputation-oracle/server/src/modules/user/user.module.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/user/user.module.ts
@@ -1,4 +1,4 @@
-import { Logger, Module } from '@nestjs/common';
+import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 
 import { UserService } from './user.service';
@@ -10,7 +10,7 @@ import { HCaptchaModule } from '../../integrations/hcaptcha/hcaptcha.module';
 
 @Module({
   imports: [ConfigModule, Web3Module, HCaptchaModule],
-  providers: [Logger, UserService, UserRepository, SiteKeyRepository],
+  providers: [UserService, UserRepository, SiteKeyRepository],
   controllers: [UserController],
   exports: [UserService],
 })
diff --git a/packages/apps/reputation-oracle/server/src/modules/user/user.service.spec.ts b/packages/apps/reputation-oracle/server/src/modules/user/user.service.spec.ts
index d6125cff71..5ec3c87c13 100644
--- a/packages/apps/reputation-oracle/server/src/modules/user/user.service.spec.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/user/user.service.spec.ts
@@ -2,7 +2,7 @@ import { Test } from '@nestjs/testing';
 import { createMock } from '@golevelup/ts-jest';
 import { UserRepository } from './user.repository';
 import { UserService } from './user.service';
-import { RegistrationInExchangeOracleDto, UserCreateDto } from './user.dto';
+import { RegistrationInExchangeOracleDto } from './user.dto';
 import { UserEntity } from './user.entity';
 import {
   KycStatus,
@@ -140,21 +140,20 @@ describe('UserService', () => {
 
   describe('create', () => {
     it('should create a new user and return the created user entity', async () => {
-      const dto: UserCreateDto = {
+      const createUserData = {
         email: 'test@example.com',
         password: 'password123',
-        hCaptchaToken: 'test',
       };
       const createdUser: Partial<UserEntity> = {
-        email: dto.email,
+        email: createUserData.email,
         password: expect.any(String),
         role: Role.WORKER,
         status: UserStatus.PENDING,
       };
 
-      const result = await userService.create(dto);
+      const result = await userService.create(createUserData);
       expect(userRepository.createUnique).toHaveBeenCalledWith({
-        email: dto.email,
+        email: createUserData.email,
         password: expect.any(String),
         role: Role.WORKER,
         status: UserStatus.PENDING,
@@ -755,9 +754,7 @@ describe('UserService', () => {
         type: SiteKeyType.REGISTRATION,
         user: userEntity,
       };
-      jest
-        .spyOn(hcaptchaService, 'verifyToken')
-        .mockResolvedValueOnce({ success: true });
+      jest.spyOn(hcaptchaService, 'verifyToken').mockResolvedValueOnce(true);
       jest
         .spyOn(siteKeyRepository, 'findByUserSiteKeyAndType')
         .mockResolvedValueOnce(null);
@@ -797,9 +794,7 @@ describe('UserService', () => {
         type: SiteKeyType.REGISTRATION,
         user: userEntity,
       };
-      jest
-        .spyOn(hcaptchaService, 'verifyToken')
-        .mockResolvedValueOnce({ success: true });
+      jest.spyOn(hcaptchaService, 'verifyToken').mockResolvedValueOnce(true);
       jest
         .spyOn(siteKeyRepository, 'findByUserSiteKeyAndType')
         .mockResolvedValueOnce(siteKeyMock as SiteKeyEntity);
diff --git a/packages/apps/reputation-oracle/server/src/modules/user/user.service.ts b/packages/apps/reputation-oracle/server/src/modules/user/user.service.ts
index 9b86af43ff..44014fd3ae 100644
--- a/packages/apps/reputation-oracle/server/src/modules/user/user.service.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/user/user.service.ts
@@ -1,4 +1,4 @@
-import { Injectable, Logger } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import * as bcrypt from 'bcrypt';
 import {
   KycStatus,
@@ -8,9 +8,8 @@ import {
 } from '../../common/enums/user';
 import { generateNonce, verifySignature } from '../../common/utils/signature';
 import { UserEntity } from './user.entity';
-import { RegisterAddressRequestDto, UserCreateDto } from './user.dto';
+import { RegisterAddressRequestDto } from './user.dto';
 import { UserRepository } from './user.repository';
-import { ValidatePasswordDto } from '../auth/auth.dto';
 import { Web3Service } from '../web3/web3.service';
 import { SignatureType, Web3Env } from '../../common/enums/web3';
 import { ChainId, KVStoreClient, KVStoreUtils } from '@human-protocol/sdk';
@@ -33,8 +32,8 @@ import {
 
 @Injectable()
 export class UserService {
-  private readonly logger = new Logger(UserService.name);
-  private HASH_ROUNDS = 12;
+  private readonly HASH_ROUNDS = 12;
+
   constructor(
     private userRepository: UserRepository,
     private siteKeyRepository: SiteKeyRepository,
@@ -52,10 +51,13 @@ export class UserService {
     return bcrypt.compareSync(password, passwordHash);
   }
 
-  public async create(dto: UserCreateDto): Promise<UserEntity> {
+  public async create({
+    email,
+    password,
+  }: Pick<UserEntity, 'email' | 'password'>): Promise<UserEntity> {
     const newUser = new UserEntity();
-    newUser.email = dto.email;
-    newUser.password = bcrypt.hashSync(dto.password, this.HASH_ROUNDS);
+    newUser.email = email;
+    newUser.password = bcrypt.hashSync(password, this.HASH_ROUNDS);
     newUser.role = Role.WORKER;
     newUser.status = UserStatus.PENDING;
     await this.userRepository.createUnique(newUser);
@@ -64,9 +66,9 @@ export class UserService {
 
   public updatePassword(
     userEntity: UserEntity,
-    data: ValidatePasswordDto,
+    newPassword: string,
   ): Promise<UserEntity> {
-    userEntity.password = bcrypt.hashSync(data.password, this.HASH_ROUNDS);
+    userEntity.password = bcrypt.hashSync(newPassword, this.HASH_ROUNDS);
     return this.userRepository.updateOne(userEntity);
   }
 
diff --git a/packages/apps/reputation-oracle/server/src/modules/web3/web3.service.ts b/packages/apps/reputation-oracle/server/src/modules/web3/web3.service.ts
index d204e24df7..423e09327b 100644
--- a/packages/apps/reputation-oracle/server/src/modules/web3/web3.service.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/web3/web3.service.ts
@@ -1,4 +1,4 @@
-import { Injectable, Logger } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { Provider, Wallet, ethers } from 'ethers';
 import { Web3ConfigService } from '../../common/config/web3-config.service';
 import { NetworkConfigService } from '../../common/config/network-config.service';
@@ -10,7 +10,6 @@ export class Web3Service {
   private signersByChainId: {
     [chainId: number]: WalletWithProvider;
   } = {};
-  public readonly logger = new Logger(Web3Service.name);
 
   constructor(
     private readonly web3ConfigService: Web3ConfigService,
diff --git a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-incoming.module.ts b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-incoming.module.ts
index a26f584821..157786322a 100644
--- a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-incoming.module.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-incoming.module.ts
@@ -1,4 +1,4 @@
-import { Logger, Module } from '@nestjs/common';
+import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 
 import { HttpModule } from '@nestjs/axios';
@@ -11,7 +11,7 @@ import { WebhookIncomingService } from './webhook-incoming.service';
 @Module({
   imports: [ConfigModule, Web3Module, HttpModule, EscrowCompletionModule],
   controllers: [WebhookController],
-  providers: [Logger, WebhookIncomingService, WebhookIncomingRepository],
+  providers: [WebhookIncomingService, WebhookIncomingRepository],
   exports: [WebhookIncomingService],
 })
 export class WebhookIncomingModule {}
diff --git a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-incoming.repository.ts b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-incoming.repository.ts
index 401f9eac16..11eb2322ee 100644
--- a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-incoming.repository.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-incoming.repository.ts
@@ -1,4 +1,4 @@
-import { Injectable, Logger } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { BaseRepository } from '../../database/base.repository';
 import { DataSource, LessThanOrEqual } from 'typeorm';
 import { WebhookIncomingStatus } from '../../common/enums/webhook';
@@ -7,7 +7,6 @@ import { ServerConfigService } from '../../common/config/server-config.service';
 
 @Injectable()
 export class WebhookIncomingRepository extends BaseRepository<WebhookIncomingEntity> {
-  private readonly logger = new Logger(WebhookIncomingRepository.name);
   constructor(
     private dataSource: DataSource,
     public readonly serverConfigService: ServerConfigService,
diff --git a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-incoming.service.spec.ts b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-incoming.service.spec.ts
index 8e6db959e0..99eacefafc 100644
--- a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-incoming.service.spec.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-incoming.service.spec.ts
@@ -268,7 +268,11 @@ describe('WebhookIncomingService', () => {
         }),
       );
       expect(loggerErrorSpy).toHaveBeenCalledWith(
-        expect.stringContaining(`Error message: ${error.message}`),
+        'Error processing incoming webhook',
+        {
+          error,
+          webhookId: expect.any(Number),
+        },
       );
     });
 
diff --git a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-incoming.service.ts b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-incoming.service.ts
index d6bc51667d..b879827394 100644
--- a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-incoming.service.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-incoming.service.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
-import { Injectable, Logger } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { ServerConfigService } from '../../common/config/server-config.service';
 import { Web3ConfigService } from '../../common/config/web3-config.service';
 import { BACKOFF_INTERVAL_SECONDS } from '../../common/constants';
@@ -11,10 +11,13 @@ import { WebhookIncomingEntity } from './webhook-incoming.entity';
 import { WebhookIncomingRepository } from './webhook-incoming.repository';
 import { IncomingWebhookDto } from './webhook.dto';
 import { IncomingWebhookError, WebhookErrorMessage } from './webhook.error';
+import logger from '../../logger';
 
 @Injectable()
 export class WebhookIncomingService {
-  private readonly logger = new Logger(WebhookIncomingService.name);
+  private readonly logger = logger.child({
+    context: WebhookIncomingService.name,
+  });
 
   constructor(
     private readonly webhookIncomingRepository: WebhookIncomingRepository,
@@ -89,18 +92,21 @@ export class WebhookIncomingService {
 
         webhookEntity.status = WebhookIncomingStatus.COMPLETED;
         await this.webhookIncomingRepository.updateOne(webhookEntity);
-      } catch (err) {
-        if (isDuplicatedError(err)) {
+      } catch (error) {
+        if (isDuplicatedError(error)) {
           webhookEntity.status = WebhookIncomingStatus.COMPLETED;
           await this.webhookIncomingRepository.updateOne(webhookEntity);
         } else {
           // Handle other errors (general failure)
-          const failureDetail = `Error message: ${err.message}`;
+          this.logger.error('Error processing incoming webhook', {
+            error,
+            webhookId: webhookEntity.id,
+          });
 
-          this.logger.error(
-            `Error processing incoming webhook. Webhook ID: ${webhookEntity.id}. ${failureDetail}.`,
+          await this.handleWebhookIncomingError(
+            webhookEntity,
+            `Error message: ${error.message}`,
           );
-          await this.handleWebhookIncomingError(webhookEntity, failureDetail);
         }
         continue;
       }
diff --git a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-outgoing.module.ts b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-outgoing.module.ts
index cb82de9b2a..3258e2ed03 100644
--- a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-outgoing.module.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-outgoing.module.ts
@@ -1,4 +1,4 @@
-import { Logger, Module } from '@nestjs/common';
+import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { HttpModule } from '@nestjs/axios';
 import { Web3Module } from '../web3/web3.module';
@@ -7,7 +7,7 @@ import { WebhookOutgoingService } from './webhook-outgoing.service';
 
 @Module({
   imports: [ConfigModule, Web3Module, HttpModule],
-  providers: [Logger, WebhookOutgoingService, WebhookOutgoingRepository],
+  providers: [WebhookOutgoingService, WebhookOutgoingRepository],
   exports: [WebhookOutgoingService],
 })
 export class WebhookOutgoingModule {}
diff --git a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-outgoing.repository.ts b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-outgoing.repository.ts
index 37b76f964b..68ff98f576 100644
--- a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-outgoing.repository.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-outgoing.repository.ts
@@ -1,4 +1,4 @@
-import { Injectable, Logger } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { BaseRepository } from '../../database/base.repository';
 import { DataSource, LessThanOrEqual } from 'typeorm';
 import { WebhookOutgoingStatus } from '../../common/enums/webhook';
@@ -7,7 +7,6 @@ import { ServerConfigService } from '../../common/config/server-config.service';
 
 @Injectable()
 export class WebhookOutgoingRepository extends BaseRepository<WebhookOutgoingEntity> {
-  private readonly logger = new Logger(WebhookOutgoingRepository.name);
   constructor(
     private dataSource: DataSource,
     public readonly serverConfigService: ServerConfigService,
diff --git a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-outgoing.service.spec.ts b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-outgoing.service.spec.ts
index 95800a7a54..66d129a8ab 100644
--- a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-outgoing.service.spec.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-outgoing.service.spec.ts
@@ -282,7 +282,11 @@ describe('WebhookOutgoingService', () => {
         }),
       );
       expect(loggerErrorSpy).toHaveBeenCalledWith(
-        expect.stringContaining(`Error message: ${error.message}`),
+        'Error processing outgoing webhook',
+        {
+          error,
+          webhookId: expect.any(Number),
+        },
       );
     });
   });
diff --git a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-outgoing.service.ts b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-outgoing.service.ts
index fa8305bb59..726c0af585 100644
--- a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-outgoing.service.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook-outgoing.service.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 import * as crypto from 'crypto';
 import stringify from 'json-stable-stringify';
-import { HttpStatus, Injectable, Logger } from '@nestjs/common';
+import { HttpStatus, Injectable } from '@nestjs/common';
 import { WebhookOutgoingStatus } from '../../common/enums';
 import { firstValueFrom } from 'rxjs';
 import { signMessage } from '../../common/utils/signature';
@@ -17,10 +17,13 @@ import { WebhookOutgoingEntity } from './webhook-outgoing.entity';
 import { WebhookOutgoingRepository } from './webhook-outgoing.repository';
 import { calculateExponentialBackoffMs } from '../../common/utils/backoff';
 import { OutgoingWebhookError, WebhookErrorMessage } from './webhook.error';
+import logger from '../../logger';
 
 @Injectable()
 export class WebhookOutgoingService {
-  private readonly logger = new Logger(WebhookOutgoingService.name);
+  private readonly logger = logger.child({
+    context: WebhookOutgoingService.name,
+  });
 
   constructor(
     private readonly httpService: HttpService,
@@ -120,12 +123,16 @@ export class WebhookOutgoingService {
     for (const webhookEntity of webhookEntities) {
       try {
         await this.sendWebhook(webhookEntity);
-      } catch (err) {
-        const failureDetail = `Error message: ${err.message}`;
-        this.logger.error(
-          `Error processing outgoing webhook. Webhook ID: ${webhookEntity.id}. ${failureDetail}`,
+      } catch (error) {
+        this.logger.error('Error processing outgoing webhook', {
+          error,
+          webhookId: webhookEntity.id,
+        });
+
+        await this.handleWebhookOutgoingError(
+          webhookEntity,
+          `Error message: ${error.message}`,
         );
-        await this.handleWebhookOutgoingError(webhookEntity, failureDetail);
         continue;
       }
       webhookEntity.status = WebhookOutgoingStatus.SENT;
diff --git a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook.controller.ts b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook.controller.ts
index 47a8739579..15db3e012c 100644
--- a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook.controller.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook.controller.ts
@@ -1,4 +1,12 @@
-import { Body, Controller, Post, UseFilters, UseGuards } from '@nestjs/common';
+import {
+  Body,
+  Controller,
+  HttpCode,
+  Post,
+  UseFilters,
+  UseGuards,
+} from '@nestjs/common';
+
 import {
   ApiTags,
   ApiOperation,
@@ -23,11 +31,9 @@ export class WebhookController {
     private readonly webhookIncomingService: WebhookIncomingService,
   ) {}
 
-  @UseGuards(new SignatureAuthGuard([AuthSignatureRole.Recording]))
-  @Post('/')
   @ApiOperation({
-    summary: 'Create Incoming Webhook',
-    description: 'Endpoint to create an incoming webhook.',
+    summary: 'Accept incoming webhook',
+    description: 'Endpoint to accept incoming webhooks',
   })
   @ApiHeader({
     name: HEADER_SIGNATURE_KEY,
@@ -36,25 +42,15 @@ export class WebhookController {
   })
   @ApiBody({ type: IncomingWebhookDto })
   @ApiResponse({
-    status: 200,
-    description: 'Incoming webhook created successfully',
-  })
-  @ApiResponse({
-    status: 400,
-    description: 'Bad Request. Invalid input parameters.',
-  })
-  @ApiResponse({
-    status: 401,
-    description: 'Unauthorized. Missing or invalid credentials.',
-  })
-  @ApiResponse({
-    status: 404,
-    description: 'Not Found. Could not find the requested content.',
+    status: 202,
+    description: 'Incoming webhook accepted successfully',
   })
+  @UseGuards(new SignatureAuthGuard([AuthSignatureRole.Recording]))
+  @Post('/')
+  @HttpCode(202)
   public async createIncomingWebhook(
     @Body() data: IncomingWebhookDto,
   ): Promise<void> {
     await this.webhookIncomingService.createIncomingWebhook(data);
-    return;
   }
 }
diff --git a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook.dto.ts b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook.dto.ts
index b2ac696408..56816ee0fb 100644
--- a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook.dto.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook.dto.ts
@@ -1,5 +1,5 @@
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
-import { IsObject, IsOptional, IsString } from 'class-validator';
+import { IsEthereumAddress, IsObject, IsOptional } from 'class-validator';
 import { EventType } from '../../common/enums';
 import { ChainId } from '@human-protocol/sdk';
 import { IsEnumCaseInsensitive } from '../../common/decorators';
@@ -14,7 +14,7 @@ export class IncomingWebhookDto {
   public eventType: EventType;
 
   @ApiProperty({ name: 'escrow_address' })
-  @IsString()
+  @IsEthereumAddress()
   public escrowAddress: string;
 
   @ApiPropertyOptional({ name: 'event_data' })
diff --git a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook.error.filter.ts b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook.error.filter.ts
index 6bf097861d..f7c0103e8b 100644
--- a/packages/apps/reputation-oracle/server/src/modules/webhook/webhook.error.filter.ts
+++ b/packages/apps/reputation-oracle/server/src/modules/webhook/webhook.error.filter.ts
@@ -3,26 +3,25 @@ import {
   Catch,
   ArgumentsHost,
   HttpStatus,
-  Logger,
 } from '@nestjs/common';
 import { Request, Response } from 'express';
 
 import { IncomingWebhookError } from './webhook.error';
+import logger from '../../logger';
 
 @Catch(IncomingWebhookError)
 export class IncomingWebhookErrorFilter implements ExceptionFilter {
-  private logger = new Logger(IncomingWebhookErrorFilter.name);
+  private readonly logger = logger.child({
+    context: IncomingWebhookErrorFilter.name,
+  });
+
   catch(exception: IncomingWebhookError, host: ArgumentsHost) {
     const ctx = host.switchToHttp();
     const response = ctx.getResponse<Response>();
     const request = ctx.getRequest<Request>();
     const status = HttpStatus.BAD_REQUEST;
 
-    this.logger.error(
-      exception.message,
-      exception.stack,
-      `${exception.chainId} - ${exception.address}`,
-    );
+    this.logger.error('Incoming webhook error', exception);
 
     return response.status(status).json({
       message: exception.message,
diff --git a/packages/apps/reputation-oracle/server/tsconfig.json b/packages/apps/reputation-oracle/server/tsconfig.json
index bbd076c0f3..1f9b2843d5 100644
--- a/packages/apps/reputation-oracle/server/tsconfig.json
+++ b/packages/apps/reputation-oracle/server/tsconfig.json
@@ -18,6 +18,7 @@
     "strictBindCallApply": true,
     "forceConsistentCasingInFileNames": true,
     "noFallthroughCasesInSwitch": true,
-    "esModuleInterop": true
+    "esModuleInterop": true ,
+    "resolveJsonModule": true
   }
 }
diff --git a/packages/apps/staking/package.json b/packages/apps/staking/package.json
index 9a72d1b8dc..3e1c888260 100644
--- a/packages/apps/staking/package.json
+++ b/packages/apps/staking/package.json
@@ -34,7 +34,7 @@
     "@tanstack/react-query": "^5.60.5",
     "@tanstack/react-query-persist-client": "^5.51.11",
     "axios": "^1.7.2",
-    "ethers": "^6.13.1",
+    "ethers": "^6.13.5",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-router-dom": "^6.24.1",
diff --git a/packages/apps/staking/src/components/Tables/kvstore.tsx b/packages/apps/staking/src/components/Tables/kvstore.tsx
index 334dcf44ae..90ac3e60ff 100644
--- a/packages/apps/staking/src/components/Tables/kvstore.tsx
+++ b/packages/apps/staking/src/components/Tables/kvstore.tsx
@@ -1,3 +1,4 @@
+import { ChainId } from '@human-protocol/sdk';
 import EditIcon from '@mui/icons-material/Edit';
 import InfoIcon from '@mui/icons-material/Info';
 import { Box, Button, Typography, useTheme } from '@mui/material';
@@ -8,7 +9,6 @@ import { SUPPORTED_CHAIN_IDS } from '../../constants/chains';
 import { useKVStoreContext } from '../../contexts/kvstore';
 import { useSnackbar } from '../../providers/SnackProvider';
 import KVStoreModal from '../modals/KVStoreModal';
-import { ChainId } from '@human-protocol/sdk';
 
 const KVStoreTable: React.FC = () => {
   const { kvStore, set, setBulk } = useKVStoreContext();
diff --git a/packages/apps/staking/src/components/modals/KVStoreModal.tsx b/packages/apps/staking/src/components/modals/KVStoreModal.tsx
index 4b280abf10..d32ffa1c94 100644
--- a/packages/apps/staking/src/components/modals/KVStoreModal.tsx
+++ b/packages/apps/staking/src/components/modals/KVStoreModal.tsx
@@ -207,12 +207,12 @@ const KVStoreModal: React.FC<Props> = ({
                     <MenuItem value="" disabled>
                       Select Key
                     </MenuItem>
-                    {Object.entries(KVStoreKeys).map(([label, kvKey]) => (
+                    {Object.entries(KVStoreKeys).map(([, kvKey]) => (
                       <MenuItem key={kvKey} value={kvKey}>
-                        {label[0].toUpperCase() + label.slice(1)}
+                        {kvKey}
                       </MenuItem>
                     ))}
-                    <MenuItem value="custom">Custom</MenuItem>
+                    <MenuItem value="custom">custom</MenuItem>
                   </Select>
                 </FormControl>
                 {item.isCustom && (
diff --git a/packages/apps/staking/src/utils/case-converter.ts b/packages/apps/staking/src/utils/case-converter.ts
index 37a195c1e8..b2ed3545e6 100644
--- a/packages/apps/staking/src/utils/case-converter.ts
+++ b/packages/apps/staking/src/utils/case-converter.ts
@@ -34,4 +34,11 @@ export class CaseConverter {
       return obj;
     }
   }
+
+  static convertSnakeToHumanReadable(string: string): string {
+    return string
+      .split('_')
+      .map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())
+      .join(' ');
+  }
 }
diff --git a/packages/sdk/python/human-protocol-sdk/human_protocol_sdk/constants.py b/packages/sdk/python/human-protocol-sdk/human_protocol_sdk/constants.py
index 9febaee002..5631ae1753 100644
--- a/packages/sdk/python/human-protocol-sdk/human_protocol_sdk/constants.py
+++ b/packages/sdk/python/human-protocol-sdk/human_protocol_sdk/constants.py
@@ -161,10 +161,10 @@ class Status(Enum):
 class Role(Enum):
     """Enum for roles."""
 
-    job_launcher = "Job Launcher"
-    exchange_oracle = "Exchange Oracle"
-    reputation_oracle = "Reputation Oracle"
-    recording_oracle = "Recording Oracle"
+    job_launcher = "job_launcher"
+    exchange_oracle = "exchange_oracle"
+    reputation_oracle = "reputation_oracle"
+    recording_oracle = "recording_oracle"
 
 
 ARTIFACTS_FOLDER = os.path.join(os.path.dirname(os.path.dirname(__file__)), "artifacts")
@@ -176,7 +176,7 @@ class KVStoreKeys(Enum):
     category = "category"
     fee = "fee"
     job_types = "job_types"
-    name = "name"
+    operator_name = "name"
     public_key = "public_key"
     public_key_hash = "public_key_hash"
     registration_instructions = "registration_instructions"
diff --git a/packages/sdk/typescript/human-protocol-sdk/src/constants.ts b/packages/sdk/typescript/human-protocol-sdk/src/constants.ts
index 79737b77fd..8926ea1eaa 100644
--- a/packages/sdk/typescript/human-protocol-sdk/src/constants.ts
+++ b/packages/sdk/typescript/human-protocol-sdk/src/constants.ts
@@ -133,25 +133,25 @@ export const NETWORKS: {
 };
 
 export const KVStoreKeys = {
-  role: 'role',
+  category: 'category',
   fee: 'fee',
+  jobTypes: 'job_types',
+  operatorName: 'name',
   publicKey: 'public_key',
   publicKeyHash: 'public_key_hash',
-  webhookUrl: 'webhook_url',
-  website: 'website',
-  url: 'url',
-  jobTypes: 'job_types',
-  registrationNeeded: 'registration_needed',
   registrationInstructions: 'registration_instructions',
-  name: 'name',
-  category: 'category',
+  registrationNeeded: 'registration_needed',
+  role: 'role',
+  url: 'url',
+  website: 'website',
+  webhookUrl: 'webhook_url',
 };
 
 export const Role = {
-  JobLauncher: 'Job Launcher',
-  ExchangeOracle: 'Exchange Oracle',
-  ReputationOracle: 'Reputation Oracle',
-  RecordingOracle: 'Recording Oracle',
+  JobLauncher: 'job_launcher',
+  ExchangeOracle: 'exchange_oracle',
+  ReputationOracle: 'reputation_oracle',
+  RecordingOracle: 'recording_oracle',
 };
 
 export const SUBGRAPH_API_KEY_PLACEHOLDER = '[SUBGRAPH_API_KEY]';
diff --git a/packages/sdk/typescript/subgraph/package.json b/packages/sdk/typescript/subgraph/package.json
index 74d5aaf44e..20d64dc634 100644
--- a/packages/sdk/typescript/subgraph/package.json
+++ b/packages/sdk/typescript/subgraph/package.json
@@ -37,7 +37,7 @@
   "license": "MIT",
   "devDependencies": {
     "@graphprotocol/graph-cli": "^0.71.1",
-    "@graphprotocol/graph-ts": "^0.35.1",
+    "@graphprotocol/graph-ts": "^0.37.0",
     "@graphql-eslint/eslint-plugin": "^3.19.1",
     "@human-protocol/core": "*",
     "graphql": "^16.6.0",
diff --git a/yarn.lock b/yarn.lock
index 6c76e2b646..a22dc1c378 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1965,6 +1965,11 @@
     "@ethersproject/properties" "^5.7.0"
     "@ethersproject/strings" "^5.7.0"
 
+"@faker-js/faker@^9.4.0":
+  version "9.4.0"
+  resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-9.4.0.tgz#3e85604df3a318729436677565e9433d964276d2"
+  integrity sha512-85+k0AxaZSTowL0gXp8zYWDIrWclTbRPg/pm/V0dSFZ6W6D4lhcG3uuZl4zLsEKfEvs69xDbLN2cHQudwp95JA==
+
 "@float-capital/float-subgraph-uncrashable@^0.0.0-alpha.4":
   version "0.0.0-internal-testing.5"
   resolved "https://registry.yarnpkg.com/@float-capital/float-subgraph-uncrashable/-/float-subgraph-uncrashable-0.0.0-internal-testing.5.tgz#060f98440f6e410812766c5b040952d2d02e2b73"
@@ -2068,12 +2073,12 @@
     which "2.0.2"
     yaml "1.10.2"
 
-"@graphprotocol/graph-ts@^0.35.1":
-  version "0.35.1"
-  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.35.1.tgz#1e1ecc36d8f7a727ef3a6f1fed4c5ce16de378c2"
-  integrity sha512-74CfuQmf7JI76/XCC34FTkMMKeaf+3Pn0FIV3m9KNeaOJ+OI3CvjMIVRhOZdKcJxsFCBGaCCl0eQjh47xTjxKA==
+"@graphprotocol/graph-ts@^0.37.0":
+  version "0.37.0"
+  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.37.0.tgz#ad5e9bc24a099db336e6488e37d5bd5283501a39"
+  integrity sha512-3xp/sO8zFDBkX44ydGB87ow5Cyrfr/SAm/cWzIRzUVL7ROw0KUyFBG1xj4KKlMnAod7/RL99zChYquC15H4Oqg==
   dependencies:
-    assemblyscript "0.19.10"
+    assemblyscript "0.27.31"
 
 "@graphql-eslint/eslint-plugin@^3.19.1":
   version "3.20.1"
@@ -3293,10 +3298,10 @@
     path-to-regexp "3.3.0"
     swagger-ui-dist "5.17.14"
 
-"@nestjs/terminus@^10.2.1", "@nestjs/terminus@^10.2.3":
-  version "10.2.3"
-  resolved "https://registry.yarnpkg.com/@nestjs/terminus/-/terminus-10.2.3.tgz#72c8a66d04df52aeaae807551245480fd7239a75"
-  integrity sha512-iX7gXtAooePcyQqFt57aDke5MzgdkBeYgF5YsFNNFwOiAFdIQEhfv3PR0G+HlH9F6D7nBCDZt9U87Pks/qHijg==
+"@nestjs/terminus@^11.0.0":
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/@nestjs/terminus/-/terminus-11.0.0.tgz#18b030e4994ef3a8c63136df4c6fb4b6fbe70f59"
+  integrity sha512-c55LOo9YGovmQHtFUMa/vDaxGZ2cglMTZejqgHREaApt/GArTfgYYGwhRXPLq8ZwiQQlLuYB+79e9iA8mlDSLA==
   dependencies:
     boxen "5.1.2"
     check-disk-space "3.4.0"
@@ -5943,13 +5948,13 @@
     "@typescript-eslint/types" "7.18.0"
     "@typescript-eslint/visitor-keys" "7.18.0"
 
-"@typescript-eslint/scope-manager@8.16.0":
-  version "8.16.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.16.0.tgz#ebc9a3b399a69a6052f3d88174456dd399ef5905"
-  integrity sha512-mwsZWubQvBki2t5565uxF0EYvG+FwdFb8bMtDuGQLdCCnGPrDEDvm1gtfynuKlnpzeBRqdFCkMf9jg1fnAK8sg==
+"@typescript-eslint/scope-manager@8.22.0":
+  version "8.22.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.22.0.tgz#e85836ddeb8eae715f870628bcc32fe96aaf4d0e"
+  integrity sha512-/lwVV0UYgkj7wPSw0o8URy6YI64QmcOdwHuGuxWIYznO6d45ER0wXUbksr9pYdViAofpUCNJx/tAzNukgvaaiQ==
   dependencies:
-    "@typescript-eslint/types" "8.16.0"
-    "@typescript-eslint/visitor-keys" "8.16.0"
+    "@typescript-eslint/types" "8.22.0"
+    "@typescript-eslint/visitor-keys" "8.22.0"
 
 "@typescript-eslint/type-utils@5.62.0":
   version "5.62.0"
@@ -5996,10 +6001,10 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.18.0.tgz#b90a57ccdea71797ffffa0321e744f379ec838c9"
   integrity sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==
 
-"@typescript-eslint/types@8.16.0":
-  version "8.16.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.16.0.tgz#49c92ae1b57942458ab83d9ec7ccab3005e64737"
-  integrity sha512-NzrHj6thBAOSE4d9bsuRNMvk+BvaQvmY4dDglgkgGC0EW/tB3Kelnp3tAKH87GEwzoxgeQn9fNGRyFJM/xd+GQ==
+"@typescript-eslint/types@8.22.0":
+  version "8.22.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.22.0.tgz#d9dec7116479ad03aeb6c8ac9c5223c4c79cf360"
+  integrity sha512-0S4M4baNzp612zwpD4YOieP3VowOARgK2EkN/GBn95hpyF8E2fbMT55sRHWBq+Huaqk3b3XK+rxxlM8sPgGM6A==
 
 "@typescript-eslint/typescript-estree@5.62.0":
   version "5.62.0"
@@ -6042,19 +6047,19 @@
     semver "^7.6.0"
     ts-api-utils "^1.3.0"
 
-"@typescript-eslint/typescript-estree@8.16.0":
-  version "8.16.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.16.0.tgz#9d741e56e5b13469b5190e763432ce5551a9300c"
-  integrity sha512-E2+9IzzXMc1iaBy9zmo+UYvluE3TW7bCGWSF41hVWUE01o8nzr1rvOQYSxelxr6StUvRcTMe633eY8mXASMaNw==
+"@typescript-eslint/typescript-estree@8.22.0":
+  version "8.22.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.22.0.tgz#c188c3e19529d5b3145577c0bd967e2683b114df"
+  integrity sha512-SJX99NAS2ugGOzpyhMza/tX+zDwjvwAtQFLsBo3GQxiGcvaKlqGBkmZ+Y1IdiSi9h4Q0Lr5ey+Cp9CGWNY/F/w==
   dependencies:
-    "@typescript-eslint/types" "8.16.0"
-    "@typescript-eslint/visitor-keys" "8.16.0"
+    "@typescript-eslint/types" "8.22.0"
+    "@typescript-eslint/visitor-keys" "8.22.0"
     debug "^4.3.4"
     fast-glob "^3.3.2"
     is-glob "^4.0.3"
     minimatch "^9.0.4"
     semver "^7.6.0"
-    ts-api-utils "^1.3.0"
+    ts-api-utils "^2.0.0"
 
 "@typescript-eslint/utils@5.62.0", "@typescript-eslint/utils@^5.10.0", "@typescript-eslint/utils@^5.58.0", "@typescript-eslint/utils@^5.62.0":
   version "5.62.0"
@@ -6093,15 +6098,15 @@
     "@typescript-eslint/types" "7.18.0"
     "@typescript-eslint/typescript-estree" "7.18.0"
 
-"@typescript-eslint/utils@^6.0.0 || ^7.0.0 || ^8.0.0", "@typescript-eslint/utils@^8.15.0", "@typescript-eslint/utils@^8.4.0":
-  version "8.16.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.16.0.tgz#c71264c437157feaa97842809836254a6fc833c3"
-  integrity sha512-C1zRy/mOL8Pj157GiX4kaw7iyRLKfJXBR3L82hk5kS/GyHcOFmy4YUq/zfZti72I9wnuQtA/+xzft4wCC8PJdA==
+"@typescript-eslint/utils@^6.0.0 || ^7.0.0 || ^8.0.0", "@typescript-eslint/utils@^8.15.0", "@typescript-eslint/utils@^8.22.0":
+  version "8.22.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.22.0.tgz#c8cc4e52a9c711af8a741a82dc5d7242b7a8dd44"
+  integrity sha512-T8oc1MbF8L+Bk2msAvCUzjxVB2Z2f+vXYfcucE2wOmYs7ZUwco5Ep0fYZw8quNwOiw9K8GYVL+Kgc2pETNTLOg==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
-    "@typescript-eslint/scope-manager" "8.16.0"
-    "@typescript-eslint/types" "8.16.0"
-    "@typescript-eslint/typescript-estree" "8.16.0"
+    "@typescript-eslint/scope-manager" "8.22.0"
+    "@typescript-eslint/types" "8.22.0"
+    "@typescript-eslint/typescript-estree" "8.22.0"
 
 "@typescript-eslint/visitor-keys@5.62.0":
   version "5.62.0"
@@ -6127,12 +6132,12 @@
     "@typescript-eslint/types" "7.18.0"
     eslint-visitor-keys "^3.4.3"
 
-"@typescript-eslint/visitor-keys@8.16.0":
-  version "8.16.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.16.0.tgz#d5086afc060b01ff7a4ecab8d49d13d5a7b07705"
-  integrity sha512-pq19gbaMOmFE3CbL0ZB8J8BFCo2ckfHBfaIsaOZgBIF4EoISJIdLX5xRhd0FGB0LlHReNRuzoJoMGpTjq8F2CQ==
+"@typescript-eslint/visitor-keys@8.22.0":
+  version "8.22.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.22.0.tgz#02cc005014c372033eb9171e2275b76cba722a3f"
+  integrity sha512-AWpYAXnUgvLNabGTy3uBylkgZoosva/miNd1I8Bz3SjotmQPbVqhO4Cczo8AsZ44XVErEBPr/CRSgaj8sG7g0w==
   dependencies:
-    "@typescript-eslint/types" "8.16.0"
+    "@typescript-eslint/types" "8.22.0"
     eslint-visitor-keys "^4.2.0"
 
 "@ungap/structured-clone@^1.2.0":
@@ -7310,14 +7315,6 @@ asn1js@^3.0.5:
     pvutils "^1.1.3"
     tslib "^2.4.0"
 
-assemblyscript@0.19.10:
-  version "0.19.10"
-  resolved "https://registry.yarnpkg.com/assemblyscript/-/assemblyscript-0.19.10.tgz#7ede6d99c797a219beb4fa4614c3eab9e6343c8e"
-  integrity sha512-HavcUBXB3mBTRGJcpvaQjmnmaqKHBGREjSPNsIvnAk2f9dj78y4BkMaSSdvBQYWcDDzsHQjyUC8stICFkD1Odg==
-  dependencies:
-    binaryen "101.0.0-nightly.20210723"
-    long "^4.0.0"
-
 assemblyscript@0.19.23:
   version "0.19.23"
   resolved "https://registry.yarnpkg.com/assemblyscript/-/assemblyscript-0.19.23.tgz#16ece69f7f302161e2e736a0f6a474e6db72134c"
@@ -7327,6 +7324,14 @@ assemblyscript@0.19.23:
     long "^5.2.0"
     source-map-support "^0.5.20"
 
+assemblyscript@0.27.31:
+  version "0.27.31"
+  resolved "https://registry.yarnpkg.com/assemblyscript/-/assemblyscript-0.27.31.tgz#07412b1bc42c67f78080dbaddca030ab74d3b9b2"
+  integrity sha512-Ra8kiGhgJQGZcBxjtMcyVRxOEJZX64kd+XGpjWzjcjgxWJVv+CAQO0aDBk4GQVhjYbOkATarC83mHjAVGtwPBQ==
+  dependencies:
+    binaryen "116.0.0-nightly.20240114"
+    long "^5.2.1"
+
 assert@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/assert/-/assert-2.1.0.tgz#6d92a238d05dc02e7427c881fb8be81c8448b2dd"
@@ -7632,16 +7637,16 @@ binary-install-raw@0.0.13:
     rimraf "^3.0.2"
     tar "^6.1.0"
 
-binaryen@101.0.0-nightly.20210723:
-  version "101.0.0-nightly.20210723"
-  resolved "https://registry.yarnpkg.com/binaryen/-/binaryen-101.0.0-nightly.20210723.tgz#b6bb7f3501341727681a03866c0856500eec3740"
-  integrity sha512-eioJNqhHlkguVSbblHOtLqlhtC882SOEPKmNFZaDuz1hzQjolxZ+eu3/kaS10n3sGPONsIZsO7R9fR00UyhEUA==
-
 binaryen@102.0.0-nightly.20211028:
   version "102.0.0-nightly.20211028"
   resolved "https://registry.yarnpkg.com/binaryen/-/binaryen-102.0.0-nightly.20211028.tgz#8f1efb0920afd34509e342e37f84313ec936afb2"
   integrity sha512-GCJBVB5exbxzzvyt8MGDv/MeUjs6gkXDvf4xOIItRBptYl0Tz5sm1o/uG95YK0L0VeG5ajDu3hRtkBP2kzqC5w==
 
+binaryen@116.0.0-nightly.20240114:
+  version "116.0.0-nightly.20240114"
+  resolved "https://registry.yarnpkg.com/binaryen/-/binaryen-116.0.0-nightly.20240114.tgz#ad8bfbde77d4cb4715b93997114eefc30f45155b"
+  integrity sha512-0GZrojJnuhoe+hiwji7QFaL3tBlJoA+KFUN7ouYSDGZLSo9CKM8swQX8n/UcbR0d1VuZKU+nhogNzv423JEu5A==
+
 bindings@^1.4.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
@@ -8209,7 +8214,7 @@ chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^5.0.1, chalk@^5.3.0, chalk@~5.4.1:
+chalk@^5.0.1, chalk@^5.3.0, chalk@^5.4.1:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.4.1.tgz#1b48bf0963ec158dce2aacf69c093ae2dd2092d8"
   integrity sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==
@@ -8570,7 +8575,7 @@ color-support@^1.1.2:
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
 
-colorette@^2.0.20:
+colorette@^2.0.20, colorette@^2.0.7:
   version "2.0.20"
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
   integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
@@ -8617,6 +8622,11 @@ commander@4.1.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
   integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
 
+commander@^13.1.0:
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-13.1.0.tgz#776167db68c78f38dcce1f9b8d7b8b9a488abf46"
+  integrity sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw==
+
 commander@^2.20.0, commander@^2.20.3:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -8632,11 +8642,6 @@ commander@^9.4.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30"
   integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==
 
-commander@~12.1.0:
-  version "12.1.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-12.1.0.tgz#01423b36f501259fdaac4d0e4d60c96c991585d3"
-  integrity sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==
-
 comment-json@4.2.5:
   version "4.2.5"
   resolved "https://registry.yarnpkg.com/comment-json/-/comment-json-4.2.5.tgz#482e085f759c2704b60bc6f97f55b8c01bc41e70"
@@ -8693,17 +8698,15 @@ concat-stream@^1.5.2, concat-stream@^1.6.0, concat-stream@^1.6.2, concat-stream@
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-concurrently@^8.2.2:
-  version "8.2.2"
-  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-8.2.2.tgz#353141985c198cfa5e4a3ef90082c336b5851784"
-  integrity sha512-1dP4gpXFhei8IOtlXRE/T/4H88ElHgTiUzh71YUmtjTEHMSRS2Z/fgOxHSxxusGHogsRfxNq1vyAwxSC+EVyDg==
+concurrently@^9.1.2:
+  version "9.1.2"
+  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-9.1.2.tgz#22d9109296961eaee773e12bfb1ce9a66bc9836c"
+  integrity sha512-H9MWcoPsYddwbOGM6difjVwVZHl63nwMEwDJG/L7VGtuaJhb12h2caPG2tVPWs7emuYix252iGfqOyrz1GczTQ==
   dependencies:
     chalk "^4.1.2"
-    date-fns "^2.30.0"
     lodash "^4.17.21"
     rxjs "^7.8.1"
     shell-quote "^1.8.1"
-    spawn-command "0.0.2"
     supports-color "^8.1.1"
     tree-kill "^1.2.2"
     yargs "^17.7.2"
@@ -9171,7 +9174,7 @@ dataloader@^2.2.2:
   resolved "https://registry.yarnpkg.com/dataloader/-/dataloader-2.2.2.tgz#216dc509b5abe39d43a9b9d97e6e5e473dfbe3e0"
   integrity sha512-8YnDaaf7N3k/q5HnTJVuzSyLETjoZjVmHc4AeKAzOvKHEFQKcn64OKBfzHYtE9zGjctNM7V9I0MfnUVLpi7M5g==
 
-date-fns@^2.29.3, date-fns@^2.30.0:
+date-fns@^2.29.3:
   version "2.30.0"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0"
   integrity sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==
@@ -9183,6 +9186,11 @@ date-fns@^4.1.0:
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-4.1.0.tgz#64b3d83fff5aa80438f5b1a633c2e83b8a1c2d14"
   integrity sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==
 
+dateformat@^4.6.3:
+  version "4.6.3"
+  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-4.6.3.tgz#556fa6497e5217fedb78821424f8a1c22fa3f4b5"
+  integrity sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==
+
 dayjs@1.11.10:
   version "1.11.10"
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.10.tgz#68acea85317a6e164457d6d6947564029a6a16a0"
@@ -9205,7 +9213,7 @@ debug@2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.5, debug@^4.3.7, debug@~4.4.0:
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.5, debug@^4.3.7, debug@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a"
   integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==
@@ -10671,10 +10679,10 @@ ethers@^5.7.0:
     "@ethersproject/web" "5.7.1"
     "@ethersproject/wordlists" "5.7.0"
 
-ethers@^6.12.0, ethers@^6.12.1, ethers@^6.13.1, ethers@^6.7.0, ethers@^6.8.1:
-  version "6.13.4"
-  resolved "https://registry.yarnpkg.com/ethers/-/ethers-6.13.4.tgz#bd3e1c3dc1e7dc8ce10f9ffb4ee40967a651b53c"
-  integrity sha512-21YtnZVg4/zKkCQPjrDj38B1r4nQvTZLopUGMLQ1ePU2zV/joCfDC3t3iKQjWRzjjjbzR+mdAIoikeBRNkdllA==
+ethers@^6.13.5, ethers@^6.7.0, ethers@^6.8.1:
+  version "6.13.5"
+  resolved "https://registry.yarnpkg.com/ethers/-/ethers-6.13.5.tgz#8c1d6ac988ac08abc3c1d8fabbd4b8b602851ac4"
+  integrity sha512-+knKNieu5EKRThQJWwqaJ10a6HE9sSehGeqWN65//wE7j47ZpFhKAnHB/JJFibwwg61I/koxaPsXbXpD/skNOQ==
   dependencies:
     "@adraffy/ens-normalize" "1.10.1"
     "@noble/curves" "1.2.0"
@@ -10748,7 +10756,7 @@ execa@5.1.1, execa@^5.0.0, execa@^5.1.1:
     signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
-execa@^8.0.1, execa@~8.0.1:
+execa@^8.0.1:
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/execa/-/execa-8.0.1.tgz#51f6a5943b580f963c3ca9c6321796db8cc39b8c"
   integrity sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==
@@ -10895,6 +10903,11 @@ fast-base64-decode@^1.0.0:
   resolved "https://registry.yarnpkg.com/fast-base64-decode/-/fast-base64-decode-1.0.0.tgz#b434a0dd7d92b12b43f26819300d2dafb83ee418"
   integrity sha512-qwaScUgUGBYeDNRnbc/KyllVU88Jk1pRHPStuF/lO7B0/RTRLj7U0lkdTAutlBblY08rwZDff6tNU9cjv6j//Q==
 
+fast-copy@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/fast-copy/-/fast-copy-3.0.2.tgz#59c68f59ccbcac82050ba992e0d5c389097c9d35"
+  integrity sha512-dl0O9Vhju8IrcLndv2eU4ldt1ftXMqqfgN4H1cpmGV7P6jeB9FwpN9a2c8DPGE1Ys88rNUJVYDHq73CGAGOPfQ==
+
 fast-decode-uri-component@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/fast-decode-uri-component/-/fast-decode-uri-component-1.0.1.tgz#46f8b6c22b30ff7a81357d4f59abfae938202543"
@@ -10955,7 +10968,7 @@ fast-querystring@^1.1.1:
   dependencies:
     fast-decode-uri-component "^1.0.1"
 
-fast-redact@^3.0.0:
+fast-redact@^3.0.0, fast-redact@^3.1.1:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/fast-redact/-/fast-redact-3.5.0.tgz#e9ea02f7e57d0cd8438180083e93077e496285e4"
   integrity sha512-dwsoQlS7h9hMeYUq1W++23NDcBLV4KqONnITDV9DjfS3q1SgDGVrBdvvTLUotWtPSD7asWDV9/CmsZPy8Hf70A==
@@ -12034,6 +12047,11 @@ helmet@^7.1.0:
   resolved "https://registry.yarnpkg.com/helmet/-/helmet-7.2.0.tgz#8b2dcc425b4a46c88f6953481b40453cbe66b167"
   integrity sha512-ZRiwvN089JfMXokizgqEPXsl2Guk094yExfoDXR0cBYWxtBbaSww/w+vT4WEJsBW2iTUi1GgZ6swmoug3Oy4Xw==
 
+help-me@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/help-me/-/help-me-5.0.0.tgz#b1ebe63b967b74060027c2ac61f9be12d354a6f6"
+  integrity sha512-7xgomUX6ADmcYzFik0HzAxh/73YlKR9bmFzf51CZwR+b6YtzU2m0u49hQCqV6SvlqIqsaxovfwdvbnsw3b/zpg==
+
 hexoid@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/hexoid/-/hexoid-2.0.0.tgz#fb36c740ebbf364403fa1ec0c7efd268460ec5b9"
@@ -13493,6 +13511,11 @@ joi@^17.13.3:
     "@sideway/formula" "^3.0.1"
     "@sideway/pinpoint" "^2.0.0"
 
+joycon@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/joycon/-/joycon-3.1.1.tgz#bce8596d6ae808f8b68168f5fc69280996894f03"
+  integrity sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==
+
 js-cookie@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8"
@@ -13867,7 +13890,7 @@ libphonenumber-js@^1.10.53:
   resolved "https://registry.yarnpkg.com/libphonenumber-js/-/libphonenumber-js-1.11.15.tgz#0947ba02208cf6c44fdf3b07e097a98b3ec945f4"
   integrity sha512-M7+rtYi9l5RvMmHyjyoF3BHHUpXTYdJ0PezZGHNs0GyW1lO+K7jxlXpbdIb7a56h0nqLYdjIw+E+z0ciGaJP7g==
 
-lilconfig@~3.1.3:
+lilconfig@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.1.3.tgz#a1bcfd6257f9585bf5ae14ceeebb7b559025e4c4"
   integrity sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==
@@ -13884,21 +13907,21 @@ linkify-it@^5.0.0:
   dependencies:
     uc.micro "^2.0.0"
 
-lint-staged@^15.3.0:
-  version "15.3.0"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-15.3.0.tgz#32a0b3f2f2b8825950bd3b9fb093e045353bdfa3"
-  integrity sha512-vHFahytLoF2enJklgtOtCtIjZrKD/LoxlaUusd5nh7dWv/dkKQJY74ndFSzxCdv7g0ueGg1ORgTSt4Y9LPZn9A==
-  dependencies:
-    chalk "~5.4.1"
-    commander "~12.1.0"
-    debug "~4.4.0"
-    execa "~8.0.1"
-    lilconfig "~3.1.3"
-    listr2 "~8.2.5"
-    micromatch "~4.0.8"
-    pidtree "~0.6.0"
-    string-argv "~0.3.2"
-    yaml "~2.6.1"
+lint-staged@^15.4.3:
+  version "15.4.3"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-15.4.3.tgz#e73587cc857f580c99f907abefe9ac8d8d5e74c1"
+  integrity sha512-FoH1vOeouNh1pw+90S+cnuoFwRfUD9ijY2GKy5h7HS3OR7JVir2N2xrsa0+Twc1B7cW72L+88geG5cW4wIhn7g==
+  dependencies:
+    chalk "^5.4.1"
+    commander "^13.1.0"
+    debug "^4.4.0"
+    execa "^8.0.1"
+    lilconfig "^3.1.3"
+    listr2 "^8.2.5"
+    micromatch "^4.0.8"
+    pidtree "^0.6.0"
+    string-argv "^0.3.2"
+    yaml "^2.7.0"
 
 listhen@^1.9.0:
   version "1.9.0"
@@ -13924,7 +13947,7 @@ listhen@^1.9.0:
     untun "^0.1.3"
     uqr "^0.1.2"
 
-listr2@~8.2.5:
+listr2@^8.2.5:
   version "8.2.5"
   resolved "https://registry.yarnpkg.com/listr2/-/listr2-8.2.5.tgz#5c9db996e1afeb05db0448196d3d5f64fec2593d"
   integrity sha512-iyAZCeyD+c1gPyE9qpFu8af0Y+MRtmKOncdGoA2S5EY8iFq99dmmvkNnHiWo+pj0s7yH7l3KPIgee77tKpXPWQ==
@@ -14199,6 +14222,11 @@ long@^5.0.0, long@^5.2.0:
   resolved "https://registry.yarnpkg.com/long/-/long-5.2.3.tgz#a3ba97f3877cf1d778eccbcb048525ebb77499e1"
   integrity sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==
 
+long@^5.2.1:
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/long/-/long-5.2.4.tgz#ee651d5c7c25901cfca5e67220ae9911695e99b2"
+  integrity sha512-qtzLbJE8hq7VabR3mISmVGtoXP8KGc2Z/AT8OuqlYD7JTR3oqrgwdjnk07wpj1twXxYmgDXgoKVWUG/fReSzHg==
+
 loose-envify@^1.1.0, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
@@ -14424,7 +14452,7 @@ micro-ftch@^0.3.1:
   resolved "https://registry.yarnpkg.com/micro-ftch/-/micro-ftch-0.3.1.tgz#6cb83388de4c1f279a034fb0cf96dfc050853c5f"
   integrity sha512-/0LLxhzP0tfiR5hcQebtudP56gUurs2CLkGarnCiB/OqEyUFQ6U3paQi/tgLv0hBJYt2rnr9MNpxz4fiiugstg==
 
-micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5, micromatch@~4.0.8:
+micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5, micromatch@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
   integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
@@ -15261,6 +15289,11 @@ on-exit-leak-free@^0.2.0:
   resolved "https://registry.yarnpkg.com/on-exit-leak-free/-/on-exit-leak-free-0.2.0.tgz#b39c9e3bf7690d890f4861558b0d7b90a442d209"
   integrity sha512-dqaz3u44QbRXQooZLTUKU41ZrzYrcvLISVgbrzbyCMxpmSLJvZ3ZamIJIZ29P6OhZIkNIQKosdeM6t1LYbA9hg==
 
+on-exit-leak-free@^2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/on-exit-leak-free/-/on-exit-leak-free-2.1.2.tgz#fed195c9ebddb7d9e4c3842f93f281ac8dadd3b8"
+  integrity sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA==
+
 on-finished@2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
@@ -15783,7 +15816,7 @@ picomatch@^4.0.2:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.2.tgz#77c742931e8f3b8820946c76cd0c1f13730d1dab"
   integrity sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==
 
-pidtree@~0.6.0:
+pidtree@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.6.0.tgz#90ad7b6d42d5841e69e0a2419ef38f8883aa057c"
   integrity sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==
@@ -15803,6 +15836,13 @@ pify@^5.0.0:
   resolved "https://registry.yarnpkg.com/pify/-/pify-5.0.0.tgz#1f5eca3f5e87ebec28cc6d54a0e4aaf00acc127f"
   integrity sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==
 
+pino-abstract-transport@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pino-abstract-transport/-/pino-abstract-transport-2.0.0.tgz#de241578406ac7b8a33ce0d77ae6e8a0b3b68a60"
+  integrity sha512-F63x5tizV6WCh4R6RHyi2Ml+M70DNRXt/+HANowMflpgGFMAym/VKm6G7ZOQRjqN7XbGxK1Lg9t6ZrtzOaivMw==
+  dependencies:
+    split2 "^4.0.0"
+
 pino-abstract-transport@v0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/pino-abstract-transport/-/pino-abstract-transport-0.5.0.tgz#4b54348d8f73713bfd14e3dc44228739aa13d9c0"
@@ -15811,11 +15851,35 @@ pino-abstract-transport@v0.5.0:
     duplexify "^4.1.2"
     split2 "^4.0.0"
 
+pino-pretty@^13.0.0:
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/pino-pretty/-/pino-pretty-13.0.0.tgz#21d57fe940e34f2e279905d7dba2d7e2c4f9bf17"
+  integrity sha512-cQBBIVG3YajgoUjo1FdKVRX6t9XPxwB9lcNJVD5GCnNM4Y6T12YYx8c6zEejxQsU0wrg9TwmDulcE9LR7qcJqA==
+  dependencies:
+    colorette "^2.0.7"
+    dateformat "^4.6.3"
+    fast-copy "^3.0.2"
+    fast-safe-stringify "^2.1.1"
+    help-me "^5.0.0"
+    joycon "^3.1.1"
+    minimist "^1.2.6"
+    on-exit-leak-free "^2.1.0"
+    pino-abstract-transport "^2.0.0"
+    pump "^3.0.0"
+    secure-json-parse "^2.4.0"
+    sonic-boom "^4.0.1"
+    strip-json-comments "^3.1.1"
+
 pino-std-serializers@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-4.0.0.tgz#1791ccd2539c091ae49ce9993205e2cd5dbba1e2"
   integrity sha512-cK0pekc1Kjy5w9V2/n+8MkZwusa6EyyxfeQCB799CQRhRt/CqYKiWs5adeu8Shve2ZNffvfC/7J64A2PJo1W/Q==
 
+pino-std-serializers@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-7.0.0.tgz#7c625038b13718dbbd84ab446bd673dc52259e3b"
+  integrity sha512-e906FRY0+tV27iq4juKzSYPbUj2do2X2JX4EzSca1631EB2QJQUqGbDuERal7LCtOpxl6x3+nvo9NPZcmjkiFA==
+
 pino@7.11.0:
   version "7.11.0"
   resolved "https://registry.yarnpkg.com/pino/-/pino-7.11.0.tgz#0f0ea5c4683dc91388081d44bff10c83125066f6"
@@ -15833,6 +15897,23 @@ pino@7.11.0:
     sonic-boom "^2.2.1"
     thread-stream "^0.15.1"
 
+pino@^9.6.0:
+  version "9.6.0"
+  resolved "https://registry.yarnpkg.com/pino/-/pino-9.6.0.tgz#6bc628159ba0cc81806d286718903b7fc6b13169"
+  integrity sha512-i85pKRCt4qMjZ1+L7sy2Ag4t1atFcdbEt76+7iRJn1g2BvsnRMGu9p8pivl9fs63M2kF/A0OacFZhTub+m/qMg==
+  dependencies:
+    atomic-sleep "^1.0.0"
+    fast-redact "^3.1.1"
+    on-exit-leak-free "^2.1.0"
+    pino-abstract-transport "^2.0.0"
+    pino-std-serializers "^7.0.0"
+    process-warning "^4.0.0"
+    quick-format-unescaped "^4.0.3"
+    real-require "^0.2.0"
+    safe-stable-stringify "^2.3.1"
+    sonic-boom "^4.0.1"
+    thread-stream "^3.0.0"
+
 pirates@^4.0.4:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9"
@@ -16046,6 +16127,11 @@ process-warning@^1.0.0:
   resolved "https://registry.yarnpkg.com/process-warning/-/process-warning-1.0.0.tgz#980a0b25dc38cd6034181be4b7726d89066b4616"
   integrity sha512-du4wfLyj4yCZq1VupnVSZmRsPJsNuxoDQFdCFHLaYiEbFBD7QE0a+I4D7hOxrVnh78QE/YipFAj9lXHiXocV+Q==
 
+process-warning@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/process-warning/-/process-warning-4.0.1.tgz#5c1db66007c67c756e4e09eb170cdece15da32fb"
+  integrity sha512-3c2LzQ3rY9d0hc1emcsHhfT9Jwz0cChib/QN89oME2R451w5fy3f0afAhERFZAwrbDU43wk12d0ORBpDVME50Q==
+
 process@^0.11.10:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
@@ -16547,6 +16633,11 @@ real-require@^0.1.0:
   resolved "https://registry.yarnpkg.com/real-require/-/real-require-0.1.0.tgz#736ac214caa20632847b7ca8c1056a0767df9381"
   integrity sha512-r/H9MzAWtrv8aSVjPCMFpDMl5q66GqtmmRkRjpHTsp4zBAa+snZyiQNlMONiUmEJcsnaw0wCauJ2GWODr/aFkg==
 
+real-require@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/real-require/-/real-require-0.2.0.tgz#209632dea1810be2ae063a6ac084fee7e33fba78"
+  integrity sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg==
+
 receptacle@^1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/receptacle/-/receptacle-1.3.2.tgz#a7994c7efafc7a01d0e2041839dab6c4951360d2"
@@ -17023,7 +17114,7 @@ safe-regex-test@^1.0.3:
     es-errors "^1.3.0"
     is-regex "^1.1.4"
 
-safe-stable-stringify@^2.1.0:
+safe-stable-stringify@^2.1.0, safe-stable-stringify@^2.3.1:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz#4ca2f8e385f2831c432a719b108a3bf7af42a1dd"
   integrity sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==
@@ -17115,10 +17206,15 @@ secp256k1@^5.0.1:
     node-addon-api "^5.0.0"
     node-gyp-build "^4.2.0"
 
+secure-json-parse@^2.4.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/secure-json-parse/-/secure-json-parse-2.7.0.tgz#5a5f9cd6ae47df23dba3151edd06855d47e09862"
+  integrity sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw==
+
 "semver@2 || 3 || 4 || 5", semver@7.3.5, semver@7.4.0, semver@^5.5.0, semver@^6.0.0, semver@^6.3.0, semver@^6.3.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.2, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.3:
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.0.tgz#9c6fe61d0c6f9fa9e26575162ee5a9180361b09c"
-  integrity sha512-DrfFnPzblFmNrIZzg5RzHegbiRWg7KMR7btwi2yjHwx06zsUbO5g613sVwEV7FTwmzJu+Io0lJe2GJ3LxqpvBQ==
+  version "7.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.1.tgz#abd5098d82b18c6c81f6074ff2647fd3e7220c9f"
+  integrity sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==
 
 send@0.19.0:
   version "0.19.0"
@@ -17458,6 +17554,13 @@ sonic-boom@^2.2.1:
   dependencies:
     atomic-sleep "^1.0.0"
 
+sonic-boom@^4.0.1:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-4.2.0.tgz#e59a525f831210fa4ef1896428338641ac1c124d"
+  integrity sha512-INb7TM37/mAcsGmc9hyyI6+QR3rR1zVRu36B0NeGXKnOOLiZOfER5SA+N7X7k3yUYRzLWafduTDvJAfDswwEww==
+  dependencies:
+    atomic-sleep "^1.0.0"
+
 sort-object-keys@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.3.tgz#bff833fe85cab147b34742e45863453c1e190b45"
@@ -17520,11 +17623,6 @@ source-map@~0.2.0:
   dependencies:
     amdefine ">=0.0.4"
 
-spawn-command@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2.tgz#9544e1a43ca045f8531aac1a48cb29bdae62338e"
-  integrity sha512-zC8zGoGkmc8J9ndvml8Xksr1Amk9qBujgbF0JAIWO7kXr43w0h/0GJNM/Vustixu+YE8N/MTrQ7N31FvHUACxQ==
-
 spdx-correct@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c"
@@ -17688,7 +17786,7 @@ strict-uri-encode@^2.0.0:
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"
   integrity sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==
 
-string-argv@~0.3.2:
+string-argv@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6"
   integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==
@@ -18236,6 +18334,13 @@ thread-stream@^0.15.1:
   dependencies:
     real-require "^0.1.0"
 
+thread-stream@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/thread-stream/-/thread-stream-3.1.0.tgz#4b2ef252a7c215064507d4ef70c05a5e2d34c4f1"
+  integrity sha512-OqyPZ9u96VohAyMfJykzmivOrY2wfMSf3C5TtFJVgN+Hm6aj+voFhlK+kZEIv2FBh1X6Xp3DlnCOfEQ3B2J86A==
+  dependencies:
+    real-require "^0.2.0"
+
 through2@^4.0.0, through2@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764"
@@ -18428,6 +18533,11 @@ ts-api-utils@^1.0.1, ts-api-utils@^1.3.0:
   resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.4.2.tgz#a6a6dff26117ac7965624fc118525971edc6a82a"
   integrity sha512-ZF5gQIQa/UmzfvxbHZI3JXN0/Jt+vnAfAviNRAMc491laiK6YCLpCW9ft8oaCRFOTxCZtUTE6XB0ZQAe3olntw==
 
+ts-api-utils@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-2.0.1.tgz#660729385b625b939aaa58054f45c058f33f10cd"
+  integrity sha512-dnlgjFSVetynI8nzgJ+qF62efpglpWRk8isUEWZGWlJYySCTD6aKvbUDu+zbPeDakk3bg5H4XpitHukgfL1m9w==
+
 ts-command-line-args@^2.2.0:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/ts-command-line-args/-/ts-command-line-args-2.5.1.tgz#e64456b580d1d4f6d948824c274cf6fa5f45f7f0"
@@ -19209,6 +19319,14 @@ vite-plugin-node-polyfills@^0.22.0:
     "@rollup/plugin-inject" "^5.0.5"
     node-stdlib-browser "^1.2.0"
 
+vite-plugin-node-polyfills@^0.23.0:
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/vite-plugin-node-polyfills/-/vite-plugin-node-polyfills-0.23.0.tgz#99d0d1524fa75ce5c7bb1fc8af30283379e9c684"
+  integrity sha512-4n+Ys+2bKHQohPBKigFlndwWQ5fFKwaGY6muNDMTb0fSQLyBzS+jjUNRZG9sKF0S/Go4ApG6LFnUGopjkILg3w==
+  dependencies:
+    "@rollup/plugin-inject" "^5.0.5"
+    node-stdlib-browser "^1.2.0"
+
 vite-plugin-svgr@^4.2.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/vite-plugin-svgr/-/vite-plugin-svgr-4.3.0.tgz#742f16f11375996306c696ec323e4d23f6005075"
@@ -19979,10 +20097,10 @@ yaml@1.10.2, yaml@^1.10.0, yaml@^1.10.2:
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
-yaml@^2.6.1, yaml@~2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.6.1.tgz#42f2b1ba89203f374609572d5349fb8686500773"
-  integrity sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==
+yaml@^2.6.1, yaml@^2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.7.0.tgz#aef9bb617a64c937a9a748803786ad8d3ffe1e98"
+  integrity sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==
 
 yargs-parser@21.1.1, yargs-parser@^21.0.0, yargs-parser@^21.1.1:
   version "21.1.1"
@@ -20070,10 +20188,10 @@ yocto-queue@^1.0.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.1.1.tgz#fef65ce3ac9f8a32ceac5a634f74e17e5b232110"
   integrity sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g==
 
-yup@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/yup/-/yup-1.4.0.tgz#898dcd660f9fb97c41f181839d3d65c3ee15a43e"
-  integrity sha512-wPbgkJRCqIf+OHyiTBQoJiP5PFuAXaWiJK6AmYkzQAh5/c2K9hzSApBZG5wV9KoKSePF7sAxmNSvh/13YHkFDg==
+yup@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/yup/-/yup-1.6.1.tgz#8defcff9daaf9feac178029c0e13b616563ada4b"
+  integrity sha512-JED8pB50qbA4FOkDol0bYF/p60qSEDQqBD0/qeIrUCG1KbPBIQ776fCUNb9ldbPcSTxA69g/47XTo4TqWiuXOA==
   dependencies:
     property-expr "^2.0.5"
     tiny-case "^1.0.3"