Merge branch 'main' into nullpointer0x00/1328-migrate-msgfees-gov-pro…

…ps-v1
provenance-io · Aug 11, 2023 · 17b5316 · 17b5316
2 parents 392421d + 294259a
commit 17b5316
Show file tree

Hide file tree

Showing 6 changed files with 95 additions and 86 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -51,6 +51,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### Bug Fixes
 
 * Fix ibcnet relayer creating multiple connections on restart [#1620](https://github.com/provenance-io/provenance/issues/1620).
+* Fix for incorrect resource-id type casting on contract specification [#1647](https://github.com/provenance-io/provenance/issues/1647).
 
 ---
 

diff --git a/proto/provenance/metadata/v1/specification.proto b/proto/provenance/metadata/v1/specification.proto
@@ -77,7 +77,10 @@ message ContractSpecification {
   // contract
   oneof source {
     // the address of a record on chain that represents this contract
-    bytes resource_id = 5 [(gogoproto.customtype) = "MetadataAddress", (gogoproto.moretags) = "yaml:\"resource_id\""];
+    bytes resource_id = 5 [
+      (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress",
+      (gogoproto.moretags)   = "yaml:\"resource_id\""
+    ];
     // the hash of contract binary (off-chain instance)
     string hash = 6;
   }

diff --git a/x/metadata/client/cli/tx.go b/x/metadata/client/cli/tx.go
@@ -605,8 +605,8 @@ icon-url           - address to a image to be used as an icon (optional, can onl
 				ClassName:       args[4],
 			}
 			sourceValue := args[3]
-			var recordID types.MetadataAddress
-			recordID, err = types.MetadataAddressFromBech32(sourceValue)
+			var recordID sdk.AccAddress
+			recordID, err = sdk.AccAddressFromBech32(sourceValue)
 			if err != nil {
 				contractSpecification.Source = &types.ContractSpecification_Hash{
 					Hash: sourceValue,

diff --git a/x/metadata/types/specification.go b/x/metadata/types/specification.go
@@ -122,7 +122,7 @@ func NewContractSpecification(
 }
 
 // NewContractSpecificationSourceResourceID creates a new source (for a ContractSpecification) with a resource id
-func NewContractSpecificationSourceResourceID(resourceID MetadataAddress) *ContractSpecification_ResourceId {
+func NewContractSpecificationSourceResourceID(resourceID sdk.AccAddress) *ContractSpecification_ResourceId {
 	return &ContractSpecification_ResourceId{ResourceId: resourceID}
 }
 

diff --git a/x/metadata/types/specification.pb.go b/x/metadata/types/specification.pb.go
diff --git a/x/metadata/types/specification_test.go b/x/metadata/types/specification_test.go
@@ -354,7 +354,7 @@ func (s *SpecificationTestSuite) TestContractSpecValidateBasic() {
 				nil,
 				[]string{specTestBech32},
 				[]PartyType{PartyType_PARTY_TYPE_OWNER},
-				NewContractSpecificationSourceResourceID(MetadataAddress(specTestAddr)),
+				NewContractSpecificationSourceResourceID(specTestAddr),
 				"someclass",
 			),
 			fmt.Sprintf("invalid source resource id: %s", "invalid metadata address type: 133"),