@etherisc/gif-next 0.0.2-9addcc0-107 → 0.0.2-9b58b75-869

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": [
@@ -56,43 +56,64 @@
       "inputs": [
         {
           "internalType": "Amount",
-          "name": "transferredDistributionFeeAmount",
+          "name": "amount",
           "type": "uint96"
         },
         {
           "internalType": "Amount",
-          "name": "expectedDistributionFeeAmount",
+          "name": "limit",
           "type": "uint96"
         }
       ],
-      "name": "ErrorDistributionServiceInvalidFeeTransferred",
+      "name": "ErrorDistributionServiceCommissionWithdrawAmountExceedsLimit",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "ErrorDistributionServiceCommissionWithdrawAmountIsZero",
       "type": "error"
     },
     {
       "inputs": [
         {
-          "internalType": "address",
-          "name": "caller",
-          "type": "address"
+          "internalType": "NftId",
+          "name": "distributorNftId",
+          "type": "uint96"
         }
       ],
-      "name": "ErrorIDistributionServiceCallerNotDistributor",
+      "name": "ErrorDistributionServiceDistributorNotActive",
+      "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"
     },
     {
@@ -104,90 +125,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",
+          "name": "maxDiscountPercentage",
           "type": "uint256"
         },
         {
           "internalType": "uint256",
-          "name": "distributionFeeVarAmount",
+          "name": "discountPercentage",
           "type": "uint256"
-        },
+        }
+      ],
+      "name": "ErrorIDistributionServiceDiscountTooHigh",
+      "type": "error"
+    },
+    {
+      "inputs": [
         {
           "internalType": "uint256",
-          "name": "distributionOwnerFeeFixAmount",
+          "name": "minDiscountPercentage",
           "type": "uint256"
         },
         {
           "internalType": "uint256",
-          "name": "distributionOwnerFeeVarAmount",
+          "name": "discountPercentage",
           "type": "uint256"
-        },
+        }
+      ],
+      "name": "ErrorIDistributionServiceDiscountTooLow",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "Timestamp",
+          "name": "expiryAt",
+          "type": "uint40"
+        }
+      ],
+      "name": "ErrorIDistributionServiceExpirationInvalid",
+      "type": "error"
+    },
+    {
+      "inputs": [
         {
           "internalType": "uint256",
-          "name": "commissionAmount",
+          "name": "maxReferralLifetime",
           "type": "uint256"
         },
         {
           "internalType": "uint256",
-          "name": "discountAmount",
+          "name": "expiryAt",
           "type": "uint256"
         }
       ],
-      "name": "ErrorIDistributionServiceFeeCalculationMismatch",
+      "name": "ErrorIDistributionServiceExpiryTooLong",
       "type": "error"
     },
     {
@@ -212,22 +266,6 @@
       "name": "ErrorIDistributionServiceInvalidReferralId",
       "type": "error"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "maxDiscountPercentage",
-          "type": "uint256"
-        },
-        {
-          "internalType": "uint256",
-          "name": "limit",
-          "type": "uint256"
-        }
-      ],
-      "name": "ErrorIDistributionServiceMaxDiscountTooHigh",
-      "type": "error"
-    },
     {
       "inputs": [
         {
@@ -355,196 +393,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": "distributorAddress",
+          "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",
@@ -784,6 +670,19 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [],
+      "name": "getRoleId",
+      "outputs": [
+        {
+          "internalType": "RoleId",
+          "name": "serviceRoleId",
+          "type": "uint64"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "getVersion",
@@ -831,7 +730,13 @@
     {
       "inputs": [],
       "name": "linkToRegisteredNftId",
-      "outputs": [],
+      "outputs": [
+        {
+          "internalType": "NftId",
+          "name": "",
+          "type": "uint96"
+        }
+      ],
       "stateMutability": "nonpayable",
       "type": "function"
     },
@@ -849,6 +754,21 @@
         },
         {
           "components": [
+            {
+              "internalType": "Amount",
+              "name": "productFeeAmount",
+              "type": "uint96"
+            },
+            {
+              "internalType": "Amount",
+              "name": "distributionFeeAndCommissionAmount",
+              "type": "uint96"
+            },
+            {
+              "internalType": "Amount",
+              "name": "poolPremiumAndFeeAmount",
+              "type": "uint96"
+            },
             {
               "internalType": "uint256",
               "name": "netPremiumAmount",
@@ -928,11 +848,6 @@
           "internalType": "struct IPolicy.Premium",
           "name": "premium",
           "type": "tuple"
-        },
-        {
-          "internalType": "Amount",
-          "name": "transferredDistributionFeeAmount",
-          "type": "uint96"
         }
       ],
       "name": "processSale",
@@ -977,48 +892,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": [
         {
@@ -1050,6 +923,30 @@
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "NftId",
+          "name": "distributorNftId",
+          "type": "uint96"
+        },
+        {
+          "internalType": "Amount",
+          "name": "amount",
+          "type": "uint96"
+        }
+      ],
+      "name": "withdrawCommission",
+      "outputs": [
+        {
+          "internalType": "Amount",
+          "name": "withdrawnAmount",
+          "type": "uint96"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "function"
     }
   ],
   "bytecode": "0x",

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

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