mirror
/
remix-project
mirror of https://github.com/ethereum/remix-project.git
2
0
Fork 0
Code Issues Releases Wiki Activity

fix bytecode

Browse Source
pull/4143/head
filip mertens 1 year ago
parent 889f1f9419
commit 1542b15ac4
2 changed files with 22 additions and 5 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 21
      libs/remix-core-plugin/src/lib/constants/uups.ts
  2. 6
      libs/remix-core-plugin/src/lib/openzeppelin-proxy.ts

21
libs/remix-core-plugin/src/lib/constants/uups.ts
View File

File diff suppressed because one or more lines are too long

6
libs/remix-core-plugin/src/lib/openzeppelin-proxy.ts
Unescape View File

@ -1,6 +1,6 @@
import { Plugin } from '@remixproject/engine' import { Plugin } from '@remixproject/engine'
import { ContractAST, ContractSources, DeployOptions } from '../types/contract' import { ContractAST, ContractSources, DeployOptions } from '../types/contract'
import { EnableProxyURLParam, EnableUpgradeURLParam, GETUUPSProxyVersionAbi, UUPS, UUPSABI, UUPSBytecode, UUPSBytecodeV5, UUPSfunAbi, UUPSupgradeAbi, UUPSupgradeToAndCallAbi } from './constants/uups' import { EnableProxyURLParam, EnableUpgradeURLParam, GETUUPSProxyVersionAbi, UUPS, UUPSABI, UUPSBytecode, UUPSBytecodeV5, UUPSfunAbi, UUPSfunAbiV5, UUPSupgradeAbi, UUPSupgradeToAndCallAbi } from './constants/uups'
import * as remixLib from '@remix-project/remix-lib' import * as remixLib from '@remix-project/remix-lib'
import * as semver from 'semver' import * as semver from 'semver'
const txFormat = remixLib.execution.txFormat const txFormat = remixLib.execution.txFormat
@ -104,7 +104,7 @@ export class OpenZeppelinProxy extends Plugin {
contractABI: UUPSABI, contractABI: UUPSABI,
contractByteCode: UUPSBytecodeV5, contractByteCode: UUPSBytecodeV5,
contractName: proxyName, contractName: proxyName,
funAbi: UUPSfunAbi, funAbi: UUPSfunAbiV5,
funArgs: args, funArgs: args,
linkReferences: {}, linkReferences: {},
dataHex: UUPSBytecodeV5 + constructorData.replace('0x', ''), dataHex: UUPSBytecodeV5 + constructorData.replace('0x', ''),
@ -115,6 +115,7 @@ export class OpenZeppelinProxy extends Plugin {
if (!hasUpgradeVersionCall) { if (!hasUpgradeVersionCall) {
data.contractByteCode = UUPSBytecode data.contractByteCode = UUPSBytecode
data.dataHex = UUPSBytecode + constructorData.replace('0x', '') data.dataHex = UUPSBytecode + constructorData.replace('0x', '')
data.funAbi = UUPSfunAbi
this.call('terminal', 'logHtml', `Deploying ERC1967 < 5.0.0 as proxy...`) this.call('terminal', 'logHtml', `Deploying ERC1967 < 5.0.0 as proxy...`)
}else{ }else{
this.call('terminal', 'logHtml', `Deploying ERC1967 >= 5.0.0 as proxy...`) this.call('terminal', 'logHtml', `Deploying ERC1967 >= 5.0.0 as proxy...`)
@ -158,7 +159,6 @@ export class OpenZeppelinProxy extends Plugin {
const response = txFormat.decodeResponse(returnValue, GETUUPSProxyVersionAbi) const response = txFormat.decodeResponse(returnValue, GETUUPSProxyVersionAbi)
version = response[0].split('string: ')[1] version = response[0].split('string: ')[1]
// check if version is >= 5.0.0 // check if version is >= 5.0.0
console.log('version', response)
} }
if (semver.gte(version, '5.0.0')) { if (semver.gte(version, '5.0.0')) {

Write Preview
Loading…
Cancel
Save