Release Adena Wallet 'v1.8.2' (#287)

.yarnrc.yml

@@ -2,7 +2,9 @@ nodeLinker: node-modules
 
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
-    spec: '@yarnpkg/plugin-workspace-tools'
+    spec: "@yarnpkg/plugin-workspace-tools"
+  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
+    spec: "@yarnpkg/plugin-interactive-tools"
 
 pnpMode: loose
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "adena-wallet",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "description": "Adena Wallet",
   "license": "Adena License",
   "private": true,

packages/adena-extension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adena-extension",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "private": true,
   "description": "Adena is a friendly browser extension wallet for the Gnoland blockchain.",
   "scripts": {
@@ -74,7 +74,8 @@
     "webpack-merge": "^5.8.0"
   },
   "dependencies": {
-    "@gnolang/gno-js-client": "1.0.1",
+    "@gnolang/gno-js-client": "^1.1.6",
+    "@gnolang/tm2-js-client": "^1.1.4",
     "@tanstack/react-query": "^4.10.3",
     "@vespaiach/axios-fetch-adapter": "^0.3.0",
     "adena-module": "*",

packages/adena-extension/public/manifest.json

@@ -2,7 +2,7 @@
   "name": "Adena",
   "description": "Adena is a friendly browser extension wallet for the Gnoland blockchain.",
   "manifest_version": 3,
-  "version": "1.8.1",
+  "version": "1.8.2",
   "action": {
     "default_popup": "popup.html"
   },

packages/adena-extension/src/common/provider/gno/gno-provider.ts

@@ -9,7 +9,8 @@ import {
   RPCResponse,
   parseABCI,
   RestService,
-  BroadcastTxResult,
+  BroadcastTxCommitResult,
+  BroadcastTxSyncResult,
   TransactionEndpoint,
 } from '@gnolang/tm2-js-client';
 import fetchAdapter from '@vespaiach/axios-fetch-adapter';
@@ -131,14 +132,14 @@ export class GnoProvider extends GnoJSONRPCProvider {
       .catch(() => null);
   }
 
-  public async sendTransaction(tx: string): Promise<string> {
-    const response: BroadcastTxResult = await RestService.post<BroadcastTxResult>(this.baseURL, {
-      request: newRequest(TransactionEndpoint.BROADCAST_TX_SYNC, [tx]),
-    });
-    if (response.error) {
-      throw Tm2Error.createTm2Error(response.hash, response.error['@type']);
-    }
-    return response.hash;
+  public async sendTransactionSync(tx: string): Promise<BroadcastTxSyncResult> {
+    const response = this.sendTransaction(tx, TransactionEndpoint.BROADCAST_TX_SYNC);
+    return response;
+  }
+
+  public async sendTransactionCommit(tx: string): Promise<BroadcastTxCommitResult> {
+    const response = this.sendTransaction(tx, TransactionEndpoint.BROADCAST_TX_COMMIT);
+    return response;
   }
 
   public waitResultForTransaction(hash: string, timeout?: number) {

packages/adena-extension/src/containers/approve-transaction-container/approve-transaction-container.tsx

@@ -10,7 +10,7 @@ import { RoutePath } from '@router/path';
 import { validateInjectionData } from '@inject/message/methods';
 import BigNumber from 'bignumber.js';
 import { useNetwork } from '@hooks/use-network';
-import { Tm2Error } from '@common/errors/common/tm2-error';
+import { TM2Error } from "@gnolang/tm2-js-client"
 
 function mappedTransactionData(document: StdSignDoc) {
   return {
@@ -184,33 +184,37 @@ const ApproveTransactionContainer: React.FC = () => {
         document
       );
       const transaction = await transactionService.createTransaction(document, signature);
-      const hash = await new Promise<string>((resolve, reject) => {
+      const hash = transactionService.createHash(transaction);
+      const responseHash = await new Promise<string>((resolve) => {
         transactionService.sendTransaction(transaction)
           .then(resolve)
-          .catch(reject);
+          .catch((error: TM2Error) => {
+            const message = {
+              hash,
+              error: {
+                name: error.name,
+                message: error.message,
+                log: error.log,
+              },
+            };
+            chrome.runtime.sendMessage(
+              InjectionMessageInstance.failure('TRANSACTION_FAILED', message, requestData?.key),
+            )
+          });
 
         checkHealth(currentNetwork.rpcUrl, requestData?.key);
       })
-      if (hash.length > 0) {
+      if (hash === responseHash) {
         chrome.runtime.sendMessage(
           InjectionMessageInstance.success('TRANSACTION_SUCCESS', { hash }, requestData?.key),
         );
         return true;
       } else {
         chrome.runtime.sendMessage(
-          InjectionMessageInstance.failure('TRANSACTION_FAILED', {}, requestData?.key),
+          InjectionMessageInstance.failure('TRANSACTION_FAILED', { hash }, requestData?.key),
         );
       }
     } catch (e) {
-      if (e instanceof Tm2Error) {
-        chrome.runtime.sendMessage(
-          InjectionMessageInstance.failure(
-            'TRANSACTION_FAILED',
-            e.response,
-            requestData?.key,
-          ),
-        );
-      }
       if (e instanceof Error) {
         const message = e.message;
         if (message.includes('Ledger')) {

packages/adena-extension/src/containers/approve-transaction-ledger-loading-container/approve-transaction-ledger-loading-container.tsx

@@ -6,6 +6,7 @@ import { InjectionMessage, InjectionMessageInstance } from '@inject/message';
 import { useCurrentAccount } from '@hooks/use-current-account';
 import { useAdenaContext } from '@hooks/use-context';
 import { useNetwork } from '@hooks/use-network';
+import { TM2Error } from "@gnolang/tm2-js-client"
 
 interface ApproveSignLedgerLoadingState {
   requestData?: InjectionMessage;
@@ -45,8 +46,23 @@ const ApproveTransactionLedgerLoadingContainer: React.FC = () => {
 
     const result = await transactionService.createSignatureWithLedger(currentAccount, document).then(async (signature) => {
       const transaction = await transactionService.createTransaction(document, signature);
-      const hash = await transactionService.sendTransaction(transaction);
-      if (hash.length > 0) {
+      const hash = transactionService.createHash(transaction);
+      const responseHash = await transactionService.sendTransaction(transaction)
+        .catch((error: TM2Error) => {
+          const message = {
+            hash,
+            error: {
+              name: error.name,
+              message: error.message,
+              log: error.log,
+            },
+          };
+          chrome.runtime.sendMessage(
+            InjectionMessageInstance.failure('TRANSACTION_FAILED', message, requestData?.key),
+          )
+        });
+
+      if (hash === responseHash) {
         chrome.runtime.sendMessage(
           InjectionMessageInstance.success('TRANSACTION_SUCCESS', { hash }, requestData?.key),
         );

packages/adena-extension/src/services/transaction/transaction.ts

@@ -137,9 +137,9 @@ export class TransactionService {
    */
   public sendTransaction = async (transaction: Array<number>) => {
     const provider = this.getGnoProvider();
-    const hash = await provider.sendTransaction(Buffer.from(transaction).toString('base64'));
-    provider.waitResultForTransaction(hash).then(console.log);
-    return hash;
+    const encodedTransaction = Buffer.from(transaction).toString('base64');
+    const response = await provider.sendTransactionCommit(encodedTransaction);
+    return response.hash;
   };
 
   public createHash(transaction: Array<number>) {

packages/adena-module/package.json

@@ -1,7 +1,7 @@
 {
   "name": "adena-module",
   "private": true,
-  "version": "1.8.1",
+  "version": "1.8.2",
   "description": "Adena's Wallet",
   "main": "./dist/index.umd.js",
   "module": "./dist/index.esm.js",