Commit 8de84f0b authored by hezhengjun's avatar hezhengjun

make sol build successfullly

parent c1da9d02
......@@ -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);
}
......
......@@ -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];
......
##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; \
......@@ -11,7 +11,7 @@ contract Oracle {
/*
* @dev: Public variable declarations
*/
GoAssetBridge public GoAssetBridge;
GoAssetBridge public goAssetBridge;
Valset public valset;
address public operator;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment