Hoist core/node/contracts up one dir, also move river contracts to ri… (

#268) …ver subdir
river-build · Jun 26, 2024 · 5440e84 · 5440e84
1 parent 082af0a
commit 5440e84
Show file tree

Hide file tree

Showing 80 changed files with 210 additions and 242 deletions.
diff --git a/core/cmd/register_xchain_node_cmd.go b/core/cmd/register_xchain_node_cmd.go
@@ -12,7 +12,6 @@ import (
 
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/core/types"
-	node_contracts "github.com/river-build/river/core/node/contracts"
 	"github.com/river-build/river/core/node/crypto"
 	"github.com/river-build/river/core/node/infra"
 	"github.com/spf13/cobra"
@@ -100,7 +99,7 @@ func registerImpl(operatorKeyfile string, userConfirmationMessage string, regist
 		return err
 	}
 
-	decoder, err := node_contracts.NewEVMErrorDecoder(checker.GetMetadata(), entitlementGatedMetaData.GetMetadata())
+	decoder, err := crypto.NewEVMErrorDecoder(checker.GetMetadata(), entitlementGatedMetaData.GetMetadata())
 	if err != nil {
 		return err
 	}

diff --git a/core/cmd/registry_cmd.go b/core/cmd/registry_cmd.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/river-build/river/core/config"
+	"github.com/river-build/river/core/contracts/river"
 	. "github.com/river-build/river/core/node/base"
-	"github.com/river-build/river/core/node/contracts"
 	"github.com/river-build/river/core/node/crypto"
 	"github.com/river-build/river/core/node/infra"
 	. "github.com/river-build/river/core/node/protocol"
@@ -125,7 +125,7 @@ func nodesdump(cfg *config.Config) error {
 			node.NodeAddress.Hex(),
 			node.Operator.Hex(),
 			node.Status,
-			contracts.NodeStatusString(node.Status),
+			river.NodeStatusString(node.Status),
 			node.Url,
 		)
 	}

diff --git a/core/node/contracts/base/architect.go → core/contracts/base/architect.go b/core/node/contracts/base/architect.go → core/contracts/base/architect.go
diff --git a/core/node/contracts/base/banning.go → core/contracts/base/banning.go b/core/node/contracts/base/banning.go → core/contracts/base/banning.go
diff --git a/core/node/contracts/base/channels.go → core/contracts/base/channels.go b/core/node/contracts/base/channels.go → core/contracts/base/channels.go
diff --git a/...tracts/base/entitlement_data_queryable.go → ...tracts/base/entitlement_data_queryable.go b/...tracts/base/entitlement_data_queryable.go → ...tracts/base/entitlement_data_queryable.go
diff --git a/...de/contracts/base/entitlements_manager.go → core/contracts/base/entitlements_manager.go b/...de/contracts/base/entitlements_manager.go → core/contracts/base/entitlements_manager.go
diff --git a/.../node/contracts/base/erc721a_queryable.go → core/contracts/base/erc721a_queryable.go b/.../node/contracts/base/erc721a_queryable.go → core/contracts/base/erc721a_queryable.go
diff --git a/core/node/contracts/base/pausable.go → core/contracts/base/pausable.go b/core/node/contracts/base/pausable.go → core/contracts/base/pausable.go
diff --git a/core/node/contracts/base/rule_entitlement.go → core/contracts/base/rule_entitlement.go b/core/node/contracts/base/rule_entitlement.go → core/contracts/base/rule_entitlement.go
diff --git a/core/node/contracts/base/wallet_link.go → core/contracts/base/wallet_link.go b/core/node/contracts/base/wallet_link.go → core/contracts/base/wallet_link.go
diff --git a/...e/contracts/deploy/mock_river_registry.go → ...racts/river/deploy/mock_river_registry.go b/...e/contracts/deploy/mock_river_registry.go → ...racts/river/deploy/mock_river_registry.go
diff --git a/core/node/contracts/node_registry_v1.go → core/contracts/river/node_registry_v1.go b/core/node/contracts/node_registry_v1.go → core/contracts/river/node_registry_v1.go
diff --git a/core/node/contracts/node_registry_v1_ex.go → core/contracts/river/node_registry_v1_ex.go b/core/node/contracts/node_registry_v1_ex.go → core/contracts/river/node_registry_v1_ex.go
@@ -1,4 +1,4 @@
-package contracts
+package river
 
 import "github.com/ethereum/go-ethereum/accounts/abi/bind"
 

diff --git a/core/node/contracts/operator_registry_v1.go → core/contracts/river/operator_registry_v1.go b/core/node/contracts/operator_registry_v1.go → core/contracts/river/operator_registry_v1.go
diff --git a/core/node/contracts/river_config_v1.go → core/contracts/river/river_config_v1.go b/core/node/contracts/river_config_v1.go → core/contracts/river/river_config_v1.go
diff --git a/core/node/contracts/river_config_v1_ex.go → core/contracts/river/river_config_v1_ex.go b/core/node/contracts/river_config_v1_ex.go → core/contracts/river/river_config_v1_ex.go
@@ -1,4 +1,4 @@
-package contracts
+package river
 
 import "github.com/ethereum/go-ethereum/accounts/abi/bind"
 

diff --git a/core/node/contracts/stream_registry_v1.go → core/contracts/river/stream_registry_v1.go b/core/node/contracts/stream_registry_v1.go → core/contracts/river/stream_registry_v1.go
diff --git a/core/node/contracts/stream_registry_v1_ex.go → .../contracts/river/stream_registry_v1_ex.go b/core/node/contracts/stream_registry_v1_ex.go → .../contracts/river/stream_registry_v1_ex.go
@@ -1,4 +1,4 @@
-package contracts
+package river
 
 import "github.com/ethereum/go-ethereum/accounts/abi/bind"
 

diff --git a/core/node/auth/architect.go b/core/node/auth/architect.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/river-build/river/core/config"
-	"github.com/river-build/river/core/node/contracts/base"
+	"github.com/river-build/river/core/contracts/base"
 	"github.com/river-build/river/core/node/dlog"
 	. "github.com/river-build/river/core/node/protocol"
 

diff --git a/core/node/auth/banning.go b/core/node/auth/banning.go
@@ -8,8 +8,8 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/river-build/river/core/config"
+	baseContracts "github.com/river-build/river/core/contracts/base"
 	. "github.com/river-build/river/core/node/base"
-	baseContracts "github.com/river-build/river/core/node/contracts/base"
 	. "github.com/river-build/river/core/node/protocol"
 )
 

