@etherisc/gif-next 3.0.0-f0c22a5-010 → 3.0.0-f142263-886

package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json

@@ -223,95 +223,65 @@
       "anonymous": false,
       "inputs": [
         {
-          "indexed": false,
-          "internalType": "address",
-          "name": "tokenHandler",
-          "type": "address"
+          "indexed": true,
+          "internalType": "NftId",
+          "name": "nftId",
+          "type": "uint96"
         },
         {
-          "indexed": false,
+          "indexed": true,
           "internalType": "address",
-          "name": "token",
+          "name": "owner",
           "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "Amount",
-          "name": "limit",
-          "type": "uint96"
-        },
-        {
-          "indexed": false,
-          "internalType": "bool",
-          "name": "isMaxAmount",
-          "type": "bool"
         }
       ],
-      "name": "LogComponentTokenHandlerApproved",
+      "name": "LogNftOwnableNftLinkedToAddress",
       "type": "event"
     },
     {
       "anonymous": false,
       "inputs": [
         {
-          "indexed": false,
-          "internalType": "address",
-          "name": "oldWallet",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "newWallet",
-          "type": "address"
+          "indexed": true,
+          "internalType": "RequestId",
+          "name": "requestId",
+          "type": "uint64"
         }
       ],
-      "name": "LogComponentWalletAddressChanged",
+      "name": "LogOracleRequestCancelled",
       "type": "event"
     },
     {
       "anonymous": false,
       "inputs": [
         {
-          "indexed": false,
-          "internalType": "address",
-          "name": "from",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "to",
-          "type": "address"
+          "indexed": true,
+          "internalType": "RequestId",
+          "name": "requestId",
+          "type": "uint64"
         },
         {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "amount",
-          "type": "uint256"
+          "indexed": true,
+          "internalType": "NftId",
+          "name": "requesterId",
+          "type": "uint96"
         }
       ],
-      "name": "LogComponentWalletTokensTransferred",
+      "name": "LogOracleRequestReceived",
       "type": "event"
     },
     {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
-        },
+      "inputs": [],
+      "name": "activeRequests",
+      "outputs": [
         {
-          "indexed": false,
-          "internalType": "address",
-          "name": "owner",
-          "type": "address"
+          "internalType": "uint256",
+          "name": "numberOfRequests",
+          "type": "uint256"
         }
       ],
-      "name": "LogNftOwnableNftLinkedToAddress",
-      "type": "event"
+      "stateMutability": "view",
+      "type": "function"
     },
     {
       "inputs": [],
@@ -339,6 +309,25 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "uint256",
+          "name": "idx",
+          "type": "uint256"
+        }
+      ],
+      "name": "getActiveRequest",
+      "outputs": [
+        {
+          "internalType": "RequestId",
+          "name": "requestId",
+          "type": "uint64"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "getAuthorization",
@@ -582,6 +571,25 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "RequestId",
+          "name": "requestId",
+          "type": "uint64"
+        }
+      ],
+      "name": "isActiveRequest",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "isActive",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "isConsumingScheduledOp",

package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2592a963feb4b1d492558b31cde53adc.json"
+  "buildInfo": "../../../build-info/4a920db63dcec7e94b7e117d063533e6.json"
 }

package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json

