refactor: support go 1.24 with newtypes

Author: Stebalien

cgo/bls.go

@@ -9,53 +9,59 @@ package cgo
 import "C"
 
 func Hash(message SliceRefUint8) *[96]byte {
-	resp := C.hash(message)
+	resp := (*ByteArray96)(C.hash((C.slice_ref_uint8_t)(message)))
 	defer resp.destroy()
 	return resp.copyAsArray()
 }
 
 func Aggregate(flattenedSignatures SliceRefUint8) *[96]byte {
-	resp := C.aggregate(flattenedSignatures)
+	resp := (*ByteArray96)(C.aggregate((C.slice_ref_uint8_t)(flattenedSignatures)))
 	defer resp.destroy()
 	return resp.copyAsArray()
 }
 
 func Verify(signature SliceRefUint8, flattenedDigests SliceRefUint8, flattenedPublicKeys SliceRefUint8) bool {
-	resp := C.verify(signature, flattenedDigests, flattenedPublicKeys)
+	resp := C.verify((C.slice_ref_uint8_t)(signature),
+		(C.slice_ref_uint8_t)(flattenedDigests),
+		(C.slice_ref_uint8_t)(flattenedPublicKeys))
 	return bool(resp)
 }
 
 func HashVerify(signature SliceRefUint8, flattenedMessages SliceRefUint8, messageSizes SliceRefUint, flattenedPublicKeys SliceRefUint8) bool {
-	resp := C.hash_verify(signature, flattenedMessages, messageSizes, flattenedPublicKeys)
+	resp := C.hash_verify((C.slice_ref_uint8_t)(signature),
+		(C.slice_ref_uint8_t)(flattenedMessages),
+		(C.slice_ref_size_t)(messageSizes),
+		(C.slice_ref_uint8_t)(flattenedPublicKeys))
 	return bool(resp)
 }
 
 func PrivateKeyGenerate() *[32]byte {
-	resp := C.private_key_generate()
+	resp := (*ByteArray32)(C.private_key_generate())
 	defer resp.destroy()
 	return resp.copyAsArray()
 }
 
 func PrivateKeyGenerateWithSeed(rawSeed *ByteArray32) *[32]byte {
-	resp := C.private_key_generate_with_seed(rawSeed)
+	resp := (*ByteArray32)(C.private_key_generate_with_seed((*C.uint8_32_array_t)(rawSeed)))
 	defer resp.destroy()
 	return resp.copyAsArray()
 }
 
 func PrivateKeySign(rawPrivateKey SliceRefUint8, message SliceRefUint8) *[96]byte {
-	resp := C.private_key_sign(rawPrivateKey, message)
+	resp := (*ByteArray96)(C.private_key_sign((C.slice_ref_uint8_t)(rawPrivateKey),
+		(C.slice_ref_uint8_t)(message)))
 	defer resp.destroy()
 	return resp.copyAsArray()
 }
 
 func PrivateKeyPublicKey(rawPrivateKey SliceRefUint8) *[48]byte {
-	resp := C.private_key_public_key(rawPrivateKey)
+	resp := (*ByteArray48)(C.private_key_public_key((C.slice_ref_uint8_t)(rawPrivateKey)))
 	defer resp.destroy()
 	return resp.copyAsArray()
 }
 
 func CreateZeroSignature() *[96]byte {
-	resp := C.create_zero_signature()
+	resp := (*ByteArray96)(C.create_zero_signature())
 	defer resp.destroy()
 	return resp.copyAsArray()
 }

cgo/fvm.go

