From 6dec29e214e6c9f222a7673efd97d21b3952b090 Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Thu, 8 Feb 2018 11:23:37 -0800 Subject: Simplify standard postpublish script and remove them from some private packages --- packages/testnet-faucets/scripts/postpublish.js | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 packages/testnet-faucets/scripts/postpublish.js (limited to 'packages/testnet-faucets') diff --git a/packages/testnet-faucets/scripts/postpublish.js b/packages/testnet-faucets/scripts/postpublish.js deleted file mode 100644 index 16d67e03f..000000000 --- a/packages/testnet-faucets/scripts/postpublish.js +++ /dev/null @@ -1,15 +0,0 @@ -const postpublish_utils = require('../../../scripts/postpublish_utils'); -const packageJSON = require('../package.json'); - -const subPackageName = packageJSON.name; - -postpublish_utils - .getLatestTagAndVersionAsync(subPackageName) - .then(function(result) { - const releaseName = postpublish_utils.getReleaseName(subPackageName, result.version); - const assets = []; - return postpublish_utils.publishReleaseNotes(result.tag, releaseName, assets); - }) - .catch(function(err) { - throw err; - }); -- cgit v1.2.3 From ef1375b9ddafb357b06b47b185ee901a7a768ac3 Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Fri, 9 Feb 2018 10:50:38 -0800 Subject: signature -> ecSignature --- packages/testnet-faucets/src/ts/handler.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/testnet-faucets') diff --git a/packages/testnet-faucets/src/ts/handler.ts b/packages/testnet-faucets/src/ts/handler.ts index 5ed9ce628..ac2718f84 100644 --- a/packages/testnet-faucets/src/ts/handler.ts +++ b/packages/testnet-faucets/src/ts/handler.ts @@ -159,7 +159,7 @@ export class Handler { const signature = await zeroEx.signOrderHashAsync(orderHash, configs.DISPENSER_ADDRESS, false); const signedOrder = { ...order, - signature, + ecSignature: signature, }; const signedOrderHash = ZeroEx.getOrderHashHex(signedOrder); const payload = JSON.stringify(signedOrder); -- cgit v1.2.3 From e68b9c7e81dd89867fadef3d1d87a988f968f450 Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Fri, 9 Feb 2018 12:20:25 -0800 Subject: Convert to baseUnits in signed order --- packages/testnet-faucets/src/ts/handler.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'packages/testnet-faucets') diff --git a/packages/testnet-faucets/src/ts/handler.ts b/packages/testnet-faucets/src/ts/handler.ts index ac2718f84..bf713d709 100644 --- a/packages/testnet-faucets/src/ts/handler.ts +++ b/packages/testnet-faucets/src/ts/handler.ts @@ -129,18 +129,18 @@ export class Handler { } const zeroEx = networkConfig.zeroEx; res.setHeader('Content-Type', 'application/json'); - const makerTokenAddress = await zeroEx.tokenRegistry.getTokenAddressBySymbolIfExistsAsync(requestedAssetType); - if (_.isUndefined(makerTokenAddress)) { + const makerToken = await zeroEx.tokenRegistry.getTokenBySymbolIfExistsAsync(requestedAssetType); + if (_.isUndefined(makerToken) || _.isUndefined(makerToken.address)) { throw new Error(`Unsupported asset type: ${requestedAssetType}`); } const takerTokenSymbol = requestedAssetType === RequestedAssetType.WETH ? RequestedAssetType.ZRX : RequestedAssetType.WETH; - const takerTokenAddress = await zeroEx.tokenRegistry.getTokenAddressBySymbolIfExistsAsync(takerTokenSymbol); - if (_.isUndefined(takerTokenAddress)) { + const takerToken = await zeroEx.tokenRegistry.getTokenBySymbolIfExistsAsync(takerTokenSymbol); + if (_.isUndefined(takerToken) || _.isUndefined(takerToken.address)) { throw new Error(`Unsupported asset type: ${requestedAssetType}`); } - const makerTokenAmount = new BigNumber(0.1); - const takerTokenAmount = new BigNumber(0.1); + const makerTokenAmount = ZeroEx.toBaseUnitAmount(new BigNumber(0.1), makerToken.decimals); + const takerTokenAmount = ZeroEx.toBaseUnitAmount(new BigNumber(0.1), takerToken.decimals); const order: Order = { maker: configs.DISPENSER_ADDRESS, taker: req.params.recipient, @@ -148,8 +148,8 @@ export class Handler { takerFee: new BigNumber(0), makerTokenAmount, takerTokenAmount, - makerTokenAddress, - takerTokenAddress, + makerTokenAddress: makerToken.address, + takerTokenAddress: takerToken.address, salt: ZeroEx.generatePseudoRandomSalt(), exchangeContractAddress: zeroEx.exchange.getContractAddress(), feeRecipient: ZeroEx.NULL_ADDRESS, -- cgit v1.2.3 From 0a2947b86039030707d0d1bf20c27857bffad2aa Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Fri, 9 Feb 2018 12:27:28 -0800 Subject: address is not optional in this context --- packages/testnet-faucets/src/ts/handler.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/testnet-faucets') diff --git a/packages/testnet-faucets/src/ts/handler.ts b/packages/testnet-faucets/src/ts/handler.ts index bf713d709..5f6ada186 100644 --- a/packages/testnet-faucets/src/ts/handler.ts +++ b/packages/testnet-faucets/src/ts/handler.ts @@ -130,13 +130,13 @@ export class Handler { const zeroEx = networkConfig.zeroEx; res.setHeader('Content-Type', 'application/json'); const makerToken = await zeroEx.tokenRegistry.getTokenBySymbolIfExistsAsync(requestedAssetType); - if (_.isUndefined(makerToken) || _.isUndefined(makerToken.address)) { + if (_.isUndefined(makerToken)) { throw new Error(`Unsupported asset type: ${requestedAssetType}`); } const takerTokenSymbol = requestedAssetType === RequestedAssetType.WETH ? RequestedAssetType.ZRX : RequestedAssetType.WETH; const takerToken = await zeroEx.tokenRegistry.getTokenBySymbolIfExistsAsync(takerTokenSymbol); - if (_.isUndefined(takerToken) || _.isUndefined(takerToken.address)) { + if (_.isUndefined(takerToken)) { throw new Error(`Unsupported asset type: ${requestedAssetType}`); } const makerTokenAmount = ZeroEx.toBaseUnitAmount(new BigNumber(0.1), makerToken.decimals); -- cgit v1.2.3 From 634032d5be6b040383f94bbbec19e854ec07ca27 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Fri, 9 Feb 2018 16:19:43 -0800 Subject: Publish - 0x.js@0.32.2 - @0xproject/abi-gen@0.2.1 - @0xproject/assert@0.0.18 - chai-as-promised-typescript-typings@0.0.9 - chai-typescript-typings@0.0.3 - @0xproject/connect@0.5.7 - contracts@2.1.11 - @0xproject/deployer@0.0.8 - @0xproject/dev-utils@0.0.12 - @0xproject/json-schemas@0.7.10 - @0xproject/monorepo-scripts@0.1.10 - @0xproject/subproviders@0.4.1 - @0xproject/testnet-faucets@1.0.12 - @0xproject/tslint-config@0.4.8 - @0xproject/types@0.2.1 - @0xproject/utils@0.3.2 - web3-typescript-typings@0.9.10 - @0xproject/web3-wrapper@0.1.12 - @0xproject/website@0.0.14 --- packages/testnet-faucets/package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'packages/testnet-faucets') diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json index 75b780d93..0981174f5 100644 --- a/packages/testnet-faucets/package.json +++ b/packages/testnet-faucets/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@0xproject/testnet-faucets", - "version": "1.0.11", + "version": "1.0.12", "description": "A faucet micro-service that dispenses test ERC20 tokens or Ether", "main": "server.js", "scripts": { @@ -15,9 +15,9 @@ "author": "Fabio Berger", "license": "Apache-2.0", "dependencies": { - "0x.js": "^0.32.1", - "@0xproject/subproviders": "^0.4.0", - "@0xproject/utils": "^0.3.1", + "0x.js": "^0.32.2", + "@0xproject/subproviders": "^0.4.1", + "@0xproject/utils": "^0.3.2", "body-parser": "^1.17.1", "ethereumjs-tx": "^1.3.3", "ethereumjs-util": "^5.1.1", @@ -28,7 +28,7 @@ "web3-provider-engine": "^13.0.1" }, "devDependencies": { - "@0xproject/tslint-config": "^0.4.7", + "@0xproject/tslint-config": "^0.4.8", "@types/body-parser": "^1.16.1", "@types/express": "^4.0.35", "@types/lodash": "^4.14.86", @@ -41,7 +41,7 @@ "types-bn": "^0.0.1", "types-ethereumjs-util": "0xProject/types-ethereumjs-util", "typescript": "2.7.1", - "web3-typescript-typings": "^0.9.9", + "web3-typescript-typings": "^0.9.10", "webpack": "^3.1.0", "webpack-node-externals": "^1.6.0" } -- cgit v1.2.3 From 07d00cc515e0f9825b81595386b358593b7a3d6f Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Fri, 9 Feb 2018 18:36:51 -0800 Subject: Publish - 0x.js@0.32.3 - @0xproject/abi-gen@0.2.2 - @0xproject/assert@0.0.19 - @0xproject/connect@0.5.8 - contracts@2.1.12 - @0xproject/deployer@0.0.9 - @0xproject/dev-utils@0.0.13 - @0xproject/json-schemas@0.7.11 - @0xproject/monorepo-scripts@0.1.11 - @0xproject/subproviders@0.4.2 - @0xproject/testnet-faucets@1.0.13 - @0xproject/tslint-config@0.4.9 - @0xproject/types@0.2.2 - @0xproject/utils@0.3.3 - @0xproject/web3-wrapper@0.1.13 - @0xproject/website@0.0.15 --- packages/testnet-faucets/package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'packages/testnet-faucets') diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json index 0981174f5..b1190bac7 100644 --- a/packages/testnet-faucets/package.json +++ b/packages/testnet-faucets/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@0xproject/testnet-faucets", - "version": "1.0.12", + "version": "1.0.13", "description": "A faucet micro-service that dispenses test ERC20 tokens or Ether", "main": "server.js", "scripts": { @@ -15,9 +15,9 @@ "author": "Fabio Berger", "license": "Apache-2.0", "dependencies": { - "0x.js": "^0.32.2", - "@0xproject/subproviders": "^0.4.1", - "@0xproject/utils": "^0.3.2", + "0x.js": "^0.32.3", + "@0xproject/subproviders": "^0.4.2", + "@0xproject/utils": "^0.3.3", "body-parser": "^1.17.1", "ethereumjs-tx": "^1.3.3", "ethereumjs-util": "^5.1.1", @@ -28,7 +28,7 @@ "web3-provider-engine": "^13.0.1" }, "devDependencies": { - "@0xproject/tslint-config": "^0.4.8", + "@0xproject/tslint-config": "^0.4.9", "@types/body-parser": "^1.16.1", "@types/express": "^4.0.35", "@types/lodash": "^4.14.86", -- cgit v1.2.3