@etherisc/gif-next 0.0.2-ce8407f-016 → 0.0.2-ce8fb44-591

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

@@ -1,87 +1,98 @@
 {
   "_format": "hh-sol-artifact-1",
-  "contractName": "ServiceBase",
-  "sourceName": "contracts/instance/base/ServiceBase.sol",
+  "contractName": "Service",
+  "sourceName": "contracts/shared/Service.sol",
   "abi": [
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "registry",
+          "name": "authority",
           "type": "address"
-        },
-        {
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
         }
       ],
-      "name": "ErrorAlreadyLinked",
+      "name": "AccessManagedInvalidAuthority",
       "type": "error"
     },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "contractAddress",
+          "name": "caller",
           "type": "address"
+        },
+        {
+          "internalType": "uint32",
+          "name": "delay",
+          "type": "uint32"
         }
       ],
-      "name": "ErrorContractNotRegistered",
+      "name": "AccessManagedRequiredDelay",
       "type": "error"
     },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "account",
+          "name": "caller",
           "type": "address"
         }
       ],
-      "name": "ErrorNotOwner",
+      "name": "AccessManagedUnauthorized",
       "type": "error"
     },
     {
       "inputs": [
         {
-          "internalType": "address",
-          "name": "registryAddress",
-          "type": "address"
+          "internalType": "NftId",
+          "name": "nftId",
+          "type": "uint96"
         }
       ],
-      "name": "ErrorNotRegistry",
+      "name": "ErrorNftOwnableAlreadyLinked",
       "type": "error"
     },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "registryAddress",
+          "name": "contractAddress",
           "type": "address"
         }
       ],
-      "name": "ErrorRegisterableNotRegistry",
+      "name": "ErrorNftOwnableContractNotRegistered",
       "type": "error"
     },
     {
       "inputs": [],
-      "name": "ErrorRegistryAddressZero",
+      "name": "ErrorNftOwnableInitialOwnerZero",
       "type": "error"
     },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "registry",
+          "name": "account",
           "type": "address"
         }
       ],
-      "name": "ErrorRegistryAlreadyInitialized",
+      "name": "ErrorNftOwnableNotOwner",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "registryAddress",
+          "type": "address"
+        }
+      ],
+      "name": "ErrorNotRegistry",
       "type": "error"
     },
     {
       "inputs": [],
-      "name": "ErrorRegistryNotInitialized",
+      "name": "ErrorServiceNotImplemented",
       "type": "error"
     },
     {
@@ -99,12 +110,12 @@
       "inputs": [
         {
           "indexed": false,
-          "internalType": "uint64",
-          "name": "version",
-          "type": "uint64"
+          "internalType": "address",
+          "name": "authority",
+          "type": "address"
         }
       ],
-      "name": "Initialized",
+      "name": "AuthorityUpdated",
       "type": "event"
     },
     {
@@ -112,26 +123,27 @@
       "inputs": [
         {
           "indexed": false,
-          "internalType": "Version",
+          "internalType": "uint64",
           "name": "version",
-          "type": "uint24"
-        },
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "implementation",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "activatedBy",
-          "type": "address"
+          "type": "uint64"
         }
       ],
-      "name": "LogVersionableInitialized",
+      "name": "Initialized",
       "type": "event"
     },
+    {
+      "inputs": [],
+      "name": "NFT_OWNABLE_STORAGE_LOCATION_V1",
+      "outputs": [
+        {
+          "internalType": "bytes32",
+          "name": "",
+          "type": "bytes32"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "REGISTERABLE_LOCATION_V1",
@@ -145,6 +157,32 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [],
+      "name": "authority",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "getDomain",
+      "outputs": [
+        {
+          "internalType": "ObjectType",
+          "name": "serviceDomain",
+          "type": "uint8"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "getInitialInfo",
@@ -188,57 +226,13 @@
             }
           ],
           "internalType": "struct IRegistry.ObjectInfo",
-          "name": "",
+          "name": "info",
           "type": "tuple"
-        },
-        {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
         }
       ],
       "stateMutability": "view",
       "type": "function"
     },
