@etherisc/gif-next 0.0.2-ce8407f-016 → 0.0.2-ceb30b2-601

package/contracts/types/UFixed.sol

@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
+pragma solidity ^0.8.20;
 
 /// @dev UFixed is a fixed point number with 18 decimals precision.
 type UFixed is uint256;
@@ -16,9 +14,16 @@ using {
     ltUFixed as <,
     lteUFixed as <=,
     eqUFixed as ==,
-    UFixedMathLib.toInt
+    neUFixed as !=,
+    UFixedLib.toInt,
+    UFixedLib.gtz
 } for UFixed global;
 
+// TODO move to UFixedLib and rename to zero()
+function zeroUFixed() pure returns (UFixed zero) {
+    return UFixed.wrap(0);
+}
+
 function addUFixed(UFixed a, UFixed b) pure returns (UFixed) {
     return UFixed.wrap(UFixed.unwrap(a) + UFixed.unwrap(b));
 }
@@ -30,14 +35,14 @@ function subUFixed(UFixed a, UFixed b) pure returns (UFixed) {
 
 function mulUFixed(UFixed a, UFixed b) pure returns (UFixed) {
     return
-        UFixed.wrap(Math.mulDiv(UFixed.unwrap(a), UFixed.unwrap(b), 10 ** 18));
+        UFixed.wrap(MathLib.mulDiv(UFixed.unwrap(a), UFixed.unwrap(b), 10 ** 18));
 }
 
 function divUFixed(UFixed a, UFixed b) pure returns (UFixed) {
     require(UFixed.unwrap(b) > 0, "ERROR:UFM-020:DIVISOR_ZERO");
 
     return
-        UFixed.wrap(Math.mulDiv(UFixed.unwrap(a), 10 ** 18, UFixed.unwrap(b)));
+        UFixed.wrap(MathLib.mulDiv(UFixed.unwrap(a), 10 ** 18, UFixed.unwrap(b)));
 }
 
 function gtUFixed(UFixed a, UFixed b) pure returns (bool isGreaterThan) {
@@ -60,6 +65,10 @@ function eqUFixed(UFixed a, UFixed b) pure returns (bool isEqual) {
     return UFixed.unwrap(a) == UFixed.unwrap(b);
 }
 
+function neUFixed(UFixed a, UFixed b) pure returns (bool isEqual) {
+    return UFixed.unwrap(a) != UFixed.unwrap(b);
+}
+
 function gtzUFixed(UFixed a) pure returns (bool isZero) {
     return UFixed.unwrap(a) > 0;
 }
@@ -76,7 +85,115 @@ function deltaUFixed(UFixed a, UFixed b) pure returns (UFixed) {
     return b - a;
 }
 
-library UFixedMathLib {
+/// @dev copied from https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.9.3/contracts/utils/math/Math.sol
+library MathLib {
+
+    enum Rounding {
+        Down, // Toward negative infinity
+        Up, // Toward infinity
+        Zero // Toward zero
+    }
+
+    /**
+     * @notice Calculates floor(x * y / denominator) with full precision. Throws if result overflows a uint256 or denominator == 0
+     * @dev Original credit to Remco Bloemen under MIT license (https://xn--2-umb.com/21/muldiv)
+     * with further edits by Uniswap Labs also under MIT license.
+     */
+    function mulDiv(uint256 x, uint256 y, uint256 denominator) internal pure returns (uint256 result) {
+        unchecked {
+            // 512-bit multiply [prod1 prod0] = x * y. Compute the product mod 2^256 and mod 2^256 - 1, then use
+            // use the Chinese Remainder Theorem to reconstruct the 512 bit result. The result is stored in two 256
+            // variables such that product = prod1 * 2^256 + prod0.
+            uint256 prod0; // Least significant 256 bits of the product
+            uint256 prod1; // Most significant 256 bits of the product
+            assembly {
+                let mm := mulmod(x, y, not(0))
+                prod0 := mul(x, y)
+                prod1 := sub(sub(mm, prod0), lt(mm, prod0))
+            }
+
+            // Handle non-overflow cases, 256 by 256 division.
+            if (prod1 == 0) {
+                // Solidity will revert if denominator == 0, unlike the div opcode on its own.
+                // The surrounding unchecked block does not change this fact.
+                // See https://docs.soliditylang.org/en/latest/control-structures.html#checked-or-unchecked-arithmetic.
+                return prod0 / denominator;
+            }
+
+            // Make sure the result is less than 2^256. Also prevents denominator == 0.
+            require(denominator > prod1, "Math: mulDiv overflow");
+
+            ///////////////////////////////////////////////
+            // 512 by 256 division.
+            ///////////////////////////////////////////////
+
+            // Make division exact by subtracting the remainder from [prod1 prod0].
+            uint256 remainder;
+            assembly {
+                // Compute remainder using mulmod.
+                remainder := mulmod(x, y, denominator)
+
+                // Subtract 256 bit number from 512 bit number.
+                prod1 := sub(prod1, gt(remainder, prod0))
+                prod0 := sub(prod0, remainder)
+            }
+
+            // Factor powers of two out of denominator and compute largest power of two divisor of denominator. Always >= 1.
+            // See https://cs.stackexchange.com/q/138556/92363.
+
+            // Does not overflow because the denominator cannot be zero at this stage in the function.
+            uint256 twos = denominator & (~denominator + 1);
+            assembly {
+                // Divide denominator by twos.
+                denominator := div(denominator, twos)
+
+                // Divide [prod1 prod0] by twos.
+                prod0 := div(prod0, twos)
+
+                // Flip twos such that it is 2^256 / twos. If twos is zero, then it becomes one.
+                twos := add(div(sub(0, twos), twos), 1)
+            }
+
+            // Shift in bits from prod1 into prod0.
+            prod0 |= prod1 * twos;
+
+            // Invert denominator mod 2^256. Now that denominator is an odd number, it has an inverse modulo 2^256 such
+            // that denominator * inv = 1 mod 2^256. Compute the inverse by starting with a seed that is correct for
+            // four bits. That is, denominator * inv = 1 mod 2^4.
+            uint256 inverse = (3 * denominator) ^ 2;
+
+            // Use the Newton-Raphson iteration to improve the precision. Thanks to Hensel's lifting lemma, this also works
+            // in modular arithmetic, doubling the correct bits in each step.
+            inverse *= 2 - denominator * inverse; // inverse mod 2^8
+            inverse *= 2 - denominator * inverse; // inverse mod 2^16
+            inverse *= 2 - denominator * inverse; // inverse mod 2^32
+            inverse *= 2 - denominator * inverse; // inverse mod 2^64
+            inverse *= 2 - denominator * inverse; // inverse mod 2^128
+            inverse *= 2 - denominator * inverse; // inverse mod 2^256
+
+            // Because the division is now exact we can divide by multiplying with the modular inverse of denominator.
+            // This will give us the correct result modulo 2^256. Since the preconditions guarantee that the outcome is
+            // less than 2^256, this is the final result. We don't need to compute the high bits of the result and prod1
+            // is no longer required.
+            result = prod0 * inverse;
+            return result;
+        }
+    }
+
+    /**
+     * @notice Calculates x * y / denominator with full precision, following the selected rounding direction.
+     */
+    function mulDiv(uint256 x, uint256 y, uint256 denominator, Rounding rounding) internal pure returns (uint256) {
+        uint256 result = mulDiv(x, y, denominator);
+        if (rounding == Rounding.Up && mulmod(x, y, denominator) > 0) {
+            result += 1;
+        }
+        return result;
+    }
+
+}
+
+library UFixedLib {
     int8 public constant EXP = 18;
     uint256 public constant MULTIPLIER = 10 ** uint256(int256(EXP));
     uint256 public constant MULTIPLIER_HALF = MULTIPLIER / 2;
@@ -123,23 +240,23 @@ library UFixedMathLib {
     function toIntWithRounding(UFixed a, uint8 rounding) public pure returns (uint256) {
         if (rounding == ROUNDING_HALF_UP()) {
             return
-                Math.mulDiv(
+                MathLib.mulDiv(
                     UFixed.unwrap(a) + MULTIPLIER_HALF,
                     1,
                     MULTIPLIER,
-                    Math.Rounding.Down
+                    MathLib.Rounding.Down
                 );
         } else if (rounding == ROUNDING_DOWN()) {
             return
-                Math.mulDiv(
+                MathLib.mulDiv(
                     UFixed.unwrap(a),
                     1,
                     MULTIPLIER,
-                    Math.Rounding.Down
+                    MathLib.Rounding.Down
                 );
         } else {
             return
-                Math.mulDiv(UFixed.unwrap(a), 1, MULTIPLIER, Math.Rounding.Up);
+                MathLib.mulDiv(UFixed.unwrap(a), 1, MULTIPLIER, MathLib.Rounding.Up);
         }
     }
 

package/contracts/types/Version.sol

@@ -6,15 +6,18 @@ type VersionPart is uint8;
 using {
     versionPartGt as >,
     versionPartEq as ==,
+    versionPartNe as !=,
     VersionPartLib.toInt
 }
     for VersionPart global;
 
 function versionPartGt(VersionPart a, VersionPart b) pure returns(bool isGreaterThan) { return VersionPart.unwrap(a) > VersionPart.unwrap(b); }
 function versionPartEq(VersionPart a, VersionPart b) pure returns(bool isSame) { return VersionPart.unwrap(a) == VersionPart.unwrap(b); }
+function versionPartNe(VersionPart a, VersionPart b) pure returns(bool isSame) { return VersionPart.unwrap(a) != VersionPart.unwrap(b); }
 
 library VersionPartLib {
-    function toInt(VersionPart x) external pure returns(uint) { return VersionPart.unwrap(x); }
+    function toInt(VersionPart a) external pure returns(uint) { return VersionPart.unwrap(a); }
+    function toVersionPart(uint256 a) external pure returns(VersionPart) { return VersionPart.wrap(uint8(a)); }
 }
 
 type Version is uint24; // contains major,minor,patch version parts
@@ -98,6 +101,7 @@ library VersionLib {
         return Version.wrap(uint24(versionNumber));
     }
 
+    // TODO rename to zero()
     function zeroVersion() external pure returns(Version) {
         return Version.wrap(0);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etherisc/gif-next",
-  "version": "0.0.2-ce8407f-016",
+  "version": "0.0.2-ceb30b2-601",
   "description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
   "main": "index.js",
   "scripts": {
@@ -32,8 +32,8 @@
     "@nomicfoundation/hardhat-foundry": "^1.1.1",
     "@nomicfoundation/hardhat-toolbox": "^3.0.0",
     "@nomicfoundation/hardhat-verify": "^1.1.1",
-    "@typescript-eslint/eslint-plugin": "^6.7.2",
-    "@typescript-eslint/parser": "^6.7.2",
+    "@typescript-eslint/eslint-plugin": "^7.1.0",
+    "@typescript-eslint/parser": "^7.1.0",
     "dotenv": "^16.3.1",
     "eslint": "^8.50.0",
     "hardhat": "^2.17.2",
@@ -42,10 +42,11 @@
     "typescript": "^5"
   },
   "dependencies": {
-    "@openzeppelin/contracts": "^4.9.3",
-    "@openzeppelin/contracts-upgradeable": "^4.9.3",
+    "@openzeppelin/contracts": "5.0.0",
+    "@openzeppelin/contracts-upgradeable": "5.0.0",
     "abi-coder": "^5.0.0",
     "ethers": "^6.7.1",
+    "solidity-docgen": "^0.6.0-beta.36",
     "winston": "^3.10.0"
   }
 }

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

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

package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json

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

package/artifacts/contracts/experiment/errors/Require.sol/Require.json

@@ -1,105 +0,0 @@
-{
-  "_format": "hh-sol-artifact-1",
-  "contractName": "Require",
-  "sourceName": "contracts/experiment/errors/Require.sol",
-  "abi": [
-    {
-      "inputs": [],
-      "stateMutability": "nonpayable",
-      "type": "constructor"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "a",
-          "type": "uint256"
-        },
-        {
-          "internalType": "uint256",
-          "name": "b",
-          "type": "uint256"
-        }
-      ],
-      "name": "AsmallerThanB_L",
-      "type": "error"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "a",
-          "type": "uint256"
-        }
-      ],
-      "name": "AsmallerThanB_M",
-      "type": "error"
-    },
-    {
-      "inputs": [],
-      "name": "AsmallerThanB_S",
-      "type": "error"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "a",
-          "type": "uint256"
-        }
-      ],
-      "name": "isAlargerThanBRequire_L",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "isLarger",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "a",
-          "type": "uint256"
-        }
-      ],
-      "name": "isAlargerThanBRequire_M",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "isLarger",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "a",
-          "type": "uint256"
-        }
-      ],
-      "name": "isAlargerThanBRequire_S",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "isLarger",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50602a6000556101df806100256000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c806342bf62e0146100465780638db581aa1461006d57806394977ddd14610080575b600080fd5b610059610054366004610190565b610093565b604051901515815260200160405180910390f35b61005961007b366004610190565b6100f2565b61005961008e366004610190565b610134565b6000805482116100ea5760405162461bcd60e51b815260206004820152601a60248201527f4552524f523a4142432d3030323a415f49535f534d414c4c455200000000000060448201526064015b60405180910390fd5b506001919050565b6000805482116100ea5760405162461bcd60e51b815260206004820152600d60248201526c4552524f523a4142432d30303160981b60448201526064016100e1565b6000805482116100ea5760405162461bcd60e51b815260206004820152602160248201527f4552524f523a4142432d3030333a415f49535f534d414c4c45525f5448414e5f6044820152602160f91b60648201526084016100e1565b6000602082840312156101a257600080fd5b503591905056fea2646970667358221220572bbc4b1e30046ddb065771b03fa96e34255214cd346e350172d87d56991ba064736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c806342bf62e0146100465780638db581aa1461006d57806394977ddd14610080575b600080fd5b610059610054366004610190565b610093565b604051901515815260200160405180910390f35b61005961007b366004610190565b6100f2565b61005961008e366004610190565b610134565b6000805482116100ea5760405162461bcd60e51b815260206004820152601a60248201527f4552524f523a4142432d3030323a415f49535f534d414c4c455200000000000060448201526064015b60405180910390fd5b506001919050565b6000805482116100ea5760405162461bcd60e51b815260206004820152600d60248201526c4552524f523a4142432d30303160981b60448201526064016100e1565b6000805482116100ea5760405162461bcd60e51b815260206004820152602160248201527f4552524f523a4142432d3030333a415f49535f534d414c4c45525f5448414e5f6044820152602160f91b60648201526084016100e1565b6000602082840312156101a257600080fd5b503591905056fea2646970667358221220572bbc4b1e30046ddb065771b03fa96e34255214cd346e350172d87d56991ba064736f6c63430008140033",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
-}

