[1.0.9] adjustVinsignature

Author: jbrower95

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@layr-labs/zeus",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "web3 deployer / metadata manager",
   "main": "src/index.ts",
   "scripts": {

src/signing/strategies/gnosis/api/gnosisApi.ts

@@ -50,14 +50,12 @@ export abstract class GnosisApiStrategy extends GnosisSigningStrategy {
             ],
         })
 
-        const prompt = ora(`Forming transaction...`);
-        const spinner = prompt.start();
+        console.log(`Forming transaction...`);
         const hash = await protocolKitOwner1.getTransactionHash(txn)
-        spinner.stop();
 
         return {
             output,
-            safeAddress: safeContext.addr,
+            safeAddress: getAddress(safeContext.addr),
             safeTxHash: hash as `0x${string}`,
             senderAddress: signer as `0x${string}`,
             stateUpdates
@@ -101,11 +99,9 @@ export abstract class GnosisApiStrategy extends GnosisSigningStrategy {
             }]
         })
 
-        let prompt = ora(`Creating transaction...`);
-        let spinner = prompt.start();
+        console.log(`Creating transaction...`);
         const hash = await protocolKitOwner1.getTransactionHash(txn)
         const version = await protocolKitOwner1.getContractVersion();
-        spinner.stop();
 
         if (stateUpdates) {
             console.log(chalk.bold.underline(`Updated Environment: `));
@@ -114,25 +110,19 @@ export abstract class GnosisApiStrategy extends GnosisSigningStrategy {
 
         const senderSignature = await this.getSignature(version, txn, safeContext.addr)
 
-        prompt = ora(`Sending transction to Gnosis SAFE UI... (safe=${ getAddress(safeContext.addr)})`);
-        spinner = prompt.start();
-        try {
-            await apiKit.proposeTransaction({
-                safeAddress: getAddress(safeContext.addr),
-                safeTransactionData: txn.data,
-                safeTxHash: hash,
-                senderAddress: getAddress(signer),
-                senderSignature,
-            })
-        } finally {
-            spinner.stop();
-        }
+        await apiKit.proposeTransaction({
+            safeAddress: getAddress(safeContext.addr),
+            safeTransactionData: txn.data,
+            safeTxHash: hash,
+            senderAddress: getAddress(signer),
+            senderSignature,
+        })
 
         return {
             output,
             safeAddress: safeContext.addr,
             safeTxHash: hash as `0x${string}`,
-            senderAddress: signer,
+            senderAddress: getAddress(signer),
             signature: senderSignature,
             stateUpdates
         }

src/signing/strategies/gnosis/api/gnosisLedger.ts

@@ -12,8 +12,8 @@ import * as prompts from '../../../../commands/prompts';
 import { JsonRpcProvider } from "ethers";
 import * as AllChains from 'viem/chains';
 import { abi } from "../onchain/Safe";
-import { ethers } from 'ethers';
-import { calculateSafeTransactionHash } from "@safe-global/protocol-kit/dist/src/utils";
+import { adjustVInSignature, calculateSafeTransactionHash } from "@safe-global/protocol-kit/dist/src/utils";
+import { SigningMethod } from "@safe-global/protocol-kit";
 
 export class GnosisLedgerStrategy extends GnosisApiStrategy {
     id = "gnosis.api.ledger";
@@ -68,21 +68,27 @@ export class GnosisLedgerStrategy extends GnosisApiStrategy {
             const addr = await signer.getAddress() as `0x${string}`;
             console.log(`The ledger reported this address: ${addr}`);
 
-            const signature = await signer.signMessage(
+            const _signature = await signer.signMessage(
                 gnosisHash
             ) as `0x${string}`
 
-            const valid = await verifyMessage({address: addr, message: gnosisHash, signature});
+            const signature = (await adjustVInSignature(SigningMethod.ETH_SIGN, _signature, gnosisHash, addr)) as `0x${string}`;
+
+            const valid = await verifyMessage({address: addr, message: gnosisHash, signature: _signature});
             if (!valid) {
                 console.error(`Failed to verify signature. Nothing will be submitted. (signed from ${addr})`);
-                console.warn(`Signature: ${signature}`);
+                console.warn(`Signature: ${_signature}`);
+                console.log(`V-Adjusted signature: ${signature}`);
                 console.warn(`Gnosis Hash: ${gnosisHash}`);
                 console.warn(`From: ${addr}`);
                 throw new Error(`Invalid signature. Failed to verify typedData.`);
             } else {
-                console.log(`Successfully verified signature (from=${addr},signature=${signature})`);
+                console.log(`Successfully verified signature (from=${addr},signature=${_signature})`);
             }
 
+            console.log(`Original Signature: ${_signature}`);
+            console.log(`V-Adjusted signature: ${signature}`);
+
             return signature;
         } catch (e) {
             if ((e as Error).message.includes(`0x6a80`)) {