Skip to content
Permalink
Browse files

Merge pull request #20 from guardaco/master

from Master
  • Loading branch information
matyushkins committed Sep 3, 2020
2 parents 18e48a6 + 48bda73 commit 37728b62c06e3cc1aaa721d5cf274c0cc221dc9c
@@ -183,18 +183,26 @@ func (b *EthereumRPC) EthereumTypeGetErc20ContractInfo(contractDesc bchain.Addre
address := EIP55Address(contractDesc)
data, err := b.ethCall(erc20NameSignature, address)
if err != nil {
return nil, err
// ignore the error from the eth_call - since geth v1.9.15 they changed the behavior
// and returning error "execution reverted" for some non contract addresses
// https://github.com/ethereum/go-ethereum/issues/21249#issuecomment-648647672
glog.Warning(errors.Annotatef(err, "erc20NameSignature %v", address))
return nil, nil
// return nil, errors.Annotatef(err, "erc20NameSignature %v", address)
}
name := parseErc20StringProperty(contractDesc, data)
if name != "" {
data, err = b.ethCall(erc20SymbolSignature, address)
if err != nil {
return nil, err
glog.Warning(errors.Annotatef(err, "erc20SymbolSignature %v", address))
return nil, nil
// return nil, errors.Annotatef(err, "erc20SymbolSignature %v", address)
}
symbol := parseErc20StringProperty(contractDesc, data)
data, err = b.ethCall(erc20DecimalsSignature, address)
if err != nil {
return nil, err
glog.Warning(errors.Annotatef(err, "erc20DecimalsSignature %v", address))
// return nil, errors.Annotatef(err, "erc20DecimalsSignature %v", address)
}
contract = &bchain.Erc20Contract{
Contract: address,
@@ -22,10 +22,10 @@
"package_name": "backend-bcash",
"package_revision": "satoshilabs-1",
"system_user": "bcash",
"version": "0.21.10",
"binary_url": "https://download.bitcoinabc.org/0.21.10/linux/bitcoin-abc-0.21.10-x86_64-linux-gnu.tar.gz",
"version": "0.22.0",
"binary_url": "https://download.bitcoinabc.org/0.22.0/linux/bitcoin-abc-0.22.0-x86_64-linux-gnu.tar.gz",
"verification_type": "sha256",
"verification_source": "d50d10147c1dc4eef23942b10331c047f0da80600cf5526b627ff01a4c317fb4",
"verification_source": "9d3718cbaf0516cc1e2bff40bd9ff708e61b6ed2469afb18e87e9fc1de3c4d5c",
"extract_command": "tar -C backend --strip 1 -xf",
"exclude_files": [
"bin/bitcoin-qt"
@@ -49,7 +49,7 @@
"additional_params": "",
"block_chain": {
"parse": true,
"subversion": "/Bitcoin ABC:0.20.8/",
"subversion": "/Bitcoin ABC:0.22.0/",
"address_format": "cashaddr",
"mempool_workers": 8,
"mempool_sub_workers": 2,
@@ -22,10 +22,10 @@
"package_name": "backend-bcash-testnet",
"package_revision": "satoshilabs-1",
"system_user": "bcash",
"version": "0.21.10",
"binary_url": "https://download.bitcoinabc.org/0.21.10/linux/bitcoin-abc-0.21.10-x86_64-linux-gnu.tar.gz",
"version": "0.22.0",
"binary_url": "https://download.bitcoinabc.org/0.22.0/linux/bitcoin-abc-0.22.0-x86_64-linux-gnu.tar.gz",
"verification_type": "sha256",
"verification_source": "d50d10147c1dc4eef23942b10331c047f0da80600cf5526b627ff01a4c317fb4",
"verification_source": "9d3718cbaf0516cc1e2bff40bd9ff708e61b6ed2469afb18e87e9fc1de3c4d5c",
"extract_command": "tar -C backend --strip 1 -xf",
"exclude_files": [
"bin/bitcoin-qt"
@@ -49,7 +49,7 @@
"additional_params": "",
"block_chain": {
"parse": true,
"subversion": "/Bitcoin ABC:0.20.8/",
"subversion": "/Bitcoin ABC:0.22.0/",
"address_format": "cashaddr",
"mempool_workers": 8,
"mempool_sub_workers": 2,
@@ -21,10 +21,10 @@
"package_name": "backend-ethereum",
"package_revision": "satoshilabs-1",
"system_user": "ethereum",
"version": "1.9.19-3e064192",
"binary_url": "https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.9.19-3e064192.tar.gz",
"version": "1.9.20-979fc968",
"binary_url": "https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.9.20-979fc968.tar.gz",
"verification_type": "gpg",
"verification_source": "https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.9.19-3e064192.tar.gz.asc",
"verification_source": "https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.9.20-979fc968.tar.gz.asc",
"extract_command": "tar -C backend --strip 1 -xf",
"exclude_files": [],
"exec_command_template": "/bin/sh -c '{{.Env.BackendInstallPath}}/{{.Coin.Alias}}/geth --ipcdisable --syncmode full --cache 1024 --nat none --datadir {{.Env.BackendDataPath}}/{{.Coin.Alias}}/backend --port 38336 --ws --wsaddr 127.0.0.1 --wsport {{.Ports.BackendRPC}} --wsorigins \"*\" --rpc --rpcport 8136 -rpcaddr 127.0.0.1 --rpccorsdomain \"*\" --rpcvhosts \"*\" 2>>{{.Env.BackendDataPath}}/{{.Coin.Alias}}/backend/{{.Coin.Alias}}.log'",
@@ -20,10 +20,10 @@
"package_name": "backend-ethereum-testnet-ropsten",
"package_revision": "satoshilabs-1",
"system_user": "ethereum",
"version": "1.9.19-3e064192",
"binary_url": "https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.9.19-3e064192.tar.gz",
"version": "1.9.20-979fc968",
"binary_url": "https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.9.20-979fc968.tar.gz",
"verification_type": "gpg",
"verification_source": "https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.9.19-3e064192.tar.gz.asc",
"verification_source": "https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.9.20-979fc968.tar.gz.asc",
"extract_command": "tar -C backend --strip 1 -xf",
"exclude_files": [],
"exec_command_template": "/bin/sh -c '{{.Env.BackendInstallPath}}/{{.Coin.Alias}}/geth --testnet --syncmode full --ipcdisable --cache 1024 --nat none --datadir {{.Env.BackendDataPath}}/{{.Coin.Alias}}/backend --port 48336 --ws --wsaddr 127.0.0.1 --wsport {{.Ports.BackendRPC}} --wsorigins \"*\" 2>>{{.Env.BackendDataPath}}/{{.Coin.Alias}}/backend/{{.Coin.Alias}}.log'",
@@ -22,10 +22,10 @@
"package_name": "backend-groestlcoin",
"package_revision": "satoshilabs-1",
"system_user": "groestlcoin",
"version": "2.19.1",
"binary_url": "https://github.com/Groestlcoin/groestlcoin/releases/download/v2.19.1/groestlcoin-2.19.1-x86_64-linux-gnu.tar.gz",
"version": "2.20.1",
"binary_url": "https://github.com/Groestlcoin/groestlcoin/releases/download/v2.20.1/groestlcoin-2.20.1-x86_64-linux-gnu.tar.gz",
"verification_type": "gpg-sha256",
"verification_source": "https://github.com/Groestlcoin/groestlcoin/releases/download/v2.19.1/SHA256SUMS.asc",
"verification_source": "https://github.com/Groestlcoin/groestlcoin/releases/download/v2.20.1/SHA256SUMS.asc",
"extract_command": "tar -C backend --strip 1 -xf",
"exclude_files": [
"bin/groestlcoin-qt"
@@ -60,7 +60,10 @@
"xpub_magic_segwit_p2sh": 77429938,
"xpub_magic_segwit_native": 78792518,
"slip44": 17,
"additional_params": {}
"additional_params": {
"fiat_rates": "coingecko",
"fiat_rates_params": "{\"url\": \"https://api.coingecko.com/api/v3\", \"coin\": \"groestlcoin\", \"periodSeconds\": 60}"
}
}
},
"meta": {
@@ -22,10 +22,10 @@
"package_name": "backend-groestlcoin-testnet",
"package_revision": "satoshilabs-1",
"system_user": "groestlcoin",
"version": "2.19.1",
"binary_url": "https://github.com/Groestlcoin/groestlcoin/releases/download/v2.19.1/groestlcoin-2.19.1-x86_64-linux-gnu.tar.gz",
"version": "2.20.1",
"binary_url": "https://github.com/Groestlcoin/groestlcoin/releases/download/v2.20.1/groestlcoin-2.20.1-x86_64-linux-gnu.tar.gz",
"verification_type": "gpg-sha256",
"verification_source": "https://github.com/Groestlcoin/groestlcoin/releases/download/v2.19.1/SHA256SUMS.asc",
"verification_source": "https://github.com/Groestlcoin/groestlcoin/releases/download/v2.20.1/SHA256SUMS.asc",
"extract_command": "tar -C backend --strip 1 -xf",
"exclude_files": [
"bin/groestlcoin-qt"
@@ -60,7 +60,10 @@
"xpub_magic_segwit_p2sh": 71979618,
"xpub_magic_segwit_native": 73342198,
"slip44": 1,
"additional_params": {}
"additional_params": {
"fiat_rates": "coingecko",
"fiat_rates_params": "{\"url\": \"https://api.coingecko.com/api/v3\", \"coin\": \"groestlcoin\", \"periodSeconds\": 60}"
}
}
},
"meta": {
5 go.mod
@@ -17,7 +17,7 @@ require (
github.com/decred/dcrd/dcrutil/v2 v2.0.1
github.com/decred/dcrd/hdkeychain/v2 v2.1.0
github.com/decred/dcrd/txscript/v2 v2.1.0
github.com/ethereum/go-ethereum v1.8.20
github.com/ethereum/go-ethereum v1.9.20
github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c // indirect
github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect
github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 // indirect
@@ -41,9 +41,8 @@ require (
github.com/prometheus/procfs v0.0.10 // indirect
github.com/rs/cors v1.7.0 // indirect
github.com/schancel/cashaddr-converter v0.0.0-20180113210041-0a38f5822f79
github.com/syndtr/goleveldb v1.0.0 // indirect
github.com/tecbot/gorocksdb v0.0.0-20180907100951-214b6b7bc0f0
golang.org/x/crypto v0.0.0-20190927123631-a832865fa7ad
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect

0 comments on commit 37728b6

Please sign in to comment.
You can’t perform that action at this time.