fix #1: remove oracle types, triggered by change in gif-interface

Author: matthiaszimmermann

README.md

@@ -140,7 +140,12 @@ Start the "Fire Insurance" API sever.
 uvicorn server.api:app --log-level info --host 0.0.0.0 --reload
 ```
 
-After the application startup has completed open the OpenAPI UI in your web browser
+In case the above command leads to error messages like 
+`brownie.exceptions.ContractNotFound: No contract deployed at 0x...` 
+this might caused by brownie book keeping of previous contracts that is probably not relevant in your situation.
+In this case delete the files in directory `build/deployments/*` and try to start the API server again.
+
+After the application startup has completed successfully open the OpenAPI UI in your web browser
 [http://localhost:8000/docs](http://localhost:8000/docs).
 
 ### Deploy the "Fire Insurance" Product

brownie-config.yaml

@@ -9,7 +9,7 @@ compiler:
         # 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.2.0-staging-b"
+          - "@gif-interface=etherisc/gif-interface@1.3.0-staging"
     vyper:
         version: null
 
@@ -19,7 +19,7 @@ compiler:
 dependencies:
     # github dependency format: <owner>/<repository>@<release>
     - OpenZeppelin/openzeppelin-contracts@4.5.0
-    - etherisc/gif-interface@1.2.0-staging-b
+    - etherisc/gif-interface@1.3.0-staging
 
 # exclude Ownable when calculating test coverage
 # https://eth-brownie.readthedocs.io/en/v1.10.3/config.html#exclude_paths

contracts/example/fire/FireInsurance.sol

@@ -17,7 +17,6 @@ contract FireInsurance is Product {
     string public constant CALLBACK_METHOD_NAME = "oracleCallback";
 
     // variables
-    bytes32 public fireOracleType;
     uint256 public fireOracleId;
     uint256 public uniqueIndex;
 
@@ -33,12 +32,10 @@ contract FireInsurance is Product {
     constructor(
         address gifProductService,
         bytes32 productName,
-        bytes32 oracleType,
         uint256 oracleId
     )
         Product(gifProductService, productName, POLICY_FLOW)
     {
-        fireOracleType = oracleType;
         fireOracleId = oracleId;
     }
 
@@ -81,7 +78,6 @@ contract FireInsurance is Product {
             policyId,
             abi.encode(objectName),
             CALLBACK_METHOD_NAME,
-            fireOracleType,
             fireOracleId
         );
 

contracts/example/fire/FireOracle.sol

@@ -11,10 +11,9 @@ contract FireOracle is Oracle {
     constructor(
         address gifOracleService,
         address gifOracleOwnerService,
-        bytes32 oracleTypeName,
         bytes32 oracleName
     )
-        Oracle(gifOracleService, gifOracleOwnerService, oracleTypeName, oracleName)
+        Oracle(gifOracleService, gifOracleOwnerService, oracleName)
     { }
 
     function request(uint256 requestId, bytes calldata input) 

contracts/example/helloworld/HelloWorldInsurance.sol

@@ -22,7 +22,6 @@ contract HelloWorldInsurance is IHelloWorldInsurance, Product {
     string public constant CALLBACK_METHOD_NAME = "greetingCallback";
 
     uint256 public uniqueIndex;
-    bytes32 public greetingsOracleType;
     uint256 public greetingsOracleId;
 
     mapping(bytes32 => address) public policyIdToAddress;
@@ -31,12 +30,10 @@ contract HelloWorldInsurance is IHelloWorldInsurance, Product {
     constructor(
         address gifProductService,
         bytes32 productName,
-        bytes32 oracleType,
         uint256 oracleId
     )
         Product(gifProductService, productName, POLICY_FLOW)
     {
-        greetingsOracleType = oracleType;
         greetingsOracleId = oracleId;
     }
 
@@ -76,7 +73,6 @@ contract HelloWorldInsurance is IHelloWorldInsurance, Product {
             policyId,
             abi.encode(greeting),
             CALLBACK_METHOD_NAME,
-            greetingsOracleType,
             greetingsOracleId
         );
 

contracts/example/helloworld/HelloWorldOracle.sol

@@ -20,10 +20,9 @@ contract HelloWorldOracle is Oracle {
     constructor(
         address gifOracleService,
         address gifOracleOwnerService,
-        bytes32 oracleTypeName,
         bytes32 oracleName
     )
-        Oracle(gifOracleService, gifOracleOwnerService, oracleTypeName, oracleName)
+        Oracle(gifOracleService, gifOracleOwnerService, oracleName)
     { }
 
     function request(uint256 requestId, bytes calldata input) 

contracts/example/test/TestOracle.sol

@@ -9,10 +9,9 @@ contract TestOracle is Oracle {
     constructor(
         address gifOracleService,
         address gifOracleOwnerService,
-        bytes32 oracleTypeName,
         bytes32 oracleName
     )
-        Oracle(gifOracleService, gifOracleOwnerService, oracleTypeName, oracleName)
+        Oracle(gifOracleService, gifOracleOwnerService, oracleName)
     { }
 
     function request(uint256 requestId, bytes calldata input) external override onlyQuery {

contracts/example/test/TestProduct.sol

@@ -63,7 +63,6 @@ contract TestProduct is Product {
             policyId,
             abi.encode(_claims),
             ORACLE_CALLBACK_METHOD_NAME,
-            _testOracleType,
             _testOracleId
         );
     }

contracts/shared/InstanceHelper.sol

@@ -28,7 +28,6 @@ contract InstanceHelper {
         _productService = IProductService(_registry.getContractFromRegistry(PRODUCT_SERVICE));
     }
 
-    function oracleTypes() external view returns (uint256) { return _operatorService.oracleTypes(); }
     function oracles() external view returns (uint256) { return _operatorService.oracles(); }
     function products() external view returns (uint256) { return _operatorService.products(); }
 

scripts/fire.py

@@ -21,8 +21,6 @@ def __init__(
             'Fire', 
             FireInsurance, 
             productOwner, 
-            '(bytes input)', 
-            '(bytes1 fireCategory)', 
             FireOracle,
             oracleOwner,
             instance,