package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json

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

package/artifacts/contracts/experiment/errors/Revert.sol/Revert.json

@@ -1,105 +0,0 @@
-{
-  "_format": "hh-sol-artifact-1",
-  "contractName": "Revert",
-  "sourceName": "contracts/experiment/errors/Revert.sol",
-  "abi": [
-    {
-      "inputs": [],
-      "stateMutability": "nonpayable",
-      "type": "constructor"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "a",
-          "type": "uint256"
-        },
-        {
-          "internalType": "uint256",
-          "name": "b",
-          "type": "uint256"
-        }
-      ],
-      "name": "AsmallerThanB_L",
-      "type": "error"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "a",
-          "type": "uint256"
-        }
-      ],
-      "name": "AsmallerThanB_M",
-      "type": "error"
-    },
-    {
-      "inputs": [],
-      "name": "AsmallerThanB_S",
-      "type": "error"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "a",
-          "type": "uint256"
-        }
-      ],
-      "name": "isAlargerThanBRevert_L",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "isLarger",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "a",
-          "type": "uint256"
-        }
-      ],
-      "name": "isAlargerThanBRevert_M",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "isLarger",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "a",
-          "type": "uint256"
-        }
-      ],
-      "name": "isAlargerThanBRevert_S",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "isLarger",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50602a60005561016d806100256000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c806312eee592146100465780638997f3ee1461006d578063d0e7624f14610080575b600080fd5b61005961005436600461011e565b610093565b604051901515815260200160405180910390f35b61005961007b36600461011e565b6100d5565b61005961008e36600461011e565b6100fb565b6000805482116100cd5760005460405163b0d3ec1d60e01b81526100c4918491600401918252602082015260400190565b60405180910390fd5b506001919050565b6000805482116100cd576040516309f81e2f60e21b8152600481018390526024016100c4565b6000805482116100cd576040516306b3487560e31b815260040160405180910390fd5b60006020828403121561013057600080fd5b503591905056fea2646970667358221220971ee831490ff41fe8f688c6304beb1d7f3abc7460ef1bce5fe4620a30a6068364736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c806312eee592146100465780638997f3ee1461006d578063d0e7624f14610080575b600080fd5b61005961005436600461011e565b610093565b604051901515815260200160405180910390f35b61005961007b36600461011e565b6100d5565b61005961008e36600461011e565b6100fb565b6000805482116100cd5760005460405163b0d3ec1d60e01b81526100c4918491600401918252602082015260400190565b60405180910390fd5b506001919050565b6000805482116100cd576040516309f81e2f60e21b8152600481018390526024016100c4565b6000805482116100cd576040516306b3487560e31b815260040160405180910390fd5b60006020828403121561013057600080fd5b503591905056fea2646970667358221220971ee831490ff41fe8f688c6304beb1d7f3abc7460ef1bce5fe4620a30a6068364736f6c63430008140033",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
-}

