From 6e9af5f25ea0364fe20a4280566d45c20afe559b Mon Sep 17 00:00:00 2001 From: nghaninn <43451336+nghaninn@users.noreply.github.com> Date: Tue, 5 Nov 2024 11:08:31 +0800 Subject: [PATCH 1/4] fix: update token registry package version --- examples/v5/raw-documents/example.0.json | 2 +- examples/v5/wrapped-documents/example.0.json | 8 ++++---- package-lock.json | 8 ++++---- package.json | 4 ++-- src/implementations/title-escrow/surrenderDocument.ts | 10 +++++----- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/examples/v5/raw-documents/example.0.json b/examples/v5/raw-documents/example.0.json index 68c3f4e5..b1761d2f 100644 --- 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 index 23836f5d..169606b2 100644 --- 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 index 4c25c6db..5c1081f5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,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.2", "@tradetrust-tt/tradetrust": "^6.9.6", "@tradetrust-tt/tradetrust-config": "^1.14.1", "@tradetrust-tt/tt-verify": "^8.9.1", @@ -4460,9 +4460,9 @@ "integrity": "sha512-wMTQkZ4FNzYvlWwaeKCHuV8fYxw+kefI38dTMHY5fpV3B5oaapePFGKHDs+4IrV1ZVFHQbqR/r/MP7dNwwjJDA==" }, "node_modules/@tradetrust-tt/token-registry": { - "version": "5.0.0-alpha.1", - "resolved": "https://registry.npmjs.org/@tradetrust-tt/token-registry/-/token-registry-5.0.0-alpha.1.tgz", - "integrity": "sha512-i66WAfnN2TIk78sA4PsdoIvHo14zASs+UZZuM6ATg+oxFvAM/DRLG7tGaUlDTXseCUr9qHSDb+vRxve7QfbyPQ==", + "version": "5.0.0-alpha.2", + "resolved": "https://registry.npmjs.org/@tradetrust-tt/token-registry/-/token-registry-5.0.0-alpha.2.tgz", + "integrity": "sha512-fYXHWXRaXV3KJdUZFZEFDXVeHMc4lzuEpQ6sEzruIDds8nxJM4u2fGvTHwSDO0lPCnxTRCIzTvXjewmvwpacHg==", "dependencies": { "@typechain/ethers-v5": "10.2.1" }, diff --git a/package.json b/package.json index f733cfef..9410429e 100644 --- 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.2", "@tradetrust-tt/tradetrust": "^6.9.6", "@tradetrust-tt/tradetrust-config": "^1.14.1", "@tradetrust-tt/tt-verify": "^8.9.1", @@ -91,7 +91,7 @@ "yargs": "^17.0.1" }, "overrides": { - "@tradetrust-tt/token-registry": "^5.0.0-alpha.1" + "@tradetrust-tt/token-registry": "^5.0.0-alpha.2" }, "license": "GPL-3.0", "babel": { diff --git a/src/implementations/title-escrow/surrenderDocument.ts b/src/implementations/title-escrow/surrenderDocument.ts index 1c3a7fb0..9049bd5e 100644 --- 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}`); From 98f2692b3dbe34466e008b7cc139afeb613030b1 Mon Sep 17 00:00:00 2001 From: nghaninn <43451336+nghaninn@users.noreply.github.com> Date: Tue, 5 Nov 2024 18:21:25 +0800 Subject: [PATCH 2/4] fix: update test case --- package-lock.json | 19 +++++++++++++++---- package.json | 5 +---- .../token-registry/token-registry.test.ts | 16 +++++++++++++--- .../title-escrow/surrenderDocument.test.ts | 4 ++-- 4 files changed, 31 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5c1081f5..3b0f91e9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,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.2", + "@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", @@ -4460,9 +4460,9 @@ "integrity": "sha512-wMTQkZ4FNzYvlWwaeKCHuV8fYxw+kefI38dTMHY5fpV3B5oaapePFGKHDs+4IrV1ZVFHQbqR/r/MP7dNwwjJDA==" }, "node_modules/@tradetrust-tt/token-registry": { - "version": "5.0.0-alpha.2", - "resolved": "https://registry.npmjs.org/@tradetrust-tt/token-registry/-/token-registry-5.0.0-alpha.2.tgz", - "integrity": "sha512-fYXHWXRaXV3KJdUZFZEFDXVeHMc4lzuEpQ6sEzruIDds8nxJM4u2fGvTHwSDO0lPCnxTRCIzTvXjewmvwpacHg==", + "version": "5.0.0-alpha.3", + "resolved": "https://registry.npmjs.org/@tradetrust-tt/token-registry/-/token-registry-5.0.0-alpha.3.tgz", + "integrity": "sha512-z8S00KaF1RIwsACt4RPDK9dAe9bYse6F0RPdzyIIdaNl8G64S2dSjdJoSG5DloH85hHa5zSz7byzrif6N7PImw==", "dependencies": { "@typechain/ethers-v5": "10.2.1" }, @@ -4554,6 +4554,17 @@ "node": "18.x" } }, + "node_modules/@tradetrust-tt/tt-verify/node_modules/@tradetrust-tt/token-registry": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/@tradetrust-tt/token-registry/-/token-registry-4.12.0.tgz", + "integrity": "sha512-5CWoqXE4RZX65lZCjp+QcYW4hv9+BzU/MVLXjVbXKyb7RJmbw/TcGmI5YPs55FzSYIxls+hZnhQMCBY4r05CsQ==", + "dependencies": { + "@typechain/ethers-v5": "10.2.1" + }, + "peerDependencies": { + "ethers": ">=5.0.8" + } + }, "node_modules/@tsconfig/node10": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz", diff --git a/package.json b/package.json index 9410429e..24c66457 100644 --- 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.2", + "@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.2" - }, "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 index 419abf38..4ec58594 100644 --- 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,14 @@ 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); @@ -112,6 +121,7 @@ describe("deploy Token Registry", () => { it("should allow errors to bubble up", async () => { mockedDeploy.mockRejectedValue(new Error("An Error")); await expect(deployTokenRegistry(deployParams)).rejects.toThrow("An Error"); + expect(mockedDeploy).toHaveBeenCalled(); }); it("should throw when keys are not found anywhere", async () => { diff --git a/src/implementations/title-escrow/surrenderDocument.test.ts b/src/implementations/title-escrow/surrenderDocument.test.ts index f431b11b..6bb2553b 100644 --- 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, }, }); From 8a370abf74bce7440e7097b1a2797897b25b6713 Mon Sep 17 00:00:00 2001 From: nghaninn <43451336+nghaninn@users.noreply.github.com> Date: Tue, 5 Nov 2024 18:24:16 +0800 Subject: [PATCH 3/4] fix: linting --- .../token-registry/token-registry.test.ts | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/implementations/deploy/token-registry/token-registry.test.ts b/src/implementations/deploy/token-registry/token-registry.test.ts index 4ec58594..5e2c3313 100644 --- a/src/implementations/deploy/token-registry/token-registry.test.ts +++ b/src/implementations/deploy/token-registry/token-registry.test.ts @@ -21,13 +21,18 @@ 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) + 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); From 29be1ca0643cfd200dbeaddd38aace555e98991f Mon Sep 17 00:00:00 2001 From: nghaninn <43451336+nghaninn@users.noreply.github.com> Date: Tue, 5 Nov 2024 18:26:34 +0800 Subject: [PATCH 4/4] fix: linting --- src/implementations/deploy/token-registry/token-registry.test.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/implementations/deploy/token-registry/token-registry.test.ts b/src/implementations/deploy/token-registry/token-registry.test.ts index 5e2c3313..95936e86 100644 --- a/src/implementations/deploy/token-registry/token-registry.test.ts +++ b/src/implementations/deploy/token-registry/token-registry.test.ts @@ -126,7 +126,6 @@ describe("deploy Token Registry", () => { it("should allow errors to bubble up", async () => { mockedDeploy.mockRejectedValue(new Error("An Error")); await expect(deployTokenRegistry(deployParams)).rejects.toThrow("An Error"); - expect(mockedDeploy).toHaveBeenCalled(); }); it("should throw when keys are not found anywhere", async () => {