@mimicprotocol/sdk 0.0.1-rc.38 → 0.0.1-rc.39

package/dist/runner/validators.d.ts

@@ -19,21 +19,21 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             }, "strip", z.ZodTypeAny, {
                 data: string;
                 chainId: number;
-                timestamp: number;
                 to: string;
+                timestamp: number;
             }, {
                 data: string;
                 chainId: number;
-                timestamp: number;
                 to: string;
+                timestamp: number;
             }>;
         }, "strip", z.ZodTypeAny, {
             name: "EvmCallQuery";
             params: {
                 data: string;
                 chainId: number;
-                timestamp: number;
                 to: string;
+                timestamp: number;
             };
             hash: string;
         }, {
@@ -41,8 +41,8 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             params: {
                 data: string;
                 chainId: number;
-                timestamp: number;
                 to: string;
+                timestamp: number;
             };
             hash: string;
         }>;
@@ -54,7 +54,6 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             value: string;
         }>;
     }, "strip", z.ZodTypeAny, {
-        signature: string;
         result: {
             value: string;
         };
@@ -63,13 +62,13 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             params: {
                 data: string;
                 chainId: number;
-                timestamp: number;
                 to: string;
+                timestamp: number;
             };
             hash: string;
         };
-    }, {
         signature: string;
+    }, {
         result: {
             value: string;
         };
@@ -78,11 +77,12 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             params: {
                 data: string;
                 chainId: number;
-                timestamp: number;
                 to: string;
+                timestamp: number;
             };
             hash: string;
         };
+        signature: string;
     }>, z.ZodObject<{
         signature: z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>;
         query: z.ZodObject<{
@@ -142,7 +142,6 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             value: string;
         }>;
     }, "strip", z.ZodTypeAny, {
-        signature: string;
         result: {
             value: string;
         };
@@ -157,8 +156,8 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             };
             hash: string;
         };
-    }, {
         signature: string;
+    }, {
         result: {
             value: string;
         };
@@ -173,6 +172,7 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             };
             hash: string;
         };
