From 719ab3069ff01caabf5c22b2c41eced53756ed43 Mon Sep 17 00:00:00 2001
From: Nami <me@nami.sh>
Date: Tue, 29 Oct 2024 18:49:16 +0400
Subject: [PATCH] fix(payloads): fix payload format for relay-signer (#604)

* fix(payloads): fix payload format

* test(relay-signer): fix tests
---
 packages/relay-signer/src/action/index.test.ts | 6 +++---
 packages/relay-signer/src/action/index.ts      | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/relay-signer/src/action/index.test.ts b/packages/relay-signer/src/action/index.test.ts
index 24a5a6c3..63b06e5e 100644
--- a/packages/relay-signer/src/action/index.test.ts
+++ b/packages/relay-signer/src/action/index.test.ts
@@ -88,7 +88,7 @@ describe('ActionRelayer', () => {
       expect(relayer.lambda.invoke).toHaveBeenCalledWith({
         FunctionName: 'arn',
         InvocationType: 'RequestResponse',
-        Payload: '{"action":"replace-tx","payload":{"to":"0x0","gasLimit":21000}}',
+        Payload: '{"action":"replace-tx","payload":{"to":"0x0","gasLimit":21000,"nonce":10}}',
       });
     });
 
@@ -97,7 +97,7 @@ describe('ActionRelayer', () => {
       expect(relayer.lambda.invoke).toHaveBeenCalledWith({
         FunctionName: 'arn',
         InvocationType: 'RequestResponse',
-        Payload: '{"action":"replace-tx","txPayload":{"to":"0x0","gasLimit":21000,"id":"123-456-abc"}}',
+        Payload: '{"action":"replace-tx","payload":{"to":"0x0","gasLimit":21000,"id":"123-456-abc"}}',
       });
     });
   });
@@ -108,7 +108,7 @@ describe('ActionRelayer', () => {
       expect(relayer.lambda.invoke).toHaveBeenCalledWith({
         FunctionName: 'arn',
         InvocationType: 'RequestResponse',
-        Payload: '{"action":"cancel-tx","id":"123-456-abc"}',
+        Payload: '{"action":"cancel-tx","payload":"123-456-abc"}',
       });
     });
   });
diff --git a/packages/relay-signer/src/action/index.ts b/packages/relay-signer/src/action/index.ts
index 813b8785..6462d135 100644
--- a/packages/relay-signer/src/action/index.ts
+++ b/packages/relay-signer/src/action/index.ts
@@ -54,7 +54,7 @@ export class ActionRelayer extends BaseActionClient implements IRelayer {
 
   public async replaceTransactionById(id: string, payload: RelayerTransactionPayload): Promise<RelayerTransaction> {
     const txPayload: RelayerTransactionPayload & { id: string } = { ...payload, id };
-    return this.execute({ action: 'replace-tx', txPayload });
+    return this.execute({ action: 'replace-tx', payload: txPayload });
   }
 
   public async replaceTransactionByNonce(
@@ -62,11 +62,12 @@ export class ActionRelayer extends BaseActionClient implements IRelayer {
     payload: RelayerTransactionPayload,
   ): Promise<RelayerTransaction> {
     const txPayload: RelayerTransactionPayload & { nonce: number } = { ...payload, nonce };
-    return this.execute({ action: 'replace-tx', payload });
+    return this.execute({ action: 'replace-tx', payload: txPayload });
   }
 
   public async cancelTransactionById(id: string): Promise<TransactionDeleteResponse> {
-    return this.execute({ action: 'cancel-tx', id });
+    const payload = id;
+    return this.execute({ action: 'cancel-tx', payload });
   }
 
   public async getRelayer(): Promise<RelayerGetResponse> {