support a structtag hint to specify that a String should be an address (

#93)

* nested type

* added option to structtag to say that this String field should be address in cadence

account_test.go

@@ -75,6 +75,24 @@ func TestCheckContractUpdate(t *testing.T) {
 		g, _ := NewTestingEmulator().StartE()
 
 		code := []byte(`pub contract Debug{
+
+	pub struct FooListBar {
+		pub let foo:[Foo2]
+		pub let bar:String
+
+		init(foo:[Foo2], bar:String) {
+			self.foo=foo
+			self.bar=bar
+		}
+	}
+
+	pub struct Foo2{
+		pub let bar: Address
+
+		init(bar: Address) {
+			self.bar=bar
+		}
+	}
 			pub struct FooBar {
 				pub let foo:Foo
 				pub let bar:String

cadence.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/fatih/structtag"
 	"github.com/onflow/cadence"
+	"golang.org/x/exp/slices"
 )
 
 // CadenceValueToJsonString converts a cadence.Value into a json pretty printed string
@@ -168,6 +169,17 @@ func ReflectToCadence(value reflect.Value, resolver InputResolver) (cadence.Valu
 				name = strings.ToLower(field.Name)
 			}
 
+			if tag != nil && slices.Contains(tag.Options, "cadenceAddress") {
+				stringVal := getAndUnquoteString(cadenceVal)
+				adr, err := hexToAddress(stringVal)
+				if err != nil {
+					return nil, err
+				}
+				cadenceAddress := cadence.BytesToAddress(adr.Bytes())
+				cadenceType = cadence.AddressType{}
+				cadenceVal = cadenceAddress
+			}
+
 			fields = append(fields, cadence.Field{
 				Identifier: name,
 				Type:       cadenceType,

cadence_test.go

@@ -166,6 +166,11 @@ type Foo struct {
 	Bar string
 }
 
+type Debug_FooListBar struct {
+	Bar string
+	Foo []Debug_Foo2
+}
+
 type Debug_FooBar struct {
 	Bar string
 	Foo Debug_Foo
@@ -176,6 +181,10 @@ type Debug_Foo_Skip struct {
 	Skip string `cadence:"-"`
 }
 
+type Debug_Foo2 struct {
+	Bar string `cadence:"bar,cadenceAddress"`
+}
+
 type Debug_Foo struct {
 	Bar string
 }

contracts/Debug.cdc

@@ -2,6 +2,15 @@ import NonFungibleToken from "./NonFungibleToken.cdc"
 
 pub contract Debug {
 
+	pub struct FooListBar {
+		pub let foo:[Foo2]
+		pub let bar:String
+
+		init(foo:[Foo2], bar:String) {
+			self.foo=foo
+			self.bar=bar
+		}
+	}
 	pub struct FooBar {
 		pub let foo:Foo
 		pub let bar:String
@@ -12,6 +21,15 @@ pub contract Debug {
 		}
 	}
 
+
+	pub struct Foo2{
+		pub let bar: Address
+
+		init(bar: Address) {
+			self.bar=bar
+		}
+	}
+
 	pub struct Foo{
 		pub let bar: String
 

testdata/TestParseConfig/parse.golden

@@ -195,6 +195,15 @@ transaction(test:String) {
 
 pub contract Debug {
 
+pub struct FooListBar {
+	pub let foo:[Foo2]
+	pub let bar:String
+
+	init(foo:[Foo2], bar:String) {
+		self.foo=foo
+		self.bar=bar
+	}
+}
 pub struct FooBar {
 	pub let foo:Foo
 	pub let bar:String
@@ -205,6 +214,15 @@ pub struct FooBar {
 	}
 }
 
+
+pub struct Foo2{
+	pub let bar: Address
+
+	init(bar: Address) {
+		self.bar=bar
+	}
+}
+
 pub struct Foo{
 	pub let bar: String
 
@@ -357,6 +375,15 @@ transaction(test:String) {
 
 pub contract Debug {
 
+pub struct FooListBar {
+	pub let foo:[Foo2]
+	pub let bar:String
+
+	init(foo:[Foo2], bar:String) {
+		self.foo=foo
+		self.bar=bar
+	}
+}
 pub struct FooBar {
 	pub let foo:Foo
 	pub let bar:String
@@ -367,6 +394,15 @@ pub struct FooBar {
 	}
 }
 
+
+pub struct Foo2{
+	pub let bar: Address
+
+	init(bar: Address) {
+		self.bar=bar
+	}
+}
+
 pub struct Foo{
 	pub let bar: String
 
@@ -516,6 +552,15 @@ transaction(test:String) {
 
 pub contract Debug {
 
+pub struct FooListBar {
+	pub let foo:[Foo2]
+	pub let bar:String
+
+	init(foo:[Foo2], bar:String) {
+		self.foo=foo
+		self.bar=bar
+	}
+}
 pub struct FooBar {
 	pub let foo:Foo
 	pub let bar:String
@@ -526,6 +571,15 @@ pub struct FooBar {
 	}
 }
 
+
+pub struct Foo2{
+	pub let bar: Address
+
+	init(bar: Address) {
+		self.bar=bar
+	}
+}
+
 pub struct Foo{
 	pub let bar: String
 

testdata/TestParseConfig/parse_and_merge.golden

@@ -176,6 +176,15 @@ transaction(test:String) {
 
 pub contract Debug {
 
+pub struct FooListBar {
+	pub let foo:[Foo2]
+	pub let bar:String
+
+	init(foo:[Foo2], bar:String) {
+		self.foo=foo
+		self.bar=bar
+	}
+}
 pub struct FooBar {
 	pub let foo:Foo
 	pub let bar:String
@@ -186,6 +195,15 @@ pub struct FooBar {
 	}
 }
 
+
+pub struct Foo2{
+	pub let bar: Address
+
+	init(bar: Address) {
+		self.bar=bar
+	}
+}
+
 pub struct Foo{
 	pub let bar: String
 
@@ -388,6 +406,15 @@ transaction(test:String) {
 
 pub contract Debug {
 
+pub struct FooListBar {
+	pub let foo:[Foo2]
+	pub let bar:String
+
+	init(foo:[Foo2], bar:String) {
+		self.foo=foo
+		self.bar=bar
+	}
+}
 pub struct FooBar {
 	pub let foo:Foo
 	pub let bar:String
@@ -398,6 +425,15 @@ pub struct FooBar {
 	}
 }
 
+
+pub struct Foo2{
+	pub let bar: Address
+
+	init(bar: Address) {
+		self.bar=bar
+	}
+}
+
 pub struct Foo{
 	pub let bar: String
 
@@ -597,6 +633,15 @@ transaction(test:String) {
 
 pub contract Debug {
 
+pub struct FooListBar {
+	pub let foo:[Foo2]
+	pub let bar:String
+
+	init(foo:[Foo2], bar:String) {
+		self.foo=foo
+		self.bar=bar
+	}
+}
 pub struct FooBar {
 	pub let foo:Foo
 	pub let bar:String
@@ -607,6 +652,15 @@ pub struct FooBar {
 	}
 }
 
+
+pub struct Foo2{
+	pub let bar: Address
+
+	init(bar: Address) {
+		self.bar=bar
+	}
+}
+
 pub struct Foo{
 	pub let bar: String
 

transaction_integration_test.go

@@ -190,6 +190,20 @@ func TestTransactionIntegration(t *testing.T) {
 
 	})
 
+	t.Run("Send nestedstruct with array to transaction", func(t *testing.T) {
+
+		o.Tx(`
+		import Debug from "../contracts/Debug.cdc"
+		transaction(foo: Debug.FooListBar) {
+		  prepare(acct: AuthAccount) {
+		 } 
+	 }`,
+			WithSigner("first"),
+			WithArg("foo", Debug_FooListBar{Bar: "bar", Foo: []Debug_Foo2{{Bar: "0xf8d6e0586b0a20c7"}}}),
+		).AssertSuccess(t)
+
+	})
+
 	t.Run("Send HttpFile to transaction", func(t *testing.T) {
 
 		o.Tx(`