@etherisc/gif-next 3.0.0-495114d-923 → 3.0.0-4a8758c-370

package/contracts/authorization/AccessAdmin.sol

@@ -367,7 +367,7 @@ contract AccessAdmin is
         // add role to list of roles
         _roleIds.push(roleId);
 
-        emit LogAccessAdminRoleCreated(_adminName, roleId, info.targetType, info.adminRoleId, info.name.toString());
+        emit LogAccessAdminRoleCreated(roleId, info.adminRoleId, info.targetType, info.name.toString(), _adminName);
     }
 
 
@@ -387,7 +387,7 @@ contract AccessAdmin is
         Blocknumber lastUpdateIn = _roleInfo[roleId].lastUpdateIn;
         _roleInfo[roleId].lastUpdateIn = BlocknumberLib.current();
 
-        emit LogAccessAdminRoleActivatedSet(_adminName, roleId, active, lastUpdateIn);
+        emit LogAccessAdminRoleActivatedSet(roleId, active, _adminName, lastUpdateIn);
     }
 
 
@@ -418,9 +418,9 @@ contract AccessAdmin is
             0);
         
         emit LogAccessAdminRoleGranted(
-            _adminName, 
             account, 
-            AccessAdminLib.getRoleName(this, roleId));
+            AccessAdminLib.getRoleName(this, roleId),
+            _adminName);
     }
 
 
@@ -441,7 +441,7 @@ contract AccessAdmin is
             RoleId.unwrap(roleId), 
             account);
 
-        emit LogAccessAdminRoleRevoked(_adminName, account, _roleInfo[roleId].name.toString());
+        emit LogAccessAdminRoleRevoked(account, _roleInfo[roleId].name.toString(), _adminName);
     }
 
 
@@ -557,7 +557,7 @@ contract AccessAdmin is
         // grant contract role to target
         _grantRoleToAccount(targetRoleId, target);
 
-        emit LogAccessAdminTargetCreated(_adminName, targetName, managed, target, targetRoleId);
+        emit LogAccessAdminTargetCreated(target, targetRoleId, managed, targetName, _adminName);
     }
 
 
@@ -571,7 +571,7 @@ contract AccessAdmin is
         Blocknumber lastUpdateIn = _targetInfo[target].lastUpdateIn;
         _targetInfo[target].lastUpdateIn = BlocknumberLib.current();
 
-        emit LogAccessAdminTargetLockedSet(_adminName, target, locked, lastUpdateIn);
+        emit LogAccessAdminTargetLockedSet(target, locked, _adminName, lastUpdateIn);
     }
 
 
@@ -652,9 +652,11 @@ contract AccessAdmin is
 
         // logging
         emit LogAccessAdminFunctionGranted(
-            _adminName, 
             target, 
+            selector,
+            roleId,
             AccessAdminLib.toFunctionGrantingString(this, func.name, roleId),
+            _adminName, 
             lastUpdateIn);
     }
 }

package/contracts/authorization/AccessManagerCloneable.sol

@@ -24,6 +24,8 @@ contract AccessManagerCloneable is
     error ErrorAccessManagerTargetAdminLocked(address target);
     error ErrorAccessManagerCallerAdminLocked(address caller);
 
+    event LogAccessManagerLocked(address indexed accessManager, bool indexed locked);
+
     VersionPart private _release;
     bool private _isLocked;
 
@@ -39,6 +41,7 @@ contract AccessManagerCloneable is
 
     function initialize(address admin)
         public
