fixed broken sigs with 712 domains

GenerationSoftware · Apr 30, 2024 · d1db7df · d1db7df
1 parent 56821aa
commit d1db7df
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/packages/hyperstructure-client-js/package.json b/packages/hyperstructure-client-js/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@generationsoftware/hyperstructure-client-js",
   "description": "Lightweight library for interacting with PoolTogether contracts",
-  "version": "1.12.2",
+  "version": "1.12.3",
   "license": "MIT",
   "main": "./dist/index.mjs",
   "types": "./dist/index.d.ts",

diff --git a/packages/hyperstructure-react-hooks/package.json b/packages/hyperstructure-react-hooks/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@generationsoftware/hyperstructure-react-hooks",
   "description": "React hooks library for interacting with PoolTogether contracts",
-  "version": "1.16.3",
+  "version": "1.16.4",
   "license": "MIT",
   "main": "./dist/index.mjs",
   "types": "./dist/index.d.ts",

diff --git a/shared/utilities/utils/tokens.ts b/shared/utilities/utils/tokens.ts
@@ -180,26 +180,27 @@ export const getTokenDomain = async (publicClient: PublicClient, tokenAddress: A
 
     domain.name = eip712Domain[1]
     domain.version = eip712Domain[2]
-    domain.verifyingContract = eip712Domain[4]
-    domain.salt = eip712Domain[5]
+    // TODO: for some reason, adding salt and verifying contract from domain breaks sigs
+    // domain.verifyingContract = eip712Domain[4]
+    // domain.salt = eip712Domain[5]
 
     return domain
   } catch {
     try {
-      const version = await publicClient.readContract({
+      const name = await publicClient.readContract({
         address: tokenAddress,
         abi: erc20ABI,
-        functionName: 'version'
+        functionName: 'name'
       })
 
-      const name = await publicClient.readContract({
+      const version = await publicClient.readContract({
         address: tokenAddress,
         abi: erc20ABI,
-        functionName: 'name'
+        functionName: 'version'
       })
 
-      domain.version = version
       domain.name = name
+      domain.version = version
 
       return domain
     } catch {
@@ -217,13 +218,6 @@ export const getTokenPermitSupport = async (
   publicClient: PublicClient,
   tokenAddress: Address
 ): Promise<'eip2612' | 'daiPermit' | 'none'> => {
-  if (
-    tokenAddress.toLowerCase() === '0xdb1fe6da83698885104da02a6e0b3b65c0b0de80' ||
-    tokenAddress.toLowerCase() === '0x6da98bde0068d10ddd11b468b197ea97d96f96bc'
-  ) {
-    return 'none'
-  }
-
   try {
     await publicClient.simulateContract({
       address: tokenAddress,