From 8479ec57cfe007e91ba38573f320b1e5a66c052f Mon Sep 17 00:00:00 2001 From: Eric Lee Date: Tue, 30 May 2023 18:11:29 -0400 Subject: [PATCH] fix node and python sdk --- .github/workflows/cd-python-sdk.yaml | 3 +-- packages/sdk/python/human-protocol-sdk/.gitignore | 1 + packages/sdk/python/human-protocol-sdk/MANIFEST.in | 2 +- packages/sdk/python/human-protocol-sdk/Makefile | 6 +++++- packages/sdk/python/human-protocol-sdk/Pipfile | 12 ++++++------ packages/sdk/python/human-protocol-sdk/setup.py | 9 ++------- .../sdk/typescript/human-protocol-sdk/package.json | 4 +++- .../typescript/human-protocol-sdk/src/constants.ts | 2 +- .../sdk/typescript/human-protocol-sdk/src/escrow.ts | 8 ++++++-- .../human-protocol-sdk/test/escrow.test.ts | 3 ++- .../sdk/typescript/human-protocol-sdk/tsconfig.json | 2 +- yarn.lock | 2 +- 12 files changed, 30 insertions(+), 24 deletions(-) diff --git a/.github/workflows/cd-python-sdk.yaml b/.github/workflows/cd-python-sdk.yaml index d1a6ba7e37..55f73f7e43 100644 --- a/.github/workflows/cd-python-sdk.yaml +++ b/.github/workflows/cd-python-sdk.yaml @@ -40,5 +40,4 @@ jobs: TWINE_USERNAME: __token__ TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} run: | - make build-package - twine upload dist/* --skip-existing + make publish-package diff --git a/packages/sdk/python/human-protocol-sdk/.gitignore b/packages/sdk/python/human-protocol-sdk/.gitignore index fbc96479ef..f00033a0be 100644 --- a/packages/sdk/python/human-protocol-sdk/.gitignore +++ b/packages/sdk/python/human-protocol-sdk/.gitignore @@ -11,6 +11,7 @@ pip-wheel-metadata/ build dist *.egg-info +.eggs # ABIs artifacts diff --git a/packages/sdk/python/human-protocol-sdk/MANIFEST.in b/packages/sdk/python/human-protocol-sdk/MANIFEST.in index de3d56a8b4..eb410e634e 100644 --- a/packages/sdk/python/human-protocol-sdk/MANIFEST.in +++ b/packages/sdk/python/human-protocol-sdk/MANIFEST.in @@ -1 +1 @@ -recursive-include contracts * +recursive-include artifacts *.json diff --git a/packages/sdk/python/human-protocol-sdk/Makefile b/packages/sdk/python/human-protocol-sdk/Makefile index 0236503101..798ba6594a 100644 --- a/packages/sdk/python/human-protocol-sdk/Makefile +++ b/packages/sdk/python/human-protocol-sdk/Makefile @@ -1,5 +1,5 @@ clean-package: - rm -rf build artifacts dist *.egg-info + rm -rf build artifacts dist *.egg-info .eggs build-contracts: ./scripts/build-contracts.sh @@ -31,3 +31,7 @@ build-package: make clean-package make build-contracts python3 setup.py sdist bdist_wheel + +publish-package: + make build-package + twine upload dist/* --skip-existing diff --git a/packages/sdk/python/human-protocol-sdk/Pipfile b/packages/sdk/python/human-protocol-sdk/Pipfile index 0ded1d99b8..88552f7ef9 100644 --- a/packages/sdk/python/human-protocol-sdk/Pipfile +++ b/packages/sdk/python/human-protocol-sdk/Pipfile @@ -4,20 +4,20 @@ url = "https://pypi.org/simple" verify_ssl = true [dev-packages] +black = "*" +pylint = "*" +pytest = "*" +setuptools-pipfile = "*" [packages] cryptography = "*" hmt-basemodels = "==0.1.18" -sphinx = "*" -black = "*" -pylint = "*" -pytest = "*" -web3 = "==5.24.0" minio = "*" validators = "*" +web3 = "==5.24.0" [requires] -python_version = "3" +python_version = "3.10" [pipenv] allow_prereleases = true diff --git a/packages/sdk/python/human-protocol-sdk/setup.py b/packages/sdk/python/human-protocol-sdk/setup.py index 86f16de2d2..44049c2673 100644 --- a/packages/sdk/python/human-protocol-sdk/setup.py +++ b/packages/sdk/python/human-protocol-sdk/setup.py @@ -1,4 +1,3 @@ -from glob import glob import setuptools setuptools.setup( @@ -16,10 +15,6 @@ "Programming Language :: Python", ], packages=setuptools.find_packages() + ["artifacts"], - install_requires=[ - "boto3", - "cryptography", - "hmt-basemodels>=0.1.18", - "web3==5.24.0", - ], + setup_requires="setuptools-pipfile", + use_pipfile=True, ) diff --git a/packages/sdk/typescript/human-protocol-sdk/package.json b/packages/sdk/typescript/human-protocol-sdk/package.json index 0d2fd055a6..780690e7e8 100644 --- a/packages/sdk/typescript/human-protocol-sdk/package.json +++ b/packages/sdk/typescript/human-protocol-sdk/package.json @@ -1,7 +1,7 @@ { "name": "@human-protocol/sdk", "description": "Human Protocol SDK", - "version": "1.0.3", + "version": "1.0.9", "files": [ "src", "dist" @@ -38,8 +38,10 @@ "dependencies": { "@human-protocol/core": "*", "aws-sdk": "^2.1255.0", + "axios": "^1.4.0", "crypto": "^1.0.1", "ethers": "^5.7.2", + "minio": "^7.0.32", "secp256k1": "^4.0.3", "vitest": "^0.30.1", "winston": "^3.8.2" diff --git a/packages/sdk/typescript/human-protocol-sdk/src/constants.ts b/packages/sdk/typescript/human-protocol-sdk/src/constants.ts index 61f091fdb8..0bc2176ee9 100644 --- a/packages/sdk/typescript/human-protocol-sdk/src/constants.ts +++ b/packages/sdk/typescript/human-protocol-sdk/src/constants.ts @@ -217,7 +217,7 @@ export const NETWORKS: { scanUrl: '', factoryAddress: '0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9', hmtAddress: '0x5FbDB2315678afecb367f032d93F642f64180aa3', - stakingAddress: '0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512', + stakingAddress: '0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0', kvstoreAddress: '0x5FC8d32690cc91D4c39d9d3abcBD16989F875707', subgraphUrl: '', oldSubgraphUrl: '', diff --git a/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts b/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts index 095ee44b82..42fd05ecda 100644 --- a/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts +++ b/packages/sdk/typescript/human-protocol-sdk/src/escrow.ts @@ -96,11 +96,15 @@ export default class EscrowClient { ) ).wait(); - if (!result.events || !result.events[0] || !result.events[0].args) { + const event = result.events?.find(({ topics }) => + topics.includes(ethers.utils.id('Launched(address,address)')) + )?.args; + + if (!event) { throw ErrorLaunchedEventIsNotEmitted; } - return result.events[0].args[1]; + return event.escrow; } catch (e: any) { return throwError(e); } diff --git a/packages/sdk/typescript/human-protocol-sdk/test/escrow.test.ts b/packages/sdk/typescript/human-protocol-sdk/test/escrow.test.ts index 27d5ac1b07..73f86aaf92 100644 --- a/packages/sdk/typescript/human-protocol-sdk/test/escrow.test.ts +++ b/packages/sdk/typescript/human-protocol-sdk/test/escrow.test.ts @@ -145,8 +145,9 @@ describe('EscrowClient', () => { wait: async () => ({ events: [ { + topics: [ethers.utils.id('Launched(address,address)')], args: { - 1: expectedEscrowAddress, + escrow: expectedEscrowAddress, }, }, ], diff --git a/packages/sdk/typescript/human-protocol-sdk/tsconfig.json b/packages/sdk/typescript/human-protocol-sdk/tsconfig.json index 25ecd8cc8d..4413fa13b9 100644 --- a/packages/sdk/typescript/human-protocol-sdk/tsconfig.json +++ b/packages/sdk/typescript/human-protocol-sdk/tsconfig.json @@ -14,5 +14,5 @@ "emitDecoratorMetadata": true, "experimentalDecorators": true, }, - "include": ["./src", "./test"] + "include": ["./src"] } diff --git a/yarn.lock b/yarn.lock index a8ac3e78e7..3022c4033e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6423,7 +6423,7 @@ axios@^0.27.2: follow-redirects "^1.14.9" form-data "^4.0.0" -axios@^1.1.3, axios@^1.2.2, axios@^1.2.3, axios@^1.2.6, axios@^1.3.3, axios@^1.3.4: +axios@^1.1.3, axios@^1.2.2, axios@^1.2.3, axios@^1.2.6, axios@^1.3.3, axios@^1.3.4, axios@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/axios/-/axios-1.4.0.tgz#38a7bf1224cd308de271146038b551d725f0be1f" integrity sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==