improve multisigs and mintless jettons

tonkeeper · Sep 16, 2024 · 88f04f1 · 88f04f1
1 parent 96a0ed0
commit 88f04f1
Show file tree

Hide file tree

Showing 8 changed files with 154 additions and 11 deletions.
diff --git a/api/openapi.json b/api/openapi.json
@@ -3783,6 +3783,9 @@
       "format": "address",
       "type": "string"
      },
+     "custom_payload_api_uri": {
+      "type": "string"
+     },
      "decimals": {
       "example": 9,
       "type": "integer"
@@ -4321,6 +4324,10 @@
       "format": "int32",
       "type": "integer"
      },
+     "creation_date": {
+      "format": "int64",
+      "type": "integer"
+     },
      "expiration_date": {
       "format": "int64",
       "type": "integer"
@@ -4337,6 +4344,14 @@
       "example": false,
       "type": "boolean"
      },
+     "signed_by": {
+      "items": {
+       "example": "0:da6b1b6663a0e4d18cc8574ccd9db5296e367dd9324706f3bbd9eb1cd2caf0bf",
+       "format": "address",
+       "type": "string"
+      },
+      "type": "array"
+     },
      "signers": {
       "items": {
        "example": "0:da6b1b6663a0e4d18cc8574ccd9db5296e367dd9324706f3bbd9eb1cd2caf0bf",
@@ -4358,7 +4373,9 @@
      "signers",
      "approvals_num",
      "expiration_date",
-     "risk"
+     "risk",
+     "creation_date",
+     "signed_by"
     ],
     "type": "object"
    },

diff --git a/api/openapi.yml b/api/openapi.yml
@@ -5345,6 +5345,8 @@ components:
           example: https://cache.tonapi.io/images/jetton.jpg
         verification:
           $ref: '#/components/schemas/JettonVerificationType'
+        custom_payload_api_uri:  # todo: maybe remove
+          type: string
     JettonBalance:
       type: object
       required:
@@ -5574,6 +5576,8 @@ components:
         - approvals_num
         - expiration_date
         - risk
+        - creation_date
+        - signed_by
       properties:
         address:
           type: string
@@ -5603,6 +5607,15 @@ components:
           format: int64
         risk:
           $ref: '#/components/schemas/Risk'
+        creation_date:
+          type: integer
+          format: int64
+        signed_by:
+          type: array
+          items:
+            type: string
+            format: address
+            example: "0:da6b1b6663a0e4d18cc8574ccd9db5296e367dd9324706f3bbd9eb1cd2caf0bf"
     Refund:
       type: object
       required:

diff --git a/pkg/api/converters.go b/pkg/api/converters.go
@@ -253,6 +253,7 @@ func (h *Handler) convertMultisig(ctx context.Context, item core.Multisig) (*oas
 			Signers:          signers,
 			ApprovalsNum:     order.ApprovalsNum,
 			ExpirationDate:   order.ExpirationDate,
+			CreationDate:     order.CreationDate,
 			Risk:             oasRisk,
 		})
 	}

diff --git a/pkg/api/jetton_converters.go b/pkg/api/jetton_converters.go
@@ -24,6 +24,9 @@ func jettonPreview(master ton.AccountID, meta NormalizedMetadata) oas.JettonPrev
 		Decimals:     meta.Decimals,
 		Image:        meta.Image,
 	}
+	if meta.CustomPayloadApiUri != "" {
+		preview.CustomPayloadAPIURI = oas.NewOptString(meta.CustomPayloadApiUri)
+	}
 	return preview
 }
 

diff --git a/pkg/core/multisig.go b/pkg/core/multisig.go
@@ -23,5 +23,6 @@ type MultisigOrder struct {
 	ApprovalsMask    []byte
 	ApprovalsNum     int32
 	ExpirationDate   int64
+	CreationDate     int64
 	Actions          []abi.MultisigSendMessageAction
 }
diff --git a/pkg/oas/oas_json_gen.go b/pkg/oas/oas_json_gen.go
diff --git a/pkg/oas/oas_schemas_gen.go b/pkg/oas/oas_schemas_gen.go
diff --git a/pkg/oas/oas_validators_gen.go b/pkg/oas/oas_validators_gen.go