crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: go back to using transformERC20 in AS (#343)

Browse Source 
* go back to using transformERC20

* Update changelog
This commit is contained in:
mzhu25 2021-10-12 22:47:29 -07:00 committed by GitHub
parent 2c187c7e85
commit 9af22110b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/asset-swapper/CHANGELOG.json
View File

@ -5,6 +5,10 @@
{ {
"note": "Check MAX_IN_RATIO in sampleBuysFromBalancer", "note": "Check MAX_IN_RATIO in sampleBuysFromBalancer",
"pr": 338 "pr": 338
},
{
"note": "Go back to using transformERC20 (instead of transformERC20Staging)",
"pr": 343
} }
] ]
}, },

7
packages/asset-swapper/src/quote_consumers/exchange_proxy_swap_quote_consumer.ts
View File

@ -1,6 +1,5 @@
import { ChainId, ContractAddresses } from '@0x/contract-addresses'; import { ChainId, ContractAddresses } from '@0x/contract-addresses';
import { IZeroExContract } from '@0x/contract-wrappers'; import { IZeroExContract } from '@0x/contract-wrappers';
import { TransformERC20FeatureContract } from '@0x/contracts-zero-ex';
import { import {
encodeAffiliateFeeTransformerData, encodeAffiliateFeeTransformerData,
encodeCurveLiquidityProviderData, encodeCurveLiquidityProviderData,
@ -95,7 +94,6 @@ export class ExchangeProxySwapQuoteConsumer implements SwapQuoteConsumerBase {
}; };
private readonly _exchangeProxy: IZeroExContract; private readonly _exchangeProxy: IZeroExContract;
private readonly _transformERC20Feature: TransformERC20FeatureContract;
constructor(public readonly contractAddresses: ContractAddresses, options: Partial<SwapQuoteConsumerOpts> = {}) { constructor(public readonly contractAddresses: ContractAddresses, options: Partial<SwapQuoteConsumerOpts> = {}) {
const { chainId } = _.merge({}, constants.DEFAULT_SWAP_QUOTER_OPTS, options); const { chainId } = _.merge({}, constants.DEFAULT_SWAP_QUOTER_OPTS, options);
@ -103,7 +101,6 @@ export class ExchangeProxySwapQuoteConsumer implements SwapQuoteConsumerBase {
this.chainId = chainId; this.chainId = chainId;
this.contractAddresses = contractAddresses; this.contractAddresses = contractAddresses;
this._exchangeProxy = new IZeroExContract(contractAddresses.exchangeProxy, FAKE_PROVIDER); this._exchangeProxy = new IZeroExContract(contractAddresses.exchangeProxy, FAKE_PROVIDER);
this._transformERC20Feature = new TransformERC20FeatureContract(contractAddresses.exchangeProxy, FAKE_PROVIDER);
this.transformerNonces = { this.transformerNonces = {
wethTransformer: findTransformerNonce( wethTransformer: findTransformerNonce(
contractAddresses.transformers.wethTransformer, contractAddresses.transformers.wethTransformer,
@ -495,8 +492,8 @@ export class ExchangeProxySwapQuoteConsumer implements SwapQuoteConsumerBase {
amounts: [], amounts: [],
}), }),
}); });
const calldataHexString = this._transformERC20Feature const calldataHexString = this._exchangeProxy
.transformERC20Staging( .transformERC20(
isFromETH ? ETH_TOKEN_ADDRESS : sellToken, isFromETH ? ETH_TOKEN_ADDRESS : sellToken,
isToETH ? ETH_TOKEN_ADDRESS : buyToken, isToETH ? ETH_TOKEN_ADDRESS : buyToken,
shouldSellEntireBalance ? MAX_UINT256 : sellAmount, shouldSellEntireBalance ? MAX_UINT256 : sellAmount,

2
packages/asset-swapper/test/exchange_proxy_swap_quote_consumer_test.ts
View File

@ -186,7 +186,7 @@ describe('ExchangeProxySwapQuoteConsumer', () => {
); );
} }
const transformERC20Encoder = AbiEncoder.createMethod('transformERC20Staging', [ const transformERC20Encoder = AbiEncoder.createMethod('transformERC20', [
{ type: 'address', name: 'inputToken' }, { type: 'address', name: 'inputToken' },
{ type: 'address', name: 'outputToken' }, { type: 'address', name: 'outputToken' },
{ type: 'uint256', name: 'inputTokenAmount' }, { type: 'uint256', name: 'inputTokenAmount' },