diff --git a/packages/contract-artifacts/artifacts/DummyLiquidityProvider.json b/packages/contract-artifacts/artifacts/DummyLiquidityProvider.json index 78b682110d..e06cf8a361 100644 --- a/packages/contract-artifacts/artifacts/DummyLiquidityProvider.json +++ b/packages/contract-artifacts/artifacts/DummyLiquidityProvider.json @@ -3,12 +3,11 @@ "contractName": "DummyLiquidityProvider", "compilerOutput": { "abi": [ - { "inputs": [], "payable": false, "stateMutability": "nonpayable", "type": "constructor" }, { "constant": true, "inputs": [ - { "internalType": "address", "name": "takerToken", "type": "address" }, - { "internalType": "address", "name": "makerToken", "type": "address" }, + { "internalType": "address", "name": "", "type": "address" }, + { "internalType": "address", "name": "", "type": "address" }, { "internalType": "uint256", "name": "buyAmount", "type": "uint256" } ], "name": "getBuyQuote", @@ -20,8 +19,8 @@ { "constant": true, "inputs": [ - { "internalType": "address", "name": "takerToken", "type": "address" }, - { "internalType": "address", "name": "makerToken", "type": "address" }, + { "internalType": "address", "name": "", "type": "address" }, + { "internalType": "address", "name": "", "type": "address" }, { "internalType": "uint256", "name": "sellAmount", "type": "uint256" } ], "name": "getSellQuote", @@ -35,30 +34,22 @@ "methods": { "getBuyQuote(address,address,uint256)": { "details": "Quotes the amount of `takerToken` that would need to be sold in order to obtain `buyAmount` of `makerToken`.", - "params": { - "buyAmount": "Amount of `makerToken` to buy.", - "makerToken": "Address of the maker token (what to buy).", - "takerToken": "Address of the taker token (what to sell)." - }, + "params": { "buyAmount": "Amount of `makerToken` to buy." }, "return": "takerTokenAmount Amount of `takerToken` that would need to be sold." }, "getSellQuote(address,address,uint256)": { "details": "Quotes the amount of `makerToken` that would be obtained by selling `sellAmount` of `takerToken`.", - "params": { - "makerToken": "Address of the maker token (what to buy).", - "sellAmount": "Amount of `takerToken` to sell.", - "takerToken": "Address of the taker token (what to sell)." - }, + "params": { "sellAmount": "Amount of `takerToken` to sell." }, "return": "makerTokenAmount Amount of `makerToken` that would be obtained." } } }, "evm": { "bytecode": { - "object": "0x608060405234801561001057600080fd5b50610159806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c8063343fbcdd1461003b57806345060eb014610064575b600080fd5b61004e6100493660046100a8565b610077565b60405161005b91906100e8565b60405180910390f35b61004e6100723660046100a8565b61009f565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0192915050565b60010192915050565b6000806000606084860312156100bc578283fd5b83356100c7816100f1565b925060208401356100d7816100f1565b929592945050506040919091013590565b90815260200190565b73ffffffffffffffffffffffffffffffffffffffff8116811461011357600080fd5b5056fea365627a7a723158202381fcfabad426957f70167a455c05b45e1a6babf4a85fb8887359d558fd68e46c6578706572696d656e74616cf564736f6c63430005100040" + "object": "0x608060405234801561001057600080fd5b50610159806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c8063343fbcdd1461003b57806345060eb014610064575b600080fd5b61004e6100493660046100a8565b610077565b60405161005b91906100e8565b60405180910390f35b61004e6100723660046100a8565b61009f565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0192915050565b60010192915050565b6000806000606084860312156100bc578283fd5b83356100c7816100f1565b925060208401356100d7816100f1565b929592945050506040919091013590565b90815260200190565b73ffffffffffffffffffffffffffffffffffffffff8116811461011357600080fd5b5056fea365627a7a72315820981135e6e25d9062a0a9bcf7e08e326cde449b18310db7488d1db4e79ef0f6f36c6578706572696d656e74616cf564736f6c63430005100040" }, "deployedBytecode": { - "object": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c8063343fbcdd1461003b57806345060eb014610064575b600080fd5b61004e6100493660046100a8565b610077565b60405161005b91906100e8565b60405180910390f35b61004e6100723660046100a8565b61009f565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0192915050565b60010192915050565b6000806000606084860312156100bc578283fd5b83356100c7816100f1565b925060208401356100d7816100f1565b929592945050506040919091013590565b90815260200190565b73ffffffffffffffffffffffffffffffffffffffff8116811461011357600080fd5b5056fea365627a7a723158202381fcfabad426957f70167a455c05b45e1a6babf4a85fb8887359d558fd68e46c6578706572696d656e74616cf564736f6c63430005100040" + "object": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c8063343fbcdd1461003b57806345060eb014610064575b600080fd5b61004e6100493660046100a8565b610077565b60405161005b91906100e8565b60405180910390f35b61004e6100723660046100a8565b61009f565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0192915050565b60010192915050565b6000806000606084860312156100bc578283fd5b83356100c7816100f1565b925060208401356100d7816100f1565b929592945050506040919091013590565b90815260200190565b73ffffffffffffffffffffffffffffffffffffffff8116811461011357600080fd5b5056fea365627a7a72315820981135e6e25d9062a0a9bcf7e08e326cde449b18310db7488d1db4e79ef0f6f36c6578706572696d656e74616cf564736f6c63430005100040" } } }, diff --git a/packages/contract-artifacts/artifacts/DummyLiquidityProviderRegistry.json b/packages/contract-artifacts/artifacts/DummyLiquidityProviderRegistry.json index 916da2472a..6d6a0f0baf 100644 --- a/packages/contract-artifacts/artifacts/DummyLiquidityProviderRegistry.json +++ b/packages/contract-artifacts/artifacts/DummyLiquidityProviderRegistry.json @@ -3,12 +3,11 @@ "contractName": "DummyLiquidityProviderRegistry", "compilerOutput": { "abi": [ - { "inputs": [], "payable": false, "stateMutability": "nonpayable", "type": "constructor" }, { "constant": true, "inputs": [ - { "internalType": "address", "name": "takerToken", "type": "address" }, - { "internalType": "address", "name": "makerToken", "type": "address" } + { "internalType": "address", "name": "xToken", "type": "address" }, + { "internalType": "address", "name": "yToken", "type": "address" } ], "name": "getLiquidityProviderForMarket", "outputs": [{ "internalType": "address", "name": "poolAddress", "type": "address" }], @@ -19,8 +18,8 @@ { "constant": false, "inputs": [ - { "internalType": "address", "name": "takerToken", "type": "address" }, - { "internalType": "address", "name": "makerToken", "type": "address" }, + { "internalType": "address", "name": "xToken", "type": "address" }, + { "internalType": "address", "name": "yToken", "type": "address" }, { "internalType": "address", "name": "poolAddress", "type": "address" } ], "name": "setLiquidityProviderForMarket", @@ -34,28 +33,25 @@ "methods": { "getLiquidityProviderForMarket(address,address)": { "details": "Returns the address of pool for a market given market (xAsset, yAsset), or reverts if pool does not exist.", - "params": { - "makerToken": "Second asset managed by pool.", - "takerToken": "First asset managed by pool." - }, + "params": { "xToken": "First asset managed by pool.", "yToken": "Second asset managed by pool." }, "return": "Address of pool." }, "setLiquidityProviderForMarket(address,address,address)": { "details": "Sets address of pool for a market given market (xAsset, yAsset).", "params": { - "makerToken": "Second asset managed by pool.", "poolAddress": "Address of pool.", - "takerToken": "First asset managed by pool." + "xToken": "First asset managed by pool.", + "yToken": "Second asset managed by pool." } } } }, "evm": { "bytecode": { - "object": "0x608060405234801561001057600080fd5b506102a6806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c8063153f59971461003b57806384da8d1e14610064575b600080fd5b61004e610049366004610192565b610079565b60405161005b919061020b565b60405180910390f35b6100776100723660046101c6565b6100f2565b005b73ffffffffffffffffffffffffffffffffffffffff808316600090815260208181526040808320858516845290915290205416806100ec576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016100e39061022c565b60405180910390fd5b92915050565b73ffffffffffffffffffffffffffffffffffffffff92831660008181526020818152604080832095871683529481528482208054969094167fffffffffffffffffffffffff0000000000000000000000000000000000000000968716811790945581815284822092825291909152919091208054909216179055565b803573ffffffffffffffffffffffffffffffffffffffff811681146100ec57600080fd5b600080604083850312156101a4578182fd5b6101ae848461016e565b91506101bd846020850161016e565b90509250929050565b6000806000606084860312156101da578081fd5b6101e4858561016e565b92506101f3856020860161016e565b9150610202856040860161016e565b90509250925092565b73ffffffffffffffffffffffffffffffffffffffff91909116815260200190565b6020808252601c908201527f52656769737472792f4d41524b45545f504149525f4e4f545f5345540000000060408201526060019056fea365627a7a72315820e9d014b71aff38d71d3d9efe78edb01a2b319d7bd2dddac70764cfb4924be0136c6578706572696d656e74616cf564736f6c63430005100040" + "object": "0x608060405234801561001057600080fd5b506102a6806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c8063153f59971461003b57806384da8d1e14610064575b600080fd5b61004e610049366004610192565b610079565b60405161005b919061020b565b60405180910390f35b6100776100723660046101c6565b6100f2565b005b73ffffffffffffffffffffffffffffffffffffffff808316600090815260208181526040808320858516845290915290205416806100ec576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016100e39061022c565b60405180910390fd5b92915050565b73ffffffffffffffffffffffffffffffffffffffff92831660008181526020818152604080832095871683529481528482208054969094167fffffffffffffffffffffffff0000000000000000000000000000000000000000968716811790945581815284822092825291909152919091208054909216179055565b803573ffffffffffffffffffffffffffffffffffffffff811681146100ec57600080fd5b600080604083850312156101a4578182fd5b6101ae848461016e565b91506101bd846020850161016e565b90509250929050565b6000806000606084860312156101da578081fd5b6101e4858561016e565b92506101f3856020860161016e565b9150610202856040860161016e565b90509250925092565b73ffffffffffffffffffffffffffffffffffffffff91909116815260200190565b6020808252601c908201527f52656769737472792f4d41524b45545f504149525f4e4f545f5345540000000060408201526060019056fea365627a7a723158200b589233a17eab806bfb7e334f40bc1ba4502479e55b2aa562c069bc440ceb476c6578706572696d656e74616cf564736f6c63430005100040" }, "deployedBytecode": { - "object": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c8063153f59971461003b57806384da8d1e14610064575b600080fd5b61004e610049366004610192565b610079565b60405161005b919061020b565b60405180910390f35b6100776100723660046101c6565b6100f2565b005b73ffffffffffffffffffffffffffffffffffffffff808316600090815260208181526040808320858516845290915290205416806100ec576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016100e39061022c565b60405180910390fd5b92915050565b73ffffffffffffffffffffffffffffffffffffffff92831660008181526020818152604080832095871683529481528482208054969094167fffffffffffffffffffffffff0000000000000000000000000000000000000000968716811790945581815284822092825291909152919091208054909216179055565b803573ffffffffffffffffffffffffffffffffffffffff811681146100ec57600080fd5b600080604083850312156101a4578182fd5b6101ae848461016e565b91506101bd846020850161016e565b90509250929050565b6000806000606084860312156101da578081fd5b6101e4858561016e565b92506101f3856020860161016e565b9150610202856040860161016e565b90509250925092565b73ffffffffffffffffffffffffffffffffffffffff91909116815260200190565b6020808252601c908201527f52656769737472792f4d41524b45545f504149525f4e4f545f5345540000000060408201526060019056fea365627a7a72315820e9d014b71aff38d71d3d9efe78edb01a2b319d7bd2dddac70764cfb4924be0136c6578706572696d656e74616cf564736f6c63430005100040" + "object": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c8063153f59971461003b57806384da8d1e14610064575b600080fd5b61004e610049366004610192565b610079565b60405161005b919061020b565b60405180910390f35b6100776100723660046101c6565b6100f2565b005b73ffffffffffffffffffffffffffffffffffffffff808316600090815260208181526040808320858516845290915290205416806100ec576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016100e39061022c565b60405180910390fd5b92915050565b73ffffffffffffffffffffffffffffffffffffffff92831660008181526020818152604080832095871683529481528482208054969094167fffffffffffffffffffffffff0000000000000000000000000000000000000000968716811790945581815284822092825291909152919091208054909216179055565b803573ffffffffffffffffffffffffffffffffffffffff811681146100ec57600080fd5b600080604083850312156101a4578182fd5b6101ae848461016e565b91506101bd846020850161016e565b90509250929050565b6000806000606084860312156101da578081fd5b6101e4858561016e565b92506101f3856020860161016e565b9150610202856040860161016e565b90509250925092565b73ffffffffffffffffffffffffffffffffffffffff91909116815260200190565b6020808252601c908201527f52656769737472792f4d41524b45545f504149525f4e4f545f5345540000000060408201526060019056fea365627a7a723158200b589233a17eab806bfb7e334f40bc1ba4502479e55b2aa562c069bc440ceb476c6578706572696d656e74616cf564736f6c63430005100040" } } }, diff --git a/packages/contract-wrappers/src/generated-wrappers/dummy_liquidity_provider.ts b/packages/contract-wrappers/src/generated-wrappers/dummy_liquidity_provider.ts index 6424fe673d..700bc8be6b 100644 --- a/packages/contract-wrappers/src/generated-wrappers/dummy_liquidity_provider.ts +++ b/packages/contract-wrappers/src/generated-wrappers/dummy_liquidity_provider.ts @@ -161,22 +161,15 @@ export class DummyLiquidityProviderContract extends BaseContract { */ public static ABI(): ContractAbi { const abi = [ - { - inputs: [], - outputs: [], - payable: false, - stateMutability: 'nonpayable', - type: 'constructor', - }, { constant: true, inputs: [ { - name: 'takerToken', + name: 'index_0', type: 'address', }, { - name: 'makerToken', + name: 'index_1', type: 'address', }, { @@ -199,11 +192,11 @@ export class DummyLiquidityProviderContract extends BaseContract { constant: true, inputs: [ { - name: 'takerToken', + name: 'index_0', type: 'address', }, { - name: 'makerToken', + name: 'index_1', type: 'address', }, { @@ -304,15 +297,13 @@ export class DummyLiquidityProviderContract extends BaseContract { /** * Quotes the amount of `takerToken` that would need to be sold in * order to obtain `buyAmount` of `makerToken`. - * @param takerToken Address of the taker token (what to sell). - * @param makerToken Address of the maker token (what to buy). * @param buyAmount Amount of `makerToken` to buy. * @returns takerTokenAmount Amount of `takerToken` that would need to be sold. */ - public getBuyQuote(takerToken: string, makerToken: string, buyAmount: BigNumber): ContractFunctionObj { + public getBuyQuote(index_0: string, index_1: string, buyAmount: BigNumber): ContractFunctionObj { const self = (this as any) as DummyLiquidityProviderContract; - assert.isString('takerToken', takerToken); - assert.isString('makerToken', makerToken); + assert.isString('index_0', index_0); + assert.isString('index_1', index_1); assert.isBigNumber('buyAmount', buyAmount); const functionSignature = 'getBuyQuote(address,address,uint256)'; @@ -329,8 +320,8 @@ export class DummyLiquidityProviderContract extends BaseContract { }, getABIEncodedTransactionData(): string { return self._strictEncodeArguments(functionSignature, [ - takerToken.toLowerCase(), - makerToken.toLowerCase(), + index_0.toLowerCase(), + index_1.toLowerCase(), buyAmount, ]); }, @@ -339,15 +330,13 @@ export class DummyLiquidityProviderContract extends BaseContract { /** * Quotes the amount of `makerToken` that would be obtained by * selling `sellAmount` of `takerToken`. - * @param takerToken Address of the taker token (what to sell). - * @param makerToken Address of the maker token (what to buy). * @param sellAmount Amount of `takerToken` to sell. * @returns makerTokenAmount Amount of `makerToken` that would be obtained. */ - public getSellQuote(takerToken: string, makerToken: string, sellAmount: BigNumber): ContractFunctionObj { + public getSellQuote(index_0: string, index_1: string, sellAmount: BigNumber): ContractFunctionObj { const self = (this as any) as DummyLiquidityProviderContract; - assert.isString('takerToken', takerToken); - assert.isString('makerToken', makerToken); + assert.isString('index_0', index_0); + assert.isString('index_1', index_1); assert.isBigNumber('sellAmount', sellAmount); const functionSignature = 'getSellQuote(address,address,uint256)'; @@ -364,8 +353,8 @@ export class DummyLiquidityProviderContract extends BaseContract { }, getABIEncodedTransactionData(): string { return self._strictEncodeArguments(functionSignature, [ - takerToken.toLowerCase(), - makerToken.toLowerCase(), + index_0.toLowerCase(), + index_1.toLowerCase(), sellAmount, ]); }, diff --git a/packages/contract-wrappers/src/generated-wrappers/dummy_liquidity_provider_registry.ts b/packages/contract-wrappers/src/generated-wrappers/dummy_liquidity_provider_registry.ts index a0a4195e8e..8ab37a4af1 100644 --- a/packages/contract-wrappers/src/generated-wrappers/dummy_liquidity_provider_registry.ts +++ b/packages/contract-wrappers/src/generated-wrappers/dummy_liquidity_provider_registry.ts @@ -161,22 +161,15 @@ export class DummyLiquidityProviderRegistryContract extends BaseContract { */ public static ABI(): ContractAbi { const abi = [ - { - inputs: [], - outputs: [], - payable: false, - stateMutability: 'nonpayable', - type: 'constructor', - }, { constant: true, inputs: [ { - name: 'takerToken', + name: 'xToken', type: 'address', }, { - name: 'makerToken', + name: 'yToken', type: 'address', }, ], @@ -195,11 +188,11 @@ export class DummyLiquidityProviderRegistryContract extends BaseContract { constant: false, inputs: [ { - name: 'takerToken', + name: 'xToken', type: 'address', }, { - name: 'makerToken', + name: 'yToken', type: 'address', }, { @@ -294,14 +287,14 @@ export class DummyLiquidityProviderRegistryContract extends BaseContract { /** * Returns the address of pool for a market given market (xAsset, yAsset), or reverts if pool does not exist. - * @param takerToken First asset managed by pool. - * @param makerToken Second asset managed by pool. + * @param xToken First asset managed by pool. + * @param yToken Second asset managed by pool. * @returns Address of pool. */ - public getLiquidityProviderForMarket(takerToken: string, makerToken: string): ContractFunctionObj { + public getLiquidityProviderForMarket(xToken: string, yToken: string): ContractFunctionObj { const self = (this as any) as DummyLiquidityProviderRegistryContract; - assert.isString('takerToken', takerToken); - assert.isString('makerToken', makerToken); + assert.isString('xToken', xToken); + assert.isString('yToken', yToken); const functionSignature = 'getLiquidityProviderForMarket(address,address)'; return { @@ -316,27 +309,24 @@ export class DummyLiquidityProviderRegistryContract extends BaseContract { return abiEncoder.strictDecodeReturnValue(rawCallResult); }, getABIEncodedTransactionData(): string { - return self._strictEncodeArguments(functionSignature, [ - takerToken.toLowerCase(), - makerToken.toLowerCase(), - ]); + return self._strictEncodeArguments(functionSignature, [xToken.toLowerCase(), yToken.toLowerCase()]); }, }; } /** * Sets address of pool for a market given market (xAsset, yAsset). - * @param takerToken First asset managed by pool. - * @param makerToken Second asset managed by pool. + * @param xToken First asset managed by pool. + * @param yToken Second asset managed by pool. * @param poolAddress Address of pool. */ public setLiquidityProviderForMarket( - takerToken: string, - makerToken: string, + xToken: string, + yToken: string, poolAddress: string, ): ContractTxFunctionObj { const self = (this as any) as DummyLiquidityProviderRegistryContract; - assert.isString('takerToken', takerToken); - assert.isString('makerToken', makerToken); + assert.isString('xToken', xToken); + assert.isString('yToken', yToken); assert.isString('poolAddress', poolAddress); const functionSignature = 'setLiquidityProviderForMarket(address,address,address)'; @@ -379,8 +369,8 @@ export class DummyLiquidityProviderRegistryContract extends BaseContract { }, getABIEncodedTransactionData(): string { return self._strictEncodeArguments(functionSignature, [ - takerToken.toLowerCase(), - makerToken.toLowerCase(), + xToken.toLowerCase(), + yToken.toLowerCase(), poolAddress.toLowerCase(), ]); },