@@ -3,7 +3,7 @@ const withPlaceAlgoTxns = require('../txns/buy/withPlaceAlgoTxns');
33const withCloseAssetTxns = require ( '../txns/close/withCloseAssetTxns' ) ;
44const withCloseAlgoTxns = require ( '../txns/close/withCloseAlgoTxns' ) ;
55const getTakerOrders = require ( '../structure/getTakerOrders' ) ;
6- const { timeout } = require ( '../../teal/utils' ) ;
6+ const { timeout} = require ( '../../teal/utils' ) ;
77
88const compile = require ( '../compile/compile' ) ;
99const AlgodexApi = require ( '../../AlgodexApi' ) ;
@@ -32,116 +32,113 @@ const tesnet = {
3232const algodexApi = new AlgodexApi ( tesnet ) ;
3333
3434const TransactionGenerator = {
35- getPlaceASAEscrowOrderTxns : async function ( order ) {
35+ getPlaceASAEscrowOrderTxns : async function ( order ) {
3636 return await withPlaceAssetTxns (
37- await compile ( {
38- ...order ,
39- appId :
40- typeof order . appId === 'undefined'
41- ? await algodexApi . getAppId ( order )
42- : order . appId ,
43- version : 6 ,
44- indexer : algodexApi . indexer ,
45- wallet : {
46- ...order . wallet ,
47- ...( await algodexApi . http . indexer . fetchAccountInfo ( order . wallet ) ) ,
48- } ,
49- } )
37+ await compile ( {
38+ ...order ,
39+ appId :
40+ typeof order . appId === 'undefined' ?
41+ await algodexApi . getAppId ( order ) :
42+ order . appId ,
43+ version : 6 ,
44+ indexer : algodexApi . indexer ,
45+ wallet : {
46+ ...order . wallet ,
47+ ...( await algodexApi . http . indexer . fetchAccountInfo ( order . wallet ) ) ,
48+ } ,
49+ } ) ,
5050 ) ;
5151 } ,
52- getPlaceAlgoEscrowOrderTxns : async function ( order ) {
52+ getPlaceAlgoEscrowOrderTxns : async function ( order ) {
5353 return await withPlaceAlgoTxns (
54- await compile ( {
55- ...order ,
56- appId :
57- typeof order . appId === 'undefined'
58- ? await algodexApi . getAppId ( order )
59- : order . appId ,
60- version : 6 ,
61- indexer : algodexApi . indexer ,
62- wallet : {
63- ...order . wallet ,
64- ...( await algodexApi . http . indexer . fetchAccountInfo ( order . wallet ) ) ,
65- } ,
66- } )
54+ await compile ( {
55+ ...order ,
56+ appId :
57+ typeof order . appId === 'undefined' ?
58+ await algodexApi . getAppId ( order ) :
59+ order . appId ,
60+ version : 6 ,
61+ indexer : algodexApi . indexer ,
62+ wallet : {
63+ ...order . wallet ,
64+ ...( await algodexApi . http . indexer . fetchAccountInfo ( order . wallet ) ) ,
65+ } ,
66+ } ) ,
6767 ) ;
6868 } ,
69- getCloseASAEscrowOrderTxns : async function ( order ) {
69+ getCloseASAEscrowOrderTxns : async function ( order ) {
7070 return await withCloseAssetTxns (
71- await compile ( {
72- ...order ,
73- appId :
74- typeof order . appId === 'undefined'
75- ? await algodexApi . getAppId ( order )
76- : order . appId ,
77- version : 6 ,
78- indexer : algodexApi . indexer ,
79- contract : {
80- creator : order . address ,
81- } ,
82- wallet : {
83- ...order . wallet ,
84- ...( await algodexApi . http . indexer . fetchAccountInfo ( order . wallet ) ) ,
85- } ,
86- } )
71+ await compile ( {
72+ ...order ,
73+ appId :
74+ typeof order . appId === 'undefined' ?
75+ await algodexApi . getAppId ( order ) :
76+ order . appId ,
77+ version : 6 ,
78+ indexer : algodexApi . indexer ,
79+ contract : {
80+ creator : order . address ,
81+ } ,
82+ wallet : {
83+ ...order . wallet ,
84+ ...( await algodexApi . http . indexer . fetchAccountInfo ( order . wallet ) ) ,
85+ } ,
86+ } ) ,
8787 ) ;
8888 } ,
89- getCloseAlgoEscrowOrderTxns : async function ( order ) {
89+ getCloseAlgoEscrowOrderTxns : async function ( order ) {
9090 return await withCloseAlgoTxns (
91- await compile ( {
92- ...order ,
93- appId :
94- typeof order . appId === 'undefined'
95- ? await algodexApi . getAppId ( order )
96- : order . appId ,
97- version : 6 ,
98- indexer : algodexApi . indexer ,
99- contract : {
100- creator : order . address ,
101- } ,
102- wallet : {
103- ...order . wallet ,
104- ...( await algodexApi . http . indexer . fetchAccountInfo ( order . wallet ) ) ,
105- } ,
106- } )
91+ await compile ( {
92+ ...order ,
93+ appId :
94+ typeof order . appId === 'undefined' ?
95+ await algodexApi . getAppId ( order ) :
96+ order . appId ,
97+ version : 6 ,
98+ indexer : algodexApi . indexer ,
99+ contract : {
100+ creator : order . address ,
101+ } ,
102+ wallet : {
103+ ...order . wallet ,
104+ ...( await algodexApi . http . indexer . fetchAccountInfo ( order . wallet ) ) ,
105+ } ,
106+ } ) ,
107107 ) ;
108108 } ,
109- getTakerOrderTxns : async function ( order ) {
109+ getTakerOrderTxns : async function ( order ) {
110110 algodexApi . setWallet ( order . wallet ) ;
111111
112- let _orderbook = await algodexApi . http . dexd . fetchAssetOrders ( order . asset . id )
112+ let _orderbook = await algodexApi . http . dexd . fetchAssetOrders ( order . asset . id ) ;
113113
114- try {
115- while (
116- Object . values ( _orderbook ) . reduce ( ( a , b ) => {
117- return a . concat ( b ) ; // need to put inside the while statement so the expression re runs every time _orderbook changes
118- } , [ ] ) . length === 0
119- ) {
120- await timeout ( 4000 ) ;
121- _orderbook = await algodexApi . http . dexd . fetchAssetOrders (
122- order . asset . id
123- ) ;
124- }
125- } catch ( e ) {
126- throw e ;
114+ while (
115+ Object . values ( _orderbook ) . reduce ( ( a , b ) => {
116+ return a . concat ( b ) ; // need to put inside the while statement so the expression re runs every time _orderbook changes
117+ } , [ ] ) . length === 0
118+ ) {
119+ await timeout ( 4000 ) ;
120+ _orderbook = await algodexApi . http . dexd . fetchAssetOrders (
121+ order . asset . id ,
122+ ) ;
127123 }
128124
129- let orderbook = algodexApi . http . dexd . mapToAllEscrowOrders ( {
125+
126+ const orderbook = algodexApi . http . dexd . mapToAllEscrowOrders ( {
130127 buy : _orderbook . buyASAOrdersInEscrow ,
131128 sell : _orderbook . sellASAOrdersInEscrow ,
132129 } ) ;
133130
134131 return await getTakerOrders ( algodexApi , {
135132 ...order ,
136133 appId :
137- typeof order . appId === 'undefined'
138- ? await algodexApi . getAppId ( order )
139- : order . appId ,
134+ typeof order . appId === 'undefined' ?
135+ await algodexApi . getAppId ( order ) :
136+ order . appId ,
140137 version : 6 ,
141138 indexer : algodexApi . indexer ,
142139 asset : {
143140 ...order . asset ,
144- orderbook
141+ orderbook,
145142 } ,
146143 wallet : {
147144 ...order . wallet ,
0 commit comments