Merge branch 'main' into BCF-3392-ContractReaderByIDs-wrapper

smartcontractkit · Sep 30, 2024 · 84714e0 · 84714e0
2 parents 7376e82 + ef04dd4
commit 84714e0
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 1 deletion.
diff --git a/pkg/types/ccipocr3/interfaces.go b/pkg/types/ccipocr3/interfaces.go
@@ -31,3 +31,10 @@ type RMNCrypto interface {
 		signerAddresses []Bytes,
 	) error
 }
+
+// TokenDataEncoder is a generic interface for encoding offchain token data for different chain families.
+// Right now it supports only USDC/CCTP, but every new token that requires offchain data processsing
+// should be added to that interface and implemented in the downstream repositories (e.g. chainlink-ccip, chainlink).
+type TokenDataEncoder interface {
+	EncodeUSDC(ctx context.Context, message Bytes, attestation Bytes) (Bytes, error)
+}
diff --git a/pkg/values/big_int.go b/pkg/values/big_int.go
@@ -3,6 +3,7 @@ package values
 import (
 	"errors"
 	"fmt"
+	"math"
 	"math/big"
 	"reflect"
 
@@ -41,6 +42,14 @@ func (b *BigInt) UnwrapTo(to any) error {
 			return errors.New("cannot unwrap to nil pointer")
 		}
 		*tb = *b.Underlying
+	case *uint64:
+		if tb == nil {
+			return errors.New("cannot unwrap to nil pointer")
+		}
+		if b.Underlying.Cmp(new(big.Int).SetUint64(math.MaxUint64)) > 0 {
+			return errors.New("big.Int value is larger than uint64")
+		}
+		*tb = b.Underlying.Uint64()
 	case *any:
 		if tb == nil {
 			return errors.New("cannot unwrap to nil pointer")
@@ -52,6 +61,14 @@ func (b *BigInt) UnwrapTo(to any) error {
 		rto := reflect.ValueOf(to)
 		if rto.CanConvert(reflect.TypeOf(new(big.Int))) {
 			return b.UnwrapTo(rto.Convert(reflect.TypeOf(new(big.Int))).Interface())
+		} else if rto.CanConvert(reflect.TypeOf(new(uint64))) {
+			return b.UnwrapTo(rto.Convert(reflect.TypeOf(new(uint64))).Interface())
+		} else if rto.CanInt() || rto.CanUint() {
+			if b.Underlying.Cmp(big.NewInt(math.MaxInt64)) > 0 {
+				return fmt.Errorf("big.Int value is larger than int64")
+			}
+
+			return NewInt64(b.Underlying.Int64()).UnwrapTo(to)
 		}
 		return fmt.Errorf("cannot unwrap to value of type: %T", to)
 	}

diff --git a/pkg/values/value.go b/pkg/values/value.go
@@ -3,6 +3,7 @@ package values
 import (
 	"errors"
 	"fmt"
+	"math"
 	"math/big"
 	"reflect"
 
@@ -57,6 +58,9 @@ func Wrap(v any) (Value, error) {
 	case int:
 		return NewInt64(int64(tv)), nil
 	case uint64:
+		if tv > math.MaxInt64 {
+			return NewBigInt(new(big.Int).SetUint64(tv)), nil
+		}
 		return NewInt64(int64(tv)), nil
 	case uint32:
 		return NewInt64(int64(tv)), nil
@@ -141,7 +145,9 @@ func Wrap(v any) (Value, error) {
 
 	case reflect.Bool:
 		return Wrap(val.Convert(reflect.TypeOf(true)).Interface())
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+	case reflect.Uint64:
+		return Wrap(val.Convert(reflect.TypeOf(uint64(0))).Interface())
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32:
 		return Wrap(val.Convert(reflect.TypeOf(int64(0))).Interface())
 	case reflect.Float32, reflect.Float64:
 		return Wrap(val.Convert(reflect.TypeOf(float64(0))).Interface())

diff --git a/pkg/values/value_test.go b/pkg/values/value_test.go
@@ -272,6 +272,34 @@ func Test_IntTypes(t *testing.T) {
 		{name: "uint16", test: func(tt *testing.T) { wrappableTest[int64, uint16](tt, anyValue) }},
 		{name: "uint8", test: func(tt *testing.T) { wrappableTest[int64, uint8](tt, anyValue) }},
 		{name: "uint", test: func(tt *testing.T) { wrappableTest[int64, uint](tt, anyValue) }},
+		{name: "uint64 small enough for int64", test: func(tt *testing.T) {
+			u64, err := Wrap(uint64(math.MaxInt64))
+			require.NoError(tt, err)
+
+			expected, err := Wrap(int64(math.MaxInt64))
+			require.NoError(tt, err)
+
+			assert.Equal(tt, expected, u64)
+
+			unwrapped := uint64(0)
+			err = u64.UnwrapTo(&unwrapped)
+			require.NoError(tt, err)
+			assert.Equal(tt, uint64(math.MaxInt64), unwrapped)
+		}},
+		{name: "uint64 too large for int64", test: func(tt *testing.T) {
+			u64, err := Wrap(uint64(math.MaxInt64 + 1))
+			require.NoError(tt, err)
+
+			expected, err := Wrap(new(big.Int).SetUint64(math.MaxInt64 + 1))
+			require.NoError(tt, err)
+
+			assert.Equal(tt, expected, u64)
+
+			unwrapped := uint64(0)
+			err = u64.UnwrapTo(&unwrapped)
+			require.NoError(tt, err)
+			assert.Equal(tt, uint64(math.MaxInt64+1), unwrapped)
+		}},
 	}
 
 	for _, tc := range testCases {
@@ -451,6 +479,7 @@ type aliasByte uint8
 type decimalAlias decimal.Decimal
 type bigIntAlias big.Int
 type bigIntPtrAlias *big.Int
+type aliasUint64 uint64
 
 func Test_Aliases(t *testing.T) {
 	testCases := []struct {
@@ -481,6 +510,14 @@ func Test_Aliases(t *testing.T) {
 			name: "integer",
 			test: func(tt *testing.T) { wrappableTest[int, aliasInt](tt, 1) },
 		},
+		{
+			name: "uint64 fits in int64",
+			test: func(tt *testing.T) { wrappableTest[uint64, aliasUint64](tt, uint64(math.MaxInt64)) },
+		},
+		{
+			name: "uint64 too large for int64",
+			test: func(tt *testing.T) { wrappableTest[uint64, aliasUint64](tt, uint64(math.MaxInt64+1)) },
+		},
 		{
 			name: "map",
 			test: func(tt *testing.T) { wrappableTest[map[string]any, aliasMap](tt, map[string]any{"hello": "world"}) },