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.

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

Refactor DEX to fit tx limits & misc improvements #863

Merged
merged 29 commits into from
Apr 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
89adcae
export TokenId and deprecate Token class instead
mitschabaude Apr 20, 2023
f8043c1
add more labels and make this.token more flexible
mitschabaude Apr 20, 2023
925fe31
getAndAssertEquals to reduce boiler plate
mitschabaude Apr 20, 2023
e8b4481
clone all method arguments bc otherwise callData may be corrupted by …
mitschabaude Apr 20, 2023
9892d37
get rid of 4 AUs in supplyLiquidity
mitschabaude Apr 20, 2023
03d563a
reduce # of account updates in dex
mitschabaude Apr 20, 2023
31297d2
make dex test run w/o compiling
mitschabaude Apr 20, 2023
8fd1dc7
get rid of more compilation
mitschabaude Apr 20, 2023
a16c34d
multiple reducer and token improvements:
mitschabaude Apr 21, 2023
8011473
add all-impossible permissions & a label
mitschabaude Apr 21, 2023
838e3d3
add 2 new state methods and doccomments
mitschabaude Apr 21, 2023
49a8b2f
new dex which uses actions to overcome AU limit
mitschabaude Apr 21, 2023
61e4d95
fix token test, add back deprecated Token functionality
mitschabaude Apr 21, 2023
39d33f0
change to `mayUseToken` default causes vk upgrade
mitschabaude Apr 21, 2023
9492eaa
delete old redeem methods
mitschabaude Apr 21, 2023
ba5dd32
move swap below AU limit
mitschabaude Apr 21, 2023
732a07a
remove commented code
mitschabaude Apr 21, 2023
ea4f474
emit some actions & remove obsolete mayUseToken config
mitschabaude Apr 21, 2023
290ecd8
fix counting of account update limit
mitschabaude Apr 24, 2023
4940d63
add berkeley dex script
mitschabaude Apr 24, 2023
5a0d166
bring supply below the AU limit, again
mitschabaude Apr 24, 2023
2140f63
helper script to generate keys
mitschabaude Apr 24, 2023
8bba404
some fixes, enable to run tests selectively
mitschabaude Apr 24, 2023
7f5f79b
another fix
mitschabaude Apr 24, 2023
9e41932
vk regression
mitschabaude Apr 24, 2023
d4516ab
Update src/examples/zkapps/dex/dex-with-actions.ts
mitschabaude Apr 25, 2023
a5f9893
Apply suggestions from code review
mitschabaude Apr 25, 2023
8e0b542
add helper for getting typed events
mitschabaude Apr 25, 2023
62a0957
refactor smart contract context to be able to step outside it
mitschabaude Apr 25, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions generate-keys.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env node
import Client from './dist/node/mina-signer/MinaSigner.js';

let client = new Client({ network: 'testnet' });

