fix: add func to get objectChange Owner data

This commit is contained in:
miancan
2024-05-31 16:45:29 +08:00
parent d51dbdb85d
commit 28b06d2c10
2 changed files with 54 additions and 23 deletions

View File

@@ -89,28 +89,7 @@ type SuiObjectResponseError struct {
Digest string `json:"digest"`
}
func (o *ObjectOwner) UnmarshalJSON(data []byte) error {
res := gjson.ParseBytes(data)
if !res.IsObject() {
o.ObjectType = res.String()
return nil
}
o.AddressOwner = res.Get("AddressOwner").String()
o.ObjectOwner = res.Get("ObjectOwner").String()
shard := res.Get("Shared").String()
if shard != "" {
var objectShare ObjectShare
err := json.Unmarshal([]byte(shard), &objectShare)
if err != nil {
return err
}
o.Shared = objectShare
}
return nil
}
type ObjectOwner struct { //This struct has its own UnmarshalJSON method !!!
ObjectType string `json:"ObjectType"` //if Immutable return Immutable
type ObjectOwner struct {
// the owner's Sui address
AddressOwner string `json:"AddressOwner"`
ObjectOwner string `json:"ObjectOwner"`

View File

@@ -1,5 +1,10 @@
package models
import (
"encoding/json"
"github.com/tidwall/gjson"
)
type GetTransactionMetaData struct {
GatewayTxSeqNumber uint64 `json:"gatewayTxSeqNumber"`
TransactionDigest string `json:"transactionDigest"`
@@ -186,10 +191,57 @@ type SuiTransactionBlockResponse struct {
ConfirmedLocalExecution bool `json:"confirmedLocalExecution,omitempty"`
}
func (o ObjectChange) GetObjectChangeAddressOwner() string {
b, err := json.Marshal(o.Owner)
if err != nil {
return ""
}
if gjson.ParseBytes(b).IsObject() {
var owner ObjectOwner
err = json.Unmarshal(b, &owner)
if err == nil {
return owner.AddressOwner
}
}
return ""
}
func (o ObjectChange) GetObjectChangeObjectOwner() string {
b, err := json.Marshal(o.Owner)
if err != nil {
return ""
}
if gjson.ParseBytes(b).IsObject() {
var owner ObjectOwner
err = json.Unmarshal(b, &owner)
if err == nil {
return owner.ObjectOwner
}
}
return ""
}
func (o ObjectChange) GetObjectOwnerShare() ObjectShare {
var share ObjectShare
b, err := json.Marshal(o.Owner)
if err != nil {
return share
}
if gjson.ParseBytes(b).IsObject() {
var owner ObjectOwner
err = json.Unmarshal(b, &owner)
if err == nil {
return owner.Shared
}
}
return share
}
type ObjectChange struct {
Type string `json:"type"`
Sender string `json:"sender"`
Owner ObjectOwner `json:"owner"`
Owner interface{} `json:"owner"`
ObjectType string `json:"objectType"`
ObjectId string `json:"objectId"`
PackageId string `json:"packageId"`