Move xchain contract bindings into core/contracts (#284)

Also drop v3/dev versions
river-build · Jun 26, 2024 · bb7c46b · bb7c46b
1 parent 1650ec8
commit bb7c46b
Show file tree

Hide file tree

Showing 46 changed files with 425 additions and 11,088 deletions.
diff --git a/core/cmd/register_xchain_node_cmd.go b/core/cmd/register_xchain_node_cmd.go
@@ -7,14 +7,14 @@ import (
 	"os"
 	"time"
 
-	"github.com/river-build/river/core/xchain/contracts"
-	"github.com/river-build/river/core/xchain/util"
-
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/spf13/cobra"
+
+	"github.com/river-build/river/core/contracts/base"
 	"github.com/river-build/river/core/node/crypto"
 	"github.com/river-build/river/core/node/infra"
-	"github.com/spf13/cobra"
+	"github.com/river-build/river/core/xchain/util"
 )
 
 var (
@@ -64,7 +64,6 @@ func registerImpl(operatorKeyfile string, userConfirmationMessage string, regist
 		ctx, cancel                = context.WithTimeout(context.Background(), time.Minute)
 		xchainWallet, xWalletErr   = util.LoadWallet(ctx)
 		operatorWallet, oWalletErr = crypto.LoadWallet(ctx, operatorKeyfile)
-		entitlementGatedMetaData   = contracts.NewEntitlementGatedMetaData(cmdConfig.GetContractVersion())
 	)
 	defer cancel()
 
@@ -93,13 +92,12 @@ func registerImpl(operatorKeyfile string, userConfirmationMessage string, regist
 		metrics,
 	)
 
-	checker, err := contracts.NewIEntitlementChecker(
-		cmdConfig.GetEntitlementContractAddress(), baseChain.Client, cmdConfig.GetContractVersion())
+	checker, err := base.NewIEntitlementChecker(cmdConfig.GetEntitlementContractAddress(), baseChain.Client)
 	if err != nil {
 		return err
 	}
 
-	decoder, err := crypto.NewEVMErrorDecoder(checker.GetMetadata(), entitlementGatedMetaData.GetMetadata())
+	decoder, err := crypto.NewEVMErrorDecoder(base.IEntitlementCheckerMetaData, base.IEntitlementGatedMetaData)
 	if err != nil {
 		return err
 	}

diff --git a/core/config/config.go b/core/config/config.go
@@ -11,13 +11,6 @@ import (
 	. "github.com/river-build/river/core/node/protocol"
 )
 
-type ContractVersion string
-
-const (
-	VersionDev ContractVersion = "dev"
-	VersionV3  ContractVersion = "v3"
-)
-
 func GetDefaultConfig() *Config {
 	return &Config{
 		Port: 443,
@@ -143,10 +136,9 @@ type Config struct {
 	XChainBlockchains []uint64
 
 	// extra xChain configuration
-	EntitlementContract           ContractConfig  `mapstructure:"entitlement_contract"`
-	contractVersion               ContractVersion `mapstructure:"contract_version"`
-	TestEntitlementContract       ContractConfig  `mapstructure:"test_contract"`
-	TestCustomEntitlementContract ContractConfig  `mapstructure:"test_custom_entitlement_contract"`
+	EntitlementContract           ContractConfig `mapstructure:"entitlement_contract"`
+	TestEntitlementContract       ContractConfig `mapstructure:"test_contract"`
+	TestCustomEntitlementContract ContractConfig `mapstructure:"test_custom_entitlement_contract"`
 
 	// History indicates how far back xchain must look for entitlement check requests after start
 	History time.Duration
@@ -248,8 +240,6 @@ type PerformanceTrackingConfig struct {
 type ContractConfig struct {
 	// Address of the contract
 	Address common.Address
-	// Version of the contract to use.
-	Version string
 }
 
 type ArchiveConfig struct {
@@ -355,14 +345,6 @@ func (c *Config) GetGraffiti() string {
 	return c.Graffiti
 }
 
-func (c *Config) GetContractVersion() ContractVersion {
-	if c.contractVersion == VersionV3 {
-		return VersionV3
-	} else {
-		return VersionDev
-	}
-}
-
 func (c *Config) GetEntitlementContractAddress() common.Address {
 	return c.EntitlementContract.Address
 }

diff --git a/...hain/contracts/dev/entitlement_checker.go → ...tracts/base/deploy/entitlement_checker.go b/...hain/contracts/dev/entitlement_checker.go → ...tracts/base/deploy/entitlement_checker.go
diff --git a/.../contracts/dev/mock_custom_entitlement.go → ...ts/base/deploy/mock_custom_entitlement.go b/.../contracts/dev/mock_custom_entitlement.go → ...ts/base/deploy/mock_custom_entitlement.go
diff --git a/...contracts/dev/mock_entitlement_checker.go → ...s/base/deploy/mock_entitlement_checker.go b/...contracts/dev/mock_entitlement_checker.go → ...s/base/deploy/mock_entitlement_checker.go
diff --git a/...in/contracts/v3/mock_entitlement_gated.go → ...cts/base/deploy/mock_entitlement_gated.go b/...in/contracts/v3/mock_entitlement_gated.go → ...cts/base/deploy/mock_entitlement_gated.go
diff --git a/core/xchain/contracts/test/mock_erc20.go → core/contracts/base/deploy/mock_erc20.go b/core/xchain/contracts/test/mock_erc20.go → core/contracts/base/deploy/mock_erc20.go
diff --git a/core/xchain/contracts/test/mock_erc721.go → core/contracts/base/deploy/mock_erc721.go b/core/xchain/contracts/test/mock_erc721.go → core/contracts/base/deploy/mock_erc721.go
diff --git a/core/xchain/contracts/dev/wallet_link.go → core/contracts/base/deploy/wallet_link.go b/core/xchain/contracts/dev/wallet_link.go → core/contracts/base/deploy/wallet_link.go
diff --git a/...hain/contracts/v3/i_custom_entitlement.go → core/contracts/base/i_custom_entitlement.go b/...hain/contracts/v3/i_custom_entitlement.go → core/contracts/base/i_custom_entitlement.go
diff --git a/core/xchain/contracts/v3/i_entitlement.go → core/contracts/base/i_entitlement.go b/core/xchain/contracts/v3/i_entitlement.go → core/contracts/base/i_entitlement.go
diff --git a/...in/contracts/dev/i_entitlement_checker.go → core/contracts/base/i_entitlement_checker.go b/...in/contracts/dev/i_entitlement_checker.go → core/contracts/base/i_entitlement_checker.go
diff --git a/...chain/contracts/v3/i_entitlement_gated.go → core/contracts/base/i_entitlement_gated.go b/...chain/contracts/v3/i_entitlement_gated.go → core/contracts/base/i_entitlement_gated.go
diff --git a/core/contracts/base/rule_entitlement.go b/core/contracts/base/rule_entitlement.go
diff --git a/core/node/auth/architect.go b/core/node/auth/architect.go
@@ -33,7 +33,7 @@ func NewArchitect(ctx context.Context, cfg *config.ContractConfig, backend bind.
 		return nil, WrapRiverError(
 			Err_CANNOT_CONNECT,
 			err,
-		).Tags("address", cfg.Address, "version", cfg.Version).
+		).Tags("address", cfg.Address).
 			Func("NewArchitect").
 			Message("Failed to initialize contract")
 	}

diff --git a/core/node/auth/banning.go b/core/node/auth/banning.go
@@ -95,7 +95,6 @@ func (b *banning) IsBanned(ctx context.Context, wallets []common.Address) (bool,
 func NewBanning(
 	ctx context.Context,
 	cfg *config.ChainConfig,
-	version string,
 	spaceAddress common.Address,
 	backend bind.ContractBackend,
 ) (Banning, error) {

diff --git a/core/node/auth/channels.go b/core/node/auth/channels.go
@@ -20,7 +20,6 @@ type Channels interface {
 
 func NewChannels(
 	ctx context.Context,
-	version string,
 	address common.Address,
 	backend bind.ContractBackend,
 ) (Channels, error) {
@@ -31,7 +30,7 @@ func NewChannels(
 		return nil, WrapRiverError(
 			Err_CANNOT_CONNECT,
 			err,
-		).Tags("address", address, "version", version).
+		).Tags("address", address).
 			Func("NewChannels").
 			Message("Failed to initialize contract")
 	}