Merge branch 'develop' of github.com:iotaledger/iota-core into feat/r…

…eactive-chainmanager
iotaledger · Nov 30, 2023 · 146feba · 146feba
2 parents 407c833 + aefe705
commit 146feba
Show file tree

Hide file tree

Showing 118 changed files with 4,407 additions and 4,270 deletions.
diff --git a/components/dashboard/explorer_routes.go b/components/dashboard/explorer_routes.go
@@ -46,10 +46,6 @@ func setupExplorerRoutes(routeGroup *echo.Group) {
 	routeGroup.GET("/output/:"+api.ParameterOutputID, getOutput)
 	// routeGroup.GET("/output/:outputID/metadata", ledgerstateAPI.GetOutputMetadata)
 	// routeGroup.GET("/output/:outputID/consumers", ledgerstateAPI.GetOutputConsumers)
-	// routeGroup.GET("/conflict/:conflictID", ledgerstateAPI.GetConflict)
-	// routeGroup.GET("/conflict/:conflictID/children", ledgerstateAPI.GetConflictChildren)
-	// routeGroup.GET("/conflict/:conflictID/conflicts", ledgerstateAPI.GetConflictConflicts)
-	// routeGroup.GET("/conflict/:conflictID/voters", ledgerstateAPI.GetConflictVoters)
 	routeGroup.GET("/slot/commitment/:"+api.ParameterCommitmentID, getSlotDetailsByID)
 
 	routeGroup.GET("/search/:search", func(c echo.Context) error {
@@ -171,8 +167,8 @@ func createExplorerBlock(block *model.Block, cachedBlock *blocks.Block, metadata
 		t.LikedInsteadChildren = lo.Map(cachedBlock.ShallowLikeChildren(), func(childBlock *blocks.Block) string {
 			return childBlock.ID().ToHex()
 		})
-		t.ConflictIDs = lo.Map(cachedBlock.ConflictIDs().ToSlice(), func(conflictID iotago.TransactionID) string {
-			return conflictID.ToHex()
+		t.SpendIDs = lo.Map(cachedBlock.SpenderIDs().ToSlice(), func(spendID iotago.TransactionID) string {
+			return spendID.ToHex()
 		})
 	} else {
 		switch metadata.BlockState {
@@ -232,7 +228,7 @@ func getTransactionMetadata(c echo.Context) error {
 		return ierrors.Errorf("tx metadata not found: %s", txID.ToHex())
 	}
 
-	conflicts, _ := deps.Protocol.Engines.Main.Get().Ledger.ConflictDAG().ConflictingConflicts(txID)
+	conflicts, _ := deps.Protocol.Engines.Main.Get().Ledger.SpendDAG().ConflictingSpenders(txID)
 
 	return httpserver.JSONResponse(c, http.StatusOK, NewTransactionMetadata(txMetadata, conflicts))
 }

diff --git a/components/dashboard/frontend/build/app.7343ba1c945034668914.js b/components/dashboard/frontend/build/app.7343ba1c945034668914.js
diff --git a/components/dashboard/frontend/build/app.7343ba1c945034668914.js.map b/components/dashboard/frontend/build/app.7343ba1c945034668914.js.map
diff --git a/components/dashboard/frontend/build/app.991aa07a823b10139416.js b/components/dashboard/frontend/build/app.991aa07a823b10139416.js
diff --git a/components/dashboard/frontend/build/app.991aa07a823b10139416.js.map b/components/dashboard/frontend/build/app.991aa07a823b10139416.js.map
diff --git a/components/dashboard/frontend/build/index.html b/components/dashboard/frontend/build/index.html
@@ -1 +1 @@
-<!doctype html> <html> <head> <meta charset="utf-8"> <title>iota-core Dashboard</title> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous"/> </head> <body> <div id="root"></div> <script type="text/javascript" src="/app/a1e7322de4eb5154c0c3.js"></script><script type="text/javascript" src="/app/vendor.146c9687b00ba21e0070.js"></script><script type="text/javascript" src="/app/app.991aa07a823b10139416.js"></script></body> </html> 
+<!doctype html> <html> <head> <meta charset="utf-8"> <title>iota-core Dashboard</title> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous"/> </head> <body> <div id="root"></div> <script type="text/javascript" src="/app/a1e7322de4eb5154c0c3.js"></script><script type="text/javascript" src="/app/vendor.673a0c611e9ac940cbe9.js"></script><script type="text/javascript" src="/app/app.7343ba1c945034668914.js"></script></body> </html> 
diff --git a/components/dashboard/frontend/build/vendor.146c9687b00ba21e0070.js.map b/components/dashboard/frontend/build/vendor.146c9687b00ba21e0070.js.map
diff --git a/...tend/build/vendor.146c9687b00ba21e0070.js → ...tend/build/vendor.673a0c611e9ac940cbe9.js b/...tend/build/vendor.146c9687b00ba21e0070.js → ...tend/build/vendor.673a0c611e9ac940cbe9.js
diff --git a/components/dashboard/frontend/build/vendor.673a0c611e9ac940cbe9.js.map b/components/dashboard/frontend/build/vendor.673a0c611e9ac940cbe9.js.map
diff --git a/components/dashboard/frontend/src/app/components/Explorer.tsx b/components/dashboard/frontend/src/app/components/Explorer.tsx
@@ -8,7 +8,6 @@ import {ExplorerSearchbar} from "./ExplorerSearchbar";
 import {ExplorerLiveFeed} from "./ExplorerLiveFeed";
 import {ExplorerTransactionSearchbar} from "./ExplorerTransactionSearchbar";
 import {ExplorerOutputSearchbar} from "./ExplorerOutputSearchbar";
-import {ExplorerConflictSearchbar} from "./ExplorerConflictSearchbar";
 
 interface Props {
     nodeStore?: NodeStore;
@@ -24,7 +23,7 @@ export class Explorer extends React.Component<Props, any> {
                 <Row className={"mb-3"}>
                     <Col>
                         <p>
-                            Search for addresses, blocks, transactions, outputs and conflicts.
+                            Search for addresses, blocks, transactions, outputs and spends.
                         </p>
                     </Col>
                 </Row>
@@ -40,9 +39,6 @@ export class Explorer extends React.Component<Props, any> {
                     <Col>
                         <ExplorerOutputSearchbar/>
                     </Col>
-                    <Col>
-                        <ExplorerConflictSearchbar/>
-                    </Col>
                 </Row>
                 <ExplorerLiveFeed/>
                 <small>

diff --git a/components/dashboard/frontend/src/app/components/ExplorerAddressResult.tsx b/components/dashboard/frontend/src/app/components/ExplorerAddressResult.tsx
@@ -8,11 +8,9 @@ import {ExplorerStore, ExplorerOutput, OutputMetadata} from "../stores/ExplorerS
 import Spinner from "react-bootstrap/Spinner";
 import ListGroup from "react-bootstrap/ListGroup";
 import Alert from "react-bootstrap/Alert";
-import {Link} from 'react-router-dom';
 import {displayManaUnit} from "../utils";
 import {OutputType, outputToComponent, outputTypeToName} from "../utils/output";
 import {Button, ListGroupItem} from "react-bootstrap";
-import {resolveBase58ConflictID} from "../utils/conflict";
 
 interface Props {
     nodeStore?: NodeStore;
@@ -222,15 +220,13 @@ class OutputMeta extends React.Component<omProps, any> {
         let pendingMana = this.props.pendingMana;
         return (
             <ListGroup>
-                ConflictIDs: 
+                SpendIDs: 
                 <ListGroup>
                     {
-                        metadata.conflictIDs.map((value, index) => {
+                        metadata.spendIDs.map((value, index) => {
                             return (
-                                <ListGroup.Item key={"ConflictID" + index + 1} className="text-break">
-                                    <Link to={`/explorer/conflict/${value}`}>
-                                        {resolveBase58ConflictID(value)}
-                                    </Link>
+                                <ListGroup.Item key={"SpendID" + index + 1} className="text-break">
+                                    {value}
                                 </ListGroup.Item>
                             )
                         })

diff --git a/components/dashboard/frontend/src/app/components/ExplorerBlockQueryResult.tsx b/components/dashboard/frontend/src/app/components/ExplorerBlockQueryResult.tsx
@@ -13,7 +13,6 @@ import { Link } from 'react-router-dom';
 import { BasicPayload } from './BasicPayload'
 import { TransactionPayload } from './TransactionPayload'
 import { getPayloadType, PayloadType } from '../misc/Payload'
-import { resolveBase58ConflictID } from "../utils/conflict";
 import { FaucetPayload } from './FaucetPayload';
 import { TaggedDataPayload } from './TaggedDataPayload';
 
@@ -124,50 +123,14 @@ export class ExplorerBlockQueryResult extends React.Component<Props, any> {
                                         Sequence Number: {blk.sequenceNumber}
                                     </ListGroup.Item>
                                     <ListGroup.Item>
-                                        ConflictIDs:
+                                        SpendIDs:
                                         <ListGroup>
                                             {
-                                                blk.conflictIDs.map((value, index) => {
+                                                blk.spendIDs.map((value, index) => {
                                                     return (
-                                                        <ListGroup.Item key={"ConflictID" + index + 1}
+                                                        <ListGroup.Item key={"SpendID" + index + 1}
                                                             className="text-break">
-                                                            <Link to={`/explorer/conflict/${value}`}>
-                                                                {resolveBase58ConflictID(value)}
-                                                            </Link>
-                                                        </ListGroup.Item>
-                                                    )
-                                                })
-                                            }
-                                        </ListGroup>
-                                    </ListGroup.Item>
-                                    <ListGroup.Item>
-                                        AddedConflictIDs:
-                                        <ListGroup>
-                                            {
-                                                blk.addedConflictIDs.map((value, index) => {
-                                                    return (
-                                                        <ListGroup.Item key={"AddedConflictID" + index + 1}
-                                                            className="text-break">
-                                                            <Link to={`/explorer/conflict/${value}`}>
-                                                                {resolveBase58ConflictID(value)}
-                                                            </Link>
-                                                        </ListGroup.Item>
-                                                    )
-                                                })
-                                            }
-                                        </ListGroup>
-                                    </ListGroup.Item>
-                                    <ListGroup.Item>
-                                        SubtractedConflictIDs:
-                                        <ListGroup>
-                                            {
-                                                blk.subtractedConflictIDs.map((value, index) => {
-                                                    return (
-                                                        <ListGroup.Item key={"SubtractedConflictID" + index + 1}
-                                                            className="text-break">
-                                                            <Link to={`/explorer/conflict/${value}`}>
-                                                                {resolveBase58ConflictID(value)}
-                                                            </Link>
+                                                                {value}
                                                         </ListGroup.Item>
                                                     )
                                                 })

diff --git a/components/dashboard/frontend/src/app/components/ExplorerConflictQueryResult.tsx b/components/dashboard/frontend/src/app/components/ExplorerConflictQueryResult.tsx
diff --git a/components/dashboard/frontend/src/app/components/ExplorerConflictSearchbar.tsx b/components/dashboard/frontend/src/app/components/ExplorerConflictSearchbar.tsx
diff --git a/components/dashboard/frontend/src/app/components/ExplorerOutputQueryResult.tsx b/components/dashboard/frontend/src/app/components/ExplorerOutputQueryResult.tsx
@@ -5,9 +5,7 @@ import NodeStore from "../stores/NodeStore";
 import { inject, observer } from "mobx-react";
 import ExplorerStore from "../stores/ExplorerStore";
 import Badge from "react-bootstrap/Badge";
-import {Link} from 'react-router-dom';
 import {displayManaUnit} from "../utils";
-import {resolveBase58ConflictID} from "../utils/conflict";
 import {outputToComponent} from "../utils/output";
 import {resolveConfirmationState} from "../utils/confirmation_state";
 
@@ -76,15 +74,13 @@ export class ExplorerOutputQueryResult extends React.Component<Props, any> {
                 {outputMetadata && <div className={"mb-2"}>
                     <ListGroup>
                         <ListGroup.Item>Transaction ID: <a href={`/explorer/transaction/${outputMetadata.outputID.transactionID}`}>{outputMetadata.outputID.transactionID}</a> </ListGroup.Item>
-                        ConflictIDs: 
+                        SpendIDs: 
                         <ListGroup>
                             {
-                                outputMetadata.conflictIDs.map((value, index) => {
+                                outputMetadata.spendIDs.map((value, index) => {
                                     return (
-                                        <ListGroup.Item key={"ConflictID" + index + 1} className="text-break">
-                                            <Link to={`/explorer/conflict/${value}`}>
-                                                {resolveBase58ConflictID(value)}
-                                            </Link>
+                                        <ListGroup.Item key={"SpendID" + index + 1} className="text-break">
+                                                {value}
                                         </ListGroup.Item>
                                     )
                                 })

diff --git a/components/dashboard/frontend/src/app/components/ExplorerTransactionMetadata.tsx b/components/dashboard/frontend/src/app/components/ExplorerTransactionMetadata.tsx
@@ -4,7 +4,6 @@ import NodeStore from "../stores/NodeStore";
 import { inject, observer } from "mobx-react";
 import ExplorerStore from "../stores/ExplorerStore";
 import ListGroup from "react-bootstrap/ListGroup";
-// import {resolveBase58ConflictID} from "../utils/conflict";
 
 interface Props {
     nodeStore?: NodeStore;
@@ -40,12 +39,12 @@ export class ExplorerTransactionMetadata extends React.Component<Props, any> {
                 <h4>Metadata</h4>
                 {txMetadata && <ListGroup>
                     <ListGroup.Item>
-                        ConflictIDs: 
+                        SpendIDs: 
                         <ListGroup>
                             { 
-                                txMetadata.conflictIDs && txMetadata.conflictIDs.map((value, index) => {
+                                txMetadata.spendIDs && txMetadata.spendIDs.map((value, index) => {
                                     return (
-                                        <ListGroup.Item key={"ConflictID" + index + 1} className="text-break">
+                                        <ListGroup.Item key={"SpendID" + index + 1} className="text-break">
                                             <a href={`/explorer/transaction/${value}`}>{value}</a>
                                         </ListGroup.Item>
                                     )
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html> <html> <head> <meta charset="utf-8"> <title>iota-core Dashboard</title> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous"/> </head> <body> <div id="root"></div> <script type="text/javascript" src="/app/a1e7322de4eb5154c0c3.js"></script><script type="text/javascript" src="/app/vendor.146c9687b00ba21e0070.js"></script><script type="text/javascript" src="/app/app.991aa07a823b10139416.js"></script></body> </html>
		<!doctype html> <html> <head> <meta charset="utf-8"> <title>iota-core Dashboard</title> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous"/> </head> <body> <div id="root"></div> <script type="text/javascript" src="/app/a1e7322de4eb5154c0c3.js"></script><script type="text/javascript" src="/app/vendor.673a0c611e9ac940cbe9.js"></script><script type="text/javascript" src="/app/app.7343ba1c945034668914.js"></script></body> </html>