+        signature: string;
     }>, z.ZodObject<{
         signature: z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>;
         query: z.ZodObject<{
@@ -310,7 +310,6 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             };
         }>;
     }, "strip", z.ZodTypeAny, {
-        signature: string;
         result: {
             value: {
                 timestamp: number;
@@ -337,8 +336,8 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             };
             hash: string;
         };
-    }, {
         signature: string;
+    }, {
         result: {
             value: {
                 timestamp: number;
@@ -365,6 +364,7 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             };
             hash: string;
         };
+        signature: string;
     }>, z.ZodObject<{
         signature: z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>;
         query: z.ZodObject<{
@@ -428,7 +428,6 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             };
         }>;
     }, "strip", z.ZodTypeAny, {
-        signature: string;
         result: {
             value: {
                 data: string;
@@ -445,8 +444,8 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             };
             hash: string;
         };
-    }, {
         signature: string;
+    }, {
         result: {
             value: {
                 data: string;
@@ -463,6 +462,7 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             };
             hash: string;
         };
+        signature: string;
     }>, z.ZodObject<{
         signature: z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>;
         query: z.ZodObject<{
@@ -558,7 +558,6 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             };
         }>;
     }, "strip", z.ZodTypeAny, {
-        signature: string;
         result: {
             value: {
                 accountsInfo: {
@@ -579,8 +578,8 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             };
             hash: string;
         };
-    }, {
         signature: string;
+    }, {
         result: {
             value: {
                 accountsInfo: {
@@ -601,6 +600,7 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             };
             hash: string;
         };
+        signature: string;
     }>]>, "many">>;
     hash: z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>;
     triggerSig: z.ZodString;
@@ -621,11 +621,11 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
     version: z.ZodEffects<z.ZodString, string, string>;
 }, "strip", z.ZodTypeAny, {
     user: string;
-    version: string;
-    input: Record<string, unknown>;
-    triggerSig: string;
     timestamp: number;
     hash: string;
+    version: string;
+    triggerSig: string;
+    input: Record<string, unknown>;
     callbackUrl: string;
     settlers: string;
     triggerConfig: {
@@ -634,7 +634,6 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
     };
     oracleUrls?: string[] | undefined;
     oracleResponses?: ({
-        signature: string;
         result: {
             value: string;
         };
@@ -643,13 +642,13 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             params: {
                 data: string;
                 chainId: number;
-                timestamp: number;
                 to: string;
+                timestamp: number;
             };
             hash: string;
         };
-    } | {
         signature: string;
+    } | {
         result: {
             value: {
                 accountsInfo: {
@@ -670,8 +669,8 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             };
             hash: string;
         };
-    } | {
         signature: string;
+    } | {
         result: {
             value: string;
         };
@@ -686,8 +685,8 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             };
             hash: string;
         };
-    } | {
         signature: string;
+    } | {
         result: {
             value: {
                 timestamp: number;
@@ -714,8 +713,8 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             };
             hash: string;
         };
-    } | {
         signature: string;
+    } | {
         result: {
             value: {
                 data: string;
@@ -732,14 +731,15 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             };
             hash: string;
         };
+        signature: string;
     })[] | undefined;
 }, {
     user: string;
-    version: string;
-    input: Record<string, unknown>;
-    triggerSig: string;
     timestamp: number;
     hash: string;
+    version: string;
+    triggerSig: string;
+    input: Record<string, unknown>;
     callbackUrl: string;
     settlers: string;
     triggerConfig: {
@@ -748,7 +748,6 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
     };
     oracleUrls?: string[] | undefined;
     oracleResponses?: ({
-        signature: string;
         result: {
             value: string;
         };
@@ -757,13 +756,13 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             params: {
                 data: string;
                 chainId: number;
-                timestamp: number;
                 to: string;
+                timestamp: number;
             };
             hash: string;
         };
-    } | {
         signature: string;
+    } | {
         result: {
             value: {
                 accountsInfo: {
@@ -784,8 +783,8 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             };
             hash: string;
         };
-    } | {
         signature: string;
+    } | {
         result: {
             value: string;
         };
@@ -800,8 +799,8 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             };
             hash: string;
         };
-    } | {
         signature: string;
+    } | {
         result: {
             value: {
                 timestamp: number;
@@ -828,8 +827,8 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             };
             hash: string;
         };
-    } | {
         signature: string;
+    } | {
         result: {
             value: {
                 data: string;
@@ -846,14 +845,15 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             };
             hash: string;
         };
+        signature: string;
     })[] | undefined;
 }>, {
     user: string;
-    version: string;
-    input: Record<string, unknown>;
-    triggerSig: string;
     timestamp: number;
     hash: string;
+    version: string;
+    triggerSig: string;
+    input: Record<string, unknown>;
     callbackUrl: string;
     settlers: string;
     triggerConfig: {
@@ -862,7 +862,6 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
     };
     oracleUrls?: string[] | undefined;
     oracleResponses?: ({
-        signature: string;
         result: {
             value: string;
         };
@@ -871,13 +870,13 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             params: {
                 data: string;
                 chainId: number;
-                timestamp: number;
                 to: string;
+                timestamp: number;
             };
             hash: string;
         };
-    } | {
         signature: string;
+    } | {
         result: {
             value: {
                 accountsInfo: {
@@ -898,8 +897,8 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             };
             hash: string;
         };
-    } | {
         signature: string;
+    } | {
         result: {
             value: string;
         };
@@ -914,8 +913,8 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             };
             hash: string;
         };
-    } | {
         signature: string;
+    } | {
         result: {
             value: {
                 timestamp: number;
@@ -942,8 +941,8 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             };
             hash: string;
         };
-    } | {
         signature: string;
+    } | {
         result: {
             value: {
                 data: string;
@@ -960,14 +959,15 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             };
             hash: string;
         };
+        signature: string;
     })[] | undefined;
 }, {
     user: string;
-    version: string;
-    input: Record<string, unknown>;
-    triggerSig: string;
     timestamp: number;
     hash: string;
+    version: string;
+    triggerSig: string;
+    input: Record<string, unknown>;
     callbackUrl: string;
     settlers: string;
     triggerConfig: {
@@ -976,7 +976,6 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
     };
     oracleUrls?: string[] | undefined;
     oracleResponses?: ({
-        signature: string;
         result: {
             value: string;
         };
@@ -985,13 +984,13 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             params: {
                 data: string;
                 chainId: number;
-                timestamp: number;
                 to: string;
+                timestamp: number;
             };
             hash: string;
         };
-    } | {
         signature: string;
+    } | {
         result: {
             value: {
                 accountsInfo: {
@@ -1012,8 +1011,8 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             };
             hash: string;
         };
-    } | {
         signature: string;
+    } | {
         result: {
             value: string;
         };
@@ -1028,8 +1027,8 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             };
             hash: string;
         };
-    } | {
         signature: string;
+    } | {
         result: {
             value: {
                 timestamp: number;
@@ -1056,8 +1055,8 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             };
             hash: string;
         };
-    } | {
         signature: string;
+    } | {
         result: {
             value: {
                 data: string;
@@ -1074,6 +1073,7 @@ export declare const RunExecutionRequestValidator: z.ZodEffects<z.ZodObject<{
             };
             hash: string;
         };
+        signature: string;
     })[] | undefined;
 }>;
 export declare const RunExecutionResultValidator: z.ZodObject<{

package/dist/settler/svm/Settler.d.ts

@@ -1,4 +1,4 @@
-import { IdlTypes, Program, Provider, web3 } from '@coral-xyz/anchor';
+import { Address, IdlTypes, Program, Provider, web3 } from '@coral-xyz/anchor';
 import { OpType, Proposal } from '../../shared';
 import { Settler } from './idls/types/settler';
 import { EntityType } from './Controller';
@@ -8,7 +8,7 @@ export default class SvmSettler {
     protected program: Program<Settler>;
     private validatorSigner;
     private proposalSigner;
-    constructor(provider?: Provider);
+    constructor(provider: Provider);
     initializeIx(domain: SolanaEip712Domain): Promise<web3.TransactionInstruction>;
     updateEip712DomainIx(domain: SolanaEip712Domain): Promise<web3.TransactionInstruction>;
     createIntentIx(intentHashHex: string, params: CreateIntentParams, isFinal?: boolean): Promise<web3.TransactionInstruction>;
@@ -17,13 +17,13 @@ export default class SvmSettler {
     createProposalIx(intentHashHex: string, params: CreateProposalParams): Promise<web3.TransactionInstruction>;
     addInstructionsToProposalIx(intentHashHex: string, moreInstructions: ProposalInstruction[], finalize?: boolean): Promise<web3.TransactionInstruction>;
     claimStaleProposalIx(intentHashHex: string): Promise<web3.TransactionInstruction>;
-    addValidatorSigIxs(intentHashHex: string, validatorEthAddress: Buffer, signature: number[], recoveryId: number): Promise<web3.TransactionInstruction[]>;
-    addAxiaSigIxs(proposal: web3.PublicKey, axiaEthAddress: Buffer, signature: number[], recoveryId: number): Promise<web3.TransactionInstruction[]>;
+    addValidatorSigIxs(intentHashHex: string, validatorEthAddress: string, signature: string): Promise<web3.TransactionInstruction[]>;
+    addAxiaSigIxs(intentHash: string, proposal: Proposal, axiaEthAddress: string, signature: string): Promise<web3.TransactionInstruction[]>;
     getSettlerSettingsKey(): web3.PublicKey;
     getIntentKey(intentHashHex: string): web3.PublicKey;
     getFulfilledIntentKey(intentHashHex: string): web3.PublicKey;
-    getProposalKey(intentHashHex: string, solverPubkey?: web3.PublicKey): web3.PublicKey;
-    getEntityRegistryKey(entityType: EntityType, entityAddress: web3.PublicKey | Buffer): web3.PublicKey;
+    getProposalKey(intentHashHex: string, solverPubkey?: Address): web3.PublicKey;
+    getEntityRegistryKey(entityType: EntityType, entityAddress: Address | Buffer): web3.PublicKey;
     getSignerKey(): web3.PublicKey;
     opTypeToAnchorEnum(op: OpType): IdlTypes<Settler>['opType'];
     anchorProposalToEip712Proposal(proposalAccount: ProposalAccount, intentHash: number[]): Proposal & {
@@ -36,6 +36,7 @@ export default class SvmSettler {
     private parseTokenFees;
     private parseProposalInstructions;
     private pubkeyOrBufferToBuffer;
+    private parseSignature;
 }
 export {};
 //# sourceMappingURL=Settler.d.ts.map

package/dist/settler/svm/Settler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Settler.d.ts","sourceRoot":"","sources":["../../../src/settler/svm/Settler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Settler.d.ts","sourceRoot":"","sources":["../../../src/settler/svm/Settler.ts"],"names":[],"mappings":"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"}

package/dist/settler/svm/Settler.js

@@ -24,6 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const anchor_1 = require("@coral-xyz/anchor");
+const ethers_1 = require("ethers");
 const axia_1 = require("../../axia");
 const shared_1 = require("../../shared");
 const validator_1 = require("../../validator");
@@ -45,14 +46,14 @@ class SvmSettler {
         return ix;
     }
     async createIntentIx(intentHashHex, params, isFinal = true) {
-        const { op, user, nonceHex, deadline, minValidations, dataHex, maxFees, eventsHex } = params;
+        const { op, user, nonce: nonceHex, deadline, minValidations, data: dataHex, maxFees, events: eventsHex } = params;
         const intentHash = this.parseIntentHashHex(intentHashHex);
         const nonce = this.parseIntentNonceHex(nonceHex);
         const data = (0, shared_1.hexToBytes)(dataHex);
         const maxFeesBn = this.parseTokenFees(maxFees);
         const events = this.parseIntentEventsHex(eventsHex);
         const ix = await this.program.methods
-            .createIntent(intentHash, data, maxFeesBn, events, minValidations, this.opTypeToAnchorEnum(op), user, nonce, new anchor_1.BN(deadline), isFinal)
+            .createIntent(intentHash, data, maxFeesBn, events, minValidations, this.opTypeToAnchorEnum(op), (0, anchor_1.translateAddress)(user), nonce, new anchor_1.BN(deadline), isFinal)
             .accountsPartial({
             solver: this.getSignerKey(),
             solverRegistry: this.getEntityRegistryKey(Controller_1.EntityType.Solver, this.getSignerKey()),
@@ -120,7 +121,8 @@ class SvmSettler {
             .instruction();
         return ix;
     }
-    async addValidatorSigIxs(intentHashHex, validatorEthAddress, signature, recoveryId) {
+    async addValidatorSigIxs(intentHashHex, validatorEthAddress, signature) {
+        const { signedMessage, recoveryId } = this.parseSignature(signature);
         const eip712Preimage = this.validatorSigner.getIntentMessage({
             hash: intentHashHex,
             settler: this.program.programId.toString(),
@@ -128,8 +130,8 @@ class SvmSettler {
         });
         const secp256k1Ix = anchor_1.web3.Secp256k1Program.createInstructionWithEthAddress({
             message: (0, shared_1.hexToBytes)(eip712Preimage),
-            ethAddress: validatorEthAddress,
-            signature: Buffer.from(signature),
+            ethAddress: (0, shared_1.hexToBytes)(validatorEthAddress),
+            signature: signedMessage,
             recoveryId,
         });
         const ix = await this.program.methods
@@ -139,25 +141,20 @@ class SvmSettler {
             solverRegistry: this.getEntityRegistryKey(Controller_1.EntityType.Solver, this.getSignerKey()),
             intent: this.getIntentKey(intentHashHex),
             fulfilledIntent: this.getFulfilledIntentKey(intentHashHex),
-            validatorRegistry: this.getEntityRegistryKey(Controller_1.EntityType.Validator, validatorEthAddress),
+            validatorRegistry: this.getEntityRegistryKey(Controller_1.EntityType.Validator, (0, shared_1.hexToBytes)(validatorEthAddress)),
             settlerSettings: this.getSettlerSettingsKey(),
             ixSysvar: anchor_1.web3.SYSVAR_INSTRUCTIONS_PUBKEY,
         })
             .instruction();
         return [secp256k1Ix, ix];
     }
-    async addAxiaSigIxs(proposal, axiaEthAddress, signature, recoveryId) {
-        const proposalAccount = await this.program.account.proposal.fetchNullable(proposal);
-        if (!proposalAccount)
-            throw new Error(`Couldn't fetch Proposal at address ${proposal}`);
-        const intentAccount = await this.program.account.intent.fetchNullable(proposalAccount.intent);
-        if (!intentAccount)
-            throw new Error(`Couldn't fetch Intent at address ${proposalAccount.intent}`);
-        const eip712Preimage = this.proposalSigner.getMessage(this.anchorProposalToEip712Proposal(proposalAccount, intentAccount.hash), { chainId: shared_1.Chains.Solana, address: this.program.programId.toString() });
+    async addAxiaSigIxs(intentHash, proposal, axiaEthAddress, signature) {
+        const { signedMessage, recoveryId } = this.parseSignature(signature);
+        const eip712Preimage = this.proposalSigner.getMessage({ ...proposal, intent: intentHash }, { chainId: shared_1.Chains.Solana, address: this.program.programId.toString() });
         const secp256k1Ix = anchor_1.web3.Secp256k1Program.createInstructionWithEthAddress({
             message: (0, shared_1.hexToBytes)(eip712Preimage),
             ethAddress: axiaEthAddress,
-            signature: Buffer.from(signature),
+            signature: signedMessage,
             recoveryId,
         });
         const ix = await this.program.methods
@@ -165,9 +162,9 @@ class SvmSettler {
             .accountsPartial({
             solver: this.getSignerKey(),
             solverRegistry: this.getEntityRegistryKey(Controller_1.EntityType.Solver, this.getSignerKey()),
-            proposal,
-            intent: proposalAccount.intent,
-            axiaRegistry: this.getEntityRegistryKey(Controller_1.EntityType.Axia, axiaEthAddress),
+            proposal: this.getProposalKey(intentHash, proposal.solver),
+            intent: this.getIntentKey(intentHash),
+            axiaRegistry: this.getEntityRegistryKey(Controller_1.EntityType.Axia, (0, shared_1.hexToBytes)(axiaEthAddress)),
             settlerSettings: this.getSettlerSettingsKey(),
             ixSysvar: anchor_1.web3.SYSVAR_INSTRUCTIONS_PUBKEY,
         })
@@ -189,7 +186,7 @@ class SvmSettler {
         this.parseIntentHashHex(intentHashHex);
         const intentKey = this.getIntentKey(intentHashHex);
         const solver = solverPubkey || this.getSignerKey();
-        return anchor_1.web3.PublicKey.findProgramAddressSync([Buffer.from('proposal'), intentKey.toBuffer(), solver.toBuffer()], this.program.programId)[0];
+        return anchor_1.web3.PublicKey.findProgramAddressSync([Buffer.from('proposal'), intentKey.toBuffer(), (0, anchor_1.translateAddress)(solver).toBuffer()], this.program.programId)[0];
     }
     getEntityRegistryKey(entityType, entityAddress) {
         const addressBuffer = this.pubkeyOrBufferToBuffer(entityAddress);
@@ -254,18 +251,30 @@ class SvmSettler {
     }
     parseTokenFees(tokenFees) {
         return tokenFees.map((tokenFee) => ({
-            ...tokenFee,
             amount: new anchor_1.BN(tokenFee.amount),
+            mint: (0, anchor_1.translateAddress)(tokenFee.token),
         }));
     }
     parseProposalInstructions(instructions) {
         return instructions.map((instruction) => ({
             ...instruction,
+            programId: (0, anchor_1.translateAddress)(instruction.programId),
             data: typeof instruction.data === 'string' ? (0, shared_1.hexToBytes)(instruction.data) : instruction.data,
         }));
     }
     pubkeyOrBufferToBuffer(pubkeyOrBuffer) {
-        return Buffer.isBuffer(pubkeyOrBuffer) ? pubkeyOrBuffer : pubkeyOrBuffer.toBuffer();
+        return Buffer.isBuffer(pubkeyOrBuffer) ? pubkeyOrBuffer : (0, anchor_1.translateAddress)(pubkeyOrBuffer).toBuffer();
+    }
+    parseSignature(signature) {
+        if (!(0, shared_1.isValidHex)(signature))
+            throw new Error('Invalid signature - not hex');
+        if ((0, shared_1.hexToBytes)(signature).length !== 65)
+            throw new Error('Invalid signature - not 65 bytes');
+        const parsedSig = ethers_1.ethers.Signature.from(signature);
+        return {
+            signedMessage: Buffer.from(ethers_1.ethers.getBytes(parsedSig.r + parsedSig.s.slice(2))),
+            recoveryId: parsedSig.v - 27,
+        };
     }
 }
 exports.default = SvmSettler;