fix(near::addvalidator): fix serialization

XP-NETWORK · Dec 6, 2024 · 4cedd5f · 4cedd5f
1 parent e00db5f
commit 4cedd5f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/handler/chains/near/config.ts b/src/handler/chains/near/config.ts
@@ -25,11 +25,6 @@ export async function configNearHandler(
   staking: ERC20Staking,
   validatorAddress: string,
 ) {
-  const near = await connect({
-    networkId: conf.networkId,
-    nodeUrl: conf.rpcURL,
-  });
-
   const lb = await em.findOne(Block, {
     chain: conf.chain,
     contractAddress: conf.contractAddress,
@@ -42,6 +37,11 @@ export async function configNearHandler(
     nearWallet.accountId,
     KeyPair.fromString(nearWallet.secretKey as never),
   );
+  const near = await connect({
+    networkId: conf.networkId,
+    nodeUrl: conf.rpcURL,
+    keyStore: ks,
+  });
   const mutex = new Mutex();
   async function fetchProvider() {
     const release = await mutex.acquire();

diff --git a/src/handler/chains/near/utils/signData.ts b/src/handler/chains/near/utils/signData.ts
@@ -3,10 +3,10 @@ import type { KeyPairEd25519 } from "near-api-js/lib/utils";
 
 export class AddValidator {
   @field({ type: "string" })
-  account_id: string;
+  public_key: string;
 
   @field({ type: "string" })
-  public_key: string;
+  account_id: string;
 
   constructor(account_id: string, public_key: string) {
     this.account_id = account_id;