Bug fix for sticky message

Bug fix incorrect context path led to deployment error

.env

@@ -1,8 +1,8 @@
 
-NODE_ENV=development
+NODE_ENV=production
 
-VITE_SBTC_CONTRACT_ID_MAINNET=tb1qasu5x7dllnejmx0dtd5j42quk4q03dl56caqss
-VITE_SBTC_CONTRACT_ID_TESTNET=tb1qasu5x7dllnejmx0dtd5j42quk4q03dl56caqss
+VITE_SBTC_CONTRACT_ID_MAINNET=SP000000000000000000002Q6VF78.pox
+VITE_SBTC_CONTRACT_ID_TESTNET=ST000000000000000000002AMW42H.pox
 
 VITE_APP_STACKS_TESTNET_API=https://stacks-node-api.testnet.stacks.co
 VITE_APP_STACKS_MAINNET_API=https://stacks-node-api.mainnet.stacks.co

.env.staging

@@ -0,0 +1,16 @@
+NODE_ENV=production
+
+VITE_SBTC_CONTRACT_ID_MAINNET=SP000000000000000000002Q6VF78.pox
+VITE_SBTC_CONTRACT_ID_TESTNET=ST000000000000000000002AMW42H.pox
+
+VITE_APP_STACKS_TESTNET_API=https://stacks-node-api.testnet.stacks.co
+VITE_APP_STACKS_MAINNET_API=https://stacks-node-api.mainnet.stacks.co
+
+VITE_MEMPOOL_EXPLORER_MAINNET=https://mempool.space/api
+VITE_MEMPOOL_EXPLORER_TESTNET=https://mempool.space/testnet/api
+
+VITE_BLOCKCYPHER_EXPLORER_TESTNET=https://api.blockcypher.com/v1/btc/test3
+VITE_BLOCKCYPHER_EXPLORER_MAINNET=https://api.blockcypher.com/v1/btc/main
+
+VITE_ORIGIN=
+VITE_STACKS_EXPLORER=https://explorer.stacks.co

deploy-remote.sh

@@ -0,0 +1,38 @@
+#!/bin/bash -e
+set -e;
+
+export DEPLOYMENT=$1
+export PORT=22
+
+PATH_DEPLOY=build
+mkdir -p $PATH_DEPLOY
+export SERVER=popper.brightblock.org
+export BUILDER=build
+if [ "$DEPLOYMENT" == "prod" ]; then
+  SERVER=chomsky.brightblock.org;
+  BUILDER=build
+  PORT=7019
+fi
+
+printf "\n-----------------------------------------------------------------------------------------------------\n";
+printf "Running script: $0 \n";
+printf "Deploying to: $SERVER \n";
+printf "\n-----------------------------------------------------------------------------------------------------\n";
+
+function __build() {
+  echo "Building $BUILDER ...";
+  #npm run $BUILDER
+  echo "Initialisation of $BUILD_PATH complete";
+}
+
+function __pushcode() {
+  echo "\n- deploying from pipeline build \n";
+  rsync -aP $PATH_DEPLOY/* static/* bob@$SERVER:/var/www/sbtc-bridge
+}
+
+BUILD_PATH=./
+__build
+
+__pushcode
+
+exit 0;

package.json

@@ -5,7 +5,7 @@
 	"author": "Mike Cohen",
 	"scripts": {
 		"dev": "vite dev --port=8080",
-		"build": "vite build --mode production",
+		"build": "vite build --mode staging",
 		"preview": "vite preview",
 		"test": "playwright test",
 		"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",

src/lib/components/FetchUTXOs.svelte

@@ -159,10 +159,10 @@
     <div class="row">
       <div class="col-12">
         {#if showFeeCalculation}
-          <label for="transact-path" class="mb-3">Tx Fee Calculation</label>
+          <label for="transact-path" class="mb-3">Tx Fee Calculation (sats/kb)</label>
           <div class="d-flex justify-content-between">
             <div>Using fee rate: {feeToUse}</div>
-            <div><a href="/" on:click|preventDefault={() => {feeToUse = 0; hexTx = undefined}}>reset</a></div>
+            <div><a href="/" on:click|preventDefault={() => {feeToUse = 0; hexTx = undefined; changeErrorReason = undefined}}>reset</a></div>
           </div>
           <div>Peg In: {pegInAmount}</div>
           <div>Change: {change}</div>

src/lib/psbt.ts

@@ -20,9 +20,9 @@ export async function buildPegInTx(config:SbtcConfig) {
   })
   const data = Buffer.from(config.stxAddress, 'utf8');
   const embed = payments.embed({ data: [data] });
-  psbt.addOutput({ script: embed.output, value: 0 });
   psbt.addOutput({ address: config.sbtcWalletAddress, value: config.pegInAmount });
-  psbt.addOutput({ address: config.fromBtcAddress, value: config.pegInChangeAmount });
+  if (config.pegInChangeAmount > 0) psbt.addOutput({ address: config.fromBtcAddress, value: config.pegInChangeAmount });
+  psbt.addOutput({ script: embed.output, value: 0 });
   return psbt.toHex();
 }
 

src/lib/sbtc.ts

@@ -32,7 +32,7 @@ export async function fetchSbtcWalletAddress(network:string) {
 	const result = await callContractReadOnly(data);
   console.log('pox: ', result)
   if (network === 'testnet') {
-    return 'tb1qasu5x7dllnejmx0dtd5j42quk4q03dl56caqss';
+    return 'tb1qasu5x7dllnejmx0dtd5j42quk4q03dl56caqss'; // alice
   }
   return 'bc1q0pcvvu8ewfqw3p270cwxtsd5pe7us3s8kznftnrhs74w4nfl4rtqjt6hp6';
 }

src/routes/+layout.svelte

@@ -42,7 +42,7 @@
   onMount(async () => {
     bootstrap = (await import('bootstrap'));
     try {
-      fetchWalletAddress();
+      await fetchWalletAddress();
     } catch (err) {
       console.log(err)
     }

svelte.config.js

@@ -24,7 +24,7 @@ const config = {
     adapter: adapter({ fallback: "index.html" }),
     prerender: { entries: [] },
 		paths: {
-			base: dev ? '' : '/blocksim',
+			base: dev ? '' : '/sbtc-bridge',
 		},
 		// If you are not using a .nojekyll file, change your appDir to something not starting with an underscore.
 		// For example, instead of '_app', use 'app_', 'internal', etc.