package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json

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

package/artifacts/contracts/experiment/inheritance/A.sol/A.json

@@ -1,128 +0,0 @@
-{
-  "_format": "hh-sol-artifact-1",
-  "contractName": "A",
-  "sourceName": "contracts/experiment/inheritance/A.sol",
-  "abi": [
-    {
-      "inputs": [],
-      "name": "getA",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getAfromB",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getAfromC",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getB",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getBfromC",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getC",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "newA",
-          "type": "uint256"
-        }
-      ],
-      "name": "setA",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "newB",
-          "type": "uint256"
-        }
-      ],
-      "name": "setB",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "newC",
-          "type": "uint256"
-        }
-      ],
-      "name": "setC",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50602a60005560018055600280556102488061002d6000396000f3fe608060405234801561001057600080fd5b50600436106100935760003560e01c8063d46300fd11610066578063d46300fd146100d3578063d4febc86146100db578063e2c11f20146100db578063ee919d50146100e3578063eeb4914e146100f657600080fd5b806309cdcf9b14610098578063a1c51915146100ad578063a2375d1e146100c3578063b9c23ae9146100cb575b600080fd5b6100ab6100a63660046101e0565b600155565b005b6001545b60405190815260200160405180910390f35b6002546100b1565b6100b1610109565b6000546100b1565b6100b1610177565b6100ab6100f13660046101e0565b600055565b6100ab6101043660046101e0565b600255565b600080309050806001600160a01b031663a1c519156040518163ffffffff1660e01b8152600401602060405180830381865afa15801561014d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061017191906101f9565b91505090565b6000306001600160a01b031663d46300fd6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156101b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101db91906101f9565b905090565b6000602082840312156101f257600080fd5b5035919050565b60006020828403121561020b57600080fd5b505191905056fea26469706673582212209f0222d418abde01d04d1e182c58ee620abbe0d402c527a3397b73f7c260f81b64736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100935760003560e01c8063d46300fd11610066578063d46300fd146100d3578063d4febc86146100db578063e2c11f20146100db578063ee919d50146100e3578063eeb4914e146100f657600080fd5b806309cdcf9b14610098578063a1c51915146100ad578063a2375d1e146100c3578063b9c23ae9146100cb575b600080fd5b6100ab6100a63660046101e0565b600155565b005b6001545b60405190815260200160405180910390f35b6002546100b1565b6100b1610109565b6000546100b1565b6100b1610177565b6100ab6100f13660046101e0565b600055565b6100ab6101043660046101e0565b600255565b600080309050806001600160a01b031663a1c519156040518163ffffffff1660e01b8152600401602060405180830381865afa15801561014d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061017191906101f9565b91505090565b6000306001600160a01b031663d46300fd6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156101b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101db91906101f9565b905090565b6000602082840312156101f257600080fd5b5035919050565b60006020828403121561020b57600080fd5b505191905056fea26469706673582212209f0222d418abde01d04d1e182c58ee620abbe0d402c527a3397b73f7c260f81b64736f6c63430008140033",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
-}

