From b54df5e03c3c574d8a6c083e00dfaacf51cd263e Mon Sep 17 00:00:00 2001 From: Marcelo Morgado Date: Tue, 12 Mar 2019 20:44:56 +0000 Subject: [PATCH 1/6] dependencies --- packages/tasit-action/package.json | 3 ++- packages/tasit-identity-contract/package.json | 3 ++- packages/tasit-sdk/package-lock.json | 2 +- packages/tasit-sdk/package.json | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/tasit-action/package.json b/packages/tasit-action/package.json index a98997b8..55b6abdc 100644 --- a/packages/tasit-action/package.json +++ b/packages/tasit-action/package.json @@ -26,7 +26,8 @@ }, "dependencies": { "@babel/runtime": "^7.1.5", - "ethers": "^4.0.27" + "ethers": "^4.0.27", + "tasit-contracts": "^0.0.11" }, "devDependencies": { "@babel/cli": "^7.1.5", diff --git a/packages/tasit-identity-contract/package.json b/packages/tasit-identity-contract/package.json index 61ede6ce..93b86548 100644 --- a/packages/tasit-identity-contract/package.json +++ b/packages/tasit-identity-contract/package.json @@ -27,7 +27,8 @@ "dependencies": { "@babel/runtime": "^7.1.5", "ethers": "^4.0.27", - "tasit-action": "^0.0.11" + "tasit-action": "^0.0.11", + "tasit-contracts": "^0.0.11" }, "devDependencies": { "@babel/cli": "^7.1.5", diff --git a/packages/tasit-sdk/package-lock.json b/packages/tasit-sdk/package-lock.json index 308c1183..b5636ef1 100644 --- a/packages/tasit-sdk/package-lock.json +++ b/packages/tasit-sdk/package-lock.json @@ -1,6 +1,6 @@ { "name": "tasit-sdk", - "version": "0.0.10", + "version": "0.0.11", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/tasit-sdk/package.json b/packages/tasit-sdk/package.json index 3fd1d526..ace03ccc 100644 --- a/packages/tasit-sdk/package.json +++ b/packages/tasit-sdk/package.json @@ -42,6 +42,7 @@ "@babel/register": "^7.0.0", "chai": "^4.2.0", "ethers": "^4.0.27", - "mocha": "^6.0.1" + "mocha": "^6.0.1", + "tasit-contracts": "^0.0.11" } } From 3d8756316c6d2eea42a4b8ec36c6cc551fd357fe Mon Sep 17 00:00:00 2001 From: Marcelo Morgado Date: Tue, 12 Mar 2019 20:45:01 +0000 Subject: [PATCH 2/6] tasit-action --- packages/tasit-action/src/erc20/ERC20Full.js | 5 ++++- packages/tasit-action/src/erc20/Mana.js | 6 ++++-- packages/tasit-action/src/erc721/ERC721Full.js | 5 ++++- packages/tasit-action/src/erc721/Estate.js | 6 ++++-- packages/tasit-action/src/erc721/Land.js | 6 ++++-- packages/tasit-action/src/marketplace/Decentraland.js | 6 ++++-- 6 files changed, 24 insertions(+), 10 deletions(-) diff --git a/packages/tasit-action/src/erc20/ERC20Full.js b/packages/tasit-action/src/erc20/ERC20Full.js index 8042cc29..dc9735a6 100644 --- a/packages/tasit-action/src/erc20/ERC20Full.js +++ b/packages/tasit-action/src/erc20/ERC20Full.js @@ -1,5 +1,8 @@ import Contract from "../contract/Contract"; -import abi from "../../../tasit-contracts/abi/MyERC20Full.json"; +import TasitContracts from "tasit-contracts"; +const { local } = TasitContracts; +const { MyERC20Full } = local; +const { abi } = MyERC20Full; export default class ERC20Full extends Contract { constructor(address, wallet) { diff --git a/packages/tasit-action/src/erc20/Mana.js b/packages/tasit-action/src/erc20/Mana.js index d08df182..a454e182 100644 --- a/packages/tasit-action/src/erc20/Mana.js +++ b/packages/tasit-action/src/erc20/Mana.js @@ -1,9 +1,11 @@ import Contract from "../contract/Contract"; -import manaTokenABI from "../../../tasit-contracts/abi/MANAToken.json"; +import TasitContracts from "tasit-contracts"; +const { local } = TasitContracts; +const { MANAToken } = local; +const { abi } = MANAToken; export default class Mana extends Contract { constructor(address, wallet) { - const abi = manaTokenABI; super(address, abi, wallet); } } diff --git a/packages/tasit-action/src/erc721/ERC721Full.js b/packages/tasit-action/src/erc721/ERC721Full.js index eee041dc..5e73131f 100644 --- a/packages/tasit-action/src/erc721/ERC721Full.js +++ b/packages/tasit-action/src/erc721/ERC721Full.js @@ -1,5 +1,8 @@ import Contract from "../contract/Contract"; -import abi from "../../../tasit-contracts/abi/MyERC721Full.json"; +import TasitContracts from "tasit-contracts"; +const { local } = TasitContracts; +const { MyERC721Full } = local; +const { abi } = MyERC721Full; export default class ERC721Full extends Contract { constructor(address, wallet) { diff --git a/packages/tasit-action/src/erc721/Estate.js b/packages/tasit-action/src/erc721/Estate.js index 08abf4a9..41855e5f 100644 --- a/packages/tasit-action/src/erc721/Estate.js +++ b/packages/tasit-action/src/erc721/Estate.js @@ -1,9 +1,11 @@ import Contract from "../contract/Contract"; -import estateRegistryABI from "../../../tasit-contracts/abi/EstateRegistry.json"; +import TasitContracts from "tasit-contracts"; +const { local } = TasitContracts; +const { EstateRegistry } = local; +const { abi } = EstateRegistry; export default class DecentralandEstate extends Contract { constructor(address, wallet) { - const abi = estateRegistryABI; super(address, abi, wallet); } } diff --git a/packages/tasit-action/src/erc721/Land.js b/packages/tasit-action/src/erc721/Land.js index 48cb1b9e..d1d6c0d7 100644 --- a/packages/tasit-action/src/erc721/Land.js +++ b/packages/tasit-action/src/erc721/Land.js @@ -1,9 +1,11 @@ import Contract from "../contract/Contract"; -import landRegistryABI from "../../../tasit-contracts/abi/LANDRegistry.json"; +import TasitContracts from "tasit-contracts"; +const { local } = TasitContracts; +const { LANDRegistry } = local; +const { abi } = LANDRegistry; export default class Land extends Contract { constructor(address, wallet) { - const abi = landRegistryABI; super(address, abi, wallet); } } diff --git a/packages/tasit-action/src/marketplace/Decentraland.js b/packages/tasit-action/src/marketplace/Decentraland.js index 47c4a571..87d28a8a 100644 --- a/packages/tasit-action/src/marketplace/Decentraland.js +++ b/packages/tasit-action/src/marketplace/Decentraland.js @@ -1,9 +1,11 @@ import Contract from "../contract/Contract"; -import marketplaceABI from "../../../tasit-contracts/abi/Marketplace.json"; +import TasitContracts from "tasit-contracts"; +const { local } = TasitContracts; +const { Marketplace } = local; +const { abi } = Marketplace; export default class Decentraland extends Contract { constructor(address, wallet) { - const abi = marketplaceABI; super(address, abi, wallet); } } From 1d9587f7dab04b40f82eff6d1c14a7b5bb1bade4 Mon Sep 17 00:00:00 2001 From: Marcelo Morgado Date: Tue, 12 Mar 2019 20:46:38 +0000 Subject: [PATCH 3/6] tasit-contracts main file --- packages/tasit-contracts/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/tasit-contracts/package.json b/packages/tasit-contracts/package.json index f8004a0f..fb716497 100644 --- a/packages/tasit-contracts/package.json +++ b/packages/tasit-contracts/package.json @@ -2,6 +2,7 @@ "name": "tasit-contracts", "version": "0.0.11", "description": "", + "main": "dist/index.js", "keywords": [ "ethereum", "dapp", From a0cfd7d4b8f020a91fe46b8c373fd7bc5bdbd484 Mon Sep 17 00:00:00 2001 From: Marcelo Morgado Date: Tue, 12 Mar 2019 20:49:44 +0000 Subject: [PATCH 4/6] tasit-action --- packages/tasit-action/src/contract/Contract.test.js | 2 +- packages/tasit-action/src/erc20/ERC20Full.test.js | 2 +- packages/tasit-action/src/erc20/Mana.test.js | 2 +- packages/tasit-action/src/erc721/ERC721Full.test.js | 2 +- packages/tasit-action/src/erc721/Estate.test.js | 2 +- packages/tasit-action/src/erc721/Land.test.js | 2 +- packages/tasit-action/src/ethers.test.js | 2 +- packages/tasit-action/src/marketplace/Decentraland.test.js | 2 +- packages/tasit-action/src/testHelpers/helpers.js | 2 +- packages/tasit-action/src/testHelpers/mochaSetup.js | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/tasit-action/src/contract/Contract.test.js b/packages/tasit-action/src/contract/Contract.test.js index bf0f55eb..8d32d0cc 100644 --- a/packages/tasit-action/src/contract/Contract.test.js +++ b/packages/tasit-action/src/contract/Contract.test.js @@ -1,6 +1,6 @@ import Contract from "./Contract"; import Account from "tasit-account"; -import TasitContracts from "../../../tasit-contracts/dist"; +import TasitContracts from "tasit-contracts"; const { local: localContracts } = TasitContracts; const { SampleContract } = localContracts; const { diff --git a/packages/tasit-action/src/erc20/ERC20Full.test.js b/packages/tasit-action/src/erc20/ERC20Full.test.js index 0837a4b4..c4546c37 100644 --- a/packages/tasit-action/src/erc20/ERC20Full.test.js +++ b/packages/tasit-action/src/erc20/ERC20Full.test.js @@ -1,5 +1,5 @@ import ERC20Full from "./ERC20Full"; -import TasitContracts from "../../../tasit-contracts/dist"; +import TasitContracts from "tasit-contracts"; const { local: localContracts } = TasitContracts; const { MyERC20Full } = localContracts; const { address: ERC20_FULL_ADDRESS } = MyERC20Full; diff --git a/packages/tasit-action/src/erc20/Mana.test.js b/packages/tasit-action/src/erc20/Mana.test.js index eb3e2b24..860a9ab1 100644 --- a/packages/tasit-action/src/erc20/Mana.test.js +++ b/packages/tasit-action/src/erc20/Mana.test.js @@ -1,5 +1,5 @@ import Mana from "./Mana"; -import TasitContracts from "../../../tasit-contracts/dist"; +import TasitContracts from "tasit-contracts"; const { local: localContracts } = TasitContracts; const { MANAToken } = localContracts; const { address: MANA_ADDRESS } = MANAToken; diff --git a/packages/tasit-action/src/erc721/ERC721Full.test.js b/packages/tasit-action/src/erc721/ERC721Full.test.js index a0d9c370..50d97bc3 100644 --- a/packages/tasit-action/src/erc721/ERC721Full.test.js +++ b/packages/tasit-action/src/erc721/ERC721Full.test.js @@ -1,6 +1,6 @@ import ERC721Full from "./ERC721Full"; -import TasitContracts from "../../../tasit-contracts/dist"; +import TasitContracts from "tasit-contracts"; const { local: localContracts } = TasitContracts; const { MyERC721Full, SampleContract } = localContracts; const { address: ERC721_FULL_ADDRESS } = MyERC721Full; diff --git a/packages/tasit-action/src/erc721/Estate.test.js b/packages/tasit-action/src/erc721/Estate.test.js index 78f7a94e..06b70b56 100644 --- a/packages/tasit-action/src/erc721/Estate.test.js +++ b/packages/tasit-action/src/erc721/Estate.test.js @@ -1,5 +1,5 @@ import Estate from "./Estate"; -import TasitContracts from "../../../tasit-contracts/dist"; +import TasitContracts from "tasit-contracts"; const { local: localContracts } = TasitContracts; const { EstateRegistry } = localContracts; const { address: ESTATE_ADDRESS } = EstateRegistry; diff --git a/packages/tasit-action/src/erc721/Land.test.js b/packages/tasit-action/src/erc721/Land.test.js index 199bce13..9312a678 100644 --- a/packages/tasit-action/src/erc721/Land.test.js +++ b/packages/tasit-action/src/erc721/Land.test.js @@ -1,5 +1,5 @@ import Land from "./Land"; -import TasitContracts from "../../../tasit-contracts/dist"; +import TasitContracts from "tasit-contracts"; const { local: localContracts } = TasitContracts; const { LANDProxy } = localContracts; const { address: LAND_PROXY_ADDRESS } = LANDProxy; diff --git a/packages/tasit-action/src/ethers.test.js b/packages/tasit-action/src/ethers.test.js index 64514453..f71aefe9 100644 --- a/packages/tasit-action/src/ethers.test.js +++ b/packages/tasit-action/src/ethers.test.js @@ -1,6 +1,6 @@ import { ethers } from "ethers"; ethers.errors.setLogLevel("error"); -import TasitContracts from "../../tasit-contracts/dist"; +import TasitContracts from "tasit-contracts"; const { local: localContracts } = TasitContracts; const { SampleContract } = localContracts; const { diff --git a/packages/tasit-action/src/marketplace/Decentraland.test.js b/packages/tasit-action/src/marketplace/Decentraland.test.js index 3ae48cc3..48f9c830 100644 --- a/packages/tasit-action/src/marketplace/Decentraland.test.js +++ b/packages/tasit-action/src/marketplace/Decentraland.test.js @@ -1,5 +1,5 @@ import Decentraland from "./Decentraland"; -import TasitContracts from "../../../tasit-contracts/dist"; +import TasitContracts from "tasit-contracts"; const { local: localContracts } = TasitContracts; const { Marketplace } = localContracts; const { address: MARKETPLACE_ADDRESS } = Marketplace; diff --git a/packages/tasit-action/src/testHelpers/helpers.js b/packages/tasit-action/src/testHelpers/helpers.js index 12c20c95..0c3af997 100644 --- a/packages/tasit-action/src/testHelpers/helpers.js +++ b/packages/tasit-action/src/testHelpers/helpers.js @@ -1,7 +1,7 @@ import { expect } from "chai"; import { ethers } from "ethers"; import ProviderFactory from "../ProviderFactory"; -import developmentConfig from "../config/default.js"; +import developmentConfig from "../config/default"; // Note: Using dist file because babel doesn't compile node_modules files. // Any changes on src should be followed by compilation to avoid unexpected behaviors. diff --git a/packages/tasit-action/src/testHelpers/mochaSetup.js b/packages/tasit-action/src/testHelpers/mochaSetup.js index 96ecf9bb..ccbbc29e 100644 --- a/packages/tasit-action/src/testHelpers/mochaSetup.js +++ b/packages/tasit-action/src/testHelpers/mochaSetup.js @@ -12,7 +12,7 @@ import actionHelpers from "./helpers"; global = Object.assign(global, actionHelpers); import ConfigLoader from "../ConfigLoader"; -import config from "../config/default.js"; +import config from "../config/default"; ConfigLoader.setConfig(config); // Global hooks From efc80289497237a8fcfe3dcc6fff56c56c41c6c6 Mon Sep 17 00:00:00 2001 From: Marcelo Morgado Date: Tue, 12 Mar 2019 20:51:30 +0000 Subject: [PATCH 5/6] tasit-identity-contract --- packages/tasit-identity-contract/src/GnosisSafe.js | 2 +- packages/tasit-identity-contract/src/GnosisSafe.test.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tasit-identity-contract/src/GnosisSafe.js b/packages/tasit-identity-contract/src/GnosisSafe.js index 9ee698f1..1ca9ebb2 100644 --- a/packages/tasit-identity-contract/src/GnosisSafe.js +++ b/packages/tasit-identity-contract/src/GnosisSafe.js @@ -4,7 +4,7 @@ const { ERC20Detailed } = ERC20; const { ERC721Full } = ERC721; import GnosisSafeUtils from "./GnosisSafeUtils"; import ActionUtils from "tasit-action/dist/contract/Utils.js"; -import TasitContracts from "../../tasit-contracts/dist"; +import TasitContracts from "tasit-contracts"; const { local } = TasitContracts; const { GnosisSafe: GnosisSafeInfo, MyERC20Full, MyERC721Full } = local; const { abi: gnosisSafeABI } = GnosisSafeInfo; diff --git a/packages/tasit-identity-contract/src/GnosisSafe.test.js b/packages/tasit-identity-contract/src/GnosisSafe.test.js index 493bda5b..4adb1f39 100644 --- a/packages/tasit-identity-contract/src/GnosisSafe.test.js +++ b/packages/tasit-identity-contract/src/GnosisSafe.test.js @@ -4,7 +4,7 @@ const { ERC20Full } = ERC20; const { ERC721Full } = ERC721; import GnosisSafe from "./GnosisSafe"; import Account from "../../tasit-account/dist"; -import TasitContracts from "../../tasit-contracts/dist"; +import TasitContracts from "tasit-contracts"; const { local } = TasitContracts; const { GnosisSafe: GnosisSafeInfo, MyERC20Full, MyERC721Full } = local; const { address: GNOSIS_SAFE_ADDRESS } = GnosisSafeInfo; From 4d2b44214311131f0930ebd37a4d874ac09b9478 Mon Sep 17 00:00:00 2001 From: Marcelo Morgado Date: Tue, 12 Mar 2019 20:52:44 +0000 Subject: [PATCH 6/6] tasit-sdk --- packages/tasit-sdk/package.json | 6 +++--- packages/tasit-sdk/src/helpers/DecentralandUtils.js | 2 +- packages/tasit-sdk/src/testHelpers/mochaSetup.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/tasit-sdk/package.json b/packages/tasit-sdk/package.json index ace03ccc..a7ce4a19 100644 --- a/packages/tasit-sdk/package.json +++ b/packages/tasit-sdk/package.json @@ -32,7 +32,8 @@ "dependencies": { "@babel/runtime": "^7.1.5", "tasit-account": "^0.0.11", - "tasit-action": "^0.0.11" + "tasit-action": "^0.0.11", + "tasit-contracts": "^0.0.11" }, "devDependencies": { "@babel/cli": "^7.1.5", @@ -42,7 +43,6 @@ "@babel/register": "^7.0.0", "chai": "^4.2.0", "ethers": "^4.0.27", - "mocha": "^6.0.1", - "tasit-contracts": "^0.0.11" + "mocha": "^6.0.1" } } diff --git a/packages/tasit-sdk/src/helpers/DecentralandUtils.js b/packages/tasit-sdk/src/helpers/DecentralandUtils.js index 9c235d5f..8708e763 100644 --- a/packages/tasit-sdk/src/helpers/DecentralandUtils.js +++ b/packages/tasit-sdk/src/helpers/DecentralandUtils.js @@ -1,5 +1,5 @@ import { ethers } from "ethers"; -import TasitContracts from "../../../tasit-contracts/dist"; +import TasitContracts from "tasit-contracts"; // ABI is the same among the networks. The ABI from local will work with tesnet. const { local } = TasitContracts; const { Marketplace } = local; diff --git a/packages/tasit-sdk/src/testHelpers/mochaSetup.js b/packages/tasit-sdk/src/testHelpers/mochaSetup.js index 0e8fe028..58f08a45 100644 --- a/packages/tasit-sdk/src/testHelpers/mochaSetup.js +++ b/packages/tasit-sdk/src/testHelpers/mochaSetup.js @@ -24,7 +24,7 @@ ConfigLoader.setConfig(config); const { provider: configProvider } = config; const { network } = configProvider; -import TasitContracts from "../../../tasit-contracts/dist"; +import TasitContracts from "tasit-contracts"; const { local, goerli, ropsten } = TasitContracts; let blockchain; if (network === "goerli") blockchain = goerli;