64a362c059
Use u128 for all the math but store in u64 ( #711 )
...
* Use u128 for all the math but store in u64
* tests
* missing changes
* bulds
* specific conversion failure
* fix tests
* use large numbers
* Rebase and fix merge issue from new tests
Co-authored-by: Jon Cinque <jon.cinque@gmail.com>
2020-10-26 18:18:33 +01:00
aed7439884
Bump @solana/web3.js from 0.83.0 to 0.84.0 in /token-swap/js ( #726 )
...
Bumps [@solana/web3.js](https://github.com/solana-labs/solana-web3.js ) from 0.83.0 to 0.84.0.
- [Release notes](https://github.com/solana-labs/solana-web3.js/releases )
- [Commits](https://github.com/solana-labs/solana-web3.js/compare/v0.83.0...v0.84.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-26 12:17:40 +00:00
b2fa509a86
Bump eslint from 7.11.0 to 7.12.0 in /token-swap/js ( #727 )
...
Bumps [eslint](https://github.com/eslint/eslint ) from 7.11.0 to 7.12.0.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v7.11.0...v7.12.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-26 11:19:42 +00:00
a6cfc590e1
Prevent swap accounts being used as user accounts ( #719 )
2020-10-26 18:17:47 +08:00
211f92e8c6
Groom Cargo.tomls
2020-10-25 07:52:33 +00:00
fe627797c3
Use program_stubs to clean up invoke_signed stub
2020-10-25 03:29:01 +00:00
80e29ef6b9
Port SPL to solana-program and `cargo build-bpf`
2020-10-24 19:21:38 -07:00
b0867c7e28
token-swap: Add fee account to receive withdraw / trading fees, trading token mints ( #695 )
...
* Add mints to swap info
* Add mints to JS
* Add fee account in SwapInfo / init
* Add test for 0 fee, init test fully
* Add withdraw command interface
* Add fee accounts to swap instruction
* Add calculations for swap and withdraw fees
* Run cargo fmt
* Add new fees to JS and test
* Review feedback: fixup instruction doc and clone
* Update order of accounts in instructions
* Run cargo fmt
* Fix owner fee pool token calculation to include trading fee
* Add owner fees to flat curve, per request
* Fix instruction comment numbering
* Add more errors types for clearer calculation errors
Add a check for withdrawing from fee account
* Cargo fmt
2020-10-23 18:31:58 +02:00
8c3c124f31
Bump @solana/web3.js from 0.82.0 to 0.83.0 in /token-swap/js ( #703 )
...
Bumps [@solana/web3.js](https://github.com/solana-labs/solana-web3.js ) from 0.82.0 to 0.83.0.
- [Release notes](https://github.com/solana-labs/solana-web3.js/releases )
- [Commits](https://github.com/solana-labs/solana-web3.js/compare/v0.82.0...v0.83.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-23 11:30:43 +00:00
ee99fcf025
Check for close and freeze authorities in token-swap ( #686 )
2020-10-22 21:20:38 +08:00
db42f7abbe
token-swap: Add curve and pool token trait and integrate in processor ( #624 )
...
* Add SwapCurve trait and integrate in processor
* Add PoolTokenConverter trait to correspond
* Add curve type parameter to initialization and JS
* Refactor for flat curve test, fmt
* Update token-swap/program/src/curve.rs
Co-authored-by: Tyera Eulberg <teulberg@gmail.com>
* Refactor swap curve to allow for any implementation
* Rename SwapCurveWrapper -> SwapCurve
* Run cargo fmt
* Update CurveType to enum in JS
Co-authored-by: Tyera Eulberg <teulberg@gmail.com>
2020-10-21 20:46:50 +02:00
781df85cbb
Bump rollup from 2.32.0 to 2.32.1 in /token-swap/js ( #682 )
...
Bumps [rollup](https://github.com/rollup/rollup ) from 2.32.0 to 2.32.1.
- [Release notes](https://github.com/rollup/rollup/releases )
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rollup/rollup/compare/v2.32.0...v2.32.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-21 11:54:34 +00:00
8b95867df4
Bump @solana/web3.js from 0.81.0 to 0.82.0 in /token-swap/js ( #683 )
...
Bumps [@solana/web3.js](https://github.com/solana-labs/solana-web3.js ) from 0.81.0 to 0.82.0.
- [Release notes](https://github.com/solana-labs/solana-web3.js/releases )
- [Commits](https://github.com/solana-labs/solana-web3.js/compare/v0.81.0...v0.82.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-21 11:26:19 +00:00
26dc5b959a
Bump @babel/cli from 7.11.6 to 7.12.1 in /token-swap/js ( #674 )
...
Bumps [@babel/cli](https://github.com/babel/babel/tree/HEAD/packages/babel-cli ) from 7.11.6 to 7.12.1.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.12.1/packages/babel-cli )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-20 11:37:21 +00:00
532d041bac
Bump @babel/plugin-transform-runtime in /token-swap/js ( #673 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime ) from 7.11.5 to 7.12.1.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.12.1/packages/babel-plugin-transform-runtime )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-20 11:33:40 +00:00
0e8c4fb5bf
Bump @solana/web3.js to v0.81.0 ( #663 )
2020-10-19 23:54:29 +08:00
df4ca7a0e3
Bump flow-bin from 0.135.0 to 0.136.0 in /token-swap/js ( #662 )
...
Bumps [flow-bin](https://github.com/flowtype/flow-bin ) from 0.135.0 to 0.136.0.
- [Release notes](https://github.com/flowtype/flow-bin/releases )
- [Commits](https://github.com/flowtype/flow-bin/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-19 13:08:31 +00:00
b2ebc6a077
Bump @babel/runtime from 7.12.0 to 7.12.1 in /token-swap/js ( #661 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.12.0 to 7.12.1.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.12.1/packages/babel-runtime )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-19 13:05:09 +00:00
64f8f24961
Bump rollup from 2.30.0 to 2.32.0 in /token-swap/js ( #657 )
...
Bumps [rollup](https://github.com/rollup/rollup ) from 2.30.0 to 2.32.0.
- [Release notes](https://github.com/rollup/rollup/releases )
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rollup/rollup/compare/v2.30.0...v2.32.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-19 11:52:12 +00:00
150bbc0359
Bump @babel/core from 7.12.0 to 7.12.3 in /token-swap/js ( #656 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.12.0 to 7.12.3.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.12.3/packages/babel-core )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-19 11:42:31 +00:00
8e9503972b
Bump @babel/node from 7.10.5 to 7.12.1 in /token-swap/js ( #658 )
...
Bumps [@babel/node](https://github.com/babel/babel/tree/HEAD/packages/babel-node ) from 7.10.5 to 7.12.1.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.12.1/packages/babel-node )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-19 11:40:45 +00:00
9a8fa8e845
Update SDK version to v1.3.17 ( #649 )
...
* Update SDK version to v1.3.17
* Fix clients
2020-10-19 18:07:45 +08:00
641c27810c
Ensure that read only accounts in token-swap instructions are set correctly ( #648 )
2020-10-19 11:22:39 +02:00
758cecaee2
Bump @babel/plugin-proposal-class-properties in /token-swap/js ( #641 )
...
Bumps [@babel/plugin-proposal-class-properties](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-class-properties ) from 7.10.4 to 7.12.1.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.12.1/packages/babel-plugin-proposal-class-properties )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-16 12:39:26 +00:00
875ea6e847
Bump @babel/preset-flow from 7.10.4 to 7.12.1 in /token-swap/js ( #642 )
...
Bumps [@babel/preset-flow](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-flow ) from 7.10.4 to 7.12.1.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.12.1/packages/babel-preset-flow )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-16 11:19:50 +00:00
5fac4a46f5
Bump @babel/preset-env from 7.12.0 to 7.12.1 in /token-swap/js ( #643 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.12.0 to 7.12.1.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.12.1/packages/babel-preset-env )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-16 11:19:26 +00:00
66390fd703
Bump @babel/preset-env from 7.11.0 to 7.12.0 in /token-swap/js ( #635 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.11.0 to 7.12.0.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.12.0/packages/babel-preset-env )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-15 11:22:03 +00:00
a83392dcdb
Bump @babel/core from 7.11.6 to 7.12.0 in /token-swap/js ( #633 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.11.6 to 7.12.0.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.12.0/packages/babel-core )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-15 11:16:05 +00:00
2c5b31936e
Bump @babel/runtime from 7.11.2 to 7.12.0 in /token-swap/js ( #634 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.11.2 to 7.12.0.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.12.0/packages/babel-runtime )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-15 11:12:18 +00:00
ed1764973d
Bump rollup from 2.29.0 to 2.30.0 in /token-swap/js ( #619 )
...
Bumps [rollup](https://github.com/rollup/rollup ) from 2.29.0 to 2.30.0.
- [Release notes](https://github.com/rollup/rollup/releases )
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rollup/rollup/compare/v2.29.0...v2.30.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-14 11:55:50 +00:00
d878c1a877
Bump @solana/web3.js from 0.80.1 to 0.80.2 in /token-swap/js ( #618 )
...
Bumps [@solana/web3.js](https://github.com/solana-labs/solana-web3.js ) from 0.80.1 to 0.80.2.
- [Release notes](https://github.com/solana-labs/solana-web3.js/releases )
- [Commits](https://github.com/solana-labs/solana-web3.js/compare/v0.80.1...v0.80.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-14 11:50:52 +00:00
5f56635fde
Pass TokenSwap state into the constructor to simplify function calls ( #586 )
...
* Pass TokenSwap state into the constructor to simplify function calls
* WIP: Update program to return token_program_id
* Add tokenProgramId to js TokenSwapInfo object
* Address pr comments
* Remove TokenSwapInfo and use loadTokenSwap as the primary way to fetch TokenSwap metadata
* Fix module.d.ts
* Address pr comments
* Clarification on comments
Co-authored-by: Yutaro Mori <yutaro@umaproject.org>
2020-10-14 12:37:58 +02:00
f944faeced
Bump @solana/web3.js from 0.80.0 to 0.80.1 in /token-swap/js ( #608 )
...
Bumps [@solana/web3.js](https://github.com/solana-labs/solana-web3.js ) from 0.80.0 to 0.80.1.
- [Release notes](https://github.com/solana-labs/solana-web3.js/releases )
- [Commits](https://github.com/solana-labs/solana-web3.js/compare/v0.80.0...v0.80.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-13 11:36:07 +00:00
dc408c4e4c
Bump eslint from 7.10.0 to 7.11.0 in /token-swap/js ( #601 )
...
Bumps [eslint](https://github.com/eslint/eslint ) from 7.10.0 to 7.11.0.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v7.10.0...v7.11.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-12 12:33:11 +00:00
f07e4ed931
Bump @solana/web3.js from 0.79.0 to 0.80.0 in /token-swap/js ( #602 )
...
Bumps [@solana/web3.js](https://github.com/solana-labs/solana-web3.js ) from 0.79.0 to 0.80.0.
- [Release notes](https://github.com/solana-labs/solana-web3.js/releases )
- [Commits](https://github.com/solana-labs/solana-web3.js/compare/v0.79.0...v0.80.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-12 11:39:37 +00:00
423d8b1ae9
Add checks for 0 token output and tests ( #595 )
2020-10-09 19:23:43 +02:00
d5c99b35bc
Bump @solana/web3.js from 0.78.3 to 0.79.0 in /token-swap/js ( #588 )
...
Bumps [@solana/web3.js](https://github.com/solana-labs/solana-web3.js ) from 0.78.3 to 0.79.0.
- [Release notes](https://github.com/solana-labs/solana-web3.js/releases )
- [Commits](https://github.com/solana-labs/solana-web3.js/compare/v0.78.3...v0.79.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-09 07:35:05 +00:00
5bd2e1c98c
Update token / token-swap npm package version ( #585 )
2020-10-09 01:03:09 +02:00
31161eac67
Bump rollup from 2.28.2 to 2.29.0 in /token-swap/js ( #580 )
...
Bumps [rollup](https://github.com/rollup/rollup ) from 2.28.2 to 2.29.0.
- [Release notes](https://github.com/rollup/rollup/releases )
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rollup/rollup/compare/v2.28.2...v2.29.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-08 10:27:36 +00:00
9e76189a42
Clean up JS test getConnection function ( #577 )
2020-10-08 09:27:06 +00:00
a7b121074d
Remove skip-no-mangle entirely
2020-10-07 09:13:59 -07:00
2b3f71c1ae
Bump @solana/web3.js from 0.78.2 to 0.78.3 in /token-swap/js ( #571 )
...
Bumps [@solana/web3.js](https://github.com/solana-labs/solana-web3.js ) from 0.78.2 to 0.78.3.
- [Release notes](https://github.com/solana-labs/solana-web3.js/releases )
- [Commits](https://github.com/solana-labs/solana-web3.js/compare/v0.78.2...v0.78.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-07 10:21:39 +00:00
aa9984e0d0
Replace mkdirp-promise with mkdirp
2020-10-06 18:01:48 -07:00
c574597d71
solana sdk does not need skip-no-mangle
2020-10-06 11:03:14 -07:00
2b07fc1064
token-swap: Assess swap fee on input token ( #562 )
...
* token-swap: Assess swap fee on input token
* Update token-swap/program/src/curve.rs
Co-authored-by: Tyera Eulberg <teulberg@gmail.com>
* Update token-swap/program/src/curve.rs
Co-authored-by: Tyera Eulberg <teulberg@gmail.com>
* Fix new var name everywhere
Co-authored-by: Tyera Eulberg <teulberg@gmail.com>
2020-10-02 22:47:39 +02:00
bbc5f57dcc
token-swap: Add slippage to swap / withdraw / deposit ( #560 )
...
* token-swap: Add slippage to swap / withdraw / deposit
* Update JS snake_case -> camelCase
* Run prettier
2020-10-02 10:40:33 +02:00
5e1c2bb34d
token-swap: Use sdk version of Pack ( #554 )
...
* token-swap: Use sdk version of Pack
* Update to get_packed_len per review
2020-10-01 11:02:31 +02:00
01e3c193f1
Bump flow-bin from 0.134.0 to 0.135.0 in /token-swap/js ( #557 )
...
Bumps [flow-bin](https://github.com/flowtype/flow-bin ) from 0.134.0 to 0.135.0.
- [Release notes](https://github.com/flowtype/flow-bin/releases )
- [Commits](https://github.com/flowtype/flow-bin/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-01 08:43:15 +00:00
06f30cc829
Bump @solana/web3.js from 0.78.1 to 0.78.2 in /token-swap/js ( #550 )
...
Bumps [@solana/web3.js](https://github.com/solana-labs/solana-web3.js ) from 0.78.1 to 0.78.2.
- [Release notes](https://github.com/solana-labs/solana-web3.js/releases )
- [Commits](https://github.com/solana-labs/solana-web3.js/compare/v0.78.1...v0.78.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-30 08:40:25 +00:00
663390b727
Bump eslint-plugin-import from 2.22.0 to 2.22.1 in /token-swap/js ( #547 )
...
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import ) from 2.22.0 to 2.22.1.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases )
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md )
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.22.0...v2.22.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-28 09:18:51 +00:00
anatoly yakovenko
dependabot[bot]
Justin Starry
Michael Vines
Jon Cinque
Yutaro Mori
Yutaro Mori
Jack May