migrate: remove facilitator, use tendermint events (#429)

* refactor: remove facilitator
* use events for lease, order creation
* reconstruct transactions from events for listeners
* refactor: remove failing tests
* genesis: set initial token supply to 100M AKT (#428)
* run: add minikube ip

Signed-off-by: Greg Osuri <me@gregosuri.com>

Author: gosuri

CHANGELOG

@@ -0,0 +1,2 @@
+
+upstream/uitable: fix IOR error during empty listing [#421] (#422)

Makefile

@@ -79,6 +79,9 @@ test-vet:
 deps-install:
 	$(GO) mod download
 
+deps-tidy:
+	$(GO) mod tidy
+
 devdeps-install:
 	$(GO) install github.com/gogo/protobuf/protoc-gen-gogo
 	$(GO) install github.com/vektra/mockery/.../

_integration/cmp/account.go

@@ -25,7 +25,7 @@ func accountSendTo(from key, to key, amount int64) gestalt.Component {
 }
 
 func groupAccountSend(key key) gestalt.Component {
-	start := int64(1000000000000000)
+	start := int64(100000000000000)
 	amount := int64(100)
 	other := newKey("other")
 	return g.Group("account-send").

_run/multi/akash-node/templates/deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "akash-node.fullname" . }}

_run/multi/akash-provider/templates/deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "akash-provider.fullname" . }}
@@ -34,6 +34,8 @@ spec:
               value: "true"
             - name: AKASH_DEPLOYMENT_INGRESS_DOMAIN
               value: "{{ .Values.deployment.ingress.domain }}"
+            - name: AKASH_PROVIDER_FAKE_CAPACITY
+              value: "true"
           ports:
             - containerPort: {{ .Values.provider.port }}
               name: http

_run/multi/deployment.yml

@@ -10,6 +10,8 @@ services:
         accept:
           - hello.192.168.99.132.nip.io
           - hello.192.168.99.130.nip.io
+          - hello.192.168.99.112.nip.io
+          - hello.192.168.64.2.nip.io
         to:
           - global: true
 
@@ -22,7 +24,6 @@ profiles:
   placement:
     westcoast:
       attributes:
-        region: us-west
       pricing:
         web: 100u
 

app/app.go

