Merge pull request #83 from celenium-io/dev

v1.16.0

Author: GusevPM

assets/icons.json

@@ -115,6 +115,7 @@
 		}
 	],
 	"calc": "M 16.241 2 C 17.046 2 17.711 2 18.251 2.044 C 18.814 2.09 19.331 2.189 19.816 2.436 C 20.569 2.819 21.181 3.431 21.564 4.184 C 21.811 4.669 21.91 5.186 21.956 5.748 C 22 6.29 22 6.954 22 7.758 L 22 16.241 C 22 17.046 22 17.711 21.956 18.251 C 21.91 18.814 21.811 19.331 21.564 19.816 C 21.181 20.569 20.569 21.181 19.816 21.564 C 19.331 21.811 18.814 21.91 18.252 21.956 C 17.711 22 17.046 22 16.242 22 L 7.758 22 C 6.953 22 6.288 22 5.748 21.956 C 5.185 21.91 4.668 21.811 4.183 21.564 C 3.43 21.181 2.818 20.569 2.435 19.816 C 2.188 19.331 2.089 18.814 2.043 18.252 C 2 17.71 2 17.046 2 16.242 L 2 7.758 C 2 6.953 2 6.288 2.044 5.748 C 2.09 5.185 2.189 4.668 2.436 4.183 C 2.819 3.43 3.431 2.818 4.184 2.435 C 4.669 2.188 5.186 2.089 5.748 2.043 C 6.29 2 6.954 2 7.758 2 Z M 7.207 18.207 L 18.207 7.207 C 18.586 6.815 18.581 6.191 18.195 5.805 C 17.809 5.419 17.185 5.414 16.793 5.793 L 5.793 16.793 C 5.533 17.044 5.429 17.416 5.52 17.766 C 5.612 18.115 5.885 18.388 6.234 18.48 C 6.584 18.571 6.956 18.467 7.207 18.207 Z M 9.5 6.5 C 9.5 5.948 9.052 5.5 8.5 5.5 C 7.948 5.5 7.5 5.948 7.5 6.5 L 7.5 7.5 L 6.5 7.5 C 5.948 7.5 5.5 7.948 5.5 8.5 C 5.5 9.052 5.948 9.5 6.5 9.5 L 7.5 9.5 L 7.5 10.5 C 7.5 11.052 7.948 11.5 8.5 11.5 C 9.052 11.5 9.5 11.052 9.5 10.5 L 9.5 9.5 L 10.5 9.5 C 11.052 9.5 11.5 9.052 11.5 8.5 C 11.5 7.948 11.052 7.5 10.5 7.5 L 9.5 7.5 Z M 13.5 16.5 L 17.5 16.5 C 18.052 16.5 18.5 16.052 18.5 15.5 C 18.5 14.948 18.052 14.5 17.5 14.5 L 13.5 14.5 C 12.948 14.5 12.5 14.948 12.5 15.5 C 12.5 16.052 12.948 16.5 13.5 16.5 Z",
