aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src
diff options
context:
space:
mode:
authorGreg Hysen <greg.hysen@gmail.com>2018-04-18 03:01:33 +0800
committerAmir Bandeali <abandeali1@gmail.com>2018-04-21 04:56:18 +0800
commit0e3544e1f997d57089023e65ea9030270914e8eb (patch)
treefa9e735bef10c7aeebfa1bd57817b29043fa71c2 /packages/contracts/src
parentf4589b5bd4517cecc017bde91b0de9efbe75888b (diff)
downloaddexon-sol-tools-0e3544e1f997d57089023e65ea9030270914e8eb.tar
dexon-sol-tools-0e3544e1f997d57089023e65ea9030270914e8eb.tar.gz
dexon-sol-tools-0e3544e1f997d57089023e65ea9030270914e8eb.tar.bz2
dexon-sol-tools-0e3544e1f997d57089023e65ea9030270914e8eb.tar.lz
dexon-sol-tools-0e3544e1f997d57089023e65ea9030270914e8eb.tar.xz
dexon-sol-tools-0e3544e1f997d57089023e65ea9030270914e8eb.tar.zst
dexon-sol-tools-0e3544e1f997d57089023e65ea9030270914e8eb.zip
Miscellaneous style changes to the contracts package; specifically tests
Diffstat (limited to 'packages/contracts/src')
-rw-r--r--packages/contracts/src/contracts/current/utils/LibBytes/LibBytes.sol2
-rw-r--r--packages/contracts/src/utils/types.ts4
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/contracts/src/contracts/current/utils/LibBytes/LibBytes.sol b/packages/contracts/src/contracts/current/utils/LibBytes/LibBytes.sol
index 90f3b32d7..f78d9baec 100644
--- a/packages/contracts/src/contracts/current/utils/LibBytes/LibBytes.sol
+++ b/packages/contracts/src/contracts/current/utils/LibBytes/LibBytes.sol
@@ -70,7 +70,7 @@ contract LibBytes {
// Read address from array memory
assembly {
- // 1. Add index to to address of bytes array
+ // 1. Add index to address of bytes array
// 2. Load 32-byte word from memory
// 3. Apply 20-byte mask to obtain address
result := and(mload(add(b, index)), 0xffffffffffffffffffffffffffffffffffffffff)
diff --git a/packages/contracts/src/utils/types.ts b/packages/contracts/src/utils/types.ts
index 5bb1a36d4..0e30ddaee 100644
--- a/packages/contracts/src/utils/types.ts
+++ b/packages/contracts/src/utils/types.ts
@@ -51,8 +51,8 @@ export interface DefaultOrderParams {
takerTokenAddress: string;
makerTokenAmount: BigNumber;
takerTokenAmount: BigNumber;
- makerFeeAmount: BigNumber;
- takerFeeAmount: BigNumber;
+ makerFee: BigNumber;
+ takerFee: BigNumber;
makerAssetData: string;
takerAssetData: string;
}