adapt to gif-interface changes in release v1.5.0-staging-i and cleanup

Author: matthiaszimmermann

brownie-config.yaml

@@ -8,8 +8,8 @@ compiler:
             runs: 200
         # https://eth-brownie.readthedocs.io/en/stable/compile.html#compiler-settings
         remappings:
-          - "@openzeppelin=OpenZeppelin/openzeppelin-contracts@4.5.0"
-          - "@gif-interface=etherisc/gif-interface@1.3.0-staging"
+          - "@openzeppelin=OpenZeppelin/openzeppelin-contracts@4.6.0"
+          - "@gif-interface=etherisc/gif-interface@1.5.0-staging-i"
     vyper:
         version: null
 
@@ -18,8 +18,8 @@ compiler:
 # to list the packages installed via the dependency list below
 dependencies:
     # github dependency format: <owner>/<repository>@<release>
-    - OpenZeppelin/openzeppelin-contracts@4.5.0
-    - etherisc/gif-interface@1.3.0-staging
+    - OpenZeppelin/openzeppelin-contracts@4.6.0
+    - etherisc/gif-interface@1.5.0-staging-i
 
 # exclude Ownable when calculating test coverage
 # https://eth-brownie.readthedocs.io/en/v1.10.3/config.html#exclude_paths

contracts/example/fire/FireInsurance.sol

@@ -1,9 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
-import "@gif-interface/contracts/Product.sol";
 import "./FireOracle.sol";
-
+import "@gif-interface/contracts/components/Product.sol";
 
 contract FireInsurance is Product {
 
@@ -25,20 +24,21 @@ contract FireInsurance is Product {
     // events
     event LogFirePolicyCreated(address policyHolder, string objectName, bytes32 policyId);
     event LogFirePolicyExpired(string objectName, bytes32 policyId);
+    event LogFireOracleCallbackReceived(uint256 requestId, bytes32 policyId, bytes fireCategory);
     event LogFireClaimConfirmed(bytes32 policyId, uint256 claimId, uint256 payoutId, uint256 payoutAmount);
     event LogFirePayoutExecuted(bytes32 policyId, uint256 claimId, uint256 payoutId, uint256 payoutAmount);
 
-    // functions
     constructor(
-        address gifProductService,
         bytes32 productName,
+        address registry,
         uint256 oracleId
     )
-        Product(gifProductService, productName, POLICY_FLOW)
+        Product(productName, POLICY_FLOW, registry)
     {
         fireOracleId = oracleId;
     }
 
+    // functions
     function deposit() public payable {}
 
     function withdraw(uint256 amount) external onlyOwner {
@@ -64,7 +64,7 @@ contract FireInsurance is Product {
 
         // Create new ID for this policy
         uniqueIndex++;
-        policyId = keccak256(abi.encode(productId, policyHolder, objectName, uniqueIndex));
+        policyId = keccak256(abi.encode(getId(), policyHolder, objectName, uniqueIndex));
 
         // Create and underwrite new application
         _newApplication(policyId, abi.encode(policyHolder, objectName, premium));
@@ -103,6 +103,8 @@ contract FireInsurance is Product {
         external
         onlyOracle
     {
+        emit LogFireOracleCallbackReceived(requestId, policyId, response);
+
         // Get policy data for oracle response
         (address payable policyHolder, string memory objectName, uint256 premium) = abi.decode(
             _getApplicationData(policyId), (address, string, uint256));

contracts/example/fire/FireOracle.sol

@@ -1,19 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
-import "@gif-interface/contracts/Oracle.sol";
-
+import "@gif-interface/contracts/components/Oracle.sol";
 
 contract FireOracle is Oracle {
 
-    event LogFireOracleRequest(uint256 requestId, string objectName);
+    event LogFireOracleRequest(
+        uint256 requestId, 
+        string objectName
+    );
 
     constructor(
-        address gifOracleService,
-        address gifOracleOwnerService,
-        bytes32 oracleName
+        bytes32 oracleName,
+        address registry
     )
-        Oracle(gifOracleService, gifOracleOwnerService, oracleName)
+        Oracle(oracleName, registry)
     { }
 
     function request(uint256 requestId, bytes calldata input)