From 88b99b03b5a0c8599c171a6e1d56ac5c8be5688c Mon Sep 17 00:00:00 2001 From: benthecarman Date: Fri, 25 Jun 2021 09:53:01 -0500 Subject: [PATCH] Add view on oracle explorer button (#3328) * Add view on oracle explorer button * Fix compile * Fix docs --- .../commons/jsonmodels}/ExplorerEnv.scala | 2 +- .../org/bitcoins/gui/dlc/DLCTableView.scala | 16 +++++++++++++++- .../oracle-explorer-client.md | 3 +-- .../explorer/client/SbExplorerClient.scala | 2 +- .../explorer/client/SbExplorerClientTest.scala | 2 +- .../bitcoins/explorer/env/ExplorerEnvTest.scala | 3 ++- 6 files changed, 21 insertions(+), 7 deletions(-) rename {oracle-explorer-client/src/main/scala/org/bitcoins/explorer/env => app-commons/src/main/scala/org/bitcoins/commons/jsonmodels}/ExplorerEnv.scala (96%) diff --git a/oracle-explorer-client/src/main/scala/org/bitcoins/explorer/env/ExplorerEnv.scala b/app-commons/src/main/scala/org/bitcoins/commons/jsonmodels/ExplorerEnv.scala similarity index 96% rename from oracle-explorer-client/src/main/scala/org/bitcoins/explorer/env/ExplorerEnv.scala rename to app-commons/src/main/scala/org/bitcoins/commons/jsonmodels/ExplorerEnv.scala index 1de3e0bc87..94b81c837a 100644 --- a/oracle-explorer-client/src/main/scala/org/bitcoins/explorer/env/ExplorerEnv.scala +++ b/app-commons/src/main/scala/org/bitcoins/commons/jsonmodels/ExplorerEnv.scala @@ -1,4 +1,4 @@ -package org.bitcoins.explorer.env +package org.bitcoins.commons.jsonmodels import org.bitcoins.crypto.StringFactory diff --git a/app/gui/src/main/scala/org/bitcoins/gui/dlc/DLCTableView.scala b/app/gui/src/main/scala/org/bitcoins/gui/dlc/DLCTableView.scala index de50b56a86..9656fceb71 100644 --- a/app/gui/src/main/scala/org/bitcoins/gui/dlc/DLCTableView.scala +++ b/app/gui/src/main/scala/org/bitcoins/gui/dlc/DLCTableView.scala @@ -1,8 +1,10 @@ package org.bitcoins.gui.dlc +import org.bitcoins.commons.jsonmodels.ExplorerEnv import org.bitcoins.core.dlc.accounting.RateOfReturnUtil import org.bitcoins.core.protocol.dlc.models.DLCStatus._ import org.bitcoins.core.protocol.dlc.models._ +import org.bitcoins.gui.GUI import org.bitcoins.gui.util.GUIUtil import scalafx.beans.property.StringProperty import scalafx.geometry.Insets @@ -133,6 +135,18 @@ class DLCTableView(model: DLCPaneModel) { } } + val viewOnExplorer: MenuItem = new MenuItem("View on Oracle Explorer") { + onAction = _ => { + val status = selectionModel.value.getSelectedItem + val primaryOracle = + status.oracleInfo.singleOracleInfos.head.announcement + val baseUrl = ExplorerEnv.Production.siteUrl + val url = + s"${baseUrl}announcement/${primaryOracle.sha256.hex}" + GUI.hostServices.showDocument(url) + } + } + val copyIdItem: MenuItem = new MenuItem("Copy Contract Id") { onAction = _ => { val dlc = selectionModel.value.getSelectedItem @@ -154,7 +168,7 @@ class DLCTableView(model: DLCPaneModel) { } contextMenu = new ContextMenu() { - items ++= Vector(infoItem, copyIdItem, cancelDLCItem) + items ++= Vector(infoItem, viewOnExplorer, copyIdItem, cancelDLCItem) } } } diff --git a/docs/oracle-explorer-client/oracle-explorer-client.md b/docs/oracle-explorer-client/oracle-explorer-client.md index 04c1c065f1..9d2b8a56ab 100644 --- a/docs/oracle-explorer-client/oracle-explorer-client.md +++ b/docs/oracle-explorer-client/oracle-explorer-client.md @@ -21,7 +21,7 @@ while the other references the [test environment](https://test.oracle.suredbits. ```scala mdoc:invisible import akka.actor.ActorSystem import org.bitcoins.explorer.client._ -import org.bitcoins.explorer.env._ +import org.bitcoins.commons.jsonmodels._ import org.bitcoins.explorer.model._ import org.bitcoins.crypto.Sha256Digest import org.bitcoins.core.protocol.tlv.{OracleAnnouncementV0TLV,OracleAttestmentV0TLV} @@ -71,4 +71,3 @@ val sbAttestations = CreateAttestations(announcementHash, attestations) val createdAttestationsF = explorerClient.createAttestations(sbAttestations) ``` - diff --git a/oracle-explorer-client/src/main/scala/org/bitcoins/explorer/client/SbExplorerClient.scala b/oracle-explorer-client/src/main/scala/org/bitcoins/explorer/client/SbExplorerClient.scala index 4efbc3c24a..470f5a2ff6 100644 --- a/oracle-explorer-client/src/main/scala/org/bitcoins/explorer/client/SbExplorerClient.scala +++ b/oracle-explorer-client/src/main/scala/org/bitcoins/explorer/client/SbExplorerClient.scala @@ -4,10 +4,10 @@ import akka.actor.ActorSystem import akka.http.scaladsl.model._ import akka.http.scaladsl.{Http, HttpExt} import akka.util.ByteString +import org.bitcoins.commons.jsonmodels.ExplorerEnv import org.bitcoins.core.protocol.tlv.OracleAnnouncementTLV import org.bitcoins.core.util.FutureUtil import org.bitcoins.crypto.{SchnorrPublicKey, Sha256Digest} -import org.bitcoins.explorer.env.ExplorerEnv import org.bitcoins.explorer.model.{ CreateAnnouncementExplorer, CreateAttestations, diff --git a/oracle-explorer-client/src/test/scala/org/bitcoins/explorer/client/SbExplorerClientTest.scala b/oracle-explorer-client/src/test/scala/org/bitcoins/explorer/client/SbExplorerClientTest.scala index 4f8235249a..17cc4abb0a 100644 --- a/oracle-explorer-client/src/test/scala/org/bitcoins/explorer/client/SbExplorerClientTest.scala +++ b/oracle-explorer-client/src/test/scala/org/bitcoins/explorer/client/SbExplorerClientTest.scala @@ -1,11 +1,11 @@ package org.bitcoins.explorer.client +import org.bitcoins.commons.jsonmodels.ExplorerEnv import org.bitcoins.core.protocol.tlv.{ OracleAnnouncementV0TLV, OracleAttestmentV0TLV } import org.bitcoins.crypto.Sha256Digest -import org.bitcoins.explorer.env.ExplorerEnv import org.bitcoins.explorer.model.{ CreateAnnouncementExplorer, CreateAttestations, diff --git a/oracle-explorer-client/src/test/scala/org/bitcoins/explorer/env/ExplorerEnvTest.scala b/oracle-explorer-client/src/test/scala/org/bitcoins/explorer/env/ExplorerEnvTest.scala index 94c108fd86..013bd6a43d 100644 --- a/oracle-explorer-client/src/test/scala/org/bitcoins/explorer/env/ExplorerEnvTest.scala +++ b/oracle-explorer-client/src/test/scala/org/bitcoins/explorer/env/ExplorerEnvTest.scala @@ -1,6 +1,7 @@ package org.bitcoins.explorer.env -import org.bitcoins.explorer.env.ExplorerEnv._ +import org.bitcoins.commons.jsonmodels.ExplorerEnv._ +import org.bitcoins.commons.jsonmodels.ExplorerEnv import org.bitcoins.testkitcore.util.BitcoinSUnitTest class ExplorerEnvTest extends BitcoinSUnitTest {