Skip to content

fix audit issues #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
renlulu wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix audit issues #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b51460
fix: add admin updating function for LockProxy
renlulu May 19, 2021
6a0f9d8
chore: remove one comment
renlulu May 19, 2021
9338731
fix: some minor issues
renlulu May 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 75 additions & 43 deletions contracts/LockProxy.scilla
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ type Error =
| IllegalAmount
| EmptyFromProxy
| FromProxyNotExist
| DeserializeArgsFailed

let make_error =
fun (result: Error) =>
Expand All @@ -40,6 +41,7 @@ let make_error =
| IllegalAmount => Int32 -11
| EmptyFromProxy => Int32 -12
| FromProxyNotExist => Int32 -13
| DeserializeArgsFailed => Int32 -14
end
in
{ _exception: "Error"; code: result_code }
Expand All @@ -50,13 +52,19 @@ let one_msg =
let e = Nil {Message} in
Cons {Message} m e

let uint128_zero = Uint128 0
let uint32_zero = Uint32 0
(* Means transfer native zil if toAssetHash is zero_address *)
let zero_address = 0x0000000000000000000000000000000000000000
let zero_bystr = let a = 0x in builtin to_bystr a
(* The constant unlock is used by lock transition, it represents the transition/function name on target chain *)
let unlock = let a = 0x756e6c6f636b in builtin to_bystr a

let serialize_tx_args =
fun (args: TxArgs) =>
match args with
| TxArgs toAssetHash toAddress amount =>
let empty_str_0x = 0x in
let empty_str = builtin to_bystr empty_str_0x in
let to_asset_hash_str = append_varbytes empty_str toAssetHash in
let to_asset_hash_str = append_varbytes zero_bystr toAssetHash in
let to_address = append_varbytes to_asset_hash_str toAddress in
let amount = append_uint256_le to_address amount in
amount
Expand All @@ -83,14 +91,6 @@ let deserialize_tx_args =
| None => None { TxArgs }
end

let uint128_zero = Uint128 0
let uint32_zero = Uint32 0
let zero_address = 0x0000000000000000000000000000000000000000
let zero_bystr = let a = 0x in builtin to_bystr a
(* it is unlock *)
let unlock = let a = 0x756e6c6f636b in builtin to_bystr a
let uint128_max = Uint256 340282366920938463463374607431768211455

(***************************************************)
(* The contract definition *)
(***************************************************)
Expand All @@ -100,6 +100,7 @@ contract LockProxy(
init_manager: ByStr20
)

field stagingadmin: Option ByStr20 = None {ByStr20}
field contractadmin: ByStr20 = init_admin
field asset_map: Map ByStr20 (Map Uint64 ByStr) = Emp ByStr20 (Map Uint64 ByStr)
(* The LockProxy in other blockchains *)
Expand Down Expand Up @@ -146,7 +147,7 @@ procedure ValidateAmount(amount: Uint128)
end
end

procedure validateFromProxy(fromContractAddr: ByStr)
procedure IsNonEmptyProxy(fromContractAddr: ByStr)
is_equal = builtin eq zero_bystr fromContractAddr;
match is_equal with
| True =>
Expand All @@ -169,20 +170,20 @@ end
procedure ValidateFromProxy(fromContractAddr: ByStr, fromChainId: Uint64)
e = { _eventname: "ValidateFromProxy"; fromContractAddr: fromContractAddr; fromChainId: fromChainId };
event e;
validateFromProxy fromContractAddr;
IsNonEmptyProxy fromContractAddr;
targetAddr_o <- proxy_hash_map[fromChainId];
match targetAddr_o with
| Some targetAddr =>
is_equal = builtin eq targetAddr fromContractAddr;
match is_equal with
| True =>
| False =>
e = IllegalFromProxy;
ThrowError e
illegalFromErr = IllegalFromProxy;
ThrowError illegalFromErr
end
| None =>
e = FromProxyNotExist;
ThrowError e
notExistErr = FromProxyNotExist;
ThrowError notExistErr
end
end

Expand Down Expand Up @@ -212,32 +213,24 @@ end

(* transfer asset from LockProxy contract to address *)
procedure TransferFromContract(toAssetHash: ByStr20, address: ByStr20, amount: Uint256)
(* convert Uint256 amount to Uint128 amount, so it cannot be greater than uint128_max *)
is_greater = uint256_gt amount uint128_max;
match is_greater with
| True =>
uint128_amount_o = builtin to_uint128 amount;
match uint128_amount_o with
| Some uint128_amount =>
(* if toAssetHash is zero address, then transfer native zil, otherwise, transfer zrc2 *)
is_native_transfer = builtin eq toAssetHash zero_address;
match is_native_transfer with
| True =>
transferNativeZILFromContract address uint128_amount;
e = { _eventname: "TransferFromContract"; toAssetHash: toAssetHash; address: address; amount: amount };
event e
| False =>
transferZRC2FromContract toAssetHash address uint128_amount;
e = { _eventname: "TransferFromContract"; toAssetHash: toAssetHash; address: address; amount: amount };
event e
end
| None =>
e = IllegalAmount;
ThrowError e
| False =>
uint128_amount_o = builtin to_uint128 amount;
match uint128_amount_o with
| Some uint128_amount =>
(* if toAssetHash is zero address, then transfer native zil, otherwise, transfer zrc2 *)
is_native_transfer = builtin eq toAssetHash zero_address;
match is_native_transfer with
| True =>
transferNativeZILFromContract address uint128_amount;
e = { _eventname: "TransferFromContract"; toAssetHash: toAssetHash; address: address; amount: amount };
event e
| False =>
transferZRC2FromContract toAssetHash address uint128_amount;
e = { _eventname: "TransferFromContract"; toAssetHash: toAssetHash; address: address; amount: amount };
event e
end
| None =>
e = IllegalAmount;
ThrowError e
end
end
end