@@ -286,13 +286,13 @@
       "anonymous": false,
       "inputs": [
         {
-          "indexed": false,
+          "indexed": true,
           "internalType": "NftId",
           "name": "nftId",
           "type": "uint96"
         },
         {
-          "indexed": false,
+          "indexed": true,
           "internalType": "address",
           "name": "owner",
           "type": "address"
@@ -305,13 +305,13 @@
       "anonymous": false,
       "inputs": [
         {
-          "indexed": false,
+          "indexed": true,
           "internalType": "RequestId",
           "name": "requestId",
           "type": "uint64"
         },
         {
-          "indexed": false,
+          "indexed": true,
           "internalType": "address",
           "name": "requesterAddress",
           "type": "address"
@@ -330,13 +330,13 @@
       "anonymous": false,
       "inputs": [
         {
-          "indexed": false,
+          "indexed": true,
           "internalType": "RequestId",
           "name": "requestId",
           "type": "uint64"
         },
         {
-          "indexed": false,
+          "indexed": true,
           "internalType": "NftId",
           "name": "requesterNftId",
           "type": "uint96"
@@ -349,19 +349,19 @@
       "anonymous": false,
       "inputs": [
         {
-          "indexed": false,
+          "indexed": true,
           "internalType": "RequestId",
           "name": "requestId",
           "type": "uint64"
         },
         {
-          "indexed": false,
+          "indexed": true,
           "internalType": "NftId",
           "name": "requesterNftId",
           "type": "uint96"
         },
         {
-          "indexed": false,
+          "indexed": true,
           "internalType": "NftId",
           "name": "oracleNftId",
           "type": "uint96"
@@ -380,13 +380,19 @@
       "anonymous": false,
       "inputs": [
         {
-          "indexed": false,
+          "indexed": true,
           "internalType": "RequestId",
           "name": "requestId",
           "type": "uint64"
         },
         {
-          "indexed": false,
+          "indexed": true,
+          "internalType": "NftId",
+          "name": "requesterNftId",
+          "type": "uint96"
+        },
+        {
+          "indexed": true,
           "internalType": "NftId",
           "name": "oracleNftId",
           "type": "uint96"
@@ -399,13 +405,13 @@
       "anonymous": false,
       "inputs": [
         {
-          "indexed": false,
+          "indexed": true,
           "internalType": "RequestId",
           "name": "requestId",
           "type": "uint64"
         },
         {
-          "indexed": false,
+          "indexed": true,
           "internalType": "NftId",
           "name": "requesterNftId",
           "type": "uint96"

package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2592a963feb4b1d492558b31cde53adc.json"
+  "buildInfo": "../../../build-info/4a920db63dcec7e94b7e117d063533e6.json"
 }

package/artifacts/contracts/oracle/Oracle.sol/Oracle.json

@@ -246,94 +246,51 @@
       "anonymous": false,
       "inputs": [
         {
-          "indexed": false,
-          "internalType": "address",
-          "name": "tokenHandler",
-          "type": "address"
+          "indexed": true,
+          "internalType": "NftId",
+          "name": "nftId",
+          "type": "uint96"
         },
         {
-          "indexed": false,
+          "indexed": true,
           "internalType": "address",
-          "name": "token",
+          "name": "owner",
           "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "Amount",
-          "name": "limit",
-          "type": "uint96"
-        },
-        {
-          "indexed": false,
-          "internalType": "bool",
-          "name": "isMaxAmount",
-          "type": "bool"
         }
       ],
-      "name": "LogComponentTokenHandlerApproved",
+      "name": "LogNftOwnableNftLinkedToAddress",
       "type": "event"
     },
     {
       "anonymous": false,
       "inputs": [
         {
-          "indexed": false,
-          "internalType": "address",
-          "name": "oldWallet",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "newWallet",
-          "type": "address"
+          "indexed": true,
+          "internalType": "RequestId",
+          "name": "requestId",
+          "type": "uint64"
         }
       ],
-      "name": "LogComponentWalletAddressChanged",
+      "name": "LogOracleRequestCancelled",
       "type": "event"
     },
     {
       "anonymous": false,
       "inputs": [
         {
-          "indexed": false,
-          "internalType": "address",
-          "name": "from",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "to",
-          "type": "address"
+          "indexed": true,
+          "internalType": "RequestId",
+          "name": "requestId",
+          "type": "uint64"
         },
         {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "LogComponentWalletTokensTransferred",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
+          "indexed": true,
           "internalType": "NftId",
-          "name": "nftId",
+          "name": "requesterId",
           "type": "uint96"
-        },
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "owner",
-          "type": "address"
         }
       ],
-      "name": "LogNftOwnableNftLinkedToAddress",
+      "name": "LogOracleRequestReceived",
       "type": "event"
     },
     {
@@ -401,6 +358,19 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [],
+      "name": "activeRequests",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "numberOfRequests",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "authority",
@@ -427,6 +397,25 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "uint256",
+          "name": "idx",
+          "type": "uint256"
+        }
+      ],
+      "name": "getActiveRequest",
+      "outputs": [
+        {
+          "internalType": "RequestId",
+          "name": "requestId",
+          "type": "uint64"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "getAuthorization",
@@ -683,6 +672,25 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "RequestId",
+          "name": "requestId",
+          "type": "uint64"
+        }
+      ],
+      "name": "isActiveRequest",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "isActive",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "isConsumingScheduledOp",
@@ -840,7 +848,7 @@
       "inputs": [
         {
           "internalType": "Amount",
-          "name": "amount",
+          "name": "",
           "type": "uint96"
         }
       ],

package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2592a963feb4b1d492558b31cde53adc.json"
+  "buildInfo": "../../../build-info/4a920db63dcec7e94b7e117d063533e6.json"
 }