@etherisc/gif-next 3.0.0-ee35efe-784 → 3.0.0-f060b81-534

package/contracts/oracle/OracleService.sol

@@ -2,14 +2,16 @@
 pragma solidity ^0.8.20;
 
 import {ContractLib} from "../shared/ContractLib.sol";
+import {IComponent} from "../shared/IComponent.sol";
 import {IInstance} from "../instance/IInstance.sol";
+import {IInstanceService} from "../instance/IInstanceService.sol";
 import {InstanceReader} from "../instance/InstanceReader.sol";
 import {IOracle} from "./IOracle.sol";
 import {IOracleComponent} from "./IOracleComponent.sol";
 import {IOracleService} from "./IOracleService.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
 import {NftId} from "../type/NftId.sol";
-import {ObjectType, ORACLE, PRODUCT} from "../type/ObjectType.sol";
+import {ObjectType, COMPONENT, ORACLE, PRODUCT} from "../type/ObjectType.sol";
 import {RequestId} from "../type/RequestId.sol";
 import {Service} from "../shared/Service.sol";
 import {StateId, ACTIVE, KEEP_STATE, FULFILLED, FAILED, CANCELLED} from "../type/StateId.sol";
@@ -215,84 +217,6 @@ contract OracleService is
         emit LogOracleServiceRequestCancelled(requestId, requesterNftId);
     }
 
-    function activeRequests() 
-        external 
-        view 
-        virtual 
-        returns(uint256 numberOfRequests) 
-    {
-        (
-            IRegistry.ObjectInfo memory info, 
-            address instanceAddress
-        ) = ContractLib.getAndVerifyAnyComponent(
-            getRegistry(), msg.sender, true);
-        IInstance instance = IInstance(instanceAddress);
-
-
-        return instance.getRequestSet().activeRequests(info.nftId);
-    }
-
-    function activeRequestAt(uint256 idx) 
-        external 
-        view 
-        virtual 
-        returns(RequestId requestId) 
-    {
-        (
-            IRegistry.ObjectInfo memory info, 
-            address instanceAddress
-        ) = ContractLib.getAndVerifyAnyComponent(
-            getRegistry(), msg.sender, true);
-        IInstance instance = IInstance(instanceAddress);
-
-        return instance.getRequestSet().activeRequestAt(info.nftId, idx);
-    }
-
-    function isActiveRequest(RequestId requestId) 
-        external 
-        view 
-        virtual 
-        returns(bool isActive) 
-    {
-        (
-            IRegistry.ObjectInfo memory info, 
-            address instanceAddress
-        ) = ContractLib.getAndVerifyAnyComponent(
-            getRegistry(), msg.sender, true);
-        IInstance instance = IInstance(instanceAddress);
-
-        return instance.getRequestSet().contains(info.nftId, requestId);
-    }
-
-    function addRequest(RequestId requestId) 
-        external 
-        virtual 
-        restricted()
-    {
-        (
-            IRegistry.ObjectInfo memory info, 
-            address instanceAddress
-        ) = ContractLib.getAndVerifyAnyComponent(
-            getRegistry(), msg.sender, true);
-        IInstance instance = IInstance(instanceAddress);
-
-        instance.getRequestSet().add(info.nftId, requestId);
-    }
-
-    function removeRequest(RequestId requestId) 
-        external 
-        virtual 
-        restricted()
-    {
-        (
-            IRegistry.ObjectInfo memory info, 
-            address instanceAddress
-        ) = ContractLib.getAndVerifyAnyComponent(
-            getRegistry(), msg.sender, true);
-        IInstance instance = IInstance(instanceAddress);
-
-        instance.getRequestSet().remove(info.nftId, requestId);
-    }
 
     function _checkRequestParams(
         IRegistry registry,

package/contracts/registry/ServiceAuthorizationV3.sol

@@ -308,8 +308,6 @@ contract ServiceAuthorizationV3
           _authorize(functions, IOracleService.respond.selector, "respond");
           _authorize(functions, IOracleService.resend.selector, "resend");
           _authorize(functions, IOracleService.cancel.selector, "cancel");
-          _authorize(functions, IOracleService.addRequest.selector, "addRequest");
-          _authorize(functions, IOracleService.removeRequest.selector, "removeRequest");
      }
 
      function _setupApplicationServiceAuthorization()

