From b446e6ea4799e15a257354faff0303f05e0cb600 Mon Sep 17 00:00:00 2001 From: Alessandro Candeago <54709706+alecande11@users.noreply.github.com> Date: Wed, 3 Jan 2024 15:08:38 +0100 Subject: [PATCH 1/3] Remove unnecessary ethers dependencies --- package-lock.json | 770 ------------------------------------------ package.json | 2 - src/core/PublicKey.ts | 10 +- src/key/RawKey.ts | 15 +- 4 files changed, 7 insertions(+), 790 deletions(-) diff --git a/package-lock.json b/package-lock.json index 918c4472..02ec9acf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,6 @@ "version": "2.0.0-beta.15", "license": "MIT", "dependencies": { - "@ethersproject/bytes": "^5.7.0", "@terra-money/legacy.proto": "npm:@terra-money/terra.proto@^0.1.7", "@terra-money/terra.proto": "^4.0.4", "assert": "^2.0.0", @@ -20,7 +19,6 @@ "bufferutil": "^4.0.3", "crypto-browserify": "^3.12.0", "decimal.js": "^10.2.1", - "ethers": "^5.7.2", "jscrypto": "^1.0.1", "keccak256": "^1.0.6", "long": "^5.2.3", @@ -703,712 +701,6 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, - "node_modules/@ethersproject/abi": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.7.0.tgz", - "integrity": "sha512-351ktp42TiRcYB3H1OP8yajPeAQstMW/yCFokj/AthP9bLHzQFPlOrxOcwYEDkUAICmOHljvN4K39OMTMUa9RA==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/address": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/constants": "^5.7.0", - "@ethersproject/hash": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/strings": "^5.7.0" - } - }, - "node_modules/@ethersproject/abstract-provider": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/abstract-provider/-/abstract-provider-5.7.0.tgz", - "integrity": "sha512-R41c9UkchKCpAqStMYUpdunjo3pkEvZC3FAwZn5S5MGbXoMQOHIdHItezTETxAO5bevtMApSyEhn9+CHcDsWBw==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/networks": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/transactions": "^5.7.0", - "@ethersproject/web": "^5.7.0" - } - }, - "node_modules/@ethersproject/abstract-signer": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.7.0.tgz", - "integrity": "sha512-a16V8bq1/Cz+TGCkE2OPMTOUDLS3grCpdjoJCYNnVBbdYEMSgKrU0+B90s8b6H+ByYTBZN7a3g76jdIJi7UfKQ==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/abstract-provider": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0" - } - }, - "node_modules/@ethersproject/address": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/address/-/address-5.7.0.tgz", - "integrity": "sha512-9wYhYt7aghVGo758POM5nqcOMaE168Q6aRLJZwUmiqSrAungkG74gSSeKEIR7ukixesdRZGPgVqme6vmxs1fkA==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/rlp": "^5.7.0" - } - }, - "node_modules/@ethersproject/base64": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/base64/-/base64-5.7.0.tgz", - "integrity": "sha512-Dr8tcHt2mEbsZr/mwTPIQAf3Ai0Bks/7gTw9dSqk1mQvhW3XvRlmDJr/4n+wg1JmCl16NZue17CDh8xb/vZ0sQ==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bytes": "^5.7.0" - } - }, - "node_modules/@ethersproject/basex": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/basex/-/basex-5.7.0.tgz", - "integrity": "sha512-ywlh43GwZLv2Voc2gQVTKBoVQ1mti3d8HK5aMxsfu/nRDnMmNqaSJ3r3n85HBByT8OpoY96SXM1FogC533T4zw==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/properties": "^5.7.0" - } - }, - "node_modules/@ethersproject/bignumber": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/bignumber/-/bignumber-5.7.0.tgz", - "integrity": "sha512-n1CAdIHRWjSucQO3MC1zPSVgV/6dy/fjL9pMrPP9peL+QxEg9wOsVqwD4+818B6LUEtaXzVHQiuivzRoxPxUGw==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "bn.js": "^5.2.1" - } - }, - "node_modules/@ethersproject/bignumber/node_modules/bn.js": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", - "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==" - }, - "node_modules/@ethersproject/bytes": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/bytes/-/bytes-5.7.0.tgz", - "integrity": "sha512-nsbxwgFXWh9NyYWo+U8atvmMsSdKJprTcICAkvbBffT75qDocbuggBU0SJiVK2MuTrp0q+xvLkTnGMPK1+uA9A==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/logger": "^5.7.0" - } - }, - "node_modules/@ethersproject/constants": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/constants/-/constants-5.7.0.tgz", - "integrity": "sha512-DHI+y5dBNvkpYUMiRQyxRBYBefZkJfo70VUkUAsRjcPs47muV9evftfZ0PJVCXYbAiCgght0DtcF9srFQmIgWA==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bignumber": "^5.7.0" - } - }, - "node_modules/@ethersproject/contracts": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/contracts/-/contracts-5.7.0.tgz", - "integrity": "sha512-5GJbzEU3X+d33CdfPhcyS+z8MzsTrBGk/sc+G+59+tPa9yFkl6HQ9D6L0QMgNTA9q8dT0XKxxkyp883XsQvbbg==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/abi": "^5.7.0", - "@ethersproject/abstract-provider": "^5.7.0", - "@ethersproject/abstract-signer": "^5.7.0", - "@ethersproject/address": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/constants": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/transactions": "^5.7.0" - } - }, - "node_modules/@ethersproject/hash": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/hash/-/hash-5.7.0.tgz", - "integrity": "sha512-qX5WrQfnah1EFnO5zJv1v46a8HW0+E5xuBBDTwMFZLuVTx0tbU2kkx15NqdjxecrLGatQN9FGQKpb1FKdHCt+g==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/abstract-signer": "^5.7.0", - "@ethersproject/address": "^5.7.0", - "@ethersproject/base64": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/strings": "^5.7.0" - } - }, - "node_modules/@ethersproject/hdnode": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/hdnode/-/hdnode-5.7.0.tgz", - "integrity": "sha512-OmyYo9EENBPPf4ERhR7oj6uAtUAhYGqOnIS+jE5pTXvdKBS99ikzq1E7Iv0ZQZ5V36Lqx1qZLeak0Ra16qpeOg==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/abstract-signer": "^5.7.0", - "@ethersproject/basex": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/pbkdf2": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/sha2": "^5.7.0", - "@ethersproject/signing-key": "^5.7.0", - "@ethersproject/strings": "^5.7.0", - "@ethersproject/transactions": "^5.7.0", - "@ethersproject/wordlists": "^5.7.0" - } - }, - "node_modules/@ethersproject/json-wallets": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/json-wallets/-/json-wallets-5.7.0.tgz", - "integrity": "sha512-8oee5Xgu6+RKgJTkvEMl2wDgSPSAQ9MB/3JYjFV9jlKvcYHUXZC+cQp0njgmxdHkYWn8s6/IqIZYm0YWCjO/0g==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/abstract-signer": "^5.7.0", - "@ethersproject/address": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/hdnode": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/pbkdf2": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/random": "^5.7.0", - "@ethersproject/strings": "^5.7.0", - "@ethersproject/transactions": "^5.7.0", - "aes-js": "3.0.0", - "scrypt-js": "3.0.1" - } - }, - "node_modules/@ethersproject/keccak256": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/keccak256/-/keccak256-5.7.0.tgz", - "integrity": "sha512-2UcPboeL/iW+pSg6vZ6ydF8tCnv3Iu/8tUmLLzWWGzxWKFFqOBQFLo6uLUv6BDrLgCDfN28RJ/wtByx+jZ4KBg==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "js-sha3": "0.8.0" - } - }, - "node_modules/@ethersproject/logger": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/logger/-/logger-5.7.0.tgz", - "integrity": "sha512-0odtFdXu/XHtjQXJYA3u9G0G8btm0ND5Cu8M7i5vhEcE8/HmF4Lbdqanwyv4uQTr2tx6b7fQRmgLrsnpQlmnig==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ] - }, - "node_modules/@ethersproject/networks": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/@ethersproject/networks/-/networks-5.7.1.tgz", - "integrity": "sha512-n/MufjFYv3yFcUyfhnXotyDlNdFb7onmkSy8aQERi2PjNcnWQ66xXxa3XlS8nCcA8aJKJjIIMNJTC7tu80GwpQ==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/logger": "^5.7.0" - } - }, - "node_modules/@ethersproject/pbkdf2": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/pbkdf2/-/pbkdf2-5.7.0.tgz", - "integrity": "sha512-oR/dBRZR6GTyaofd86DehG72hY6NpAjhabkhxgr3X2FpJtJuodEl2auADWBZfhDHgVCbu3/H/Ocq2uC6dpNjjw==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/sha2": "^5.7.0" - } - }, - "node_modules/@ethersproject/properties": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/properties/-/properties-5.7.0.tgz", - "integrity": "sha512-J87jy8suntrAkIZtecpxEPxY//szqr1mlBaYlQ0r4RCaiD2hjheqF9s1LVE8vVuJCXisjIP+JgtK/Do54ej4Sw==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/logger": "^5.7.0" - } - }, - "node_modules/@ethersproject/providers": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.7.2.tgz", - "integrity": "sha512-g34EWZ1WWAVgr4aptGlVBF8mhl3VWjv+8hoAnzStu8Ah22VHBsuGzP17eb6xDVRzw895G4W7vvx60lFFur/1Rg==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/abstract-provider": "^5.7.0", - "@ethersproject/abstract-signer": "^5.7.0", - "@ethersproject/address": "^5.7.0", - "@ethersproject/base64": "^5.7.0", - "@ethersproject/basex": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/constants": "^5.7.0", - "@ethersproject/hash": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/networks": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/random": "^5.7.0", - "@ethersproject/rlp": "^5.7.0", - "@ethersproject/sha2": "^5.7.0", - "@ethersproject/strings": "^5.7.0", - "@ethersproject/transactions": "^5.7.0", - "@ethersproject/web": "^5.7.0", - "bech32": "1.1.4", - "ws": "7.4.6" - } - }, - "node_modules/@ethersproject/providers/node_modules/bech32": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/bech32/-/bech32-1.1.4.tgz", - "integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==" - }, - "node_modules/@ethersproject/providers/node_modules/ws": { - "version": "7.4.6", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", - "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", - "engines": { - "node": ">=8.3.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": "^5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, - "node_modules/@ethersproject/random": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/random/-/random-5.7.0.tgz", - "integrity": "sha512-19WjScqRA8IIeWclFme75VMXSBvi4e6InrUNuaR4s5pTF2qNhcGdCUwdxUVGtDDqC00sDLCO93jPQoDUH4HVmQ==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0" - } - }, - "node_modules/@ethersproject/rlp": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/rlp/-/rlp-5.7.0.tgz", - "integrity": "sha512-rBxzX2vK8mVF7b0Tol44t5Tb8gomOHkj5guL+HhzQ1yBh/ydjGnpw6at+X6Iw0Kp3OzzzkcKp8N9r0W4kYSs9w==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0" - } - }, - "node_modules/@ethersproject/sha2": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/sha2/-/sha2-5.7.0.tgz", - "integrity": "sha512-gKlH42riwb3KYp0reLsFTokByAKoJdgFCwI+CCiX/k+Jm2mbNs6oOaCjYQSlI1+XBVejwH2KrmCbMAT/GnRDQw==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "hash.js": "1.1.7" - } - }, - "node_modules/@ethersproject/signing-key": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/signing-key/-/signing-key-5.7.0.tgz", - "integrity": "sha512-MZdy2nL3wO0u7gkB4nA/pEf8lu1TlFswPNmy8AiYkfKTdO6eXBJyUdmHO/ehm/htHw9K/qF8ujnTyUAD+Ry54Q==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "bn.js": "^5.2.1", - "elliptic": "6.5.4", - "hash.js": "1.1.7" - } - }, - "node_modules/@ethersproject/signing-key/node_modules/bn.js": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", - "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==" - }, - "node_modules/@ethersproject/solidity": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/solidity/-/solidity-5.7.0.tgz", - "integrity": "sha512-HmabMd2Dt/raavyaGukF4XxizWKhKQ24DoLtdNbBmNKUOPqwjsKQSdV9GQtj9CBEea9DlzETlVER1gYeXXBGaA==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/sha2": "^5.7.0", - "@ethersproject/strings": "^5.7.0" - } - }, - "node_modules/@ethersproject/strings": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/strings/-/strings-5.7.0.tgz", - "integrity": "sha512-/9nu+lj0YswRNSH0NXYqrh8775XNyEdUQAuf3f+SmOrnVewcJ5SBNAjF7lpgehKi4abvNNXyf+HX86czCdJ8Mg==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/constants": "^5.7.0", - "@ethersproject/logger": "^5.7.0" - } - }, - "node_modules/@ethersproject/transactions": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/transactions/-/transactions-5.7.0.tgz", - "integrity": "sha512-kmcNicCp1lp8qanMTC3RIikGgoJ80ztTyvtsFvCYpSCfkjhD0jZ2LOrnbcuxuToLIUYYf+4XwD1rP+B/erDIhQ==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/address": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/constants": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/rlp": "^5.7.0", - "@ethersproject/signing-key": "^5.7.0" - } - }, - "node_modules/@ethersproject/units": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/units/-/units-5.7.0.tgz", - "integrity": "sha512-pD3xLMy3SJu9kG5xDGI7+xhTEmGXlEqXU4OfNapmfnxLVY4EMSSRp7j1k7eezutBPH7RBN/7QPnwR7hzNlEFeg==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/constants": "^5.7.0", - "@ethersproject/logger": "^5.7.0" - } - }, - "node_modules/@ethersproject/wallet": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/wallet/-/wallet-5.7.0.tgz", - "integrity": "sha512-MhmXlJXEJFBFVKrDLB4ZdDzxcBxQ3rLyCkhNqVu3CDYvR97E+8r01UgrI+TI99Le+aYm/in/0vp86guJuM7FCA==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/abstract-provider": "^5.7.0", - "@ethersproject/abstract-signer": "^5.7.0", - "@ethersproject/address": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/hash": "^5.7.0", - "@ethersproject/hdnode": "^5.7.0", - "@ethersproject/json-wallets": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/random": "^5.7.0", - "@ethersproject/signing-key": "^5.7.0", - "@ethersproject/transactions": "^5.7.0", - "@ethersproject/wordlists": "^5.7.0" - } - }, - "node_modules/@ethersproject/web": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.7.1.tgz", - "integrity": "sha512-Gueu8lSvyjBWL4cYsWsjh6MtMwM0+H4HvqFPZfB6dV8ctbP9zFAO73VG1cMWae0FLPCtz0peKPpZY8/ugJJX2w==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/base64": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/strings": "^5.7.0" - } - }, - "node_modules/@ethersproject/wordlists": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/wordlists/-/wordlists-5.7.0.tgz", - "integrity": "sha512-S2TFNJNfHWVHNE6cNDjbVlZ6MgE17MIxMbMg2zv3wn+3XSJGosL1m9ZVv3GXCf/2ymSsQ+hRI5IzoMJTG6aoVA==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/hash": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/strings": "^5.7.0" - } - }, "node_modules/@humanwhocodes/config-array": { "version": "0.10.4", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz", @@ -2701,11 +1993,6 @@ "node": ">=0.4.0" } }, - "node_modules/aes-js": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.0.0.tgz", - "integrity": "sha512-H7wUZRn8WpTq9jocdxQ2c8x2sKo9ZVmzfRE13GiNJXfp7NcKYEdvl3vspKjXox6RIG2VtaRe4JFvxG4rqp2Zuw==" - }, "node_modules/agent-base": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", @@ -4270,53 +3557,6 @@ "node": ">=0.10.0" } }, - "node_modules/ethers": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/ethers/-/ethers-5.7.2.tgz", - "integrity": "sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg==", - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/abi": "5.7.0", - "@ethersproject/abstract-provider": "5.7.0", - "@ethersproject/abstract-signer": "5.7.0", - "@ethersproject/address": "5.7.0", - "@ethersproject/base64": "5.7.0", - "@ethersproject/basex": "5.7.0", - "@ethersproject/bignumber": "5.7.0", - "@ethersproject/bytes": "5.7.0", - "@ethersproject/constants": "5.7.0", - "@ethersproject/contracts": "5.7.0", - "@ethersproject/hash": "5.7.0", - "@ethersproject/hdnode": "5.7.0", - "@ethersproject/json-wallets": "5.7.0", - "@ethersproject/keccak256": "5.7.0", - "@ethersproject/logger": "5.7.0", - "@ethersproject/networks": "5.7.1", - "@ethersproject/pbkdf2": "5.7.0", - "@ethersproject/properties": "5.7.0", - "@ethersproject/providers": "5.7.2", - "@ethersproject/random": "5.7.0", - "@ethersproject/rlp": "5.7.0", - "@ethersproject/sha2": "5.7.0", - "@ethersproject/signing-key": "5.7.0", - "@ethersproject/solidity": "5.7.0", - "@ethersproject/strings": "5.7.0", - "@ethersproject/transactions": "5.7.0", - "@ethersproject/units": "5.7.0", - "@ethersproject/wallet": "5.7.0", - "@ethersproject/web": "5.7.1", - "@ethersproject/wordlists": "5.7.0" - } - }, "node_modules/events": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", @@ -6057,11 +5297,6 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, - "node_modules/js-sha3": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz", - "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==" - }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -7456,11 +6691,6 @@ "url": "https://opencollective.com/webpack" } }, - "node_modules/scrypt-js": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-3.0.1.tgz", - "integrity": "sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA==" - }, "node_modules/secp256k1": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-4.0.3.tgz", diff --git a/package.json b/package.json index 2b433835..e656e522 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,6 @@ "webpack-cli": "^4.3.0" }, "dependencies": { - "@ethersproject/bytes": "^5.7.0", "@terra-money/legacy.proto": "npm:@terra-money/terra.proto@^0.1.7", "@terra-money/terra.proto": "^4.0.4", "assert": "^2.0.0", @@ -96,7 +95,6 @@ "bufferutil": "^4.0.3", "crypto-browserify": "^3.12.0", "decimal.js": "^10.2.1", - "ethers": "^5.7.2", "jscrypto": "^1.0.1", "keccak256": "^1.0.6", "long": "^5.2.3", diff --git a/src/core/PublicKey.ts b/src/core/PublicKey.ts index 86b064a5..2363abe7 100644 --- a/src/core/PublicKey.ts +++ b/src/core/PublicKey.ts @@ -6,7 +6,7 @@ import { PubKey as PubKey_pb } from '@terra-money/terra.proto/cosmos/crypto/secp import { PubKey as ValConsPubKey_pb } from '@terra-money/terra.proto/cosmos/crypto/ed25519/keys'; import { bech32 } from 'bech32'; import { publicKeyConvert } from 'secp256k1'; -import { keccak256 } from 'ethers/lib/utils'; +import keccak256 from 'keccak256'; // As discussed in https://github.com/binance-chain/javascript-sdk/issues/163 // Prefixes listed here: https://github.com/tendermint/tendermint/blob/d419fffe18531317c28c29a292ad7d253f6cafdf/docs/spec/blockchain/encoding.md#public-key-cryptography @@ -257,12 +257,8 @@ export class InjectivePubKey extends JSONSerializable< publicKeyConvert(fixedPubKey, false) ).toString('hex'); - const addressBuffer = Buffer.from( - keccak256(Buffer.from(decompressedPublicKey.substring(2), 'hex')).replace( - '0x', - '' - ), - 'hex' + const addressBuffer = keccak256( + Buffer.from(decompressedPublicKey.substring(2), 'hex') ).subarray(-20); return addressBuffer; diff --git a/src/key/RawKey.ts b/src/key/RawKey.ts index d9c9a106..754ad63f 100644 --- a/src/key/RawKey.ts +++ b/src/key/RawKey.ts @@ -1,8 +1,6 @@ import { SHA256, Word32Array } from 'jscrypto'; import * as secp256k1 from 'secp256k1'; import keccak256 from 'keccak256'; -import { Wallet } from 'ethers'; -import * as BytesUtils from '@ethersproject/bytes'; import { Key } from './Key'; import { InjectivePubKey, SimplePublicKey } from '../core/PublicKey'; @@ -42,15 +40,10 @@ export class RawKey extends Key { public etherSign(payload: Buffer): { signature: Uint8Array } { const hash = keccak256(payload); - const wallet = new Wallet(this.privateKey); - - const signature = wallet._signingKey().signDigest(hash); - - return { - signature: BytesUtils.arrayify( - BytesUtils.concat([signature.r, signature.s]) - ), - }; + return secp256k1.ecdsaSign( + Uint8Array.from(hash), + Uint8Array.from(this.privateKey) + ); } public async sign(payload: Buffer): Promise<Buffer> { From 04e6c2b6baaf1955e17cee81d08ce1b66e5910d5 Mon Sep 17 00:00:00 2001 From: freeelancer <lmengsplist96@gmail.com> Date: Thu, 11 Jan 2024 16:13:23 +0800 Subject: [PATCH 2/3] removed all reference to jax --- src/core/Msg.ts | 28 ---- src/core/index.ts | 4 - src/core/jax/msgs/MsgExecuteContract.ts | 177 ------------------------ src/core/jax/msgs/MsgStoreCode.ts | 154 --------------------- src/core/jax/msgs/index.ts | 16 --- 5 files changed, 379 deletions(-) delete mode 100644 src/core/jax/msgs/MsgExecuteContract.ts delete mode 100644 src/core/jax/msgs/MsgStoreCode.ts delete mode 100644 src/core/jax/msgs/index.ts diff --git a/src/core/Msg.ts b/src/core/Msg.ts index 46a1af1e..c059ac10 100644 --- a/src/core/Msg.ts +++ b/src/core/Msg.ts @@ -77,7 +77,6 @@ import { MsgSetBeforeSendHook, TokenFactoryMsg, } from './tokenfactory'; -import { JAXMsgExecuteContract, JAXMsgStoreCode, JaxMsg } from './jax/msgs'; import { MsgTransfer, IbcTransferMsg } from './ibc/applications/transfer'; import { MsgCreateClient, @@ -142,7 +141,6 @@ export type Msg = | AllianceMsg | CustomMsg | CrisisMsg - | JaxMsg | MsgAuctionBid | FeeshareMsg | TokenFactoryMsg; @@ -163,7 +161,6 @@ export namespace Msg { | AllianceMsg.Amino | CustomMsg.Amino | CrisisMsg.Amino - | JaxMsg.Amino | MsgAuctionBid.Amino | FeeshareMsg.Amino | TokenFactoryMsg.Amino; @@ -187,7 +184,6 @@ export namespace Msg { | AllianceMsg.Data | CustomMsg.Data | CrisisMsg.Data - | JaxMsg.Data | MsgAuctionBid.Data | FeeshareMsg.Data | TokenFactoryMsg.Data; @@ -210,7 +206,6 @@ export namespace Msg { | IbcChannelMsg.Proto | AllianceMsg.Proto | CrisisMsg.Proto - | JaxMsg.Proto | MsgAuctionBid.Proto | FeeshareMsg.Proto | TokenFactoryMsg.Proto; @@ -484,17 +479,6 @@ export namespace Msg { data as MsgVerifyInvariant.Amino, isClassic ); - // jax - case 'jax/MsgExecuteContract': - return JAXMsgExecuteContract.fromAmino( - data as JAXMsgExecuteContract.Amino, - isClassic - ); - case 'jax/MsgStoreCode': - return JAXMsgStoreCode.fromAmino( - data as JAXMsgStoreCode.Amino, - isClassic - ); // Pob module case 'pob/MsgAuctionBid': @@ -707,12 +691,6 @@ export namespace Msg { case '/cosmos.crisis.v1beta1.MsgVerifyInvariant': return MsgVerifyInvariant.fromData(data, isClassic); - // jax - case '/jax.MsgExecuteContract': - return JAXMsgExecuteContract.fromData(data, isClassic); - case '/jax.MsgStoreCode': - return JAXMsgStoreCode.fromData(data, isClassic); - // pob module case '/pob.builder.v1.MsgAuctionBid': return MsgAuctionBid.fromData(data, isClassic); @@ -919,12 +897,6 @@ export namespace Msg { case '/cosmos.crisis.v1beta1.MsgVerifyInvariant': return MsgVerifyInvariant.unpackAny(proto, isClassic); - // jax - case '/jax.MsgExecuteContract': - return JAXMsgExecuteContract.unpackAny(proto, isClassic); - case '/jax.MsgStoreCode': - return JAXMsgStoreCode.unpackAny(proto, isClassic); - case '/pob.builder.v1.MsgAuctionBid': return MsgAuctionBid.unpackAny(proto, isClassic); diff --git a/src/core/index.ts b/src/core/index.ts index 08ab4cf5..8fdf9063 100644 --- a/src/core/index.ts +++ b/src/core/index.ts @@ -24,10 +24,6 @@ export { MsgRedelegate as MsgAllianceRedelegate } from './alliance/msgs/MsgRedel export { MsgClaimDelegationRewards as MsgClaimDelegationRewards } from './alliance/msgs/MsgClaimDelegationRewards'; export * from './alliance/proposals'; -// JAX -export { MsgExecuteContract as JAXMsgExecuteContract } from './jax/msgs/MsgExecuteContract'; -export { MsgStoreCode as JAXMsgStoreCode } from './jax/msgs/MsgStoreCode'; - // Auth export * from './auth/Account'; export * from './auth/BaseAccount'; diff --git a/src/core/jax/msgs/MsgExecuteContract.ts b/src/core/jax/msgs/MsgExecuteContract.ts deleted file mode 100644 index dd67f726..00000000 --- a/src/core/jax/msgs/MsgExecuteContract.ts +++ /dev/null @@ -1,177 +0,0 @@ -import { JSONSerializable, removeNull } from '../../../util/json'; -import { AccAddress } from '../../bech32'; -import { Coins } from '../../Coins'; -import { Any } from '@terra-money/terra.proto/google/protobuf/any'; -import { MsgExecuteContract as MsgExecuteContract_pb } from '@terra-money/terra.proto/jax/tx'; - -export class MsgExecuteContract extends JSONSerializable< - MsgExecuteContract.Amino, - MsgExecuteContract.Data, - MsgExecuteContract.Proto -> { - public coins: Coins; - - /** - * @param sender contract user - * @param contract contract address - * @param method method name on the contract - * @param params json stringified params - * @param coins coins to be sent to contract - */ - constructor( - public sender: AccAddress, - public contract: AccAddress, - public method: string, - public params: string, - coins: Coins.Input = {} - ) { - super(); - this.coins = new Coins(coins); - } - - public static fromAmino( - data: MsgExecuteContract.Amino, - _?: boolean - ): MsgExecuteContract { - const { - value: { sender, contract, method, params, coins }, - } = data as MsgExecuteContract.AminoV2; - return new MsgExecuteContract( - sender, - contract, - method, - params, - Coins.fromAmino(coins) - ); - } - - public toAmino(_?: boolean): MsgExecuteContract.Amino { - const { sender, contract, method, params, coins } = this; - return { - type: 'jax/MsgExecuteContract', - value: { - sender, - contract, - method, - params, - coins: coins.toAmino(), - }, - }; - } - - public static fromProto( - proto: MsgExecuteContract.Proto, - _?: boolean - ): MsgExecuteContract { - const p = proto as MsgExecuteContract_pb; - return new MsgExecuteContract( - p.sender, - p.contract, - p.method, - p.params, - Coins.fromProto(p.coins) - ); - } - - public toProto(_?: boolean): MsgExecuteContract.Proto { - const { sender, contract, method, params, coins } = this; - return MsgExecuteContract_pb.fromPartial({ - coins: coins.toProto(), - contract, - sender, - method, - params, - }); - } - - public packAny(isClassic?: boolean): Any { - return Any.fromPartial({ - typeUrl: '/jax.MsgExecuteContract', - value: MsgExecuteContract_pb.encode( - this.toProto(isClassic) as MsgExecuteContract_pb - ).finish(), - }); - } - - public static unpackAny( - msgAny: Any, - isClassic?: boolean - ): MsgExecuteContract { - return MsgExecuteContract.fromProto( - MsgExecuteContract_pb.decode(msgAny.value), - isClassic - ); - } - - public static fromData( - data: MsgExecuteContract.Data, - _?: boolean - ): MsgExecuteContract { - const { sender, contract, method, params, coins } = - data as MsgExecuteContract.DataV2; - return new MsgExecuteContract( - sender, - contract, - method, - params, - Coins.fromData(coins) - ); - } - - public toData(_?: boolean): MsgExecuteContract.Data { - const { sender, contract, method, params, coins } = this; - return { - '@type': '/jax.MsgExecuteContract', - sender, - contract, - method, - params, - coins: coins.toData(), - }; - } -} - -export namespace MsgExecuteContract { - export interface AminoV1 { - type: 'jax/MsgExecuteContract'; - value: { - sender: AccAddress; - contract: AccAddress; - method: string; - params: string; - coins: Coins.Amino; - }; - } - - export interface AminoV2 { - type: 'jax/MsgExecuteContract'; - value: { - sender: AccAddress; - contract: AccAddress; - method: string; - params: string; - coins: Coins.Amino; - }; - } - - export interface DataV1 { - '@type': '/jax.MsgExecuteContract'; - sender: AccAddress; - contract: AccAddress; - method: string; - params: string; - coins: Coins.Data; - } - export interface DataV2 { - '@type': '/jax.MsgExecuteContract'; - sender: AccAddress; - contract: AccAddress; - method: string; - params: string; - coins: Coins.Data; - } - - export type Amino = AminoV1 | AminoV2; - export type Data = DataV1 | DataV2; - export type Proto = MsgExecuteContract_pb; -} diff --git a/src/core/jax/msgs/MsgStoreCode.ts b/src/core/jax/msgs/MsgStoreCode.ts deleted file mode 100644 index 841a9fe1..00000000 --- a/src/core/jax/msgs/MsgStoreCode.ts +++ /dev/null @@ -1,154 +0,0 @@ -import { JSONSerializable } from '../../../util/json'; -import { AccAddress } from '../../bech32'; -import { Coins } from '../../Coins'; -import { Any } from '@terra-money/terra.proto/google/protobuf/any'; -import { MsgStoreCode as MsgStoreCode_pb } from '@terra-money/terra.proto/jax/tx'; - -export class MsgStoreCode extends JSONSerializable< - MsgStoreCode.Amino, - MsgStoreCode.Data, - MsgStoreCode.Proto -> { - public coins: Coins; - /** - * @param creator contract deployer - * @param admin address of contract admin, usually contract deployer - * @param code the JavaScript source code of the contract - * @param params json stringified params to pass to init - * @param coins coins to be sent to contract - */ - constructor( - public creator: AccAddress, - public admin: AccAddress, - public code: string, - public params: string, - coins: Coins.Input = {} - ) { - super(); - this.coins = new Coins(coins); - } - - public static fromAmino(data: MsgStoreCode.Amino, _?: boolean): MsgStoreCode { - const { - value: { creator, admin, code, params }, - } = data as MsgStoreCode.AminoV2; - return new MsgStoreCode(creator, admin, code, params); - } - - public toAmino(_?: boolean): MsgStoreCode.Amino { - const { creator, admin, code, params, coins } = this; - return { - type: 'jax/MsgStoreCode', - value: { - creator, - admin, - code, - params, - coins: coins.toAmino(), - }, - }; - } - - public static fromProto( - proto: MsgStoreCode.Proto, - _?: boolean - ): MsgStoreCode { - const p = proto as MsgStoreCode_pb; - return new MsgStoreCode(p.creator, p.admin, p.code, p.params); - } - - public toProto(_?: boolean): MsgStoreCode.Proto { - const { creator, admin, code, params, coins } = this; - return MsgStoreCode_pb.fromPartial({ - creator, - admin, - code, - params, - coins: coins.toProto(), - }); - } - - public packAny(isClassic?: boolean): Any { - return Any.fromPartial({ - typeUrl: '/jax.MsgStoreCode', - value: MsgStoreCode_pb.encode( - this.toProto(isClassic) as MsgStoreCode_pb - ).finish(), - }); - } - - public static unpackAny(msgAny: Any, isClassic?: boolean): MsgStoreCode { - return MsgStoreCode.fromProto( - MsgStoreCode_pb.decode(msgAny.value), - isClassic - ); - } - - public static fromData(data: MsgStoreCode.Data, _?: boolean): MsgStoreCode { - const { creator, admin, code, params, coins } = data as MsgStoreCode.DataV2; - return new MsgStoreCode( - creator, - admin, - code, - params, - Coins.fromData(coins) - ); - } - - public toData(_?: boolean): MsgStoreCode.Data { - const { creator, admin, code, params, coins } = this; - return { - '@type': '/jax.MsgStoreCode', - creator, - admin, - code, - params, - coins: coins.toData(), - }; - } -} - -export namespace MsgStoreCode { - export interface AminoV1 { - type: 'jax/MsgStoreCode'; - value: { - creator: AccAddress; - admin: AccAddress; - code: string; - params: string; - coins: Coins.Amino; - }; - } - - export interface AminoV2 { - type: 'jax/MsgStoreCode'; - value: { - creator: AccAddress; - admin: AccAddress; - code: string; - params: string; - coins: Coins.Amino; - }; - } - - export interface DataV1 { - '@type': '/jax.MsgStoreCode'; - creator: AccAddress; - admin: AccAddress; - code: string; - params: string; - coins: Coins.Data; - } - export interface DataV2 { - '@type': '/jax.MsgStoreCode'; - creator: AccAddress; - admin: AccAddress; - code: string; - params: string; - coins: Coins.Data; - } - - export type Amino = AminoV1 | AminoV2; - export type Data = DataV1 | DataV2; - export type Proto = MsgStoreCode_pb; -} diff --git a/src/core/jax/msgs/index.ts b/src/core/jax/msgs/index.ts deleted file mode 100644 index e81c4ab4..00000000 --- a/src/core/jax/msgs/index.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { MsgExecuteContract } from './MsgExecuteContract'; -import { MsgStoreCode } from './MsgStoreCode'; - -// These messages are similar to the wasm module so prefix with JAX. -export { MsgExecuteContract as JAXMsgExecuteContract }; -export { MsgStoreCode as JAXMsgStoreCode }; - -export type JaxMsg = MsgExecuteContract | MsgStoreCode; - -export namespace JaxMsg { - export type Data = MsgExecuteContract.Data | MsgStoreCode.Data; - - export type Amino = MsgExecuteContract.Amino | MsgStoreCode.Amino; - - export type Proto = MsgExecuteContract.Proto | MsgStoreCode.Proto; -} From 5273ba55f81ce5f75f78b56eb8ad097563bd629c Mon Sep 17 00:00:00 2001 From: emidev98 <emilian@terra.money> Date: Tue, 16 Jan 2024 13:00:26 +0200 Subject: [PATCH 3/3] feat: v2.0.0 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 02ec9acf..a5480066 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@terra-money/feather.js", - "version": "2.0.0-beta.15", + "version": "2.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@terra-money/feather.js", - "version": "2.0.0-beta.15", + "version": "2.0.0", "license": "MIT", "dependencies": { "@terra-money/legacy.proto": "npm:@terra-money/terra.proto@^0.1.7", diff --git a/package.json b/package.json index e656e522..ba3e0698 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@terra-money/feather.js", - "version": "2.0.0-beta.15", + "version": "2.0.0", "description": "The JavaScript SDK for Terra and Feather chains", "license": "MIT", "author": "Terraform Labs, PTE.",