+	"calculator": "M 12 22 C 7.286 22 4.929 22 3.464 20.535 C 2 19.072 2 16.714 2 12 C 2 7.286 2 4.929 3.464 3.464 C 4.93 2 7.286 2 12 2 C 16.714 2 19.071 2 20.535 3.464 C 22 4.93 22 7.286 22 12 C 22 16.714 22 19.071 20.535 20.535 C 19.072 22 16.714 22 12 22 Z M 8.75 6.5 C 8.75 6.086 8.414 5.75 8 5.75 C 7.586 5.75 7.25 6.086 7.25 6.5 L 7.25 7.75 L 6 7.75 C 5.586 7.75 5.25 8.086 5.25 8.5 C 5.25 8.914 5.586 9.25 6 9.25 L 7.25 9.25 L 7.25 10.5 C 7.25 10.914 7.586 11.25 8 11.25 C 8.414 11.25 8.75 10.914 8.75 10.5 L 8.75 9.25 L 10 9.25 C 10.414 9.25 10.75 8.914 10.75 8.5 C 10.75 8.086 10.414 7.75 10 7.75 L 8.75 7.75 Z M 14 7.75 C 13.586 7.75 13.25 8.086 13.25 8.5 C 13.25 8.914 13.586 9.25 14 9.25 L 18 9.25 C 18.414 9.25 18.75 8.914 18.75 8.5 C 18.75 8.086 18.414 7.75 18 7.75 Z M 14 13.75 C 13.586 13.75 13.25 14.086 13.25 14.5 C 13.25 14.914 13.586 15.25 14 15.25 L 18 15.25 C 18.414 15.25 18.75 14.914 18.75 14.5 C 18.75 14.086 18.414 13.75 18 13.75 Z M 7.03 13.97 C 6.734 13.695 6.274 13.703 5.988 13.988 C 5.703 14.274 5.695 14.734 5.97 15.03 L 6.94 16 L 5.97 16.97 C 5.769 17.157 5.687 17.439 5.755 17.704 C 5.822 17.97 6.03 18.178 6.296 18.245 C 6.561 18.313 6.843 18.231 7.03 18.03 L 8 17.06 L 8.97 18.03 C 9.157 18.231 9.439 18.313 9.704 18.245 C 9.97 18.178 10.178 17.97 10.245 17.704 C 10.313 17.439 10.231 17.157 10.03 16.97 L 9.06 16 L 10.03 15.03 C 10.231 14.843 10.313 14.561 10.245 14.296 C 10.178 14.03 9.97 13.822 9.704 13.755 C 9.439 13.687 9.157 13.769 8.97 13.97 L 8 14.94 Z M 14 16.75 C 13.586 16.75 13.25 17.086 13.25 17.5 C 13.25 17.914 13.586 18.25 14 18.25 L 18 18.25 C 18.414 18.25 18.75 17.914 18.75 17.5 C 18.75 17.086 18.414 16.75 18 16.75 Z",
 	"alt-arrow-down": "M12.3698 15.835L18.7998 9.205C19.2008 8.79 18.9578 8 18.4298 8H5.56982C5.04182 8 4.79882 8.79 5.19982 9.205L11.6298 15.835C11.8428 16.055 12.1568 16.055 12.3698 15.835Z",
 	"arrow-left": "M12.7071 5.70711C13.0976 5.31658 13.0976 4.68342 12.7071 4.29289C12.3166 3.90237 11.6834 3.90237 11.2929 4.29289L4.29289 11.2929C3.90237 11.6834 3.90237 12.3166 4.29289 12.7071L11.2929 19.7071C11.6834 20.0976 12.3166 20.0976 12.7071 19.7071C13.0976 19.3166 13.0976 18.6834 12.7071 18.2929L7.41421 13H19C19.5523 13 20 12.5523 20 12C20 11.4477 19.5523 11 19 11H7.41421L12.7071 5.70711Z",
 	"arrow-left-stop": "M4 3C4 2.44772 3.55229 2 3 2C2.44772 2 2 2.44772 2 3V21C2 21.5523 2.44772 22 3 22C3.55228 22 4 21.5523 4 21V3ZM14.7071 5.70711L9.41421 11H21C21.5523 11 22 11.4477 22 12C22 12.5523 21.5523 13 21 13H9.41421L14.7071 18.2929C15.0976 18.6834 15.0976 19.3166 14.7071 19.7071C14.3166 20.0976 13.6834 20.0976 13.2929 19.7071L6.29289 12.7071C5.90237 12.3166 5.90237 11.6834 6.29289 11.2929L13.2929 4.29289C13.6834 3.90237 14.3166 3.90237 14.7071 4.29289C15.0976 4.68342 15.0976 5.31658 14.7071 5.70711Z",
