From 3bfd5e88a8b11da8ce2ed09a6a7373caa2f8ac53 Mon Sep 17 00:00:00 2001 From: Daniel Wang Date: Wed, 31 Jul 2019 23:06:39 -0400 Subject: [PATCH 1/3] [Protocol3] fix ABI file path (temporarily) --- ...s_lib_AddressUtil_sol_AddressUtil.abi => AddressUtil.abi} | 0 ...ib_Authorizable_sol_Authorizable.abi => Authorizable.abi} | 0 ...BurnableERC20_sol_BurnableERC20.abi => BurnableERC20.abi} | 0 ...ntracts_lib_BytesUtil_sol_BytesUtil.abi => BytesUtil.abi} | 0 ...ntracts_lib_Claimable_sol_Claimable.abi => Claimable.abi} | 0 .../{contracts_lib_ERC20_sol_ERC20.abi => ERC20.abi} | 0 ...nsfer_sol_ERC20SafeTransfer.abi => ERC20SafeTransfer.abi} | 0 ...acts_lib_ERC20Token_sol_ERC20Token.abi => ERC20Token.abi} | 0 ...ockVerifier_sol_IBlockVerifier.abi => IBlockVerifier.abi} | 0 ...IDecompressor_sol_IDecompressor.abi => IDecompressor.abi} | 0 ...racts_iface_IExchange_sol_IExchange.abi => IExchange.abi} | 0 ...iface_ILoopringV3_sol_ILoopringV3.abi => ILoopringV3.abi} | 0 ...Vault_sol_IProtocolFeeVault.abi => IProtocolFeeVault.abi} | 0 ...ingPool_sol_IUserStakingPool.abi => IUserStakingPool.abi} | 0 ...{contracts_lib_Killable_sol_Killable.abi => Killable.abi} | 0 ...ecompressor_sol_LzDecompressor.abi => LzDecompressor.abi} | 0 ...{contracts_lib_MathUint_sol_MathUint.abi => MathUint.abi} | 0 ...NoDefaultFunc_sol_NoDefaultFunc.abi => NoDefaultFunc.abi} | 0 .../{contracts_lib_Ownable_sol_Ownable.abi => Ownable.abi} | 0 ...{contracts_lib_Poseidon_sol_Poseidon.abi => Poseidon.abi} | 0 ...ancyGuard_sol_ReentrancyGuard.abi => ReentrancyGuard.abi} | 0 ...ors_sol_RoleBasedOperators.abi => RoleBasedOperators.abi} | 0 packages/loopring_v3/README.md | 2 +- packages/loopring_v3/genAbi.sh | 5 +++++ 24 files changed, 6 insertions(+), 1 deletion(-) rename packages/loopring_v3/ABI/version30/{contracts_lib_AddressUtil_sol_AddressUtil.abi => AddressUtil.abi} (100%) rename packages/loopring_v3/ABI/version30/{contracts_lib_Authorizable_sol_Authorizable.abi => Authorizable.abi} (100%) rename packages/loopring_v3/ABI/version30/{contracts_lib_BurnableERC20_sol_BurnableERC20.abi => BurnableERC20.abi} (100%) rename packages/loopring_v3/ABI/version30/{contracts_lib_BytesUtil_sol_BytesUtil.abi => BytesUtil.abi} (100%) rename packages/loopring_v3/ABI/version30/{contracts_lib_Claimable_sol_Claimable.abi => Claimable.abi} (100%) rename packages/loopring_v3/ABI/version30/{contracts_lib_ERC20_sol_ERC20.abi => ERC20.abi} (100%) rename packages/loopring_v3/ABI/version30/{contracts_lib_ERC20SafeTransfer_sol_ERC20SafeTransfer.abi => ERC20SafeTransfer.abi} (100%) rename packages/loopring_v3/ABI/version30/{contracts_lib_ERC20Token_sol_ERC20Token.abi => ERC20Token.abi} (100%) rename packages/loopring_v3/ABI/version30/{contracts_iface_IBlockVerifier_sol_IBlockVerifier.abi => IBlockVerifier.abi} (100%) rename packages/loopring_v3/ABI/version30/{contracts_iface_IDecompressor_sol_IDecompressor.abi => IDecompressor.abi} (100%) rename packages/loopring_v3/ABI/version30/{contracts_iface_IExchange_sol_IExchange.abi => IExchange.abi} (100%) rename packages/loopring_v3/ABI/version30/{contracts_iface_ILoopringV3_sol_ILoopringV3.abi => ILoopringV3.abi} (100%) rename packages/loopring_v3/ABI/version30/{contracts_iface_IProtocolFeeVault_sol_IProtocolFeeVault.abi => IProtocolFeeVault.abi} (100%) rename packages/loopring_v3/ABI/version30/{contracts_iface_IUserStakingPool_sol_IUserStakingPool.abi => IUserStakingPool.abi} (100%) rename packages/loopring_v3/ABI/version30/{contracts_lib_Killable_sol_Killable.abi => Killable.abi} (100%) rename packages/loopring_v3/ABI/version30/{contracts_lib_LzDecompressor_sol_LzDecompressor.abi => LzDecompressor.abi} (100%) rename packages/loopring_v3/ABI/version30/{contracts_lib_MathUint_sol_MathUint.abi => MathUint.abi} (100%) rename packages/loopring_v3/ABI/version30/{contracts_lib_NoDefaultFunc_sol_NoDefaultFunc.abi => NoDefaultFunc.abi} (100%) rename packages/loopring_v3/ABI/version30/{contracts_lib_Ownable_sol_Ownable.abi => Ownable.abi} (100%) rename packages/loopring_v3/ABI/version30/{contracts_lib_Poseidon_sol_Poseidon.abi => Poseidon.abi} (100%) rename packages/loopring_v3/ABI/version30/{contracts_lib_ReentrancyGuard_sol_ReentrancyGuard.abi => ReentrancyGuard.abi} (100%) rename packages/loopring_v3/ABI/version30/{contracts_lib_RoleBasedOperators_sol_RoleBasedOperators.abi => RoleBasedOperators.abi} (100%) create mode 100755 packages/loopring_v3/genAbi.sh diff --git a/packages/loopring_v3/ABI/version30/contracts_lib_AddressUtil_sol_AddressUtil.abi b/packages/loopring_v3/ABI/version30/AddressUtil.abi similarity index 100% rename from packages/loopring_v3/ABI/version30/contracts_lib_AddressUtil_sol_AddressUtil.abi rename to packages/loopring_v3/ABI/version30/AddressUtil.abi diff --git a/packages/loopring_v3/ABI/version30/contracts_lib_Authorizable_sol_Authorizable.abi b/packages/loopring_v3/ABI/version30/Authorizable.abi similarity index 100% rename from packages/loopring_v3/ABI/version30/contracts_lib_Authorizable_sol_Authorizable.abi rename to packages/loopring_v3/ABI/version30/Authorizable.abi diff --git a/packages/loopring_v3/ABI/version30/contracts_lib_BurnableERC20_sol_BurnableERC20.abi b/packages/loopring_v3/ABI/version30/BurnableERC20.abi similarity index 100% rename from packages/loopring_v3/ABI/version30/contracts_lib_BurnableERC20_sol_BurnableERC20.abi rename to packages/loopring_v3/ABI/version30/BurnableERC20.abi diff --git a/packages/loopring_v3/ABI/version30/contracts_lib_BytesUtil_sol_BytesUtil.abi b/packages/loopring_v3/ABI/version30/BytesUtil.abi similarity index 100% rename from packages/loopring_v3/ABI/version30/contracts_lib_BytesUtil_sol_BytesUtil.abi rename to packages/loopring_v3/ABI/version30/BytesUtil.abi diff --git a/packages/loopring_v3/ABI/version30/contracts_lib_Claimable_sol_Claimable.abi b/packages/loopring_v3/ABI/version30/Claimable.abi similarity index 100% rename from packages/loopring_v3/ABI/version30/contracts_lib_Claimable_sol_Claimable.abi rename to packages/loopring_v3/ABI/version30/Claimable.abi diff --git a/packages/loopring_v3/ABI/version30/contracts_lib_ERC20_sol_ERC20.abi b/packages/loopring_v3/ABI/version30/ERC20.abi similarity index 100% rename from packages/loopring_v3/ABI/version30/contracts_lib_ERC20_sol_ERC20.abi rename to packages/loopring_v3/ABI/version30/ERC20.abi diff --git a/packages/loopring_v3/ABI/version30/contracts_lib_ERC20SafeTransfer_sol_ERC20SafeTransfer.abi b/packages/loopring_v3/ABI/version30/ERC20SafeTransfer.abi similarity index 100% rename from packages/loopring_v3/ABI/version30/contracts_lib_ERC20SafeTransfer_sol_ERC20SafeTransfer.abi rename to packages/loopring_v3/ABI/version30/ERC20SafeTransfer.abi diff --git a/packages/loopring_v3/ABI/version30/contracts_lib_ERC20Token_sol_ERC20Token.abi b/packages/loopring_v3/ABI/version30/ERC20Token.abi similarity index 100% rename from packages/loopring_v3/ABI/version30/contracts_lib_ERC20Token_sol_ERC20Token.abi rename to packages/loopring_v3/ABI/version30/ERC20Token.abi diff --git a/packages/loopring_v3/ABI/version30/contracts_iface_IBlockVerifier_sol_IBlockVerifier.abi b/packages/loopring_v3/ABI/version30/IBlockVerifier.abi similarity index 100% rename from packages/loopring_v3/ABI/version30/contracts_iface_IBlockVerifier_sol_IBlockVerifier.abi rename to packages/loopring_v3/ABI/version30/IBlockVerifier.abi diff --git a/packages/loopring_v3/ABI/version30/contracts_iface_IDecompressor_sol_IDecompressor.abi b/packages/loopring_v3/ABI/version30/IDecompressor.abi similarity index 100% rename from packages/loopring_v3/ABI/version30/contracts_iface_IDecompressor_sol_IDecompressor.abi rename to packages/loopring_v3/ABI/version30/IDecompressor.abi diff --git a/packages/loopring_v3/ABI/version30/contracts_iface_IExchange_sol_IExchange.abi b/packages/loopring_v3/ABI/version30/IExchange.abi similarity index 100% rename from packages/loopring_v3/ABI/version30/contracts_iface_IExchange_sol_IExchange.abi rename to packages/loopring_v3/ABI/version30/IExchange.abi diff --git a/packages/loopring_v3/ABI/version30/contracts_iface_ILoopringV3_sol_ILoopringV3.abi b/packages/loopring_v3/ABI/version30/ILoopringV3.abi similarity index 100% rename from packages/loopring_v3/ABI/version30/contracts_iface_ILoopringV3_sol_ILoopringV3.abi rename to packages/loopring_v3/ABI/version30/ILoopringV3.abi diff --git a/packages/loopring_v3/ABI/version30/contracts_iface_IProtocolFeeVault_sol_IProtocolFeeVault.abi b/packages/loopring_v3/ABI/version30/IProtocolFeeVault.abi similarity index 100% rename from packages/loopring_v3/ABI/version30/contracts_iface_IProtocolFeeVault_sol_IProtocolFeeVault.abi rename to packages/loopring_v3/ABI/version30/IProtocolFeeVault.abi diff --git a/packages/loopring_v3/ABI/version30/contracts_iface_IUserStakingPool_sol_IUserStakingPool.abi b/packages/loopring_v3/ABI/version30/IUserStakingPool.abi similarity index 100% rename from packages/loopring_v3/ABI/version30/contracts_iface_IUserStakingPool_sol_IUserStakingPool.abi rename to packages/loopring_v3/ABI/version30/IUserStakingPool.abi diff --git a/packages/loopring_v3/ABI/version30/contracts_lib_Killable_sol_Killable.abi b/packages/loopring_v3/ABI/version30/Killable.abi similarity index 100% rename from packages/loopring_v3/ABI/version30/contracts_lib_Killable_sol_Killable.abi rename to packages/loopring_v3/ABI/version30/Killable.abi diff --git a/packages/loopring_v3/ABI/version30/contracts_lib_LzDecompressor_sol_LzDecompressor.abi b/packages/loopring_v3/ABI/version30/LzDecompressor.abi similarity index 100% rename from packages/loopring_v3/ABI/version30/contracts_lib_LzDecompressor_sol_LzDecompressor.abi rename to packages/loopring_v3/ABI/version30/LzDecompressor.abi diff --git a/packages/loopring_v3/ABI/version30/contracts_lib_MathUint_sol_MathUint.abi b/packages/loopring_v3/ABI/version30/MathUint.abi similarity index 100% rename from packages/loopring_v3/ABI/version30/contracts_lib_MathUint_sol_MathUint.abi rename to packages/loopring_v3/ABI/version30/MathUint.abi diff --git a/packages/loopring_v3/ABI/version30/contracts_lib_NoDefaultFunc_sol_NoDefaultFunc.abi b/packages/loopring_v3/ABI/version30/NoDefaultFunc.abi similarity index 100% rename from packages/loopring_v3/ABI/version30/contracts_lib_NoDefaultFunc_sol_NoDefaultFunc.abi rename to packages/loopring_v3/ABI/version30/NoDefaultFunc.abi diff --git a/packages/loopring_v3/ABI/version30/contracts_lib_Ownable_sol_Ownable.abi b/packages/loopring_v3/ABI/version30/Ownable.abi similarity index 100% rename from packages/loopring_v3/ABI/version30/contracts_lib_Ownable_sol_Ownable.abi rename to packages/loopring_v3/ABI/version30/Ownable.abi diff --git a/packages/loopring_v3/ABI/version30/contracts_lib_Poseidon_sol_Poseidon.abi b/packages/loopring_v3/ABI/version30/Poseidon.abi similarity index 100% rename from packages/loopring_v3/ABI/version30/contracts_lib_Poseidon_sol_Poseidon.abi rename to packages/loopring_v3/ABI/version30/Poseidon.abi diff --git a/packages/loopring_v3/ABI/version30/contracts_lib_ReentrancyGuard_sol_ReentrancyGuard.abi b/packages/loopring_v3/ABI/version30/ReentrancyGuard.abi similarity index 100% rename from packages/loopring_v3/ABI/version30/contracts_lib_ReentrancyGuard_sol_ReentrancyGuard.abi rename to packages/loopring_v3/ABI/version30/ReentrancyGuard.abi diff --git a/packages/loopring_v3/ABI/version30/contracts_lib_RoleBasedOperators_sol_RoleBasedOperators.abi b/packages/loopring_v3/ABI/version30/RoleBasedOperators.abi similarity index 100% rename from packages/loopring_v3/ABI/version30/contracts_lib_RoleBasedOperators_sol_RoleBasedOperators.abi rename to packages/loopring_v3/ABI/version30/RoleBasedOperators.abi diff --git a/packages/loopring_v3/README.md b/packages/loopring_v3/README.md index 5e62be2f4..a07a0a0b1 100644 --- a/packages/loopring_v3/README.md +++ b/packages/loopring_v3/README.md @@ -51,7 +51,7 @@ make - run `npm run ganache` from project's root directory in terminal. - run `npm run test` from project's root directory in another terminal window. -- run single test: `npm run test -- transpiled/test/xxx.js` +- run single test: `npm run test -T- transpiled/test/xxx.js` - print info logs in tests: `npm run test -- -i` - print more detailed debug logs in tests: `npm run test -- -x` diff --git a/packages/loopring_v3/genAbi.sh b/packages/loopring_v3/genAbi.sh new file mode 100755 index 000000000..f98c33bcc --- /dev/null +++ b/packages/loopring_v3/genAbi.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +solc --abi contracts/iface/*.sol -o ABI/version30/ --overwrite + +solc --abi contracts/lib/*.sol --allow-paths contracts/iface/*.sol -o ABI/version30/ --overwrite \ No newline at end of file From bff972d53131f57c9658135dec03c113742c163b Mon Sep 17 00:00:00 2001 From: Daniel Wang Date: Wed, 31 Jul 2019 23:09:00 -0400 Subject: [PATCH 2/3] Update README.md --- packages/loopring_v3/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/loopring_v3/README.md b/packages/loopring_v3/README.md index a07a0a0b1..5e62be2f4 100644 --- a/packages/loopring_v3/README.md +++ b/packages/loopring_v3/README.md @@ -51,7 +51,7 @@ make - run `npm run ganache` from project's root directory in terminal. - run `npm run test` from project's root directory in another terminal window. -- run single test: `npm run test -T- transpiled/test/xxx.js` +- run single test: `npm run test -- transpiled/test/xxx.js` - print info logs in tests: `npm run test -- -i` - print more detailed debug logs in tests: `npm run test -- -x` From fe58302ac0a5835f2e459ab24624350dd56ef916 Mon Sep 17 00:00:00 2001 From: Daniel Wang Date: Wed, 31 Jul 2019 23:09:15 -0400 Subject: [PATCH 3/3] Delete genAbi.sh --- packages/loopring_v3/genAbi.sh | 5 ----- 1 file changed, 5 deletions(-) delete mode 100755 packages/loopring_v3/genAbi.sh diff --git a/packages/loopring_v3/genAbi.sh b/packages/loopring_v3/genAbi.sh deleted file mode 100755 index f98c33bcc..000000000 --- a/packages/loopring_v3/genAbi.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -solc --abi contracts/iface/*.sol -o ABI/version30/ --overwrite - -solc --abi contracts/lib/*.sol --allow-paths contracts/iface/*.sol -o ABI/version30/ --overwrite \ No newline at end of file