Skip to content
This repository has been archived by the owner on Jan 24, 2022. It is now read-only.

Fix push functionality when deploying a dependency contract #1486

Merged
merged 3 commits into from
Feb 29, 2020
Merged

Fix push functionality when deploying a dependency contract #1486

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d43ff3
filter dependency contracts from alias list in push
frangio Feb 28, 2020
b11166f
Merge branch 'master' of github.com:OpenZeppelin/openzeppelin-sdk int…
frangio Feb 28, 2020
53f6eb7
avoid mapping if variable is undefined
frangio Feb 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion packages/cli/src/scripts/push.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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();
Expand Down