@@ -9,8 +9,8 @@ package cgo
 import "C"
 
 func CreateFvmMachine(fvmVersion FvmRegisteredVersion, chainEpoch, chainTimestamp, chainId, baseFeeHi, baseFeeLo, baseCircSupplyHi, baseCircSupplyLo, networkVersion uint64, stateRoot SliceRefUint8, tracing bool, blockstoreId, externsId uint64) (*FvmMachine, error) {
-	resp := C.create_fvm_machine(
-		fvmVersion,
+	resp := (*resultFvmMachine)(C.create_fvm_machine(
+		(C.FvmRegisteredVersion_t)(fvmVersion),
 		C.uint64_t(chainEpoch),
 		C.uint64_t(chainTimestamp),
 		C.uint64_t(chainId),
@@ -19,13 +19,13 @@ func CreateFvmMachine(fvmVersion FvmRegisteredVersion, chainEpoch, chainTimestam
 		C.uint64_t(baseCircSupplyHi),
 		C.uint64_t(baseCircSupplyLo),
 		C.uint32_t(networkVersion),
-		stateRoot,
+		(C.slice_ref_uint8_t)(stateRoot),
 		C.bool(tracing),
 		C.uint64_t(blockstoreId),
 		C.uint64_t(externsId),
-	)
+	))
 	// take out the pointer from the result to ensure it doesn't get freed
-	executor := resp.value
+	executor := (*FvmMachine)(resp.value)
 	resp.value = nil
 	defer resp.destroy()
 
@@ -37,8 +37,8 @@ func CreateFvmMachine(fvmVersion FvmRegisteredVersion, chainEpoch, chainTimestam
 }
 
 func CreateFvmDebugMachine(fvmVersion FvmRegisteredVersion, chainEpoch, chainTimestamp, chainId, baseFeeHi, baseFeeLo, baseCircSupplyHi, baseCircSupplyLo, networkVersion uint64, stateRoot SliceRefUint8, actorRedirect SliceRefUint8, tracing bool, blockstoreId, externsId uint64) (*FvmMachine, error) {
-	resp := C.create_fvm_debug_machine(
-		fvmVersion,
+	resp := (*resultFvmMachine)(C.create_fvm_debug_machine(
+		(C.FvmRegisteredVersion_t)(fvmVersion),
 		C.uint64_t(chainEpoch),
 		C.uint64_t(chainTimestamp),
 		C.uint64_t(chainId),
@@ -47,14 +47,14 @@ func CreateFvmDebugMachine(fvmVersion FvmRegisteredVersion, chainEpoch, chainTim
 		C.uint64_t(baseCircSupplyHi),
 		C.uint64_t(baseCircSupplyLo),
 		C.uint32_t(networkVersion),
-		stateRoot,
-		actorRedirect,
+		(C.slice_ref_uint8_t)(stateRoot),
+		(C.slice_ref_uint8_t)(actorRedirect),
 		C.bool(tracing),
 		C.uint64_t(blockstoreId),
 		C.uint64_t(externsId),
-	)
+	))
 	// take out the pointer from the result to ensure it doesn't get freed
-	executor := resp.value
+	executor := (*FvmMachine)(resp.value)
 	resp.value = nil
 	defer resp.destroy()
 
@@ -66,27 +66,27 @@ func CreateFvmDebugMachine(fvmVersion FvmRegisteredVersion, chainEpoch, chainTim
 }
 
 func FvmMachineExecuteMessage(executor *FvmMachine, message SliceRefUint8, chainLen, applyKind uint64) (FvmMachineExecuteResponseGo, error) {
-	resp := C.fvm_machine_execute_message(
-		executor,
-		message,
+	resp := (*resultFvmMachineExecuteResponse)(C.fvm_machine_execute_message(
+		(*C.InnerFvmMachine_t)(executor),
+		(C.slice_ref_uint8_t)(message),
 		C.uint64_t(chainLen),
 		C.uint64_t(applyKind),
-	)
+	))
 	defer resp.destroy()
 
 	if err := CheckErr(resp); err != nil {
 		return FvmMachineExecuteResponseGo{}, err
 	}
 
-	return resp.value.copy(), nil
+	return (FvmMachineExecuteResponse)(resp.value).copy(), nil
 }
 
 func FvmMachineFlush(executor *FvmMachine) ([]byte, error) {
-	resp := C.fvm_machine_flush(executor)
+	resp := (*resultSliceBoxedUint8)(C.fvm_machine_flush((*C.InnerFvmMachine_t)(executor)))
 	defer resp.destroy()
 
 	if err := CheckErr(resp); err != nil {
 		return nil, err
 	}
-	return resp.value.copy(), nil
+	return (SliceBoxedUint8)(resp.value).copy(), nil
 }