fix: update token registry package version (#32)

* fix: update token registry package version * fix: update test case * fix: linting * fix: linting
TradeTrust · Nov 5, 2024 · 168d929 · 168d929
1 parent 148cfa1
commit 168d929
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 23 deletions.
diff --git a/examples/v5/raw-documents/example.0.json b/examples/v5/raw-documents/example.0.json
@@ -32,7 +32,7 @@
     "proof": {
       "type": "OpenAttestationProofMethod",
       "method": "TOKEN_REGISTRY",
-      "value": "0x96cc41e7007Dee20eB409586E2e8206d5053219B",
+      "value": "0x0f99945c7ebae71a9a615c422d716fe1eeab2b2e",
       "revocation": {
         "type": "NONE"
       }

diff --git a/examples/v5/wrapped-documents/example.0.json b/examples/v5/wrapped-documents/example.0.json
@@ -32,7 +32,7 @@
     "proof": {
       "type": "OpenAttestationProofMethod",
       "method": "TOKEN_REGISTRY",
-      "value": "0x96cc41e7007Dee20eB409586E2e8206d5053219B",
+      "value": "0x0f99945c7ebae71a9a615c422d716fe1eeab2b2e",
       "revocation": {
         "type": "NONE"
       }
@@ -56,10 +56,10 @@
   "proof": {
     "type": "OpenAttestationMerkleProofSignature2018",
     "proofPurpose": "assertionMethod",
-    "targetHash": "042ff9d3c76b60ff4cb5cea2a21306da1be1989e31f0879b1d8c3c82848b1e10",
+    "targetHash": "c552c365670f15fbb31486b2d96c15b1cc5fd53b6f178f4e7075c156119deed2",
     "proofs": [],
-    "merkleRoot": "042ff9d3c76b60ff4cb5cea2a21306da1be1989e31f0879b1d8c3c82848b1e10",
-    "salts": "W3sidmFsdWUiOiIzMGQ2NTVkN2ZjZTQ3NWIwZjNkMzk1NzAyOGE1NzBjMDY4MDA5M2Q2YWI4ZjliNTFiODU5M2UyYTcxNjEwNmZiIiwicGF0aCI6InZlcnNpb24ifSx7InZhbHVlIjoiOTIwOTYyNGYxNTIzNWQ3NDc3YjEwOWMyMGZmNTMwYjcxYjRiYjA2ZTk1NzY5ZjE3OWMxMTA5YTlkNzhmZmNlNiIsInBhdGgiOiJuZXR3b3JrLmNoYWluIn0seyJ2YWx1ZSI6ImJiNmI1ZjJhYmFmMzRlYWQ1NzZhNDM2ODA2YzhmZDJkOThmOGRhM2QyZTY3NDJhYjFiMjQ1NTQyNjc0MTJlYTkiLCJwYXRoIjoibmV0d29yay5jaGFpbklkIn0seyJ2YWx1ZSI6ImU0NWIxMTM1YjNhMWMxZWEyZDcwYmUxMmRiYzc2M2Y0OGQ4YmQ5MmY5MDhiNWU3OTc3NTQ2ZDQ4ZDlkNTU0NWEiLCJwYXRoIjoiQGNvbnRleHRbMF0ifSx7InZhbHVlIjoiOTA5YmY3ZDI1NzAxNDhiZTdiMTcyNzUzM2JlMzdiMjNjN2Y4MmM2Njk5YzE1ODE3MjFhZjMzY2UwYWY1MzhiNCIsInBhdGgiOiJAY29udGV4dFsxXSJ9LHsidmFsdWUiOiI5NTE2OGEyNDhkNDA1MjFjOWRmYmYzZTNjMjlmZjczMzNkMDA5MjE4OTc5MDBjODY1MzI1ZWY2MzEyODVlZDE3IiwicGF0aCI6IkBjb250ZXh0WzJdIn0seyJ2YWx1ZSI6ImQ2ZDkzYWNmYjI4MjJiMDYxNzY5MjAzNWE4NjZkMDNmZDY2ZjMzNTZmMmQzYjg0YTNmMTYxZmYzYzU0NGU3ZTQiLCJwYXRoIjoiY3JlZGVudGlhbFN1YmplY3QuYmxOdW1iZXIifSx7InZhbHVlIjoiYzU4ZTU3OWExM2IzYWU3MWVmNTdjNjAzNzEzY2VmMjUyMDQ2NjEzOTcxNTJjNjg1YWNkMDA3ZjA4MTAwYjgzYSIsInBhdGgiOiJjcmVkZW50aWFsU3ViamVjdC5zY2FjIn0seyJ2YWx1ZSI6IjI0YzJiM2VjZDU4ZjU0NGRjMzNjMDEzYjQxNmEzN2UyYWNlY2JmYTg5MTI1M2VhY2VhODA3NTRiMWUyOTQ1YzUiLCJwYXRoIjoiY3JlZGVudGlhbFN1YmplY3QubGlua3Muc2VsZi5ocmVmIn0seyJ2YWx1ZSI6IjZlNzYwZTUxMzBlODIxN2FmN2E1NzE2NmVmNWIyYTA4NzdjYjM3YzM5MzQ5ZGZmZjc5OWQwMDU0YWRiNTAyYzEiLCJwYXRoIjoib3BlbkF0dGVzdGF0aW9uTWV0YWRhdGEudGVtcGxhdGUudHlwZSJ9LHsidmFsdWUiOiI1NjBiYWE1ZDEzMTljMWQ3YzA2NThkYjRhYjJmNTZhOGZkZTEzNGEyMGFmMGY2ZDExZDEyMjViZGMyZDM3MmM1IiwicGF0aCI6Im9wZW5BdHRlc3RhdGlvbk1ldGFkYXRhLnRlbXBsYXRlLm5hbWUifSx7InZhbHVlIjoiNjlmMDAwZDY5NTcxMzEwN2Q1OGM4ZTE0NWJiYzFkOWQwZTVhOTkyYjZiMGQzZDIxOTcwM2ZiZWZiNGMxNTFiMSIsInBhdGgiOiJvcGVuQXR0ZXN0YXRpb25NZXRhZGF0YS50ZW1wbGF0ZS51cmwifSx7InZhbHVlIjoiODM1OGY1ODkzZjRjNjg1NDJmNTYwYzRjMTc1NTFkNGIzMjk1OWMwYzBkODEzMzBmZWRlMDRiYzA3YmI0Y2ZmMyIsInBhdGgiOiJvcGVuQXR0ZXN0YXRpb25NZXRhZGF0YS5wcm9vZi50eXBlIn0seyJ2YWx1ZSI6IjM4ZjRiMTA4MTQ2YjM3Y2M1ZmM2NjQzOWJlMGQ3ZTRjOTk0OWE1YmFjNzEyOWVhNTU1ZTZkZjc5OTJiYWZjZjAiLCJwYXRoIjoib3BlbkF0dGVzdGF0aW9uTWV0YWRhdGEucHJvb2YubWV0aG9kIn0seyJ2YWx1ZSI6IjcxNGVjY2EwODI4ZjAzZWNlN2MxYWE0MmMyZjEzZmFjMTcyNjQ0ZTkxOWE2Y2ZhMmRhODE4OWE5OTM4MzE5NjAiLCJwYXRoIjoib3BlbkF0dGVzdGF0aW9uTWV0YWRhdGEucHJvb2YudmFsdWUifSx7InZhbHVlIjoiMzVjOThhYTQzZjc2YjRlMzU3ZGFkOTAxYTc1ZjZiOThiMDAzMTAyMWM0ODdlZmRjNWFiZjVhZTM1YzkwNGIxYSIsInBhdGgiOiJvcGVuQXR0ZXN0YXRpb25NZXRhZGF0YS5wcm9vZi5yZXZvY2F0aW9uLnR5cGUifSx7InZhbHVlIjoiZTQyZDZmZGEwNzMzZWQzYTFkYzZiOGJhZjI2ZDM4ZDMwODQyMWYwN2E5OGU0MzEwMGEyOTE1Yzk3ZTY3MWUwMyIsInBhdGgiOiJvcGVuQXR0ZXN0YXRpb25NZXRhZGF0YS5pZGVudGl0eVByb29mLnR5cGUifSx7InZhbHVlIjoiYjkwZjZjMzFmMWNjNTQyZDg4YjBhNWMwY2UxZTA3YzAwNTUwMGM1MDRlMzVmYTI4MmQyYzZjNmI5ZDYwOTk0YyIsInBhdGgiOiJvcGVuQXR0ZXN0YXRpb25NZXRhZGF0YS5pZGVudGl0eVByb29mLmlkZW50aWZpZXIifSx7InZhbHVlIjoiODkyN2M0ODZjYmI3MDBkMzA2NDljYmZlZGQzYmI5ZTI5Zjg4MjU2MGQ5NTdmMDUxODJlNTBjYjI3NzEwZjBlYyIsInBhdGgiOiJpc3N1YW5jZURhdGUifSx7InZhbHVlIjoiNjhjMzVlNmNlYTYxN2I3ZTUxMzA5ZTRhNTRkYTdhZGI2MTI1YmM2YTQzNjI3ZDhiYzNkNTMzZTI0Mzk4NWVmNiIsInBhdGgiOiJleHBpcmF0aW9uRGF0ZSJ9LHsidmFsdWUiOiJmYzczNjYwM2EyMjY4MzY1Zjc5ODUyYjFkN2ZkZTA3MjkzYTdiNzI4NTEwMDQ2OGFkMDZhMTE1MzIyZDFjNjEzIiwicGF0aCI6Imlzc3Vlci5pZCJ9LHsidmFsdWUiOiI3YWZiMDJkN2ZiNmE5ODRiOGE0YWEyMDc4ZjM3Nzc0MjkyYWQ5MzMzY2FjOTE1OWVlNDZhYzNiNTJmOTFjZjRmIiwicGF0aCI6Imlzc3Vlci5uYW1lIn0seyJ2YWx1ZSI6ImY3Yzk1MWM4YjczOWEyMzA3MDQ0NjU4NGQ0YTAzY2FlYjI0ZjE0NWZkZjZlMWQ4MGYwZDVhNWFlYmQzMDg3ZjYiLCJwYXRoIjoiaXNzdWVyLnR5cGUifSx7InZhbHVlIjoiZDE1ZjIwMDlkYzZhMzEzOWFiMjhhMmQ0OTM5YTI3MjI4OWUxYjk4YmVhZWUwMGNjZjZjNWNjZjZlZDg0MzI5MSIsInBhdGgiOiJ0eXBlWzBdIn0seyJ2YWx1ZSI6IjFmMjlhYzUxN2E3MDcwM2ZjNWNiMjU3Y2ZkNWE1ZTJmYWU4YzU5NmJiN2ZjNTAyMDM0YzQ5YWJmNmFiNTA1OGQiLCJwYXRoIjoidHlwZVsxXSJ9XQ==",
+    "merkleRoot": "c552c365670f15fbb31486b2d96c15b1cc5fd53b6f178f4e7075c156119deed2",
+    "salts": "W3sidmFsdWUiOiI2N2ZiY2I0ZTEwOTc3MDhjOTBjY2MxMDM3YmE2YTBhZjc1ODA5YjgyZTY0MjNhMDFmMzVjM2UwOTI3NDUzOThjIiwicGF0aCI6InZlcnNpb24ifSx7InZhbHVlIjoiZWI2NzRiOGYyMGQ2YTkwMjAwZjU4M2Q4NGQ1ZGRkY2U0MDE4MzNkMjFjODBjZjJhMTIwYzIxMjUxNGZmYjMxNSIsInBhdGgiOiJuZXR3b3JrLmNoYWluIn0seyJ2YWx1ZSI6ImY3ZmJlMTliM2IxNDFmZGQyMDA3YjFmNDU0ZGEzZjBlZDE2OTM1MTVjZWNjODA5OGI3ODQ2YWFiNTVmNWRjMDIiLCJwYXRoIjoibmV0d29yay5jaGFpbklkIn0seyJ2YWx1ZSI6IjRjN2Y3OWZiZGM1MGEyMGNhNzM0YTVhZGE2YzlhODE2OTE4YjVlNDJkNzljYjZjYjNhYWMyMzFkYzE4NWZkNjUiLCJwYXRoIjoiQGNvbnRleHRbMF0ifSx7InZhbHVlIjoiMjdlNzVlY2I2MjBhMmFhNmY5YmVhYjgwNDJkYmY5ZDU1YjQ1MDM0YTUwYTI5ODIyYzkzMWMyZjAwM2NlZTZiZCIsInBhdGgiOiJAY29udGV4dFsxXSJ9LHsidmFsdWUiOiIyNTBiNjlmZDY0MjQ0Y2RhZTA3MDA4Mjg5NDQ2ZTNhMGI2MDY4ZjRmMTE1YjIyN2YxZTIxZjhiMWM4YTJjOGZlIiwicGF0aCI6IkBjb250ZXh0WzJdIn0seyJ2YWx1ZSI6ImI1NjRmYTY3Mzg2OGYwZTE2ZTY5ZWMxZjA2Y2UzOThhMzZkNmRlMTFhZjNlYjExYmM3MTRiMzQ1YmQzYmMzZDAiLCJwYXRoIjoiY3JlZGVudGlhbFN1YmplY3QuYmxOdW1iZXIifSx7InZhbHVlIjoiNzY5MTRhNTk2MGEzOTFhOTI3M2M4ZGMxYjQ4M2VkNWFkN2Q1NDRjOGIxZGE3NzM1MmRkYzM1NzFhNTRmZTFkYSIsInBhdGgiOiJjcmVkZW50aWFsU3ViamVjdC5zY2FjIn0seyJ2YWx1ZSI6IjgxZmY5NzZhZThjMjdjY2Q2MmE2NTM3MmZmYzVkMmQ4NzUzMmJlNzExYWY4ZGEyOTE5MmUyYTgxMGY5ODNiZWMiLCJwYXRoIjoiY3JlZGVudGlhbFN1YmplY3QubGlua3Muc2VsZi5ocmVmIn0seyJ2YWx1ZSI6ImFkZjYwMTBlNGQxNTQ3ZDA4NWM1NTkwZDU3NTQ5Y2RhZjI0ZjAzNTM0NzU5NGI0NDUxYjgzOTQ0MmNmODkwYTciLCJwYXRoIjoib3BlbkF0dGVzdGF0aW9uTWV0YWRhdGEudGVtcGxhdGUudHlwZSJ9LHsidmFsdWUiOiJmZTY3YWQxYTRmZDNhNTg1YjVjODMyYzUzMmEwODllZDNlYjFlYTYxMDcwODdkZjMwZGJhMzkwZDMyMTE4NzU0IiwicGF0aCI6Im9wZW5BdHRlc3RhdGlvbk1ldGFkYXRhLnRlbXBsYXRlLm5hbWUifSx7InZhbHVlIjoiZmViMjkzMzA4NTUzMDQ3MDgxMGY4MzlkMTdkMDAyOGMyYWRjNDlkNzQ5ODkwNzkyMWRhNTNlMWNhMjEwYzM0YSIsInBhdGgiOiJvcGVuQXR0ZXN0YXRpb25NZXRhZGF0YS50ZW1wbGF0ZS51cmwifSx7InZhbHVlIjoiMmQ3N2I4MzQ4ODk2OTk0Mzg3NjdmYzExM2M2MWY2MzFiY2MzYzM4MWFjMjcxMWY4ZWMyMWViYjBlYTcyZDIxZiIsInBhdGgiOiJvcGVuQXR0ZXN0YXRpb25NZXRhZGF0YS5wcm9vZi50eXBlIn0seyJ2YWx1ZSI6ImRjZGNkZDNkMDU1ZGQ3NTMxZTFmNmEzMWNhYWIyNWYwODY1OWYwY2M3OTE4OTNkMmYzNTAzY2Y3ZjNjZTBhYjUiLCJwYXRoIjoib3BlbkF0dGVzdGF0aW9uTWV0YWRhdGEucHJvb2YubWV0aG9kIn0seyJ2YWx1ZSI6ImUyODBlNDk5ZWFkOWM4MjI5NWZmNmYzNTNhYTI3Nzc4ODQ5NjQ1ODcxNzQwNDQ0MmE0NDI4ZTdhYzRiZThiY2EiLCJwYXRoIjoib3BlbkF0dGVzdGF0aW9uTWV0YWRhdGEucHJvb2YudmFsdWUifSx7InZhbHVlIjoiNzFiNzEyYTlmYjRhMzAwNjMwZTFjNDMyYjliMzE2MjIwMjM5MTFhYWNmN2U1Y2M5ZTNjNjgyZTMxNjJiMzBmOCIsInBhdGgiOiJvcGVuQXR0ZXN0YXRpb25NZXRhZGF0YS5wcm9vZi5yZXZvY2F0aW9uLnR5cGUifSx7InZhbHVlIjoiNGMyNWM1MWU4ZTEwMWZiYjBmMTJjYWZkYjMyYzk4YTNiN2E3NzU5YTIwN2JmNDE3YjNhMTc0MGMzNjlkYjRlMSIsInBhdGgiOiJvcGVuQXR0ZXN0YXRpb25NZXRhZGF0YS5pZGVudGl0eVByb29mLnR5cGUifSx7InZhbHVlIjoiYWNhYjM5YTYwZGZmOWU4MzdkMjNmMzYwNDA1ZGY3OTljOGJjNzQ5MjJmMjUwN2UwODcxOTNjNjNmYWU1MDA1YSIsInBhdGgiOiJvcGVuQXR0ZXN0YXRpb25NZXRhZGF0YS5pZGVudGl0eVByb29mLmlkZW50aWZpZXIifSx7InZhbHVlIjoiZmExYjcxNjVlYzcwZTE4ZGU5NGJjODY2OWQxNjJiOTRmMmU4MDA5NWM1ZTI0MTI1ZmY2MmU5MjFkMDViM2FhYSIsInBhdGgiOiJpc3N1YW5jZURhdGUifSx7InZhbHVlIjoiMTVkMGMwMTM4ZmQzZTc1MzMwOWE3M2ZlYmMzZTVjYWI2YzM3NzA5NWM0ZTE3MTRmZDU3NzY3ZWRlMTNhNDQ1YiIsInBhdGgiOiJleHBpcmF0aW9uRGF0ZSJ9LHsidmFsdWUiOiJmZWQ4Y2JlMTJlYTNhNDgxMjMxOWI1OGRjOTc5MTk2YjhhZTUxM2ZmZjE3MGFlN2FhMThkOGI3Mzc2MGRjYThkIiwicGF0aCI6Imlzc3Vlci5pZCJ9LHsidmFsdWUiOiI0N2E3NjZmOGM5NTRjMzY4OWQxNjQ1NjUwNDdlZDRiYmEzNGJkMDNhMDFlMjdlNWQzNmMwZjMyM2JiM2YzM2FhIiwicGF0aCI6Imlzc3Vlci5uYW1lIn0seyJ2YWx1ZSI6Ijg3ZTJhMGI4MGU4ZTdjYzBiYjg4MGM5MzM3YzIwNWFlMGU5ZWY3ZmJlNzYzZjFlZDQ3MWM5OWZmMDUwNWRiOWYiLCJwYXRoIjoiaXNzdWVyLnR5cGUifSx7InZhbHVlIjoiNDQ0MTFmNTQ4MTNkOTJkZTE0OGNlMTY0ODc1NTVkNzZkOGIyODcyNTIwMjVhMjEyNDg4NTk0ZDJmNjM4ZjcyZCIsInBhdGgiOiJ0eXBlWzBdIn0seyJ2YWx1ZSI6Ijg5MGZhNmE3NTAxODZlMTQzOWE2NjJiNjg2MzVlOGE1YzY1MTZiMjc1ZWYxODllNWJmNDZkMmE1YzYwZGJkZDEiLCJwYXRoIjoidHlwZVsxXSJ9XQ==",
     "privacy": {
       "obfuscated": []
     }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -73,7 +73,7 @@
     "@snyk/protect": "^1.1196.0",
     "@tradetrust-tt/dnsprove": "^2.12.2",
     "@tradetrust-tt/document-store": "^2.7.0",
-    "@tradetrust-tt/token-registry": "^5.0.0-alpha.1",
+    "@tradetrust-tt/token-registry": "^5.0.0-alpha.3",
     "@tradetrust-tt/tradetrust": "^6.9.6",
     "@tradetrust-tt/tradetrust-config": "^1.14.1",
     "@tradetrust-tt/tt-verify": "^8.9.1",
@@ -90,9 +90,6 @@
     "web3-utils": "^1.3.6",
     "yargs": "^17.0.1"
   },
-  "overrides": {
-    "@tradetrust-tt/token-registry": "^5.0.0-alpha.1"
-  },
   "license": "GPL-3.0",
   "babel": {
     "presets": [

diff --git a/src/implementations/deploy/token-registry/token-registry.test.ts b/src/implementations/deploy/token-registry/token-registry.test.ts
@@ -1,8 +1,9 @@
-import { deployTokenRegistry } from "./token-registry";
-import { encodeInitParams } from "./helpers";
+import { TDocDeployer__factory } from "@tradetrust-tt/token-registry/dist/contracts";
+import { DeploymentEvent } from "@tradetrust-tt/token-registry/dist/contracts/contracts/utils/TDocDeployer";
 import { Contract } from "ethers";
 import { DeployTokenRegistryCommand } from "../../../commands/deploy/deploy.types";
-import { DeploymentEvent } from "@tradetrust-tt/token-registry/dist/contracts/contracts/utils/TDocDeployer";
+import { encodeInitParams } from "./helpers";
+import { deployTokenRegistry } from "./token-registry";
 
 const deployParams: DeployTokenRegistryCommand = {
   registryName: "Test",
@@ -20,6 +21,19 @@ describe("deploy Token Registry", () => {
   mockedEthersContract.prototype.deploy = jest.fn();
   const mockedDeploy: jest.Mock = mockedEthersContract.prototype.deploy;
 
+  const factoryMock = jest.spyOn(TDocDeployer__factory, "connect");
+  factoryMock.mockImplementation(
+    () =>
+      ({
+        interface: {
+          getEventTopic: jest
+            .fn()
+            .mockReturnValue("0x3588ebb5c75fdf91927f8472318f41513ee567c2612a5ce52ac840dcf6f162f5"),
+        },
+        deploy: mockedDeploy,
+      } as any)
+  );
+
   // increase timeout because ethers is throttling
   jest.setTimeout(30000);
 

diff --git a/src/implementations/title-escrow/surrenderDocument.test.ts b/src/implementations/title-escrow/surrenderDocument.test.ts
@@ -45,9 +45,9 @@ describe("title-escrow", () => {
         ownerOf: mockedOwnerOf,
       });
       mockedConnectTitleEscrowFactory.mockReturnValue({
-        surrender: mockSurrender,
+        returnToIssuer: mockSurrender,
         callStatic: {
-          surrender: mockCallStaticSurrender,
+          returnToIssuer: mockCallStaticSurrender,
         },
       });
 

diff --git a/src/implementations/title-escrow/surrenderDocument.ts b/src/implementations/title-escrow/surrenderDocument.ts
@@ -20,7 +20,7 @@ export const surrenderDocument = async ({
   const titleEscrow = await connectToTitleEscrow({ tokenId, address, wallet });
   if (dryRun) {
     await dryRunMode({
-      estimatedGas: await titleEscrow.estimateGas.surrender("0x"),
+      estimatedGas: await titleEscrow.estimateGas.returnToIssuer("0x"),
       network,
     });
     process.exit(0);
@@ -31,13 +31,13 @@ export const surrenderDocument = async ({
     const gasFees = await getGasFees({ provider: wallet.provider, ...rest });
     trace(`Gas maxFeePerGas: ${gasFees.maxFeePerGas}`);
     trace(`Gas maxPriorityFeePerGas: ${gasFees.maxPriorityFeePerGas}`);
-    await titleEscrow.callStatic.surrender("0x");
+    await titleEscrow.callStatic.returnToIssuer("0x");
     signale.await(`Sending transaction to pool`);
-    transaction = await titleEscrow.surrender("0x", { ...gasFees });
+    transaction = await titleEscrow.returnToIssuer("0x", { ...gasFees });
   } else {
-    await titleEscrow.callStatic.surrender("0x");
+    await titleEscrow.callStatic.returnToIssuer("0x");
     signale.await(`Sending transaction to pool`);
-    transaction = await titleEscrow.surrender("0x");
+    transaction = await titleEscrow.returnToIssuer("0x");
   }
 
   trace(`Tx hash: ${transaction.hash}`);