Merge pull request #30 from datachainlab/adr-001

ADR-001 support

Signed-off-by: Jun Kimura <jun.kimura@datachain.jp>

README.md

@@ -1,3 +1,7 @@
 # ethereum-ibc-relay-chain
 
 This provides the ethereum chain module of [yui-relayer](https://github.com/hyperledger-labs/yui-relayer).
+
+## Compatibility
+
+This module is compatible with [ibc-solidity v0.3.23](https://github.com/hyperledger-labs/yui-ibc-solidity/releases/tag/v0.3.23).

pkg/relay/ethereum/chain.go

@@ -44,6 +44,10 @@ type Chain struct {
 	ibcHandler *ibchandler.Ibchandler
 
 	signer Signer
+
+	// cache
+	connectionOpenedConfirmed bool
+	allowLCFunctions          *AllowLCFunctions
 }
 
 var _ core.Chain = (*Chain)(nil)
@@ -68,14 +72,22 @@ func NewChain(config ChainConfig) (*Chain, error) {
 	if err != nil {
 		return nil, fmt.Errorf("failed to build signer: %v", err)
 	}
+	var alfs *AllowLCFunctions
+	if config.AllowLcFunctions != nil {
+		alfs, err = config.AllowLcFunctions.ToAllowLCFunctions()
+		if err != nil {
+			return nil, fmt.Errorf("failed to build allowLcFunctions: %v", err)
+		}
+	}
 	return &Chain{
 		config:  config,
 		client:  client,
 		chainID: id,
 
 		ibcHandler: ibcHandler,
 
-		signer: signer,
+		signer:           signer,
+		allowLCFunctions: alfs,
 	}, nil
 }
 
@@ -446,3 +458,28 @@ func (c *Chain) GetChainLogger() *log.RelayLogger {
 	chainID := c.Path().ChainID
 	return logger.WithChain(chainID)
 }
+
+func (c *Chain) confirmConnectionOpened(ctx context.Context) (bool, error) {
+	if c.connectionOpenedConfirmed {
+		return true, nil
+	}
+	if c.pathEnd.ConnectionID == "" {
+		return false, nil
+	}
+	latestHeight, err := c.LatestHeight()
+	if err != nil {
+		return false, err
+	}
+	// NOTE: err is nil if the connection not found
+	connRes, err := c.QueryConnection(
+		core.NewQueryContext(ctx, latestHeight),
+	)
+	if err != nil {
+		return false, err
+	}
+	if connRes.Connection.State != conntypes.OPEN {
+		return false, nil
+	}
+	c.connectionOpenedConfirmed = true
+	return true, nil
+}

pkg/relay/ethereum/config.go

@@ -1,6 +1,7 @@
 package ethereum
 
 import (
+	"encoding/hex"
 	"errors"
 	"fmt"
 	"strings"
@@ -45,7 +46,11 @@ func (c ChainConfig) Validate() error {
 	} else if err := c.Signer.GetCachedValue().(SignerConfig).Validate(); err != nil {
 		errs = append(errs, fmt.Errorf("config attribute \"signer\" is invalid: %v", err))
 	}
-
+	if c.AllowLcFunctions != nil {
+		if err := c.AllowLcFunctions.ValidateBasic(); err != nil {
+			errs = append(errs, fmt.Errorf("config attribute \"allow_lc_functions\" is invalid: %v", err))
+		}
+	}
 	return errors.Join(errs...)
 }
 
@@ -59,3 +64,61 @@ func (c ChainConfig) UnpackInterfaces(unpacker codectypes.AnyUnpacker) error {
 func (c ChainConfig) IBCAddress() common.Address {
 	return common.HexToAddress(c.IbcAddress)
 }
+
+func (alf AllowLCFunctionsConfig) ValidateBasic() error {
+	if !common.IsHexAddress(alf.LcAddress) {
+		return fmt.Errorf("invalid contract address: %s", alf.LcAddress)
+	} else if alf.AllowAll && len(alf.Selectors) > 0 {
+		return fmt.Errorf("allowAll is true and selectors is not empty")
+	} else if !alf.AllowAll && len(alf.Selectors) == 0 {
+		return fmt.Errorf("allowAll is false and selectors is empty")
+	}
+	return nil
+}
+
+// CONTRACT: alf.ValidateBasic() must be called before calling this method.
+func (alf AllowLCFunctionsConfig) ToAllowLCFunctions() (*AllowLCFunctions, error) {
+	if alf.AllowAll {
+		return &AllowLCFunctions{
+			LCAddress: common.HexToAddress(alf.LcAddress),
+			AllowALL:  true,
+		}, nil
+	}
+	selectors := make([][4]byte, len(alf.Selectors))
+	for i, s := range alf.Selectors {
+		bz, err := hex.DecodeString(strings.TrimPrefix(s, "0x"))
+		if err != nil {
+			return nil, fmt.Errorf("failed to decode selector: selector=%v err=%v", s, err)
+		}
+		if len(bz) != 4 {
+			return nil, fmt.Errorf("invalid selector: %s", s)
+		}
+		copy(selectors[i][:], bz)
+	}
+	return &AllowLCFunctions{
+		LCAddress: common.HexToAddress(alf.LcAddress),
+		AllowALL:  false,
+		Selectors: selectors,
+	}, nil
+}
+
+type AllowLCFunctions struct {
+	LCAddress common.Address
+	AllowALL  bool
+	Selectors [][4]byte
+}
+
+func (lcf AllowLCFunctions) IsAllowed(address common.Address, selector [4]byte) bool {
+	if lcf.LCAddress != address {
+		return false
+	}
+	if lcf.AllowALL {
+		return true
+	}
+	for _, s := range lcf.Selectors {
+		if s == selector {
+			return true
+		}
+	}
+	return false
+}