diff --git a/internal/hub/handler_bridging.go b/internal/hub/handler_bridging.go index 2a9941cc..a73bde57 100644 --- a/internal/hub/handler_bridging.go +++ b/internal/hub/handler_bridging.go @@ -3,7 +3,6 @@ package hub import ( "fmt" "net/http" - "time" "github.com/labstack/echo/v4" ) @@ -17,15 +16,15 @@ func (h *Hub) GetBridgingHandler(c echo.Context) error { data := []*Bridging{ { - Sender: "0xA", - Receiver: "0xA", + Sender: "0x428AB2BA90Eba0a4Be7aF34C9Ac451ab061AC010", + Receiver: "0x428AB2BA90Eba0a4Be7aF34C9Ac451ab061AC010", Block: &Block{ - Number: 1, - Hash: "0x01", - Timestamp: uint64(time.Now().Unix()), + Number: 18884279, + Hash: "0x2a43aaef44872d575f17ab0482e72b8da0083017d4d7ede5790399b10838e68d", + Timestamp: 1703768603, }, Transaction: &Transaction{ - Hash: "0x02", + Hash: "0x427cc05cd02ef3e031cb89387bafd39fd91a440c81eceac9b14d40fdba4fd9cc", Index: 70, Nonce: 147973, Status: "success", @@ -34,38 +33,38 @@ func (h *Hub) GetBridgingHandler(c echo.Context) error { Event: &BridgingEvent{ Token: &Token{ Address: &Address{ - Layer1: "0x1", - Layer2: "0x2", + Layer1: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", + Layer2: "0x7F5c764cBc14f9669B88837ca1490cCa17c31607", }, + Value: "132657840479", + Decimal: 18, }, - Value: "1000000000000000000", - Decimal: 18, }, }, { - Sender: "0xB", - Receiver: "0xB", + Sender: "0x428AB2BA90Eba0a4Be7aF34C9Ac451ab061AC010", + Receiver: "0x428AB2BA90Eba0a4Be7aF34C9Ac451ab061AC010", Block: &Block{ - Number: 2, - Hash: "0x03", - Timestamp: uint64(time.Now().Unix()), + Number: 18884279 + 1, + Hash: "0xd86e83801b9930975ede7d4d7103800ad8b27e2840ba71f575d27844feaa34a2", + Timestamp: 1703768603 + 1, }, Transaction: &Transaction{ - Hash: "0x04", - Index: 80, - Nonce: 147977, - Status: "failure", + Hash: "0xcc9df4abdf04d41b9caece18c044a19df93dfab78398bc130e3fe20dc50cc724", + Index: 70, + Nonce: 147973 + 1, + Status: "success", }, - Action: "stake", + Action: "withdraw", Event: &BridgingEvent{ Token: &Token{ Address: &Address{ - Layer1: "0x1", - Layer2: "0x2", + Layer1: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", + Layer2: "0x7F5c764cBc14f9669B88837ca1490cCa17c31607", }, + Value: "132657840479", + Decimal: 18, }, - Value: "1000000000000000000", - Decimal: 18, }, }, } @@ -106,13 +105,14 @@ type Bridging struct { } type BridgingEvent struct { - Token *Token `json:"token"` - Value string `json:"value"` - Decimal uint `json:"decimal"` + Token *Token `json:"token"` + Data string `json:"data"` } type Token struct { Address *Address `json:"address"` + Value string `json:"value"` + Decimal uint `json:"decimal"` } type Address struct { diff --git a/internal/hub/handler_staking.go b/internal/hub/handler_staking.go index df364b41..47604415 100644 --- a/internal/hub/handler_staking.go +++ b/internal/hub/handler_staking.go @@ -4,7 +4,6 @@ import ( "fmt" "math/big" "net/http" - "time" "github.com/labstack/echo/v4" ) @@ -18,48 +17,73 @@ func (h *Hub) GetStakingHandler(c echo.Context) error { data := []*Staking{ { - UserAddress: "0xA", - NodeAddress: "0x1", + UserAddress: "0xaA3f6537De9Ded08ACdC8a75773C70921B14bc34", + NodeAddress: "0x43cb41B12907C37757a8CdCA80deD9eD7356f3Aa", Block: &Block{ - Number: 1, - Hash: "0x01", - Timestamp: uint64(time.Now().Unix()), + Number: 18884279, + Hash: "0x2a43aaef44872d575f17ab0482e72b8da0083017d4d7ede5790399b10838e68d", + Timestamp: 1703768603, }, Transaction: &Transaction{ - Hash: "0x02", + Hash: "0x427cc05cd02ef3e031cb89387bafd39fd91a440c81eceac9b14d40fdba4fd9cc", Index: 70, Nonce: 147973, Status: "success", }, - Action: "stake", + Action: "staked", Event: &StakingEvent{ - Stake: &Stake{ + Staked: &Staked{ Value: "1000000000000000000", - StartTokenID: big.NewInt(1), - EndTokenID: big.NewInt(4), + StartTokenID: big.NewInt(0), + EndTokenID: big.NewInt(1), }, }, }, { - UserAddress: "0xB", - NodeAddress: "0x2", + UserAddress: "0xaA3f6537De9Ded08ACdC8a75773C70921B14bc34", + NodeAddress: "0x43cb41B12907C37757a8CdCA80deD9eD7356f3Aa", Block: &Block{ - Number: 2, - Hash: "0x03", - Timestamp: uint64(time.Now().Unix()), + Number: 18884279, + Hash: "0xd86e83801b9930975ede7d4d7103800ad8b27e2840ba71f575d27844feaa34a2", + Timestamp: 1703768603, }, Transaction: &Transaction{ - Hash: "0x04", - Index: 80, - Nonce: 147977, - Status: "failure", + Hash: "0xcc9df4abdf04d41b9caece18c044a19df93dfab78398bc130e3fe20dc50cc724", + Index: 70, + Nonce: 147973, + Status: "success", }, - Action: "stake", + Action: "requestUnstake", Event: &StakingEvent{ - Stake: &Stake{ - Value: "1000000000000000000", - StartTokenID: big.NewInt(2), - EndTokenID: big.NewInt(5), + RequestUnstake: &RequestUnstake{ + ID: 0, + ChipsIDs: []uint64{ + 0, 1, + }, + }, + }, + }, + { + UserAddress: "0xaA3f6537De9Ded08ACdC8a75773C70921B14bc34", + NodeAddress: "0x43cb41B12907C37757a8CdCA80deD9eD7356f3Aa", + Block: &Block{ + Number: 18884279, + Hash: "0xd86e83801b9930975ede7d4d7103800ad8b27e2840ba71f575d27844feaa34a2", + Timestamp: 1703768603, + }, + Transaction: &Transaction{ + Hash: "0xcc9df4abdf04d41b9caece18c044a19df93dfab78398bc130e3fe20dc50cc724", + Index: 70, + Nonce: 147973, + Status: "success", + }, + Action: "unstakeClaimed", + Event: &StakingEvent{ + UnstakeClaimed: &UnstakeClaimed{ + RequestID: 0, + NodeAddress: "0x43cb41B12907C37757a8CdCA80deD9eD7356f3Aa", + User: "0xaA3f6537De9Ded08ACdC8a75773C70921B14bc34", + Amount: "1000000000000000000", }, }, }, @@ -87,8 +111,8 @@ func (h *Hub) GetStakingHandler(c echo.Context) error { type StakingRequest struct { Cursor string `query:"cursor"` - UserAddress string `query:"user_address"` - NodeAddress string `query:"node_address"` + UserAddress string `query:"userAddress"` + NodeAddress string `query:"nodeAddress"` } type StakingResponse struct { @@ -97,8 +121,8 @@ type StakingResponse struct { } type Staking struct { - UserAddress string `json:"user_address"` - NodeAddress string `json:"node_address"` + UserAddress string `json:"userAddress"` + NodeAddress string `json:"nodeAddress"` Block *Block `json:"block"` Transaction *Transaction `json:"transaction"` Action string `json:"action"` @@ -119,11 +143,25 @@ type Transaction struct { } type StakingEvent struct { - Stake *Stake `json:"stake,omitempty"` + Staked *Staked `json:"staked,omitempty"` + RequestUnstake *RequestUnstake `json:"requestUnstake,omitempty"` + UnstakeClaimed *UnstakeClaimed `json:"unstakeClaimed,omitempty"` } -type Stake struct { +type Staked struct { Value string `json:"value"` StartTokenID *big.Int `json:"start_token_id"` EndTokenID *big.Int `json:"end_token_id"` } + +type RequestUnstake struct { + ID uint64 `json:"id"` + ChipsIDs []uint64 `json:"chipsIDs"` +} + +type UnstakeClaimed struct { + RequestID int `json:"requestID"` + NodeAddress string `json:"nodeAddress"` + User string `json:"user"` + Amount string `json:"amount"` +}