Merge pull request #125 from tkernell/tellor2

Update Tellor Module
gnosisguild · Jun 27, 2023 · deeda04 · deeda04
2 parents 7df829d + 4854494
commit deeda04
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 5 deletions.
diff --git a/sdk/abi/Tellor.json b/sdk/abi/Tellor.json
@@ -1,6 +1,11 @@
 [
   {
     "inputs": [
+      {
+        "internalType": "address",
+        "name": "_owner",
+        "type": "address"
+      },
       {
         "internalType": "address",
         "name": "_avatar",
@@ -562,6 +567,11 @@
         "internalType": "string",
         "name": "_proposalId",
         "type": "string"
+      },
+      {
+        "internalType": "bytes32[]",
+        "name": "_txHashes",
+        "type": "bytes32[]"
       }
     ],
     "name": "getQueryId",
@@ -572,7 +582,7 @@
         "type": "bytes32"
       }
     ],
-    "stateMutability": "pure",
+    "stateMutability": "view",
     "type": "function"
   },
   {
@@ -712,6 +722,37 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "string",
+        "name": "_proposalId",
+        "type": "string"
+      },
+      {
+        "internalType": "bytes32[]",
+        "name": "_txHashes",
+        "type": "bytes32[]"
+      }
+    ],
+    "name": "markProposalAsInvalid",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "bytes32",
+        "name": "_proposalHash",
+        "type": "bytes32"
+      }
+    ],
+    "name": "markProposalAsInvalidByHash",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [
       {

diff --git a/sdk/contracts.ts b/sdk/contracts.ts
@@ -113,7 +113,7 @@ const CanonicalAddresses: Record<
     "1.0.0": "0x33D1C5A5B6a7f3885c7467e829aaa21698937597",
   },
   [KnownContracts.TELLOR]: {
-    "2.0.0": "0xcc4C0ED5958770B5036189394360C33DDECf8414",
+    "2.1.0": "0xa89EC2C1e218CfBb0F82829E95352CeAbDEe9A69",
   },
   [KnownContracts.OPTIMISTIC_GOVERNOR]: {
     "1.0.0": "",
@@ -157,12 +157,18 @@ export const ContractVersions: Record<
     [KnownContracts.OPTIMISTIC_GOVERNOR]: {
       "1.2.0": "0x28CeBFE94a03DbCA9d17143e9d2Bd1155DC26D5d",
     },
+    [KnownContracts.TELLOR]: {
+      "2.1.0": "0xaB80413Ab8C4aF91Af5F349352a0c92CF3A30D18",
+    },
   },
   [SupportedNetworks.Goerli]: {
     ...CanonicalAddresses,
     [KnownContracts.OPTIMISTIC_GOVERNOR]: {
       "1.2.0": "0x07a7Be7AA4AaD42696A17e974486cb64A4daC47b",
     },
+    [KnownContracts.TELLOR]: {
+      "2.1.0": "0x4FCba614bf5df50b2575a5825adbc4739aE6FDF5",
+    },
   },
   [SupportedNetworks.BinanceSmartChain]: CanonicalAddresses,
   [SupportedNetworks.GnosisChain]: {
@@ -181,14 +187,12 @@ export const ContractVersions: Record<
   [SupportedNetworks.Mumbai]: CanonicalAddresses,
   [SupportedNetworks.ArbitrumOne]: {
     ...CanonicalAddresses,
-    [KnownContracts.TELLOR]: {},
     [KnownContracts.OPTIMISTIC_GOVERNOR]: {
       "1.2.0": "0x30679ca4ea452d3df8a6c255a806e08810321763",
     },
   },
   [SupportedNetworks.Optimism]: {
     ...CanonicalAddresses,
-    [KnownContracts.TELLOR]: {},
     [KnownContracts.OPTIMISTIC_GOVERNOR]: {
       "1.2.0": "0x357fe84E438B3150d2F68AB9167bdb8f881f3b9A",
     },

diff --git a/sdk/factory/types.ts b/sdk/factory/types.ts
@@ -45,7 +45,7 @@ export enum KnownContracts {
 
 // type META_GUARD_VERSION = "v1.0.0";
 // type OPTIMISTIC_GOVERNOR_VERSION = "v1.0.0";
-// type TELLOR_VERSION = "v2.0.0";
+// type TELLOR_VERSION = "v2.1.0";
 // type REALITY_ETH_VERSION = "v1.0.0";
 // type BRIDGE_VERSION = "v1.0.0";
 // type DELAY_VERSION = "v1.0.0";