From 2d43ff35dc22c915bd59597382adc8653191d1d1 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Fri, 28 Feb 2020 17:37:26 -0300 Subject: [PATCH 1/2] filter dependency contracts from alias list in push --- packages/cli/src/scripts/push.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/cli/src/scripts/push.ts b/packages/cli/src/scripts/push.ts index eb3336b2e..829bcadf5 100644 --- a/packages/cli/src/scripts/push.ts +++ b/packages/cli/src/scripts/push.ts @@ -1,5 +1,6 @@ import NetworkController from '../models/network/NetworkController'; import { PushParams } from './interfaces'; +import { fromContractFullName } from '../utils/naming'; export default async function push({ contractAliases, @@ -18,7 +19,13 @@ export default async function push({ if (deployDependencies) await controller.deployDependencies(); if (deployProxyAdmin) await controller.deployProxyAdmin(); if (deployProxyFactory) await controller.deployProxyFactory(); - await controller.push(contractAliases, { reupload, force }); + + const localContractAliases = contractAliases + .map(fromContractFullName) + .filter(({ package: packageName }) => packageName === undefined || packageName === controller.projectFile.name) + .map(({ contract }) => contract); + + await controller.push(localContractAliases, { reupload, force }); const { appAddress } = controller; } finally { controller.writeNetworkPackageIfNeeded(); From 53f6eb7d2a8f6fd3ea3f6d083ad559da7a57730e Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Fri, 28 Feb 2020 18:05:04 -0300 Subject: [PATCH 2/2] avoid mapping if variable is undefined --- packages/cli/src/scripts/push.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/src/scripts/push.ts b/packages/cli/src/scripts/push.ts index 829bcadf5..ff6cde087 100644 --- a/packages/cli/src/scripts/push.ts +++ b/packages/cli/src/scripts/push.ts @@ -21,7 +21,7 @@ export default async function push({ if (deployProxyFactory) await controller.deployProxyFactory(); const localContractAliases = contractAliases - .map(fromContractFullName) + ?.map(fromContractFullName) .filter(({ package: packageName }) => packageName === undefined || packageName === controller.projectFile.name) .map(({ contract }) => contract);