Fix: update contracts, tests, abis

py_order_utils/builders/base_builder.py

@@ -14,7 +14,7 @@ def __init__(self, exchange_address: str, chain_id: int, signer: Signer):
 
     def _get_domain_separator(self, chain_id: int, verifying_contract: str)->EIP712Struct:
         return make_domain(
-            name="1inch Limit Order Protocol",
+            name="Polymarket Limit Order Protocol",
             version="1",
             chainId=str(chain_id),
             verifyingContract=verifying_contract,

py_order_utils/builders/limit_order_builder.py

@@ -79,8 +79,6 @@ def build_limit_order(self, data: LimitOrderData)-> LimitOrder:
             getMakerAmount=get_maker_amount,
             getTakerAmount=get_taker_amount,
             predicate=predicate,
-            permit=data.permit,
-            interaction=data.interaction,
             signer=signer,
             sigType=data.sig_type
         )

py_order_utils/config.py

@@ -27,8 +27,8 @@ def get_conditional(self):
     ),
 
     80001: ContractConfig(
-        exchange="0xe8DaCEd3A06A59ADADF804771d10684A6E536ffd", 
-        executor="0xA15b04F6eb916f2e368Aeb17740a52b0379B8B6D", 
+        exchange="0x6D486b31b5c0f724828Aff07c88606b213B0D196", 
+        executor="0x6b0ab7A1E65ea6AE9072f6c45B4261ACDfB30827", 
         collateral="0x2E8DCfE708D44ae2e406a1c02DFE2Fa13012f961",
         conditional = "0x7D8610E9567d2a6C9FBf66a5A13E9Ba8bb120d43"
     )

py_order_utils/constants.py

@@ -1,6 +1,4 @@
 
-PROTOCOL_NAME = '1inch Limit Order Protocol'
-PROTOCOL_VERSION = '1'
 ZX = '0x'
 ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'
 

py_order_utils/facades/erc1155_facade.py

@@ -6,7 +6,7 @@ class Erc1155Facade(BaseFacade):
     """
     Facade for ERC1155 transfers and balance
     """
-    ABIS = {"erc1155": "abi/ERC1155ABI.json", "lop": "abi/LimitOrderProtocol.json"}
+    ABIS = {"erc1155": "abi/ERC1155ABI.json", "lop": "abi/PolyLimitOrderProtocol.json"}
     transferFrom = "func_733NCGU"
     balanceOf = "balanceOf"
 

py_order_utils/facades/limit_order_facade.py

@@ -8,7 +8,7 @@ class LimitOrderProtocolFacade(BaseFacade):
     Limit Order protocol facade
     """
 
-    ABIS = {"lop": "abi/LimitOrderProtocol.json"}
+    ABIS = {"lop": "abi/PolyLimitOrderProtocol.json"}
 
     def __init__(self):
         super().__init__(self.ABIS)

py_order_utils/model/model.py

@@ -25,8 +25,6 @@ class LimitOrderData:
     signer: str = None
     sig_type: int = EOA
     predicate: str = ZX
-    permit: str = ZX
-    interaction: str = ZX
 
 
 class LimitOrder(EIP712Struct):
@@ -41,8 +39,6 @@ class LimitOrder(EIP712Struct):
     getMakerAmount = Bytes()
     getTakerAmount = Bytes()
     predicate = Bytes()
-    permit = Bytes()
-    interaction = Bytes()
     signer= Address()
     sigType = Uint(256)
 
@@ -56,8 +52,6 @@ def dict(self):
                 "getMakerAmount": self["getMakerAmount"],
                 "getTakerAmount": self["getTakerAmount"],
                 "predicate": self["predicate"],
-                "permit": self["permit"],
-                "interaction": self["interaction"],
                 "signer": self["signer"],
                 "sigType": self["sigType"],
         }

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="py_order_utils",
-    version="0.0.18",
+    version="0.0.19",
     author="Jonathan Amenechi",
     author_email="jonathanamenechi@gmail.com",
     description="Python utilities used to generate and sign limit and market orders on Polymarket's CLOB",

tests/test_limit_order_builder.py

@@ -73,16 +73,6 @@ def test_build_limit_order(self):
             "0x961d5b1e000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000002000000000000000000000000cf7ed3acca5a467e9e704c703e8d87f634fb0fc9000000000000000000000000cf7ed3acca5a467e9e704c703e8d87f634fb0fc90000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000002463592c2b0000000000000000000000000000000000000000000000000000000061f5119f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000044cf6fc6e300000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             limit_order["predicate"]
         )
-
-        self.assertEqual(
-            "0x",
-            limit_order["permit"]
-        )
-
-        self.assertEqual(
-            "0x",
-            limit_order["interaction"]
-        )
 
         self.assertEqual(
             "0x70997970C51812dc3A010C7d01b50e0d17dc79C8",
@@ -96,29 +86,27 @@ def test_build_limit_order(self):
 
     def test_build_signature(self):
         signer = mock.MagicMock()
-        expected_signature = "0xf3639d0f921eb0e21ea779394808612a846b6a6ee39c7ed7d369a45bc0b9cdaf00022ec65fff31a2124306d27fc471768f04b1da0ac5e483946a4bf70788dade1b"
+        expected_signature = "0xba171a61c9c0bc4453d29d9ab9e3699fd0be7eef8ab6fba1b2c6555ced42f79d7bb5a07f975b1bfaf7bccf7b8e89e1877ba717090a4e9934136f6e6743a7146b1b"
 
         # Instead of using a private key, unit tests mock the expected signature response
         signer.sign.return_value = expected_signature
-        builder = LimitOrderBuilder("0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9", 31337, signer)
+        builder = LimitOrderBuilder("0x0165878A594ca255338adfa4d48449f69242Eb8F", 31337, signer)
 
         order = LimitOrder(
-        salt= 1441990488917,
-        makerAsset="0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512",
-        takerAsset="0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9",
-        makerAssetData="0x23b872dd000000000000000000000000e3d9bfa896af6988f80027bfd13440a42c5ed02b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f4240",
-        takerAssetData="0x23b872e10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e3d9bfa896af6988f80027bfd13440a42c5ed02b000000000000000000000000000000000000000000000000000000000007a1200000000000000000000000005fbdb2315678afecb367f032d93f642f64180aa3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
-        getMakerAmount='0xf4a215c300000000000000000000000000000000000000000000000000000000000f4240000000000000000000000000000000000000000000000000000000000007a120',
-        getTakerAmount='0x296637bf00000000000000000000000000000000000000000000000000000000000f4240000000000000000000000000000000000000000000000000000000000007a120',
-        predicate="0x",
-        permit="0x",
-        interaction="0x",
-        signer='0xe3d9BFA896aF6988f80027bfd13440A42C5ed02b',
-        sigType=0
+            salt=1568294891220,
+            makerAsset='0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512',
+            takerAsset='0x0165878A594ca255338adfa4d48449f69242Eb8F',
+            makerAssetData='0x23b872dd00000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f4240',
+            takerAssetData='0x23b872e1000000000000000000000000000000000000000000000000000000000000000000000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c8000000000000000000000000000000000000000000000000000000000007a1200000000000000000000000005fbdb2315678afecb367f032d93f642f64180aa3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000',
+            getMakerAmount='0xf4a215c300000000000000000000000000000000000000000000000000000000000f4240000000000000000000000000000000000000000000000000000000000007a120',
+            getTakerAmount='0x296637bf00000000000000000000000000000000000000000000000000000000000f4240000000000000000000000000000000000000000000000000000000000007a120',
+            predicate='0x961d5b1e000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000165878a594ca255338adfa4d48449f69242eb8f0000000000000000000000000165878a594ca255338adfa4d48449f69242eb8f0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000002463592c2b00000000000000000000000000000000000000000000000000000000628e1424000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000044cf6fc6e300000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
+            signer='0x70997970C51812dc3A010C7d01b50e0d17dc79C8',
+            sigType=0
         )
 
         # Ensure struct hash is expected(generated via ethers)
-        expected_struct_hash = "0x44b6cebf08a4ebe229ae0c7f5d6f7c7c77f66788e83cf6bba0b6cb9a5dffb3d5"
+        expected_struct_hash = "0xfd94c8eb9dbfabc41329eda323fb9ad4d69eda4f27c1be41cc53c902fb749a4b"
         struct_hash = builder._create_struct_hash(order)
         self.assertEqual(expected_struct_hash, struct_hash.hex())
 

tests/test_market_order_builder.py

@@ -51,14 +51,27 @@ def test_build_market_order(self):
         self.assertEqual(EOA, mkt_order["sigType"])
 
     def test_build_market_order_signature(self):
-        expected_sig = "0x88be65ecb593b31977425933df5332f3da1c7b2b54ca033906035dc3d4fd11850e676164e7073e70ef25f881109b39f5b7321df415bc5572d09918c3063669ee1b"
+        mkt_order_data = MarketOrderData(
+            exchange_address='0x0165878A594ca255338adfa4d48449f69242Eb8F',
+            salt=1028957131466,
+            signer='0x70997970C51812dc3A010C7d01b50e0d17dc79C8',
+            maker_address='0x70997970C51812dc3A010C7d01b50e0d17dc79C8',
+            maker_asset_address='0x5FbDB2315678afecb367f032d93F642f64180aa3',
+            maker_amount=150000000,
+            maker_asset_id=0,
+            taker_asset_address='0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512',
+            taker_asset_id=0,
+            sig_type=0
+        )
+
+        expected_sig = "0x62a1b1b3634d5ba8eca890fd7954247c7dbe1a50211bdff31753b3687bb6d0311f3df23e52401f73be7f2cd407902696479af8d324fdc9836769993786b710d41c"
         signer = mock.MagicMock()
         signer.sign.return_value = expected_sig
 
-        builder = MarketOrderBuilder("0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9", 31337, signer)
-        expected_struct_hash = "0xc568f86a5347e6ace2d4d7eff6215a4669d86ab811be1f9d74ba59717396da90"
+        builder = MarketOrderBuilder("0x0165878A594ca255338adfa4d48449f69242Eb8F", 31337, signer)
+        expected_struct_hash = "0x6b5da848321b92bc4c7d045289484063e6e31aa3197bd2ccecad302f6b043b47"
 
-        mkt_order = builder.build_market_order(self.generate_data())
+        mkt_order = builder.build_market_order(mkt_order_data)
         self.assertEqual(expected_struct_hash, builder._create_struct_hash(mkt_order).hex())
 
         signature = builder.build_market_order_signature(mkt_order)