diff --git a/package.json b/package.json
index 3a047ca..4006733 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@studydefi/money-legos",
-  "version": "2.3.5",
+  "version": "2.3.6",
   "main": "index.js",
   "types": "index.d.ts",
   "repository": "git@github.com:studydefi/money-legos.git",
diff --git a/src/uma/abi/AddressWhitelist.json b/src/uma/abi/AddressWhitelist.json
index fbdeeaa..449faee 100644
--- a/src/uma/abi/AddressWhitelist.json
+++ b/src/uma/abi/AddressWhitelist.json
@@ -55,7 +55,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [],
@@ -94,7 +95,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [
@@ -113,7 +115,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [
@@ -158,7 +161,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [],
@@ -171,6 +175,7 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   }
 ]
\ No newline at end of file
diff --git a/src/uma/abi/ExpiringMultiParty.json b/src/uma/abi/ExpiringMultiParty.json
index ba2cc36..08e9b29 100644
--- a/src/uma/abi/ExpiringMultiParty.json
+++ b/src/uma/abi/ExpiringMultiParty.json
@@ -286,6 +286,12 @@
         "internalType": "uint256",
         "name": "liquidatedCollateral",
         "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "liquidationTime",
+        "type": "uint256"
       }
     ],
     "name": "LiquidationCreated",
@@ -348,6 +354,12 @@
         "internalType": "enum Liquidatable.Status",
         "name": "liquidationStatus",
         "type": "uint8"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "settlementPrice",
+        "type": "uint256"
       }
     ],
     "name": "LiquidationWithdrawn",
diff --git a/src/uma/abi/ExpiringMultiPartyCreator.json b/src/uma/abi/ExpiringMultiPartyCreator.json
index 27402f8..57e5447 100644
--- a/src/uma/abi/ExpiringMultiPartyCreator.json
+++ b/src/uma/abi/ExpiringMultiPartyCreator.json
@@ -6,11 +6,6 @@
         "name": "_finderAddress",
         "type": "address"
       },
-      {
-        "internalType": "address",
-        "name": "_collateralTokenWhitelist",
-        "type": "address"
-      },
       {
         "internalType": "address",
         "name": "_tokenFactoryAddress",
@@ -44,45 +39,6 @@
     "name": "CreatedExpiringMultiParty",
     "type": "event"
   },
-  {
-    "inputs": [],
-    "name": "STRICT_LIQUIDATION_LIVENESS",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "STRICT_WITHDRAWAL_LIVENESS",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "collateralTokenWhitelist",
-    "outputs": [
-      {
-        "internalType": "contract AddressWhitelist",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "getCurrentTime",
@@ -135,25 +91,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "name": "validExpirationTimestamps",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [
       {
@@ -242,6 +179,16 @@
             "internalType": "struct FixedPoint.Unsigned",
             "name": "minSponsorTokens",
             "type": "tuple"
+          },
+          {
+            "internalType": "uint256",
+            "name": "withdrawalLiveness",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "liquidationLiveness",
+            "type": "uint256"
           }
         ],
         "internalType": "struct ExpiringMultiPartyCreator.Params",
diff --git a/src/uma/abi/FinancialContractsAdmin.json b/src/uma/abi/FinancialContractsAdmin.json
index 8d1889c..73a04a8 100644
--- a/src/uma/abi/FinancialContractsAdmin.json
+++ b/src/uma/abi/FinancialContractsAdmin.json
@@ -29,7 +29,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [],
diff --git a/src/uma/abi/Finder.json b/src/uma/abi/Finder.json
index 8b7cc59..a9a0d97 100644
--- a/src/uma/abi/Finder.json
+++ b/src/uma/abi/Finder.json
@@ -54,7 +54,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [],
@@ -67,7 +68,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [],
@@ -124,6 +126,7 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   }
 ]
\ No newline at end of file
diff --git a/src/uma/abi/IdentifierWhitelist.json b/src/uma/abi/IdentifierWhitelist.json
index ad78a36..26071c9 100644
--- a/src/uma/abi/IdentifierWhitelist.json
+++ b/src/uma/abi/IdentifierWhitelist.json
@@ -55,7 +55,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [],
@@ -120,6 +121,7 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   }
 ]
