Merge pull request #34 from axone-protocol/fix/blocks

fix: fixed blocks and signatures logic

src/main.ts

@@ -19,6 +19,5 @@ import '@utils/config-loader';
   await app.listen(config.app.port, config.app.host);
 
   await showAvailableRoutes(app);
-
-  Log.success(`${config.app.host}:${config.app.port}`);
+  Log.success(`Application is running on: ${await app.getUrl()}`);
 })().catch(AppExceptionsFilter.catch);

src/modules/staking/enums/staking-cache-prefix.enum.ts

@@ -1,10 +1,11 @@
 export enum StakingCachePrefix {
-  STAKING = 'staking',
-  GLOBAL_OVERVIEW = 'global_overview',
-  VALIDATORS = 'validators',
-  VALIDATOR_IMG = 'validator_img',
-  VALIDATOR_SIGNATURES = 'validator_signatures',
-  VALIDATOR_RECENTLY_PROPOSED_BLOCKS = 'validator_recently_propored_blocks',
-  PROPOSALS = 'proposals',
-  PROPOSAL = 'proposal',
+  STAKING = "staking",
+  GLOBAL_OVERVIEW = "global_overview",
+  VALIDATORS = "validators",
+  VALIDATOR_IMG = "validator_img",
+  VALIDATOR_SIGNATURES = "validator_signatures",
+  VALIDATOR_RECENTLY_PROPOSED_BLOCKS = "validator_recently_propored_blocks",
+  PROPOSALS = "proposals",
+  PROPOSAL = "proposal",
+  LAST_BLOCK = "last_block",
 }

src/modules/staking/services/staking.cache.ts

@@ -92,19 +92,33 @@ export class StakingCache {
     return signatures.map(signature => JSON.parse(signature!));
   }
 
-  async setRecentlyProposedBlock(block: unknown) {
-    const key = this.createRedisKey(StakingCachePrefix.VALIDATOR_RECENTLY_PROPOSED_BLOCKS, v4());
+  async setRecentlyProposedBlock(address: string, block: unknown) {
+    const key = this.createRedisKey(this.createRedisKey(StakingCachePrefix.VALIDATOR_RECENTLY_PROPOSED_BLOCKS, address), v4());
     this.redisService.setWithTTL(key, JSON.stringify(block), config.cache.validatorSignature);
   }
 
-  async getRecentlyProposedBlock() {
-    const pattern = this.createRedisKey(StakingCachePrefix.VALIDATOR_RECENTLY_PROPOSED_BLOCKS, '*');
+  async getRecentlyProposedBlock(address: string) {
+    const pattern = this.createRedisKey(this.createRedisKey(StakingCachePrefix.VALIDATOR_RECENTLY_PROPOSED_BLOCKS, address), '*');
     const keys = await this.redisService.keys(pattern);
     const recentlyProposedBlocks = await Promise.all(keys.map((key: string) => this.redisService.get(key)));
 
     return recentlyProposedBlocks.map(block => JSON.parse(block!));
   }
 
+  async setLastBlock(block: unknown) {
+    this.redisService.set(this.createRedisKey(StakingCachePrefix.LAST_BLOCK), JSON.stringify(block));
+  }
+
+  async getLastBlock() {
+    const serialized = await this.redisService.get(this.createRedisKey(StakingCachePrefix.LAST_BLOCK));
+
+    if (!serialized) {
+      return null;
+    }
+
+    return JSON.parse(serialized as string);
+  }
+
   private createRedisKey(...ids: string[]) {
     return ids.reduce((acc, id) => acc + `_${id}`, `${StakingCachePrefix.STAKING}`);
   }