+        override
         initializer()
     {
         __ERC165_init();
@@ -94,6 +97,7 @@ contract AccessManagerCloneable is
         onlyAdminRole() 
     {
         _isLocked = locked;
+        emit LogAccessManagerLocked(address(this), locked);
     }
 
 

package/contracts/authorization/IAccessAdmin.sol

@@ -12,6 +12,7 @@ import {Blocknumber} from "../type/Blocknumber.sol";
 import {NftId} from "../type/NftId.sol";
 import {ObjectType} from "../type/ObjectType.sol";
 import {RoleId} from "../type/RoleId.sol";
+import {Selector} from "../type/Selector.sol";
 import {Str} from "../type/String.sol";
 import {VersionPart} from "../type/Version.sol";
 
@@ -24,14 +25,14 @@ interface IAccessAdmin is
 {
 
     // roles, targets and functions
-    event LogAccessAdminRoleCreated(string admin, RoleId roleId, TargetType targetType, RoleId roleAdminId, string name);
-    event LogAccessAdminTargetCreated(string admin, string name, bool managed, address target, RoleId roleId);
-
-    event LogAccessAdminRoleActivatedSet(string admin, RoleId roleId, bool active, Blocknumber lastUpdateIn);
-    event LogAccessAdminRoleGranted(string admin, address account, string roleName);
-    event LogAccessAdminRoleRevoked(string admin, address account, string roleName);
-    event LogAccessAdminTargetLockedSet(string admin, address target, bool locked, Blocknumber lastUpdateIn);
-    event LogAccessAdminFunctionGranted(string admin, address target, string func, Blocknumber lastUpdateIn);
+    event LogAccessAdminRoleCreated(RoleId indexed roleId, RoleId indexed roleAdminId, TargetType indexed targetType, string name, string admin);
+    event LogAccessAdminTargetCreated(address indexed target, RoleId indexed roleId, bool indexed managed, string name, string admin);
+
+    event LogAccessAdminRoleActivatedSet(RoleId indexed roleId, bool indexed active, string admin, Blocknumber indexed lastUpdateIn);
+    event LogAccessAdminRoleGranted(address indexed account, string roleName, string admin);
+    event LogAccessAdminRoleRevoked(address indexed account, string roleName, string admin);
+    event LogAccessAdminTargetLockedSet(address indexed target, bool indexed locked, string admin, Blocknumber indexed lastUpdateIn);
+    event LogAccessAdminFunctionGranted(address indexed target, Selector indexed selector, RoleId indexed roleId, string func, string admin, Blocknumber lastUpdateIn);
 
     // only deployer modifier
     error ErrorAccessAdminNotDeployer();

package/contracts/distribution/DistributionService.sol

@@ -98,21 +98,24 @@ contract DistributionService is
         }
 
         distributorType = DistributorTypeLib.toDistributorType(distributionNftId, name);
-        IDistribution.DistributorTypeInfo memory info = IDistribution.DistributorTypeInfo({
-            name: name,
-            distributionNftId: distributionNftId,
-            minDiscountPercentage: minDiscountPercentage,
-            maxDiscountPercentage: maxDiscountPercentage,
-            commissionPercentage: commissionPercentage,
-            maxReferralCount: maxReferralCount,
-            maxReferralLifetime: maxReferralLifetime,
-            allowSelfReferrals: allowSelfReferrals,
-            allowRenewals: allowRenewals,
-            data: data});
-
-        instance.getInstanceStore().createDistributorType(distributorType, info);
+        
+        {
+            IDistribution.DistributorTypeInfo memory info = IDistribution.DistributorTypeInfo({
+                name: name,
+                distributionNftId: distributionNftId,
+                minDiscountPercentage: minDiscountPercentage,
+                maxDiscountPercentage: maxDiscountPercentage,
+                commissionPercentage: commissionPercentage,
+                maxReferralCount: maxReferralCount,
+                maxReferralLifetime: maxReferralLifetime,
+                allowSelfReferrals: allowSelfReferrals,
+                allowRenewals: allowRenewals,
+                data: data});
+
+            instance.getInstanceStore().createDistributorType(distributorType, info);
+        }
 
-        emit LogDistributionServiceDistributorTypeCreated(distributionNftId, name);
+        emit LogDistributionServiceDistributorTypeCreated(distributionNftId, distributorType, name, commissionPercentage);
     }
 
 
@@ -148,7 +151,7 @@ contract DistributionService is
 
         instance.getInstanceStore().createDistributor(distributorNftId, info);
 