package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json

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

package/artifacts/contracts/experiment/inheritance/A.sol/AShared.json

@@ -1,42 +0,0 @@
-{
-  "_format": "hh-sol-artifact-1",
-  "contractName": "AShared",
-  "sourceName": "contracts/experiment/inheritance/A.sol",
-  "abi": [
-    {
-      "inputs": [],
-      "stateMutability": "nonpayable",
-      "type": "constructor"
-    },
-    {
-      "inputs": [],
-      "name": "getA",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "newA",
-          "type": "uint256"
-        }
-      ],
-      "name": "setA",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b50602a60005560ac806100246000396000f3fe6080604052348015600f57600080fd5b506004361060325760003560e01c8063d46300fd146037578063ee919d5014604c575b600080fd5b60005460405190815260200160405180910390f35b605c6057366004605e565b600055565b005b600060208284031215606f57600080fd5b503591905056fea26469706673582212205368bc3fa78bd92d791aba3d469035cccfe59767c9c43ee03454d08de90a6d5264736f6c63430008140033",
-  "deployedBytecode": "0x6080604052348015600f57600080fd5b506004361060325760003560e01c8063d46300fd146037578063ee919d5014604c575b600080fd5b60005460405190815260200160405180910390f35b605c6057366004605e565b600055565b005b600060208284031215606f57600080fd5b503591905056fea26469706673582212205368bc3fa78bd92d791aba3d469035cccfe59767c9c43ee03454d08de90a6d5264736f6c63430008140033",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
-}