Skip to content

Commit 8d0139b

Browse files
committed
fix
1 parent 4a2d6c8 commit 8d0139b

7 files changed

+17
-139
lines changed

api/openapi.json

-8
Original file line numberDiff line numberDiff line change
@@ -3133,17 +3133,12 @@
31333133
"example": "https://cache.tonapi.io/images/extra.jpg",
31343134
"type": "string"
31353135
},
3136-
"name": {
3137-
"example": "FMS",
3138-
"type": "string"
3139-
},
31403136
"symbol": {
31413137
"example": "FMS",
31423138
"type": "string"
31433139
}
31443140
},
31453141
"required": [
3146-
"name",
31473142
"symbol",
31483143
"decimals",
31493144
"image"
@@ -3315,9 +3310,6 @@
33153310
"recipient": {
33163311
"$ref": "#/components/schemas/AccountAddress"
33173312
},
3318-
"refund": {
3319-
"$ref": "#/components/schemas/Refund"
3320-
},
33213313
"sender": {
33223314
"$ref": "#/components/schemas/AccountAddress"
33233315
}

api/openapi.yml

-6
Original file line numberDiff line numberDiff line change
@@ -5848,14 +5848,10 @@ components:
58485848
EcPreview:
58495849
type: object
58505850
required:
5851-
- name
58525851
- symbol
58535852
- decimals
58545853
- image
58555854
properties:
5856-
name:
5857-
type: string
5858-
example: FMS
58595855
symbol:
58605856
type: string
58615857
example: FMS
@@ -5887,8 +5883,6 @@ components:
58875883
example: "Hi! This is your salary. \nFrom accounting with love."
58885884
encrypted_comment:
58895885
$ref: '#/components/schemas/EncryptedComment'
5890-
refund:
5891-
$ref: '#/components/schemas/Refund'
58925886
currency:
58935887
$ref: '#/components/schemas/EcPreview'
58945888
SmartContractAction:

pkg/api/event_converters.go

-7
Original file line numberDiff line numberDiff line change
@@ -162,18 +162,11 @@ func (h *Handler) convertActionExtraCurrencyTransfer(t *bath.ExtraCurrencyTransf
162162
Sender: convertAccountAddress(t.Sender, h.addressBook),
163163
EncryptedComment: convertEncryptedComment(t.EncryptedComment),
164164
Currency: oas.EcPreview{
165-
Name: meta.Name,
166165
Symbol: meta.Symbol,
167166
Decimals: meta.Decimals,
168167
Image: meta.Image,
169168
},
170169
})
171-
if t.Refund != nil {
172-
action.Value.Refund.SetTo(oas.Refund{
173-
Type: oas.RefundType(t.Refund.Type),
174-
Origin: t.Refund.Origin,
175-
})
176-
}
177170
simplePreview := oas.ActionSimplePreview{
178171
Name: "Extra Currency Transfer",
179172
Description: "", // TODO: add description

pkg/bath/actions.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ type (
110110
EncryptedComment *EncryptedComment
111111
Recipient tongo.AccountID
112112
Sender tongo.AccountID
113-
Refund *Refund
114113
}
115114
SmartContractAction struct {
116115
TonAttached int64
@@ -274,7 +273,7 @@ func (a Action) ContributeToExtra(account tongo.AccountID) int64 {
274273
return 0
275274
}
276275
switch a.Type {
277-
case NftItemTransfer, ContractDeploy, UnSubscription, JettonMint, JettonBurn, WithdrawStakeRequest, DomainRenew, InscriptionMint, InscriptionTransfer: // actions without extra
276+
case NftItemTransfer, ContractDeploy, UnSubscription, JettonMint, JettonBurn, WithdrawStakeRequest, DomainRenew, InscriptionMint, InscriptionTransfer, ExtraCurrencyTransfer: // actions without extra
278277
return 0
279278
case TonTransfer:
280279
return detectDirection(account, a.TonTransfer.Sender, a.TonTransfer.Recipient, a.TonTransfer.Amount)
@@ -351,6 +350,10 @@ func (a *TonTransferAction) SubjectAccounts() []tongo.AccountID {
351350
return []tongo.AccountID{a.Sender, a.Recipient}
352351
}
353352

353+
func (a *ExtraCurrencyTransferAction) SubjectAccounts() []tongo.AccountID {
354+
return []tongo.AccountID{a.Sender, a.Recipient}
355+
}
356+
354357
func (a *SmartContractAction) SubjectAccounts() []tongo.AccountID {
355358
return []tongo.AccountID{a.Contract, a.Executor}
356359
}

pkg/oas/oas_json_gen.go

+12-46
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/oas/oas_schemas_gen.go

-22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/oas/oas_validators_gen.go

-48
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)