console.log(client.genKeys());
12 changes: 6 additions & 6 deletions src/examples/regression_test.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"Voting_": {
"verificationKey": {
"data": "AACYleKdZbT/a5vtaOprNqqTIsYqzmPEkcrZ+6OsalhEB78rwASNIdHL4GB76R4W2YNnSxj3tJf8fRy+6MZ4Zl0vRsTGgMVzYsH3VjaSv30IiYmsFGrKkDHixTxoEqVlpxQ46WPwaYWEo9SWRXpuaDKVbbZRD/1KiyOifIoEKbo1JFG8xrNqSAPmpYv0peN5nmGV/VXWW7HZXWQpu5Kh+586dYTsT+LW08yA5tndb2TYz3qDyqyPnvOpTRdgVFmldSX7JzQdPxr5O1P26rJvOkC7NDWLAQYP02gEVu312pHuGjm4Ra3Mjap0NSIw/cCGroJCdPB3Wq2oEpy/urMBHuQBK2P4XpBpuqt1hhkBS2jSGwz47FnMeaKvYaLgmY//0ix/f67LshCF4lXbLxzBLtTgaFnG/xHSvTIdKnN3x66TJeyU+8gvUQ4b3xrKxNgRmaS/cxyZ6tfOaoPWeTW9sgE2WzBw7eKTzzMb09cJWw7KSzq93Zkx12JJN+cA2MF0DQxum82Ai4ELYbM2s5mTD57TuF1P2PQL+nZsLy3NcoA+D2JmuIeuJzt87c3S83FufRQraBKtstcEmhMSBPAp/bAOAOYFvF8bokxXNwClNrmNg1BJfMvotljlK66Nd0kdfHcLAb42WYeS2QD/Iny3LE9K9In0gn6ik8hGuYyn5OM/+AHQJrlP8Dpkz3lojBZbP2mQ6HoYGXONWhlmVY9Hj4puFGfFd6DDF1i+7LQHMvNDXIPyxlP4siMhdDjNoLCMJ/E0Ch+LWJJnYCGTqnqrBMDLwDBi4V3qD7hr0IfkHs6cDSZPnzZrs5KHv/wwOSoepStJEcuSCl4y4vR9uLvL/5mgNdvGR5DKk0mYw7pPsSnyXTBPL24TWERtKUBBVU/A8xkuRKMAellfERh/Odt3pbhpfNb7swkG/Rukd8j7nrfGyA0JjTPMWRQXq3ePdog1UV+XjSyByBXuSzW+Tyivw7eWCKX8gEmhlwB/Vqj9PhbKp2+rlEu/CX7YOPtrqQ5E/k88UMYO54lpZxin35FyjfllAeQkAZtCuVtWvq9B/12fAxvmR/aq8lJMpRZf/fH/UpXRosVshVGAH5IBEkw9j4fqB0gbdnCfGnfJJMDRVzrmKXpJNIdU/IgJoJaIp5mDahIlJLvVgiIGggW/LdWKA67IJ9FnpvX5HMK5RYGZr4LRYRuZLhra0/e9yxvzzhftKetck1CU67/gusv9BIasq6n7OuMg/mJnJ0gw1m0R3KMChci3/eZFUxH6/xPcixMvPccj0BHctfSUeUhy/If601NlQH5pDAM/UDAXSwc4548TEAofRoDmhwBdsxUNt9Nwx/dh81yV6rI4FS+MW31IjN3mE4c6lCkXpBdQRrJrfmxkobcmmzk+mw19NPaHVIt7VCcpHg7IL3eJOrIuohzaDcgig9nM4dwz+IRcEKfT0yWNOD7qzBk25AeLJ1Q+QyXv/sXLJk7ngoqpw4PcUs+6GTmHN3AYU73WngRGlYQrTr7+LT44o+w51Dd9Gj8x2neFLqEOw+VpZAJMq1t8+b7xuG8c4luK34/I0JH32b+H5GeWuy+sjCzoWdrU1K/1Wljw1/8yjzkoScgmdCt5w3Ev/eh7EXEyrfSKlqsMb7yqCgEwyZRzP8Mwazb9nDYYzMS77YgGVdW+h6LzlQA2aVJs7GThN/27PqkWTsk/sbAJ/j4BSSVbcXTZf6LQ9+bteD0Zan2DAGMn1f5LQdmZxW2GOCA4Kn3OeEXPr9slJ4G9Ca9r2HEF/CSAfELSzfh3wzUduwcbI1UW5x/gYSWyuLL/c13cITGNUdv6KjxNYBCfjaegQzrULV10SXwF4abFdnpv0AARVLQOgpgaprIBSQgL+WNSOABlwsy1Hl2vrJefA3gW/HUTyOUv+HeX3ILOJ/ZXoUEOH0hFq7Wwlw3H4apdRHJPpT0EgZx2kt5NK+b4j81NIJAvuSFEN0gH65qjQ6lPl8r5zqc4yFUE1BVu+OiPhMbZ6R3HyZngRAgAd4k5skjHaXLO+6y3T9miWX96Mc0RV+/aI619JDpQtQf5TM6tGWjge+Rz3osOwlsuZuTTiGf0k+E0leYsSBvp6vncWfqKNB7piVQaM5uHtuzpl9WcVDq3pSspgBno/Rj+3qvVyM8tcy6+XmhH/LlR0mNOpr9sMOvWM6i8VRrsOPoxWO+crHyAujeGRcignfeb8tPFk8LxaQc2KObcBmd8Z7GrZULmdX5ASr7h1SJyPm698SA/WVYYAz1ldhmpCLpkOby1plXa4Z11sGNmnB9DTO0xCZ2TiOWnKoVJXgKtA0qto9utKPPUg/gokexpZ4FmfT+CBNoKkeoahRxFki+l85RGCXEWtsSNKeTOxIvdcXz2yGRSFG+rSxQ=",
"hash": "12792560556693539606735923311811117433165369543125266619542306386624586253107"
"data": "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",
"hash": "19310027642437930290458048212755059674159518924616933538143563269561536287877"
}
},
"Membership_": {
Expand All @@ -19,14 +19,14 @@
},
"TokenContract": {
"verificationKey": {
"data": "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",
"hash": "25233369077755956166656912091919770106000926128666369624140027897897542472859"
"data": "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",
"hash": "1805618078121285332343482592243061319759675662039725571222151161035831907635"
}
},
"Dex": {
"verificationKey": {
"data": "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",
"hash": "11656004533948220170811542827386442823924717815066547341670031403039013683568"
"data": "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",
"hash": "19435468715062623397587806151775069885208933390199296510404720462609868425905"
}
}
}
4 changes: 2 additions & 2 deletions src/examples/zkapps/dex/arbitrary_token_interaction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
AccountUpdate,
UInt64,
shutdown,
Token,
TokenId,
} from 'snarkyjs';
import { TokenContract, addresses, keys, tokenIds } from './dex.js';

Expand All @@ -22,7 +22,7 @@ console.log('-------------------------------------------------');
console.log('TOKEN X ADDRESS\t', addresses.tokenX.toBase58());
console.log('USER ADDRESS\t', userAddress.toBase58());
console.log('-------------------------------------------------');
console.log('TOKEN X ID\t', Token.Id.toBase58(tokenIds.X));
console.log('TOKEN X ID\t', TokenId.toBase58(tokenIds.X));
console.log('-------------------------------------------------');

// compile & deploy all 5 zkApps
Expand Down