Merge pull request #2976 from darkdrag00nv2/revertible_random

Update interface of `revertibleRandom`
onflow · Dec 11, 2023 · 3946910 · 3946910
2 parents 0de878b + 901bb55
commit 3946910
Show file tree

Hide file tree

Showing 33 changed files with 703 additions and 158 deletions.
diff --git a/encoding/ccf/ccf_test.go b/encoding/ccf/ccf_test.go
@@ -7811,6 +7811,7 @@ func TestEncodeSimpleTypes(t *testing.T) {
 		ccf.SimpleTypeSignedNumber:                     cadence.SignedNumberType,
 		ccf.SimpleTypeInteger:                          cadence.IntegerType,
 		ccf.SimpleTypeSignedInteger:                    cadence.SignedIntegerType,
+		ccf.SimpleTypeFixedSizeUnsignedInteger:         cadence.FixedSizeUnsignedIntegerType,
 		ccf.SimpleTypeFixedPoint:                       cadence.FixedPointType,
 		ccf.SimpleTypeSignedFixedPoint:                 cadence.SignedFixedPointType,
 		ccf.SimpleTypeInt:                              cadence.IntType,

diff --git a/encoding/ccf/simpletype.go b/encoding/ccf/simpletype.go
@@ -138,6 +138,7 @@ const ( // Cadence simple type IDs
 	SimpleTypeCapabilitiesMapping
 	SimpleTypeAccountMapping
 	SimpleTypeHashableStruct
+	SimpleTypeFixedSizeUnsignedInteger
 
 	// !!! *WARNING* !!!
 	// ADD NEW TYPES *BEFORE* THIS WARNING.
@@ -168,6 +169,7 @@ func initSimpleTypeIDBiMap() (m *bimap.BiMap[cadence.PrimitiveType, SimpleType])
 	m.Insert(cadence.SignedNumberType, SimpleTypeSignedNumber)
 	m.Insert(cadence.IntegerType, SimpleTypeInteger)
 	m.Insert(cadence.SignedIntegerType, SimpleTypeSignedInteger)
+	m.Insert(cadence.FixedSizeUnsignedIntegerType, SimpleTypeFixedSizeUnsignedInteger)
 	m.Insert(cadence.FixedPointType, SimpleTypeFixedPoint)
 	m.Insert(cadence.SignedFixedPointType, SimpleTypeSignedFixedPoint)
 

diff --git a/encoding/ccf/simpletype_string.go b/encoding/ccf/simpletype_string.go
diff --git a/encoding/ccf/traverse_value.go b/encoding/ccf/traverse_value.go
@@ -225,6 +225,7 @@ func (ct *compositeTypes) traverseType(typ cadence.Type) (checkRuntimeType bool)
 		cadence.SignedNumberType,
 		cadence.IntegerType,
 		cadence.SignedIntegerType,
+		cadence.FixedSizeUnsignedIntegerType,
 		cadence.FixedPointType,
 		cadence.SignedFixedPointType:
 

diff --git a/runtime/convertTypes.go b/runtime/convertTypes.go
@@ -58,6 +58,8 @@ func ExportMeteredType(
 			return cadence.IntegerType
 		case sema.SignedIntegerType:
 			return cadence.SignedIntegerType
+		case sema.FixedSizeUnsignedIntegerType:
+			return cadence.FixedSizeUnsignedIntegerType
 		case sema.FixedPointType:
 			return cadence.FixedPointType
 		case sema.SignedFixedPointType:

diff --git a/runtime/convertValues_test.go b/runtime/convertValues_test.go
@@ -990,6 +990,11 @@ func TestRuntimeImportRuntimeType(t *testing.T) {
 			actual:   cadence.SignedIntegerType,
 			expected: interpreter.PrimitiveStaticTypeSignedInteger,
 		},
+		{
+			label:    "FixedSizeUnsignedInteger",
+			actual:   cadence.FixedSizeUnsignedIntegerType,
+			expected: interpreter.PrimitiveStaticTypeFixedSizeUnsignedInteger,
+		},
 		{
 			label:    "FixedPoint",
 			actual:   cadence.FixedPointType,

diff --git a/runtime/imported_values_memory_metering_test.go b/runtime/imported_values_memory_metering_test.go
@@ -192,6 +192,18 @@ func TestRuntimeImportedValueMemoryMetering(t *testing.T) {
 		assert.Equal(t, uint64(32), meter[common.MemoryKindBigInt])
 	})
 
+	t.Run("FixedSizeUnsignedInteger", func(t *testing.T) {
+		t.Parallel()
+
+		script := []byte(`
+            access(all) fun main(x: FixedSizeUnsignedInteger) {}
+        `)
+
+		meter := make(map[common.MemoryKind]uint64)
+		executeScript(t, script, meter, cadence.NewUInt256(2))
+		assert.Equal(t, uint64(32), meter[common.MemoryKindBigInt])
+	})
+
 	t.Run("Int", func(t *testing.T) {
 		t.Parallel()
 

diff --git a/runtime/interpreter/interpreter.go b/runtime/interpreter/interpreter.go
@@ -3343,7 +3343,7 @@ func init() {
 
 		switch numberType {
 		case sema.NumberType, sema.SignedNumberType,
-			sema.IntegerType, sema.SignedIntegerType,
+			sema.IntegerType, sema.SignedIntegerType, sema.FixedSizeUnsignedIntegerType,
 			sema.FixedPointType, sema.SignedFixedPointType:
 			continue
 		}

diff --git a/runtime/interpreter/interpreter_expression.go b/runtime/interpreter/interpreter_expression.go
@@ -784,7 +784,7 @@ func (interpreter *Interpreter) NewIntegerValueFromBigInt(value *big.Int, intege
 	case sema.UInt128Type:
 		// BigInt value is already metered at parser.
 		return NewUnmeteredUInt128ValueFromBigInt(value)
-	case sema.UInt256Type:
+	case sema.UInt256Type, sema.FixedSizeUnsignedIntegerType:
 		// BigInt value is already metered at parser.
 		return NewUnmeteredUInt256ValueFromBigInt(value)
 

diff --git a/runtime/interpreter/primitivestatictype.go b/runtime/interpreter/primitivestatictype.go
@@ -97,7 +97,7 @@ const (
 	// Integer
 	PrimitiveStaticTypeInteger
 	PrimitiveStaticTypeSignedInteger
-	_
+	PrimitiveStaticTypeFixedSizeUnsignedInteger
 	_
 	_
 	_
@@ -303,6 +303,7 @@ func (t PrimitiveStaticType) elementSize() uint {
 		PrimitiveStaticTypeWord256,
 		PrimitiveStaticTypeInteger,
 		PrimitiveStaticTypeSignedInteger,
+		PrimitiveStaticTypeFixedSizeUnsignedInteger,
 		PrimitiveStaticTypeNumber,
 		PrimitiveStaticTypeSignedNumber:
 		return UnknownElementSize
@@ -480,6 +481,8 @@ func (t PrimitiveStaticType) SemaType() sema.Type {
 		return sema.IntegerType
 	case PrimitiveStaticTypeSignedInteger:
 		return sema.SignedIntegerType
+	case PrimitiveStaticTypeFixedSizeUnsignedInteger:
+		return sema.FixedSizeUnsignedIntegerType
 
 	// FixedPoint
 	case PrimitiveStaticTypeFixedPoint:
@@ -693,6 +696,8 @@ func ConvertSemaToPrimitiveStaticType(
 		typ = PrimitiveStaticTypeInteger
 	case sema.SignedIntegerType:
 		typ = PrimitiveStaticTypeSignedInteger
+	case sema.FixedSizeUnsignedIntegerType:
+		typ = PrimitiveStaticTypeFixedSizeUnsignedInteger
 
 	// FixedPoint
 	case sema.FixedPointType: