@etherisc/gif-next 0.0.2-edc084c-558 → 0.0.2-edd8f00-238

package/README.md

@@ -68,7 +68,6 @@ The deploy script will deploy all required contracts and create a test instance
 
 ```bash
 # run deployment on a locally created ganache instance
-export SKIP_VERIFICATION=true
 hh run scripts/deploy_all.ts
 ```
 
@@ -79,9 +78,17 @@ hh run scripts/deploy_all.ts
 hh run --network <networkname> scripts/deploy_all.ts
 ```
 
+The deployment will persist deployment information into the files `deployment_state_<chainid>.json`, `libraries_<chainid>.json` and `verification_log_<chainid>.json`. 
+This data can then be used for verification of the deployed contracts on etherscan/polygonscan.
+
+For the verification of the contracts on etherscan/polygonscan the above files (created by previous deployment) are required and then the following command can be used:
+
+```bash
+hh run --network <networkname> scripts/verify_deployment.ts 
+```
+
 Environment variables:
 
-- `SKIP_VERIFICATION` set to `true` to skip etherscan verification (required for ganacht and anvil)
 - `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)
 - `ETHERSCAN_API_KEY` `POLYGONSCAN_API_KEY` the api key for etherscan/polygonscan (required for mumbai and mainnet)
@@ -460,13 +467,14 @@ contracts
     ComponentService.sol
   instance
     Instance.sol
-    InstanceAccessManager.sol
+    InstanceAdmin.sol
     InstanceReader.sol
     InstanceService.sol
     InstanceServiceManager.sol
   registry
     ChainNft.sol
     Registry.sol
+    RegistryAdmin.sol
     RegistryService.sol
     RegistryServiceManager.sol
   shared

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

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

package/artifacts/contracts/{components → distribution}/Distribution.sol/Distribution.json

