Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merging upstream #1

Open
wants to merge 264 commits into
base: independent-mode
Choose a base branch
from
Open

merging upstream #1

wants to merge 264 commits into from

Conversation

duckdegen
Copy link
Owner

No description provided.

0xtrooper and others added 30 commits February 3, 2022 12:31
@0xtrooper
start fill loop after initiating wallets
e4de274
@0xtrooper
Switch MARKETS over to ws
d7f2877 
Remove old fetch for markets. Use "marketinfo" op code to setup market info. Can be used to update infos.
@taureau75
Merge pull request #5 from TrooperCrypto/feat/multiple-wallets-per-mm
0f50148 
Feat/multiple wallets per mm
@taureau75
Merge branch 'master' into feat/update-market-info-over-ws
48b3f38
@taureau75
Merge pull request #9 from TrooperCrypto/feat/update-market-info-over-ws
c8292fa 
refactor/ update market info over ws
@taureau75
quick fix to merged code
f3bfff4
@taureau75
parse JSON keys from env
a15e4f5
@taureau75
show greatest wallet balance in liquidity
7a75750
@0xtrooper
Fix as account_state is string
170847a
@taureau75
Merge pull request #10 from TrooperCrypto/master
ca6c5b2 
Fix as account_state is string
@taureau75
remove markets query since it's no longer needed. catch cryptowatch f…
972b29a 
…ailure errors
@taureau75
Merge branch 'master' of zigzag:ZigZagExchange/market-maker
76c9bed
@0xtrooper
make setupPriceFeed modular for n providers
62f0fc7
@0xtrooper
rename
bc600d6
@0xtrooper
Update marketmaker.js
e55bd23
@0xtrooper
make infuraUrl available
439248f
@0xtrooper
Added Chainlink to readme
97c800d
@0xtrooper
rm line
a243bfc
@0xtrooper
up interval to 10s
c0e958f
@0xtrooper
Include price
730b10b
@0xtrooper
Bug fixes
2a4a879 
- await first prices
- move setupPriceFeeds after ethersProvider
- move chainlinkProviders to globals
- log prices once after first fetch
@0xtrooper
Update marketmaker.js
df16f56
@taureau75
Merge pull request #11 from TrooperCrypto/feat/priceFeed-with-chainlink
7a47785 
Feat/price feed with chainlink
@0xtrooper
Update marketmaker.js
6220c8d
@0xtrooper
Merge branch 'ZigZagExchange:master' into feat/priceFeed-with-chainlink
c96dc34
@taureau75
Merge pull request #12 from TrooperCrypto/feat/priceFeed-with-chainlink
e3deb2e 
make marketinfo not as overwhelming in logs
@0xtrooper
fix/ add marekt_id in log
95e7891 
This should log the maket_id. Otherwise its pointless
@0xtrooper
Add examples to README and add warning
dee00ae
@taureau75
Merge pull request #13 from TrooperCrypto/master
be348f9 
fix/ add marekt_id in log
@0xtrooper
fix/cryptowatch restart
1a84229 
need to give parameter to cryptowatchWsSetup
0xtrooper and others added 30 commits June 12, 2022 15:26
@0xtrooper
Merge pull request #88 from TrooperCrypto/master
743fe01 
update README - Security advice
@0xtrooper
add min eth balance of 0.01
9a7f835
@0xtrooper
revert
02ccfd1
@0xtrooper
fix number of splits for price = 0
3aa573c
@0xtrooper
Merge pull request #90 from TrooperCrypto/master
3734fa5 
fix number of splits for price = 0
@0xtrooper
add Invert price feed
903e139
@0xtrooper
revert format
e6fe732
@0xtrooper
Merge pull request #92 from TrooperCrypto/master
870d6bb 
add Invert price feed
@0xtrooper
Merge pull request #93 from ZigZagExchange/dev
6fcbf79 
stage master - add Invert price feed
@0xtrooper
update package json
f6834cb
@0xtrooper
update sign order
c30088b
@0xtrooper
Merge pull request #94 from TrooperCrypto/master
91a9579 
update zksync sdk to "^0.13"
@0xtrooper
add goerli zksync
7d71d0c
@0xtrooper
Merge pull request #95 from TrooperCrypto/master
b40ce85 
add goerli zksync
@0xtrooper
fix naming goerli
1053c72
@0xtrooper
Merge pull request #96 from TrooperCrypto/master
e1530a0 
fix naming goerli
@0xtrooper
enable uniswap mainnet feed for goerli
1381543
@0xtrooper
add INFURA to read me
6a00540
@0xtrooper
Merge pull request #97 from TrooperCrypto/master
2b09f7a 
enable uniswap mainnet feed for goerli
@0xtrooper
remove FEE_TOKEN if no longer available for fees
3d11819
@0xtrooper
Merge branch 'ZigZagExchange:master' into master
4f0c12c
@0xtrooper
fix logic
551b0de
@0xtrooper
Merge branch 'master' of https://github.com/TrooperCrypto/market-maker
85a2fe6
@0xtrooper
Merge pull request #98 from TrooperCrypto/master
670f748 
remove FEE_TOKEN if no longer available for fees
@0xtrooper
format and add sendMessage
cd9052d 
make sure ws is ready
@0xtrooper
avoid building a big callstack
3b0abff
@0xtrooper
fix format
729c53e
@0xtrooper
Merge pull request #104 from TrooperCrypto/master
526a51b 
fix/make sure ws is ready before sending
@0xtrooper
add ethereumRPC for custom rpc's
d55e39b
@0xtrooper
Merge pull request #105 from TrooperCrypto/master
210013d 
feat/add ethereumRPC for custom rpc's
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@duckdegen @iofq @0xtrooper @taureau75 @Connor-Knabe