Lit-node-monitor Updates

blockchain/contracts/abis/ContractResolver.abi

@@ -388,6 +388,19 @@
     "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/contracts/lit-core/ContractResolver.sol

@@ -23,6 +23,8 @@ 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/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_CONTRACT(),
+                s().contractResolver.PUB_KEY_ROUTER_VIEWS_CONTRACT(),
                 s().env
             );
     }

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

@@ -51,6 +51,11 @@ contract Staking {
 
         // Global Configuration values across all realms
         // Most of this is related to staking / delegation
+
+        uint256[] memory keyTypes = new uint256[](2);
+        keyTypes[0] = uint256(1); // BLS
+        keyTypes[1] = uint256(2); // ECDSA
+
         s.globalConfig[0] = LibStakingStorage.GlobalConfig({
             tokenRewardPerTokenPerEpoch: (10 ** 18) / 20, // 18 decimal places in token
             keyTypes_deprecated: new uint256[](0),

blockchain/contracts/contracts/lit-node/Staking/FunctionSelectorHelper.t.sol

@@ -209,7 +209,7 @@ contract FunctionSelectorHelper {
         functionSignatures[15] = "decreaseRewardPool(uint256,uint256)";
         functionSignatures[
             16
-        ] = "setConfig((uint256,uint256[],uint256,uint256,uint256,uint256,uint256,uint256,uint256,uint256,bool,uint256,uint256,uint256,uint256,uint256,uint256,uint256,uint256,uint256,uint256,uint256))";
+        ] = "setConfig((uint256,uint256,uint256,uint256,uint256,uint256,uint256,uint256,uint256,bool,uint256,uint256,uint256,uint256,uint256,uint256,uint256,uint256,uint256,uint256,uint256))";
         functionSignatures[
             17
         ] = "setComplaintConfig(uint256,(uint256,uint256,uint256,uint256))";

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

@@ -198,6 +198,7 @@ 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,6 +136,7 @@ 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,6 +160,7 @@ 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,6 +147,7 @@ describe('PKPPermissions', function () {
       pkpPermissionsContract: pkpPermissions,
       hdKeyDeriverContract: keyDeriver,
       pubkeyRouterContract: router,
+      pubkeyRouterViewsContract: routerViews,
     });
 
     await stakingKeySetsFacet.setKeySet({

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

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

blockchain/contracts/utils/contract.ts

@@ -53,6 +53,7 @@ export async function setContractResolver(
     domainWalletRegistryContract,
     hdKeyDeriverContract,
     pubkeyRouterContract,
+    pubkeyRouterViewsContract,
     stylusContractP256,
     stylusContractK256,
   }: {
@@ -66,6 +67,7 @@ export async function setContractResolver(
     domainWalletRegistryContract?: DomainWalletRegistryFacet;
     hdKeyDeriverContract?: KeyDeriver;
     pubkeyRouterContract?: PubkeyRouterFacet;
+    pubkeyRouterViewsContract?: PubkeyRouterViewsFacet;
     stylusContractP256?: string;
     stylusContractK256?: string;
   }
@@ -142,6 +144,14 @@ 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(),

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

@@ -68,8 +68,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x6080604052348015600f57600080fd5b506105ee8061001f6000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c806362e4c4641461003b578063a32c2b9914610060575b600080fd5b61004360f581565b6040516001600160a01b0390911681526020015b60405180910390f35b61007361006e36600461029e565b610081565b604051610057929190610443565b600060606000610092868686610100565b905060008060f56001600160a01b0316836040516100b0919061047f565b600060405180830381855afa9150503d80600081146100eb576040519150601f19603f3d011682016040523d82523d6000602084013e6100f0565b606091505b5090999098509650505050505050565b60408051600080825260208201909252606091805b855181101561019a57848682815181106101315761013161049b565b6020026020010151602001510361019257828682815181106101555761015561049b565b6020026020010151600001516040516020016101729291906104b1565b6040516020818303038152906040529250818061018e906104e0565b9250505b600101610115565b50836002036101ac57600193506101b9565b836003036101b957600093505b60006040518060600160405280602b815260200161058e602b9139805160405191925060f887901b91600160e51b9160e090811b919086901b9060009061021090869086908f9087908b9088908f90602001610513565b60408051808303601f190181529190529c9b505050505050505050505050565b634e487b7160e01b600052604160045260246000fd5b604080519081016001600160401b038111828210171561026857610268610230565b60405290565b604051601f8201601f191681016001600160401b038111828210171561029657610296610230565b604052919050565b6000806000606084860312156102b357600080fd5b8335925060208401356001600160401b038111156102d057600080fd5b8401601f810186136102e157600080fd5b80356001600160401b038111156102fa576102fa610230565b8060051b61030a6020820161026e565b9182526020818401810192908101908984111561032657600080fd5b6020850192505b8383101561040a5782356001600160401b0381111561034b57600080fd5b85016040818c03601f1901121561036157600080fd5b610369610246565b60208201356001600160401b0381111561038257600080fd5b82016020810190603f018d1361039757600080fd5b80356001600160401b038111156103b0576103b0610230565b6103c3601f8201601f191660200161026e565b8181528e60208385010111156103d857600080fd5b81602084016020830137600060209282018301528352604093909301358284015250835292830192919091019061032d565b96999698505050506040949094013593505050565b60005b8381101561043a578181015183820152602001610422565b50506000910152565b8215158152604060208201526000825180604084015261046a81606085016020870161041f565b601f01601f1916919091016060019392505050565b6000825161049181846020870161041f565b9190910192915050565b634e487b7160e01b600052603260045260246000fd5b600083516104c381846020880161041f565b8351908301906104d781836020880161041f565b01949350505050565b600063ffffffff821663ffffffff810361050a57634e487b7160e01b600052601160045260246000fd5b60010192915050565b6001600160f81b0319881681526001600160e01b031987811660018301526005820187905285166025820152835160009061055581602985016020890161041f565b6001600160e01b03198516602991840191820152835161057c81602d84016020880161041f565b01602d01999850505050505050505056fe4c49545f48445f4b45595f49445f4b3235365f584d443a5348412d3235365f535357555f524f5f4e554c5fa2646970667358221220bbe004057781343f93dd4de89688a2d7d0fd3454c7d2e2f06bfe272602e95fe464736f6c634300081c0033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c806362e4c4641461003b578063a32c2b9914610060575b600080fd5b61004360f581565b6040516001600160a01b0390911681526020015b60405180910390f35b61007361006e36600461029e565b610081565b604051610057929190610443565b600060606000610092868686610100565b905060008060f56001600160a01b0316836040516100b0919061047f565b600060405180830381855afa9150503d80600081146100eb576040519150601f19603f3d011682016040523d82523d6000602084013e6100f0565b606091505b5090999098509650505050505050565b60408051600080825260208201909252606091805b855181101561019a57848682815181106101315761013161049b565b6020026020010151602001510361019257828682815181106101555761015561049b565b6020026020010151600001516040516020016101729291906104b1565b6040516020818303038152906040529250818061018e906104e0565b9250505b600101610115565b50836002036101ac57600193506101b9565b836003036101b957600093505b60006040518060600160405280602b815260200161058e602b9139805160405191925060f887901b91600160e51b9160e090811b919086901b9060009061021090869086908f9087908b9088908f90602001610513565b60408051808303601f190181529190529c9b505050505050505050505050565b634e487b7160e01b600052604160045260246000fd5b604080519081016001600160401b038111828210171561026857610268610230565b60405290565b604051601f8201601f191681016001600160401b038111828210171561029657610296610230565b604052919050565b6000806000606084860312156102b357600080fd5b8335925060208401356001600160401b038111156102d057600080fd5b8401601f810186136102e157600080fd5b80356001600160401b038111156102fa576102fa610230565b8060051b61030a6020820161026e565b9182526020818401810192908101908984111561032657600080fd5b6020850192505b8383101561040a5782356001600160401b0381111561034b57600080fd5b85016040818c03601f1901121561036157600080fd5b610369610246565b60208201356001600160401b0381111561038257600080fd5b82016020810190603f018d1361039757600080fd5b80356001600160401b038111156103b0576103b0610230565b6103c3601f8201601f191660200161026e565b8181528e60208385010111156103d857600080fd5b81602084016020830137600060209282018301528352604093909301358284015250835292830192919091019061032d565b96999698505050506040949094013593505050565b60005b8381101561043a578181015183820152602001610422565b50506000910152565b8215158152604060208201526000825180604084015261046a81606085016020870161041f565b601f01601f1916919091016060019392505050565b6000825161049181846020870161041f565b9190910192915050565b634e487b7160e01b600052603260045260246000fd5b600083516104c381846020880161041f565b8351908301906104d781836020880161041f565b01949350505050565b600063ffffffff821663ffffffff810361050a57634e487b7160e01b600052601160045260246000fd5b60010192915050565b6001600160f81b0319881681526001600160e01b031987811660018301526005820187905285166025820152835160009061055581602985016020890161041f565b6001600160e01b03198516602991840191820152835161057c81602d84016020880161041f565b01602d01999850505050505050505056fe4c49545f48445f4b45595f49445f4b3235365f584d443a5348412d3235365f535357555f524f5f4e554c5fa2646970667358221220bbe004057781343f93dd4de89688a2d7d0fd3454c7d2e2f06bfe272602e95fe464736f6c634300081c0033",
+  "bytecode": "0x6080604052348015600f57600080fd5b506105ee8061001f6000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c806362e4c4641461003b578063a32c2b9914610060575b600080fd5b61004360f581565b6040516001600160a01b0390911681526020015b60405180910390f35b61007361006e36600461029e565b610081565b604051610057929190610443565b600060606000610092868686610100565b905060008060f56001600160a01b0316836040516100b0919061047f565b600060405180830381855afa9150503d80600081146100eb576040519150601f19603f3d011682016040523d82523d6000602084013e6100f0565b606091505b5090999098509650505050505050565b60408051600080825260208201909252606091805b855181101561019a57848682815181106101315761013161049b565b6020026020010151602001510361019257828682815181106101555761015561049b565b6020026020010151600001516040516020016101729291906104b1565b6040516020818303038152906040529250818061018e906104e0565b9250505b600101610115565b50836002036101ac57600193506101b9565b836003036101b957600093505b60006040518060600160405280602b815260200161058e602b9139805160405191925060f887901b91600160e51b9160e090811b919086901b9060009061021090869086908f9087908b9088908f90602001610513565b60408051808303601f190181529190529c9b505050505050505050505050565b634e487b7160e01b600052604160045260246000fd5b604080519081016001600160401b038111828210171561026857610268610230565b60405290565b604051601f8201601f191681016001600160401b038111828210171561029657610296610230565b604052919050565b6000806000606084860312156102b357600080fd5b8335925060208401356001600160401b038111156102d057600080fd5b8401601f810186136102e157600080fd5b80356001600160401b038111156102fa576102fa610230565b8060051b61030a6020820161026e565b9182526020818401810192908101908984111561032657600080fd5b6020850192505b8383101561040a5782356001600160401b0381111561034b57600080fd5b85016040818c03601f1901121561036157600080fd5b610369610246565b60208201356001600160401b0381111561038257600080fd5b82016020810190603f018d1361039757600080fd5b80356001600160401b038111156103b0576103b0610230565b6103c3601f8201601f191660200161026e565b8181528e60208385010111156103d857600080fd5b81602084016020830137600060209282018301528352604093909301358284015250835292830192919091019061032d565b96999698505050506040949094013593505050565b60005b8381101561043a578181015183820152602001610422565b50506000910152565b8215158152604060208201526000825180604084015261046a81606085016020870161041f565b601f01601f1916919091016060019392505050565b6000825161049181846020870161041f565b9190910192915050565b634e487b7160e01b600052603260045260246000fd5b600083516104c381846020880161041f565b8351908301906104d781836020880161041f565b01949350505050565b600063ffffffff821663ffffffff810361050a57634e487b7160e01b600052601160045260246000fd5b60010192915050565b6001600160f81b0319881681526001600160e01b031987811660018301526005820187905285166025820152835160009061055581602985016020890161041f565b6001600160e01b03198516602991840191820152835161057c81602d84016020880161041f565b01602d01999850505050505050505056fe4c49545f48445f4b45595f49445f4b3235365f584d443a5348412d3235365f535357555f524f5f4e554c5fa26469706673582212205d2e87924405c75a37cb3199109dc5847775ce28137c5e1ca405720cfa3bea3d64736f6c634300081c0033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c806362e4c4641461003b578063a32c2b9914610060575b600080fd5b61004360f581565b6040516001600160a01b0390911681526020015b60405180910390f35b61007361006e36600461029e565b610081565b604051610057929190610443565b600060606000610092868686610100565b905060008060f56001600160a01b0316836040516100b0919061047f565b600060405180830381855afa9150503d80600081146100eb576040519150601f19603f3d011682016040523d82523d6000602084013e6100f0565b606091505b5090999098509650505050505050565b60408051600080825260208201909252606091805b855181101561019a57848682815181106101315761013161049b565b6020026020010151602001510361019257828682815181106101555761015561049b565b6020026020010151600001516040516020016101729291906104b1565b6040516020818303038152906040529250818061018e906104e0565b9250505b600101610115565b50836002036101ac57600193506101b9565b836003036101b957600093505b60006040518060600160405280602b815260200161058e602b9139805160405191925060f887901b91600160e51b9160e090811b919086901b9060009061021090869086908f9087908b9088908f90602001610513565b60408051808303601f190181529190529c9b505050505050505050505050565b634e487b7160e01b600052604160045260246000fd5b604080519081016001600160401b038111828210171561026857610268610230565b60405290565b604051601f8201601f191681016001600160401b038111828210171561029657610296610230565b604052919050565b6000806000606084860312156102b357600080fd5b8335925060208401356001600160401b038111156102d057600080fd5b8401601f810186136102e157600080fd5b80356001600160401b038111156102fa576102fa610230565b8060051b61030a6020820161026e565b9182526020818401810192908101908984111561032657600080fd5b6020850192505b8383101561040a5782356001600160401b0381111561034b57600080fd5b85016040818c03601f1901121561036157600080fd5b610369610246565b60208201356001600160401b0381111561038257600080fd5b82016020810190603f018d1361039757600080fd5b80356001600160401b038111156103b0576103b0610230565b6103c3601f8201601f191660200161026e565b8181528e60208385010111156103d857600080fd5b81602084016020830137600060209282018301528352604093909301358284015250835292830192919091019061032d565b96999698505050506040949094013593505050565b60005b8381101561043a578181015183820152602001610422565b50506000910152565b8215158152604060208201526000825180604084015261046a81606085016020870161041f565b601f01601f1916919091016060019392505050565b6000825161049181846020870161041f565b9190910192915050565b634e487b7160e01b600052603260045260246000fd5b600083516104c381846020880161041f565b8351908301906104d781836020880161041f565b01949350505050565b600063ffffffff821663ffffffff810361050a57634e487b7160e01b600052601160045260246000fd5b60010192915050565b6001600160f81b0319881681526001600160e01b031987811660018301526005820187905285166025820152835160009061055581602985016020890161041f565b6001600160e01b03198516602991840191820152835161057c81602d84016020880161041f565b01602d01999850505050505050505056fe4c49545f48445f4b45595f49445f4b3235365f584d443a5348412d3235365f535357555f524f5f4e554c5fa26469706673582212205d2e87924405c75a37cb3199109dc5847775ce28137c5e1ca405720cfa3bea3d64736f6c634300081c0033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }