Merge pull request #278 from onflow/secure-cadence

Update to Cadence v0.24 (Secure Cadence)

Author: turbolent

access/grpc/convert.go

@@ -212,7 +212,7 @@ func cadenceValuesToMessages(values []cadence.Value) ([][]byte, error) {
 }
 
 func messageToCadenceValue(m []byte) (cadence.Value, error) {
-	v, err := jsoncdc.Decode(m)
+	v, err := jsoncdc.Decode(nil, m)
 	if err != nil {
 		return nil, fmt.Errorf("convert: %w", err)
 	}

access/http/convert.go

@@ -241,7 +241,7 @@ func encodeCadenceValue(value string) (cadence.Value, error) {
 		return nil, err
 	}
 
-	return cadenceJSON.Decode(decoded)
+	return cadenceJSON.Decode(nil, decoded)
 }
 
 func toProposalKey(key *models.ProposalKey) flow.ProposalKey {
@@ -318,7 +318,7 @@ func toEvents(events []models.Event) ([]flow.Event, error) {
 			return nil, err
 		}
 
-		event, err := cadenceJSON.Decode(payload)
+		event, err := cadenceJSON.Decode(nil, payload)
 		if err != nil {
 			return nil, err
 		}

decode_test.go

@@ -29,7 +29,7 @@ import (
 )
 
 func TestDecodeFlowTypeID(t *testing.T) {
-	location, qualifiedIdentifier, err := common.DecodeTypeID(flow.EventAccountCreated)
+	location, qualifiedIdentifier, err := common.DecodeTypeID(nil, flow.EventAccountCreated)
 	require.NoError(t, err)
 	assert.Equal(t, common.LocationID("flow"), location.ID())
 	assert.Equal(t, "AccountCreated", qualifiedIdentifier)

go.mod

@@ -5,7 +5,7 @@ go 1.16
 require (
 	cloud.google.com/go/kms v1.4.0
 	github.com/ethereum/go-ethereum v1.9.13
-	github.com/onflow/cadence v0.23.4
+	github.com/onflow/cadence v0.24.0
 	github.com/onflow/flow-go/crypto v0.24.3
 	github.com/onflow/flow/protobuf/go/flow v0.2.5
 	github.com/onflow/sdks v0.4.4

go.sum

@@ -278,7 +278,7 @@ func (g *Events) New() flow.Event {
 			cadence.String("foo"),
 		}).WithType(testEventType)
 
-	typeID := location.TypeID(identifier)
+	typeID := location.TypeID(nil, identifier)
 
 	payload, err := jsoncdc.Encode(testEvent)
 	if err != nil {

test/entities.go

@@ -162,7 +162,7 @@ func (t *Transaction) Argument(i int) (cadence.Value, error) {
 
 	encodedArg := t.Arguments[i]
 
-	arg, err := jsoncdc.Decode(encodedArg)
+	arg, err := jsoncdc.Decode(nil, encodedArg)
 	if err != nil {
 		return nil, fmt.Errorf("failed to decode argument at index %d: %w", i, err)
 	}