Expand Down Expand Up @@ -275,6 +268,43 @@ procedure CrossChain(toChainId: Uint64, toContract: ByStr, method: ByStr, txData
end


transition ChangeAdmin(newAdmin: ByStr20)
currentAdmin <- contractadmin;
isAdmin = builtin eq currentAdmin _sender;
match isAdmin with
| True =>
new_staging_admin = Some {ByStr20} newAdmin;
stagingadmin := new_staging_admin;
e = {_eventname: "ChangeAdmin"; oldAdmin: currentAdmin; newAdmin: newAdmin};
event e
| False =>
e = {_eventname: "ChangeAdmin FailedNotAdmin"; newAdmin: newAdmin};
event e
end
end

transition ClaimAdmin()
staging_admin_o <- stagingadmin;
match staging_admin_o with
| Some staging_admin =>
is_stagingadmin = builtin eq staging_admin _sender;
match is_stagingadmin with
| True =>
contractadmin := _sender;
tmp_staging_admin = None {ByStr20};
stagingadmin := tmp_staging_admin;
e = {_eventname: "ClaimAdmin"; newAdmin: _sender};
event e
| False =>
e = {_eventname: "ClaimAdmin FailedNotStagingadmin"; newAdmin: _sender};
event e
end
| None =>
e = {_eventname: "ClaimAdmin FailedNoStagingadmin"};
event e
end
end

(* This function is meant to be invoked by the user *)
(* a certin amount teokens will be locked in the proxy contract the invoker/msg.sender immediately.*)
(* Then the same amount of tokens will be unloked from target chain proxy contract at the target chain with chainId later. *)
Expand Down Expand Up @@ -327,7 +357,7 @@ transition unlock(args: ByStr, fromContractAddr: ByStr, fromChainId: Uint64)
tx_args_o = deserialize_tx_args args uint32_zero;
match tx_args_o with
| Some (TxArgs toAssetHash toAddressHash amount) =>
(* ValidateToAssetHash toAssetHash; *)
ValidateToAssetHash toAssetHash;
toAssetAddress_o = builtin to_bystr20 toAssetHash;
toAddress_o = builtin to_bystr20 toAddressHash;
match toAssetAddress_o with
Expand All @@ -346,7 +376,9 @@ transition unlock(args: ByStr, fromContractAddr: ByStr, fromChainId: Uint64)
ThrowError e
end

| None =>
| None =>
e = DeserializeArgsFailed;
ThrowError e
end
end

Expand Down
5 changes: 2 additions & 3 deletions contracts/ZilCrossChainManager.scilla
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,8 @@ end
(* @param initiator: The original caller who called the proxy. *)
transition ClaimAdmin(initiator: ByStr20)
IsProxy;
staging_admin <- stagingcontractadmin;
match staging_admin with
ostaging_admin <- stagingcontractadmin;
match ostaging_admin with
| Some admin =>
is_valid = builtin eq initiator admin;
match is_valid with
Expand Down Expand Up @@ -368,7 +368,6 @@ transition CrossChain(toChainId: Uint64, toContract: ByStr, method: ByStr, txDat
rawParam = append_TxParam empty_bystr txp;
rawParamHash = builtin keccak256hash rawParam;
updateZilTxHash txHashIndex rawParamHash;
(* todo: original caller *)
e = { _eventname : "CrossChainEvent";
sender : _origin;
txId : paramTxHash;
Expand Down
5 changes: 5 additions & 0 deletions contracts/ZilCrossChainManagerProxy.scilla
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,27 +116,32 @@ end
(* Cross chain transition *)
(***************************************************)


(* Invoked by poly-cli *)
transition InitGenesisBlock(rawHeader: ByStr, pubkeys: List Pubkey)
current_impl <- crosschain_manager;
msg = {_tag: "InitGenesisBlock"; _recipient: current_impl; _amount: zero; rawHeader: rawHeader; pubkeys: pubkeys};
msgs = one_msg msg;
send msgs
end

(* Invoked zilliqa relayer *)
transition ChangeBookKeeper(rawHeader: ByStr, pubkeys: List Pubkey, sigList: List Signature)
current_impl <- crosschain_manager;
msg = {_tag: "ChangeBookKeeper"; _recipient: current_impl; _amount: zero; rawHeader: rawHeader; pubkeys: pubkeys; sigList: sigList};
msgs = one_msg msg;
send msgs
end

(* Invoked by smart contracts on Zilliqa blockchain *)
transition CrossChain(toChainId: Uint64, toContract: ByStr, method: ByStr, txData: ByStr)
current_impl <- crosschain_manager;
msg = {_tag: "CrossChain"; _recipient: current_impl; _amount: zero; toChainId: toChainId; toContract: toContract; method: method; txData: txData; originContractAddr: _sender};
msgs = one_msg msg;
send msgs
end

(* Invoked zilliqa relayer *)
transition VerifyHeaderAndExecuteTx(proof: Proof, rawHeader: ByStr, headerProof: Proof, curRawHeader: ByStr, headerSig: List Signature)
current_impl <- crosschain_manager;
msg = {_tag: "VerifyHeaderAndExecuteTx"; _recipient: current_impl; _amount: zero; proof: proof; rawHeader: rawHeader; headerProof: headerProof; curRawHeader: curRawHeader; headerSig: headerSig};
Expand Down