Add contract call criteria

apps/authz/src/opa/rego/__test__/criteria/contractCall_test.rego

@@ -0,0 +1,44 @@
+package main
+
+import future.keywords.in
+
+test_contractCall {
+	contractCallTransactionRequest = {
+		"from": "0xddcf208f219a6e6af072f2cfdc615b2c1805f98e",
+		"to": "0x08a08d0504d4f3363a5b7fda1f5fff1c7bca8ad4",
+		"chainId": 137,
+		"maxFeePerGas": "20000000000",
+		"maxPriorityFeePerGas": "3000000000",
+		"gas": "21000",
+		"data": "0x42842e0e000000000000000000000000ea7278a0d8306658dd6d38274dde084f24cd8a11000000000000000000000000b253f6156e64b12ba0dec3974062dbbaee139f0c000000000000000000000000000000000000000000000000000000000000a0d5",
+		"nonce": 192,
+		"type": "2",
+	}
+
+	contractCallIntent = {
+		"from": "eip155:eoa:0xddcf208f219a6e6af072f2cfdc615b2c1805f98e",
+		"to": "eip155:137:0xa45e21e9370ba031c5e1f47dedca74a7ce2ed7a3",
+		"type": "contractCall",
+		"contract": "eip155:137/erc721:0x08a08d0504d4f3363a5b7fda1f5fff1c7bca8ad4",
+		"hexSignature": "0x12345",
+	}
+
+	contractCallRequest = {
+		"action": "signTransaction",
+		"transactionRequest": contractCallTransactionRequest,
+		"intent": contractCallIntent,
+		"principal": principalReq,
+		"resource": resourceReq,
+		"approvals": approvalsReq,
+		"transfers": transfersReq,
+	}
+
+	checkContractCallType({"contractCall"}) with input as contractCallRequest
+		with data.entities as entities
+
+	checkContractCallAddress({"eip155:137/erc721:0x08a08d0504d4f3363a5b7fda1f5fff1c7bca8ad4"}) with input as contractCallRequest
+		with data.entities as entities
+
+	checkContractCallHexSignatures({"0x12345"}) with input as contractCallRequest
+		with data.entities as entities
+}

apps/authz/src/opa/rego/__test__/criteria/transferNft_test.rego

@@ -2,11 +2,6 @@ package main
 
 import future.keywords.in
 
-test_extractTokenIdFromCaip19 {
-	res := extractTokenIdFromCaip19("eip155:137/erc1155:0x08a08d0504d4f3363a5b7fda1f5fff1c7bca8ad4/55555")
-	res == "55555"
-}
-
 test_transferERC721 {
 	erc721TransactionRequest = {
 		"from": "0xddcf208f219a6e6af072f2cfdc615b2c1805f98e",
@@ -119,3 +114,8 @@ test_checkERC1155TokenAmount {
 	checkERC1155TokenAmount("5", {"tokenId": "eip155:137/erc1155:0x08a08d0504d4f3363a5b7fda1f5fff1c7bca8ad4/41173", "operator": "gt", "value": "3"})
 	checkERC1155TokenAmount("3", {"tokenId": "eip155:137/erc1155:0x08a08d0504d4f3363a5b7fda1f5fff1c7bca8ad4/41173", "operator": "lt", "value": "5"})
 }
+
+test_extractTokenIdFromCaip19 {
+	res := extractTokenIdFromCaip19("eip155:137/erc1155:0x08a08d0504d4f3363a5b7fda1f5fff1c7bca8ad4/55555")
+	res == "55555"
+}

apps/authz/src/opa/rego/lib/criteria/contractCall.rego

@@ -0,0 +1,30 @@
+package main
+
+import future.keywords.in
+
+contractCallTypes = {"contractCall"}
+
+contractCallAddress = input.intent.contract
+
+checkContractCallType(values) {
+	input.intent.type in contractCallTypes
+	input.intent.type in values
+}
+
+checkContractCallAddress(values) {
+	values == wildcard
+}
+
+checkContractCallAddress(values) {
+	values != wildcard
+	contractCallAddress in values
+}
+
+checkContractCallHexSignatures(values) {
+	values == wildcard
+}
+
+checkContractCallHexSignatures(values) {
+	values != wildcard
+	input.intent.hexSignature in values
+}

apps/authz/src/opa/rego/lib/criteria/contractDeploy.rego

@@ -5,11 +5,6 @@ import future.keywords.in
 contractDeployTypes = {"deployContract", "deployErc4337Wallet", "deploySafeWallet"}
 
 checkContractDeployType(values) {
-	values == wildcard
-}
-
-checkContractDeployType(values) {
-	values != wildcard
 	input.intent.type in contractDeployTypes
 	input.intent.type in values
 }

apps/authz/src/opa/rego/lib/criteria/transferNft.rego

@@ -6,17 +6,7 @@ transferNftTypes = {"transferERC721", "transferERC1155"}
 
 transferNftAddress = input.intent.contract
 
-extractTokenIdFromCaip19(caip19) := result {
-	arr := split(caip19, "/")
-	result := arr[count(arr) - 1]
-}
-
 checkTransferNftType(values) {
-	values == wildcard
-}
-
-checkTransferNftType(values) {
-	values != wildcard
 	input.intent.type in transferNftTypes
 	input.intent.type in values
 }
@@ -86,3 +76,8 @@ checkERC1155TokenAmount(amount, operation) {
 	operation.operator == "lte"
 	to_number(operation.value) >= to_number(amount)
 }
+
+extractTokenIdFromCaip19(caip19) := result {
+	arr := split(caip19, "/")
+	result := arr[count(arr) - 1]
+}

apps/authz/src/opa/rego/lib/criteria/transferToken.rego

@@ -13,11 +13,6 @@ transferTokenAddress = input.intent.token
 transferTokenAddress = input.intent.contract
 
 checkTransferTokenType(values) {
-	values == wildcard
-}
-
-checkTransferTokenType(values) {
-	values != wildcard
 	input.intent.type in transferTokenTypes
 	input.intent.type in values
 }

packages/transaction-request-intent/src/lib/intent.types.ts

@@ -30,6 +30,7 @@ export type ERC1155Transfer = {
   tokenId: Caip19
   amount: string
 }
+
 export type TransferErc1155 = {
   type: Intents.TRANSFER_ERC1155
   to: Caip10