Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sonm-io/core
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2f0bcb1300a5dedd3ccb02c93f9e3542281344c2
Choose a base ref
..
head repository: sonm-io/core
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9cf59d4d1792930c7ff40761f4a818be9368c84c
Choose a head ref
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

# Version of the entire package. Do not forget to update this when it's time
# to bump the version.
VERSION = v0.4.14
VERSION = v0.4.16

# Build tag. Useful to distinguish between same-version builds, but from
# different commits.
@@ -163,7 +163,7 @@ fmt:

test: mock
@echo "+ $@"
${GO} test -tags nocgo $(shell go list ./... | grep -vE 'vendor|blockchain')
${GO} test -tags nocgo $(shell go list ./... | grep -vE 'vendor')

# Everything except DWH tests.
test/lite: mock
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 0.4.14.{build}
version: 0.4.16.{build}

platform: x86

2 changes: 1 addition & 1 deletion blockchain/client.go
Original file line number Diff line number Diff line change
@@ -56,7 +56,7 @@ func (r *Receipt) UnmarshalJSON(input []byte) error {
r.BlockNumber = v.Int64()

if dec.BlockHash == "" {
return fmt.Errorf("unmarshaled block number is empty")
return fmt.Errorf("unmarshaled BlockHash is empty")
}
r.BlockHash = common.HexToHash(dec.BlockHash)

102 changes: 64 additions & 38 deletions blockchain/client_test.go
Original file line number Diff line number Diff line change
@@ -1,22 +1,55 @@
package blockchain

import (
"strings"
"testing"

"github.com/ethereum/go-ethereum/core/types"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

const blockPattern = `{
"blockHash":"0x1929947310bd7aae9509b99f8986297969e7450e116712c85d9c77a959bb8037",
"blockNumber":"0x359f08",
"contractAddress":null,
"cumulativeGasUsed":"0x81ce3",
"from":"0x4ac11b6ed0f118414db41b41dade342368f925ca",
"gasUsed":"0x81ce3",
"logs":[
{"address":"0x6c88e07debd749476636ac4841063130df6c62bf",
"topics":["0xffa896d8919f0556f53ace1395617969a3b53ab5271a085e28ac0c4a3724e63d","0x0000000000000000000000000000000000000000000000000000000000067b69"],
"data":"0x",
"blockNumber":"0x359f08",
"transactionHash":"0xf79deb72c6eea1d89490cd4d4706bfb50e6d96700021ed79cee0238012b072d2",
"transactionIndex":"0x0","blockHash":"0x1929947310bd7aae9509b99f8986297969e7450e116712c85d9c77a959bb8037","logIndex":"0x0","removed":false}],
"logsBloom":"0x00000000000000000000000000000008000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000020000000001000000000000000000400000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"status":"0x1",
"to":"0x6c88e07debd749476636ac4841063130df6c62bf",
"transactionHash":"0xf79deb72c6eea1d89490cd4d4706bfb50e6d96700021ed79cee0238012b072d2",
"transactionIndex":"0x0"
}`

func TestParseBlockNumberWithout0x(t *testing.T) {
raw := []byte(`{
"BlockNumber": "ff",
"cumulativeGasUsed": "0x1",
"gasUsed": "0x2",
"logs": [],
"transactionHash": "0xcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
"contractAddress": "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
"logsBloom": "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
"blockHash":"0x1929947310bd7aae9509b99f8986297969e7450e116712c85d9c77a959bb8037",
"blockNumber":"ff",
"contractAddress":null,
"cumulativeGasUsed":"0x81ce3",
"from":"0x4ac11b6ed0f118414db41b41dade342368f925ca",
"gasUsed":"0x81ce3",
"logs":[
{"address":"0x6c88e07debd749476636ac4841063130df6c62bf",
"topics":["0xffa896d8919f0556f53ace1395617969a3b53ab5271a085e28ac0c4a3724e63d","0x0000000000000000000000000000000000000000000000000000000000067b69"],
"data":"0x",
"blockNumber":"0x359f08",
"transactionHash":"0xf79deb72c6eea1d89490cd4d4706bfb50e6d96700021ed79cee0238012b072d2",
"transactionIndex":"0x0","blockHash":"0x1929947310bd7aae9509b99f8986297969e7450e116712c85d9c77a959bb8037","logIndex":"0x0","removed":false}],
"logsBloom":"0x00000000000000000000000000000008000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000020000000001000000000000000000400000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"status":"0x1",
"to":"0x6c88e07debd749476636ac4841063130df6c62bf",
"transactionHash":"0xf79deb72c6eea1d89490cd4d4706bfb50e6d96700021ed79cee0238012b072d2",
"transactionIndex":"0x0"
}`)

rec := &Receipt{
@@ -29,56 +62,49 @@ func TestParseBlockNumberWithout0x(t *testing.T) {
}

func TestParseBlockNumberWith0x(t *testing.T) {
raw := []byte(`{
"BlockNumber": "0xaa",
"cumulativeGasUsed": "0x1",
"gasUsed": "0x2",
"logs": [],
"transactionHash": "0xcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
"contractAddress": "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
"logsBloom": "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
}`)
raw := []byte(blockPattern)

rec := &Receipt{
Receipt: &types.Receipt{},
BlockNumber: 0,
}
err := rec.UnmarshalJSON(raw)
require.NoError(t, err)
assert.Equal(t, int64(170), rec.BlockNumber)
assert.Equal(t, int64(3514120), rec.BlockNumber)
}

func TestParseParseTo(t *testing.T) {
raw := []byte(`{
"BlockNumber": "0xaa",
"cumulativeGasUsed": "0x1",
"gasUsed": "0x2",
"To": "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
"logs": [],
"transactionHash": "0xcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
"contractAddress": "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
"logsBloom": "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
}`)
func TestParseTo(t *testing.T) {
raw := []byte(blockPattern)

rec := &Receipt{
Receipt: &types.Receipt{},
BlockNumber: 0,
}
err := rec.UnmarshalJSON(raw)
require.NoError(t, err)
assert.Equal(t, rec.To.String(), "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb")
assert.Equal(t, strings.ToLower(rec.To.String()), "0x6c88e07debd749476636ac4841063130df6c62bf")
}

func TestParseParseToWithNull(t *testing.T) {
func TestParseToWithNull(t *testing.T) {
raw := []byte(`{
"BlockNumber": "0xaa",
"cumulativeGasUsed": "0x1",
"gasUsed": "0x2",
"To": null"
"logs": [],
"transactionHash": "0xcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
"contractAddress": "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
"logsBloom": "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
"blockHash":"0x1929947310bd7aae9509b99f8986297969e7450e116712c85d9c77a959bb8037",
"blockNumber":"0x359f08",
"contractAddress":null,
"cumulativeGasUsed":"0x81ce3",
"from":"0x4ac11b6ed0f118414db41b41dade342368f925ca",
"gasUsed":"0x81ce3",
"logs":[
{"address":"0x6c88e07debd749476636ac4841063130df6c62bf",
"topics":["0xffa896d8919f0556f53ace1395617969a3b53ab5271a085e28ac0c4a3724e63d","0x0000000000000000000000000000000000000000000000000000000000067b69"],
"data":"0x",
"blockNumber":"0x359f08",
"transactionHash":"0xf79deb72c6eea1d89490cd4d4706bfb50e6d96700021ed79cee0238012b072d2",
"transactionIndex":"0x0","blockHash":"0x1929947310bd7aae9509b99f8986297969e7450e116712c85d9c77a959bb8037","logIndex":"0x0","removed":false}],
"logsBloom":"0x00000000000000000000000000000008000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000020000000001000000000000000000400000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"status":"0x1",
"to": null,
"transactionHash":"0xf79deb72c6eea1d89490cd4d4706bfb50e6d96700021ed79cee0238012b072d2",
"transactionIndex":"0x0"
}`)

rec := &Receipt{
19 changes: 0 additions & 19 deletions blockchain/examples/getBlockNumber/getBlockNumber.go

This file was deleted.

99 changes: 0 additions & 99 deletions blockchain/examples/placeOrder/placeOrder.go

This file was deleted.

20 changes: 19 additions & 1 deletion cmd/cli/commands/client.go
Original file line number Diff line number Diff line change
@@ -2,7 +2,9 @@ package commands

import (
"context"
"fmt"

"github.com/sonm-io/core/insonmnia/auth"
"github.com/sonm-io/core/proto"
"github.com/sonm-io/core/util/xgrpc"
"google.golang.org/grpc"
@@ -12,7 +14,23 @@ import (
//
// Note that `timeoutFlag`, `nodeAddressFlag` and `creds` are set implicitly because it is global for all CLI-related stuff.
func newClientConn(ctx context.Context) (*grpc.ClientConn, error) {
return xgrpc.NewClient(ctx, nodeAddress(), creds)
var addr string

fullEndpoint, err := auth.NewAddr(nodeAddress())
if err != nil {
return nil, fmt.Errorf("failed to parse node address: %v", err)
}

if insecureFlag {
addr, err = fullEndpoint.Addr()
if err != nil {
return nil, fmt.Errorf("failed to parse node addr: %v", err)
}
} else {
addr = fullEndpoint.String()
}

return xgrpc.NewClient(ctx, addr, creds)
}

func newWorkerManagementClient(ctx context.Context) (sonm.WorkerManagementClient, error) {
7 changes: 0 additions & 7 deletions cmd/cli/config/config.go
Original file line number Diff line number Diff line change
@@ -10,7 +10,6 @@ import (
"github.com/sonm-io/core/accounts"
"github.com/sonm-io/core/insonmnia/auth"
"github.com/sonm-io/core/util"
"github.com/sonm-io/core/util/netutil"
"gopkg.in/yaml.v2"
)

@@ -65,12 +64,6 @@ func (cc *Config) Validate() error {
}
}

if len(cc.NodeAddr) > 0 {
addr, port, err := netutil.SplitHostPort(cc.NodeAddr)
if err != nil || addr == nil || port == 0 {
return fmt.Errorf("failed to parse node address, please use `ip:port` format")
}
}
return nil
}

1 change: 1 addition & 0 deletions cmd/lsgpu/main.go
Original file line number Diff line number Diff line change
@@ -21,6 +21,7 @@ func main() {
fmt.Printf("Card: %s\r\n", card.Path)
if m, err := card.Metrics(); err == nil {
fmt.Printf(" t = %.1f (fan = %.1f%%)\r\n", m.Temperature, m.Fan)
fmt.Printf(" power = %.1fW\r\n", m.Power)
} else {
fmt.Printf(" metrics is not available\r\n")
}
Loading