fix(tezos): addSelfAsValidator: check for signatures using publickey

XP-NETWORK · Aug 6, 2024 · 55e37bd · 55e37bd
1 parent d008197
commit 55e37bd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/deps.ts b/src/deps.ts
@@ -144,6 +144,7 @@ export async function configTezosHandler(
   });
   const provider = new TezosToolkit(conf.rpcURL);
   const signer = new InMemorySigner(tezosWallet.secretKey);
+  provider.setSignerProvider(signer);
   return tezosHandler({
     provider,
     signer,

diff --git a/src/handler/tezos/utils/addSelfAsValidator.ts b/src/handler/tezos/utils/addSelfAsValidator.ts
@@ -20,7 +20,7 @@ export default async function addSelfAsValidator(
   try {
     let validatorsCount = (await bc.storage()).validators_count.toNumber();
     let signatureCount = Number(
-      await storage.getStakingSignaturesCount(await signer.publicKeyHash()),
+      await storage.getStakingSignaturesCount(await signer.publicKey()),
     );
 
     while (signatureCount < confirmationCountNeeded(validatorsCount)) {
@@ -45,10 +45,9 @@ export default async function addSelfAsValidator(
       };
     });
 
-    await bc.methods
-      .add_validator(
-        tas.address(await signer.publicKeyHash()),
-        stakingSignatures.map((e) => {
+    await bc.methodsObject
+      .add_validator({
+        sigs: stakingSignatures.map((e) => {
           const addr = tas.address(
             b58cencode(
               hash(
@@ -67,7 +66,8 @@ export default async function addSelfAsValidator(
             signer: tas.key(e.signerAddress),
           };
         }),
-      )
+        validator: tas.address(await signer.publicKeyHash()),
+      })
       .send();
     return "success";
   } catch (e) {

diff --git a/src/handler/tezos/utils/selfIsValidator.ts b/src/handler/tezos/utils/selfIsValidator.ts
@@ -6,7 +6,7 @@ export default async function selfIsValidator(
   bc: BridgeContractType,
   signer: Signer,
 ) {
-  const mutez = (await bc.storage()).validators.get(
+  const mutez = await (await bc.storage()).validators.get(
     tas.address(await signer.publicKeyHash()),
   );
   return mutez !== undefined;