TSDK-776 Fix redemption problem (#7)

* TSDK-776 Fix redemption problem * TSDK-776 Change port to 4000 * TSDK-776 Update brambl-cli version * TSDK-776 Fix port * TSDK-776 Fix port (bis) * TSDK-776 Fix port (bis bis) * TSDK-776 Remove extra logs
Topl · Apr 9, 2024 · 332a9cc · 332a9cc
1 parent 2ad0c11
commit 332a9cc
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 26 deletions.
diff --git a/.github/workflows/sbt_checkPR.yml b/.github/workflows/sbt_checkPR.yml
@@ -70,7 +70,7 @@ jobs:
         image: ghcr.io/topl/topl-btc-bridge:latest
         #
         ports:
-          - 3000:3000
+          - 4000:4000
         options: --name topl_bridge
         volumes:
           - ${{ github.workspace }}/data:/data

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,19 @@
+
+
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased] - 2023-mm-dd (this date should be changed on release)
+
+### Added
+
+- Minting status is now displayed in the UI.
+
+### Changed
+
+- Default port is now 4000.
+- `brambl-cli` version (for IT) is now 2.0.0-beta3.
diff --git a/bridge-ui/src/Frame.tsx b/bridge-ui/src/Frame.tsx
@@ -18,7 +18,7 @@ interface MintingStatusResponse {
   mintingStatus: string;
   address: string;
   bridgePKey: string;
-  redeemTemplate: string;
+  redeemScript: string;
 }
 
 async function checkMintingStatus(mintingStatusRequest: MintingStatusRequest): Promise<MintingStatusResponse | ErrorResponse> {
@@ -61,7 +61,7 @@ function Frame() {
             updateStatus(sessionId);
           }, 5000);
         } else {
-          mintedBTC(setSession, session, currentStatus.address, currentStatus.bridgePKey, currentStatus.redeemTemplate);
+          mintedBTC(setSession, session, currentStatus.address, currentStatus.bridgePKey, currentStatus.redeemScript);
         }
       }
     } else {

diff --git a/bridge-ui/src/views/WaitingForMint.tsx b/bridge-ui/src/views/WaitingForMint.tsx
@@ -14,7 +14,7 @@ function WaitingForMint(session: SessionInformation) {
     width: '75%'
   };
 
-  const waitingView = (mintingStatus: PeginUIState, redeemAddress: string, redeemTemplate: string) => {
+  const waitingView = (mintingStatus: PeginUIState, redeemAddress: string, bridgePKey: string, redeemTemplate: string) => {
     if (mintingStatus === PeginUIState.MintingTBTC) {
       return (
         <>
@@ -72,14 +72,18 @@ function WaitingForMint(session: SessionInformation) {
                   <div className="mb-3">
                     <div className="d-flex align-items-center">
                       <strong role="status">Tokens minted sucessfully</strong>
-                      <div className="input-group mb-3">
-                        <span className="input-group-text" id="basic-addon1">Redeem address</span>
-                        <input value={redeemAddress} type="text" className="form-control" aria-label="Redeem address" aria-describedby="basic-addon1" />
-                      </div>
-                      <div className="input-group mb-3">
-                        <span className="input-group-text" id="basic-addon1">Redeem template</span>
-                        <input value={redeemTemplate} type="text" className="form-control" aria-label="Redeem template" aria-describedby="basic-addon1" />
-                      </div>
+                    </div>
+                    <div className="input-group mb-3">
+                      <span className="input-group-text" id="basic-addon1">Redeem address</span>
+                      <input disabled value={redeemAddress} type="text" className="form-control" aria-label="Redeem address" aria-describedby="basic-addon1" />
+                    </div>
+                    <div className="input-group mb-3">
+                      <span className="input-group-text" id="basic-addon1">Bridge Key</span>
+                      <input disabled value={bridgePKey} type="text" className="form-control" aria-label="Redeem template" aria-describedby="basic-addon1" />
+                    </div>
+                    <div className="input-group mb-3">
+                      <span className="input-group-text" id="basic-addon1">Redeem template</span>
+                      <input disabled value={redeemTemplate} type="text" className="form-control" aria-label="Redeem template" aria-describedby="basic-addon1" />
                     </div>
                   </div>
                 </div>
@@ -94,7 +98,7 @@ function WaitingForMint(session: SessionInformation) {
 
   return (
     <>
-      {waitingView(session.currentState, session.redeemAddress, session.redeemTemplate)}
+      {waitingView(session.currentState, session.redeemAddress, session.toplBridgePKey, session.redeemTemplate)}
     </>
   );
 }

diff --git a/build.sbt b/build.sbt
@@ -67,7 +67,7 @@ lazy val commonDockerSettings = List(
 )
 
 lazy val dockerPublishSettingsBroker = List(
-  dockerExposedPorts ++= Seq(3000),
+  dockerExposedPorts ++= Seq(4000),
   Docker / packageName := "topl-btc-bridge"
 ) ++ commonDockerSettings
 

diff --git a/integration/src/test/scala/co/topl/bridge/BridgeIntegrationSpec.scala b/integration/src/test/scala/co/topl/bridge/BridgeIntegrationSpec.scala
@@ -118,7 +118,7 @@ class BridgeIntegrationSpec extends CatsEffectSuite {
         "launch",
         "-r",
         "https://s01.oss.sonatype.org/content/repositories/releases",
-        "co.topl:brambl-cli_2.13:2.0.0-beta1",
+        "co.topl:brambl-cli_2.13:2.0.0-beta3",
         "--",
         "genus-query",
         "utxo-by-address",
@@ -141,7 +141,7 @@ class BridgeIntegrationSpec extends CatsEffectSuite {
         "launch",
         "-r",
         "https://s01.oss.sonatype.org/content/repositories/releases",
-        "co.topl:brambl-cli_2.13:2.0.0-beta1",
+        "co.topl:brambl-cli_2.13:2.0.0-beta3",
         "--",
         "genus-query",
         "utxo-by-address",
@@ -222,7 +222,7 @@ class BridgeIntegrationSpec extends CatsEffectSuite {
                 method = Method.POST,
                 Uri
                   .fromString(
-                    "http://127.0.0.1:3000/api/" + BridgeContants.START_PEGIN_SESSION_PATH
+                    "http://127.0.0.1:4000/api/" + BridgeContants.START_PEGIN_SESSION_PATH
                   )
                   .toOption
                   .get
@@ -246,7 +246,7 @@ class BridgeIntegrationSpec extends CatsEffectSuite {
               Request[IO](
                 method = Method.POST,
                 Uri
-                  .fromString("http://127.0.0.1:3000/api/sync-wallet")
+                  .fromString("http://127.0.0.1:4000/api/sync-wallet")
                   .toOption
                   .get
               ).withContentType(
@@ -297,7 +297,7 @@ class BridgeIntegrationSpec extends CatsEffectSuite {
               Request[IO](
                 method = Method.POST,
                 Uri
-                  .fromString("http://127.0.0.1:3000/api/confirm-deposit-btc")
+                  .fromString("http://127.0.0.1:4000/api/confirm-deposit-btc")
                   .toOption
                   .get
               ).withContentType(
@@ -334,7 +334,7 @@ class BridgeIntegrationSpec extends CatsEffectSuite {
               Request[IO](
                 method = Method.POST,
                 Uri
-                  .fromString("http://127.0.0.1:3000/api/confirm-redemption")
+                  .fromString("http://127.0.0.1:4000/api/confirm-redemption")
                   .toOption
                   .get
               ).withContentType(

diff --git a/microsite/docs/intro.md b/microsite/docs/intro.md
@@ -42,6 +42,6 @@ npm run start
 
 The `cd` command changes the directory you're working with. In order to work with your newly created Docusaurus site, you'll need to navigate the terminal there.
 
-The `npm run start` command builds your website locally and serves it through a development server, ready for you to view at http://localhost:3000/.
+The `npm run start` command builds your website locally and serves it through a development server, ready for you to view at http://localhost:4000/.
 
 Open `docs/intro.md` (this page) and edit some lines: the site **reloads automatically** and displays your changes.
diff --git a/topl-btc-bridge/src/main/scala/co/topl/bridge/ApiServicesModule.scala b/topl-btc-bridge/src/main/scala/co/topl/bridge/ApiServicesModule.scala
@@ -243,7 +243,7 @@ trait ApiServicesModule {
               pegin.mintingBTCState.toString(),
               pegin.redeemAddress,
               pegin.toplBridgePKey,
-              s"threshold(1, or(sign(0), sha256(${pegin.sha256})))",
+              s"threshold(1, sign(0) or sha256(${pegin.sha256}))",
             ).asJson
           )
           _ <- IO.println("Minting status response: " + resp)

diff --git a/topl-btc-bridge/src/main/scala/co/topl/bridge/Server.scala b/topl-btc-bridge/src/main/scala/co/topl/bridge/Server.scala
@@ -19,7 +19,7 @@ object ServerConfig {
       .getOrElse(false)
 
   val port: Port = {
-    val portStr = Option(java.lang.System.getProperty("port")).getOrElse("3000")
+    val portStr = Option(java.lang.System.getProperty("port")).getOrElse("4000")
     Port
       .fromString(portStr)
       .getOrElse(throw new Exception(s"Bad port option: `${portStr}`"))

diff --git a/topl-btc-bridge/src/main/scala/co/topl/bridge/controllers/ConfirmDepositController.scala b/topl-btc-bridge/src/main/scala/co/topl/bridge/controllers/ConfirmDepositController.scala
@@ -205,7 +205,7 @@ class ConfirmDepositController[F[_]: Async: Logger](
       case e: BridgeError => Left(e)
       case e: Throwable =>
         e.printStackTrace()
-        Left(InvalidInput("Error in confirmDeposit"))
+        Left(InvalidInput(s"Error in confirmDeposit: ${e.getMessage}"))
     }
   }
 }
diff --git a/topl-btc-bridge/src/main/scala/co/topl/bridge/managers/ToplWalletAlgebra.scala b/topl-btc-bridge/src/main/scala/co/topl/bridge/managers/ToplWalletAlgebra.scala
@@ -170,6 +170,9 @@ object ToplWalletImpl {
         lockTempl <- wsa
           .getLockTemplate(mintTemplateName)
           .liftT
+        bridgePartialVk = Encoding.encodeToBase58(
+          bk.vk.toByteArray
+        )
         deriveChildKeyBridgeString = Encoding.encodeToBase58(
           bridgeVk.toByteArray
         )
@@ -195,7 +198,7 @@ object ToplWalletImpl {
           .addEntityVks(
             fromFellowship,
             mintTemplateName,
-            deriveChildKeyBridgeString :: Nil
+            bridgePartialVk :: Nil
           )
           .optionT
         currentAddress <- wsa
@@ -205,7 +208,7 @@ object ToplWalletImpl {
             None
           )
           .liftT
-      } yield (currentAddress, deriveChildKeyBridgeString)).value
+      } yield (currentAddress, bridgePartialVk)).value
     }
 
     private def computeSerializedTemplate(