Update PKP Helper V2 as well.

Author: GTC6244

blockchain/contracts/abis/PKPHelper.abi

@@ -568,6 +568,19 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "getPubkeyRouterAddress",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [
       {

blockchain/contracts/contracts/lit-node/PKPHelper.sol

@@ -9,6 +9,7 @@ import { Base64 } from "@openzeppelin/contracts/utils/Base64.sol";
 import { IERC721Receiver } from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
 import { ContractResolver } from "../lit-core/ContractResolver.sol";
 import { PKPNFTFacet } from "./PKPNFT/PKPNFTFacet.sol";
+import { PubkeyRouterViewsFacet } from "./PubkeyRouter/PubkeyRouterViewsFacet.sol";
 import "@openzeppelin/contracts/access/AccessControl.sol";
 import "hardhat/console.sol";
 
@@ -108,6 +109,13 @@ contract PKPHelper is Ownable, IERC721Receiver, AccessControl {
             );
     }
 
+    function getPubkeyRouterAddress() public view returns (address) {
+        return
+            contractResolver.getContract(
+                contractResolver.PUB_KEY_ROUTER_CONTRACT(),
+                env
+            );
+    }
     /* ========== MUTATIVE FUNCTIONS ========== */
 
     function mintNextAndAddAuthMethods(
@@ -120,6 +128,7 @@ contract PKPHelper is Ownable, IERC721Receiver, AccessControl {
         bool addPkpEthAddressAsPermittedAddress,
         bool sendPkpToItself
     ) public payable returns (uint256) {
+
         MintNextAndAddAuthMethodsWithTypesParams
             memory params = MintNextAndAddAuthMethodsWithTypesParams({
                 keyType: keyType,
@@ -198,7 +207,7 @@ contract PKPHelper is Ownable, IERC721Receiver, AccessControl {
             }
         }
 
-        address pkpEthAddress = PKPPermissionsFacet(getPkpPermissionsAddress())
+        address pkpEthAddress = PubkeyRouterViewsFacet(getPubkeyRouterAddress())
             .getEthAddress(tokenId);
 
         // add the pkp eth address as a permitted address
@@ -243,6 +252,7 @@ contract PKPHelper is Ownable, IERC721Receiver, AccessControl {
     function mintNextAndAddAuthMethodsWithTypes(
         MintNextAndAddAuthMethodsWithTypesParams memory params
     ) public payable returns (uint256) {
+
         // mint the nft and forward the funds
         uint256 tokenId = PKPNFTFacet(getPkpNftAddress()).mintNext{
             value: msg.value
@@ -321,7 +331,7 @@ contract PKPHelper is Ownable, IERC721Receiver, AccessControl {
             }
         }
 
-        address pkpEthAddress = pkpPermissions
+        address pkpEthAddress = PubkeyRouterViewsFacet(getPubkeyRouterAddress())
             .getEthAddress(tokenId);
 
         // add the pkp eth address as a permitted address
@@ -524,7 +534,7 @@ contract PKPHelper is Ownable, IERC721Receiver, AccessControl {
             }
         }
 
-        address pkpEthAddress = pkpPermissions
+        address pkpEthAddress = PubkeyRouterViewsFacet(getPubkeyRouterAddress())
             .getEthAddress(tokenId);
 
         // add the pkp eth address as a permitted address

blockchain/contracts/contracts/lit-node/PKPHelperV2.sol

@@ -5,6 +5,7 @@ import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
 import { IERC721Receiver } from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
 import { ContractResolver } from "../lit-core/ContractResolver.sol";
 import { PKPNFTFacet } from "./PKPNFT/PKPNFTFacet.sol";
+import { PubkeyRouterViewsFacet } from "./PubkeyRouter/PubkeyRouterViewsFacet.sol";
 import "hardhat/console.sol";
 
 import { LibPKPPermissionsStorage } from "./PKPPermissions/LibPKPPermissionsStorage.sol";
@@ -73,6 +74,13 @@ contract PKPHelperV2 is Ownable, IERC721Receiver {
             );
     }
 
+    function getPubkeyRouterAddress() public view returns (address) {
+        return
+            contractResolver.getContract(
+                contractResolver.PUB_KEY_ROUTER_CONTRACT(),
+                env
+            );
+    }
     /* ========== MUTATIVE FUNCTIONS ========== */
 
     function mintNextAndAddAuthMethods(
@@ -89,6 +97,8 @@ contract PKPHelperV2 is Ownable, IERC721Receiver {
             value: msg.value
         }(params.keyType, params.keySetId);
 
+        PKPPermissionsFacet pkpPermissions = PKPPermissionsFacet(getPkpPermissionsAddress());
+
         require(
             params.permittedAuthMethodTypes.length ==
                 params.permittedAuthMethodIds.length,
@@ -112,7 +122,7 @@ contract PKPHelperV2 is Ownable, IERC721Receiver {
                 i < params.permittedAuthMethodTypes.length;
                 i++
             ) {
-                PKPPermissionsFacet(getPkpPermissionsAddress())
+                pkpPermissions
                     .addPermittedAuthMethod(
                         tokenId,
                         LibPKPPermissionsStorage.AuthMethod(
@@ -125,12 +135,12 @@ contract PKPHelperV2 is Ownable, IERC721Receiver {
             }
         }
 
-        address pkpEthAddress = PKPPermissionsFacet(getPkpPermissionsAddress())
+        address pkpEthAddress = PubkeyRouterViewsFacet(getPubkeyRouterAddress())
             .getEthAddress(tokenId);
 
         // add the pkp eth address as a permitted address
         if (params.addPkpEthAddressAsPermittedAddress) {
-            PKPPermissionsFacet(getPkpPermissionsAddress()).addPermittedAddress(
+                pkpPermissions.addPermittedAddress(
                 tokenId,
                 pkpEthAddress,
                 params.pkpEthAddressScopes

rust/lit-core/lit-blockchain-lite/abis/PKPHelper.json

@@ -381,16 +381,17 @@ impl Pkp {
         info!("Minting a new PKP using helper contract on the mainnet test chain.");
         let mint_cost = pkpnft.mint_cost().call().await?;
 
-
-        
+        let empty_u256_array: Vec<U256> = vec![];
+        let empty_double_u256_array: Vec<Vec<U256>> = vec![];
+        let empty_bytes_array: Vec<ethers::types::Bytes> = vec![];
         let mint_tx = pkp_helper
             .mint_next_and_add_auth_methods(
                 key_type,
                 key_set_id.to_string(),
-                [].to_vec(),
-                vec![],
-                vec![],
-                [[].to_vec()].to_vec(),
+                empty_u256_array,
+                empty_bytes_array.clone(),
+                empty_bytes_array,
+                empty_double_u256_array,
                 false,
                 false,
             )

rust/lit-core/lit-blockchain-lite/src/contracts/pkp_helper.rs

@@ -25,7 +25,8 @@ async fn test_everything_as_web_user() {
 #[tokio::test]
 async fn test_web_user_with_auth_methods() {
     crate::common::setup_logging();
-    let (_testnet, validator_collection, mut end_user) = TestSetupBuilder::default().build().await;
+    let (_testnet, validator_collection, mut end_user) =
+        TestSetupBuilder::default().force_deploy(true).build().await;
 
     let auth_methods = vec![];