Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
plugin
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
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
link33
plugin
Commits
8de84f0b
Commit
8de84f0b
authored
Oct 08, 2021
by
hezhengjun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make sol build successfullly
parent
c1da9d02
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
41 additions
and
10 deletions
+41
-10
BridgeBank.sol
plugin/dapp/bridgevmxgo/contracts/BridgeBank/BridgeBank.sol
+2
-7
GoAssetBank.sol
plugin/dapp/bridgevmxgo/contracts/BridgeBank/GoAssetBank.sol
+2
-2
Makefile
plugin/dapp/bridgevmxgo/contracts/Makefile
+36
-0
Oracle.sol
plugin/dapp/bridgevmxgo/contracts/Oracle.sol
+1
-1
BridgeBank.go
plugin/dapp/bridgevmxgo/contracts/generated/BridgeBank.go
+0
-0
BridgeRegistry.go
...in/dapp/bridgevmxgo/contracts/generated/BridgeRegistry.go
+0
-0
No files found.
plugin/dapp/bridgevmxgo/contracts/BridgeBank/BridgeBank.sol
View file @
8de84f0b
...
...
@@ -140,12 +140,7 @@ contract BridgeBank is GoAssetBank, EvmAssetBank {
* @param _goAssetTokenAddress: The currency type
* @param _amount: number of goAsset tokens to be burned
*/
function burnBridgeTokens(
address _goAssetReceiver,
address _goAssetTokenAddress,
uint256 _amount
)
public
function burnBridgeTokens(address _goAssetReceiver, address _goAssetTokenAddress, uint256 _amount) public
{
return burnGoAssetTokens(
msg.sender,
...
...
@@ -328,7 +323,7 @@ contract BridgeBank is GoAssetBank, EvmAssetBank {
)
public
view
returns(
bytes memory
, address payable, address, uint256)
returns(
address
, address payable, address, uint256)
{
return getGoAssetDeposit(_id);
}
...
...
plugin/dapp/bridgevmxgo/contracts/BridgeBank/GoAssetBank.sol
View file @
8de84f0b
...
...
@@ -120,7 +120,7 @@ contract GoAssetBank {
* @return: The newly created GoAssetSenderDeposit's unique id.
*/
function newGoAssetDeposit(
address
memory
_goAssetSender,
address _goAssetSender,
address payable _chain33Recipient,
address _token,
uint256 _amount
...
...
@@ -362,7 +362,7 @@ contract GoAssetBank {
)
internal
view
returns(
bytes memory
, address payable, address, uint256)
returns(
address
, address payable, address, uint256)
{
GoAssetDeposit memory deposit = goAssetDeposits[_id];
...
...
plugin/dapp/bridgevmxgo/contracts/Makefile
0 → 100644
View file @
8de84f0b
##solc 使用版本为:Version: 0.5.16
##编译solidity,并产生bin文件,abi文件,和相应的go文件
SRC_CONTRACT0
:=
.
GO_OUT0
:=
${
SRC_CONTRACT0
}
/generated
PACKAGE
:=
generated
proj
:=
"build"
.PHONY
:
default build clean registry bridgeBank
default
:
depends build
build
:
depends
@
abigen
--sol
$(SRC_CONTRACT0)
/BridgeRegistry.sol
--pkg
$(PACKAGE)
--out
$(GO_OUT0)
/BridgeRegistry.go
@
abigen
--sol
$(SRC_CONTRACT0)
/BridgeBank/BridgeBank.sol
--pkg
$(PACKAGE)
--out
$(GO_OUT0)
/BridgeBank.go
clean
:
@
rm
-fr
$(GO_OUT)
/
*
registry0
:
@
abigen
--sol
$(SRC_CONTRACT0)
/BridgeRegistry.sol
--pkg
$(PACKAGE)
--out
$(GO_OUT0)
/BridgeRegistry.go
bridgeBank0
:
@
abigen
--sol
$(SRC_CONTRACT0)
/BridgeBank/BridgeBank.sol
--pkg
$(PACKAGE)
--out
$(GO_OUT0)
/BridgeBank.go
asmExample
:
@
solc
--asm
--bin
-o
tmp/ valset-bin
=
./tmp/valset-bin Valset.sol
depends
:
if
!
[
-d
openzeppelin-solidity
]
;
then
\
echo
"not exist openzeppelin-solidity and going to get"
;
\
go get github.com/OpenZeppelin/openzeppelin-contracts@v2.5
;
\
mkdir
openzeppelin-solidity
;
\
cp
-r
${
GOPATH
}
/pkg/mod/github.com/
\!
open
\!
zeppelin/openzeppelin-contracts@v2.5.0+incompatible/contracts openzeppelin-solidity
;
\
fi
;
\
plugin/dapp/bridgevmxgo/contracts/Oracle.sol
View file @
8de84f0b
...
...
@@ -11,7 +11,7 @@ contract Oracle {
/*
* @dev: Public variable declarations
*/
GoAssetBridge public
G
oAssetBridge;
GoAssetBridge public
g
oAssetBridge;
Valset public valset;
address public operator;
...
...
plugin/dapp/bridgevmxgo/contracts/generated/BridgeBank.go
0 → 100644
View file @
8de84f0b
This source diff could not be displayed because it is too large. You can
view the blob
instead.
plugin/dapp/bridgevmxgo/contracts/generated/BridgeRegistry.go
0 → 100644
View file @
8de84f0b
This diff is collapsed.
Click to expand it.
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