Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

set symbol to rpc call function name #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

set symbol to rpc call function name #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a94c77
set symbol to rpc call function name
fanyinghao Jul 28, 2021
eecfc22
use configed symbol
fanyinghao Jul 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions quorum/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ package quorum
import (
"encoding/json"
"fmt"
"reflect"

"github.com/blocktree/go-owcrypt"
"github.com/blocktree/openwallet/v2/common"
"github.com/blocktree/openwallet/v2/log"
Expand All @@ -29,7 +31,6 @@ import (
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/ethclient"
"reflect"

// "log"
"math/big"
Expand Down Expand Up @@ -77,7 +78,7 @@ func (wm *WalletManager) GetTransactionCount(addr string) (uint64, error) {
return 0, fmt.Errorf("wallet client is not initialized")
}

result, err := wm.WalletClient.Call("eth_getTransactionCount", params)
result, err := wm.WalletClient.Call(strings.ToLower(wm.Config.Symbol)+"_getTransactionCount", params)
if err != nil {
return 0, err
}
Expand All @@ -92,7 +93,7 @@ func (wm *WalletManager) GetTransactionReceipt(transactionId string) (*Transacti
}

var ethReceipt types.Receipt
result, err := wm.WalletClient.Call("eth_getTransactionReceipt", params)
result, err := wm.WalletClient.Call(strings.ToLower(wm.Config.Symbol)+"_getTransactionReceipt", params)
if err != nil {
return nil, err
}
Expand All @@ -114,7 +115,7 @@ func (wm *WalletManager) GetTransactionByHash(txid string) (*BlockTransaction, e
}

var tx BlockTransaction
result, err := wm.WalletClient.Call("eth_getTransactionByHash", params)
result, err := wm.WalletClient.Call(strings.ToLower(wm.Config.Symbol)+"_getTransactionByHash", params)
if err != nil {
return nil, err
}
Expand All @@ -140,7 +141,7 @@ func (wm *WalletManager) GetBlockByNum(blockNum uint64, showTransactionSpec bool
}
var ethBlock EthBlock

result, err := wm.WalletClient.Call("eth_getBlockByNumber", params)
result, err := wm.WalletClient.Call(strings.ToLower(wm.Config.Symbol)+"_getBlockByNumber", params)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -218,7 +219,7 @@ func (wm *WalletManager) GetAddrBalance(address string, sign string) (*big.Int,
AppendOxToAddress(address),
sign,
}
result, err := wm.WalletClient.Call("eth_getBalance", params)
result, err := wm.WalletClient.Call(strings.ToLower(wm.Config.Symbol)+"_getBalance", params)
if err != nil {
return big.NewInt(0), err
}
Expand All @@ -233,7 +234,7 @@ func (wm *WalletManager) GetAddrBalance(address string, sign string) (*big.Int,
// GetBlockNumber
func (wm *WalletManager) GetBlockNumber() (uint64, error) {
param := make([]interface{}, 0)
result, err := wm.WalletClient.Call("eth_blockNumber", param)
result, err := wm.WalletClient.Call(strings.ToLower(wm.Config.Symbol)+"_blockNumber", param)
if err != nil {
return 0, err
}
Expand Down Expand Up @@ -297,7 +298,7 @@ func (wm *WalletManager) GetGasEstimated(from string, to string, value *big.Int,
callMsg["value"] = hexutil.EncodeBig(value)
}

result, err := wm.WalletClient.Call("eth_estimateGas", []interface{}{callMsg})
result, err := wm.WalletClient.Call(strings.ToLower(wm.Config.Symbol)+"_estimateGas", []interface{}{callMsg})
if err != nil {
return big.NewInt(0), err
}
Expand All @@ -315,7 +316,7 @@ func (wm *WalletManager) GetGasEstimated(from string, to string, value *big.Int,

func (wm *WalletManager) GetGasPrice() (*big.Int, error) {

result, err := wm.WalletClient.Call("eth_gasPrice", []interface{}{})
result, err := wm.WalletClient.Call(strings.ToLower(wm.Config.Symbol)+"_gasPrice", []interface{}{})
if err != nil {
return big.NewInt(0), err
}
Expand All @@ -329,7 +330,7 @@ func (wm *WalletManager) GetGasPrice() (*big.Int, error) {

func (wm *WalletManager) SetNetworkChainID() (uint64, error) {

result, err := wm.WalletClient.Call("eth_chainId", nil)
result, err := wm.WalletClient.Call(strings.ToLower(wm.Config.Symbol)+"_chainId", nil)
if err != nil {
return 0, err
}
Expand Down Expand Up @@ -430,7 +431,7 @@ func (wm *WalletManager) EthCall(callMsg CallMsg, sign string) (string, error) {
"value": hexutil.EncodeBig(callMsg.Value),
"data": hexutil.Encode(callMsg.Data),
}
result, err := wm.WalletClient.Call("eth_call", []interface{}{param, sign})
result, err := wm.WalletClient.Call(strings.ToLower(wm.Config.Symbol)+"_call", []interface{}{param, sign})
if err != nil {
return "", err
}
Expand All @@ -443,7 +444,7 @@ func (wm *WalletManager) SendRawTransaction(signedTx string) (string, error) {
signedTx,
}

result, err := wm.WalletClient.Call("eth_sendRawTransaction", params)
result, err := wm.WalletClient.Call(strings.ToLower(wm.Config.Symbol)+"_sendRawTransaction", params)
if err != nil {
return "", err
}
Expand All @@ -458,7 +459,7 @@ func (wm *WalletManager) IsContract(address string) (bool, error) {
"latest",
}

result, err := wm.WalletClient.Call("eth_getCode", params)
result, err := wm.WalletClient.Call(strings.ToLower(wm.Config.Symbol)+"_getCode", params)
if err != nil {
return false, err
}
Expand Down
8 changes: 5 additions & 3 deletions quorum_rpc/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,17 @@ package quorum_rpc
import (
"errors"
"fmt"
"strings"

"github.com/blocktree/openwallet/v2/log"
"github.com/imroc/req"
"github.com/tidwall/gjson"
)

type Client struct {
BaseURL string
BaseURL string
BroadcastURL string
Debug bool
Debug bool
}

func (c *Client) Call(method string, params []interface{}) (*gjson.Result, error) {
Expand All @@ -40,7 +42,7 @@ func (c *Client) Call(method string, params []interface{}) (*gjson.Result, error
body["params"] = params

url := c.BaseURL
if method == "eth_sendRawTransaction" && len(c.BroadcastURL) != 0 {
if strings.HasSuffix(method, "sendRawTransaction") && len(c.BroadcastURL) != 0 {
// 广播交易使用BroadcastURL的节点
url = c.BroadcastURL
}
Expand Down