status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: ens release username hash (#2756) 

* fix: ens release username hash
* fix: IN parameters when obtaining multiple pending trxs
This commit is contained in:
Richard Ramos 2022-08-08 14:25:53 -04:00 committed by GitHub
parent eda6d10ce5
commit 2edcf0e360
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/ens/api.go
View File

@ -237,7 +237,7 @@ func (api *API) ReleaseEstimate(ctx context.Context, chainID uint64, txArgs tran
return 0, err
}
data, err := registrarABI.Pack("release", nameHash(username))
data, err := registrarABI.Pack("release", usernameToLabel(username))
if err != nil {
return 0, err
}

36
services/wallet/transaction.go
View File

@ -80,21 +80,23 @@ type PendingTransaction struct {
MultiTransactionID int64 `json:"multi_transaction_id"`
}
func arrayToString(a []uint64, delim string) string {
res := make([]string, len(a))
for i, v := range a {
res[i] = fmt.Sprint(v)
func (tm *TransactionManager) getAllPendings(chainIDs []uint64) ([]*PendingTransaction, error) {
if len(chainIDs) == 0 {
return nil, errors.New("at least 1 chainID is required")
}
return strings.Join(res, ",")
}
inVector := strings.Repeat("?, ", len(chainIDs)-1) + "?"
var parameters []interface{}
for _, c := range chainIDs {
parameters = append(parameters, c)
}
func (tm *TransactionManager) getAllPendings(chainIDs []uint64) ([]*PendingTransaction, error) {
rows, err := tm.db.Query(`SELECT hash, timestamp, value, from_address, to_address, data,
rows, err := tm.db.Query(fmt.Sprintf(`SELECT hash, timestamp, value, from_address, to_address, data,
symbol, gas_price, gas_limit, type, additional_data,
network_id
FROM pending_transactions
WHERE network_id in (?)`, arrayToString(chainIDs, ","))
WHERE network_id in (%s)`, inVector), parameters...)
if err != nil {
return nil, err
}
@ -131,11 +133,23 @@ func (tm *TransactionManager) getAllPendings(chainIDs []uint64) ([]*PendingTrans
}
func (tm *TransactionManager) getPendingByAddress(chainIDs []uint64, address common.Address) ([]*PendingTransaction, error) {
rows, err := tm.db.Query(`SELECT hash, timestamp, value, from_address, to_address, data,
if len(chainIDs) == 0 {
return nil, errors.New("at least 1 chainID is required")
}
inVector := strings.Repeat("?, ", len(chainIDs)-1) + "?"
var parameters []interface{}
for _, c := range chainIDs {
parameters = append(parameters, c)
}
parameters = append(parameters, address)
rows, err := tm.db.Query(fmt.Sprintf(`SELECT hash, timestamp, value, from_address, to_address, data,
symbol, gas_price, gas_limit, type, additional_data,
network_id
FROM pending_transactions
WHERE network_id in (?) AND from_address = ?`, arrayToString(chainIDs, ","), address)
WHERE network_id in (%s) AND from_address = ?`, inVector), parameters...)
if err != nil {
return nil, err
}