-        emit LogDistributionServiceDistributorCreated(distributionNftId, distributorNftId, distributorType, distributor);
+        emit LogDistributionServiceDistributorCreated(distributionNftId, distributorNftId, distributor, distributorType);
     }
 
     function changeDistributorType(
@@ -236,7 +239,7 @@ contract DistributionService is
 
             instance.getInstanceStore().createReferral(referralId, info);
 
-            emit LogDistributionServiceReferralCreated(distributionNftId, distributorNftId, referralId, code);
+            emit LogDistributionServiceReferralCreated(distributorNftId, referralId, code, discountPercentage, maxReferrals, expiryAt);
         }
     }
 
@@ -258,7 +261,7 @@ contract DistributionService is
             referralInfo.usedReferrals += 1;
             instance.getInstanceStore().updateReferral(referralId, referralInfo, KEEP_STATE());
 
-            emit LogDistributionServiceReferralProcessed(distributionNftId, referralInfo.distributorNftId, referralId, referralInfo.usedReferrals);
+            emit LogDistributionServiceReferralProcessed(referralInfo.distributorNftId, referralId, referralInfo.usedReferrals);
         }
     }
 
@@ -295,12 +298,14 @@ contract DistributionService is
             IDistribution.DistributorInfo memory distributorInfo = reader.getDistributorInfo(referralInfo.distributorNftId);
             distributorInfo.numPoliciesSold += 1;
             store.updateDistributor(referralInfo.distributorNftId, distributorInfo, KEEP_STATE());
+            emit LogDistributionServiceSaleProcessedWithReferral(distributionNftId, referralInfo.distributorNftId, referralId, distributorInfo.numPoliciesSold, premium.premiumAmount, distributionOwnerFee, commissionAmount);
         } else {
             // increase distribution balance by distribution owner fee
             _accountingService.increaseDistributionBalance(store, distributionNftId, AmountLib.zero(), distributionOwnerFee);
+            emit LogDistributionServiceSaleProcessed(distributionNftId, premium.premiumAmount, distributionOwnerFee);
         }
 
-        emit LogDistributionServiceSaleProcessed(distributionNftId, referralId);
+        
     }
 
     /// @inheritdoc IDistributionService
@@ -341,7 +346,7 @@ contract DistributionService is
         // transfer amount to distributor
         {
             address distributor = getRegistry().ownerOf(distributorNftId);
-            emit LogDistributionServiceCommissionWithdrawn(distributorNftId, distributor, address(distributionInfo.tokenHandler.TOKEN()), withdrawnAmount);
+            emit LogDistributionServiceCommissionWithdrawn(distributorNftId, distributor, withdrawnAmount, address(distributionInfo.tokenHandler.TOKEN()));
             distributionInfo.tokenHandler.pushToken(distributor, withdrawnAmount);
         }
     }

package/contracts/distribution/IDistributionComponent.sol

