Skip to content
This repository has been archived by the owner on Jul 9, 2021. It is now read-only.

Use hardcoded deployedBytecode for local EVM execution #2198

Merged
merged 4 commits into from
Sep 26, 2019
Merged

Use hardcoded deployedBytecode for local EVM execution #2198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a6ac3fd
hardcode deployedBytecode in contracts
xianny Sep 24, 2019
23bc086
Merge branch '3.0' into 2192-fix-eth-call
xianny Sep 25, 2019
ab1ee63
log warning if bytecode is empty or invalid
xianny Sep 25, 2019
8e07395
be typesafe
xianny Sep 26, 2019
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
8 changes: 7 additions & 1 deletion contracts/asset-proxy/test/static_call_proxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,13 @@ describe('StaticCallProxy', () => {
txDefaults,
artifacts,
);
staticCallProxy = new IAssetProxyContract(staticCallProxyWithoutTransferFrom.address, provider, txDefaults);
staticCallProxy = new IAssetProxyContract(
staticCallProxyWithoutTransferFrom.address,
provider,
txDefaults,
{},
StaticCallProxyContract.deployedBytecode,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason to specify this line here? It would default to this value, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope it would default to IAssetProxyContract.deployedBytecode, which was causing it to fail before!

);
staticCallTarget = await TestStaticCallTargetContract.deployFrom0xArtifactAsync(
artifacts.TestStaticCallTarget,
provider,
Expand Down
4 changes: 4 additions & 0 deletions packages/abi-gen-wrappers/CHANGELOG.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
{
"note": "Use V3 contracts",
"pr": 2181
},
{
"note": "Hardcode bytecode for local EVM execution",
"pr": 2198
}
]
},
Expand Down
4 changes: 4 additions & 0 deletions packages/abi-gen-wrappers/src/generated-wrappers/asset_proxy_owner.ts
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 11 additions & 1 deletion packages/abi-gen-wrappers/src/generated-wrappers/coordinator.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions packages/abi-gen-wrappers/src/generated-wrappers/coordinator_registry.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 12 additions & 1 deletion packages/abi-gen-wrappers/src/generated-wrappers/dev_utils.ts
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions packages/abi-gen-wrappers/src/generated-wrappers/dummy_erc20_token.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading