@bloxchain/contracts 1.0.0-alpha.2 → 1.0.0-alpha.20

package/README.md

@@ -2,7 +2,7 @@
 
 [![npm version](https://img.shields.io/npm/v/@bloxchain/contracts.svg)](https://www.npmjs.com/package/@bloxchain/contracts)
 [![License: MPL-2.0](https://img.shields.io/badge/License-MPL--2.0-blue.svg)](https://opensource.org/licenses/MPL-2.0)
-[![Solidity](https://img.shields.io/badge/Solidity-0.8.33-blue.svg)](https://soliditylang.org/)
+[![Solidity](https://img.shields.io/badge/Solidity-0.8.34-blue.svg)](https://soliditylang.org/)
 
 Bloxchain Protocol smart contracts – state abstraction and core components for building on the Bloxchain Protocol.
 
@@ -12,7 +12,7 @@ Bloxchain Protocol smart contracts – state abstraction and core components for
 ## Requirements
 
 - **Node.js**: >= 18.0.0 (for tooling; Solidity has no runtime dependency)
-- **Solidity**: 0.8.x (0.8.33 recommended)
+- **Solidity**: 0.8.x (0.8.34 recommended)
 - **Compilers**: Foundry, Hardhat, or Truffle
 
 ## Installation
@@ -23,18 +23,18 @@ npm install @bloxchain/contracts
 
 ## Usage
 
-Import contracts in your Solidity files. Paths are relative to the package root (`core/`, `utils/`, `interfaces/`):
+Import contracts in your Solidity files. All contracts live under `@bloxchain/contracts/core/`:
 
 ```solidity
 import "@bloxchain/contracts/core/base/BaseStateMachine.sol";
 import "@bloxchain/contracts/core/security/SecureOwnable.sol";
 import "@bloxchain/contracts/core/access/RuntimeRBAC.sol";
 import "@bloxchain/contracts/core/execution/GuardController.sol";
-import "@bloxchain/contracts/utils/SharedValidation.sol";
-import "@bloxchain/contracts/interfaces/IDefinition.sol";
+import "@bloxchain/contracts/core/lib/utils/SharedValidation.sol";
+import "@bloxchain/contracts/core/lib/interfaces/IDefinition.sol";
 ```
 
-**Foundry**: No remapping needed; the package exposes `core/`, `utils/`, and `interfaces/` at root.  
+**Foundry**: No remapping needed; the package exposes `core/` at root (lib, base, access, execution, security live inside it).  
 **Hardhat / Truffle**: Resolve `@bloxchain/contracts` from `node_modules` as usual.
 
 ## Contracts
@@ -50,7 +50,7 @@ import "@bloxchain/contracts/interfaces/IDefinition.sol";
 
 ### Templates and examples
 
-Templates (e.g. BareBlox, SecureBlox, AccountBlox) and example applications (SimpleVault, SimpleRWA20) live in the main repository under `contracts/examples/`. They are not included in this npm package. See the [main repo](https://github.com/PracticalParticle/Bloxchain-Protocol) for full documentation and examples.
+Templates (e.g. AccountBlox, CopyBlox) and example applications (SimpleVault, SimpleRWA20) live in the main repository under `contracts/examples/`. They are not included in this npm package. See the [main repo](https://github.com/PracticalParticle/Bloxchain-Protocol) for full documentation and examples.
 
 ## Dependencies
 

package/abi/BaseStateMachine.abi.json

@@ -4,22 +4,6 @@
     "name": "InvalidInitialization",
     "type": "error"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "from",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "to",
-        "type": "uint256"
-      }
-    ],
-    "name": "InvalidRange",
-    "type": "error"
-  },
   {
     "inputs": [
       {
@@ -158,6 +142,25 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "bytes4",
+        "name": "functionSelector",
+        "type": "bytes4"
+      }
+    ],
+    "name": "getHooks",
+    "outputs": [
+      {
+        "internalType": "address[]",
+        "name": "hooks",
+        "type": "address[]"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [
       {
@@ -1001,7 +1004,7 @@
       },
       {
         "internalType": "bytes32",
-        "name": "roleHashReturn",
+        "name": "hash",
         "type": "bytes32"
       },
       {
@@ -1074,7 +1077,7 @@
         "type": "bytes32"
       }
     ],
-    "name": "getWalletsInRole",
+    "name": "getAuthorizedWallets",
     "outputs": [
       {
         "internalType": "address[]",
@@ -1093,36 +1096,54 @@
         "type": "bytes4"
       }
     ],
-    "name": "functionSchemaExists",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes4",
-        "name": "functionSelector",
-        "type": "bytes4"
-      },
-      {
-        "internalType": "enum EngineBlox.TxAction",
-        "name": "action",
-        "type": "uint8"
-      }
-    ],
-    "name": "isActionSupportedByFunction",
+    "name": "getFunctionSchema",
     "outputs": [
       {
-        "internalType": "bool",
+        "components": [
+          {
+            "internalType": "string",
+            "name": "functionSignature",
+            "type": "string"
+          },
+          {
+            "internalType": "bytes4",
+            "name": "functionSelector",
+            "type": "bytes4"
+          },
+          {
+            "internalType": "bytes32",
+            "name": "operationType",
+            "type": "bytes32"
+          },
+          {
+            "internalType": "string",
+            "name": "operationName",
+            "type": "string"
+          },
+          {
+            "internalType": "uint16",
+            "name": "supportedActionsBitmap",
+            "type": "uint16"
+          },
+          {
+            "internalType": "bool",
+            "name": "enforceHandlerRelations",
+            "type": "bool"
+          },
+          {
+            "internalType": "bool",
+            "name": "isProtected",
+            "type": "bool"
+          },
+          {
+            "internalType": "bytes4[]",
+            "name": "handlerForSelectors",
+            "type": "bytes4[]"
+          }
+        ],
+        "internalType": "struct EngineBlox.FunctionSchema",
         "name": "",
-        "type": "bool"
+        "type": "tuple"
       }
     ],
     "stateMutability": "view",
@@ -1247,5 +1268,24 @@
     ],
     "stateMutability": "view",
     "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "bytes4",
+        "name": "functionSelector",
+        "type": "bytes4"
+      }
+    ],
+    "name": "getFunctionWhitelistTargets",
+    "outputs": [
+      {
+        "internalType": "address[]",
+        "name": "",
+        "type": "address[]"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
   }
 ]

package/abi/EngineBlox.abi.json

@@ -58,22 +58,6 @@
     "name": "ConflictingMetaTxPermissions",
     "type": "error"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes4",
-        "name": "functionSelector",
-        "type": "bytes4"
-      },
-      {
-        "internalType": "string",
-        "name": "functionSignature",
-        "type": "string"
-      }
-    ],
-    "name": "ContractFunctionMustBeProtected",
-    "type": "error"
-  },
   {
     "inputs": [
       {
@@ -338,6 +322,17 @@
     "name": "MaxRolesExceeded",
     "type": "error"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "provided",
+        "type": "uint256"
+      }
+    ],
+    "name": "MaxWalletsZero",
+    "type": "error"
+  },
   {
     "inputs": [
       {
@@ -354,6 +349,44 @@
     "name": "MetaTxExpired",
     "type": "error"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "signedContract",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "entryContract",
+        "type": "address"
+      }
+    ],
+    "name": "MetaTxHandlerContractMismatch",
+    "type": "error"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "txId",
+        "type": "uint256"
+      }
+    ],
+    "name": "MetaTxPaymentMismatchStoredTx",
+    "type": "error"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "txId",
+        "type": "uint256"
+      }
+    ],
+    "name": "MetaTxRecordMismatchStoredTx",
+    "type": "error"
+  },
   {
     "inputs": [
       {
@@ -581,12 +614,12 @@
   },
   {
     "inputs": [],
-    "name": "MAX_BATCH_SIZE",
+    "name": "ATTACHED_PAYMENT_RECIPIENT_SELECTOR",
     "outputs": [
       {
-        "internalType": "uint256",
+        "internalType": "bytes4",
         "name": "",
-        "type": "uint256"
+        "type": "bytes4"
       }
     ],
     "stateMutability": "view",
@@ -594,12 +627,12 @@
   },
   {
     "inputs": [],
-    "name": "MAX_FUNCTIONS",
+    "name": "ERC20_TRANSFER_SELECTOR",
     "outputs": [
       {
-        "internalType": "uint256",
+        "internalType": "bytes4",
         "name": "",
-        "type": "uint256"
+        "type": "bytes4"
       }
     ],
     "stateMutability": "view",
@@ -607,7 +640,7 @@
   },
   {
     "inputs": [],
-    "name": "MAX_HOOKS_PER_SELECTOR",
+    "name": "MAX_BATCH_SIZE",
     "outputs": [
       {
         "internalType": "uint256",
@@ -620,7 +653,7 @@
   },
   {
     "inputs": [],
-    "name": "MAX_ROLES",
+    "name": "MAX_FUNCTIONS",
     "outputs": [
       {
         "internalType": "uint256",
@@ -633,12 +666,12 @@
   },
   {
     "inputs": [],
-    "name": "NATIVE_TRANSFER_OPERATION",
+    "name": "MAX_HOOKS_PER_SELECTOR",
     "outputs": [
       {
-        "internalType": "bytes32",
+        "internalType": "uint256",
         "name": "",
-        "type": "bytes32"
+        "type": "uint256"
       }
     ],
     "stateMutability": "view",
@@ -646,25 +679,12 @@
   },
   {
     "inputs": [],
-    "name": "NATIVE_TRANSFER_SELECTOR",
+    "name": "MAX_RESULT_PREVIEW_BYTES",
     "outputs": [
       {
-        "internalType": "bytes4",
-        "name": "",
-        "type": "bytes4"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "PROTOCOL_NAME_HASH",
-    "outputs": [
-      {
-        "internalType": "bytes32",
+        "internalType": "uint256",
         "name": "",
-        "type": "bytes32"
+        "type": "uint256"
       }
     ],
     "stateMutability": "view",
@@ -672,12 +692,12 @@
   },
   {
     "inputs": [],
-    "name": "UPDATE_PAYMENT_OPERATION",
+    "name": "MAX_ROLES",
     "outputs": [
       {
-        "internalType": "bytes32",
+        "internalType": "uint256",
         "name": "",
-        "type": "bytes32"
+        "type": "uint256"
       }
     ],
     "stateMutability": "view",
@@ -685,7 +705,7 @@
   },
   {
     "inputs": [],
-    "name": "UPDATE_PAYMENT_SELECTOR",
+    "name": "NATIVE_TRANSFER_SELECTOR",
     "outputs": [
       {
         "internalType": "bytes4",
@@ -698,25 +718,12 @@
   },
   {
     "inputs": [],
-    "name": "VERSION_MAJOR",
-    "outputs": [
-      {
-        "internalType": "uint8",
-        "name": "",
-        "type": "uint8"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "VERSION_MINOR",
+    "name": "PROTOCOL_NAME_HASH",
     "outputs": [
       {
-        "internalType": "uint8",
+        "internalType": "bytes32",
         "name": "",
-        "type": "uint8"
+        "type": "bytes32"
       }
     ],
     "stateMutability": "view",
@@ -724,12 +731,12 @@
   },
   {
     "inputs": [],
-    "name": "VERSION_PATCH",
+    "name": "VERSION",
     "outputs": [
       {
-        "internalType": "uint8",
+        "internalType": "string",
         "name": "",
-        "type": "uint8"
+        "type": "string"
       }
     ],
     "stateMutability": "view",
@@ -844,29 +851,5 @@
     ],
     "stateMutability": "view",
     "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "contractAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes4",
-        "name": "selector",
-        "type": "bytes4"
-      }
-    ],
-    "name": "selectorExistsInContract",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
   }
 ]