@@ -1,7 +1,7 @@
 {
   "_format": "hh-sol-artifact-1",
   "contractName": "Distribution",
-  "sourceName": "contracts/components/Distribution.sol",
+  "sourceName": "contracts/distribution/Distribution.sol",
   "abi": [
     {
       "inputs": [
@@ -63,6 +63,11 @@
       "name": "AddressInsufficientBalance",
       "type": "error"
     },
+    {
+      "inputs": [],
+      "name": "ErrorComponentNameLengthZero",
+      "type": "error"
+    },
     {
       "inputs": [
         {
@@ -101,6 +106,11 @@
       "name": "ErrorComponentProductNftAlreadySet",
       "type": "error"
     },
+    {
+      "inputs": [],
+      "name": "ErrorComponentTokenAddressZero",
+      "type": "error"
+    },
     {
       "inputs": [],
       "name": "ErrorComponentWalletAddressIsSameAsCurrent",
@@ -137,6 +147,27 @@
       "name": "ErrorComponentWalletAllowanceTooSmall",
       "type": "error"
     },
+    {
+      "inputs": [],
+      "name": "ErrorComponentWalletNotComponent",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "distributor",
+          "type": "address"
+        },
+        {
+          "internalType": "NftId",
+          "name": "distributorNftId",
+          "type": "uint96"
+        }
+      ],
+      "name": "ErrorDistributionAlreadyDistributor",
+      "type": "error"
+    },
     {
       "inputs": [
         {
@@ -238,6 +269,25 @@
       "name": "Initialized",
       "type": "event"
     },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "token",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "Amount",
+          "name": "limit",
+          "type": "uint96"
+        }
+      ],
+      "name": "LogComponentTokenHandlerApproved",
+      "type": "event"
+    },
     {
       "anonymous": false,
       "inputs": [
@@ -327,6 +377,19 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [],
+      "name": "INSTANCE_LINKED_COMPONENT_LOCATION_V1",
+      "outputs": [
+        {
+          "internalType": "bytes32",
+          "name": "",
+          "type": "bytes32"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "NFT_OWNABLE_STORAGE_LOCATION_V1",
@@ -353,6 +416,37 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "token",
+          "type": "address"
+        },
+        {
+          "internalType": "Amount",
+          "name": "spendingLimitAmount",
+          "type": "uint96"
+        }
+      ],
+      "name": "approveTokenHandler",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "Amount",
+          "name": "spendingLimitAmount",
+          "type": "uint96"
+        }
+      ],
+      "name": "approveTokenHandler",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "authority",
@@ -489,6 +583,11 @@
               "name": "name",
               "type": "string"
             },
+            {
+              "internalType": "NftId",
+              "name": "productNftId",
+              "type": "uint96"
+            },
             {
               "internalType": "contract IERC20Metadata",
               "name": "token",
@@ -504,16 +603,6 @@
               "name": "wallet",
               "type": "address"
             },
-            {
-              "internalType": "Amount",
-              "name": "balanceAmount",
-              "type": "uint96"
-            },
-            {
-              "internalType": "Amount",
-              "name": "feeAmount",
-              "type": "uint96"
-            },
             {
               "internalType": "bytes",
               "name": "data",
@@ -552,31 +641,6 @@
       "stateMutability": "view",
       "type": "function"
     },
-    {
-      "inputs": [],
-      "name": "getDistributionFee",
-      "outputs": [
-        {
-          "components": [
-            {
-              "internalType": "UFixed",
-              "name": "fractionalFee",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "fixedFee",
-              "type": "uint256"
-            }
-          ],
-          "internalType": "struct Fee",
-          "name": "distributionFee",
-          "type": "tuple"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
     {
       "inputs": [
         {
@@ -596,6 +660,51 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [],
+      "name": "getInitialComponentInfo",
+      "outputs": [
+        {
+          "components": [
+            {
+              "internalType": "string",
+              "name": "name",
+              "type": "string"
+            },
+            {
+              "internalType": "NftId",
+              "name": "productNftId",
+              "type": "uint96"
+            },
+            {
+              "internalType": "contract IERC20Metadata",
+              "name": "token",
+              "type": "address"
+            },
+            {
+              "internalType": "contract TokenHandler",
+              "name": "tokenHandler",
+              "type": "address"
+            },
+            {
+              "internalType": "address",
+              "name": "wallet",
+              "type": "address"
+            },
+            {
+              "internalType": "bytes",
+              "name": "data",
+              "type": "bytes"
+            }
+          ],
+          "internalType": "struct IComponents.ComponentInfo",
+          "name": "info",
+          "type": "tuple"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "getInitialInfo",
@@ -745,11 +854,11 @@
     },
     {
       "inputs": [],
-      "name": "getRegistryAddress",
+      "name": "getToken",
       "outputs": [
         {
-          "internalType": "address",
-          "name": "",
+          "internalType": "contract IERC20Metadata",
+          "name": "token",
           "type": "address"
         }
       ],
@@ -758,80 +867,11 @@
     },
     {
       "inputs": [],
-      "name": "getSetupInfo",
+      "name": "getTokenHandler",
       "outputs": [
         {
-          "components": [
-            {
-              "internalType": "NftId",
-              "name": "productNftId",
-              "type": "uint96"
-            },
-            {
-              "internalType": "contract TokenHandler",
-              "name": "tokenHandler",
-              "type": "address"
-            },
-            {
-              "components": [
-                {
-                  "internalType": "UFixed",
-                  "name": "fractionalFee",
-                  "type": "uint256"
-                },
-                {
-                  "internalType": "uint256",
-                  "name": "fixedFee",
-                  "type": "uint256"
-                }
-              ],
-              "internalType": "struct Fee",
-              "name": "minDistributionOwnerFee",
-              "type": "tuple"
-            },
-            {
-              "components": [
-                {
-                  "internalType": "UFixed",
-                  "name": "fractionalFee",
-                  "type": "uint256"
-                },
-                {
-                  "internalType": "uint256",
-                  "name": "fixedFee",
-                  "type": "uint256"
-                }
-              ],
-              "internalType": "struct Fee",
-              "name": "distributionFee",
-              "type": "tuple"
-            },
-            {
-              "internalType": "address",
-              "name": "wallet",
-              "type": "address"
-            },
-            {
-              "internalType": "uint256",
-              "name": "sumDistributionOwnerFees",
-              "type": "uint256"
-            }
-          ],
-          "internalType": "struct ISetup.DistributionSetupInfo",
-          "name": "setupInfo",
-          "type": "tuple"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getToken",
-      "outputs": [
-        {
-          "internalType": "contract IERC20Metadata",
-          "name": "token",
+          "internalType": "contract TokenHandler",
+          "name": "tokenHandler",
           "type": "address"
         }
       ],
@@ -853,6 +893,11 @@
     },
     {
       "inputs": [
+        {
+          "internalType": "address",
+          "name": "authority",
+          "type": "address"
+        },
         {
           "internalType": "address",
           "name": "registry",
@@ -860,7 +905,7 @@
         },
         {
           "internalType": "NftId",
-          "name": "instanceNftId",
+          "name": "parentNftId",
           "type": "uint96"
         },
         {
@@ -892,6 +937,11 @@
           "internalType": "bytes",
           "name": "registryData",
           "type": "bytes"
+        },
+        {
+          "internalType": "bytes",
+          "name": "componentData",
+          "type": "bytes"
         }
       ],
       "name": "initializeComponent",
@@ -911,6 +961,11 @@
           "name": "instanceNftId",
           "type": "uint96"
         },
+        {
+          "internalType": "address",
+          "name": "initialOwner",
+          "type": "address"
+        },
         {
           "internalType": "string",
           "name": "name",
@@ -922,47 +977,13 @@
           "type": "address"
         },
         {
-          "components": [
-            {
-              "internalType": "UFixed",
-              "name": "fractionalFee",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "fixedFee",
-              "type": "uint256"
-            }
-          ],
-          "internalType": "struct Fee",
-          "name": "minDistributionOwnerFee",
-          "type": "tuple"
-        },
-        {
-          "components": [
-            {
-              "internalType": "UFixed",
-              "name": "fractionalFee",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "fixedFee",
-              "type": "uint256"
-            }
-          ],
-          "internalType": "struct Fee",
-          "name": "distributionFee",
-          "type": "tuple"
-        },
-        {
-          "internalType": "address",
-          "name": "initialOwner",
-          "type": "address"
+          "internalType": "bytes",
+          "name": "registryData",
+          "type": "bytes"
         },
         {
           "internalType": "bytes",
-          "name": "registryData",
+          "name": "componentData",
           "type": "bytes"
         }
       ],
@@ -978,6 +999,59 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "registry",
+          "type": "address"
+        },
+        {
+          "internalType": "NftId",
+          "name": "instanceNftId",
+          "type": "uint96"
+        },
+        {
+          "internalType": "string",
+          "name": "name",
+          "type": "string"
+        },
+        {
+          "internalType": "address",
+          "name": "token",
+          "type": "address"
+        },
+        {
+          "internalType": "ObjectType",
+          "name": "componentType",
+          "type": "uint8"
+        },
+        {
+          "internalType": "bool",
+          "name": "isInterceptor",
+          "type": "bool"
+        },
+        {
+          "internalType": "address",
+          "name": "initialOwner",
+          "type": "address"
+        },
+        {
+          "internalType": "bytes",
+          "name": "registryData",
+          "type": "bytes"
+        },
+        {
+          "internalType": "bytes",
+          "name": "componentData",
+          "type": "bytes"
+        }
+      ],
+      "name": "initializeInstanceLinkedComponent",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -1092,6 +1166,19 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [],
+      "name": "isRegistered",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "isVerifying",
@@ -1102,13 +1189,19 @@
           "type": "bool"
         }
       ],
-      "stateMutability": "view",
+      "stateMutability": "pure",
       "type": "function"
     },
     {
       "inputs": [],
       "name": "linkToRegisteredNftId",
-      "outputs": [],
+      "outputs": [
+        {
+          "internalType": "NftId",
+          "name": "nftId",
+          "type": "uint96"
+        }
+      ],
       "stateMutability": "nonpayable",
       "type": "function"
     },
@@ -1178,6 +1271,13 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
+    {
+      "inputs": [],
+      "name": "register",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -1220,7 +1320,7 @@
             }
           ],
           "internalType": "struct Fee",
-          "name": "minDistributionOwnerFee",
+          "name": "distributionFee",
           "type": "tuple"
         },
         {
@@ -1237,7 +1337,7 @@
             }
           ],
           "internalType": "struct Fee",
-          "name": "distributionFee",
+          "name": "minDistributionOwnerFee",
           "type": "tuple"
         }
       ],
@@ -1246,19 +1346,6 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "NftId",
-          "name": "productNftId",
-          "type": "uint96"
-        }
-      ],
-      "name": "setProductNftId",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
     {
       "inputs": [
         {

package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json

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