From aabd57c7088e89e74bc016f1cbc6dd47f669394b Mon Sep 17 00:00:00 2001
From: Junkil Park <juki14@gmail.com>
Date: Fri, 8 Mar 2024 15:35:50 -0800
Subject: [PATCH] Fix the API error for Multisig V2

- For the correct (de)serialization, added the serde attribute (tag = "type") to the enum type `MultisigTransactionPayload`
---
 api/doc/spec.json                             | 27 ++++++++++++++++++-
 api/doc/spec.yaml                             | 16 ++++++++++-
 api/test-context/src/test_context.rs          |  2 ++
 api/types/src/transaction.rs                  |  4 +++
 .../typescript/sdk/src/generated/index.ts     |  1 +
 .../models/MultisigTransactionPayload.ts      |  4 +--
 ...TransactionPayload_EntryFunctionPayload.ts | 10 +++++++
 7 files changed, 60 insertions(+), 4 deletions(-)
 create mode 100644 ecosystem/typescript/sdk/src/generated/models/MultisigTransactionPayload_EntryFunctionPayload.ts

diff --git a/api/doc/spec.json b/api/doc/spec.json
index c881b1d935ccc..befbb0f658479 100644
--- a/api/doc/spec.json
+++ b/api/doc/spec.json
@@ -13366,7 +13366,32 @@
       },
       "MultisigTransactionPayload": {
         "type": "object",
-        "anyOf": [
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/MultisigTransactionPayload_EntryFunctionPayload"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "entry_function_payload": "#/components/schemas/MultisigTransactionPayload_EntryFunctionPayload"
+          }
+        }
+      },
+      "MultisigTransactionPayload_EntryFunctionPayload": {
+        "allOf": [
+          {
+            "type": "object",
+            "required": [
+              "type"
+            ],
+            "properties": {
+              "type": {
+                "type": "string",
+                "example": "entry_function_payload"
+              }
+            }
+          },
           {
             "$ref": "#/components/schemas/EntryFunctionPayload"
           }
diff --git a/api/doc/spec.yaml b/api/doc/spec.yaml
index 2248780bc4d92..4e4a3ce47048e 100644
--- a/api/doc/spec.yaml
+++ b/api/doc/spec.yaml
@@ -10072,7 +10072,21 @@ components:
           $ref: '#/components/schemas/MultisigTransactionPayload'
     MultisigTransactionPayload:
       type: object
-      anyOf:
+      oneOf:
+      - $ref: '#/components/schemas/MultisigTransactionPayload_EntryFunctionPayload'
+      discriminator:
+        propertyName: type
+        mapping:
+          entry_function_payload: '#/components/schemas/MultisigTransactionPayload_EntryFunctionPayload'
+    MultisigTransactionPayload_EntryFunctionPayload:
+      allOf:
+      - type: object
+        required:
+        - type
+        properties:
+          type:
+            type: string
+            example: entry_function_payload
       - $ref: '#/components/schemas/EntryFunctionPayload'
     PendingTransaction:
       type: object
diff --git a/api/test-context/src/test_context.rs b/api/test-context/src/test_context.rs
index 800d8bacee042..8b755a3e0baf5 100644
--- a/api/test-context/src/test_context.rs
+++ b/api/test-context/src/test_context.rs
@@ -397,6 +397,7 @@ impl TestContext {
                 "type": "multisig_payload",
                 "multisig_address": multisig_account.to_hex_literal(),
                 "transaction_payload": {
+                    "type": "entry_function_payload",
                     "function": function,
                     "type_arguments": type_args,
                     "arguments": args
@@ -822,6 +823,7 @@ impl TestContext {
                 "type": "multisig_payload",
                 "multisig_address": multisig_account.to_hex_literal(),
                 "transaction_payload": {
+                    "type": "entry_function_payload",
                     "function": function,
                     "type_arguments": type_args,
                     "arguments": args
diff --git a/api/types/src/transaction.rs b/api/types/src/transaction.rs
index a5355f954a2f8..23024fb15a2db 100755
--- a/api/types/src/transaction.rs
+++ b/api/types/src/transaction.rs
@@ -740,6 +740,8 @@ impl TryFrom<Script> for ScriptPayload {
 // We use an enum here for extensibility so we can add Script payload support
 // in the future for example.
 #[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize, Union)]
+#[serde(tag = "type", rename_all = "snake_case")]
+#[oai(one_of, discriminator_name = "type", rename_all = "snake_case")]
 pub enum MultisigTransactionPayload {
     EntryFunctionPayload(EntryFunctionPayload),
 }
@@ -751,6 +753,8 @@ pub struct MultisigPayload {
     pub multisig_address: Address,
 
     // Transaction payload is optional if already stored on chain.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(default)]
     pub transaction_payload: Option<MultisigTransactionPayload>,
 }
 
diff --git a/ecosystem/typescript/sdk/src/generated/index.ts b/ecosystem/typescript/sdk/src/generated/index.ts
index 81295260e4a45..860dbb5232369 100644
--- a/ecosystem/typescript/sdk/src/generated/index.ts
+++ b/ecosystem/typescript/sdk/src/generated/index.ts
@@ -58,6 +58,7 @@ export type { MultiEd25519Signature } from './models/MultiEd25519Signature';
 export type { MultiKeySignature } from './models/MultiKeySignature';
 export type { MultisigPayload } from './models/MultisigPayload';
 export type { MultisigTransactionPayload } from './models/MultisigTransactionPayload';
+export type { MultisigTransactionPayload_EntryFunctionPayload } from './models/MultisigTransactionPayload_EntryFunctionPayload';
 export type { PendingTransaction } from './models/PendingTransaction';
 export type { PublicKey } from './models/PublicKey';
 export type { PublicKey_string_HexEncodedBytes_ } from './models/PublicKey_string_HexEncodedBytes_';
diff --git a/ecosystem/typescript/sdk/src/generated/models/MultisigTransactionPayload.ts b/ecosystem/typescript/sdk/src/generated/models/MultisigTransactionPayload.ts
index d3191b538308b..ea7b27a3d53d8 100644
--- a/ecosystem/typescript/sdk/src/generated/models/MultisigTransactionPayload.ts
+++ b/ecosystem/typescript/sdk/src/generated/models/MultisigTransactionPayload.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import type { EntryFunctionPayload } from './EntryFunctionPayload';
+import type { MultisigTransactionPayload_EntryFunctionPayload } from './MultisigTransactionPayload_EntryFunctionPayload';
 
-export type MultisigTransactionPayload = EntryFunctionPayload;
+export type MultisigTransactionPayload = MultisigTransactionPayload_EntryFunctionPayload;
 
diff --git a/ecosystem/typescript/sdk/src/generated/models/MultisigTransactionPayload_EntryFunctionPayload.ts b/ecosystem/typescript/sdk/src/generated/models/MultisigTransactionPayload_EntryFunctionPayload.ts
new file mode 100644
index 0000000000000..e438d2daa638e
--- /dev/null
+++ b/ecosystem/typescript/sdk/src/generated/models/MultisigTransactionPayload_EntryFunctionPayload.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { EntryFunctionPayload } from './EntryFunctionPayload';
+
+export type MultisigTransactionPayload_EntryFunctionPayload = ({
+    type: string;
+} & EntryFunctionPayload);
+