@@ -11,8 +11,6 @@ import {UFixed} from "../type/UFixed.sol";
 
 interface IDistributionComponent is IInstanceLinkedComponent {
 
-    event LogDistributorUpdated(address to, address operator);
-
     function getDiscountPercentage(
         string memory referralCode
     ) external view returns (UFixed discountPercentage, ReferralStatus status);

package/contracts/distribution/IDistributionService.sol

@@ -39,13 +39,14 @@ interface IDistributionService is IService {
     error ErrorDistributionServiceInvalidFeeTransferred(Amount transferredDistributionFeeAmount, Amount expectedDistributionFeeAmount);
     error ErrorDistributionServiceReferralDistributionMismatch(ReferralId referralId, NftId referralDistributionNft, NftId distributionNftId);
 
-    event LogDistributionServiceCommissionWithdrawn(NftId distributorNftId, address recipient, address tokenAddress, Amount amount);
-    event LogDistributionServiceDistributorTypeCreated(NftId distributionNftId, string name);
-    event LogDistributionServiceDistributorCreated(NftId distributionNftId, NftId distributorNftId, DistributorType distributorType, address distributor);
-    event LogDistributionServiceDistributorTypeChanged(NftId distributorNftId, DistributorType oldDistributorType, DistributorType newDistributorType);
-    event LogDistributionServiceReferralCreated(NftId distributionNftId, NftId distributorNftId, ReferralId referralId, string code);
-    event LogDistributionServiceReferralProcessed(NftId distributionNftId, NftId distributorNftId, ReferralId referralId, uint32 usedReferrals);
-    event LogDistributionServiceSaleProcessed(NftId distributionNftId, ReferralId referralId);
+    event LogDistributionServiceCommissionWithdrawn(NftId indexed distributorNftId, address indexed recipient, Amount amount, address indexed tokenAddress);
+    event LogDistributionServiceDistributorTypeCreated(NftId indexed distributionNftId, DistributorType indexed distributorType, string name, UFixed commissionPercentage);
+    event LogDistributionServiceDistributorCreated(NftId indexed distributionNftId, NftId indexed distributorNftId, address indexed distributor, DistributorType distributorType);
+    event LogDistributionServiceDistributorTypeChanged(NftId indexed distributorNftId, DistributorType indexed oldDistributorType, DistributorType indexed newDistributorType);
+    event LogDistributionServiceReferralCreated(NftId indexed distributorNftId, ReferralId indexed referralId, string code, UFixed discountPercentage, uint32 maxReferrals, Timestamp expiryAt);
+    event LogDistributionServiceReferralProcessed(NftId indexed distributorNftId, ReferralId indexed referralId, uint32 usedReferrals);
+    event LogDistributionServiceSaleProcessed(NftId indexed distributionNftId, Amount premium, Amount distributionOwnerFee);
+    event LogDistributionServiceSaleProcessedWithReferral(NftId indexed distributionNftId, NftId indexed distributorNftId, ReferralId indexed referralId, uint32 numPoliciesSold, Amount premium, Amount distributionOwnerFee, Amount commissionAmount);
 
     function createDistributorType(
         string memory name,

package/contracts/examples/flight/FlightNft.sol

@@ -5,8 +5,10 @@ import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
 import {IERC721Metadata} from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol";
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 
+import {IPolicy} from "../../instance/module/IPolicy.sol";
 import {IRegistry} from "../../registry/IRegistry.sol";
 
+import {Amount} from "../../type/Amount.sol";
 import {ChainNft} from "../../registry/ChainNft.sol";
 import {FlightProduct} from "./FlightProduct.sol";
 import {InstanceReader} from "../../instance/InstanceReader.sol";
@@ -24,13 +26,28 @@ contract FlightNft is
     Ownable
 {
 
-    ChainNft private _chainNft;
-    FlightProduct private _flightProduct;
-    InstanceReader private _reader;
-    IRegistry private _registry;
+    error ErrorFlightNftNotMinter();
+    error ErrorFlightNftAlreadyMinted(uint256 tokenId);
+    error ErrorFlightNftNotAvailable(uint256 tokenId);
+    error ErrorFlightNftNotFlightPolicy(uint256 tokenId);
+
+    ChainNft public immutable chainNft;
+    FlightProduct public immutable flightProduct;
+    InstanceReader public immutable instanceReader;
+    IRegistry public registry;
+
+    address public minter;
     string private _baseUri;
 
 
+    modifier onlyMinter() {
+        if(msg.sender != minter) {
+            revert ErrorFlightNftNotMinter();
+        }
+        _;
+    }
+
+
     constructor(
         address flightProductAddress,
         string memory nftName,
@@ -40,10 +57,12 @@ contract FlightNft is
         ERC721(nftName, nftSymbol)
         Ownable(msg.sender)
     {
-        _flightProduct = FlightProduct(flightProductAddress);
-        _registry = _flightProduct.getRegistry();
-        _chainNft = ChainNft(_registry.getChainNftAddress());
-        _reader = _flightProduct.getInstance().getInstanceReader();
+        flightProduct = FlightProduct(flightProductAddress);
+        registry = flightProduct.getRegistry();
+        chainNft = ChainNft(registry.getChainNftAddress());
+        instanceReader = flightProduct.getInstance().getInstanceReader();
+
+        minter = msg.sender;
         _baseUri = baseUri;
     }
 
@@ -60,6 +79,43 @@ contract FlightNft is
     }
 
 
+    /**
+     * Set the minter address.
+     */
+    function setMinter(address minterAddress)
+        public 
+        onlyOwner()
+    {
+        minter = minterAddress;
+    }
+
+
+    /**
+     * Mints a metadata NFT for the specified chainNft NFT.
+     * Only the minter can mint such NFTs.
+     */
+    function mint(uint256 tokenId)
+        external
+        onlyMinter()
+    {
+        // verify nft does not yet exist
+        if (_ownerOf(tokenId) != address(0)) {
+            revert ErrorFlightNftAlreadyMinted(tokenId);
+        }
+
+        // verify nft on chainNft exists
+        // also checks if nft exists (ERC721NonexistentToken)
+        address nftOwner = chainNft.ownerOf(tokenId);
+
+        // verify nft is flight delay policy
+        if (registry.getParentNftId(NftIdLib.toNftId(tokenId)) != registry.getNftIdForAddress(address(flightProduct))) {
+            revert ErrorFlightNftNotFlightPolicy(tokenId);
+        }   
+
+        _mint(nftOwner, tokenId);
+    }
+
+
     /**
      * @dev Return the NFT token URI for the specified token.
      * No check is performed to ensure the token exists.
@@ -86,76 +142,27 @@ contract FlightNft is
     function transferFrom(address from, address to, uint256 tokenId) public override { _revert(); }
 
     function balanceOf(address owner) public override view returns (uint256 balance) {
-        return _chainNft.balanceOf(owner);
+        return chainNft.balanceOf(owner);
     }
 
     function getApproved(uint256 tokenId) public override view returns (address operator) {
-        return _chainNft.getApproved(tokenId);
+        return chainNft.getApproved(tokenId);
     }
 
     function isApprovedForAll(address owner, address operator) public override view returns (bool) {
-        return _chainNft.isApprovedForAll(owner, operator);
+        return chainNft.isApprovedForAll(owner, operator);
     }
 
     function ownerOf(uint256 tokenId) public override view returns (address owner) {
-        return _chainNft.ownerOf(tokenId);
+        return chainNft.ownerOf(tokenId);
     }
 
     function supportsInterface(bytes4 interfaceId) public override view returns (bool) {
-        return _chainNft.supportsInterface(interfaceId);
+        return chainNft.supportsInterface(interfaceId);
     }
 
 
-    // /**
-    //  * @dev See {IERC721Metadata-name}.
-    //  */    
-    // function name() public override view returns (string memory) {
-    //     return _nftName;
-    // }
-
-
-    // /**
-    //  * @dev See {IERC721Metadata-name}.
-    //  */    
-    // function symbol() public override view returns (string memory) {
-    //     return _nftSymbol;
-    // }
-
-
-    /**
-     * @dev Return the NFT metadata in JSON format.
-     * examples:
-     * - https://basescan.org/address/0x4ed83635e2309a7c067d0f98efca47b920bf79b1#readContract
-     *   {"name":"No-Punk #7580","image":"https://gateway.irys.xyz/InMDGHEx3L1YyRz6boihZGDHw4CKCRlLBlKnW6D83i4/7580.png","attributes":[{"trait_type":"Hair","value":"Cap"},{"trait_type":"Mouth","value":"Purple Lipstick"},{"trait_type":"Type","value":"Female"}]}
-     * - ,
-     *   {"name":"My NFT","description": "A unique digital asset", "image": "https://example.com/nft/1.png" }
-     */    
-    function getMetadataJson(uint256 tokenId) external view returns (string memory) {
-        (
-            , // risk id
-            string memory flightData,
-            string memory departureTimeLocal,
-            string memory arrivalTimeLocal,
-            , // status
-            // delay minutes
-        ) = getRiskData(NftIdLib.toNftId(tokenId));
-
-        return string(
-            abi.encodePacked(
-                "{\"name\":\"Flight Delay Policy #",
-                toString(tokenId),
-                "\",\"description\":\"Flight: ",
-                flightData,
-                ", Scheduled Departure: ",
-                departureTimeLocal,
-                ", Scheduled Arrival: ",
-                arrivalTimeLocal,
-                "\"}"
-                ));
-    }
-
-
-    function getRiskData(NftId policyNftId)
+    function getPolicyData(NftId policyNftId)
         public
         view
         returns (
@@ -163,15 +170,27 @@ contract FlightNft is
             string memory flightData,
             string memory departureTimeLocal,
             string memory arrivalTimeLocal,
+            Amount premiumAmount, 
+            Amount[5] memory payoutAmounts,
             bytes1 status,
             int256 delayMinutes
         )
     {
-        riskId = _reader.getPolicyInfo(policyNftId).riskId;
-        bytes memory data = _reader.getRiskInfo(riskId).data;
+        IPolicy.PolicyInfo memory info = instanceReader.getPolicyInfo(policyNftId);
+
+        // get financial data
+        premiumAmount = info.premiumAmount;
+
+        if (info.applicationData.length > 0) {
+            (, payoutAmounts) = abi.decode(info.applicationData, (Amount, Amount[5]));
+        }
+
+        // get risk data
+        riskId = info.riskId;
+        bytes memory data = instanceReader.getRiskInfo(riskId).data;
 
         if (data.length > 0) {
-            FlightProduct.FlightRisk memory flightRisk = _flightProduct.decodeFlightRiskData(data);
+            FlightProduct.FlightRisk memory flightRisk = flightProduct.decodeFlightRiskData(data);
             flightData = flightRisk.flightData.toString();
             departureTimeLocal = flightRisk.departureTimeLocal;
             arrivalTimeLocal = flightRisk.arrivalTimeLocal;
@@ -181,22 +200,6 @@ contract FlightNft is
     }
 
 
-    /**
-     * returns the flight product address.
-     */
-    function getChainNft() external view returns (address) {
-        return address(_chainNft);
-    }
-
-
-    /**
-     * returns the flight product address.
-     */
-    function getFlightProduct() external view returns (address) {
-        return address(_flightProduct);
-    }
-
-
     function toString(uint256 value) public pure returns (string memory) {
         if (value == 0) {
             return "0";

package/contracts/examples/flight/FlightOracle.sol

@@ -3,11 +3,10 @@ pragma solidity ^0.8.20;
 
 import {IAuthorization} from "../../authorization/IAuthorization.sol";
 
-import {ACTIVE, FULFILLED, FAILED} from "../../type/StateId.sol";
+import {ACTIVE, FAILED} from "../../type/StateId.sol";
 import {NftId} from "../../type/NftId.sol";
 import {BasicOracle} from "../../oracle/BasicOracle.sol";
 import {RequestId} from "../../type/RequestId.sol";
-import {LibRequestIdSet} from "../../type/RequestIdSet.sol";
 import {RiskId} from "../../type/RiskId.sol";
 import {StateId} from "../../type/StateId.sol";
 import {Str} from "../../type/String.sol";
@@ -33,9 +32,6 @@ contract FlightOracle is
     event LogFlightOracleResponseSent(RequestId requestId, bytes1 status, int256 delay);
     event LogFlightOracleRequestCancelled(RequestId requestId);
 
-    // TODO decide if this variable should be moved to instance store
-    // if so it need to manage active requests by requestor nft id
-    LibRequestIdSet.Set internal _activeRequests;
 
 
     constructor(
@@ -99,52 +95,10 @@ contract FlightOracle is
 
         // effects + interaction (via framework to receiving component)
         _respond(requestId, responseData);
-
-        // TODO decide if the code below should be moved to GIF
-        _updateRequestState(requestId);
-    }
-
-
-    function updateRequestState(
-        RequestId requestId
-    )
-        external
-        restricted()
-    {
-        _updateRequestState(requestId);
     }
 
     //--- view functions ----------------------------------------------------//
 
-    // TODO decide if the code below should be moved to GIF
-    function activeRequests()
-        external
-        view
-        returns(uint256 numberOfRequests)
-    {
-        return LibRequestIdSet.size(_activeRequests);
-    }
-
-
-    // TODO decide if the code below should be moved to GIF
-    function getActiveRequest(uint256 idx)
-        external
-        view
-        returns(RequestId requestId)
-    {
-        return LibRequestIdSet.getElementAt(_activeRequests, idx);
-    }
-
-
-    function isActiveRequest(RequestId requestId)
-        external
-        view
-        returns(bool isActive)
-    {
-        return LibRequestIdSet.contains(_activeRequests, requestId);
-    }
-
-
     function getRequestState(RequestId requestId)
         external
         view
@@ -172,55 +126,4 @@ contract FlightOracle is
         return abi.decode(data, (FlightStatusRequest));
     }
 
-    //--- internal functions ------------------------------------------------//
-
-
-    // TODO decide if the code below should be moved to GIF
-    // check callback result
-    function _updateRequestState(
-        RequestId requestId
-    )
-        internal
-    {
-        bool requestFulfilled = _getInstanceReader().getRequestState(
-            requestId) == FULFILLED();
-
-        // remove from active requests when successful
-        if (requestFulfilled && LibRequestIdSet.contains(_activeRequests, requestId)) {
-            LibRequestIdSet.remove(_activeRequests, requestId);
-        } 
-    }
-
-
-    /// @dev use case specific handling of oracle requests
-    /// for now only log is emitted to verify that request has been received by oracle component 
-    function _request(
-        RequestId requestId,
-        NftId requesterId,
-        bytes calldata requestData,
-        Timestamp expiryAt
-    )
-        internal
-        virtual override
-    {
-        FlightStatusRequest memory request = abi.decode(requestData, (FlightStatusRequest));
-
-        // TODO decide if the line below should be moved to GIF
-        LibRequestIdSet.add(_activeRequests, requestId);
-        emit LogFlightOracleRequestReceived(requestId, requesterId);
-    }
-
-
-    /// @dev use case specific handling of oracle requests
-    /// for now only log is emitted to verify that cancelling has been received by oracle component 
-    function _cancel(
-        RequestId requestId
-    )
-        internal
-        virtual override
-    {
-        // TODO decide if the line below should be moved to GIF
-        LibRequestIdSet.remove(_activeRequests, requestId);
-        emit LogFlightOracleRequestCancelled(requestId);
-    }
 }

package/contracts/examples/flight/FlightOracleAuthorization.sol

@@ -49,9 +49,8 @@ contract FlightOracleAuthorization
         functions = _authorizeForTarget(getMainTargetName(), STATUS_PROVIDER_ROLE);
         _authorize(functions, FlightOracle.respondWithFlightStatus.selector, "respondWithFlightStatus");
 
-        // authorize public role (additional authz via onlyOwner)
-        functions = _authorizeForTarget(getMainTargetName(), PUBLIC_ROLE());
-        _authorize(functions, FlightOracle.updateRequestState.selector, "updateRequestState");
+        // // authorize public role (additional authz via onlyOwner)
+        // functions = _authorizeForTarget(getMainTargetName(), PUBLIC_ROLE());
     }
 }
 

package/contracts/examples/flight/FlightProduct.sol

@@ -216,12 +216,12 @@ contract FlightProduct is
     }
 
 
-    function resendRequest(RequestId requestId)
+    function resendResponse(RequestId requestId)
         external
         virtual
         restricted()
     {
-        _resendRequest(requestId);
+        _resendResponse(requestId);
     }
 
 

package/contracts/examples/flight/FlightProductAuthorization.sol

@@ -57,7 +57,7 @@ contract FlightProductAuthorization
 
         // authorize public role (additional authz via onlyOwner)
         functions = _authorizeForTarget(getMainTargetName(), PUBLIC_ROLE());
-        _authorize(functions, FlightProduct.resendRequest.selector, "resendRequest");
+        _authorize(functions, FlightProduct.resendResponse.selector, "resendResponse");
         _authorize(functions, FlightProduct.processPayoutsAndClosePolicies.selector, "processPayoutsAndClosePolicies");
         _authorize(functions, FlightProduct.setConstants.selector, "setConstants");
         _authorize(functions, FlightProduct.setTestMode.selector, "setTestMode");