Skip to content

Commit d01a04a

Browse files
AseyedAseyed
committed
bugfix data serialization
1 parent 1998fcf commit d01a04a

File tree

5 files changed

+124
-80
lines changed

5 files changed

+124
-80
lines changed

‎data-extractor

23.8 MB
Binary file not shown.

‎extractors/susy/bridge/common.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ func ValidateSolanaAddress(address string) bool {
139139
}
140140

141141
func ValidateErgoAddress(address string) bool {
142-
isValid, _ := helpers.CheckAddress(address)
142+
isValid, _ := helpers.ValidateErgoAddress(address)
143143
return isValid
144144
}
145145

‎extractors/susy/bridge/ergo.go

+69-53
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,24 @@ package bridge
22

33
import (
44
"context"
5-
"encoding/binary"
5+
"encoding/base64"
66
"encoding/hex"
77
"fmt"
8-
"strconv"
9-
108
"github.com/Gravity-Tech/gravity-node-data-extractor/v2/extractors"
119
"github.com/Gravity-Tech/gravity-node-data-extractor/v2/helpers"
1210
"math/big"
1311
)
1412

1513
// TODO: Implement general queue iterator (Waves & ETH)
16-
// bc too muchs queues
14+
1715
type ErgoRequestsState struct {
1816
requests map[string]interface{}
1917
}
2018

19+
const (
20+
ErgoRequestStatusSuccess = true
21+
)
22+
2123
type ErgoToErgoExtractionBridge struct {
2224
config ConfigureCommand
2325
configured bool
@@ -48,119 +50,133 @@ func (provider *ErgoToErgoExtractionBridge) Configure(config ConfigureCommand) e
4850
return nil
4951
}
5052

