@etherisc/gif-next 0.0.2-e875d61-189 → 0.0.2-e922e07-736

package/artifacts/contracts/{experiment/inheritance/IB.sol/IB.json → shared/IRegistryLinked.sol/IRegistryLinked.json}

@@ -1,45 +1,43 @@
 {
   "_format": "hh-sol-artifact-1",
-  "contractName": "IB",
-  "sourceName": "contracts/experiment/inheritance/IB.sol",
+  "contractName": "IRegistryLinked",
+  "sourceName": "contracts/shared/IRegistryLinked.sol",
   "abi": [
     {
-      "inputs": [],
-      "name": "getAfromB",
-      "outputs": [
+      "inputs": [
         {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
+          "internalType": "address",
+          "name": "registryAddress",
+          "type": "address"
         }
       ],
-      "stateMutability": "view",
-      "type": "function"
+      "name": "ErrorNotRegistry",
+      "type": "error"
     },
     {
       "inputs": [],
-      "name": "getB",
+      "name": "getRegistry",
       "outputs": [
         {
-          "internalType": "uint256",
+          "internalType": "contract IRegistry",
           "name": "",
-          "type": "uint256"
+          "type": "address"
         }
       ],
       "stateMutability": "view",
       "type": "function"
     },
     {
-      "inputs": [
+      "inputs": [],
+      "name": "getRegistryAddress",
+      "outputs": [
         {
-          "internalType": "uint256",
-          "name": "newA",
-          "type": "uint256"
+          "internalType": "address",
+          "name": "",
+          "type": "address"
         }
       ],
-      "name": "setB",
-      "outputs": [],
-      "stateMutability": "nonpayable",
+      "stateMutability": "view",
       "type": "function"
     }
   ],

package/artifacts/contracts/shared/IService.sol/IService.dbg.json

@@ -0,0 +1,4 @@
+{
+  "_format": "hh-sol-dbg-1",
+  "buildInfo": "../../../build-info/6de31a9fa359724de841ac23a6f4e434.json"
+}

package/artifacts/contracts/{instance/base/ServiceBase.sol/ServiceBase.json → shared/IService.sol/IService.json}

@@ -1,72 +1,126 @@
 {
   "_format": "hh-sol-artifact-1",
-  "contractName": "ServiceBase",
-  "sourceName": "contracts/instance/base/ServiceBase.sol",
+  "contractName": "IService",
+  "sourceName": "contracts/shared/IService.sol",
   "abi": [
     {
-      "anonymous": false,
       "inputs": [
         {
-          "indexed": false,
-          "internalType": "Version",
-          "name": "version",
-          "type": "uint24"
-        },
-        {
-          "indexed": false,
           "internalType": "address",
-          "name": "implementation",
+          "name": "caller",
           "type": "address"
-        },
+        }
+      ],
+      "name": "ErrorIServiceCallerUnknown",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "NftId",
+          "name": "nftId",
+          "type": "uint96"
+        }
+      ],
+      "name": "ErrorNftOwnableAlreadyLinked",
+      "type": "error"
+    },
+    {
+      "inputs": [
         {
-          "indexed": false,
           "internalType": "address",
-          "name": "activatedBy",
+          "name": "contractAddress",
           "type": "address"
         }
       ],
-      "name": "LogVersionableActivated",
-      "type": "event"
+      "name": "ErrorNftOwnableContractNotRegistered",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "ErrorNftOwnableInitialOwnerZero",
+      "type": "error"
     },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "implementation",
+          "name": "account",
           "type": "address"
-        },
+        }
+      ],
+      "name": "ErrorNftOwnableNotOwner",
+      "type": "error"
+    },
+    {
+      "inputs": [
         {
           "internalType": "address",
-          "name": "activatedBy",
+          "name": "registryAddress",
           "type": "address"
         }
       ],
-      "name": "activate",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
+      "name": "ErrorNotRegistry",
+      "type": "error"
     },
     {
       "inputs": [],
-      "name": "getData",
+      "name": "getDomain",
       "outputs": [
         {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
+          "internalType": "ObjectType",
+          "name": "serviceDomain",
+          "type": "uint8"
         }
       ],
-      "stateMutability": "view",
+      "stateMutability": "pure",
       "type": "function"
     },
     {
       "inputs": [],
-      "name": "getMajorVersion",
+      "name": "getInitialInfo",
       "outputs": [
         {
-          "internalType": "VersionPart",
-          "name": "majorVersion",
-          "type": "uint8"
+          "components": [
+            {
+              "internalType": "NftId",
+              "name": "nftId",
+              "type": "uint96"
+            },
+            {
+              "internalType": "NftId",
+              "name": "parentNftId",
+              "type": "uint96"
+            },
+            {
+              "internalType": "ObjectType",
+              "name": "objectType",
+              "type": "uint8"
+            },
+            {
+              "internalType": "bool",
+              "name": "isInterceptor",
+              "type": "bool"
+            },
+            {
+              "internalType": "address",
+              "name": "objectAddress",
+              "type": "address"
+            },
+            {
+              "internalType": "address",
+              "name": "initialOwner",
+              "type": "address"
+            },
+            {
+              "internalType": "bytes",
+              "name": "data",
+              "type": "bytes"
+            }
+          ],
+          "internalType": "struct IRegistry.ObjectInfo",
+          "name": "",
+          "type": "tuple"
         }
       ],
       "stateMutability": "view",
@@ -74,15 +128,15 @@
     },
     {
       "inputs": [],
-      "name": "getName",
+      "name": "getMajorVersion",
       "outputs": [
         {
-          "internalType": "string",
-          "name": "name",
-          "type": "string"
+          "internalType": "VersionPart",
+          "name": "majorVersion",
+          "type": "uint8"
         }
       ],
-      "stateMutability": "pure",
+      "stateMutability": "view",
       "type": "function"
     },
     {
@@ -91,7 +145,7 @@
       "outputs": [
         {
           "internalType": "NftId",
-          "name": "nftId",
+          "name": "",
           "type": "uint96"
         }
       ],
@@ -104,33 +158,20 @@
       "outputs": [
         {
           "internalType": "address",
-          "name": "owner",
+          "name": "",
           "type": "address"
         }
       ],
       "stateMutability": "view",
       "type": "function"
     },