@@ -153,6 +154,7 @@
 	"gas_fast": "M12 16a3 3 0 0 1-3-3c0-1.12.61-2.1 1.5-2.61l9.71-5.62l-5.53 9.58c-.5.98-1.51 1.65-2.68 1.65m0-13c1.81 0 3.5.5 4.97 1.32l-2.1 1.21C14 5.19 13 5 12 5a8 8 0 0 0-8 8c0 2.21.89 4.21 2.34 5.65h.01c.39.39.39 1.02 0 1.41c-.39.39-1.03.39-1.42.01A9.969 9.969 0 0 1 2 13A10 10 0 0 1 12 3m10 10c0 2.76-1.12 5.26-2.93 7.07c-.39.38-1.02.38-1.41-.01a.996.996 0 0 1 0-1.41A7.95 7.95 0 0 0 20 13c0-1-.19-2-.54-2.9L20.67 8C21.5 9.5 22 11.18 22 13",
 	"gas_median": "M12 1.38L9.14 12.06c-.34 1.04-.1 2.23.72 3.06a3.012 3.012 0 0 0 4.25 0c.79-.79 1.05-1.92.78-2.91m-.29-8.86l.62 2.33A7.99 7.99 0 0 1 20 13c0 2.21-.89 4.21-2.34 5.65h-.01a.996.996 0 0 0 0 1.41c.39.39 1.03.39 1.42.01A9.969 9.969 0 0 0 22 13c0-4.62-3.14-8.5-7.4-9.65m-5.2.01C5.15 4.5 2 8.4 2 13c0 2.76 1.12 5.26 2.93 7.07c.39.38 1.02.38 1.41-.01a.996.996 0 0 0 0-1.41A7.95 7.95 0 0 1 4 13c0-3.35 1.94-6.14 4.79-7.35",
 	"gas_slow": "M12 16c1.66 0 3-1.34 3-3c0-1.12-.61-2.1-1.5-2.61L3.79 4.77l5.53 9.58c.5.98 1.51 1.65 2.68 1.65m0-13c-1.81 0-3.5.5-4.97 1.32l2.1 1.21C10 5.19 11 5 12 5c4.42 0 8 3.58 8 8c0 2.21-.89 4.21-2.34 5.65h-.01a.996.996 0 0 0 0 1.41c.39.39 1.03.39 1.42.01A9.969 9.969 0 0 0 22 13c0-5.5-4.5-10-10-10M2 13c0 2.76 1.12 5.26 2.93 7.07c.39.38 1.02.38 1.41-.01a.996.996 0 0 0 0-1.41A7.95 7.95 0 0 1 4 13c0-1 .19-2 .54-2.9L3.33 8C2.5 9.5 2 11.18 2 13",
