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

added otc order array to createTranformData (#569)

Browse Source 
* added otc order array to createTranformData

* changelog

* fix linting

Co-authored-by: Noah Khamliche <0xnoah@Noahs-MacBook-Pro-2.local>
This commit is contained in:
Noah Khamliche 2022-08-31 11:37:50 -04:00 committed by GitHub
parent 036a263267
commit e51e1f1674
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contracts/zero-ex/CHANGELOG.json
View File

@ -3,7 +3,12 @@
"version": "0.37.0", "version": "0.37.0",
"changes": [ "changes": [
{ {
"note": "Add support for OTC orders in the FillQuoteTransformer" "note": "Add support for OTC orders in the FillQuoteTransformer",
"pr": "565"
},
{
"note": "fix CI",
"pr": "569"
} }
] ]
}, },

1
contracts/zero-ex/test/transformers/fill_quote_transformer_test.ts
View File

@ -393,6 +393,7 @@ blockchainTests.resets('FillQuoteTransformer', env => {
buyToken: makerToken.address, buyToken: makerToken.address,
bridgeOrders: [], bridgeOrders: [],
limitOrders: [], limitOrders: [],
otcOrders: [],
rfqOrders: [], rfqOrders: [],
fillSequence: [], fillSequence: [],
fillAmount: MAX_UINT256, fillAmount: MAX_UINT256,

4
packages/protocol-utils/src/transformer_utils.ts
View File

@ -1,7 +1,7 @@
import { AbiEncoder, BigNumber, hexUtils, NULL_ADDRESS } from '@0x/utils'; import { AbiEncoder, BigNumber, hexUtils, NULL_ADDRESS } from '@0x/utils';
import * as ethjs from 'ethereumjs-util'; import * as ethjs from 'ethereumjs-util';
import { LimitOrder, LimitOrderFields, RfqOrder, RfqOrderFields, OtcOrder, OtcOrderFields } from './orders'; import { LimitOrder, LimitOrderFields, OtcOrder, OtcOrderFields, RfqOrder, RfqOrderFields } from './orders';
import { Signature, SIGNATURE_ABI } from './signature_utils'; import { Signature, SIGNATURE_ABI } from './signature_utils';
const BRIDGE_ORDER_ABI_COMPONENTS = [ const BRIDGE_ORDER_ABI_COMPONENTS = [
@ -105,8 +105,8 @@ export enum FillQuoteTransformerSide {
export enum FillQuoteTransformerOrderType { export enum FillQuoteTransformerOrderType {
Bridge, Bridge,
Limit, Limit,
Otc,
Rfq, Rfq,
Otc
} }
/** /**