-    {
-      "inputs": [],
-      "name": "getParentNftId",
-      "outputs": [
-        {
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
     {
       "inputs": [],
       "name": "getRegistry",
       "outputs": [
         {
           "internalType": "contract IRegistry",
-          "name": "registry",
+          "name": "",
           "type": "address"
         }
       ],
@@ -139,15 +180,15 @@
     },
     {
       "inputs": [],
-      "name": "getType",
+      "name": "getRegistryAddress",
       "outputs": [
         {
-          "internalType": "ObjectType",
+          "internalType": "address",
           "name": "",
-          "type": "uint8"
+          "type": "address"
         }
       ],
-      "stateMutability": "pure",
+      "stateMutability": "view",
       "type": "function"
     },
     {
@@ -166,90 +207,37 @@
     {
       "inputs": [
         {
-          "internalType": "uint256",
-          "name": "idx",
-          "type": "uint256"
-        }
-      ],
-      "name": "getVersion",
-      "outputs": [
+          "internalType": "address",
+          "name": "activatedBy",
+          "type": "address"
+        },
         {
-          "internalType": "Version",
-          "name": "",
-          "type": "uint24"
+          "internalType": "bytes",
+          "name": "activationData",
+          "type": "bytes"
         }
       ],
-      "stateMutability": "view",
+      "name": "initializeVersionable",
+      "outputs": [],
+      "stateMutability": "nonpayable",
       "type": "function"
     },
     {
       "inputs": [],
-      "name": "getVersionCount",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "Version",
-          "name": "_version",
-          "type": "uint24"
-        }
-      ],
-      "name": "getVersionInfo",
-      "outputs": [
-        {
-          "components": [
-            {
-              "internalType": "Version",
-              "name": "version",
-              "type": "uint24"
-            },
-            {
-              "internalType": "address",
-              "name": "implementation",
-              "type": "address"
-            },
-            {
-              "internalType": "address",
-              "name": "activatedBy",
-              "type": "address"
-            },
-            {
-              "internalType": "Timestamp",
-              "name": "activatedAt",
-              "type": "uint40"
-            },
-            {
-              "internalType": "Blocknumber",
-              "name": "activatedIn",
-              "type": "uint32"
-            }
-          ],
-          "internalType": "struct IVersionable.VersionInfo",
-          "name": "",
-          "type": "tuple"
-        }
-      ],
-      "stateMutability": "view",
+      "name": "linkToRegisteredNftId",
+      "outputs": [],
+      "stateMutability": "nonpayable",
       "type": "function"
     },
     {
       "inputs": [
         {
-          "internalType": "Version",
-          "name": "_version",
-          "type": "uint24"
+          "internalType": "bytes4",
+          "name": "interfaceId",
+          "type": "bytes4"
         }
       ],
-      "name": "isActivated",
+      "name": "supportsInterface",
       "outputs": [
         {
           "internalType": "bool",
@@ -260,36 +248,17 @@
       "stateMutability": "view",
       "type": "function"
     },
-    {
-      "inputs": [],
-      "name": "register",
-      "outputs": [
-        {
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
     {
       "inputs": [
         {
-          "internalType": "bytes4",
-          "name": "interfaceId",
-          "type": "bytes4"
-        }
-      ],
-      "name": "supportsInterface",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
+          "internalType": "bytes",
+          "name": "upgradeData",
+          "type": "bytes"
         }
       ],
-      "stateMutability": "view",
+      "name": "upgradeVersionable",
+      "outputs": [],
+      "stateMutability": "nonpayable",
       "type": "function"
     }
   ],

package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/6e7031f88a1e1c862b2077fdfd73f778.json"
+  "buildInfo": "../../../build-info/6de31a9fa359724de841ac23a6f4e434.json"
 }

package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json

@@ -3,49 +3,6 @@
   "contractName": "IVersionable",
   "sourceName": "contracts/shared/IVersionable.sol",
   "abi": [
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "internalType": "Version",
-          "name": "version",
-          "type": "uint24"
-        },
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "implementation",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "activatedBy",
-          "type": "address"
-        }
-      ],
-      "name": "LogVersionableActivated",
-      "type": "event"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "implementation",
-          "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "activatedBy",
-          "type": "address"
-        }
-      ],
-      "name": "activate",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
     {
       "inputs": [],
       "name": "getVersion",
@@ -62,98 +19,32 @@
     {
       "inputs": [
         {
-          "internalType": "uint256",
-          "name": "index",
-          "type": "uint256"
-        }
-      ],
-      "name": "getVersion",
-      "outputs": [
-        {
-          "internalType": "Version",
-          "name": "version",
-          "type": "uint24"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getVersionCount",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "numberOfVersions",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "Version",
-          "name": "version",
-          "type": "uint24"
-        }
-      ],
-      "name": "getVersionInfo",
-      "outputs": [
+          "internalType": "address",
+          "name": "activatedBy",
+          "type": "address"
+        },
         {
-          "components": [
-            {
-              "internalType": "Version",
-              "name": "version",
-              "type": "uint24"
-            },
-            {
-              "internalType": "address",
-              "name": "implementation",
-              "type": "address"
-            },
-            {
-              "internalType": "address",
-              "name": "activatedBy",
-              "type": "address"
-            },
-            {
-              "internalType": "Timestamp",
-              "name": "activatedAt",
-              "type": "uint40"
-            },
-            {
-              "internalType": "Blocknumber",
-              "name": "activatedIn",
-              "type": "uint32"
-            }
-          ],
-          "internalType": "struct IVersionable.VersionInfo",
-          "name": "versionInfo",
-          "type": "tuple"
+          "internalType": "bytes",
+          "name": "activationData",
+          "type": "bytes"
         }
       ],
-      "stateMutability": "view",
+      "name": "initializeVersionable",
+      "outputs": [],
+      "stateMutability": "nonpayable",
       "type": "function"
     },
     {
       "inputs": [
         {
-          "internalType": "Version",
-          "name": "version",
-          "type": "uint24"
+          "internalType": "bytes",
+          "name": "upgradeData",
+          "type": "bytes"
         }
       ],
-      "name": "isActivated",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "view",
+      "name": "upgradeVersionable",
+      "outputs": [],
+      "stateMutability": "nonpayable",
       "type": "function"
     }
   ],

package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json

@@ -0,0 +1,4 @@
+{
+  "_format": "hh-sol-dbg-1",
+  "buildInfo": "../../../build-info/6de31a9fa359724de841ac23a6f4e434.json"
+}