Merge pull request #19 from trustenterprises/hotfix_regression_webhook

Hotfix regression webhook
trustenterprises · Feb 18, 2021 · 38a7297 · 38a7297
2 parents f43c06d + a57732c
commit 38a7297
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/__tests__/unit/explorer.test.js b/__tests__/unit/explorer.test.js
@@ -8,21 +8,21 @@ test("Ensure that a testnet explorer url returns", () => {
 
   const url = Explorer.getExplorerUrl(placeholderTx)
 
-	expect(url.explorer_url).toBe(`https://ledger-testnet.hashlog.io/tx/${placeholderTx}`)
+	expect(url).toBe(`https://ledger-testnet.hashlog.io/tx/${placeholderTx}`)
 })
 
 test("Ensure that a mainnet explorer url returns", () => {
   Config.HEDERA_NETWORK = 'mainnet'
 
   const url = Explorer.getExplorerUrl(placeholderTx)
 
-  expect(url.explorer_url).toBe(`https://ledger.hashlog.io/tx/${placeholderTx}`)
+  expect(url).toBe(`https://ledger.hashlog.io/tx/${placeholderTx}`)
 })
 
 test("Ensure that a previewnet explorer url returns nothing", () => {
   Config.HEDERA_NETWORK = 'previewnet'
 
   const url = Explorer.getExplorerUrl(placeholderTx)
 
-	expect(!url.explorer_url)
+	expect(!url)
 })
diff --git a/app/hashgraph/client.js b/app/hashgraph/client.js
@@ -1,15 +1,12 @@
 import {
-	Client,
-	MirrorClient,
 	PrivateKey,
-	PublicKey,
 	AccountBalanceQuery,
 	TopicInfoQuery,
-	MirrorConsensusTopicQuery,
 	TopicCreateTransaction,
 	TopicUpdateTransaction,
 	TopicMessageSubmitTransaction,
-	TransactionRecordQuery
+	TransactionRecordQuery,
+	TopicId
 } from "@hashgraph/sdk"
 import HashgraphClientContract from "./contract"
 import HashgraphNodeNetwork from "./network"
@@ -53,7 +50,7 @@ class HashgraphClient extends HashgraphClientContract {
 
 		return {
 			...transactionResponse,
-			topic: receipt.topicId
+			topic: receipt.topicId.toString()
 		}
 	}
 
@@ -97,28 +94,33 @@ class HashgraphClient extends HashgraphClientContract {
 		const client = this.#client
 
 		const transaction = await new TopicMessageSubmitTransaction({
-			topicId: topic_id,
+			topicId: TopicId.fromString(topic_id),
 			message: message
 		}).execute(client)
 
 		// Remember to allow for mainnet links for explorer
 		const messageTransactionResponse = {
 			reference,
 			topic_id,
-			transaction_id: transaction.toString(),
-			explorer_url: Explorer.getExplorerUrl(transaction)
+			transaction_id: transaction.transactionId.toString(),
+			explorer_url: Explorer.getExplorerUrl(transaction.transactionId)
 		}
 
 		const syncMessageConsensus = async () => {
 			await sleep()
 
 			const record = await new TransactionRecordQuery()
-				.setTransactionId(transaction)
+				.setTransactionId(transaction.transactionId)
 				.execute(client)
 
+			const { seconds, nanos } = record.consensusTimestampstamp
+
 			const consensusResult = {
 				...messageTransactionResponse,
-				consensus_timestamp: record.consensusTimestamp,
+				consensus_timestamp: {
+					seconds: seconds.toString(),
+					nanos: nanos.toString()
+				},
 				reference: reference
 			}
 
@@ -132,7 +134,7 @@ class HashgraphClient extends HashgraphClientContract {
 		}
 
 		if (Config.webhookUrl) {
-			syncMessageConsensus()
+			await syncMessageConsensus()
 		}
 
 		return messageTransactionResponse

diff --git a/app/utils/explorer.js b/app/utils/explorer.js
@@ -10,8 +10,8 @@ const ExplorerUrl = {
 function getExplorerUrl(tx) {
 	const network = Config.HEDERA_NETWORK || Environment.TESTNET
 
-	return {
-		explorer_url: ExplorerUrl[network] + tx
+	if (network) {
+		return ExplorerUrl[network] + tx
 	}
 }