From dca0754c226e793cce27a66121958dabf405fc20 Mon Sep 17 00:00:00 2001
From: jinoosss <112360739+jinoosss@users.noreply.github.com>
Date: Thu, 27 Jun 2024 10:03:23 +0900
Subject: [PATCH] fix: support for testnet3 network legacy modules (#524)

---
 packages/adena-module/src/utils/messages-legacy.ts       | 2 +-
 packages/adena-module/src/wallet/keyring/keyring-util.ts | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/adena-module/src/utils/messages-legacy.ts b/packages/adena-module/src/utils/messages-legacy.ts
index 4d69622a..fc836434 100644
--- a/packages/adena-module/src/utils/messages-legacy.ts
+++ b/packages/adena-module/src/utils/messages-legacy.ts
@@ -1,6 +1,6 @@
 import { Any, PubKeySecp256k1, Tx, TxFee, TxSignature } from '@gnolang/tm2-js-client-legacy';
 import { MsgCall, MsgAddPackage, MsgSend, MsgEndpoint } from '@gnolang/gno-js-client-legacy';
-import { MemPackage, MemFile, MsgRun } from '@gnolang/gno-js-client/bin/proto/gno/vm';
+import { MemPackage, MemFile, MsgRun } from '@gnolang/gno-js-client-legacy/bin/proto/gno/vm';
 import { fromBase64 } from '../encoding';
 
 export interface Document {
diff --git a/packages/adena-module/src/wallet/keyring/keyring-util.ts b/packages/adena-module/src/wallet/keyring/keyring-util.ts
index 30f11197..0216f957 100644
--- a/packages/adena-module/src/wallet/keyring/keyring-util.ts
+++ b/packages/adena-module/src/wallet/keyring/keyring-util.ts
@@ -1,18 +1,16 @@
-import { Any, MsgAddPackage, MsgCall, MsgSend } from '@gnolang/gno-js-client';
 import { AddressKeyring } from './address-keyring';
 import { HDWalletKeyring } from './hd-wallet-keyring';
 import { Keyring } from './keyring';
 import { LedgerKeyring } from './ledger-keyring';
 import { PrivateKeyKeyring } from './private-key-keyring';
 import { Web3AuthKeyring } from './web3-auth-keyring';
-import { Tx, TxSignature, Wallet as Tm2Wallet } from '@gnolang/tm2-js-client';
+import { Tx, Wallet as Tm2Wallet } from '@gnolang/tm2-js-client';
 import { Wallet as Tm2WalletLegacy } from '@gnolang/tm2-js-client-legacy';
 import { Document, documentToTx, decodeTxMessages } from './../../utils/messages';
 import {
-  Document as DocumentLegacy,
   documentToTx as documentToTxLegacy,
   decodeTxMessages as decodeTxMessagesLegacy,
-} from './../../utils/messages';
+} from './../../utils/messages-legacy';
 
 const LEGACY_NETWORKS = ['test3'];
 
@@ -61,7 +59,7 @@ export function useTm2Wallet(document: Document): typeof Tm2Wallet | typeof Tm2W
 export function makeSignedTx(wallet: Tm2Wallet | Tm2WalletLegacy, document: Document): Promise<Tx> {
   const isLegacy = LEGACY_NETWORKS.includes(document.chain_id);
   const tx = isLegacy ? documentToTxLegacy(document) : documentToTx(document);
-  const decodeTxMessageFunction = isLegacy ? decodeTxMessages : decodeTxMessagesLegacy;
+  const decodeTxMessageFunction = isLegacy ? decodeTxMessagesLegacy : decodeTxMessages;
 
   return wallet.signTransaction(tx, decodeTxMessageFunction);
 }