@etherisc/gif-next 0.0.2-4edd47e-427 → 0.0.2-4f1966f-458

package/README.md

@@ -51,7 +51,7 @@ hh docgen
 The resulting markdown files are written to `docs`
 
 
-### Deployment 
+### Full protocol deployment 
 
 Install the dependencies before running the script below for the first time.
 
@@ -81,6 +81,25 @@ Environment variables:
 - `WALLET_MNEMONIC` the mnemonic of the wallet to use for deployment (required for mumbai and mainnet)
 - `ETHERSCAN_API_KEY` `POLYGONSCAN_API_KEY` the api key for etherscan/polygonscan (required for mumbai and mainnet)
 
+### Create a new instance
+
+Requires previous step to be completed. 
+
+```bash
+# set appropriate values vor env variables (see below)
+
+hh run --network <networkname> scripts/new_instance.ts
+```
+
+Currently an HD wallet is expected to be used for the deployment. The mnemonic of the wallet needs to be provided via the `WALLET_MNEMONIC` environment variable. 
+The instance owner will be the 11th address of the wallet.
+
+Environment variables:
+
+- `WEB3_INFURA_PROJECT_ID` set to infura project id (required for mumbai and mainnet)
+- `WALLET_MNEMONIC` the mnemonic of the wallet to use for deployment (required for mumbai and mainnet)
+- `REGISTRY_ADDRESS` the address of the registry that is already deployed and configured and has a valid master instance
+
 
 ### Console
 
@@ -419,3 +438,46 @@ Distribution Service
 - registered via registry service by registry owner
 - registers distribution components for registered products via registry service by distribution owner (distribution owner role is permissend by the product's instance)
 - registers distributors for registered distribution components via registry service
+
+## Contract Organisation
+
+now 
+
+contracts
+  components
+  instance
+  registry
+  shared
+  types
+
+
+contracts
+  component
+    pool
+      Pool.sol
+      PoolService.sol
+    oracle
+    distribution
+    product
+      Product.sol
+      ProductService.sol
+    Component.sol
+    ComponentService.sol
+  instance
+    Instance.sol
+    InstanceAccessManager.sol
+    InstanceReader.sol
+    InstanceService.sol
+    InstanceServiceManager.sol
+  registry
+    ChainNft.sol
+    Registry.sol
+    RegistryService.sol
+    RegistryServiceManager.sol
+  shared
+    Registerable.sol
+    RegisterableUpgradable.sol
+  type
+    NftId.sol
+    ObjectType.sol
+

package/artifacts/contracts/components/Component.sol/Component.dbg.json

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

package/artifacts/contracts/{instance/service/IComponentOwnerService.sol/IComponentOwnerService.json → components/Component.sol/Component.json}

@@ -1,8 +1,30 @@
 {
   "_format": "hh-sol-artifact-1",
-  "contractName": "IComponentOwnerService",
-  "sourceName": "contracts/instance/service/IComponentOwnerService.sol",
+  "contractName": "Component",
+  "sourceName": "contracts/components/Component.sol",
   "abi": [
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "target",
+          "type": "address"
+        }
+      ],
+      "name": "AddressEmptyCode",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
+        }
+      ],
+      "name": "AddressInsufficientBalance",
+      "type": "error"
+    },
     {
       "inputs": [
         {
@@ -19,6 +41,96 @@
       "name": "ErrorAlreadyLinked",
       "type": "error"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "NftId",
+          "name": "instanceNftId",
+          "type": "uint96"
+        },
+        {
+          "internalType": "address",
+          "name": "instance",
+          "type": "address"
+        }
+      ],
+      "name": "ErrorComponentNotInstance",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "caller",
+          "type": "address"
+        }
+      ],
+      "name": "ErrorComponentNotProductService",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "ErrorComponentProductNftAlreadySet",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "caller",
+          "type": "address"
+        },
+        {
+          "internalType": "uint64",
+          "name": "requiredRoleIdNum",
+          "type": "uint64"
+        }
+      ],
+      "name": "ErrorComponentUnauthorized",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "newWallet",
+          "type": "address"
+        }
+      ],
+      "name": "ErrorComponentWalletAddressIsSameAsCurrent",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "ErrorComponentWalletAddressZero",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "oldWallet",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "newWallet",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "allowance",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "balance",
+          "type": "uint256"
+        }
+      ],
+      "name": "ErrorComponentWalletAllowanceTooSmall",
+      "type": "error"
+    },
     {
       "inputs": [
         {
@@ -52,6 +164,17 @@
       "name": "ErrorNotRegistry",
       "type": "error"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "registryAddress",
+          "type": "address"
+        }
+      ],
+      "name": "ErrorRegisterableNotRegistry",
+      "type": "error"
+    },
     {
       "inputs": [],
       "name": "ErrorRegistryAddressZero",
@@ -73,31 +196,109 @@
       "name": "ErrorRegistryNotInitialized",
       "type": "error"
     },
+    {
+      "inputs": [],
+      "name": "FailedInnerCall",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "InvalidInitialization",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "NotInitializing",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "token",
+          "type": "address"
+        }
+      ],
+      "name": "SafeERC20FailedOperation",
+      "type": "error"
+    },
     {
       "anonymous": false,
       "inputs": [
         {
           "indexed": false,
-          "internalType": "Version",
+          "internalType": "uint64",
           "name": "version",
-          "type": "uint24"
-        },
+          "type": "uint64"
+        }
+      ],
+      "name": "Initialized",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "newWallet",
+          "type": "address"
+        }
+      ],
+      "name": "LogComponentWalletAddressChanged",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
         {
           "indexed": false,
           "internalType": "address",
-          "name": "implementation",
+          "name": "from",
           "type": "address"
         },
         {
           "indexed": false,
           "internalType": "address",
-          "name": "activatedBy",
+          "name": "to",
           "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "amount",
+          "type": "uint256"
         }
       ],
-      "name": "LogVersionableInitialized",
+      "name": "LogComponentWalletTokensTransferred",
       "type": "event"
     },
+    {
+      "inputs": [],
+      "name": "CONTRACT_LOCATION_V1",
+      "outputs": [
+        {
+          "internalType": "bytes32",
+          "name": "",
+          "type": "bytes32"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "REGISTERABLE_LOCATION_V1",
+      "outputs": [
+        {
+          "internalType": "bytes32",
+          "name": "",
+          "type": "bytes32"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "getInitialInfo",
@@ -141,13 +342,8 @@
             }
           ],
           "internalType": "struct IRegistry.ObjectInfo",
-          "name": "",
+          "name": "info",
           "type": "tuple"
-        },
-        {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
         }
       ],
       "stateMutability": "view",
@@ -155,12 +351,12 @@
     },
     {
       "inputs": [],
-      "name": "getInitializedVersion",
+      "name": "getInitialOwner",
       "outputs": [
         {
-          "internalType": "uint64",
+          "internalType": "address",
           "name": "",
-          "type": "uint64"
+          "type": "address"
         }
       ],
       "stateMutability": "view",
@@ -168,12 +364,25 @@
     },
     {
       "inputs": [],
-      "name": "getMajorVersion",
+      "name": "getInstance",
       "outputs": [
         {
-          "internalType": "VersionPart",
-          "name": "majorVersion",
-          "type": "uint8"
+          "internalType": "contract IInstance",
+          "name": "instance",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "getInstanceService",
+      "outputs": [
+        {
+          "internalType": "contract IInstanceService",
+          "name": "",
+          "type": "address"
         }
       ],
       "stateMutability": "view",
@@ -189,7 +398,7 @@
           "type": "string"
         }
       ],
-      "stateMutability": "pure",
+      "stateMutability": "view",
       "type": "function"
     },
     {
@@ -220,63 +429,51 @@
     },
     {
       "inputs": [],
-      "name": "getRegistry",
+      "name": "getProductNftId",
       "outputs": [
         {
-          "internalType": "contract IRegistry",
-          "name": "",
-          "type": "address"
+          "internalType": "NftId",
+          "name": "productNftId",
+          "type": "uint96"
         }
       ],
       "stateMutability": "view",
       "type": "function"
     },
     {
-      "inputs": [
-        {
-          "internalType": "ObjectType",
-          "name": "cType",
-          "type": "uint8"
-        }
-      ],
-      "name": "getRoleForType",
+      "inputs": [],
+      "name": "getProductService",
       "outputs": [
         {
-          "internalType": "RoleId",
-          "name": "role",
-          "type": "uint64"
+          "internalType": "contract IProductService",
+          "name": "",
+          "type": "address"
         }
       ],
-      "stateMutability": "pure",
+      "stateMutability": "view",
       "type": "function"
     },
     {
       "inputs": [],
-      "name": "getVersion",
+      "name": "getRegistry",
       "outputs": [
         {
-          "internalType": "Version",
+          "internalType": "contract IRegistry",
           "name": "",
-          "type": "uint24"
+          "type": "address"
         }
       ],
-      "stateMutability": "pure",
+      "stateMutability": "view",
       "type": "function"
     },
     {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "index",
-          "type": "uint256"
-        }
-      ],
-      "name": "getVersion",
+      "inputs": [],
+      "name": "getToken",
       "outputs": [
         {
-          "internalType": "Version",
-          "name": "version",
-          "type": "uint24"
+          "internalType": "contract IERC20Metadata",
+          "name": "token",
+          "type": "address"
         }
       ],
       "stateMutability": "view",