diff --git a/core/node/auth/channels.go b/core/node/auth/channels.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"time"
 
+	"github.com/river-build/river/core/contracts/base"
 	. "github.com/river-build/river/core/node/base"
-	"github.com/river-build/river/core/node/contracts/base"
 	"github.com/river-build/river/core/node/dlog"
 	. "github.com/river-build/river/core/node/protocol"
 	"github.com/river-build/river/core/node/shared"

diff --git a/core/node/auth/entitlement.go b/core/node/auth/entitlement.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"time"
 
+	"github.com/river-build/river/core/contracts/base"
 	. "github.com/river-build/river/core/node/base"
-	"github.com/river-build/river/core/node/contracts/base"
 	"github.com/river-build/river/core/node/dlog"
 	. "github.com/river-build/river/core/node/protocol"
 

diff --git a/core/node/auth/pausable.go b/core/node/auth/pausable.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"time"
 
+	"github.com/river-build/river/core/contracts/base"
 	. "github.com/river-build/river/core/node/base"
-	"github.com/river-build/river/core/node/contracts/base"
 	"github.com/river-build/river/core/node/dlog"
 	. "github.com/river-build/river/core/node/protocol"
 

diff --git a/core/node/auth/space_contract_v3.go b/core/node/auth/space_contract_v3.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"sync"
 
+	"github.com/river-build/river/core/contracts/base"
 	. "github.com/river-build/river/core/node/base"
-	"github.com/river-build/river/core/node/contracts/base"
 	"github.com/river-build/river/core/node/dlog"
 	. "github.com/river-build/river/core/node/protocol"
 

diff --git a/core/node/auth/wallet_link.go b/core/node/auth/wallet_link.go
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/river-build/river/core/config"
+	"github.com/river-build/river/core/contracts/base"
 	. "github.com/river-build/river/core/node/base"
-	"github.com/river-build/river/core/node/contracts/base"
 	"github.com/river-build/river/core/node/dlog"
 	. "github.com/river-build/river/core/node/protocol"
 

diff --git a/core/node/crypto/blockchain_test.go b/core/node/crypto/blockchain_test.go
@@ -5,14 +5,13 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/river-build/river/core/node/contracts"
-
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/river-build/river/core/contracts/river"
 	. "github.com/river-build/river/core/node/base"
 	"github.com/river-build/river/core/node/base/test"
 	. "github.com/river-build/river/core/node/protocol"
@@ -211,7 +210,7 @@ func TestBlockchainMultiMonitor(t *testing.T) {
 	require.NoError(err)
 	defer tc.Close()
 
-	abi, err := contracts.NodeRegistryV1MetaData.GetAbi()
+	abi, err := river.NodeRegistryV1MetaData.GetAbi()
 	require.NoError(err, "node registry abi")
 
 	var (
@@ -239,7 +238,7 @@ func TestBlockchainMultiMonitor(t *testing.T) {
 		return tc.NodeRegistry.RegisterNode(
 			opts, node.Wallet.Address,
 			"http://TestBlockchainMultiMonitor.test",
-			contracts.NodeStatus_NotInitialized)
+			river.NodeStatus_NotInitialized)
 	})
 
 	require.NoError(err, "submit RegisterNode tx")