\ No newline at end of file
diff --git a/src/uma/abi/Registry.json b/src/uma/abi/Registry.json
index 326f6c2..5c1cdc5 100644
--- a/src/uma/abi/Registry.json
+++ b/src/uma/abi/Registry.json
@@ -182,7 +182,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [
@@ -201,7 +202,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [
@@ -225,7 +227,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [
@@ -244,7 +247,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [
@@ -356,7 +360,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [
@@ -375,7 +380,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [],
@@ -388,7 +394,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [
@@ -412,6 +419,7 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   }
 ]
\ No newline at end of file
diff --git a/src/uma/abi/Store.json b/src/uma/abi/Store.json
index 9de376a..7c658a6 100644
--- a/src/uma/abi/Store.json
+++ b/src/uma/abi/Store.json
@@ -180,7 +180,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [
@@ -217,7 +218,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [],
@@ -230,7 +232,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [],
@@ -243,7 +246,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [
@@ -262,7 +266,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [
@@ -286,7 +291,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [
@@ -361,7 +367,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [],
@@ -374,7 +381,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [
@@ -412,7 +420,8 @@
     "name": "payOracleFees",
     "outputs": [],
     "stateMutability": "payable",
-    "type": "function"
+    "type": "function",
+    "payable": true
   },
   {
     "inputs": [
@@ -492,7 +501,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [
@@ -518,7 +528,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [
diff --git a/src/uma/abi/Voting.json b/src/uma/abi/Voting.json
index 4de8978..9022700 100644
--- a/src/uma/abi/Voting.json
+++ b/src/uma/abi/Voting.json
@@ -423,6 +423,19 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "snapshotMessage",
+    "outputs": [
+      {
+        "internalType": "bytes32",
+        "name": "",
+        "type": "bytes32"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "timerAddress",
@@ -608,7 +621,13 @@
     "type": "function"
   },
   {
-    "inputs": [],
+    "inputs": [
+      {
+        "internalType": "bytes",
+        "name": "signature",
+        "type": "bytes"
+      }
+    ],
     "name": "snapshotCurrentRound",
     "outputs": [],
     "stateMutability": "nonpayable",
diff --git a/src/uma/abi/VotingToken.json b/src/uma/abi/VotingToken.json
index 1ddb798..ca11b8f 100644
--- a/src/uma/abi/VotingToken.json
+++ b/src/uma/abi/VotingToken.json
@@ -182,7 +182,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [
@@ -225,7 +226,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [
@@ -249,7 +251,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [
@@ -275,7 +278,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [
@@ -318,7 +322,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [
@@ -342,7 +347,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [
@@ -403,7 +409,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [
@@ -465,7 +472,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [],
@@ -478,7 +486,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [
@@ -497,7 +506,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [
diff --git a/src/uma/abi/WETH9.json b/src/uma/abi/WETH9.json
index 3c32b42..25bce4f 100644
--- a/src/uma/abi/WETH9.json
+++ b/src/uma/abi/WETH9.json
@@ -89,7 +89,8 @@
   },
   {
     "stateMutability": "payable",
-    "type": "fallback"
+    "type": "fallback",
+    "payable": true
   },
   {
     "inputs": [
@@ -113,7 +114,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [
@@ -132,7 +134,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [],
@@ -145,7 +148,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [],
@@ -158,7 +162,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [],
@@ -171,18 +176,21 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "stateMutability": "payable",
-    "type": "receive"
+    "type": "receive",
+    "payable": true
   },
   {
     "inputs": [],
     "name": "deposit",
     "outputs": [],
     "stateMutability": "payable",
-    "type": "function"
+    "type": "function",
+    "payable": true
   },
   {
     "inputs": [
@@ -208,7 +216,8 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function"
+    "type": "function",
+    "constant": true
   },
   {
     "inputs": [