feat: bid attributes (#162)

Signed-off-by: Artur Troian <troian.ap@gmail.com>

_run/common-kube.mk

@@ -64,7 +64,7 @@ kube-prepare-image-akash: RELEASE_DOCKER_IMAGE=ghcr.io/akash-network/node
 kube-prepare-image-akash:
 ifneq ($(SKIP_BUILD), true)
 ifeq ($(AKASH_BUILD_LOCAL_IMAGE), true)
-	$(AP_ROOT)/script/tools.sh build-akash $(AKASHD_LOCAL_PATH)
+	$(AP_ROOT)/script/tools.sh build-akash-docker $(AKASHD_LOCAL_PATH)
 else
 	docker pull $(AKASH_DOCKER_IMAGE)
 endif

balance_checker.go

@@ -12,9 +12,10 @@ import (
 	tmrpc "github.com/tendermint/tendermint/rpc/core/types"
 
 	dtypes "github.com/akash-network/akash-api/go/node/deployment/v1beta3"
-	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta3"
-	"github.com/akash-network/node/client"
+	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta4"
+
 	aclient "github.com/akash-network/node/client"
+
 	"github.com/akash-network/node/pubsub"
 	netutil "github.com/akash-network/node/util/network"
 	"github.com/akash-network/node/util/runner"
@@ -68,7 +69,7 @@ type leaseCheckResponse struct {
 
 func newBalanceChecker(ctx context.Context,
 	bqc btypes.QueryClient,
-	aqc client.QueryClient,
+	aqc aclient.QueryClient,
 	accAddr sdk.AccAddress,
 	clientSession session.Session,
 	bus pubsub.Bus,

bidengine/order.go

@@ -15,7 +15,7 @@ import (
 
 	atypes "github.com/akash-network/akash-api/go/node/audit/v1beta3"
 	dtypes "github.com/akash-network/akash-api/go/node/deployment/v1beta3"
-	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta3"
+	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta4"
 	"github.com/akash-network/node/pubsub"
 	metricsutils "github.com/akash-network/node/util/metrics"
 	"github.com/akash-network/node/util/runner"
@@ -337,8 +337,7 @@ loop:
 			o.log.Info("requesting reservation")
 			// Begin reserving resources from cluster.
 			clusterch = runner.Do(metricsutils.ObserveRunner(func() runner.Result {
-				v := runner.NewResult(o.cluster.Reserve(o.orderID, group))
-				return v
+				return runner.NewResult(o.cluster.Reserve(o.orderID, group))
 			}, reservationDuration))
 
 		case result := <-clusterch:
@@ -400,8 +399,10 @@ loop:
 
 			o.log.Debug("submitting fulfillment", "price", price)
 
+			offer := mtypes.ResourceOfferFromRU(reservation.GetAllocatedResources())
+
 			// Begin submitting fulfillment
-			msg = mtypes.NewMsgCreateBid(o.orderID, o.session.Provider().Address(), price, o.cfg.Deposit)
+			msg = mtypes.NewMsgCreateBid(o.orderID, o.session.Provider().Address(), price, o.cfg.Deposit, offer)
 			bidch = runner.Do(func() runner.Result {
 				return runner.NewResult(nil, o.session.Client().Tx().Broadcast(ctx, msg))
 			})

bidengine/order_test.go

@@ -19,7 +19,7 @@ import (
 
 	audittypes "github.com/akash-network/akash-api/go/node/audit/v1beta3"
 	dtypes "github.com/akash-network/akash-api/go/node/deployment/v1beta3"
-	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta3"
+	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta4"
 	ptypes "github.com/akash-network/akash-api/go/node/provider/v1beta3"
 	atypes "github.com/akash-network/akash-api/go/node/types/v1beta3"
 	broadcastmocks "github.com/akash-network/node/client/broadcaster/mocks"
@@ -42,8 +42,8 @@ type orderTestScaffold struct {
 	queryClient *clientmocks.QueryClient
 	client      *clientmocks.Client
 	txClient    *broadcastmocks.Client
-	cluster     *clustermocks.Cluster
 
+	cluster           *clustermocks.Cluster
 	broadcasts        chan sdk.Msg
 	reserveCallNotify chan int
 }
@@ -98,23 +98,24 @@ func makeMocks(s *orderTestScaffold) {
 	queryClientMock.On("Orders", mock.Anything, mock.Anything).Return(&mtypes.QueryOrdersResponse{}, nil)
 	queryClientMock.On("Provider", mock.Anything, mock.Anything).Return(&ptypes.QueryProviderResponse{}, nil)
 
-	txClientMock := &broadcastmocks.Client{}
+	txMocks := &broadcastmocks.Client{}
 	s.broadcasts = make(chan sdk.Msg, 1)
-	txClientMock.On("Broadcast", mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
+	txMocks.On("Broadcast", mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
 		s.broadcasts <- args.Get(1).(sdk.Msg)
 	}).Return(nil)
 
-	clientMock := &clientmocks.Client{}
-	clientMock.On("Query").Return(queryClientMock)
-	clientMock.On("Tx").Return(txClientMock)
+	clientMocks := &clientmocks.Client{}
+	clientMocks.On("Query").Return(queryClientMock)
+	clientMocks.On("Tx").Return(txMocks)
 
-	s.client = clientMock
+	s.client = clientMocks
 	s.queryClient = queryClientMock
-	s.txClient = txClientMock
+	s.txClient = txMocks
 
 	mockReservation := &clustermocks.Reservation{}
 	mockReservation.On("OrderID").Return(s.orderID)
 	mockReservation.On("Resources").Return(groupResult.Group)
+	mockReservation.On("GetAllocatedResources").Return(groupResult.Group.GroupSpec.Resources)
 
 	s.cluster = &clustermocks.Cluster{}
 	s.reserveCallNotify = make(chan int, 1)
@@ -128,7 +129,7 @@ func makeMocks(s *orderTestScaffold) {
 
 type nullProviderAttrSignatureService struct{}
 
-func (nullProviderAttrSignatureService) GetAuditorAttributeSignatures(auditor string) ([]audittypes.Provider, error) {
+func (nullProviderAttrSignatureService) GetAuditorAttributeSignatures(_ string) ([]audittypes.Provider, error) {
 	return nil, nil // Return no attributes & no error
 }
 
@@ -138,7 +139,14 @@ func (nullProviderAttrSignatureService) GetAttributes() (atypes.Attributes, erro
 
 const testBidCreatedAt = 1234556789
 
-func makeOrderForTest(t *testing.T, checkForExistingBid bool, bidState mtypes.Bid_State, pricing BidPricingStrategy, callerConfig *Config, sessionHeight int64) (*order, orderTestScaffold, <-chan int) {
+func makeOrderForTest(
+	t *testing.T,
+	checkForExistingBid bool,
+	bidState mtypes.Bid_State,
+	pricing BidPricingStrategy,
+	callerConfig *Config,
+	sessionHeight int64,
+) (*order, orderTestScaffold, <-chan int) {
 	if pricing == nil {
 		pricing = testBidPricingStrategy(1)
 		require.NotNil(t, pricing)
@@ -399,7 +407,6 @@ func Test_BidOrderAndThenLeaseCreated(t *testing.T) {
 }
 
 func Test_BidOrderAndThenLeaseCreatedForDifferentDeployment(t *testing.T) {
-
 	order, scaffold, _ := makeOrderForTest(t, false, mtypes.BidStateInvalid, nil, nil, testBidCreatedAt)
 
 	// Wait for first broadcast

bidengine/provider_attributes_test.go

@@ -9,15 +9,16 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
+	atypes "github.com/akash-network/akash-api/go/node/audit/v1beta3"
+
+	ptypes "github.com/akash-network/akash-api/go/node/provider/v1beta3"
+	akashtypes "github.com/akash-network/akash-api/go/node/types/v1beta3"
+
 	clientmocks "github.com/akash-network/node/client/mocks"
 	"github.com/akash-network/node/pubsub"
 	"github.com/akash-network/node/testutil"
 
 	"github.com/akash-network/provider/session"
-
-	atypes "github.com/akash-network/akash-api/go/node/audit/v1beta3"
-	ptypes "github.com/akash-network/akash-api/go/node/provider/v1beta3"
-	akashtypes "github.com/akash-network/akash-api/go/node/types/v1beta3"
 )
 
 type providerAttributesTestScaffold struct {
@@ -31,7 +32,11 @@ type providerAttributesTestScaffold struct {
 	providerAddr sdk.AccAddress
 }
 
-func setupProviderAttributesTestScaffold(t *testing.T, ttl time.Duration, clientFactory func(scaffold *providerAttributesTestScaffold) *clientmocks.QueryClient) *providerAttributesTestScaffold {
+func setupProviderAttributesTestScaffold(
+	t *testing.T,
+	ttl time.Duration,
+	clientFactory func(scaffold *providerAttributesTestScaffold,
+	) *clientmocks.QueryClient) *providerAttributesTestScaffold {
 	retval := &providerAttributesTestScaffold{
 		auditorAddr:  testutil.AccAddress(t),
 		providerAddr: testutil.AccAddress(t),

bidengine/service.go

@@ -11,7 +11,7 @@ import (
 
 	sdkquery "github.com/cosmos/cosmos-sdk/types/query"
 
-	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta3"
+	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta4"
 	"github.com/akash-network/node/pubsub"
 	mquery "github.com/akash-network/node/x/market/query"
 

client/broadcaster/serial.go

@@ -18,7 +18,7 @@ import (
 	"github.com/tendermint/tendermint/libs/log"
 	ttypes "github.com/tendermint/tendermint/types"
 
-	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta3"
+	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta4"
 	abroadcaster "github.com/akash-network/node/client/broadcaster"
 )
 

cluster/client.go

@@ -18,7 +18,7 @@ import (
 
 	mani "github.com/akash-network/akash-api/go/manifest/v2beta2"
 	dtypes "github.com/akash-network/akash-api/go/node/deployment/v1beta3"
-	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta3"
+	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta4"
 	"github.com/akash-network/akash-api/go/node/types/unit"
 	types "github.com/akash-network/akash-api/go/node/types/v1beta3"
 	"github.com/akash-network/node/sdl"

cluster/hostname.go

@@ -10,7 +10,7 @@ import (
 	sdktypes "github.com/cosmos/cosmos-sdk/types"
 	"github.com/pkg/errors"
 
-	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta3"
+	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta4"
 
 	clustertypes "github.com/akash-network/provider/cluster/types/v1beta3"
 )

cluster/inventory.go

@@ -16,7 +16,7 @@ import (
 	"github.com/tendermint/tendermint/libs/log"
 
 	dtypes "github.com/akash-network/akash-api/go/node/deployment/v1beta3"
-	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta3"
+	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta4"
 	atypes "github.com/akash-network/akash-api/go/node/types/v1beta3"
 
 	"github.com/akash-network/node/pubsub"

cluster/inventory_test.go

@@ -11,7 +11,7 @@ import (
 
 	manifest "github.com/akash-network/akash-api/go/manifest/v2beta2"
 	dtypes "github.com/akash-network/akash-api/go/node/deployment/v1beta3"
-	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta3"
+	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta4"
 	"github.com/akash-network/akash-api/go/node/types/unit"
 	types "github.com/akash-network/akash-api/go/node/types/v1beta3"
 	"github.com/akash-network/node/pubsub"

cluster/kube/builder/builder.go

@@ -12,7 +12,7 @@ import (
 	"github.com/tendermint/tendermint/libs/log"
 
 	mani "github.com/akash-network/akash-api/go/manifest/v2beta2"
-	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta3"
+	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta4"
 
 	ctypes "github.com/akash-network/provider/cluster/types/v1beta3"
 	clusterUtil "github.com/akash-network/provider/cluster/util"

cluster/kube/cleanup.go

@@ -9,7 +9,7 @@ import (
 	"k8s.io/apimachinery/pkg/selection"
 	"k8s.io/client-go/kubernetes"
 
-	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta3"
+	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta4"
 
 	"github.com/akash-network/provider/cluster/kube/builder"
 )

cluster/kube/client.go

@@ -25,7 +25,7 @@ import (
 
 	mapi "github.com/akash-network/akash-api/go/manifest/v2beta2"
 	dtypes "github.com/akash-network/akash-api/go/node/deployment/v1beta3"
-	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta3"
+	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta4"
 	"github.com/akash-network/node/sdl"
 	metricsutils "github.com/akash-network/node/util/metrics"
 

cluster/kube/client_exec.go

@@ -16,7 +16,7 @@ import (
 	"k8s.io/client-go/tools/remotecommand"
 	executil "k8s.io/client-go/util/exec"
 
-	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta3"
+	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta4"
 
 	"github.com/akash-network/provider/cluster"
 	"github.com/akash-network/provider/cluster/kube/builder"

cluster/kube/client_exec_test.go

@@ -17,7 +17,7 @@ import (
 	kubefake "k8s.io/client-go/kubernetes/fake"
 	"k8s.io/client-go/rest"
 
-	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta3"
+	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta4"
 	"github.com/akash-network/node/sdl"
 	"github.com/akash-network/node/testutil"
 

cluster/kube/client_hostname_connections.go

@@ -13,7 +13,7 @@ import (
 
 	sdktypes "github.com/cosmos/cosmos-sdk/types"
 
-	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta3"
+	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta4"
 
 	"github.com/akash-network/provider/cluster/kube/builder"
 	ctypes "github.com/akash-network/provider/cluster/types/v1beta3"

cluster/kube/client_ingress.go

@@ -13,7 +13,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/tools/pager"
 
-	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta3"
+	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta4"
 	metricsutils "github.com/akash-network/node/util/metrics"
 
 	"github.com/akash-network/provider/cluster/kube/builder"

cluster/kube/client_test.go

@@ -16,7 +16,7 @@ import (
 	"k8s.io/client-go/rest"
 
 	manifest "github.com/akash-network/akash-api/go/manifest/v2beta2"
-	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta3"
+	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta4"
 	types "github.com/akash-network/akash-api/go/node/types/v1beta3"
 	"github.com/akash-network/node/testutil"
 

cluster/kube/clientcommon/recover_lease_id_from_labels.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strconv"
 
-	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta3"
+	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta4"
 
 	"github.com/akash-network/provider/cluster/kube/builder"
 )

cluster/kube/cluster_ip_connections.go

@@ -14,7 +14,7 @@ import (
 	sdktypes "github.com/cosmos/cosmos-sdk/types"
 
 	manifest "github.com/akash-network/akash-api/go/manifest/v2beta2"
-	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta3"
+	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta4"
 
 	"github.com/akash-network/provider/cluster/kube/builder"
 	kubeclienterrors "github.com/akash-network/provider/cluster/kube/errors"

cluster/kube/deploy_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta3"
+	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta4"
 	"github.com/akash-network/node/sdl"
 	"github.com/akash-network/node/testutil"
 

cluster/kube/inventory_test.go

@@ -13,7 +13,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	dtypes "github.com/akash-network/akash-api/go/node/deployment/v1beta3"
-	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta3"
+	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta4"
 	"github.com/akash-network/akash-api/go/node/types/unit"
 	atypes "github.com/akash-network/akash-api/go/node/types/v1beta3"
 	"github.com/akash-network/node/testutil"
@@ -47,6 +47,10 @@ func (r *testReservation) SetAllocatedResources(val dtypes.ResourceUnits) {
 	r.adjustedResources = val
 }
 
+func (r *testReservation) GetAllocatedResources() dtypes.ResourceUnits {
+	return r.adjustedResources
+}
+
 func (r *testReservation) Allocated() bool {
 	return false
 }

cluster/kube/metallb/client.go

@@ -24,7 +24,7 @@ import (
 	"k8s.io/client-go/util/flowcontrol"
 
 	manifest "github.com/akash-network/akash-api/go/manifest/v2beta2"
-	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta3"
+	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta4"
 
 	"github.com/akash-network/provider/cluster/kube/builder"
 	"github.com/akash-network/provider/cluster/kube/clientcommon"

cluster/manager.go

@@ -15,7 +15,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promauto"
 
 	mani "github.com/akash-network/akash-api/go/manifest/v2beta2"
-	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta3"
+	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta4"
 	"github.com/akash-network/node/pubsub"
 
 	kubeclienterrors "github.com/akash-network/provider/cluster/kube/errors"

cluster/manager_cleanup.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/akash-network/akash-api/go/manifest/v2beta2"
-	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta3"
+	mtypes "github.com/akash-network/akash-api/go/node/market/v1beta4"
 	logger "github.com/tendermint/tendermint/libs/log"
 )