diff --git a/core/node/crypto/chain_monitor_test.go b/core/node/crypto/chain_monitor_test.go
@@ -12,8 +12,8 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/river-build/river/core/contracts/river"
 	"github.com/river-build/river/core/node/base/test"
-	"github.com/river-build/river/core/node/contracts"
 	"github.com/river-build/river/core/node/crypto"
 	"github.com/stretchr/testify/require"
 )
@@ -169,7 +169,7 @@ func TestChainMonitorEvents(t *testing.T) {
 			close(onMonitorStoppedCount)
 		}
 
-		nodeRegistryABI, _ = abi.JSON(strings.NewReader(contracts.NodeRegistryV1ABI))
+		nodeRegistryABI, _ = abi.JSON(strings.NewReader(river.NodeRegistryV1ABI))
 
 		urls  = []string{"https://river0.test"}
 		addrs = []common.Address{tc.Wallets[0].Address}
@@ -192,7 +192,7 @@ func TestChainMonitorEvents(t *testing.T) {
 		ctx,
 		"RegisterNode",
 		func(opts *bind.TransactOpts) (*types.Transaction, error) {
-			return tc.NodeRegistry.RegisterNode(opts, addrs[0], urls[0], contracts.NodeStatus_NotInitialized)
+			return tc.NodeRegistry.RegisterNode(opts, addrs[0], urls[0], river.NodeStatus_NotInitialized)
 		},
 	)
 	require.NoError(err)
@@ -246,7 +246,7 @@ func TestContractAllEventsFromFuture(t *testing.T) {
 		futureContractEventsCallback               = func(ctx context.Context, event types.Log) {
 			futureContractEventsCallbackCapturedEvents <- event
 		}
-		nodeRegistryABI, _ = abi.JSON(strings.NewReader(contracts.NodeRegistryV1MetaData.ABI))
+		nodeRegistryABI, _ = abi.JSON(strings.NewReader(river.NodeRegistryV1MetaData.ABI))
 		readCapturedEvents = func(captured <-chan types.Log) []types.Log {
 			var logs []types.Log
 			for i := 0; i < nodeCount; i++ {
@@ -280,7 +280,7 @@ func TestContractAllEventsFromFuture(t *testing.T) {
 					opts,
 					wallet.Address,
 					fmt.Sprintf("https://node%d.river.test", i),
-					contracts.NodeStatus_NotInitialized,
+					river.NodeStatus_NotInitialized,
 				)
 			},
 		)
@@ -344,7 +344,7 @@ func TestContractAllEventsFromFuture(t *testing.T) {
 					opts,
 					wallet.Address,
 					fmt.Sprintf("https://node%d.river.test", i),
-					contracts.NodeStatus_NotInitialized,
+					river.NodeStatus_NotInitialized,
 				)
 			},
 		)