51-
func (provider *ErgoToErgoExtractionBridge) pickRequestFromQueue(luStates []helpers.Request) (helpers.Request, error) {
53+
func (provider *ErgoToErgoExtractionBridge) pickRequestFromLUPortQueue(luRequests []helpers.Request) (helpers.Request, error) {
54+
var rq helpers.Request
5255

53-
ctx, cancel := context.WithCancel(context.Background())
54-
defer cancel()
56+
for _, luRequest := range luRequests {
57+
_, status, err := provider.ergClientTarget.GetRequest(provider.config.DestinationNodeUrl, provider.config.IBPortAddress, luRequest.RequestId)
58+
if err != nil {
59+
continue
60+
}
5561

56-
ibStates, _ := provider.ergClientTarget.GetState(provider.config.DestinationNodeUrl, provider.config.IBPortAddress, ctx)
62+
if status == ErgoRequestStatusSuccess {
63+
continue
64+
}
65+
if !ValidateErgoAddress(luRequest.Receiver) {
66+
continue
67+
}
68+
rq = luRequest
69+
break
70+
}
71+
return rq, nil
72+
}
5773

74+
func (provider *ErgoToErgoExtractionBridge) pickRequestFromIBPortQueue(ibRequests []helpers.Request) (helpers.Request, error) {
5875
var rq helpers.Request
5976

60-
for _, luState := range luStates {
61-
62-
for _, ibState := range ibStates {
63-
if ibState.RequestId != luState.RequestId {
64-
continue
65-
}
66-
if !ValidateErgoAddress(luState.Receiver) {
67-
continue
68-
}
69-
rq = luState
70-
break
77+
for _, ibRequest := range ibRequests {
78+
request, status, err := provider.ergClientSource.GetRequest(provider.config.SourceNodeUrl, provider.config.LUPortAddress, ibRequest.RequestId)
79+
if err != nil {
80+
continue
81+
}
82+
if status != ErgoRequestStatusSuccess {
83+
continue
84+
}
85+
if !ValidateErgoAddress(request.Receiver) {
86+
continue
7187
}
88+
rq = request
89+
break
7290
}
73-
7491
return rq, nil
7592
}
7693

77-
// Decoupling is aimed for tests management
78-
// It allows testing distinct functions
79-
//
94+
8095
func (provider *ErgoToErgoExtractionBridge) ExtractDirectTransferRequest(ctx context.Context) (*extractors.Data, error) {
81-
luStates, err := provider.ergClientSource.GetState(provider.config.SourceNodeUrl, provider.config.LUPortAddress,ctx)
96+
luRequests, err := provider.ergClientSource.GetRequestsList(provider.config.SourceNodeUrl, provider.config.LUPortAddress,ctx)
8297
if err != nil {
8398
return nil, err
8499
}
85100

86-
rq, _ := provider.pickRequestFromQueue(luStates)
101+
rq, _ := provider.pickRequestFromLUPortQueue(luRequests)
87102

88103
if rq.RequestId == "" {
89104
return nil, extractors.NotFoundErr
90105
}
106+
rqId := new(big.Int)
107+
rqId, _ = rqId.SetString(rq.RequestId, 10)
91108

92-
rqId, _ := strconv.ParseInt(rq.RequestId, 10, 64)
93-
amount, _ := strconv.ParseInt(rq.Amount, 10, 64)
109+
amount := new(big.Int)
110+
amount, _ = amount.SetString(rq.Amount, 10)
94111

95112
sourceDecimals := big.NewInt(10)
96113
sourceDecimals.Exp(sourceDecimals, big.NewInt(provider.config.SourceDecimals), nil)
97114

98115
destinationDecimals := big.NewInt(10)
99116
destinationDecimals.Exp(destinationDecimals, big.NewInt(provider.config.DestinationDecimals), nil)
100117

101-
bigIntAmount := big.NewInt(amount)
102-
103-
newAmount := bigIntAmount.
104-
Mul(bigIntAmount, sourceDecimals).
105-
Div(bigIntAmount, destinationDecimals)
118+
newAmount := amount.
119+
Mul(amount, sourceDecimals).
120+
Div(amount, destinationDecimals)
106121

107122
result := []byte{'m'}
108123
var newAmountBytes [32]byte
109-
var RequestIdBytes = make([]byte, 32)
110-
binary.PutVarint(RequestIdBytes, rqId)
111-
result = append(result, RequestIdBytes[:]...)
124+
var RequestIdBytes [32]byte
125+
126+
result = append(result, rqId.FillBytes(RequestIdBytes[:])...)
112127
result = append(result, newAmount.FillBytes(newAmountBytes[:])...)
113128
receiver, _ := hex.DecodeString(rq.Receiver)
114129
result = append(result, receiver[:]...)
115130

116131
println(newAmount.String())
117-
println(hex.EncodeToString(result))
132+
println(base64.StdEncoding.EncodeToString(result))
118133
return &extractors.Data{
119-
Type: extractors.String,
120-
Value: hex.EncodeToString(result),
134+
Type: extractors.Base64,
135+
Value: base64.StdEncoding.EncodeToString(result),
121136
}, err
122137
}
123138

124139
func (provider *ErgoToErgoExtractionBridge) ExtractReverseTransferRequest(ctx context.Context) (*extractors.Data, error) {
125-
ibStates, err := provider.ergClientSource.GetState(provider.config.DestinationNodeUrl, provider.config.IBPortAddress, ctx)
140+
ibRequests, err := provider.ergClientSource.GetRequestsList(provider.config.DestinationNodeUrl, provider.config.IBPortAddress, ctx)
126141
if err != nil {
127142
return nil, err
128143
}
129144

130-
rq, _ := provider.pickRequestFromQueue(ibStates)
145+
rq, _ := provider.pickRequestFromIBPortQueue(ibRequests)
131146

132147
if rq.RequestId == "" {
133148
return nil, extractors.NotFoundErr
134149
}
135150

136-
rqId, _ := strconv.ParseInt(rq.RequestId, 10, 64)
137-
amount, _ := strconv.ParseInt(rq.Amount, 10, 64)
151+
rqId := new(big.Int)
152+
rqId, _ = rqId.SetString(rq.RequestId, 10)
153+
154+
amount := new(big.Int)
155+
amount, _ = amount.SetString(rq.Amount, 10)
138156

139157
sourceDecimals := big.NewInt(10)
140158
sourceDecimals.Exp(sourceDecimals, big.NewInt(provider.config.SourceDecimals), nil)
141159

142160
destinationDecimals := big.NewInt(10)
143161
destinationDecimals.Exp(destinationDecimals, big.NewInt(provider.config.DestinationDecimals), nil)
144162

145-
bigIntAmount := big.NewInt(amount)
146-
147-
newAmount := bigIntAmount.
148-
Mul(bigIntAmount, sourceDecimals).
149-
Div(bigIntAmount, destinationDecimals)
163+
newAmount := amount.
164+
Mul(amount, sourceDecimals).
165+
Div(amount, destinationDecimals)
150166

151167
result := []byte{'u'}
152168
var newAmountBytes [32]byte
153-
var RequestIdBytes = make([]byte, 32)
154-
binary.PutVarint(RequestIdBytes, rqId)
155-
result = append(result, RequestIdBytes[:]...)
169+
var RequestIdBytes [32]byte
170+
171+
result = append(result, rqId.FillBytes(RequestIdBytes[:])...)
156172
result = append(result, newAmount.FillBytes(newAmountBytes[:])...)
157173
receiver, _ := hex.DecodeString(rq.Receiver)
158174
result = append(result, receiver[:]...)
159175

160176
println(newAmount.String())
161-
println(hex.EncodeToString(result))
177+
println(base64.StdEncoding.EncodeToString(result))
162178
return &extractors.Data{
163-
Type: extractors.String,
164-
Value: hex.EncodeToString(result),
179+
Type: extractors.Base64,
180+
Value: base64.StdEncoding.EncodeToString(result),
165181
}, err
166182
}

‎helpers/ergo.go

+46-26
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ import (
66
"encoding/json"
77
"fmt"
88
"github.com/pkg/errors"
9-
"io"
9+
"go.uber.org/zap"
1010
"io/ioutil"
1111
"net/http"
1212
"net/url"
1313
"path"
14+
"strings"
1415
"time"
1516
)
1617

@@ -104,7 +105,7 @@ func GetDataType(ctx context.Context) (int, error) {
104105
}
105106
req, err := http.NewRequestWithContext(ctx, "GET", url.String(), nil)
106107
result := new(Result)
107-
_, err = client.Do(ctx, req, result)
108+
_, err = client.Do(req, result)
108109
if err != nil {
109110
return 0, err
110111
}
@@ -134,7 +135,7 @@ type Request struct {
134135
Receiver string `json:"receiver"`
135136
}
136137

137-
func CheckAddress(address string) (bool, error) {
138+
func ValidateErgoAddress(address string) (bool, error) {
138139
type Result struct {
139140
Success bool `json:"success"`
140141
IsValid bool `json:"isValid"`
@@ -169,21 +170,21 @@ func CheckAddress(address string) (bool, error) {
169170
return responseObject.IsValid, nil
170171
}
171172

172-
func (client *ErgClient) GetState(address string, route string, ctx context.Context) ([]Request, error) {
173+
func (client *ErgClient) GetRequestsList(address string, route string, ctx context.Context) ([]Request, error) {
173174
type Result struct {
174175
Success bool `json:"success"`
175176
Requests []Request `json:"requests"`
176177
}
177178

178-
url := fmt.Sprintf("%s/%s/getState", address, route)
179+
url := fmt.Sprintf("%s/%s/getRequestsList", address, route)
179180

180-
req, err := http.NewRequest("GET", url, nil)
181+
req, err := http.NewRequestWithContext(ctx,"GET", url, nil)
181182
if err != nil {
182183
return nil, err
183184
}
184185

185186
var out Result
186-
_, err = client.Do(ctx, req, &out)
187+
_, err = client.Do(req, &out)
187188
if err != nil {
188189
return nil, err
189190
}
@@ -196,24 +197,55 @@ func (client *ErgClient) GetState(address string, route string, ctx context.Cont
196197
return out.Requests, nil
197198
}
198199

199-
func (client *ErgClient) Do(ctx context.Context, req *http.Request, v interface{}) (*Response, error) {
200-
return doHttp(ctx, client.Options, req, v)
200+
func (client *ErgClient) GetRequest(address string, route string, requestId string) (Request ,bool , error) {
201+
type Result struct {
202+
Success bool `json:"success"`
203+
Request Request `json:"request"`
204+
}
205+
206+
url := fmt.Sprintf("%s/%s/getRequest", address, route)
207+
208+
jsonValue, _ := json.Marshal(map[string]string{"requestId": requestId})
209+
req, err := http.NewRequest("POST", url, bytes.NewBuffer(jsonValue))
210+
if err != nil {
211+
return Request{}, false, err
212+
}
213+
214+
var out Result
215+
_, err = client.Do(req, &out)
216+
if err != nil {
217+
return Request{}, false, err
218+
}
219+
if !out.Success{
220+
return Request{}, false, err
221+
}
222+
if out.Request.RequestId == "" {
223+
return Request{}, false, err
224+
}
225+
return out.Request, true, nil
201226
}
202227

203-
func doHttp(ctx context.Context, options ErgOptions, req *http.Request, v interface{}) (*Response, error) {
204-
req = withContext(ctx, req)
228+
func (a *ErgClient) Do(req *http.Request, v interface{}) (*Response, error) {
229+
return doHttp(a.Options, req, v)
230+
}
231+
232+
func doHttp(options ErgOptions, req *http.Request, v interface{}) (*Response, error) {
205233
if req.Header.Get("Accept") == "" {
206234
req.Header.Set("Accept", "application/json")
207235
}
208236
req.Header.Set("Content-Type", "application/json")
209237

238+
req.Close = true
210239
resp, err := options.Doer.Do(req)
211240
if err != nil {
212241
return nil, &RequestError{Err: err}
213242
}
214243
defer resp.Body.Close()
215244

216245
response := newResponse(resp)
246+
body, _ := ioutil.ReadAll(response.Body)
247+
urlSlice := strings.Split(req.URL.String(), "/")
248+
zap.L().Sugar().Debugf("\n%s, response: %v\n", urlSlice[len(urlSlice)-1], string(body))
217249

218250
if response.StatusCode != http.StatusOK {
219251
body, _ := ioutil.ReadAll(response.Body)
@@ -223,24 +255,12 @@ func doHttp(ctx context.Context, options ErgOptions, req *http.Request, v interf
223255
}
224256
}
225257

226-
select {
227-
case <-ctx.Done():
228-
return response, ctx.Err()
229-
default:
230-
}
231-
232258
if v != nil {
233-
if w, ok := v.(io.Writer); ok {
234-
if _, err := io.Copy(w, resp.Body); err != nil {
235-
return nil, err
236-
}
237-
} else {
238-
if err = json.NewDecoder(resp.Body).Decode(v); err != nil {
239-
return response, &ParseError{Err: err}
240-
}
259+
if err = json.Unmarshal(body, v); err != nil {
260+
zap.L().Sugar().Debugf("json parse error")
261+
return response, &ParseError{Err: err}
241262
}
242263
}
243-
244264
return response, err
245265
}
246266

‎sigma-erg.json

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"SourceNodeURL": "http://176.9.65.58:9027",
3+
"SourceDecimals": 9,
4+
"DestinationDecimals": 9,
5+
"DestinationNodeURL": "http://176.9.65.58:9026",
6+
"IBPortAddress": "ibport",
7+
"LUPortAddress": "luport"
8+
}

0 commit comments

Comments
 (0)