diff --git a/apps/remix-ide-e2e/src/tests/vyper_api.test.ts b/apps/remix-ide-e2e/src/tests/vyper_api.test.ts index 62fff378fb..8731bf9e3d 100644 --- a/apps/remix-ide-e2e/src/tests/vyper_api.test.ts +++ b/apps/remix-ide-e2e/src/tests/vyper_api.test.ts @@ -147,6 +147,34 @@ module.exports = { browser.verifyCallReturnValue(contractAddress, ['0:uint256: 0']) .perform(() => done()) }) + }, + + 'Compile Ownable contract from snekmate #group1': function (browser: NightwatchBrowser) { + let contractAddress + browser + .frameParent() + .clickLaunchIcon('filePanel') + .switchWorkspace('snekmate') + .openFile('src') + .openFile('src/snekmate') + .openFile('src/snekmate/auth') + .openFile('src/snekmate/auth/Ownable.vy') + // .click('*[data-id="treeViewLitreeViewItemsrc/snekmate/auth/Ownable.vy"]') + .rightClick('*[data-id="treeViewLitreeViewItemsrc/snekmate/auth/Ownable.vy"]') + .waitForElementVisible('*[data-id="contextMenuItemvyper"]') + .click('*[data-id="contextMenuItemvyper"]') + .clickLaunchIcon('vyper') + // @ts-ignore + .frame(0) + .click('[data-id="compile"]') + .waitForElementVisible({ + selector:'[data-id="compilation-details"]', + timeout: 60000 + }) + .click('[data-id="compilation-details"]') + .frameParent() + .waitForElementVisible('[data-id="copy-abi"]') + .end() } } diff --git a/apps/vyper/src/app/app.tsx b/apps/vyper/src/app/app.tsx index 63634ca316..7b265e0bdc 100644 --- a/apps/vyper/src/app/app.tsx +++ b/apps/vyper/src/app/app.tsx @@ -119,7 +119,7 @@ const App = () => {
diff --git a/apps/vyper/src/app/utils/compiler.tsx b/apps/vyper/src/app/utils/compiler.tsx index 824c076283..902c4f1691 100644 --- a/apps/vyper/src/app/utils/compiler.tsx +++ b/apps/vyper/src/app/utils/compiler.tsx @@ -148,10 +148,10 @@ const fixContractContent = (content: string) => { const pragma = '#pragma version ^0.3.10' const evmVer = '#pragma evm-version shanghai' - if (!evmVerFound) { + if (evmVerFound === false) { content = `${evmVer}\n${content}` } - if (!pragmaFound) { + if (pragmaFound === false) { content = `${pragma}\n${content}` } return content