-    {
-      "inputs": [],
-      "name": "getInitializedVersion",
-      "outputs": [
-        {
-          "internalType": "uint64",
-          "name": "",
-          "type": "uint64"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getMajorVersion",
-      "outputs": [
-        {
-          "internalType": "VersionPart",
-          "name": "majorVersion",
-          "type": "uint8"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getName",
-      "outputs": [
-        {
-          "internalType": "string",
-          "name": "name",
-          "type": "string"
-        }
-      ],
-      "stateMutability": "pure",
-      "type": "function"
-    },
     {
       "inputs": [],
       "name": "getNftId",
@@ -280,25 +274,19 @@
     },
     {
       "inputs": [],
-      "name": "getVersion",
+      "name": "getRoleId",
       "outputs": [
         {
-          "internalType": "Version",
-          "name": "",
-          "type": "uint24"
+          "internalType": "RoleId",
+          "name": "serviceRoleId",
+          "type": "uint64"
         }
       ],
       "stateMutability": "pure",
       "type": "function"
     },
     {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "idx",
-          "type": "uint256"
-        }
-      ],
+      "inputs": [],
       "name": "getVersion",
       "outputs": [
         {
@@ -307,87 +295,104 @@
           "type": "uint24"
         }
       ],
-      "stateMutability": "view",
+      "stateMutability": "pure",
       "type": "function"
     },
     {
       "inputs": [],
-      "name": "getVersionCount",
-      "outputs": [
+      "name": "initializeERC165",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
         {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
+          "internalType": "address",
+          "name": "initialOwner",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "registryAddress",
+          "type": "address"
         }
       ],
-      "stateMutability": "view",
+      "name": "initializeNftOwnable",
+      "outputs": [],
+      "stateMutability": "nonpayable",
       "type": "function"
     },
     {
       "inputs": [
         {
-          "internalType": "Version",
-          "name": "_version",
-          "type": "uint24"
+          "internalType": "address",
+          "name": "registryAddress",
+          "type": "address"
+        },
+        {
+          "internalType": "NftId",
+          "name": "parentNftId",
+          "type": "uint96"
+        },
+        {
+          "internalType": "ObjectType",
+          "name": "objectType",
+          "type": "uint8"
+        },
+        {
+          "internalType": "bool",
+          "name": "isInterceptor",
+          "type": "bool"
+        },
+        {
+          "internalType": "address",
+          "name": "initialOwner",
+          "type": "address"
+        },
+        {
+          "internalType": "bytes",
+          "name": "registryData",
+          "type": "bytes"
         }
       ],
-      "name": "getVersionInfo",
-      "outputs": [
+      "name": "initializeRegisterable",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
         {
-          "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"
+          "internalType": "address",
+          "name": "registryAddress",
+          "type": "address"
         }
       ],
-      "stateMutability": "view",
+      "name": "initializeRegistryLinked",
+      "outputs": [],
+      "stateMutability": "nonpayable",
       "type": "function"
     },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "implementation",
+          "name": "registry",
           "type": "address"
         },
         {
           "internalType": "address",
-          "name": "activatedBy",
+          "name": "authority",
           "type": "address"
         },
         {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
+          "internalType": "address",
+          "name": "initialOwner",
+          "type": "address"
         }
       ],
-      "name": "initialize",
+      "name": "initializeService",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
@@ -395,17 +400,29 @@
     {
       "inputs": [
         {
-          "internalType": "Version",
-          "name": "_version",
-          "type": "uint24"
+          "internalType": "address",
+          "name": "activatedBy",
+          "type": "address"
+        },
+        {
+          "internalType": "bytes",
+          "name": "data",
+          "type": "bytes"
         }
       ],
-      "name": "isInitialized",
+      "name": "initializeVersionable",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "isConsumingScheduledOp",
       "outputs": [
         {
-          "internalType": "bool",
+          "internalType": "bytes4",
           "name": "",
-          "type": "bool"
+          "type": "bytes4"
         }
       ],
       "stateMutability": "view",
@@ -414,6 +431,38 @@
     {
       "inputs": [],
       "name": "linkToRegisteredNftId",
+      "outputs": [
+        {
+          "internalType": "NftId",
+          "name": "nftId",
+          "type": "uint96"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "bytes4",
+          "name": "interfaceId",
+          "type": "bytes4"
+        }
+      ],
+      "name": "registerInterface",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "newAuthority",
+          "type": "address"
+        }
+      ],
+      "name": "setAuthority",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
@@ -439,23 +488,13 @@
     },
     {
       "inputs": [
-        {
-          "internalType": "address",
-          "name": "implementation",
-          "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "activatedBy",
-          "type": "address"
-        },
         {
           "internalType": "bytes",
           "name": "data",
           "type": "bytes"
         }
       ],
-      "name": "upgrade",
+      "name": "upgradeVersionable",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/513944a18d93e005314a3ed93f91d5cd.json"
+  "buildInfo": "../../../build-info/66b888b9920d1d1f6002878b18a10a0a.json"
 }

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

@@ -67,6 +67,11 @@
     },
     {
       "inputs": [
+        {
+          "internalType": "address",
+          "name": "token",
+          "type": "address"
+        },
         {
           "internalType": "address",
           "name": "from",
@@ -78,9 +83,32 @@
           "type": "address"
         },
         {
-          "internalType": "uint256",
+          "internalType": "Amount",
           "name": "amount",
-          "type": "uint256"
+          "type": "uint96"
+        }
+      ],
+      "name": "safeTransferFrom",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "from",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "internalType": "Amount",
+          "name": "amount",
+          "type": "uint96"
         }
       ],
       "name": "transfer",