@@ -390,7 +390,7 @@ func TestContractAllEventsFromPast(t *testing.T) {
 		historicalContractEventsCallback               = func(ctx context.Context, event types.Log) {
 			historicalContractEventsCallbackCapturedEvents <- event
 		}
-		nodeRegistryABI, _ = abi.JSON(strings.NewReader(contracts.NodeRegistryV1MetaData.ABI))
+		nodeRegistryABI, _ = abi.JSON(strings.NewReader(river.NodeRegistryV1MetaData.ABI))
 		readCapturedEvents = func(captured <-chan types.Log) []types.Log {
 			var logs []types.Log
 			for i := 0; i < nodeCount; i++ {
@@ -424,7 +424,7 @@ func TestContractAllEventsFromPast(t *testing.T) {
 					opts,
 					wallet.Address,
 					fmt.Sprintf("https://node%d.river.test", i),
-					contracts.NodeStatus_NotInitialized,
+					river.NodeStatus_NotInitialized,
 				)
 			},
 		)
@@ -510,7 +510,7 @@ func TestContractEventsWithTopicsFromPast(t *testing.T) {
 		historicalContractWithTopicsEventCallback               = func(ctx context.Context, event types.Log) {
 			historicalContractWithTopicsEventCallbackCapturedEvents <- event
 		}
-		nodeRegistryABI, _ = abi.JSON(strings.NewReader(contracts.NodeRegistryV1MetaData.ABI))
+		nodeRegistryABI, _ = abi.JSON(strings.NewReader(river.NodeRegistryV1MetaData.ABI))
 		readCapturedEvents = func(captured <-chan types.Log) []types.Log {
 			var logs []types.Log
 			for i := 0; i < nodeCount; i++ {
@@ -540,7 +540,7 @@ func TestContractEventsWithTopicsFromPast(t *testing.T) {
 			ctx,
 			"RegisterNode",
 			func(opts *bind.TransactOpts) (*types.Transaction, error) {
-				return tc.NodeRegistry.RegisterNode(opts, wallet.Address, fmt.Sprintf("https://node%d.river.test", i), contracts.NodeStatus_NotInitialized)
+				return tc.NodeRegistry.RegisterNode(opts, wallet.Address, fmt.Sprintf("https://node%d.river.test", i), river.NodeStatus_NotInitialized)
 			},
 		)
 		require.NoError(err, "register node")
@@ -614,7 +614,7 @@ func TestEventsOrder(t *testing.T) {
 			capturedEvents <- event
 		}
 
-		nodeRegistryABI, _ = abi.JSON(strings.NewReader(contracts.NodeRegistryV1MetaData.ABI))
+		nodeRegistryABI, _ = abi.JSON(strings.NewReader(river.NodeRegistryV1MetaData.ABI))
 		readCapturedEvents = func(captured <-chan types.Log) []types.Log {
 			var logs []types.Log
 			for i := 0; i < nodeCount; i++ {
@@ -644,7 +644,7 @@ func TestEventsOrder(t *testing.T) {
 			ctx,
 			"RegisterNode",
 			func(opts *bind.TransactOpts) (*types.Transaction, error) {
-				return tc.NodeRegistry.RegisterNode(opts, wallet.Address, fmt.Sprintf("https://node%d.river.test", i), contracts.NodeStatus_NotInitialized)
+				return tc.NodeRegistry.RegisterNode(opts, wallet.Address, fmt.Sprintf("https://node%d.river.test", i), river.NodeStatus_NotInitialized)
 			},
 		)
 		require.NoError(err, "register node")
@@ -671,7 +671,7 @@ func TestEventsOrder(t *testing.T) {
 		if nodeRegistryABI.Events["NodeAdded"].ID != event.Topics[0] {
 			continue
 		}
-		var e contracts.NodeRegistryV1NodeAdded
+		var e river.NodeRegistryV1NodeAdded
 		if err := tc.NodeRegistry.BoundContract().UnpackLog(&e, "NodeAdded", event); err != nil {
 			require.NoError(err, "OnNodeAdded: unable to decode NodeAdded event")
 		}

diff --git a/core/node/crypto/config.go b/core/node/crypto/config.go
@@ -15,8 +15,8 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/river-build/river/core/contracts/river"
 	. "github.com/river-build/river/core/node/base"
-	"github.com/river-build/river/core/node/contracts"
 	"github.com/river-build/river/core/node/dlog"
 	. "github.com/river-build/river/core/node/protocol"
 	"github.com/river-build/river/core/node/shared"
@@ -147,7 +147,7 @@ type (
 		// activeBlock holds the current block on which the node is active
 		activeBlock atomic.Uint64
 		// contract interacts with the on-chain contract and provide metadata for decoding events
-		contract *contracts.RiverConfigV1Caller
+		contract *river.RiverConfigV1Caller
 	}
 
 	// Settings holds a list of setting values for each type of setting.
@@ -190,7 +190,7 @@ func NewOnChainConfig(
 	appliedBlockNum BlockNumber,
 	chainMonitor ChainMonitor,
 ) (*onChainConfiguration, error) {
-	caller, err := contracts.NewRiverConfigV1Caller(riverRegistry, riverClient)
+	caller, err := river.NewRiverConfigV1Caller(riverRegistry, riverClient)
 	if err != nil {
 		return nil, err
 	}
@@ -217,7 +217,7 @@ func NewOnChainConfig(
 	// on block sets the current block number that is used to determine the active configuration setting.
 	chainMonitor.OnBlock(cfg.onBlock)
 
-	cfgABI, err := contracts.RiverConfigV1MetaData.GetAbi()
+	cfgABI, err := river.RiverConfigV1MetaData.GetAbi()
 	if err != nil {
 		panic(fmt.Sprintf("RiverConfigV1 ABI invalid: %v", err))
 	}
@@ -292,7 +292,7 @@ func (occ *onChainConfiguration) ActiveBlock() uint64 {
 func (occ *onChainConfiguration) onConfigChanged(ctx context.Context, event types.Log) {
 	var (
 		log = dlog.FromCtx(ctx)
-		e   contracts.RiverConfigV1ConfigurationChanged
+		e   river.RiverConfigV1ConfigurationChanged
 	)
 	if err := occ.contract.BoundContract().UnpackLog(&e, "ConfigurationChanged", event); err != nil {
 		log.Error("OnChainConfiguration: unable to decode ConfigurationChanged event")

diff --git a/core/node/contracts/custom_errors.go → core/node/crypto/custom_errors.go b/core/node/contracts/custom_errors.go → core/node/crypto/custom_errors.go
@@ -1,4 +1,4 @@
-package contracts
+package crypto
 
 import (
 	"encoding/hex"