toggle2fa constants in the doc

petrkozorezov · Aug 22, 2021 · 3b4ac14 · 3b4ac14
1 parent fd1b762
commit 3b4ac14
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 11 deletions.
diff --git a/infrastructure/api-docs/blueprint/groups/transactions.apib b/infrastructure/api-docs/blueprint/groups/transactions.apib
@@ -57,12 +57,12 @@ Enable or disable requirement for L1 signature for L2 transactions.
     + Attributes
         + enable: false (boolean, required)
         + accountId: {{accountId}} (number, required)
-        + timestamp: 1629451646472 (number, required)
-        + signature: TxEthSignature
+        + timestamp: {{toggle2FATimestamp}} (number, required)
+        + signature (Toggle2FAEthSignature, required)
 
 + Response 200 (application/json)
     + Attributes
         + request (Request, required)
         + status: success (string, required)
-        + result (2FAResult, required{{isResultNullable}})
+        + result (Toggle2FAResult, required{{isResultNullable}})
         + error (Error, required, nullable)
diff --git a/infrastructure/api-docs/blueprint/types/transactions.apib b/infrastructure/api-docs/blueprint/types/transactions.apib
@@ -253,5 +253,13 @@
 - tx (Transaction.Incoming, required)
 - signature (TxEthSignatureVariant, required)
 
-## 2FAResult (object)
-- success true (boolean, required)
+## Toggle2FAEthereumSignature
+- type: `EthereumSignature` (string, fixed)
+- signature: `{{toggle2FASignature}}` (string, required)
+
+## Toggle2FAEthSignature (enum)
+- (Toggle2FAEthereumSignature)
+- (EIP1271Signature)
+
+## Toggle2FAResult (object)
+- success: true (boolean, required)
diff --git a/infrastructure/api-docs/src/compile.ts b/infrastructure/api-docs/src/compile.ts
@@ -83,6 +83,8 @@ interface Parameters {
     l2Signature: string;
     ethereumSignature: string;
     nftId: number;
+    toggle2FASignature: string;
+    toggle2FATimestamp: number;
 }
 
 async function getHashesAndSignatures() {
@@ -128,6 +130,10 @@ async function getHashesAndSignatures() {
     const state = await syncWallet.getAccountState();
     const nftId = Object.values(state.verified.nfts)[0].id;
 
+    const toggle2FAObject = await syncWallet.getToggle2FA(false);
+    const toggle2FASignature = (toggle2FAObject.signature as zksync.types.TxEthSignature).signature;
+    const toggle2FATimestamp = toggle2FAObject.timestamp;
+
     let result: Parameters = {
         txHash,
         txBatchHash,
@@ -136,7 +142,9 @@ async function getHashesAndSignatures() {
         pubKey,
         l2Signature,
         ethereumSignature,
-        nftId
+        nftId,
+        toggle2FASignature,
+        toggle2FATimestamp
     };
     return result;
 }

diff --git a/sdk/zksync.js/src/wallet.ts b/sdk/zksync.js/src/wallet.ts
@@ -31,7 +31,8 @@ import {
     Withdraw,
     WithdrawNFT,
     TokenRatio,
-    WeiRatio
+    WeiRatio,
+    Toggle2FARequest
 } from './types';
 import {
     ERC20_APPROVE_TRESHOLD,
@@ -916,18 +917,23 @@ export class Wallet {
         return changePubKeyTx;
     }
 
-    async toggle2FA(enable: boolean): Promise<boolean> {
-        await this.setRequiredAccountIdFromServer('Toggle 2FA');
+    async getToggle2FA(enable: boolean): Promise<Toggle2FARequest> {
         const accountId = await this.getAccountId();
         const timestamp = new Date().getTime();
         const signature = await this.getEthMessageSignature(getToggle2FAMessage(enable, timestamp));
 
-        return await this.provider.toggle2FA({
+        return {
             accountId,
             signature,
             timestamp,
             enable
-        });
+        };
+    }
+
+    async toggle2FA(enable: boolean): Promise<boolean> {
+        await this.setRequiredAccountIdFromServer('Toggle 2FA');
+
+        return await this.provider.toggle2FA(await this.getToggle2FA(enable));
     }
 
     async signSetSigningKey(changePubKey: {