Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
baas-ide
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
guxukai
baas-ide
Commits
8916fb5b
Commit
8916fb5b
authored
Jul 27, 2018
by
yann300
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fx linking when 2 or more libraries
parent
7d859f55
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
txFormat.js
remix-lib/src/execution/txFormat.js
+4
-4
No files found.
remix-lib/src/execution/txFormat.js
View file @
8916fb5b
...
...
@@ -229,7 +229,7 @@ module.exports = {
atAddress
:
function
()
{},
linkBytecodeStandard
:
function
(
contract
,
contracts
,
callback
,
callbackStep
,
callbackDeployLibrary
)
{
var
contractBytecode
=
''
var
contractBytecode
=
contract
.
evm
.
bytecode
.
object
asyncJS
.
eachOfSeries
(
contract
.
evm
.
bytecode
.
linkReferences
,
(
libs
,
file
,
cbFile
)
=>
{
asyncJS
.
eachOfSeries
(
contract
.
evm
.
bytecode
.
linkReferences
[
file
],
(
libRef
,
libName
,
cbLibDeployed
)
=>
{
var
library
=
contracts
[
file
][
libName
]
...
...
@@ -242,7 +242,7 @@ module.exports = {
if
(
hexAddress
.
slice
(
0
,
2
)
===
'0x'
)
{
hexAddress
=
hexAddress
.
slice
(
2
)
}
contractBytecode
=
this
.
linkLibraryStandard
(
libName
,
hexAddress
,
contract
)
contractBytecode
=
this
.
linkLibraryStandard
(
libName
,
hexAddress
,
contract
Bytecode
,
contract
)
cbLibDeployed
()
},
callbackStep
,
callbackDeployLibrary
)
}
else
{
...
...
@@ -338,8 +338,8 @@ module.exports = {
return
bytecode
},
linkLibraryStandard
:
function
(
libraryName
,
address
,
contract
)
{
return
this
.
linkLibraryStandardFromlinkReferences
(
libraryName
,
address
,
contract
.
evm
.
bytecode
.
object
,
contract
.
evm
.
bytecode
.
linkReferences
)
linkLibraryStandard
:
function
(
libraryName
,
address
,
bytecode
,
contract
)
{
return
this
.
linkLibraryStandardFromlinkReferences
(
libraryName
,
address
,
bytecode
,
contract
.
evm
.
bytecode
.
linkReferences
)
},
setLibraryAddress
:
function
(
address
,
bytecodeToLink
,
positions
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment