cerc-io/ipld-eth-server
12
0
Fork 1
Code Issues 10 Pull Requests 2 Actions Packages Projects Releases 37 Wiki Activity

Watch contact updates (#127)

Browse Source 
* Downcase all arguments for contact watching

* ABI retrieval from test networks
This commit is contained in:
Matt K
2018-01-08 15:59:47 -06:00
committed by GitHub
parent 14e1fc4213
commit 70cfa20c68
11 changed files with 66 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/get_logs/main.go
+7 -4
View File
@@ -9,6 +9,8 @@ import (
"time"
"strings"
"github.com/8thlight/vulcanizedb/cmd"
"github.com/8thlight/vulcanizedb/pkg/core"
"github.com/8thlight/vulcanizedb/pkg/geth"
@@ -29,11 +31,12 @@ const (
func main() {
environment := flag.String("environment", "", "Environment name")
contractHash := flag.String("contract-hash", "", "Contract hash to show summary")
flag.Parse()
ticker := time.NewTicker(pollingInterval)
defer ticker.Stop()
flag.Parse()
contractHashLowered := strings.ToLower(*contractHash)
config := cmd.LoadConfig(*environment)
blockchain := geth.NewBlockchain(config.Client.IPCPath)
repository := cmd.LoadPostgres(config.Database, blockchain.Node())
@@ -43,7 +46,7 @@ func main() {
go func() {
for i := int64(0); i < lastBlockNumber; i = min(i+stepSize, lastBlockNumber) {
logs, err := blockchain.GetLogs(core.Contract{Hash: *contractHash}, big.NewInt(i), big.NewInt(i+stepSize))
logs, err := blockchain.GetLogs(core.Contract{Hash: contractHashLowered}, big.NewInt(i), big.NewInt(i+stepSize))
log.Println("Backfilling Logs:", i)
if err != nil {
log.Println(err)
@@ -61,7 +64,7 @@ func main() {
z := &big.Int{}
z.Sub(blockchain.LastBlock(), big.NewInt(25))
log.Printf("Logs Window: %d - %d", z.Int64(), blockchain.LastBlock().Int64())
logs, _ := blockchain.GetLogs(core.Contract{Hash: *contractHash}, z, blockchain.LastBlock())
logs, _ := blockchain.GetLogs(core.Contract{Hash: contractHashLowered}, z, blockchain.LastBlock())
repository.CreateLogs(logs)
done <- struct{}{}
}()
cmd/run/main.go
+3 -2
View File
@@ -17,11 +17,12 @@ const (
)
func main() {
environment := flag.String("environment", "", "Environment name")
flag.Parse()
ticker := time.NewTicker(pollingInterval)
defer ticker.Stop()
environment := flag.String("environment", "", "Environment name")
flag.Parse()
config := cmd.LoadConfig(*environment)
blockchain := geth.NewBlockchain(config.Client.IPCPath)
repository := cmd.LoadPostgres(config.Database, blockchain.Node())
cmd/show_contract_summary/main.go
+5 -1
View File
@@ -7,6 +7,8 @@ import (
"fmt"
"strings"
"github.com/8thlight/vulcanizedb/cmd"
"github.com/8thlight/vulcanizedb/pkg/contract_summary"
"github.com/8thlight/vulcanizedb/pkg/geth"
@@ -17,12 +19,14 @@ func main() {
contractHash := flag.String("contract-hash", "", "Contract hash to show summary")
_blockNumber := flag.Int64("block-number", -1, "Block number of summary")
flag.Parse()
contractHashLowered := strings.ToLower(*contractHash)
config := cmd.LoadConfig(*environment)
blockchain := geth.NewBlockchain(config.Client.IPCPath)
repository := cmd.LoadPostgres(config.Database, blockchain.Node())
blockNumber := cmd.RequestedBlockNumber(_blockNumber)
contractSummary, err := contract_summary.NewSummary(blockchain, repository, *contractHash, blockNumber)
contractSummary, err := contract_summary.NewSummary(blockchain, repository, contractHashLowered, blockNumber)
if err != nil {
log.Fatalln(err)
}
cmd/utils.go
+4 -5
View File
@@ -5,8 +5,6 @@ import (
"path/filepath"
"fmt"
"math/big"
"github.com/8thlight/vulcanizedb/pkg/config"
@@ -42,13 +40,14 @@ func ReadAbiFile(abiFilepath string) string {
return abi
}
func GetAbi(abiFilepath string, contractHash string) string {
func GetAbi(abiFilepath string, contractHash string, network string) string {
var contractAbiString string
if abiFilepath != "" {
contractAbiString = ReadAbiFile(abiFilepath)
} else {
etherscan := geth.NewEtherScanClient("https://api.etherscan.io")
fmt.Println("No ABI supplied. Retrieving ABI from Etherscan")
url := geth.GenUrl(network)
etherscan := geth.NewEtherScanClient(url)
log.Printf("No ABI supplied. Retrieving ABI from Etherscan: %s", url)
contractAbiString, _ = etherscan.GetAbi(contractHash)
}
_, err := geth.ParseAbi(contractAbiString)
cmd/vulcanize_db/main.go
+3 -2
View File
@@ -25,11 +25,12 @@ func backFillAllBlocks(blockchain core.Blockchain, repository repositories.Postg
}
func main() {
environment := flag.String("environment", "", "Environment name")
flag.Parse()
ticker := time.NewTicker(pollingInterval)
defer ticker.Stop()
environment := flag.String("environment", "", "Environment name")
flag.Parse()
config := cmd.LoadConfig(*environment)
blockchain := geth.NewBlockchain(config.Client.IPCPath)
repository := cmd.LoadPostgres(config.Database, blockchain.Node())
cmd/watch_contract/main.go
+8 -3
View File
@@ -3,6 +3,8 @@ package main
import (
"flag"
"strings"
"github.com/8thlight/vulcanizedb/cmd"
"github.com/8thlight/vulcanizedb/pkg/core"
"github.com/8thlight/vulcanizedb/pkg/geth"
@@ -12,15 +14,18 @@ func main() {
environment := flag.String("environment", "", "Environment name")
contractHash := flag.String("contract-hash", "", "contract-hash=x1234")
abiFilepath := flag.String("abi-filepath", "", "path/to/abifile.json")
flag.Parse()
network := flag.String("network", "", "ropsten")
contractAbiString := cmd.GetAbi(*abiFilepath, *contractHash)
flag.Parse()
contractHashLowered := strings.ToLower(*contractHash)
contractAbiString := cmd.GetAbi(*abiFilepath, contractHashLowered, *network)
config := cmd.LoadConfig(*environment)
blockchain := geth.NewBlockchain(config.Client.IPCPath)
repository := cmd.LoadPostgres(config.Database, blockchain.Node())
watchedContract := core.Contract{
Abi: contractAbiString,
Hash: *contractHash,
Hash: contractHashLowered,
}
repository.CreateContract(watchedContract)
}