+	"slash": "M 2 12 C 2 6.477 6.477 2 12 2 C 17.523 2 22 6.477 22 12 C 22 17.523 17.523 22 12 22 C 6.477 22 2 17.523 2 12 Z M 14.018 7.364 C 14.122 7.014 13.959 6.641 13.633 6.478 C 13.307 6.315 12.911 6.411 12.694 6.704 C 12.635 6.785 12.593 6.878 12.57 6.976 L 9.981 16.636 C 9.874 17.036 10.112 17.448 10.512 17.555 C 10.912 17.662 11.324 17.424 11.431 17.024 Z",
 	"help": "M5 3h14a2 2 0 0 1 2 2v14c0 .53-.21 1.04-.59 1.41c-.37.38-.88.59-1.41.59H5c-.53 0-1.04-.21-1.41-.59C3.21 20.04 3 19.53 3 19V5c0-1.11.89-2 2-2m6 6h2V7h-2v2m3 8v-2h-1v-4h-3v2h1v2h-1v2h4Z",
 	"pause": "M16 19q-.825 0-1.412-.587T14 17V7q0-.825.588-1.412T16 5q.825 0 1.413.588T18 7v10q0 .825-.587 1.413T16 19m-8 0q-.825 0-1.412-.587T6 17V7q0-.825.588-1.412T8 5q.825 0 1.413.588T10 7v10q0 .825-.587 1.413T8 19",
 	"verified": "M 10.83 2.265 C 11.57 1.911 12.43 1.911 13.17 2.265 C 13.49 2.418 13.796 2.679 14.408 3.2 C 14.565 3.342 14.731 3.475 14.903 3.599 C 15.201 3.799 15.536 3.937 15.888 4.007 C 16.097 4.041 16.308 4.064 16.52 4.075 C 17.321 4.139 17.722 4.171 18.056 4.289 C 18.83 4.562 19.438 5.17 19.711 5.944 C 19.829 6.278 19.861 6.679 19.925 7.48 C 19.936 7.692 19.959 7.903 19.993 8.112 C 20.063 8.464 20.201 8.799 20.401 9.097 C 20.524 9.269 20.658 9.435 20.8 9.592 C 21.321 10.204 21.582 10.51 21.735 10.83 C 22.088 11.57 22.088 12.43 21.735 13.17 C 21.582 13.49 21.321 13.796 20.8 14.408 C 20.592 14.651 20.488 14.773 20.401 14.903 C 20.202 15.201 20.063 15.536 19.993 15.888 C 19.963 16.041 19.95 16.201 19.925 16.52 C 19.861 17.321 19.829 17.722 19.711 18.056 C 19.438 18.83 18.83 19.438 18.056 19.711 C 17.722 19.829 17.321 19.861 16.52 19.925 C 16.201 19.95 16.041 19.963 15.888 19.993 C 15.536 20.063 15.201 20.201 14.903 20.401 C 14.773 20.488 14.651 20.592 14.408 20.8 C 13.796 21.321 13.49 21.582 13.17 21.735 C 12.43 22.088 11.57 22.088 10.83 21.735 C 10.51 21.582 10.204 21.321 9.592 20.8 C 9.349 20.592 9.227 20.488 9.097 20.401 C 8.799 20.202 8.464 20.063 8.112 19.993 C 7.959 19.963 7.799 19.95 7.48 19.925 C 6.679 19.861 6.278 19.829 5.944 19.711 C 5.17 19.438 4.562 18.83 4.289 18.056 C 4.171 17.722 4.139 17.321 4.075 16.52 C 4.05 16.201 4.037 16.041 4.007 15.888 C 3.937 15.536 3.799 15.201 3.599 14.903 C 3.512 14.773 3.408 14.651 3.2 14.408 C 2.679 13.796 2.418 13.49 2.265 13.17 C 1.912 12.43 1.912 11.57 2.265 10.83 C 2.418 10.51 2.679 10.204 3.2 9.592 C 3.408 9.349 3.512 9.227 3.599 9.097 C 3.799 8.799 3.937 8.464 4.007 8.112 C 4.041 7.903 4.065 7.692 4.075 7.48 C 4.139 6.679 4.171 6.278 4.289 5.944 C 4.562 5.171 5.171 4.562 5.944 4.289 C 6.278 4.171 6.679 4.139 7.48 4.075 C 7.799 4.05 7.959 4.037 8.112 4.007 C 8.464 3.937 8.799 3.799 9.097 3.599 C 9.269 3.476 9.435 3.342 9.592 3.2 C 10.204 2.679 10.51 2.418 10.83 2.265 Z M 16.373 9.863 C 16.667 9.542 16.655 9.046 16.348 8.738 C 16.04 8.431 15.544 8.419 15.223 8.713 L 10.373 13.563 L 8.777 11.968 C 8.456 11.674 7.96 11.686 7.652 11.993 C 7.345 12.301 7.333 12.797 7.627 13.118 L 9.797 15.288 C 10.115 15.605 10.629 15.605 10.947 15.288 L 16.374 9.863 Z",

assets/styles/base.scss

