Merge branch 'unprofitable_queue' into use_txmgr

taikoxyz · Mar 25, 2024 · 0d0e5bb · 0d0e5bb
2 parents 782eec8 + 536c6e3
commit 0d0e5bb
Show file tree

Hide file tree

Showing 11 changed files with 172 additions and 976 deletions.
diff --git a/packages/bridge-ui/package.json b/packages/bridge-ui/package.json
@@ -30,7 +30,7 @@
     "@typescript-eslint/eslint-plugin": "^7.3.1",
     "@typescript-eslint/parser": "^7.0.2",
     "@vitest/coverage-v8": "^1.3.1",
-    "@wagmi/cli": "^2.1.2",
+    "@wagmi/cli": "^2.1.4",
     "abitype": "^1.0.0",
     "ajv": "^8.12.0",
     "autoprefixer": "^10.4.18",
@@ -60,9 +60,9 @@
   },
   "type": "module",
   "dependencies": {
-    "@wagmi/connectors": "^4.1.14",
-    "@wagmi/core": "^2.6.5",
-    "@walletconnect/ethereum-provider": "^2.11.2",
+    "@wagmi/connectors": "^4.1.18",
+    "@wagmi/core": "^2.6.9",
+    "@walletconnect/ethereum-provider": "^2.11.3",
     "@walletconnect/modal": "^2.6.2",
     "@web3modal/wagmi": "^4.1.1",
     "@zerodevx/svelte-toast": "^0.9.5",

diff --git a/packages/bridge-ui/src/components/TokenDropdown/AddCustomERC20.svelte b/packages/bridge-ui/src/components/TokenDropdown/AddCustomERC20.svelte
@@ -206,7 +206,7 @@
 
     {#if customTokens.length > 0}
       <div class="flex h-full w-full flex-col justify-between mt-6">
-        <h3 class="title-body-bold mb-7">Your imported tokens:</h3>
+        <h3 class="title-body-bold mb-7">{$t('token_dropdown.imported_tokens')}</h3>
         {#each customTokens as ct (ct.symbol)}
           <div class="flex items-center justify-between">
             <div class="flex items-center m-2 space-x-2">
@@ -222,7 +222,7 @@
       </div>
     {/if}
   </div>
-  <!-- We catch key events aboe -->
+  <!-- We catch key events above -->
   <!-- svelte-ignore a11y-click-events-have-key-events -->
   <div role="button" tabindex="0" class="overlay-backdrop" on:click={closeModalIfClickedOutside} />
 </dialog>
diff --git a/packages/bridge-ui/src/i18n/en.json b/packages/bridge-ui/src/i18n/en.json
@@ -402,7 +402,8 @@
       "description": "You can add your own token by entering the contract address below. Make sure you are on the chain where the token is deployed.",
       "title": "Add your own token"
     },
-    "label": "Select token"
+    "label": "Select token",
+    "imported_tokens": "Your imported tokens:"
   },
   "transactions": {
     "actions": {

diff --git a/packages/guardian-prover-health-check-ui/package.json b/packages/guardian-prover-health-check-ui/package.json
@@ -44,7 +44,7 @@
 	},
 	"type": "module",
 	"dependencies": {
-		"@wagmi/core": "^1.4.13",
+		"@wagmi/core": "^2.6.9",
 		"axios": "^1.6.7",
 		"svelte-i18n": "^4.0.0",
 		"viem": "^1.21.4"

diff --git a/...ages/guardian-prover-health-check-ui/src/lib/blocks/getGuardianProverIdsPerBlockNumber.ts b/...ages/guardian-prover-health-check-ui/src/lib/blocks/getGuardianProverIdsPerBlockNumber.ts
@@ -1,11 +1,11 @@
-import type { GuardianProverIdsMap, SignedBlock, SignedBlocks } from '$lib/types';
+import type { GuardianProverIdsMap, SignedBlocks } from '$lib/types';
 
 export const getGuardianProverIdsPerBlockNumber = (blocks: SignedBlocks): GuardianProverIdsMap => {
-	const result: GuardianProverIdsMap = {};
-
-	for (const blockNumber in blocks) {
-		result[blockNumber] = blocks[blockNumber].map((block: SignedBlock) => block.guardianProverID);
-	}
-
-	return result;
+  const blockNumbers = Object.keys(blocks);
+  return blockNumbers.reduce((prev, blockNumber) => {
+    return {
+      ...prev,
+      [blockNumber]: blocks[blockNumber].map(block => block.guardianProverID)
+    }
+  }, {});
 };
diff --git a/packages/guardian-prover-health-check-ui/src/lib/blocks/signedBlocksPerGuardian.ts b/packages/guardian-prover-health-check-ui/src/lib/blocks/signedBlocksPerGuardian.ts
@@ -1,17 +1,14 @@
 import { get } from 'svelte/store';
 import { signedBlocks } from '$stores';
-import type { SignedBlock, SortedSignedBlocks } from '$lib/types';
+import type { SortedSignedBlocks } from '$lib/types';
 
 export function signedBlocksPerGuardian(guardianProverId: number): number {
 	const allSortedSignedBlocks: SortedSignedBlocks = get(signedBlocks);
-	let count = 0;
-	allSortedSignedBlocks.forEach((blockGroup) => {
-		blockGroup.blocks.forEach((block: SignedBlock) => {
-			if (block.guardianProverID === Number(guardianProverId)) {
-				count++;
-			}
-		});
-	});
+  const targetId = Number(guardianProverId);
 
-	return count;
+  return allSortedSignedBlocks
+    .reduce((total, blockGroup) => {
+      const matchingBlocks = blockGroup.blocks.filter(block => block.guardianProverID === targetId);
+      return total + matchingBlocks.length;
+    }, 0);
 }
diff --git a/packages/relayer/docker-compose/docker-compose.yml b/packages/relayer/docker-compose/docker-compose.yml
@@ -18,6 +18,7 @@ services:
     ports:
       - 5672:5672
       - 15672:15672
+      - 15692:15692
     volumes:
       - ~/.docker-conf/rabbitmq/data/:/var/lib/rabbitmq/
       - ~/.docker-conf/rabbitmq/log/:/var/log/rabbitmq

diff --git a/packages/relayer/docker-compose/prometheus.yml b/packages/relayer/docker-compose/prometheus.yml
@@ -6,3 +6,7 @@ scrape_configs:
     scrape_interval: 15s
     static_configs:
       - targets: ["localhost:9090"]
+
+  - job_name: "rabbitmq"
+    static_configs:
+      - targets: ["host.docker.internal:15692"]
diff --git a/packages/relayer/migrations/1666650599_create_events_table.sql b/packages/relayer/migrations/1666650599_create_events_table.sql
@@ -16,7 +16,7 @@ CREATE TABLE IF NOT EXISTS events (
     kind VARCHAR(255) NOT NULL DEFAULT "",
     data JSON NOT NULL,
     canonical_token_address VARCHAR(255) DEFAULT "",
-    canonical_token_symbol VARCHAR(10) DEFAULT "",
+    canonical_token_symbol VARCHAR(255) DEFAULT "",
     canonical_token_name VARCHAR(255) DEFAULT "",
     canonical_token_decimals int DEFAULT 0,
     amount VARCHAR(255) NOT NULL DEFAULT 0,

diff --git a/packages/relayer/migrations/1707727779_alert_events_canonical_token_symbol_length.sql b/packages/relayer/migrations/1707727779_alert_events_canonical_token_symbol_length.sql