@@ -1,9 +1,7 @@
 package app
 
 import (
-	"context"
 	"encoding/json"
-	"errors"
 
 	"github.com/gogo/protobuf/jsonpb"
 	"github.com/ovrclk/akash/app/account"
@@ -27,7 +25,6 @@ import (
 
 type Application interface {
 	abci_types.Application
-	ActivateMarket(market.Actor) error
 
 	App(name string) apptypes.Application
 }
@@ -40,8 +37,6 @@ type app struct {
 
 	apps []apptypes.Application
 
-	mfacilitator market.Driver
-
 	log log.Logger
 }
 
@@ -117,29 +112,6 @@ func (app *app) App(name string) apptypes.Application {
 	return nil
 }
 
-func (app *app) ActivateMarket(actor market.Actor) error {
-
-	if app.mfacilitator != nil {
-		return errors.New("market already activated")
-	}
-
-	mapp, err := market.NewApp(app.log.With("app", market.Name))
-	if err != nil {
-		return err
-	}
-
-	mfacilitator, err := market.NewDriver(context.Background(), app.log.With("app", "market-facilitator"), actor)
-	if err != nil {
-		return err
-	}
-
-	app.mfacilitator = mfacilitator
-
-	app.apps = append(app.apps, mapp)
-
-	return nil
-}
-
 func (app *app) Info(req abci_types.RequestInfo) abci_types.ResponseInfo {
 	vsn, _ := json.Marshal(version.Get())
 	return abci_types.ResponseInfo{
@@ -236,26 +208,25 @@ func (app *app) DeliverTx(req abci_types.RequestDeliverTx) abci_types.ResponseDe
 
 func (app *app) BeginBlock(req abci_types.RequestBeginBlock) abci_types.ResponseBeginBlock {
 	app.trace("BeginBlock", "tmhash", util.X(req.Hash))
-
-	if app.mfacilitator != nil {
-		app.mfacilitator.OnBeginBlock(req)
-	}
-
 	return abci_types.ResponseBeginBlock{}
 }
 
 func (app *app) EndBlock(req abci_types.RequestEndBlock) abci_types.ResponseEndBlock {
 	app.trace("EndBlock")
-	return abci_types.ResponseEndBlock{}
+
+	events, err := market.NewEngine(app.log).Run(app.cacheState)
+	if err != nil {
+		app.log.Error("ERROR RUNNING ENGINE: ", "error", err)
+	}
+
+	return abci_types.ResponseEndBlock{
+		Events: events,
+	}
 }
 
 func (app *app) Commit() abci_types.ResponseCommit {
 	app.trace("Commit")
 
-	if err := lease.ProcessLeases(app.cacheState); err != nil {
-		app.log.Error("processing leases", "error", err)
-	}
-
 	if err := app.cacheState.Write(); err != nil {
 		panic("error when writing to cache")
 	}
@@ -265,13 +236,6 @@ func (app *app) Commit() abci_types.ResponseCommit {
 		return abci_types.ResponseCommit{Data: data}
 	}
 
-	if app.mfacilitator != nil {
-		err := app.mfacilitator.OnCommit(app.commitState)
-		if err != nil {
-			app.log.Error("error in facilitator.OnCommit", err.Error())
-		}
-	}
-
 	return abci_types.ResponseCommit{Data: data}
 }
 

app/app_test.go

@@ -4,16 +4,10 @@ import (
 	"testing"
 
 	app_ "github.com/ovrclk/akash/app"
-	dapp_ "github.com/ovrclk/akash/app/deployment"
-	fapp_ "github.com/ovrclk/akash/app/fulfillment"
-	lapp_ "github.com/ovrclk/akash/app/lease"
-	oapp_ "github.com/ovrclk/akash/app/order"
-	papp_ "github.com/ovrclk/akash/app/provider"
 	"github.com/ovrclk/akash/testutil"
 	"github.com/ovrclk/akash/txutil"
 	"github.com/ovrclk/akash/types"
 	"github.com/ovrclk/akash/types/code"
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	abci_types "github.com/tendermint/tendermint/abci/types"
 )
@@ -96,80 +90,3 @@ func TestApp(t *testing.T) {
 	}
 
 }
-
-func TestLeaseTransfer(t *testing.T) {
-	const (
-		price   = 10
-		balance = 100000
-	)
-	nonce := uint64(1)
-
-	_, keyfrom := testutil.PrivateKeySigner(t)
-	addrfrom := keyfrom.PubKey().Address().Bytes()
-
-	keyto := testutil.PrivateKey(t)
-	addrto := keyto.PubKey().Address().Bytes()
-
-	commitState, cacheState := testutil.NewState(t, &types.Genesis{
-		Accounts: []types.Account{
-			{Address: addrfrom, Balance: balance, Nonce: nonce},
-			{Address: addrto, Balance: 0, Nonce: nonce},
-		},
-	})
-
-	tacct, err := cacheState.Account().Get(addrfrom)
-	require.NoError(t, err)
-
-	pacct, err := cacheState.Account().Get(addrto)
-	require.NoError(t, err)
-
-	nonce++
-
-	app, err := app_.Create(commitState, cacheState, testutil.Logger())
-	require.NoError(t, err)
-
-	dapp := app.App(dapp_.Name)
-	require.NotNil(t, dapp)
-
-	oapp := app.App(oapp_.Name)
-	require.NotNil(t, oapp)
-
-	lapp := app.App(lapp_.Name)
-	require.NotNil(t, lapp)
-
-	papp := app.App(papp_.Name)
-	require.NotNil(t, papp)
-
-	fapp := app.App(fapp_.Name)
-	require.NotNil(t, fapp)
-
-	provider := testutil.CreateProvider(t, cacheState, papp, pacct, keyto, nonce)
-
-	deployment, groups := testutil.CreateDeployment(t, cacheState, dapp, tacct, keyfrom, nonce)
-	group := groups.Items[0]
-
-	order := testutil.CreateOrder(t, cacheState, oapp, tacct, keyfrom, deployment.Address, group.Seq, group.Seq)
-	testutil.CreateFulfillment(t, cacheState, fapp, provider.Address, keyto, deployment.Address, group.Seq, order.Seq, price)
-	lease := testutil.CreateLease(t, cacheState, lapp, provider.Address, keyto, deployment.Address, group.Seq, order.Seq, price)
-
-	app.Commit()
-
-	pacct, err = commitState.Account().Get(addrto)
-	require.NoError(t, err)
-	assert.Equal(t, uint64(lease.Price), pacct.Balance)
-
-	tacct, err = commitState.Account().Get(addrfrom)
-	require.NoError(t, err)
-	assert.Equal(t, uint64(balance-lease.Price), tacct.Balance)
-
-	app.Commit()
-
-	pacct, err = commitState.Account().Get(addrto)
-	require.NoError(t, err)
-	assert.Equal(t, uint64(lease.Price)*2, pacct.Balance)
-
-	tacct, err = commitState.Account().Get(addrfrom)
-	require.NoError(t, err)
-	assert.Equal(t, uint64(balance-lease.Price*2), tacct.Balance)
-
-}

app/deployment/app.go

@@ -347,8 +347,6 @@ func (a *app) doCheckCloseTx(state appstate.State, ctx apptypes.Context, tx *typ
 	}
 
 	switch tx.Reason {
-	case types.TxCloseDeployment_INSUFFICIENT:
-		// XXX: signer must be block's facilitator
 	case types.TxCloseDeployment_TENANT_CLOSE:
 		if !bytes.Equal(ctx.Signer().Address(), deployment.Tenant) {
 			return abci_types.ResponseCheckTx{

app/deployment/app_test.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/ovrclk/akash/app/deployment"
 	"github.com/ovrclk/akash/app/fulfillment"
-	"github.com/ovrclk/akash/app/lease"
 	"github.com/ovrclk/akash/app/order"
 	"github.com/ovrclk/akash/app/provider"
 	apptypes "github.com/ovrclk/akash/app/types"
@@ -280,57 +279,6 @@ func TestCloseTx_3(t *testing.T) {
 	check(types.Deployment_CLOSED, types.DeploymentGroup_CLOSED, types.Order_CLOSED, types.Fulfillment_CLOSED)
 }
 
-func TestCloseTx_4(t *testing.T) {
-
-	const (
-		gseq  = 1
-		oseq  = 3
-		price = 1
-	)
-
-	_, cacheState := testutil.NewState(t, nil)
-	app, err := deployment.NewApp(testutil.Logger())
-	require.NoError(t, err)
-	account, key := testutil.CreateAccount(t, cacheState)
-	nonce := uint64(1)
-	depl, _ := testutil.CreateDeployment(t, cacheState, app, account, key, nonce)
-
-	orderapp, err := order.NewApp(testutil.Logger())
-	require.NoError(t, err)
-	order := testutil.CreateOrder(t, cacheState, orderapp, account, key, depl.Address, gseq, oseq)
-
-	providerapp, err := provider.NewApp(testutil.Logger())
-	require.NoError(t, err)
-	prov := testutil.CreateProvider(t, cacheState, providerapp, account, key, nonce)
-
-	fulfillmentapp, err := fulfillment.NewApp(testutil.Logger())
-	require.NoError(t, err)
-	fulfillment := testutil.CreateFulfillment(t, cacheState, fulfillmentapp, prov.Address, key, depl.Address, gseq, oseq, price)
-
-	leaseapp, err := lease.NewApp(testutil.Logger())
-	require.NoError(t, err)
-	lease := testutil.CreateLease(t, cacheState, leaseapp, prov.Address, key, depl.Address, gseq, oseq, price)
-
-	check := func(
-		dstate types.Deployment_DeploymentState,
-		gstate types.DeploymentGroup_DeploymentGroupState,
-		ostate types.Order_OrderState,
-		fstate types.Fulfillment_FulfillmentState,
-		lstate types.Lease_LeaseState) {
-		assertDeploymentState(t, cacheState, app, depl.Address, dstate)
-		assertDeploymentGroupState(t, cacheState, app, order.GroupID(), gstate)
-		assertOrderState(t, cacheState, orderapp, order.OrderID, ostate)
-		assertFulfillmentState(t, cacheState, fulfillmentapp, fulfillment.FulfillmentID, fstate)
-		assertLeaseState(t, cacheState, leaseapp, lease.LeaseID, lstate)
-	}
-
-	check(types.Deployment_ACTIVE, types.DeploymentGroup_OPEN, types.Order_MATCHED, types.Fulfillment_OPEN, types.Lease_ACTIVE)
-
-	testutil.CloseDeployment(t, cacheState, app, &depl.Address, key)
-
-	check(types.Deployment_CLOSED, types.DeploymentGroup_CLOSED, types.Order_CLOSED, types.Fulfillment_CLOSED, types.Lease_CLOSED)
-}
-
 // check deployment and group query & status
 func assertDeploymentState(
 	t *testing.T,