@@ -31,8 +31,7 @@ $grayscale: (
 	--txt-white: rgba(255, 255, 255, 95%);
 
 	/* General */
-	// --brand: #18d2a5;
-	--brand: #0ade71;
+	--brand: #18d2a5;
 	--blue: #076acd;
 	--red: #eb5757;
 	--orange: #ff5a17;

components/LeftSidebar.vue

@@ -66,6 +66,10 @@ const modularLinks = reactive([
 		name: "Rollups",
 		path: "/rollups",
 		children: [
+			{
+				name: "Cost Savings",
+				path: "/calculators/savings",
+			},
 			{
 				name: "Register rollup",
 				path: "https://forms.gle/nimJyQJG4Lb4BTcG7",

components/TheFooter.vue

@@ -132,6 +132,9 @@ const handleChangeTheme = (target) => {
 							<NuxtLink to="/blobstream">
 								<Text size="13" weight="500" color="secondary">Blobstream</Text>
 							</NuxtLink>
+							<NuxtLink to="/calculators/savings">
+								<Text size="13" weight="500" color="secondary">Cost Savings</Text>
+							</NuxtLink>
 							<NuxtLink to="/gas">
 								<Text size="13" weight="500" color="secondary">Gas Tracker</Text>
 							</NuxtLink>

components/cmd/CommandMenu.vue

@@ -282,6 +282,15 @@ const rawNavigationActions = [
 			router.push("/blobstream")
 		},
 	},
+	{
+		type: "callback",
+		icon: "arrow-narrow-right",
+		title: "Go to Cost Savings Calculator",
+		runText: "Open Cost Savings",
+		callback: () => {
+			router.push("/calculators/savings")
+		},
+	},
 	{
 		type: "callback",
 		icon: "arrow-narrow-right",
@@ -925,10 +934,10 @@ const debouncedSearch = useDebounceFn(async (e) => {
 	const bookmarks = bookmarksStore.searchBookmarks(searchTerm.value)
 	const { data } = await search(searchTerm.value.trim())
 
-	data.value = [...bookmarks, ...data.value]
-
 	if (!data.value?.length) return
 
+	data.value = [...bookmarks, ...data.value]
+
 	amp.log("showAutocomplete", { count: data.value.length, firstType: data.value[0].type })
 
 	autocompleteActions.value = []
@@ -965,7 +974,8 @@ const debouncedSearch = useDebounceFn(async (e) => {
 				break
 
 			case "validator":
-				title = data.value[i].result.alias || data.value[i].result.moniker ? data.value[i].result.moniker : data.value[i].result.address
+				title =
+					data.value[i].result.alias || data.value[i].result.moniker ? data.value[i].result.moniker : data.value[i].result.address
 				routerLink = `/validator/${data.value[i].result.id}`
 				break
 
@@ -1066,11 +1076,18 @@ watch(
 				})
 				trap.activate()
 
+				if (appStore.cmdAction) {
+					const action = rawQuickCommandsActions.find((a) => a.title === appStore.cmdAction)
+					handleExecute({ id: 1, ...action })
+				}
+
 				removeOutside = useOutside(popupEl.value.wrapper, () => {
 					handleOutside()
 				})
 			})
 		} else {
+			appStore.cmdAction = null
+
 			document.removeEventListener("keydown", onKeydown)
 
 			if (trap && trap.active) trap.deactivate()

components/data/BlocksTimeline/BlocksTimelineTable.vue

@@ -212,7 +212,8 @@ watch(
 								<th><Text size="12" weight="600" color="tertiary">Proposer</Text></th>
 								<th><Text size="12" weight="600" color="tertiary">Txs</Text></th>
 								<th><Text size="12" weight="600" color="tertiary">Blobs</Text></th>
-								<th><Text size="12" weight="600" color="tertiary">Total Fees</Text></th>
+								<th><Text size="12" weight="600" color="tertiary">Size</Text></th>
+								<th><Text size="12" weight="600" color="tertiary">Fees</Text></th>
 							</tr>
 						</thead>
 
@@ -294,9 +295,16 @@ watch(
 										</Text>
 									</Flex>
 								</td>
+								<td>
+									<Flex align="center">
+										<Text size="13" weight="600" color="primary">
+											{{ formatBytes(block.stats.bytes_in_block, 0) }}
+										</Text>
+									</Flex>
+								</td>
 								<td>
 									<Flex align="center" gap="4">
-										<AmountInCurrency :amount="{ value: block.stats.fee, decimal: 6 }" :styles="{ amount: { size: '13' } }" />
+										<AmountInCurrency :amount="{ value: block.stats.fee, decimal: 2 }" :styles="{ amount: { size: '13' } }" />
 									</Flex>
 								</td>
 							</tr>
@@ -495,6 +503,10 @@ watch(
 							<Text size="12" weight="600" color="tertiary"> Events</Text>
 							<Text size="12" weight="600" color="secondary"> {{ preview.block.stats.events_count }} </Text>
 						</Flex>
+						<Flex align="center" justify="between">
+							<Text size="12" weight="600" color="tertiary"> Block Size </Text>
+							<Text size="12" weight="600" color="secondary"> {{ formatBytes(preview.block.stats.bytes_in_block) }} </Text>
+						</Flex>
 						<Flex align="center" justify="between">
 							<Text size="12" weight="600" color="tertiary"> Blobs </Text>
 							<Text size="12" weight="600" color="secondary"> {{ formatBytes(preview.block.stats.blobs_size) }} </Text>
@@ -566,6 +578,7 @@ watch(
 .table {
 	border-radius: 4px 4px 4px 8px;
 	background: var(--card-background);
+	max-width: 604px;
 
 	& table {
 		width: 100%;
@@ -657,6 +670,8 @@ watch(
 	}
 
 	.main {
+		max-height: 690px;
+		overflow-y: auto;
 		flex: 1;
 
 		border-bottom: 1px solid var(--op-5);

components/modules/namespace/tables/BlobsTable.vue

@@ -186,14 +186,6 @@ const handleViewBlob = (blob) => {
 		&:first-child {
 			padding-left: 16px;
 		}
-
-		& > a {
-			display: flex;
-
-			min-height: 40px;
-
-			padding-right: 24px;
-		}
 	}
 }
 

components/modules/navigation/NavLink.vue

@@ -8,7 +8,7 @@ const props = defineProps({
 	link: Object,
 })
 
-const isExpanded = ref(false)
+const isExpanded = ref(props.link.children?.some((l) => l.path === route.path) ? true : (props.link.name === 'Rollups' ? true : false))
 
 const handleClick = () => {
 	emit("onClose")

components/modules/rollup/RollupCharts.vue

@@ -15,8 +15,8 @@ import { abbreviate, formatBytes, tia } from "@/services/utils"
 import { fetchRollupSeries } from "@/services/api/stats"
 
 const props = defineProps({
-	id: {
-		type: String,
+	rollup: {
+		type: Object,
 		required: true,
 	},
 })
@@ -190,7 +190,7 @@ const getSizeSeries = async () => {
 	sizeSeries.value = []
 
 	const sizeSeriesRawData = await fetchRollupSeries({
-		id: props.id,
+		id: props.rollup.id,
 		name: "size",
 		timeframe: selectedPeriod.value.timeframe,
 		from: parseInt(
@@ -223,7 +223,7 @@ const getPfbSeries = async () => {
 	pfbSeries.value = []
 
 	const blobsSeriesRawData = await fetchRollupSeries({
-		id: props.id,
+		id: props.rollup.id,
 		name: "blobs_count",
 		timeframe: selectedPeriod.value.timeframe,
 		from: parseInt(
@@ -255,7 +255,7 @@ const getFeeSeries = async () => {
 	feeSeries.value = []
 
 	const feeSeriesRawData = await fetchRollupSeries({
-		id: props.id,
+		id: props.rollup.id,
 		name: "fee",
 		timeframe: selectedPeriod.value.timeframe,
 		from: parseInt(
@@ -628,7 +628,6 @@ onBeforeUnmount(() => {
 						<Flex ref="feeSeriesChartEl" :class="$style.chart" />
 					</Flex>
 				</Flex>
-				
 			</Flex>
 		</Flex>
 	</Flex>