Merge pull request #1735 from mesg-foundation/dev

Release v0.20.0

Author: Nicolas Mahé

.circleci/config.yml

@@ -95,6 +95,18 @@ jobs:
       - run: docker login -u $DOCKER_USER -p $DOCKER_PASS
       - run: make docker-publish version=$CIRCLE_TAG
 
+  "release_cli_dev":
+    <<: *run_on_docker
+    steps:
+      - checkout
+      - run: make publish-cmds version="dev build `echo $CIRCLE_SHA1 | cut -c1-7`" release-type=dev
+
+  "release_cli_prod":
+    <<: *run_on_docker
+    steps:
+      - checkout
+      - run: make publish-cmds version=$CIRCLE_TAG release-type=prod
+
 workflows:
   version: 2
 
@@ -142,6 +154,9 @@ workflows:
       - "publish_docker_dev":
           requires:
             - "test_e2e"
+      - "release_cli_dev":
+          requires:
+            - "test_e2e"
 
   test_prod:
     jobs:
@@ -193,3 +208,11 @@ workflows:
               ignore: /.*/
           requires:
             - "test_e2e"
+      - "release_cli_prod":
+          filters:
+            tags:
+              only: /^v.*/
+            branches:
+              ignore: /.*/
+          requires:
+            - "test_e2e"

CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## [v0.20.0](https://github.com/mesg-foundation/engine/releases/tag/v0.20.0)
+
+#### Added
+
+- ([#1688](https://github.com/mesg-foundation/engine/pull/1688)) Handle withdraw from resources.
+- ([#1694](https://github.com/mesg-foundation/engine/pull/1694)) Add build multi-platform cmds script to CI.
+- ([#1699](https://github.com/mesg-foundation/engine/pull/1699)) Processes pay for executions.
+- ([#1705](https://github.com/mesg-foundation/engine/pull/1705)) Add emitters to execution with consensus system.
+- ([#1719](https://github.com/mesg-foundation/engine/pull/1719)) Add transaction's log to returned error.
+- ([#1723](https://github.com/mesg-foundation/engine/pull/1723)) Add address to process.
+- ([#1728](https://github.com/mesg-foundation/engine/pull/1728)) Add address to service, runner, execution, and execution.
+- ([#1729](https://github.com/mesg-foundation/engine/pull/1729)) Wrap errors of modules' keeper, querier and msg to sent them to clients.
+
+#### Dependencies
+
+- ([#1668](https://github.com/mesg-foundation/engine/pull/1668)) Bump github.com/go-kit/kit from 0.9.0 to 0.10.0.
+- ([#1674](https://github.com/mesg-foundation/engine/pull/1674)) Bump github.com/stretchr/testify from 1.4.0 to 1.5.1.
+- ([#1677](https://github.com/mesg-foundation/engine/pull/1677)) Bump github.com/spf13/cobra from 0.0.5 to 0.0.6.
+- ([#1686](https://github.com/mesg-foundation/engine/pull/1686)) Bump github.com/golang/protobuf from 1.3.3 to 1.3.4.
+- ([#1697](https://github.com/mesg-foundation/engine/pull/1697)) Bump github.com/pseudomuto/protoc-gen-doc from 1.3.0 to 1.3.1.
+- ([#1702](https://github.com/mesg-foundation/engine/pull/1702)) Bump github.com/prometheus/client_golang from 1.4.1 to 1.5.0.
+
 ## [v0.19.0](https://github.com/mesg-foundation/engine/releases/tag/v0.19.0)
 
 #### Added

Makefile

@@ -1,6 +1,6 @@
-.PHONY: all build build-cmd-cosmos changelog check-version clean clean-build clean-docker dep dev dev-mon dev-start dev-stop docker-build docker-dev docker-publish docker-publish-dev docker-tools genesis lint protobuf test
+.PHONY: all build build-cmd-cosmos changelog check-version clean clean-build clean-docker dep dev dev-mon dev-start dev-stop docker-build docker-dev docker-publish docker-publish-dev docker-tools genesis lint protobuf test publish-cmds
 
-MAJOR_VERSION := $(shell echo $(version) | cut -d . -f 1)	
+MAJOR_VERSION := $(shell echo $(version) | cut -d . -f 1)
 MINOR_VERSION := $(shell echo $(version) | cut -d . -f 1-2)
 PATCH_VERSION := $(version)
 
@@ -54,6 +54,9 @@ dep:
 build: check-version dep
 	go build -mod=readonly -o ./bin/engine -ldflags="-X 'github.com/mesg-foundation/engine/version.Version=$(version)'" core/main.go
 
+publish-cmds: check-version dep
+	./scripts/publish-cmds.sh "$(version)" "$(release-type)"
+
 build-cmd: dep
 	go build -mod=readonly -o ./bin/mesg-cli ./cmd/mesg-cli/
 	go build -mod=readonly -o ./bin/mesg-daemon ./cmd/mesg-daemon/
@@ -80,6 +83,7 @@ clean-docker:
 	- docker image rm \
 			mesg/engine:$(version) \
 			mesg/engine:latest \
+			mesg/engine:local \
 			mesg/engine:dev 2>/dev/null
 
 clean: clean-build clean-docker

app/app.go

@@ -242,11 +242,11 @@ func NewInitApp(
 	)
 
 	// Engine's module keepers
-	app.ownershipKeeper = ownership.NewKeeper(app.cdc, keys[ownership.StoreKey])
+	app.ownershipKeeper = ownership.NewKeeper(app.cdc, keys[ownership.StoreKey], app.bankKeeper)
 	app.instanceKeeper = instance.NewKeeper(app.cdc, keys[instance.StoreKey])
-	app.processKeeper = process.NewKeeper(app.cdc, keys[process.StoreKey], app.instanceKeeper, app.ownershipKeeper)
+	app.processKeeper = process.NewKeeper(app.cdc, keys[process.StoreKey], app.instanceKeeper, app.ownershipKeeper, app.bankKeeper)
 	app.serviceKeeper = service.NewKeeper(app.cdc, keys[service.StoreKey], app.ownershipKeeper)
-	app.runnerKeeper = runner.NewKeeper(app.cdc, keys[runner.StoreKey], app.instanceKeeper)
+	app.runnerKeeper = runner.NewKeeper(app.cdc, keys[runner.StoreKey], app.instanceKeeper, app.ownershipKeeper)
 	app.executionKeeper = execution.NewKeeper(
 		app.cdc,
 		keys[execution.StoreKey],

config/config.go

@@ -97,7 +97,7 @@ func defaultConfig() (*Config, error) {
 
 	c.IpfsEndpoint = "http://ipfs.app.mesg.com:8080/ipfs/"
 
-	c.DefaultExecutionPrice = "10000atto" // /x/execution/internal/type/params.go#DefaultMinPrice
+	c.DefaultExecutionPrice = "10000atto" // /x/execution/internal/types/params.go#DefaultMinPrice
 
 	c.Server.Address = ":50052"
 	c.Log.Format = "text"

core/main.go

@@ -30,13 +30,14 @@ import (
 	"github.com/mesg-foundation/engine/server/grpc"
 	"github.com/mesg-foundation/engine/version"
 	"github.com/sirupsen/logrus"
+	rpcclient "github.com/tendermint/tendermint/rpc/client"
 	rpcserver "github.com/tendermint/tendermint/rpc/lib/server"
 	tmtypes "github.com/tendermint/tendermint/types"
 	db "github.com/tendermint/tm-db"
 )
 
-func stopRunningServices(mc *cosmos.ModuleClient, b *builder.Builder, address string) error {
-	runners, err := mc.ListRunner(&cosmos.FilterRunner{Address: address})
+func stopRunningServices(mc *cosmos.ModuleClient, b *builder.Builder, owner string) error {
+	runners, err := mc.ListRunner(&cosmos.FilterRunner{Owner: owner})
 	if err != nil {
 		return err
 	}
@@ -186,7 +187,7 @@ func main() {
 	}()
 
 	// create cosmos client
-	client, err := cosmos.NewClient(node, cdc, kb, genesis.ChainID, cfg.Account.Name, cfg.Account.Password, cfg.Cosmos.MinGasPrices)
+	client, err := cosmos.NewClient(rpcclient.NewLocal(node), cdc, kb, genesis.ChainID, cfg.Account.Name, cfg.Account.Password, cfg.Cosmos.MinGasPrices)
 	if err != nil {
 		logrus.WithField("module", "main").Fatalln(err)
 	}

cosmos/client.go

@@ -19,14 +19,13 @@ import (
 	"github.com/mesg-foundation/engine/ext/xstrings"
 	"github.com/mesg-foundation/engine/hash"
 	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/node"
 	rpcclient "github.com/tendermint/tendermint/rpc/client"
 	tenderminttypes "github.com/tendermint/tendermint/types"
 )
 
 // Client is a tendermint client with helper functions.
 type Client struct {
-	*rpcclient.Local
+	rpcclient.Client
 	cdc          *codec.Codec
 	kb           keys.Keybase
 	chainID      string
@@ -41,13 +40,13 @@ type Client struct {
 }
 
 // NewClient returns a rpc tendermint client.
-func NewClient(node *node.Node, cdc *codec.Codec, kb keys.Keybase, chainID, accName, accPassword, minGasPrices string) (*Client, error) {
+func NewClient(client rpcclient.Client, cdc *codec.Codec, kb keys.Keybase, chainID, accName, accPassword, minGasPrices string) (*Client, error) {
 	minGasPricesDecoded, err := sdktypes.ParseDecCoins(minGasPrices)
 	if err != nil {
 		return nil, err
 	}
 	return &Client{
-		Local:        rpcclient.NewLocal(node),
+		Client:       client,
 		cdc:          cdc,
 		kb:           kb,
 		chainID:      chainID,
@@ -93,7 +92,7 @@ func (c *Client) QueryWithData(path string, data []byte) ([]byte, int64, error)
 // BuildAndBroadcastMsg builds and signs message and broadcast it to node.
 func (c *Client) BuildAndBroadcastMsg(msg sdktypes.Msg) (*abci.ResponseDeliverTx, error) {
 	c.broadcastMutex.Lock() // Lock the whole signature + broadcast of the transaction
-	signedTx, err := c.createAndSignTx([]sdktypes.Msg{msg})
+	signedTx, err := c.CreateAndSignTx([]sdktypes.Msg{msg})
 	if err != nil {
 		c.broadcastMutex.Unlock()
 		return nil, err
@@ -106,7 +105,7 @@ func (c *Client) BuildAndBroadcastMsg(msg sdktypes.Msg) (*abci.ResponseDeliverTx
 	}
 
 	if txres.Code != abci.CodeTypeOK {
-		return nil, fmt.Errorf("transaction returned with invalid code %d", txres.Code)
+		return nil, fmt.Errorf("transaction returned with invalid code %d: %s", txres.Code, txres.Log)
 	}
 
 	// TODO: 20*time.Second should not be hardcoded here
@@ -132,7 +131,7 @@ func (c *Client) BuildAndBroadcastMsg(msg sdktypes.Msg) (*abci.ResponseDeliverTx
 		}
 		return &data.TxResult.Result, nil
 	case <-ctx.Done():
-		return nil, errors.New("i/o timeout")
+		return nil, errors.New("reach timeout for listening for transaction result")
 	}
 }
 
@@ -204,7 +203,8 @@ func (c *Client) GetAccount() (authExported.Account, error) {
 	return c.acc, nil
 }
 
-func (c *Client) createAndSignTx(msgs []sdktypes.Msg) (tenderminttypes.Tx, error) {
+// CreateAndSignTx build and sign a msg with client account.
+func (c *Client) CreateAndSignTx(msgs []sdktypes.Msg) (tenderminttypes.Tx, error) {
 	// retrieve account
 	accR, err := c.GetAccount()
 	if err != nil {

cosmos/errors/errors.go

@@ -257,7 +257,7 @@ func (mc *ModuleClient) GetRunner(hash hash.Hash) (*runnerpb.Runner, error) {
 
 // FilterRunner to apply while listing runners.
 type FilterRunner struct {
-	Address      string
+	Owner        string
 	InstanceHash hash.Hash
 }
 
@@ -277,7 +277,7 @@ func (mc *ModuleClient) ListRunner(f *FilterRunner) ([]*runnerpb.Runner, error)
 	// filter results
 	out := make([]*runnerpb.Runner, 0)
 	for _, r := range rs {
-		if (f.Address == "" || r.Address == f.Address) &&
+		if (f.Owner == "" || r.Owner == f.Owner) &&
 			(f.InstanceHash.IsZero() || r.InstanceHash.Equal(f.InstanceHash)) {
 			out = append(out, r)
 		}

cosmos/module_client.go

@@ -5,14 +5,19 @@ import (
 	"context"
 	"io/ioutil"
 	"net/http"
+	"os"
+	"path/filepath"
 	"testing"
 
+	"github.com/cosmos/cosmos-sdk/crypto/keys"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/rest"
 	"github.com/mesg-foundation/engine/app"
 	"github.com/mesg-foundation/engine/config"
 	"github.com/mesg-foundation/engine/cosmos"
 	pb "github.com/mesg-foundation/engine/protobuf/api"
 	"github.com/stretchr/testify/require"
+	rpcclient "github.com/tendermint/tendermint/rpc/client"
 	"google.golang.org/grpc"
 )
 
@@ -27,8 +32,11 @@ type apiclient struct {
 }
 
 var (
-	client apiclient
-	cdc    = app.MakeCodec()
+	minExecutionPrice     sdk.Coins
+	client                apiclient
+	cclient               *cosmos.Client
+	cdc                   = app.MakeCodec()
+	processInitialBalance = sdk.NewCoins(sdk.NewInt64Coin("atto", 10000000))
 )
 
 const (
@@ -70,14 +78,35 @@ func TestAPI(t *testing.T) {
 	}
 
 	cfg, err := config.New()
-	if err != nil {
-		panic(err)
-	}
+	require.NoError(t, err)
+
+	minExecutionPrice, err = sdk.ParseCoins(cfg.DefaultExecutionPrice)
+	require.NoError(t, err)
+
 	cosmos.CustomizeConfig(cfg)
 
 	conn, err := grpc.DialContext(context.Background(), "localhost:50052", grpc.WithInsecure())
 	require.NoError(t, err)
 
+	// change and recreate cosmos relative path because CI dir permissions
+	cfg.Cosmos.RelativePath = "e2e.cosmos"
+	err = os.MkdirAll(filepath.Join(cfg.Path, cfg.Cosmos.RelativePath), os.FileMode(0755))
+	require.NoError(t, err)
+
+	kb, err := cosmos.NewKeybase(filepath.Join(cfg.Path, cfg.Cosmos.RelativePath))
+	require.NoError(t, err)
+	if cfg.Account.Mnemonic != "" {
+		_, err = kb.CreateAccount(cfg.Account.Name, cfg.Account.Mnemonic, "", cfg.Account.Password, keys.CreateHDPath(cfg.Account.Number, cfg.Account.Index).String(), cosmos.DefaultAlgo)
+		require.NoError(t, err)
+	}
+
+	httpclient, err := rpcclient.NewHTTP("http://localhost:26657", "/websocket")
+	require.NoError(t, err)
+	require.NoError(t, httpclient.Start())
+	defer httpclient.Stop()
+	cclient, err = cosmos.NewClient(httpclient, cdc, kb, cfg.DevGenesis.ChainID, cfg.Account.Name, cfg.Account.Password, cfg.Cosmos.MinGasPrices)
+	require.NoError(t, err)
+
 	client = apiclient{
 		pb.NewServiceClient(conn),
 		pb.NewEventClient(conn),