@etherisc/gif-next 0.0.2-de0a1d3-009 → 0.0.2-def25d4-556

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

@@ -1,83 +1,149 @@
 {
   "_format": "hh-sol-artifact-1",
-  "contractName": "ServiceBase",
-  "sourceName": "contracts/instance/base/ServiceBase.sol",
+  "contractName": "IService",
+  "sourceName": "contracts/shared/IService.sol",
   "abi": [
     {
-      "inputs": [],
-      "name": "InvalidInitialization",
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "registry",
+          "type": "address"
+        },
+        {
+          "internalType": "NftId",
+          "name": "nftId",
+          "type": "uint96"
+        }
+      ],
+      "name": "ErrorAlreadyLinked",
       "type": "error"
     },
     {
-      "inputs": [],
-      "name": "NotInitializing",
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "contractAddress",
+          "type": "address"
+        }
+      ],
+      "name": "ErrorContractNotRegistered",
       "type": "error"
     },
     {
-      "anonymous": false,
       "inputs": [
         {
-          "indexed": false,
-          "internalType": "uint64",
-          "name": "version",
-          "type": "uint64"
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
         }
       ],
-      "name": "Initialized",
-      "type": "event"
+      "name": "ErrorNotOwner",
+      "type": "error"
     },
     {
-      "anonymous": false,
       "inputs": [
         {
-          "indexed": false,
-          "internalType": "Version",
-          "name": "version",
-          "type": "uint24"
-        },
-        {
-          "indexed": false,
           "internalType": "address",
-          "name": "implementation",
+          "name": "registryAddress",
           "type": "address"
-        },
+        }
+      ],
+      "name": "ErrorNotRegistry",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "ErrorRegistryAddressZero",
+      "type": "error"
+    },
+    {
+      "inputs": [
         {
-          "indexed": false,
           "internalType": "address",
-          "name": "activatedBy",
+          "name": "registry",
           "type": "address"
         }
       ],
-      "name": "LogVersionableActivated",
-      "type": "event"
+      "name": "ErrorRegistryAlreadyInitialized",
+      "type": "error"
     },
     {
+      "inputs": [],
+      "name": "ErrorRegistryNotInitialized",
+      "type": "error"
+    },
+    {
+      "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"
-        },
-        {
-          "internalType": "bytes",
-          "name": "activatinData",
-          "type": "bytes"
         }
       ],
-      "name": "activate",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
+      "name": "LogVersionableInitialized",
+      "type": "event"
     },
     {
       "inputs": [],
-      "name": "getData",
+      "name": "getInitialInfo",
       "outputs": [
+        {
+          "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"
+        },
         {
           "internalType": "bytes",
           "name": "data",
@@ -132,7 +198,7 @@
       "outputs": [
         {
           "internalType": "NftId",
-          "name": "nftId",
+          "name": "",
           "type": "uint96"
         }
       ],
@@ -145,52 +211,26 @@
       "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"
         }
       ],
       "stateMutability": "view",
       "type": "function"
     },
-    {
-      "inputs": [],
-      "name": "getType",
-      "outputs": [
-        {
-          "internalType": "ObjectType",
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "stateMutability": "pure",
-      "type": "function"
-    },
     {
       "inputs": [],
       "name": "getVersion",
@@ -208,7 +248,7 @@
       "inputs": [
         {
           "internalType": "uint256",
-          "name": "idx",
+          "name": "index",
           "type": "uint256"
         }
       ],
@@ -216,7 +256,7 @@
       "outputs": [
         {
           "internalType": "Version",
-          "name": "",
+          "name": "version",
           "type": "uint24"
         }
       ],
@@ -229,7 +269,7 @@
       "outputs": [
         {
           "internalType": "uint256",
-          "name": "",
+          "name": "numberOfVersions",
           "type": "uint256"
         }
       ],
@@ -240,7 +280,7 @@
       "inputs": [
         {
           "internalType": "Version",
-          "name": "_version",
+          "name": "version",
           "type": "uint24"
         }
       ],
@@ -275,7 +315,7 @@
             }
           ],
           "internalType": "struct IVersionable.VersionInfo",
-          "name": "",
+          "name": "versionInfo",
           "type": "tuple"
         }
       ],
@@ -296,7 +336,7 @@
         },
         {
           "internalType": "bytes",
-          "name": "initializationData",
+          "name": "activationData",
           "type": "bytes"
         }
       ],
@@ -309,11 +349,11 @@
       "inputs": [
         {
           "internalType": "Version",
-          "name": "_version",
+          "name": "version",
           "type": "uint24"
         }
       ],
-      "name": "isActivated",
+      "name": "isInitialized",
       "outputs": [
         {
           "internalType": "bool",
@@ -326,14 +366,8 @@
     },
     {
       "inputs": [],
-      "name": "register",
-      "outputs": [
-        {
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
-        }
-      ],
+      "name": "linkToRegisteredNftId",
+      "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/ddc9b0b487d1eff0b437a694ef8bc6d1.json"
+  "buildInfo": "../../../build-info/87988637569758c4560bd9f4a1a8375d.json"
 }

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

@@ -25,7 +25,7 @@
           "type": "address"
         }
       ],