@@ -284,82 +481,27 @@
     },
     {
       "inputs": [],
-      "name": "getVersionCount",
+      "name": "getWallet",
       "outputs": [
         {
-          "internalType": "uint256",
-          "name": "numberOfVersions",
-          "type": "uint256"
+          "internalType": "address",
+          "name": "walletAddress",
+          "type": "address"
         }
       ],
       "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": "versionInfo",
-          "type": "tuple"
-        }
-      ],
-      "stateMutability": "view",
+      "inputs": [],
+      "name": "linkToRegisteredNftId",
+      "outputs": [],
+      "stateMutability": "nonpayable",
       "type": "function"
     },
     {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "implementation",
-          "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "activatedBy",
-          "type": "address"
-        },
-        {
-          "internalType": "bytes",
-          "name": "activationData",
-          "type": "bytes"
-        }
-      ],
-      "name": "initialize",
+      "inputs": [],
+      "name": "lock",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
@@ -367,25 +509,12 @@
     {
       "inputs": [
         {
-          "internalType": "Version",
-          "name": "version",
-          "type": "uint24"
-        }
-      ],
-      "name": "isInitialized",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
+          "internalType": "NftId",
+          "name": "productNftId",
+          "type": "uint96"
         }
       ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "linkToRegisteredNftId",
+      "name": "setProductNftId",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
@@ -393,12 +522,12 @@
     {
       "inputs": [
         {
-          "internalType": "contract IBaseComponent",
-          "name": "component",
+          "internalType": "address",
+          "name": "newWallet",
           "type": "address"
         }
       ],
-      "name": "lock",
+      "name": "setWallet",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
@@ -423,40 +552,11 @@
       "type": "function"
     },
     {
-      "inputs": [
-        {
-          "internalType": "contract IBaseComponent",
-          "name": "component",
-          "type": "address"
-        }
-      ],
+      "inputs": [],
       "name": "unlock",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "implementation",
-          "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "activatedBy",
-          "type": "address"
-        },
-        {
-          "internalType": "bytes",
-          "name": "upgradeData",
-          "type": "bytes"
-        }
-      ],
-      "name": "upgrade",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
     }
   ],
   "bytecode": "0x",

package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/978366686a0fbaf0b24250ce70a8b08d.json"
+  "buildInfo": "../../../build-info/54de8572979db960acb5b9c1f8a57ee8.json"
 }