Merge pull request #218 from shutter-network/staging

Staging
shutter-network · Nov 8, 2024 · d169e18 · d169e18
2 parents c1e10b5 + f74119d
commit d169e18
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 16 deletions.
diff --git a/docker/.env.example b/docker/.env.example
@@ -17,4 +17,5 @@ ERPC_DB_SSL_MODE=
 GENESIS_TIMESTAMP=
 SLOT_DURATION=
 SLOTS_PER_EPOCH=
-TOTAL_GNOSIS_VALIDATORS=
+TOTAL_GNOSIS_VALIDATORS=
+LOKI_URL=https://<user_id>:<password>@logs.metrics.shutter.network/insert/loki/api/v1/push
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -10,6 +10,12 @@ services:
         condition: service_healthy
     ports:
       - "4000:4000"
+    logging:
+      driver: loki
+      options:
+        loki-url: ${LOKI_URL}
+        loki-external-labels: |
+          job=observer
     environment:
         DB_HOST: db
         DB_PORT: 5432
@@ -46,6 +52,12 @@ services:
     restart: unless-stopped
     depends_on: 
       - observer
+    logging:
+      driver: loki
+      options:
+        loki-url: ${LOKI_URL}
+        loki-external-labels: |
+          job=explorer-backend
     environment:
       SERVER_PORT: 5000
       OBSERVER_DB_HOST: db

diff --git a/frontend/cypress/components/SearchBar.cy.tsx b/frontend/cypress/components/SearchBar.cy.tsx
@@ -23,7 +23,7 @@ describe('<SearchBar /> and <Transaction /> data display test', () => {
                                     path="/"
                                     element={
                                         <SearchBar
-                                            placeholder="Search by Txn Hash"
+                                            placeholder="Search by transaction hash"
                                             value={searchQuery}
                                             onChange={handleSearchChange}
                                         />
@@ -49,7 +49,7 @@ describe('<SearchBar /> and <Transaction /> data display test', () => {
 
         mount(<TestComponent />);
 
-        cy.get('input[placeholder="Search by Txn Hash"]', { timeout: 10000 })
+        cy.get('input[placeholder="Search by transaction hash"]', { timeout: 10000 })
             .should('exist')
             .should('be.visible')
             .type(`${txHash}{enter}`, { force: true });

diff --git a/frontend/src/components/ResponsiveLayout.tsx b/frontend/src/components/ResponsiveLayout.tsx
@@ -32,7 +32,7 @@ const ResponsiveLayout: FC<ResponsiveLayoutProps> = ({ children }) => {
                 <Box component="main" sx={mainStyles}>
                     <Box sx={{ display: 'flex', justifyContent: 'flex-start', alignItems: 'center', mb: 2, padding: 0 }}>
                         <SearchBar
-                            placeholder="Search by Txn Hash"
+                            placeholder="Search by transaction hash"
                             value={searchQuery}
                             onChange={handleSearchChange}
                         />

diff --git a/frontend/src/pages/Transaction.tsx b/frontend/src/pages/Transaction.tsx
@@ -37,7 +37,7 @@ const Transaction: FC = () => {
 
         if (updatedData) {
             setTransaction(updatedData.message as TransactionDetails);
-            if (transaction? finalisedStatuses.includes(transaction.TxStatus): false){
+            if (transaction ? finalisedStatuses.includes(transaction.TxStatus) : false) {
                 setStopPolling(true)
             }
         } else {
@@ -149,7 +149,7 @@ const Transaction: FC = () => {
                             <Grid size={{ xs: 'auto', sm: 4 }}>
                                 <Box display="flex" alignItems="center" gap={1}>
                                     <Typography variant="body1" fontWeight="bold" className="card-label" textAlign="left">Estimated Inclusion Time</Typography>
-                                    <Tooltip title="Estimated time in which transaction should be included">
+                                    <Tooltip title="Estimated timestamp at which the transaction should be included">
                                         <InfoIcon />
                                     </Tooltip>
                                 </Box>
@@ -161,7 +161,7 @@ const Transaction: FC = () => {
                             <Grid size={{ xs: 'auto', sm: 4 }}>
                                 <Box display="flex" alignItems="center" gap={1}>
                                     <Typography variant="body1" fontWeight="bold" className="card-label" textAlign="left">Estimated Inclusion Delay</Typography>
-                                    <Tooltip title="Time it might take for tx to be included">
+                                    <Tooltip title="Estimated delay between submission time and inclusion time">
                                         <InfoIcon />
                                     </Tooltip>
                                 </Box>
@@ -182,7 +182,7 @@ const Transaction: FC = () => {
                             <Grid size={{ xs: 'auto', sm: 4 }}>
                                 <Box display="flex" alignItems="center" gap={1}>
                                     <Typography variant="body1" fontWeight="bold" className="card-label" textAlign="left">Effective Inclusion Time</Typography>
-                                    <Tooltip title="Time in which the transaction was included">
+                                    <Tooltip title="Timestamp at which the transaction was included">
                                         <InfoIcon />
                                     </Tooltip>
                                 </Box>
@@ -194,7 +194,7 @@ const Transaction: FC = () => {
                             <Grid size={{ xs: 'auto', sm: 4 }}>
                                 <Box display="flex" alignItems="center" gap={1}>
                                     <Typography variant="body1" fontWeight="bold" className="card-label" textAlign="left">Effective Inclusion Delay</Typography>
-                                    <Tooltip title="Time taken for tx to be included">
+                                    <Tooltip title="Delay between submission time and inclusion time">
                                         <InfoIcon />
                                     </Tooltip>
                                 </Box>
@@ -216,7 +216,7 @@ const Transaction: FC = () => {
                     <Grid container spacing={1}>
                         <Grid>
                             <Typography variant="body1" className={`tx-status status-${transaction.TxStatus.replace(/\s+/g, "-")}`}>
-                            {transaction.TxStatus === 'Not included' ? 'INCLUSION TIMEOUT EXPIRED' : transaction.TxStatus.toUpperCase()}
+                                {transaction.TxStatus === 'Not included' ? 'INCLUSION TIMEOUT EXPIRED' : transaction.TxStatus.toUpperCase()}
                             </Typography>
                         </Grid>
                         {transaction.TxStatus === 'Not included' && (
@@ -225,14 +225,14 @@ const Transaction: FC = () => {
                                     (Please check for inclusion directly on the Gnosis Explorer)
                                 </Typography>
                             </Grid>
-                            <Grid>
-                                <Link target="_blank" href={`${explorerUrl}/tx/${transaction.UserTxHash}`}>
-                                    <LinkIcon color='primary'/>
-                                </Link>
-                            </Grid> 
+                                <Grid>
+                                    <Link target="_blank" href={`${explorerUrl}/tx/${transaction.UserTxHash}`}>
+                                        <LinkIcon color='primary' />
+                                    </Link>
+                                </Grid>
                             </>
                         )}
-                        </Grid>
+                    </Grid>
 
                     <Grid size={{ lg: 12 }} sx={{ display: { xs: 'none', sm: 'none', md: 'none', lg: 'block' }, }}>
                         <Divider></Divider>