package/contracts/type/RequestId.sol

@@ -72,10 +72,4 @@ library RequestIdLib {
     function toKeyId(RequestId id) public pure returns (KeyId keyId) {
         return KeyId.wrap(bytes31(uint248(RequestId.unwrap(id))));
     }
-
-    function toRequestId(KeyId keyId) public pure returns (RequestId requestId) {
-        uint248 keyIdInt = uint248(bytes31(KeyId.unwrap(keyId)));
-        assert(keyIdInt < type(uint64).max);
-        return RequestId.wrap(uint64(keyIdInt));
-    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etherisc/gif-next",
-  "version": "3.0.0-ee35efe-784",
+  "version": "3.0.0-f060b81-534",
   "description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
   "main": "index.js",
   "scripts": {

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

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

package/artifacts/contracts/instance/RequestSet.sol/RequestSet.json

@@ -1,466 +0,0 @@
-{
-  "_format": "hh-sol-artifact-1",
-  "contractName": "RequestSet",
-  "sourceName": "contracts/instance/RequestSet.sol",
-  "abi": [
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "authority",
-          "type": "address"
-        }
-      ],
-      "name": "AccessManagedInvalidAuthority",
-      "type": "error"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "caller",
-          "type": "address"
-        },
-        {
-          "internalType": "uint32",
-          "name": "delay",
-          "type": "uint32"
-        }
-      ],
-      "name": "AccessManagedRequiredDelay",
-      "type": "error"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "caller",
-          "type": "address"
-        }
-      ],
-      "name": "AccessManagedUnauthorized",
-      "type": "error"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "NftId",
-          "name": "instanceNftId",
-          "type": "uint96"
-        }
-      ],
-      "name": "ErrorObjectSetNftIdInvalid",
-      "type": "error"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "NftId",
-          "name": "oracleNftId",
-          "type": "uint96"
-        }
-      ],
-      "name": "ErrorRequestSetOracleNotRegistered",
-      "type": "error"
-    },
-    {
-      "inputs": [],
-      "name": "InvalidInitialization",
-      "type": "error"
-    },
-    {
-      "inputs": [],
-      "name": "NotInitializing",
-      "type": "error"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "authority",
-          "type": "address"
-        }
-      ],
-      "name": "AuthorityUpdated",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "internalType": "uint64",
-          "name": "version",
-          "type": "uint64"
-        }
-      ],
-      "name": "Initialized",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "instance",
-          "type": "address"
-        }
-      ],
-      "name": "LogObjectSetInitialized",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "internalType": "NftId",
-          "name": "oracleNftId",
-          "type": "uint96"
-        },
-        {
-          "indexed": true,
-          "internalType": "RequestId",
-          "name": "requestId",
-          "type": "uint64"
-        }
-      ],
-      "name": "LogRequestSetRequestAdded",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "internalType": "NftId",
-          "name": "oracleNftId",
-          "type": "uint96"
-        },
-        {
-          "indexed": true,
-          "internalType": "RequestId",
-          "name": "requestId",
-          "type": "uint64"
-        }
-      ],
-      "name": "LogRequestSetRequestRemoved",
-      "type": "event"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "NftId",
-          "name": "oracleNftId",
-          "type": "uint96"
-        },
-        {
-          "internalType": "uint256",
-          "name": "idx",
-          "type": "uint256"
-        }
-      ],
-      "name": "activeRequestAt",
-      "outputs": [
-        {
-          "internalType": "RequestId",
-          "name": "requestId",
-          "type": "uint64"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "NftId",
-          "name": "oracleNftId",
-          "type": "uint96"
-        }
-      ],
-      "name": "activeRequests",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "numberOfRequests",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "NftId",
-          "name": "oracleNftId",
-          "type": "uint96"
-        },
-        {
-          "internalType": "RequestId",
-          "name": "requestId",
-          "type": "uint64"
-        }
-      ],
-      "name": "add",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "authority",
-      "outputs": [
-        {
-          "internalType": "address",
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "NftId",
-          "name": "oracleNftId",
-          "type": "uint96"
-        },
-        {
-          "internalType": "RequestId",
-          "name": "requestId",
-          "type": "uint64"
-        }
-      ],
-      "name": "contains",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getInstanceAddress",
-      "outputs": [
-        {
-          "internalType": "address",
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getRegistry",
-      "outputs": [
-        {
-          "internalType": "contract IRegistry",
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "authority",
-          "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "registry",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "isConsumingScheduledOp",
-      "outputs": [
-        {
-          "internalType": "bytes4",
-          "name": "",
-          "type": "bytes4"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "NftId",
-          "name": "oracleNftId",
-          "type": "uint96"
-        },
-        {
-          "internalType": "RequestId",
-          "name": "requestId",
-          "type": "uint64"
-        }
-      ],
-      "name": "remove",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "newAuthority",
-          "type": "address"
-        }
-      ],
-      "name": "setAuthority",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    }
-  ],
-  "bytecode": "0x6080604052348015600e575f5ffd5b5061117a8061001c5f395ff3fe608060405234801561000f575f5ffd5b50600436106100a5575f3560e01c8063717b02bf1161006e578063717b02bf1461012e578063783b9acd1461015a5780637a9e5e4b1461016d5780638fb3603714610180578063bf7e214f146101a1578063fe82ef14146101a9575f5ffd5b80627c1457146100a957806326b2caf3146100d1578063485cc955146100e65780635ab1bd53146100f9578063681e65f01461011d575b5f5ffd5b6100bc6100b7366004610da2565b6101ca565b60405190151581526020015b60405180910390f35b6100e46100df366004610da2565b6101e4565b005b6100e46100f4366004610deb565b610245565b5f546001600160a01b03165b6040516001600160a01b0390911681526020016100c8565b6003546001600160a01b0316610105565b61014161013c366004610e17565b6103a7565b60405167ffffffffffffffff90911681526020016100c8565b6100e4610168366004610da2565b6103ba565b6100e461017b366004610e3f565b6104df565b610188610565565b6040516001600160e01b031990911681526020016100c8565b61010561059b565b6101bc6101b7366004610e5a565b6105b6565b6040519081526020016100c8565b5f6101dd836101d8846105c6565b610644565b9392505050565b6101f0335b5f366106d5565b610202826101fd836105c6565b6107d3565b60405167ffffffffffffffff8216906001600160601b038416907f3dac51ab27988f702e7151639b701338b8f628435512b6044d2bbd1b8978d814905f90a35050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff16159067ffffffffffffffff165f8115801561028a5750825b90505f8267ffffffffffffffff1660011480156102a65750303b155b9050811580156102b4575080155b156102d25760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff1916600117855583156102fc57845460ff60401b1916600160401b1785555b600380546001600160a01b0319163317905561031887876108cb565b6003546040516001600160a01b0390911681527f354213bc359f6a4cdd77e05ad9f14f17072566dbf2dfe7d5febe8d3f1d20c55d9060200160405180910390a1831561039e57845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50505050505050565b5f6101dd6103b584846108fe565b61098f565b6103c3336101e9565b60035460405163353d4f3960e21b81526001600160a01b0390911660048201526001600160601b03831660248201525f9073__$9ab531d2fb5724a292102184f345630dcc$__9063d4f53ce4906044015f60405180830381865af415801561042d573d5f5f3e3d5ffd5b505050506040513d5f823e601f3d908101601f191682016040526104549190810190610eec565b8051519091505f036104895760405163407ad0a160e11b81526001600160601b03841660048201526024015b60405180910390fd5b61049b83610496846105c6565b610a80565b60405167ffffffffffffffff8316906001600160601b038516907feed8b2437bef47b865b19a7d7381170248b9580db0643759099486ae12a9ed7b905f90a3505050565b336104e861059b565b6001600160a01b0316816001600160a01b0316146105235760405162d1953b60e31b81526001600160a01b0382166004820152602401610480565b816001600160a01b03163b5f03610558576040516361798f2f60e11b81526001600160a01b0383166004820152602401610480565b61056182610b4a565b5050565b5f5160206111255f395f51905f5280545f9190600160a01b900460ff1661058c575f610595565b638fb3603760e01b5b91505090565b5f5160206111255f395f51905f52546001600160a01b031690565b5f6105c082610baa565b92915050565b604051630f37f38f60e41b815267ffffffffffffffff821660048201525f9073__$b4c16f233b92c2c4124fb22a521f86c95b$__9063f37f38f0906024015b602060405180830381865af4158015610620573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906105c09190610fc3565b6001600160601b0382165f908152600260205260408082209051633205659f60e11b815260048101919091526024810183905273__$cbdc78fa2b79ba32ca600e20fa3fec38f8$__9063640acb3e90604401602060405180830381865af41580156106b1573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906101dd9190610fe9565b5f5160206111255f395f51905f525f8061070d6106f061059b565b87306106ff60045f8a8c611002565b61070891611029565b610bfa565b91509150816107cb5763ffffffff8116156107a857825460ff60a01b1916600160a01b17835561073b61059b565b6001600160a01b03166394c7d7ee8787876040518463ffffffff1660e01b815260040161076a93929190611061565b5f604051808303815f87803b158015610781575f5ffd5b505af1158015610793573d5f5f3e3d5ffd5b5050845460ff60a01b19168555506107cb9050565b60405162d1953b60e31b81526001600160a01b0387166004820152602401610480565b505050505050565b6001600160601b0382165f908152600260209081526040808320600190925291829020915163c54bd26f60e01b8152600481018290526024810184905290919073__$cbdc78fa2b79ba32ca600e20fa3fec38f8$__9063c54bd26f906044015f6040518083038186803b158015610848575f5ffd5b505af415801561085a573d5f5f3e3d5ffd5b505060405163c54bd26f60e01b8152600481018490526024810186905273__$cbdc78fa2b79ba32ca600e20fa3fec38f8$__925063c54bd26f91506044015b5f6040518083038186803b1580156108af575f5ffd5b505af41580156108c1573d5f5f3e3d5ffd5b5050505050505050565b6108d3610d02565b6108dc82610d4d565b5f80546001600160a01b0319166001600160a01b039290921691909117905550565b6001600160601b0382165f90815260016020526040808220905163e9c54d3160e01b815260048101919091526024810183905273__$cbdc78fa2b79ba32ca600e20fa3fec38f8$__9063e9c54d3190604401602060405180830381865af415801561096b573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906101dd9190610fc3565b604051630713cfad60e31b8152600481018290525f9073__$b4c16f233b92c2c4124fb22a521f86c95b$__9063a66e08e49073__$4b9aaffa8d044614668dad578b824b8eee$__9063389e7d6890602401602060405180830381865af41580156109fb573d5f5f3e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610a1f91906110a0565b6040516001600160e01b031960e084901b16815260ff199091166004820152602401602060405180830381865af4158015610a5c573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906105c091906110c1565b6001600160601b0382165f90815260026020908152604080832060019092529182902091516304af170b60e41b8152600481018290526024810184905290919073__$cbdc78fa2b79ba32ca600e20fa3fec38f8$__90634af170b0906044015f6040518083038186803b158015610af5575f5ffd5b505af4158015610b07573d5f5f3e3d5ffd5b50506040516304af170b60e41b8152600481018490526024810186905273__$cbdc78fa2b79ba32ca600e20fa3fec38f8$__9250634af170b09150604401610899565b5f5160206111255f395f51905f5280546001600160a01b0383166001600160a01b03199091168117825560408051918252517f2f658b440c35314f52658ea8a740e05b284cdc84dc9ae01e891f21b8933e7cad9181900360200190a15050565b6001600160601b0381165f908152600260205260408082209051634ef87aaf60e11b8152600481019190915273__$cbdc78fa2b79ba32ca600e20fa3fec38f8$__90639df0f55e90602401610605565b6040516001600160a01b03848116602483015283811660448301526001600160e01b0319831660648301525f9182918291829189169060840160408051601f198184030181529181526020820180516001600160e01b031663b700961360e01b17905251610c6891906110dc565b5f60405180830381855afa9150503d805f8114610ca0576040519150601f19603f3d011682016040523d82523d5f602084013e610ca5565b606091505b50915091508115610cf7576040815110610cd75780806020019051810190610ccd91906110f2565b9094509250610cf7565b6020815110610cf75780806020019051810190610cf49190610fe9565b93505b505094509492505050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff16610d4b57604051631afcd79f60e31b815260040160405180910390fd5b565b610d55610d02565b610d5e81610d61565b50565b610d69610d02565b610d5e81610b4a565b80356001600160601b0381168114610d88575f5ffd5b919050565b67ffffffffffffffff81168114610d5e575f5ffd5b5f5f60408385031215610db3575f5ffd5b610dbc83610d72565b91506020830135610dcc81610d8d565b809150509250929050565b6001600160a01b0381168114610d5e575f5ffd5b5f5f60408385031215610dfc575f5ffd5b8235610e0781610dd7565b91506020830135610dcc81610dd7565b5f5f60408385031215610e28575f5ffd5b610e3183610d72565b946020939093013593505050565b5f60208284031215610e4f575f5ffd5b81356101dd81610dd7565b5f60208284031215610e6a575f5ffd5b6101dd82610d72565b634e487b7160e01b5f52604160045260245ffd5b6040805190810167ffffffffffffffff81118282101715610eaa57610eaa610e73565b60405290565b604051601f8201601f1916810167ffffffffffffffff81118282101715610ed957610ed9610e73565b604052919050565b8051610d8881610dd7565b5f60208284031215610efc575f5ffd5b815167ffffffffffffffff811115610f12575f5ffd5b820160408185031215610f23575f5ffd5b610f2b610e87565b815167ffffffffffffffff811115610f41575f5ffd5b8201601f81018613610f51575f5ffd5b805167ffffffffffffffff811115610f6b57610f6b610e73565b610f7e601f8201601f1916602001610eb0565b818152876020838501011115610f92575f5ffd5b8160208401602083015e5f60208383010152808452505050610fb660208301610ee1565b6020820152949350505050565b5f60208284031215610fd3575f5ffd5b5051919050565b80518015158114610d88575f5ffd5b5f60208284031215610ff9575f5ffd5b6101dd82610fda565b5f5f85851115611010575f5ffd5b8386111561101c575f5ffd5b5050820193919092039150565b80356001600160e01b0319811690600484101561105a576001600160e01b0319600485900360031b81901b82161691505b5092915050565b6001600160a01b03841681526040602082018190528101829052818360608301375f818301606090810191909152601f909201601f1916010192915050565b5f602082840312156110b0575f5ffd5b815160ff19811681146101dd575f5ffd5b5f602082840312156110d1575f5ffd5b81516101dd81610d8d565b5f82518060208501845e5f920191825250919050565b5f5f60408385031215611103575f5ffd5b61110c83610fda565b9150602083015163ffffffff81168114610dcc575f5ffdfef3177357ab46d8af007ab3fdb9af81da189e1068fefdc0073dca88a2cab40a00a26469706673582212204be5668e267d9baec9a83ec6c53cc46894333cd5e78cd50a3a7ae2b2a7f872dc64736f6c634300081b0033",
-  "deployedBytecode": "0x608060405234801561000f575f5ffd5b50600436106100a5575f3560e01c8063717b02bf1161006e578063717b02bf1461012e578063783b9acd1461015a5780637a9e5e4b1461016d5780638fb3603714610180578063bf7e214f146101a1578063fe82ef14146101a9575f5ffd5b80627c1457146100a957806326b2caf3146100d1578063485cc955146100e65780635ab1bd53146100f9578063681e65f01461011d575b5f5ffd5b6100bc6100b7366004610da2565b6101ca565b60405190151581526020015b60405180910390f35b6100e46100df366004610da2565b6101e4565b005b6100e46100f4366004610deb565b610245565b5f546001600160a01b03165b6040516001600160a01b0390911681526020016100c8565b6003546001600160a01b0316610105565b61014161013c366004610e17565b6103a7565b60405167ffffffffffffffff90911681526020016100c8565b6100e4610168366004610da2565b6103ba565b6100e461017b366004610e3f565b6104df565b610188610565565b6040516001600160e01b031990911681526020016100c8565b61010561059b565b6101bc6101b7366004610e5a565b6105b6565b6040519081526020016100c8565b5f6101dd836101d8846105c6565b610644565b9392505050565b6101f0335b5f366106d5565b610202826101fd836105c6565b6107d3565b60405167ffffffffffffffff8216906001600160601b038416907f3dac51ab27988f702e7151639b701338b8f628435512b6044d2bbd1b8978d814905f90a35050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff16159067ffffffffffffffff165f8115801561028a5750825b90505f8267ffffffffffffffff1660011480156102a65750303b155b9050811580156102b4575080155b156102d25760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff1916600117855583156102fc57845460ff60401b1916600160401b1785555b600380546001600160a01b0319163317905561031887876108cb565b6003546040516001600160a01b0390911681527f354213bc359f6a4cdd77e05ad9f14f17072566dbf2dfe7d5febe8d3f1d20c55d9060200160405180910390a1831561039e57845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50505050505050565b5f6101dd6103b584846108fe565b61098f565b6103c3336101e9565b60035460405163353d4f3960e21b81526001600160a01b0390911660048201526001600160601b03831660248201525f9073__$9ab531d2fb5724a292102184f345630dcc$__9063d4f53ce4906044015f60405180830381865af415801561042d573d5f5f3e3d5ffd5b505050506040513d5f823e601f3d908101601f191682016040526104549190810190610eec565b8051519091505f036104895760405163407ad0a160e11b81526001600160601b03841660048201526024015b60405180910390fd5b61049b83610496846105c6565b610a80565b60405167ffffffffffffffff8316906001600160601b038516907feed8b2437bef47b865b19a7d7381170248b9580db0643759099486ae12a9ed7b905f90a3505050565b336104e861059b565b6001600160a01b0316816001600160a01b0316146105235760405162d1953b60e31b81526001600160a01b0382166004820152602401610480565b816001600160a01b03163b5f03610558576040516361798f2f60e11b81526001600160a01b0383166004820152602401610480565b61056182610b4a565b5050565b5f5160206111255f395f51905f5280545f9190600160a01b900460ff1661058c575f610595565b638fb3603760e01b5b91505090565b5f5160206111255f395f51905f52546001600160a01b031690565b5f6105c082610baa565b92915050565b604051630f37f38f60e41b815267ffffffffffffffff821660048201525f9073__$b4c16f233b92c2c4124fb22a521f86c95b$__9063f37f38f0906024015b602060405180830381865af4158015610620573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906105c09190610fc3565b6001600160601b0382165f908152600260205260408082209051633205659f60e11b815260048101919091526024810183905273__$cbdc78fa2b79ba32ca600e20fa3fec38f8$__9063640acb3e90604401602060405180830381865af41580156106b1573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906101dd9190610fe9565b5f5160206111255f395f51905f525f8061070d6106f061059b565b87306106ff60045f8a8c611002565b61070891611029565b610bfa565b91509150816107cb5763ffffffff8116156107a857825460ff60a01b1916600160a01b17835561073b61059b565b6001600160a01b03166394c7d7ee8787876040518463ffffffff1660e01b815260040161076a93929190611061565b5f604051808303815f87803b158015610781575f5ffd5b505af1158015610793573d5f5f3e3d5ffd5b5050845460ff60a01b19168555506107cb9050565b60405162d1953b60e31b81526001600160a01b0387166004820152602401610480565b505050505050565b6001600160601b0382165f908152600260209081526040808320600190925291829020915163c54bd26f60e01b8152600481018290526024810184905290919073__$cbdc78fa2b79ba32ca600e20fa3fec38f8$__9063c54bd26f906044015f6040518083038186803b158015610848575f5ffd5b505af415801561085a573d5f5f3e3d5ffd5b505060405163c54bd26f60e01b8152600481018490526024810186905273__$cbdc78fa2b79ba32ca600e20fa3fec38f8$__925063c54bd26f91506044015b5f6040518083038186803b1580156108af575f5ffd5b505af41580156108c1573d5f5f3e3d5ffd5b5050505050505050565b6108d3610d02565b6108dc82610d4d565b5f80546001600160a01b0319166001600160a01b039290921691909117905550565b6001600160601b0382165f90815260016020526040808220905163e9c54d3160e01b815260048101919091526024810183905273__$cbdc78fa2b79ba32ca600e20fa3fec38f8$__9063e9c54d3190604401602060405180830381865af415801561096b573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906101dd9190610fc3565b604051630713cfad60e31b8152600481018290525f9073__$b4c16f233b92c2c4124fb22a521f86c95b$__9063a66e08e49073__$4b9aaffa8d044614668dad578b824b8eee$__9063389e7d6890602401602060405180830381865af41580156109fb573d5f5f3e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610a1f91906110a0565b6040516001600160e01b031960e084901b16815260ff199091166004820152602401602060405180830381865af4158015610a5c573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906105c091906110c1565b6001600160601b0382165f90815260026020908152604080832060019092529182902091516304af170b60e41b8152600481018290526024810184905290919073__$cbdc78fa2b79ba32ca600e20fa3fec38f8$__90634af170b0906044015f6040518083038186803b158015610af5575f5ffd5b505af4158015610b07573d5f5f3e3d5ffd5b50506040516304af170b60e41b8152600481018490526024810186905273__$cbdc78fa2b79ba32ca600e20fa3fec38f8$__9250634af170b09150604401610899565b5f5160206111255f395f51905f5280546001600160a01b0383166001600160a01b03199091168117825560408051918252517f2f658b440c35314f52658ea8a740e05b284cdc84dc9ae01e891f21b8933e7cad9181900360200190a15050565b6001600160601b0381165f908152600260205260408082209051634ef87aaf60e11b8152600481019190915273__$cbdc78fa2b79ba32ca600e20fa3fec38f8$__90639df0f55e90602401610605565b6040516001600160a01b03848116602483015283811660448301526001600160e01b0319831660648301525f9182918291829189169060840160408051601f198184030181529181526020820180516001600160e01b031663b700961360e01b17905251610c6891906110dc565b5f60405180830381855afa9150503d805f8114610ca0576040519150601f19603f3d011682016040523d82523d5f602084013e610ca5565b606091505b50915091508115610cf7576040815110610cd75780806020019051810190610ccd91906110f2565b9094509250610cf7565b6020815110610cf75780806020019051810190610cf49190610fe9565b93505b505094509492505050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff16610d4b57604051631afcd79f60e31b815260040160405180910390fd5b565b610d55610d02565b610d5e81610d61565b50565b610d69610d02565b610d5e81610b4a565b80356001600160601b0381168114610d88575f5ffd5b919050565b67ffffffffffffffff81168114610d5e575f5ffd5b5f5f60408385031215610db3575f5ffd5b610dbc83610d72565b91506020830135610dcc81610d8d565b809150509250929050565b6001600160a01b0381168114610d5e575f5ffd5b5f5f60408385031215610dfc575f5ffd5b8235610e0781610dd7565b91506020830135610dcc81610dd7565b5f5f60408385031215610e28575f5ffd5b610e3183610d72565b946020939093013593505050565b5f60208284031215610e4f575f5ffd5b81356101dd81610dd7565b5f60208284031215610e6a575f5ffd5b6101dd82610d72565b634e487b7160e01b5f52604160045260245ffd5b6040805190810167ffffffffffffffff81118282101715610eaa57610eaa610e73565b60405290565b604051601f8201601f1916810167ffffffffffffffff81118282101715610ed957610ed9610e73565b604052919050565b8051610d8881610dd7565b5f60208284031215610efc575f5ffd5b815167ffffffffffffffff811115610f12575f5ffd5b820160408185031215610f23575f5ffd5b610f2b610e87565b815167ffffffffffffffff811115610f41575f5ffd5b8201601f81018613610f51575f5ffd5b805167ffffffffffffffff811115610f6b57610f6b610e73565b610f7e601f8201601f1916602001610eb0565b818152876020838501011115610f92575f5ffd5b8160208401602083015e5f60208383010152808452505050610fb660208301610ee1565b6020820152949350505050565b5f60208284031215610fd3575f5ffd5b5051919050565b80518015158114610d88575f5ffd5b5f60208284031215610ff9575f5ffd5b6101dd82610fda565b5f5f85851115611010575f5ffd5b8386111561101c575f5ffd5b5050820193919092039150565b80356001600160e01b0319811690600484101561105a576001600160e01b0319600485900360031b81901b82161691505b5092915050565b6001600160a01b03841681526040602082018190528101829052818360608301375f818301606090810191909152601f909201601f1916010192915050565b5f602082840312156110b0575f5ffd5b815160ff19811681146101dd575f5ffd5b5f602082840312156110d1575f5ffd5b81516101dd81610d8d565b5f82518060208501845e5f920191825250919050565b5f5f60408385031215611103575f5ffd5b61110c83610fda565b9150602083015163ffffffff81168114610dcc575f5ffdfef3177357ab46d8af007ab3fdb9af81da189e1068fefdc0073dca88a2cab40a00a26469706673582212204be5668e267d9baec9a83ec6c53cc46894333cd5e78cd50a3a7ae2b2a7f872dc64736f6c634300081b0033",
-  "linkReferences": {
-    "contracts/instance/base/ObjectSetHelperLib.sol": {
-      "ObjectSetHelperLib": [
-        {
-          "length": 20,
-          "start": 1042
-        }
-      ]
-    },
-    "contracts/type/Key32.sol": {
-      "Key32Lib": [
-        {
-          "length": 20,
-          "start": 2527
-        }
-      ]
-    },
-    "contracts/type/Key32Set.sol": {
-      "LibKey32Set": [
-        {
-          "length": 20,
-          "start": 1685
-        },
-        {
-          "length": 20,
-          "start": 2097
-        },
-        {
-          "length": 20,
-          "start": 2197
-        },
-        {
-          "length": 20,
-          "start": 2383
-        },
-        {
-          "length": 20,
-          "start": 2782
-        },
-        {
-          "length": 20,
-          "start": 2882
-        },
-        {
-          "length": 20,
-          "start": 3060
-        }
-      ]
-    },
-    "contracts/type/RequestId.sol": {
-      "RequestIdLib": [
-        {
-          "length": 20,
-          "start": 1539
-        },
-        {
-          "length": 20,
-          "start": 2499
-        }
-      ]
-    }
-  },
-  "deployedLinkReferences": {
-    "contracts/instance/base/ObjectSetHelperLib.sol": {
-      "ObjectSetHelperLib": [
-        {
-          "length": 20,
-          "start": 1014
-        }
-      ]
-    },
-    "contracts/type/Key32.sol": {
-      "Key32Lib": [
-        {
-          "length": 20,
-          "start": 2499
-        }
-      ]
-    },
-    "contracts/type/Key32Set.sol": {
-      "LibKey32Set": [
-        {
-          "length": 20,
-          "start": 1657
-        },
-        {
-          "length": 20,
-          "start": 2069
-        },
-        {
-          "length": 20,
-          "start": 2169
-        },
-        {
-          "length": 20,
-          "start": 2355
-        },
-        {
-          "length": 20,
-          "start": 2754
-        },
-        {
-          "length": 20,
-          "start": 2854
-        },
-        {
-          "length": 20,
-          "start": 3032
-        }
-      ]
-    },
-    "contracts/type/RequestId.sol": {
-      "RequestIdLib": [
-        {
-          "length": 20,
-          "start": 1511
-        },
-        {
-          "length": 20,
-          "start": 2471
-        }
-      ]
-    }
-  }
-}