@@ -89,8 +117,34 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b506040516103fd3803806103fd83398101604081905261002f91610054565b600080546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b61036a806100936000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c806321df0da71461003b578063beabacc81461005a575b600080fd5b600054604080516001600160a01b039092168252519081900360200190f35b61006d6100683660046102a7565b61006f565b005b600054610087906001600160a01b031684848461008c565b505050565b604080516001600160a01b0385811660248301528416604482015260648082018490528251808303909101815260849091019091526020810180516001600160e01b03166323b872dd60e01b1790526100e69085906100ec565b50505050565b60006101016001600160a01b03841683610154565b9050805160001415801561012657508080602001905181019061012491906102e3565b155b1561008757604051635274afe760e01b81526001600160a01b03841660048201526024015b60405180910390fd5b606061016283836000610169565b9392505050565b60608147101561018e5760405163cd78605960e01b815230600482015260240161014b565b600080856001600160a01b031684866040516101aa9190610305565b60006040518083038185875af1925050503d80600081146101e7576040519150601f19603f3d011682016040523d82523d6000602084013e6101ec565b606091505b50915091506101fc868383610206565b9695505050505050565b60608261021b5761021682610262565b610162565b815115801561023257506001600160a01b0384163b155b1561025b57604051639996b31560e01b81526001600160a01b038516600482015260240161014b565b5080610162565b8051156102725780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b80356001600160a01b03811681146102a257600080fd5b919050565b6000806000606084860312156102bc57600080fd5b6102c58461028b565b92506102d36020850161028b565b9150604084013590509250925092565b6000602082840312156102f557600080fd5b8151801515811461016257600080fd5b6000825160005b81811015610326576020818601810151858301520161030c565b50600092019182525091905056fea26469706673582212206c45662405bc7b2191c10fbc00c274e25e42f014dabd0c56e158f08ddbb63dbb64736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c806321df0da71461003b578063beabacc81461005a575b600080fd5b600054604080516001600160a01b039092168252519081900360200190f35b61006d6100683660046102a7565b61006f565b005b600054610087906001600160a01b031684848461008c565b505050565b604080516001600160a01b0385811660248301528416604482015260648082018490528251808303909101815260849091019091526020810180516001600160e01b03166323b872dd60e01b1790526100e69085906100ec565b50505050565b60006101016001600160a01b03841683610154565b9050805160001415801561012657508080602001905181019061012491906102e3565b155b1561008757604051635274afe760e01b81526001600160a01b03841660048201526024015b60405180910390fd5b606061016283836000610169565b9392505050565b60608147101561018e5760405163cd78605960e01b815230600482015260240161014b565b600080856001600160a01b031684866040516101aa9190610305565b60006040518083038185875af1925050503d80600081146101e7576040519150601f19603f3d011682016040523d82523d6000602084013e6101ec565b606091505b50915091506101fc868383610206565b9695505050505050565b60608261021b5761021682610262565b610162565b815115801561023257506001600160a01b0384163b155b1561025b57604051639996b31560e01b81526001600160a01b038516600482015260240161014b565b5080610162565b8051156102725780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b80356001600160a01b03811681146102a257600080fd5b919050565b6000806000606084860312156102bc57600080fd5b6102c58461028b565b92506102d36020850161028b565b9150604084013590509250925092565b6000602082840312156102f557600080fd5b8151801515811461016257600080fd5b6000825160005b81811015610326576020818601810151858301520161030c565b50600092019182525091905056fea26469706673582212206c45662405bc7b2191c10fbc00c274e25e42f014dabd0c56e158f08ddbb63dbb64736f6c63430008140033",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
+  "bytecode": "0x608060405234801561001057600080fd5b5060405161056638038061056683398101604081905261002f91610054565b600080546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b6104d3806100936000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c806321df0da7146100465780638d7271c314610065578063c661667d1461007a575b600080fd5b600054604080516001600160a01b039092168252519081900360200190f35b61007861007336600461039c565b61008d565b005b6100786100883660046103f0565b61011f565b60405163046e44af60e11b81526001600160601b03821660048201526101199085908590859073__$3bac17678db7ae928afa209f2f44deec9c$__906308dc895e906024015b602060405180830381865af41580156100f0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101149190610433565b610179565b50505050565b60005460405163046e44af60e11b81526001600160601b0383166004820152610174916001600160a01b0316908590859073__$3bac17678db7ae928afa209f2f44deec9c$__906308dc895e906024016100d3565b505050565b604080516001600160a01b038581166024830152848116604483015260648083018590528351808403909101815260849092019092526020810180516001600160e01b03166323b872dd60e01b179052610119918691906000906101df90841683610232565b90508051600014158015610204575080806020019051810190610202919061044c565b155b1561017457604051635274afe760e01b81526001600160a01b03841660048201526024015b60405180910390fd5b606061024083836000610247565b9392505050565b60608147101561026c5760405163cd78605960e01b8152306004820152602401610229565b600080856001600160a01b03168486604051610288919061046e565b60006040518083038185875af1925050503d80600081146102c5576040519150601f19603f3d011682016040523d82523d6000602084013e6102ca565b606091505b50915091506102da8683836102e4565b9695505050505050565b6060826102f9576102f482610340565b610240565b815115801561031057506001600160a01b0384163b155b1561033957604051639996b31560e01b81526001600160a01b0385166004820152602401610229565b5080610240565b8051156103505780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b80356001600160a01b038116811461038057600080fd5b919050565b80356001600160601b038116811461038057600080fd5b600080600080608085870312156103b257600080fd5b6103bb85610369565b93506103c960208601610369565b92506103d760408601610369565b91506103e560608601610385565b905092959194509250565b60008060006060848603121561040557600080fd5b61040e84610369565b925061041c60208501610369565b915061042a60408501610385565b90509250925092565b60006020828403121561044557600080fd5b5051919050565b60006020828403121561045e57600080fd5b8151801515811461024057600080fd5b6000825160005b8181101561048f5760208186018101518583015201610475565b50600092019182525091905056fea2646970667358221220eb04c800cd7fb952dfc497be4a1382ec67eeeb44081b5de36c56ea019dd3241f64736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c806321df0da7146100465780638d7271c314610065578063c661667d1461007a575b600080fd5b600054604080516001600160a01b039092168252519081900360200190f35b61007861007336600461039c565b61008d565b005b6100786100883660046103f0565b61011f565b60405163046e44af60e11b81526001600160601b03821660048201526101199085908590859073__$3bac17678db7ae928afa209f2f44deec9c$__906308dc895e906024015b602060405180830381865af41580156100f0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101149190610433565b610179565b50505050565b60005460405163046e44af60e11b81526001600160601b0383166004820152610174916001600160a01b0316908590859073__$3bac17678db7ae928afa209f2f44deec9c$__906308dc895e906024016100d3565b505050565b604080516001600160a01b038581166024830152848116604483015260648083018590528351808403909101815260849092019092526020810180516001600160e01b03166323b872dd60e01b179052610119918691906000906101df90841683610232565b90508051600014158015610204575080806020019051810190610202919061044c565b155b1561017457604051635274afe760e01b81526001600160a01b03841660048201526024015b60405180910390fd5b606061024083836000610247565b9392505050565b60608147101561026c5760405163cd78605960e01b8152306004820152602401610229565b600080856001600160a01b03168486604051610288919061046e565b60006040518083038185875af1925050503d80600081146102c5576040519150601f19603f3d011682016040523d82523d6000602084013e6102ca565b606091505b50915091506102da8683836102e4565b9695505050505050565b6060826102f9576102f482610340565b610240565b815115801561031057506001600160a01b0384163b155b1561033957604051639996b31560e01b81526001600160a01b0385166004820152602401610229565b5080610240565b8051156103505780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b80356001600160a01b038116811461038057600080fd5b919050565b80356001600160601b038116811461038057600080fd5b600080600080608085870312156103b257600080fd5b6103bb85610369565b93506103c960208601610369565b92506103d760408601610369565b91506103e560608601610385565b905092959194509250565b60008060006060848603121561040557600080fd5b61040e84610369565b925061041c60208501610369565b915061042a60408501610385565b90509250925092565b60006020828403121561044557600080fd5b5051919050565b60006020828403121561045e57600080fd5b8151801515811461024057600080fd5b6000825160005b8181101561048f5760208186018101518583015201610475565b50600092019182525091905056fea2646970667358221220eb04c800cd7fb952dfc497be4a1382ec67eeeb44081b5de36c56ea019dd3241f64736f6c63430008140033",
+  "linkReferences": {
+    "contracts/type/Amount.sol": {
+      "AmountLib": [
+        {
+          "length": 20,
+          "start": 328
+        },
+        {
+          "length": 20,
+          "start": 485
+        }
+      ]
+    }
+  },
+  "deployedLinkReferences": {
+    "contracts/type/Amount.sol": {
+      "AmountLib": [
+        {
+          "length": 20,
+          "start": 181
+        },
+        {
+          "length": 20,
+          "start": 338
+        }
+      ]
+    }
+  }
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/513944a18d93e005314a3ed93f91d5cd.json"
+  "buildInfo": "../../../build-info/66b888b9920d1d1f6002878b18a10a0a.json"
 }