Fix after big merge (broken wax package)

openhive-network · Feb 28, 2024 · 9658b64 · 9658b64
1 parent 88d0cec
commit 9658b64
Show file tree

Hide file tree

Showing 9 changed files with 89 additions and 27 deletions.
diff --git a/apps/auth/package.json b/apps/auth/package.json
@@ -24,7 +24,7 @@
     "@hive/transaction": "*",
     "@hive/tsconfig": "*",
     "@hive/ui": "*",
-    "@hive/wax": "^0.3.8-240222134308",
+    "@hive/wax": "^0.3.8-240228091712",
     "@hiveio/dhive": "^1.2.8",
     "@hookform/resolvers": "^3.3.1",
     "@tanstack/react-query": "^4.36.1",

diff --git a/apps/auth/pages/profile.tsx b/apps/auth/pages/profile.tsx
@@ -12,6 +12,7 @@ import { verifySignature } from '@smart-signer/lib/utils';
 import { vote, createHiveChain, BroadcastTransactionRequest } from '@hive/wax/web';
 import { waxToKeychainOperation } from '@smart-signer/lib/signer/signer-keychain';
 import { KeyTypes } from '@smart-signer/types/common';
+import { fetchJson } from '@smart-signer/lib/fetch-json';
 
 import { getLogger } from '@ui/lib/logging';
 const logger = getLogger('app');
@@ -33,8 +34,8 @@ export default function Profile() {
     voter: user.username,
     author: 'gtg',
 
-    // permlink: 'power-to-the-hive-but-just-a-little',
-    permlink: 'non-existing-permlink-q523-73867',
+    permlink: 'power-to-the-hive-but-just-a-little',
+    // permlink: 'non-existing-permlink-q523-73867',
 
     weight: 10000
   };
@@ -63,10 +64,34 @@ export default function Profile() {
       });
       logger.info('broadcast signature: %s', signature);
       txBuilder.build(signature);
-      const request = new BroadcastTransactionRequest(txBuilder);
+      logger.info('broadcast txBuilder: %o', txBuilder);
+
+      const trx = {
+        trx: JSON.parse(txBuilder.toApi()),
+        max_block_age: -1,
+      };
+
+      logger.info('broadcast transaction: %o', trx);
+      const data = {
+        jsonrpc: "2.0",
+        method: "network_broadcast_api.broadcast_transaction",
+        params: trx,
+        id: 1
+      };
+      logger.info('broadcast data: %o', data);
+
+      const fetchResult = await fetchJson('https://api.hive.blog', {
+        method: 'POST',
+        body: JSON.stringify(data, null, 0)
+      });
+      logger.info('broadcast fetchResult: %o', fetchResult);
+
+      const broadcastReq = new BroadcastTransactionRequest(txBuilder);
+      logger.info('broadcast broadcastReq: %o', broadcastReq);
+      logger.info('broadcast JSON.stringify(broadcastReq): %o', JSON.stringify(broadcastReq));
 
       // Transmit
-      const result = await hiveChain.api.network_broadcast_api.broadcast_transaction(request);
+      const result = await hiveChain.api.network_broadcast_api.broadcast_transaction(broadcastReq);
       logger.info('broadcast result: %o', result);
     } catch (error) {
       logger.error(error);

diff --git a/apps/blog/package.json b/apps/blog/package.json
@@ -27,7 +27,7 @@
     "@hive/transaction": "*",
     "@hive/tsconfig": "*",
     "@hive/ui": "*",
-    "@hive/wax": "^0.3.8-240222134308",
+    "@hive/wax": "^0.3.8-240228091712",
     "@hiveio/content-renderer": "^2.0.0",
     "@hiveio/dhive": "^1.2.8",
     "@hookform/resolvers": "^3.1.1",

diff --git a/apps/wallet/package.json b/apps/wallet/package.json
@@ -26,7 +26,7 @@
     "@hive/transaction": "*",
     "@hive/tsconfig": "*",
     "@hive/ui": "*",
-    "@hive/wax": "^0.3.8-240222134308",
+    "@hive/wax": "^0.3.8-240228091712",
     "@hiveio/dhive": "^1.2.8",
     "@hookform/resolvers": "^3.3.2",
     "@next/bundle-analyzer": "^14.0.4",

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/smart-signer/package.json b/packages/smart-signer/package.json
@@ -7,9 +7,9 @@
     "lint": "eslint ."
   },
   "dependencies": {
-    "@hive/hb-auth": "^0.0.1-stable.240223093642",
+    "@hive/hb-auth": "^0.0.1-stable.240228104557",
     "@hive/ui": "*",
-    "@hive/wax": "^0.3.8-240222134308",
+    "@hive/wax": "^0.3.8-240228091712",
     "@hiveio/dhive": "^1.2.8",
     "@hiveio/hive-js": "^2.0.7",
     "@tanstack/react-query": "^4.36.1",

diff --git a/packages/transaction/package.json b/packages/transaction/package.json
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@hive/smart-signer": "*",
-    "@hive/wax": "^0.3.8-240222134308",
+    "@hive/wax": "^0.3.8-240228091712",
     "@hiveio/dhive": "^1.2.8",
     "@hiveio/hive-js": "^2.0.7",
     "secure-random": "^1.1.2",

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -11,7 +11,7 @@
     "@hive/prettier-config-custom": "*",
     "@hive/tailwindcss-config": "*",
     "@hive/tsconfig": "*",
-    "@hive/wax": "^0.3.8-240222134308",
+    "@hive/wax": "^0.3.8-240228091712",
     "@radix-ui/react-accordion": "^1.1.2",
     "@radix-ui/react-alert-dialog": "^1.0.4",
     "@radix-ui/react-avatar": "^1.0.3",

diff --git a/scripts/update-wax.sh b/scripts/update-wax.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+WAX_VERSION=${1} # prefixed with @
+HBAUTH_VERSION=${2} # prefixed with @
+
+uninstall_packages() {
+  echo "Uninstalling packages"
+
+  npm uninstall --save @hive/hb-auth --workspace=packages/smart-signer
+
+  npm uninstall --save @hive/wax --workspace=packages/smart-signer
+  npm uninstall --save @hive/wax --workspace=packages/transaction
+  npm uninstall --save @hive/wax --workspace=packages/ui
+
+  npm uninstall --save @hive/wax --workspace=apps/auth
+  npm uninstall --save @hive/wax --workspace=apps/blog
+  npm uninstall --save @hive/wax --workspace=apps/wallet
+}
+
+install_packages() {
+  echo "Installing packages"
+
+  npm install --save "@hive/wax${WAX_VERSION}" --workspace=apps/auth
+  npm install --save "@hive/wax${WAX_VERSION}" --workspace=apps/blog
+  npm install --save "@hive/wax${WAX_VERSION}" --workspace=apps/wallet
+
+  npm install --save "@hive/wax${WAX_VERSION}" --workspace=packages/smart-signer
+  npm install --save "@hive/wax${WAX_VERSION}" --workspace=packages/transaction
+  npm install --save "@hive/wax${WAX_VERSION}" --workspace=packages/ui
+
+  npm install --save "@hive/hb-auth${HBAUTH_VERSION}" --workspace=packages/smart-signer
+}
+
+uninstall_packages
+install_packages