Feature/node 4771 add test chains for non prod naga deploys

blockchain/contracts/abis/ContractResolver.abi

@@ -388,19 +388,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [],
-    "name": "PUB_KEY_ROUTER_VIEWS_CONTRACT",
-    "outputs": [
-      {
-        "internalType": "bytes32",
-        "name": "",
-        "type": "bytes32"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "RATE_LIMIT_NFT_CONTRACT",

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-core/ContractResolver.sol

@@ -23,8 +23,6 @@ contract ContractResolver is AccessControl {
     bytes32 public constant LIT_TOKEN_CONTRACT = keccak256("LIT_TOKEN");
     bytes32 public constant PUB_KEY_ROUTER_CONTRACT =
         keccak256("PUB_KEY_ROUTER"); // 0xb1f79813bc7630a52ae948bc99781397e409d0dd3521953bf7d8d7a2db6147f7
-    bytes32 public constant PUB_KEY_ROUTER_VIEWS_CONTRACT =
-        keccak256("PUB_KEY_ROUTER_VIEWS"); // 0x4c3f3e2f3e5d3e6f0c8e4f6b7a1e8c9d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8091
     bytes32 public constant PKP_NFT_CONTRACT = keccak256("PKP_NFT"); // 0xb7b4fde9944d3c13e9a78835431c33a5084d90a7f0c73def76d7886315fe87b0
     bytes32 public constant RATE_LIMIT_NFT_CONTRACT =
         keccak256("RATE_LIMIT_NFT"); // 0xb931b2719aeb2a65a5035fa0a190bfdc4c8622ce8cbff7a3d1ab42531fb1a918

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(
@@ -198,7 +206,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
@@ -248,6 +256,10 @@ contract PKPHelper is Ownable, IERC721Receiver, AccessControl {
             value: msg.value
         }(params.keyType, params.keySetId);
 
+        PKPPermissionsFacet pkpPermissions = PKPPermissionsFacet(
+            getPkpPermissionsAddress()
+        );
+
         // sanity checking array lengths
         require(
             params.permittedIpfsCIDs.length ==
@@ -278,24 +290,22 @@ contract PKPHelper is Ownable, IERC721Receiver, AccessControl {
         // permit the action
         if (params.permittedIpfsCIDs.length != 0) {
             for (uint256 i = 0; i < params.permittedIpfsCIDs.length; i++) {
-                PKPPermissionsFacet(getPkpPermissionsAddress())
-                    .addPermittedAction(
-                        tokenId,
-                        params.permittedIpfsCIDs[i],
-                        params.permittedIpfsCIDScopes[i]
-                    );
+                pkpPermissions.addPermittedAction(
+                    tokenId,
+                    params.permittedIpfsCIDs[i],
+                    params.permittedIpfsCIDScopes[i]
+                );
             }
         }
 
         // permit the address
         if (params.permittedAddresses.length != 0) {
             for (uint256 i = 0; i < params.permittedAddresses.length; i++) {
-                PKPPermissionsFacet(getPkpPermissionsAddress())
-                    .addPermittedAddress(
-                        tokenId,
-                        params.permittedAddresses[i],
-                        params.permittedAddressesScopes[i]
-                    );
+                pkpPermissions.addPermittedAddress(
+                    tokenId,
+                    params.permittedAddresses[i],
+                    params.permittedAddressesScopes[i]
+                );
             }
         }
 
@@ -306,25 +316,24 @@ contract PKPHelper is Ownable, IERC721Receiver, AccessControl {
                 i < params.permittedAuthMethodTypes.length;
                 i++
             ) {
-                PKPPermissionsFacet(getPkpPermissionsAddress())
-                    .addPermittedAuthMethod(
-                        tokenId,
-                        LibPKPPermissionsStorage.AuthMethod(
-                            params.permittedAuthMethodTypes[i],
-                            params.permittedAuthMethodIds[i],
-                            params.permittedAuthMethodPubkeys[i]
-                        ),
-                        params.permittedAuthMethodScopes[i]
-                    );
+                pkpPermissions.addPermittedAuthMethod(
+                    tokenId,
+                    LibPKPPermissionsStorage.AuthMethod(
+                        params.permittedAuthMethodTypes[i],
+                        params.permittedAuthMethodIds[i],
+                        params.permittedAuthMethodPubkeys[i]
+                    ),
+                    params.permittedAuthMethodScopes[i]
+                );
             }
         }
 
-        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,
                 new uint256[](0)
@@ -442,6 +451,10 @@ contract PKPHelper is Ownable, IERC721Receiver, AccessControl {
             claimMaterial.stakingContractAddress
         );
 
+        PKPPermissionsFacet pkpPermissions = PKPPermissionsFacet(
+            getPkpPermissionsAddress()
+        );
+
         require(
             authMethodData.permittedIpfsCIDs.length ==
                 authMethodData.permittedIpfsCIDScopes.length,
@@ -475,12 +488,11 @@ contract PKPHelper is Ownable, IERC721Receiver, AccessControl {
                 i < authMethodData.permittedIpfsCIDs.length;
                 i++
             ) {
-                PKPPermissionsFacet(getPkpPermissionsAddress())
-                    .addPermittedAction(
-                        tokenId,
-                        authMethodData.permittedIpfsCIDs[i],
-                        authMethodData.permittedIpfsCIDScopes[i]
-                    );
+                pkpPermissions.addPermittedAction(
+                    tokenId,
+                    authMethodData.permittedIpfsCIDs[i],
+                    authMethodData.permittedIpfsCIDScopes[i]
+                );
             }
         }
 
@@ -491,12 +503,11 @@ contract PKPHelper is Ownable, IERC721Receiver, AccessControl {
                 i < authMethodData.permittedAddresses.length;
                 i++
             ) {
-                PKPPermissionsFacet(getPkpPermissionsAddress())
-                    .addPermittedAddress(
-                        tokenId,
-                        authMethodData.permittedAddresses[i],
-                        authMethodData.permittedAddressScopes[i]
-                    );
+                pkpPermissions.addPermittedAddress(
+                    tokenId,
+                    authMethodData.permittedAddresses[i],
+                    authMethodData.permittedAddressScopes[i]
+                );
             }
         }
 
@@ -507,25 +518,24 @@ contract PKPHelper is Ownable, IERC721Receiver, AccessControl {
                 i < authMethodData.permittedAuthMethodTypes.length;
                 i++
             ) {
-                PKPPermissionsFacet(getPkpPermissionsAddress())
-                    .addPermittedAuthMethod(
-                        tokenId,
-                        LibPKPPermissionsStorage.AuthMethod(
-                            authMethodData.permittedAuthMethodTypes[i],
-                            authMethodData.permittedAuthMethodIds[i],
-                            authMethodData.permittedAuthMethodPubkeys[i]
-                        ),
-                        authMethodData.permittedAuthMethodScopes[i]
-                    );
+                pkpPermissions.addPermittedAuthMethod(
+                    tokenId,
+                    LibPKPPermissionsStorage.AuthMethod(
+                        authMethodData.permittedAuthMethodTypes[i],
+                        authMethodData.permittedAuthMethodIds[i],
+                        authMethodData.permittedAuthMethodPubkeys[i]
+                    ),
+                    authMethodData.permittedAuthMethodScopes[i]
+                );
             }
         }
 
-        address pkpEthAddress = PKPPermissionsFacet(getPkpPermissionsAddress())
+        address pkpEthAddress = PubkeyRouterViewsFacet(getPubkeyRouterAddress())
             .getEthAddress(tokenId);
 
         // add the pkp eth address as a permitted address
         if (authMethodData.addPkpEthAddressAsPermittedAddress) {
-            PKPPermissionsFacet(getPkpPermissionsAddress()).addPermittedAddress(
+            pkpPermissions.addPermittedAddress(
                 tokenId,
                 pkpEthAddress,
                 new uint256[](0)

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,10 @@ contract PKPHelperV2 is Ownable, IERC721Receiver {
             value: msg.value
         }(params.keyType, params.keySetId);
 
+        PKPPermissionsFacet pkpPermissions = PKPPermissionsFacet(
+            getPkpPermissionsAddress()
+        );
+
         require(
             params.permittedAuthMethodTypes.length ==
                 params.permittedAuthMethodIds.length,
@@ -112,25 +124,24 @@ contract PKPHelperV2 is Ownable, IERC721Receiver {
                 i < params.permittedAuthMethodTypes.length;
                 i++
             ) {
-                PKPPermissionsFacet(getPkpPermissionsAddress())
-                    .addPermittedAuthMethod(
-                        tokenId,
-                        LibPKPPermissionsStorage.AuthMethod(
-                            params.permittedAuthMethodTypes[i],
-                            params.permittedAuthMethodIds[i],
-                            params.permittedAuthMethodPubkeys[i]
-                        ),
-                        params.permittedAuthMethodScopes[i]
-                    );
+                pkpPermissions.addPermittedAuthMethod(
+                    tokenId,
+                    LibPKPPermissionsStorage.AuthMethod(
+                        params.permittedAuthMethodTypes[i],
+                        params.permittedAuthMethodIds[i],
+                        params.permittedAuthMethodPubkeys[i]
+                    ),
+                    params.permittedAuthMethodScopes[i]
+                );
             }
         }
 
-        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

blockchain/contracts/contracts/lit-node/PKPPermissions/PKPPermissionsFacet.sol

@@ -78,7 +78,7 @@ contract PKPPermissionsFacet is ERC2771 {
     function getRouterAddress() public view returns (address) {
         return
             s().contractResolver.getContract(
-                s().contractResolver.PUB_KEY_ROUTER_VIEWS_CONTRACT(),
+                s().contractResolver.PUB_KEY_ROUTER_CONTRACT(),
                 s().env
             );
     }

blockchain/contracts/test/domain-wallets/DomainWalletRegistry.ts

@@ -198,7 +198,6 @@ describe('DomainWalletRegistry', function () {
       pkpPermissionsContract: pkpPermissionsFacet,
       pkpNftMetadataContract: pkpNftMetadata,
       pubkeyRouterContract: pubkeyRouter,
-      pubkeyRouterViewsContract: pubkeyRouterViews,
       hdKeyDeriverContract: keyDeriver,
       stakingContract: stakingFacet,
       tokenContract: token,

blockchain/contracts/test/lit-node/PKPHelper.js

@@ -136,7 +136,6 @@ describe('PKPHelper', function () {
       pkpPermissionsContract: pkpPermissions,
       hdKeyDeriverContract: keyDeriver,
       pubkeyRouterContract: router,
-      pubkeyRouterViewsContract: routerViews,
     });
 
     // Mint enough tokens for the deployer

blockchain/contracts/test/lit-node/PKPNFT.js

@@ -160,7 +160,6 @@ describe('PKPNFT', function () {
       pkpNftMetadataContract: pkpNftMetadata,
       hdKeyDeriverContract: keyDeriver,
       pubkeyRouterContract: router,
-      pubkeyRouterViewsContract: routerViews,
       stylusContractP256: supportsArbitrumStylus(hre.network.config)
         ? hre.network.config.stylusContractsForTests.p256
         : undefined,

blockchain/contracts/test/lit-node/PKPPermissions.js

@@ -147,7 +147,6 @@ describe('PKPPermissions', function () {
       pkpPermissionsContract: pkpPermissions,
       hdKeyDeriverContract: keyDeriver,
       pubkeyRouterContract: router,
-      pubkeyRouterViewsContract: routerViews,
     });
 
     await stakingKeySetsFacet.setKeySet({

blockchain/contracts/test/lit-node/Staking.js

@@ -164,7 +164,6 @@ describe('Staking', function () {
       stakingContract: stakingValidatorFacet,
       pkpContract: pkpNft,
       pubkeyRouterContract: routerContract,
-      pubkeyRouterViewsContract: routerViews,
     });
 
     await stakingKeySetsFacet.setKeySet({

blockchain/contracts/utils/contract.ts

@@ -53,7 +53,6 @@ export async function setContractResolver(
     domainWalletRegistryContract,
     hdKeyDeriverContract,
     pubkeyRouterContract,
-    pubkeyRouterViewsContract,
     stylusContractP256,
     stylusContractK256,
   }: {
@@ -67,7 +66,6 @@ export async function setContractResolver(
     domainWalletRegistryContract?: DomainWalletRegistryFacet;
     hdKeyDeriverContract?: KeyDeriver;
     pubkeyRouterContract?: PubkeyRouterFacet;
-    pubkeyRouterViewsContract?: PubkeyRouterViewsFacet;
     stylusContractP256?: string;
     stylusContractK256?: string;
   }
@@ -144,14 +142,6 @@ export async function setContractResolver(
     );
   }
 
-  if (pubkeyRouterViewsContract) {
-    await contractResolver.setContract(
-      await contractResolver.PUB_KEY_ROUTER_VIEWS_CONTRACT(),
-      env,
-      await pubkeyRouterViewsContract.getAddress()
-    );
-  }
-
   if (backupRecoveryContract) {
     await contractResolver.setContract(
       await contractResolver.BACKUP_RECOVERY_CONTRACT(),