-      "name": "LogVersionableActivated",
+      "name": "LogVersionableInitialized",
       "type": "event"
     },
     {
@@ -163,7 +163,7 @@
           "type": "uint24"
         }
       ],
-      "name": "isActivated",
+      "name": "isInitialized",
       "outputs": [
         {
           "internalType": "bool",

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

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

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

@@ -0,0 +1,158 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "NftOwnable",
+  "sourceName": "contracts/shared/NftOwnable.sol",
+  "abi": [
+    {
+      "inputs": [],
+      "stateMutability": "nonpayable",
+      "type": "constructor"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "registry",
+          "type": "address"
+        },
+        {
+          "internalType": "NftId",
+          "name": "nftId",
+          "type": "uint96"
+        }
+      ],
+      "name": "ErrorAlreadyLinked",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "contractAddress",
+          "type": "address"
+        }
+      ],
+      "name": "ErrorContractNotRegistered",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
+        }
+      ],
+      "name": "ErrorNotOwner",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "registryAddress",
+          "type": "address"
+        }
+      ],
+      "name": "ErrorNotRegistry",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "ErrorRegistryAddressZero",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "registry",
+          "type": "address"
+        }
+      ],
+      "name": "ErrorRegistryAlreadyInitialized",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "ErrorRegistryNotInitialized",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "getNftId",
+      "outputs": [
+        {
+          "internalType": "NftId",
+          "name": "",
+          "type": "uint96"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "getOwner",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "getRegistry",
+      "outputs": [
+        {
+          "internalType": "contract IRegistry",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "linkToRegisteredNftId",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    }
+  ],
+  "bytecode": "0x608060405234801561001057600080fd5b50600180546001600160a01b031916331790556104a7806100326000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c8063138461e0146100515780635ab1bd531461005b578063644c45e014610085578063893d20e8146100b0575b600080fd5b6100596100b8565b005b6000546001600160a01b03165b6040516001600160a01b0390911681526020015b60405180910390f35b600054600160a01b90046001600160601b03166040516001600160601b03909116815260200161007c565b6100686102da565b6000546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af415801561011a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061013e91906103f6565b15610185576000546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6000546001600160a01b03166101ae5760405163cf29926160e01b815260040160405180910390fd5b60005460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa1580156101f7573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061021b91906103f6565b610243576040516372657a5160e01b81526001600160a01b038216600482015260240161017c565b600054604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa15801561028d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102b1919061041f565b600060146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b600080546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af415801561033d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061036191906103f6565b156103e657600054604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa1580156103bd573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103e19190610448565b905090565b506001546001600160a01b031690565b60006020828403121561040857600080fd5b8151801515811461041857600080fd5b9392505050565b60006020828403121561043157600080fd5b81516001600160601b038116811461041857600080fd5b60006020828403121561045a57600080fd5b81516001600160a01b038116811461041857600080fdfea2646970667358221220aafd42e4e4c7c8c25aa6c7b6f2197ded876bdf9e2a5440f715dc1d07d61d108664736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061004c5760003560e01c8063138461e0146100515780635ab1bd531461005b578063644c45e014610085578063893d20e8146100b0575b600080fd5b6100596100b8565b005b6000546001600160a01b03165b6040516001600160a01b0390911681526020015b60405180910390f35b600054600160a01b90046001600160601b03166040516001600160601b03909116815260200161007c565b6100686102da565b6000546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af415801561011a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061013e91906103f6565b15610185576000546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6000546001600160a01b03166101ae5760405163cf29926160e01b815260040160405180910390fd5b60005460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa1580156101f7573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061021b91906103f6565b610243576040516372657a5160e01b81526001600160a01b038216600482015260240161017c565b600054604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa15801561028d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102b1919061041f565b600060146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b600080546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af415801561033d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061036191906103f6565b156103e657600054604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa1580156103bd573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103e19190610448565b905090565b506001546001600160a01b031690565b60006020828403121561040857600080fd5b8151801515811461041857600080fd5b9392505050565b60006020828403121561043157600080fd5b81516001600160601b038116811461041857600080fd5b60006020828403121561045a57600080fd5b81516001600160a01b038116811461041857600080fdfea2646970667358221220aafd42e4e4c7c8c25aa6c7b6f2197ded876bdf9e2a5440f715dc1d07d61d108664736f6c63430008140033",
+  "linkReferences": {
+    "contracts/types/NftId.sol": {
+      "NftIdLib": [
+        {
+          "length": 20,
+          "start": 274
+        },
+        {
+          "length": 20,
+          "start": 821
+        }
+      ]
+    }
+  },
+  "deployedLinkReferences": {
+    "contracts/types/NftId.sol": {
+      "NftIdLib": [
+        {
+          "length": 20,
+          "start": 224
+        },
+        {
+          "length": 20,
+          "start": 771
+        }
+      ]
+    }
+  }
+}

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

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