@etherisc/gif-next 0.0.2-e20063b-144 → 0.0.2-e2a1510-528

package/artifacts/contracts/{instance/service → distribution}/IDistributionService.sol/IDistributionService.json

@@ -1,7 +1,7 @@
 {
   "_format": "hh-sol-artifact-1",
   "contractName": "IDistributionService",
-  "sourceName": "contracts/instance/service/IDistributionService.sol",
+  "sourceName": "contracts/distribution/IDistributionService.sol",
   "abi": [
     {
       "inputs": [
@@ -55,28 +55,54 @@
     {
       "inputs": [
         {
-          "internalType": "address",
-          "name": "caller",
-          "type": "address"
+          "internalType": "Amount",
+          "name": "amount",
+          "type": "uint96"
+        },
+        {
+          "internalType": "Amount",
+          "name": "limit",
+          "type": "uint96"
         }
       ],
-      "name": "ErrorIDistributionServiceCallerNotDistributor",
+      "name": "ErrorDistributionServiceCommissionWithdrawAmountExceedsLimit",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "ErrorDistributionServiceCommissionWithdrawAmountIsZero",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "Amount",
+          "name": "transferredDistributionFeeAmount",
+          "type": "uint96"
+        },
+        {
+          "internalType": "Amount",
+          "name": "expectedDistributionFeeAmount",
+          "type": "uint96"
+        }
+      ],
+      "name": "ErrorDistributionServiceInvalidFeeTransferred",
       "type": "error"
     },
     {
       "inputs": [
         {
           "internalType": "uint256",
-          "name": "commissionPercentage",
+          "name": "maxDiscountPercentage",
           "type": "uint256"
         },
         {
           "internalType": "uint256",
-          "name": "maxCommissionPercentage",
+          "name": "limit",
           "type": "uint256"
         }
       ],
-      "name": "ErrorIDistributionServiceCommissionTooHigh",
+      "name": "ErrorDistributionServiceMaxDiscountTooHigh",
       "type": "error"
     },
     {
@@ -88,106 +114,123 @@
         },
         {
           "internalType": "uint256",
-          "name": "discountPercentage",
+          "name": "limit",
           "type": "uint256"
         }
       ],
-      "name": "ErrorIDistributionServiceDiscountTooHigh",
+      "name": "ErrorDistributionServiceVariableFeesTooHight",
       "type": "error"
     },
     {
       "inputs": [
+        {
+          "internalType": "address",
+          "name": "wallet",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "tokenHandler",
+          "type": "address"
+        },
         {
           "internalType": "uint256",
-          "name": "minDiscountPercentage",
+          "name": "allowance",
           "type": "uint256"
         },
         {
           "internalType": "uint256",
-          "name": "discountPercentage",
+          "name": "amount",
           "type": "uint256"
         }
       ],
-      "name": "ErrorIDistributionServiceDiscountTooLow",
+      "name": "ErrorDistributionServiceWalletAllowanceTooSmall",
       "type": "error"
     },
     {
       "inputs": [
         {
-          "internalType": "Timestamp",
-          "name": "expiryAt",
-          "type": "uint40"
+          "internalType": "address",
+          "name": "caller",
+          "type": "address"
         }
       ],
-      "name": "ErrorIDistributionServiceExpirationInvalid",
+      "name": "ErrorIDistributionServiceCallerNotDistributor",
       "type": "error"
     },
     {
       "inputs": [
         {
           "internalType": "uint256",
-          "name": "maxReferralLifetime",
+          "name": "commissionPercentage",
           "type": "uint256"
         },
         {
           "internalType": "uint256",
-          "name": "expiryAt",
+          "name": "maxCommissionPercentage",
           "type": "uint256"
         }
       ],
-      "name": "ErrorIDistributionServiceExpiryTooLong",
+      "name": "ErrorIDistributionServiceCommissionTooHigh",
       "type": "error"
     },
     {
       "inputs": [
         {
           "internalType": "uint256",
-          "name": "distributionFeeFixAmount",
-          "type": "uint256"
-        },
-        {
-          "internalType": "uint256",
-          "name": "distributionFeeVarAmount",
+          "name": "maxDiscountPercentage",
           "type": "uint256"
         },
         {
           "internalType": "uint256",
-          "name": "distributionOwnerFeeFixAmount",
+          "name": "discountPercentage",
           "type": "uint256"
-        },
+        }
+      ],
+      "name": "ErrorIDistributionServiceDiscountTooHigh",
+      "type": "error"
+    },
+    {
+      "inputs": [
         {
           "internalType": "uint256",
-          "name": "distributionOwnerFeeVarAmount",
+          "name": "minDiscountPercentage",
           "type": "uint256"
         },
         {
           "internalType": "uint256",
-          "name": "commissionAmount",
+          "name": "discountPercentage",
           "type": "uint256"
-        },
+        }
+      ],
+      "name": "ErrorIDistributionServiceDiscountTooLow",
+      "type": "error"
+    },
+    {
+      "inputs": [
         {
-          "internalType": "uint256",
-          "name": "discountAmount",
-          "type": "uint256"
+          "internalType": "Timestamp",
+          "name": "expiryAt",
+          "type": "uint40"
         }
       ],
-      "name": "ErrorIDistributionServiceFeeCalculationMismatch",
+      "name": "ErrorIDistributionServiceExpirationInvalid",
       "type": "error"
     },
     {
       "inputs": [
         {
           "internalType": "uint256",
-          "name": "transferredDistributionFeeAmount",
+          "name": "maxReferralLifetime",
           "type": "uint256"
         },
         {
           "internalType": "uint256",
-          "name": "expectedDistributionFeeAmount",
+          "name": "expiryAt",
           "type": "uint256"
         }
       ],
-      "name": "ErrorIDistributionServiceInvalidFeeTransferred",
+      "name": "ErrorIDistributionServiceExpiryTooLong",
       "type": "error"
     },
     {
@@ -212,22 +255,6 @@
       "name": "ErrorIDistributionServiceInvalidReferralId",
       "type": "error"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "maxDiscountPercentage",
-          "type": "uint256"
-        },
-        {
-          "internalType": "uint256",
-          "name": "limit",
-          "type": "uint256"
-        }
-      ],
-      "name": "ErrorIDistributionServiceMaxDiscountTooHigh",
-      "type": "error"
-    },
     {
       "inputs": [
         {
@@ -336,6 +363,11 @@
       "name": "ErrorNotRegistry",
       "type": "error"
     },
+    {
+      "inputs": [],
+      "name": "ErrorServiceNotImplemented",
+      "type": "error"
+    },
     {
       "anonymous": false,
       "inputs": [
@@ -350,196 +382,44 @@
       "type": "event"
     },
     {
-      "inputs": [],
-      "name": "authority",
-      "outputs": [
-        {
-          "internalType": "address",
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
+      "anonymous": false,
       "inputs": [
         {
+          "indexed": false,
           "internalType": "NftId",
-          "name": "distributionNftId",
+          "name": "distributorNftId",
           "type": "uint96"
         },
         {
-          "internalType": "ReferralId",
-          "name": "referralId",
-          "type": "bytes8"
+          "indexed": false,
+          "internalType": "address",
+          "name": "recipient",
+          "type": "address"
         },
         {
-          "components": [
-            {
-              "internalType": "uint256",
-              "name": "netPremiumAmount",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "fullPremiumAmount",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "premiumAmount",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "productFeeFixAmount",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "poolFeeFixAmount",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "bundleFeeFixAmount",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "distributionFeeFixAmount",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "productFeeVarAmount",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "poolFeeVarAmount",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "bundleFeeVarAmount",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "distributionFeeVarAmount",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "distributionOwnerFeeFixAmount",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "distributionOwnerFeeVarAmount",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "commissionAmount",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "discountAmount",
-              "type": "uint256"
-            }
-          ],
-          "internalType": "struct IPolicy.Premium",
-          "name": "premium",
-          "type": "tuple"
+          "indexed": false,
+          "internalType": "address",
+          "name": "tokenAddress",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "Amount",
+          "name": "amount",
+          "type": "uint96"
         }
       ],
-      "name": "calculateFeeAmount",
+      "name": "LogDistributionServiceCommissionWithdrawn",
+      "type": "event"
+    },
+    {
+      "inputs": [],
+      "name": "authority",
       "outputs": [
         {
-          "components": [
-            {
-              "internalType": "uint256",
-              "name": "netPremiumAmount",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "fullPremiumAmount",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "premiumAmount",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "productFeeFixAmount",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "poolFeeFixAmount",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "bundleFeeFixAmount",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "distributionFeeFixAmount",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "productFeeVarAmount",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "poolFeeVarAmount",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "bundleFeeVarAmount",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "distributionFeeVarAmount",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "distributionOwnerFeeFixAmount",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "distributionOwnerFeeVarAmount",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "commissionAmount",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "discountAmount",
-              "type": "uint256"
-            }
-          ],
-          "internalType": "struct IPolicy.Premium",
-          "name": "finalPremium",
-          "type": "tuple"
+          "internalType": "address",
+          "name": "",
+          "type": "address"
         }
       ],
       "stateMutability": "view",
@@ -781,15 +661,15 @@
     },
     {
       "inputs": [],
-      "name": "getRegistryAddress",
+      "name": "getRoleId",
       "outputs": [
         {
-          "internalType": "address",
-          "name": "",
-          "type": "address"
+          "internalType": "RoleId",
+          "name": "serviceRoleId",
+          "type": "uint64"
         }
       ],
-      "stateMutability": "view",
+      "stateMutability": "pure",
       "type": "function"
     },
     {
@@ -839,7 +719,13 @@
     {
       "inputs": [],
       "name": "linkToRegisteredNftId",
-      "outputs": [],
+      "outputs": [
+        {
+          "internalType": "NftId",
+          "name": "",
+          "type": "uint96"
+        }
+      ],
       "stateMutability": "nonpayable",
       "type": "function"
     },
@@ -857,6 +743,21 @@
         },
         {
           "components": [
+            {
+              "internalType": "Amount",
+              "name": "productFeeAmount",
+              "type": "uint96"
+            },
+            {
+              "internalType": "Amount",
+              "name": "distributionFeeAndCommissionAmount",
+              "type": "uint96"
+            },
+            {
+              "internalType": "Amount",
+              "name": "poolPremiumAndFeeAmount",
+              "type": "uint96"
+            },
             {
               "internalType": "uint256",
               "name": "netPremiumAmount",
@@ -936,11 +837,6 @@
           "internalType": "struct IPolicy.Premium",
           "name": "premium",
           "type": "tuple"
-        },
-        {
-          "internalType": "uint256",
-          "name": "transferredDistributionFeeAmount",
-          "type": "uint256"
         }
       ],
       "name": "processSale",
@@ -985,48 +881,6 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
-    {
-      "inputs": [
-        {
-          "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"
-        }
-      ],
-      "name": "setFees",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
     {
       "inputs": [
         {
@@ -1048,23 +902,13 @@
     },
     {
       "inputs": [
-        {
-          "internalType": "NftId",
-          "name": "distributorNftId",
-          "type": "uint96"
-        },
-        {
-          "internalType": "DistributorType",
-          "name": "distributorType",
-          "type": "bytes8"
-        },
         {
           "internalType": "bytes",
-          "name": "data",
+          "name": "upgradeData",
           "type": "bytes"
         }
       ],
-      "name": "updateDistributorType",
+      "name": "upgradeVersionable",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
@@ -1072,13 +916,24 @@
     {
       "inputs": [
         {
-          "internalType": "bytes",
-          "name": "upgradeData",
-          "type": "bytes"
+          "internalType": "NftId",
+          "name": "distributorNftId",
+          "type": "uint96"
+        },
+        {
+          "internalType": "Amount",
+          "name": "amount",
+          "type": "uint96"
+        }
+      ],
+      "name": "withdrawCommission",
+      "outputs": [
+        {
+          "internalType": "Amount",
+          "name": "withdrawnAmount",
+          "type": "uint96"
         }
       ],
-      "name": "upgradeVersionable",
-      "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
     }

package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json

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