Merge branch 'main' into add-and-fix-links

README.md

@@ -7,7 +7,6 @@
 [![GoDoc](https://img.shields.io/badge/godoc-reference-blue?style=flat-square&logo=go)](https://godoc.org/github.com/skip-mev/slinky)
 [![Go Report Card](https://goreportcard.com/badge/github.com/skip-mev/slinky?style=flat-square)](https://goreportcard.com/report/github.com/skip-mev/slinky)
 [![Version](https://img.shields.io/github/tag/skip-mev/slinky.svg?style=flat-square)](https://github.com/skip-mev/slinky/releases/latest)
-[![License: Apache-2.0](https://img.shields.io/github/license/skip-mev/slinky.svg?style=flat-square)](https://github.com/skip-mev/slinky/blob/main/LICENSE)
 [![Lines Of Code](https://img.shields.io/tokei/lines/github/skip-mev/slinky?style=flat-square)](https://github.com/skip-mev/slinky)
 
 A general purpose price oracle leveraging ABCI++. Please visit our [docs](https://docs.skip.money/slinky/overview) page for more information!
@@ -16,6 +15,9 @@ Slinky uses Vote Extensions to create an hyperperformant, extremely secure mecha
 many of the highest-performance decentralized applications today. If you would like to integrate Slinky to power your use case, please contact us on our
 [discord](https://discord.gg/PeBGE9jrbu).
 
+> [!NOTE]
+> Slinky is **business-licensed software** under BSL, meaning it requires a license to use or reference. It is source viewable, but [**reach out to us on Discord**](https://skip.money/discord) if you are interested in integrating! We are limiting the number of chains we work with to seven in 2024. We apologize if we run out of capacity.
+
 ## Install
 
 ```shell

cmd/client/main.go

@@ -10,11 +10,12 @@ import (
 	"syscall"
 	"time"
 
-	slinkygrpc "github.com/skip-mev/slinky/pkg/grpc"
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 
+	slinkygrpc "github.com/skip-mev/slinky/pkg/grpc"
+
 	"github.com/skip-mev/slinky/service/servers/oracle/types"
 )
 

providers/apis/bitstamp/api_handler_test.go

@@ -7,11 +7,12 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/skip-mev/slinky/oracle/types"
 	"github.com/skip-mev/slinky/providers/apis/bitstamp"
 	"github.com/skip-mev/slinky/providers/base/testutils"
 	providertypes "github.com/skip-mev/slinky/providers/types"
-	"github.com/stretchr/testify/require"
 )
 
 var (

providers/apis/coinmarketcap/api_handler_test.go

@@ -6,11 +6,12 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/skip-mev/slinky/oracle/types"
 	"github.com/skip-mev/slinky/providers/apis/coinmarketcap"
 	"github.com/skip-mev/slinky/providers/base/testutils"
 	providertypes "github.com/skip-mev/slinky/providers/types"
-	"github.com/stretchr/testify/require"
 )
 
 var (

providers/apis/dydx/switch_over_fetcher_test.go

@@ -7,6 +7,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+	"go.uber.org/zap"
+
 	"github.com/skip-mev/slinky/oracle/config"
 	"github.com/skip-mev/slinky/providers/apis/dydx"
 	"github.com/skip-mev/slinky/providers/apis/marketmap"
@@ -17,9 +21,6 @@ import (
 	providertypes "github.com/skip-mev/slinky/providers/types"
 	mmclient "github.com/skip-mev/slinky/service/clients/marketmap/types"
 	mmtypes "github.com/skip-mev/slinky/x/marketmap/types"
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
-	"go.uber.org/zap"
 )
 
 func TestDefaultSwitchOverProvider(t *testing.T) {

providers/apis/marketmap/client.go

@@ -5,10 +5,11 @@ import (
 	"fmt"
 	"time"
 
-	slinkygrpc "github.com/skip-mev/slinky/pkg/grpc"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 
+	slinkygrpc "github.com/skip-mev/slinky/pkg/grpc"
+
 	"github.com/skip-mev/slinky/oracle/config"
 	"github.com/skip-mev/slinky/providers/base/api/metrics"
 	mmtypes "github.com/skip-mev/slinky/x/marketmap/types"

service/clients/oracle/client.go

@@ -7,11 +7,12 @@ import (
 	"time"
 
 	"cosmossdk.io/log"
-	slinkygrpc "github.com/skip-mev/slinky/pkg/grpc"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/connectivity"
 	"google.golang.org/grpc/credentials/insecure"
 
+	slinkygrpc "github.com/skip-mev/slinky/pkg/grpc"
+
 	"github.com/skip-mev/slinky/oracle/config"
 	"github.com/skip-mev/slinky/service/metrics"
 	"github.com/skip-mev/slinky/service/servers/oracle/types"

x/marketmap/keeper/genesis.go

@@ -30,8 +30,10 @@ func (k *Keeper) InitGenesis(ctx sdk.Context, gs types.GenesisState) {
 		panic(err)
 	}
 
-	if err := k.hooks.AfterMarketGenesis(ctx, gs.MarketMap.Markets); err != nil {
-		panic(err)
+	if k.hooks != nil {
+		if err := k.hooks.AfterMarketGenesis(ctx, gs.MarketMap.Markets); err != nil {
+			panic(err)
+		}
 	}
 }
 

x/marketmap/keeper/hooks.go

@@ -8,7 +8,7 @@ import (
 func (k *Keeper) Hooks() types.MarketMapHooks {
 	if k.hooks == nil {
 		// return a no-op implementation if no hooks are set
-		return types.MultiMarketMapHooks{}
+		return &types.NoopMarketMapHooks{}
 	}
 
 	return k.hooks
@@ -17,9 +17,5 @@ func (k *Keeper) Hooks() types.MarketMapHooks {
 // SetHooks sets the x/marketmap hooks.  In contrast to other receivers, this method must take a pointer due to nature
 // of the hooks interface and SDK start up sequence.
 func (k *Keeper) SetHooks(mmh types.MarketMapHooks) {
-	if k.hooks != nil {
-		panic("cannot set marketmap hooks twice")
-	}
-
 	k.hooks = mmh
 }

x/marketmap/keeper/keeper.go

@@ -50,6 +50,7 @@ func NewKeeper(ss store.KVStoreService, cdc codec.BinaryCodec, authority sdk.Acc
 		markets:     collections.NewMap(sb, types.MarketsPrefix, "markets", types.TickersCodec, codec.CollValue[types.Market](cdc)),
 		lastUpdated: collections.NewItem[uint64](sb, types.LastUpdatedPrefix, "last_updated", types.LastUpdatedCodec),
 		params:      params,
+		hooks:       &types.NoopMarketMapHooks{},
 	}
 }
 

x/marketmap/types/hooks.go

@@ -56,3 +56,20 @@ func (mh MultiMarketMapHooks) AfterMarketGenesis(ctx sdk.Context, markets map[st
 
 // MarketMapHooksWrapper is a wrapper for modules to inject MarketMapHooks using depinject.
 type MarketMapHooksWrapper struct{ MarketMapHooks }
+
+var _ MarketMapHooks = &NoopMarketMapHooks{}
+
+// NoopMarketMapHooks defines market map hooks that are a no-op.
+type NoopMarketMapHooks struct{}
+
+func (n *NoopMarketMapHooks) AfterMarketCreated(_ sdk.Context, _ Market) error {
+	return nil
+}
+
+func (n *NoopMarketMapHooks) AfterMarketUpdated(_ sdk.Context, _ Market) error {
+	return nil
+}
+
+func (n *NoopMarketMapHooks) AfterMarketGenesis(_ sdk.Context, _ map[string]Market) error {
+	return nil
+}