blockworks-foundation
/
solana-program-library
mirror of https://github.com/blockworks-foundation/solana-program-library.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,300 Commits 16 Branches 106 Tags 38 MiB
Commit Graph

316 Commits

Author SHA1 Message Date
Jon Cinque f8ba091a36
Fix bpf build, need to fully reference u128::MAX (#946) 2020-12-14 18:06:38 +01:00
Jon Cinque 8233d35fda
token-swap: Refactor math into sqrt function and add proptest (#943) 
* Refactor into sqrt function and add proptest

* Run cargo fmt + clippy

* Address review feedback
 2020-12-14 17:48:41 +01:00
Jon Cinque 55deb6c1af
token-swap: Constant price curve (#936) 
* Update constant price curve conversion to/from pool tokens

* Add test for pool token conversion

* Fix tests

* run cargo fmt

* Assess fee on half source amount for conversion
 2020-12-11 10:27:28 +01:00
Jon Cinque 087ae2e242
token-swap: Add offset curve and math (#935) 
* Add offset curve

* Fix for math

* Add PreciseNumber

* Use Balancer formulation for trading token -> pool token conversion

* Add round-trip conversion testing

* Add offset curve to JS

* Run cargo fmt

* Update JS test numbers for new calcs

* Integrate review feedback

* Allow for withdrawals when one side is 0

* Run cargo fmt

* Disallow deposits for offset curve

* Run cargo fmt

* Allow for withdrawals through 0
 2020-12-10 18:31:21 +01:00
Jon Cinque 3dcb1c5665
token-swap: Add pool token conversion interface (#934) 
* Add pool token conversion interface for all curves

This reverts commit 8400bc7bfe4fcc18580d8f81cbb19a4ef5a437ff.

* Improve tests

* Run cargo fmt
 2020-12-09 11:30:22 +01:00
Jon Cinque c0f5ff182c
token-swap: Refactor for new curves (#930) 
* Add price parameter for flat / constant price curve

This encompasses a lot of changes to properly support the constant price
curve, and fixes some old pain points to make the whole thing easier to
use, including:
* refactor fees out of the curve
* move all fee calculations into new Fees type
* modify constraints to only care about curve types and fee
* add price parameter into constant price curve (flat curve)

* Run cargo fmt and clippy

* Revert interface changes and math update

* Run cargo fmt

* Address review feedback

* Fix fraction validation for zeros
 2020-12-08 18:22:32 +01:00
dependabot[bot] 7828871e5f
Bump @rollup/plugin-commonjs from 16.0.0 to 17.0.0 in /token-swap/js (#920) 
Bumps [@rollup/plugin-commonjs](https://github.com/rollup/plugins) from 16.0.0 to 17.0.0.
- [Release notes](https://github.com/rollup/plugins/releases)
- [Commits](https://github.com/rollup/plugins/compare/commonjs-v16.0.0...commonjs-v17.0.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-03 11:19:07 +00:00
Jon Cinque 04a3c833f0
token-swap: Cleanup check (#903) 
* Add extra check

* Add extra check on init

* Run cargo fmt

* Clippy

* Add token program id check on unpack

* Run cargo fmt

* Add checks for program id ownership on swap account

* Add truncation check during swapping

* Run cargo fmt

* Update truncation to ceiling the value

* Run cargo fmt

* Fix JS test

* Refund back not needed source tokens

* Run cargo fmt

* Add swap_without_fees method to trait

* Fix merge problem

Co-authored-by: Justin Starry <justin@solana.com>
 2020-12-03 12:17:32 +01:00
Michael Vines 158fa1dea6 Upgrade to Solana v1.4.14 2020-12-03 05:39:55 +00:00
dependabot[bot] 6aa1d8cce1
Bump solana-program from 1.4.9 to 1.4.13 (#916) 
Bumps [solana-program](https://github.com/solana-labs/solana) from 1.4.9 to 1.4.13.
- [Release notes](https://github.com/solana-labs/solana/releases)
- [Changelog](https://github.com/solana-labs/solana/blob/master/RELEASE.md)
- [Commits](https://github.com/solana-labs/solana/compare/v1.4.9...v1.4.13)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-02 12:54:42 +00:00
dependabot[bot] cfcfc79482
Bump prettier from 2.2.0 to 2.2.1 in /token-swap/js (#915) 
Bumps [prettier](https://github.com/prettier/prettier) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.2.0...2.2.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-02 11:31:28 +00:00
dependabot[bot] b1753dfc20
Bump @babel/cli from 7.12.1 to 7.12.8 in /token-swap/js (#909) 
Bumps [@babel/cli](https://github.com/babel/babel/tree/HEAD/packages/babel-cli) from 7.12.1 to 7.12.8.
- [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.8/packages/babel-cli)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-01 11:31:12 +00:00
Jon Cinque b40e0dd3fd
token-swap: Add fuzzer for swap / withdraw / deposit (#875) 
* token-swap: Add fuzzer for swap / withdraw / deposit

* Run cargo fmt

* Make end-to-end testing work

* Fix test failures

* Cleanup for review

* Remove Clone trait for Initialize

* Fix building fuzz targets

* Fix fuzz withdraw logic to avoid ZeroTradingTokens error

* Cargo fmt

* Clippy / fmt again

* Integrate fuzzer in main workspace to share clippy / fmt

* Fix clippy

* Switch to stable honggfuzz that could work with BPF

* Update to most recent honggfuzz

* Add build / run requirements

* Add fuzz CI and cleanup for honggfuzz

* Revert to using fuzz feature to integrate with workspace

* Make fuzz script executable

* Refactor and cleanup

* Add nightly run

* Fix workflow typo

* Add runtime for pull request fuzz workflow

* Fix unrelated new clippy errors
 2020-11-30 13:01:31 +01:00
dependabot[bot] ac20c5d59a
Bump @babel/core from 7.12.8 to 7.12.9 in /token-swap/js (#902) 
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.12.8 to 7.12.9.
- [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.9/packages/babel-core)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-30 11:33:09 +00:00
dependabot[bot] c82feb4ad0
Bump rollup from 2.33.2 to 2.34.0 in /token-swap/js (#899) 
Bumps [rollup](https://github.com/rollup/rollup) from 2.33.2 to 2.34.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.33.2...v2.34.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-30 10:02:40 +00:00
Yuriy Savchenko a0d0ae63ca
token-swap stable curve: 256-bit math added with tests (#886) 
* Stable curve math rewritten to 256-bit, reference simulation added with test integration

* Formatting error fixed

* Clippy warnings fixed

* Fixed dependencies to remove crates not supportinf bpf

* Fixed indentations

* Fixed lint errors

* Fixed format warnings

* Fixing clippy lint errors

* U256 math and simulation library refactoring, checked math used everywhere, other small fixes

* Fixed conversion to optional u128
 2020-11-25 21:19:25 +01:00
dependabot[bot] 8619764700
Bump @babel/core from 7.12.3 to 7.12.8 in /token-swap/js (#889) 
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.12.3 to 7.12.8.
- [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.8/packages/babel-core)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-24 11:47:54 +00:00
dependabot[bot] 52939a7a95
Bump prettier from 2.1.2 to 2.2.0 in /token-swap/js (#878) 
Bumps [prettier](https://github.com/prettier/prettier) from 2.1.2 to 2.2.0.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.1.2...2.2.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-20 11:28:34 +00:00
Michael Vines c6a4ac9a82 Bump solana version to v1.4.9 2020-11-17 20:02:17 -08:00
Jon Cinque c677c58e09
Add JS test for creating accounts and swapping in one transaction (#568) 
* Add test for doing all swap in one transaction

* Fix instruction to minimize signatures required

* Run prettier
 2020-11-17 17:54:55 +01:00
Yuriy Savchenko d62ddd2b94
Added stable curve invariant to the token swap smart contract (#838) 
* Added stable curve invariant to the token swap smart contract

* Fixed formatting

* Added missing stable curve constraints

* Symbol renames to make math clearer

* Small refactoring according to PR comments, fixes for JS tests
 2020-11-17 14:13:18 +01:00
dependabot[bot] 90c0481051
Bump rollup from 2.33.1 to 2.33.2 in /token-swap/js (#849) 
Bumps [rollup](https://github.com/rollup/rollup) from 2.33.1 to 2.33.2.
- [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.33.1...v2.33.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-16 11:33:45 +00:00
dependabot[bot] 84aca40018
Bump flow-bin from 0.137.0 to 0.138.0 in /token-swap/js (#848) 
Bumps [flow-bin](https://github.com/flowtype/flow-bin) from 0.137.0 to 0.138.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-11-16 11:32:55 +00:00
Michael Vines f4af9054a2 Update to Solana 1.4.8 2020-11-14 02:35:20 +00:00
Michael Vines 5030a87021 Upgrade to Solana 1.4.7 2020-11-12 11:05:20 -08:00
dependabot[bot] 39c574a25d
Bump @solana/web3.js from 0.86.4 to 0.87.0 in /token-swap/js (#833) 
Bumps [@solana/web3.js](https://github.com/solana-labs/solana-web3.js) from 0.86.4 to 0.87.0.
- [Release notes](https://github.com/solana-labs/solana-web3.js/releases)
- [Commits](https://github.com/solana-labs/solana-web3.js/compare/v0.86.4...v0.87.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-12 11:32:07 +00:00
Yutaro Mori 81a63712ac
Fix u64.fromBuffer return type to u64 (#830) 2020-11-12 10:40:46 +01:00
dependabot[bot] b71456a8f1
Bump solana-program from 1.4.5 to 1.4.6 (#826) 
Bumps [solana-program](https://github.com/solana-labs/solana) from 1.4.5 to 1.4.6.
- [Release notes](https://github.com/solana-labs/solana/releases)
- [Changelog](https://github.com/solana-labs/solana/blob/master/RELEASE.md)
- [Commits](https://github.com/solana-labs/solana/compare/v1.4.5...v1.4.6)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-11 12:39:52 +00:00
Yutaro Mori 9ddcd77f3e
Fix type definitions for TokenSwap class (#809) 2020-11-10 21:20:52 +01:00
Jon Cinque 75acddc100
Fix zero fee calculation (#813) 
If a swap has a trading fee and a zero owner fee, when calculating the owner
fee to pool token conversion, the simulated trading fee will be non-zero
because we floor the trading fee to 1 token.  If the input to trading
fee calculation is 0, then we will try to do `0 - 1` on an unsigned int,
which causes an underflow error.  The fix is to simply return a 0 fee
for a 0 input.
 2020-11-09 19:01:21 +01:00
dependabot[bot] 59b07f4896
Bump eslint from 7.12.1 to 7.13.0 in /token-swap/js (#812) 
Bumps [eslint](https://github.com/eslint/eslint) from 7.12.1 to 7.13.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.12.1...v7.13.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-09 11:30:47 +00:00
Michael Vines 238eabc1d0 Bump solana version to v1.4.5 2020-11-06 21:29:04 -08:00
Justin Starry 1f810787d0
Fix broken stake-pool docs link and make readme's consistent (#805) 2020-11-06 09:15:27 +08:00
dependabot[bot] 8ae0f927db
Bump @babel/node from 7.12.1 to 7.12.6 in /token-swap/js (#804) 
Bumps [@babel/node](https://github.com/babel/babel/tree/HEAD/packages/babel-node) from 7.12.1 to 7.12.6.
- [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.6/packages/babel-node)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-05 11:25:49 +00:00
Michael Vines 89de77aad8 Bump spl-token to v3.0.0 2020-11-04 18:58:37 +00:00
dependabot[bot] d59133d888
Bump @babel/runtime from 7.12.1 to 7.12.5 in /token-swap/js (#799) 
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.12.1 to 7.12.5.
- [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.5/packages/babel-runtime)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-04 11:27:54 +00:00
dependabot[bot] b0834da178
Bump @solana/web3.js from 0.86.2 to 0.86.4 in /token-swap/js (#792) 
Bumps [@solana/web3.js](https://github.com/solana-labs/solana-web3.js) from 0.86.2 to 0.86.4.
- [Release notes](https://github.com/solana-labs/solana-web3.js/releases)
- [Commits](https://github.com/solana-labs/solana-web3.js/compare/v0.86.2...v0.86.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-04 04:22:56 +00:00
Michael Vines 341149d0e9 Back to no-entrypoint feature name 2020-11-03 10:34:43 -08:00
Michael Huang 5bf4b76df4
Refactor curve.rs (#754) 
* Refactor shared out of curve.rs

* Refactor out flat curve

* Refactor out constant product curve

* Cargo fmt

* More moving

* Fixup

* use::super -> user::create::curve

* cp -> constant_product

* Fix circular dependency

* Docs

* Trigger Build
 2020-11-02 14:29:00 +01:00
dependabot[bot] 1a340b8f3c
Bump rollup from 2.32.1 to 2.33.1 in /token-swap/js (#774) 
Bumps [rollup](https://github.com/rollup/rollup) from 2.32.1 to 2.33.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.1...v2.33.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-02 11:04:28 +00:00
Michael Vines 2b5e9d1286 Drop lifetimes 2020-11-01 20:48:15 -08:00
Michael Vines 9f4e6d8beb Update to solana v1.4.4 2020-11-01 20:48:15 -08:00
dependabot[bot] 6fde6e0cda
Bump @rollup/plugin-commonjs from 15.1.0 to 16.0.0 in /token-swap/js (#741) 
Bumps [@rollup/plugin-commonjs](https://github.com/rollup/plugins) from 15.1.0 to 16.0.0.
- [Release notes](https://github.com/rollup/plugins/releases)
- [Commits](https://github.com/rollup/plugins/compare/commonjs-v15.1.0...commonjs-v16.0.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-01 23:45:22 +08:00
dependabot[bot] 3cf2ae38ff
Bump flow-bin from 0.136.0 to 0.137.0 in /token-swap/js (#752) 
Bumps [flow-bin](https://github.com/flowtype/flow-bin) from 0.136.0 to 0.137.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-11-01 20:29:01 +08:00
Justin Starry beaa05ece5
Bump npm token and token-swap versions (#767) 
* Bump npm token and token-swap versions

* Bump npm token and token-swap versions
 2020-11-01 05:43:55 +00:00
Tyera Eulberg c312a0576a
Clippy suggestions (#765) 2020-10-31 19:10:33 -06:00
dependabot[bot] 3274ee2fce
Bump @solana/web3.js from 0.84.0 to 0.86.2 in /token-swap/js (#759) 
Bumps [@solana/web3.js](https://github.com/solana-labs/solana-web3.js) from 0.84.0 to 0.86.2.
- [Release notes](https://github.com/solana-labs/solana-web3.js/releases)
- [Commits](https://github.com/solana-labs/solana-web3.js/compare/v0.84.0...v0.86.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-10-30 11:04:28 +00:00
Jon Cinque 9cd1cb0900
Token-swap: Add "production mode" hard-coded fee constraints (#731) 
* Add statically configured program constraints

* Allow missing host fee account

* Run cargo fmt + clippy

* Update JS for new host fee account param

* Fix merge issues

* Add host fee to curve, constrain on curves

* Cleanup static variable

* Add production test to CI

Integrate review feedback

* Run cargo fmt, clippy, prettier

* Re-run cargo fmt

* Fix test for eslint / prettier clash
 2020-10-29 12:52:17 +01:00
dependabot[bot] 46500ad5c0
Bump eslint from 7.12.0 to 7.12.1 in /token-swap/js (#740) 
Bumps [eslint](https://github.com/eslint/eslint) from 7.12.0 to 7.12.1.
- [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.12.0...v7.12.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-10-27 11:27:00 +00:00
anatoly yakovenko 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
dependabot[bot] 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
dependabot[bot] 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
Justin Starry a6cfc590e1
Prevent swap accounts being used as user accounts (#719) 2020-10-26 18:17:47 +08:00
Michael Vines 211f92e8c6 Groom Cargo.tomls 2020-10-25 07:52:33 +00:00
Michael Vines fe627797c3 Use program_stubs to clean up invoke_signed stub 2020-10-25 03:29:01 +00:00
Michael Vines 80e29ef6b9 Port SPL to solana-program and `cargo build-bpf` 2020-10-24 19:21:38 -07:00
Jon Cinque 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
dependabot[bot] 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
Justin Starry ee99fcf025
Check for close and freeze authorities in token-swap (#686) 2020-10-22 21:20:38 +08:00
Jon Cinque 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
dependabot[bot] 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
dependabot[bot] 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
dependabot[bot] 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
dependabot[bot] 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
Justin Starry 0e8c4fb5bf
Bump @solana/web3.js to v0.81.0 (#663) 2020-10-19 23:54:29 +08:00
dependabot[bot] 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
dependabot[bot] 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
dependabot[bot] 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
dependabot[bot] 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
dependabot[bot] 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
Justin Starry 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
Yutaro Mori 641c27810c
Ensure that read only accounts in token-swap instructions are set correctly (#648) 2020-10-19 11:22:39 +02:00
dependabot[bot] 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
dependabot[bot] 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
dependabot[bot] 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
dependabot[bot] 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
dependabot[bot] 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
dependabot[bot] 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
dependabot[bot] 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
dependabot[bot] 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
Yutaro Mori 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
dependabot[bot] 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
dependabot[bot] 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
dependabot[bot] 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
Jon Cinque 423d8b1ae9
Add checks for 0 token output and tests (#595) 2020-10-09 19:23:43 +02:00
dependabot[bot] 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
Jon Cinque 5bd2e1c98c
Update token / token-swap npm package version (#585) 2020-10-09 01:03:09 +02:00
dependabot[bot] 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
Justin Starry 9e76189a42
Clean up JS test getConnection function (#577) 2020-10-08 09:27:06 +00:00
Jack May a7b121074d Remove skip-no-mangle entirely 2020-10-07 09:13:59 -07:00
dependabot[bot] 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
Michael Vines aa9984e0d0 Replace mkdirp-promise with mkdirp 2020-10-06 18:01:48 -07:00
Jack May c574597d71 solana sdk does not need skip-no-mangle 2020-10-06 11:03:14 -07:00
Jon Cinque 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
Jon Cinque 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
Jon Cinque 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
dependabot[bot] 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
dependabot[bot] 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
dependabot[bot] 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
dependabot[bot] 431299016b
Bump eslint from 7.9.0 to 7.10.0 in /token-swap/js (#545) 
Bumps [eslint](https://github.com/eslint/eslint) from 7.9.0 to 7.10.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.9.0...v7.10.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-28 08:40:15 +00:00
dependabot[bot] c24e8245ea
Bump @solana/web3.js from 0.78.0 to 0.78.1 in /token-swap/js (#539) 
Bumps [@solana/web3.js](https://github.com/solana-labs/solana-web3.js) from 0.78.0 to 0.78.1.
- [Release notes](https://github.com/solana-labs/solana-web3.js/releases)
- [Commits](https://github.com/solana-labs/solana-web3.js/compare/v0.78.0...v0.78.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-25 19:33:10 +00:00
Jon Cinque 0a059706c0
Upgrade web3 to 0.78.0 and sdk to 1.3.13 (#537) 
* Update `sendAndConfirmTransaction` to use `preflightCommitment` of
  `recent`. For the token tests, on my machine, it took roughly 18.5
  seconds, and with `skipPreflight: true` it was about 21.5 seconds.
 2020-09-25 20:49:05 +02:00
dependabot[bot] 254d36affe
Bump rollup from 2.28.1 to 2.28.2 in /token-swap/js (#533) 
Bumps [rollup](https://github.com/rollup/rollup) from 2.28.1 to 2.28.2.
- [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.1...v2.28.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-25 08:39:00 +00:00
dependabot[bot] 1a3f93f9bc
Bump @solana/web3.js from 0.76.0 to 0.77.0 in /token-swap/js (#525) 
Bumps [@solana/web3.js](https://github.com/solana-labs/solana-web3.js) from 0.76.0 to 0.77.0.
- [Release notes](https://github.com/solana-labs/solana-web3.js/releases)
- [Commits](https://github.com/solana-labs/solana-web3.js/compare/v0.76.0...v0.77.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-24 09:19:39 +00:00
Jon Cinque 13de66817d
token-swap: Improve pool token supply on initialization, deposit, and withdrawal (#508) 
* token-swap: Add token supply in invariant calculation

* Refactor state classes into curve components for future use
* Align pool initialization with Uniswap using geometric mean of token
  amounts
* Fix deposit and withdraw instruction to work as a proportion of pool
  tokens
* Add math utilities to calculate the geometric mean with u64

* Improve variable names

* Use a fixed starting pool size

* Run cargo fmt

* Update js tests with new pool numbers

* Run linting

* Remove math

* Fix BN type issues found by flow
 2020-09-23 23:08:44 +02:00
Jon Cinque 51c4dc6951
Fix lint check in CI (#519) 
* Fix lint check in CI

* `npm run lint` now checks that code is properly formatted, instead of
  running the formatter
* Add extra commands to run the linting, include ts definitions file
* Update flow-bin, fix type errors that come up

* Clarify lint vs lint:fix as requested
 2020-09-23 18:20:37 +02:00
Daniel Kelleher af98c77839
Expose Layouts and instruction creation functions to allow more flexible use of the Token and TokenSwap clients. (#517) 2020-09-23 14:22:56 +02:00
dependabot[bot] 1fc9d017e8
Bump @rollup/plugin-commonjs from 15.0.0 to 15.1.0 in /token-swap/js (#514) 
Bumps [@rollup/plugin-commonjs](https://github.com/rollup/plugins) from 15.0.0 to 15.1.0.
- [Release notes](https://github.com/rollup/plugins/releases)
- [Commits](https://github.com/rollup/plugins/compare/commonjs-v15.0.0...commonjs-v15.1.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-22 08:53:09 +00:00
Tyera Eulberg 90b5ce6d65
Standardize failure case ordering (#509) 
* Standardize processor failure-case ordering

* Fix token-swap test
 2020-09-21 20:28:24 -06:00
Jack May 759fe1487e Switch to solana_sdk Pack and COption 2020-09-21 17:08:37 -07:00
Jack May 08fe8307f0
Bump solana-sdk to v1.3.12 (#484) 2020-09-21 08:38:29 -07:00
dependabot[bot] 476e89f007
Bump rollup from 2.27.1 to 2.28.1 in /token-swap/js (#486) 
Bumps [rollup](https://github.com/rollup/rollup) from 2.27.1 to 2.28.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.27.1...v2.28.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-21 08:42:00 +00:00
Jon Cinque ba76d520eb
token-swap js: Prepare package for npm (#475) 
* Run `pretty` properly
* Add `build:program` like for spl-token
* Add TypeScript to CI
* snake_case -> camelCase variables
* Combine transactions on swap initialization
* Make instruction functions static
 2020-09-18 19:10:21 +02:00
dependabot[bot] c1dbc1cab9
Bump @solana/web3.js from 0.75.2 to 0.76.0 in /token-swap/js (#471) 
Bumps [@solana/web3.js](https://github.com/solana-labs/solana-web3.js) from 0.75.2 to 0.76.0.
- [Release notes](https://github.com/solana-labs/solana-web3.js/releases)
- [Commits](https://github.com/solana-labs/solana-web3.js/compare/v0.75.2...v0.76.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-18 08:42:06 +00:00
Daniel Kelleher 23a393801f
Token-swap ts, flow bindings and build using rollup. (#463) 
* Added token-swap ts and flow bindings and build pure JS versions using rollup, to match the token program

* Added references to the built files in token-swap package.json

* Added missing Account import

* Fix flow module syntax errors
 2020-09-18 09:31:16 +02:00
Jon Cinque 9edf7304d2
token-swap: Remove tokenSwapAccount as signer (#462) 2020-09-17 16:00:23 +02:00
Jon Cinque 84cf55e9ae
Token-swap: add tests for all instructions (#455) 
* token-swap: Add initialize tests

* Cleanup initialize test using helper struct

* Add deposit tests

* Run cargo fmt

* Add withdraw tests, refactor swap in test

* Add swap tests

* Integrate review feedback
 2020-09-17 12:11:24 +02:00
dependabot[bot] 1e3a66b001
Bump @babel/cli from 7.11.5 to 7.11.6 in /token-swap/js (#457) 
Bumps [@babel/cli](https://github.com/babel/babel/tree/HEAD/packages/babel-cli) from 7.11.5 to 7.11.6.
- [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.11.6/packages/babel-cli)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-17 08:40:04 +00:00
dependabot[bot] 9d9545c98d
Bump solana-sdk from 1.3.9 to 1.3.11 (#454) 
Bumps [solana-sdk](https://github.com/solana-labs/solana) from 1.3.9 to 1.3.11.
- [Release notes](https://github.com/solana-labs/solana/releases)
- [Changelog](https://github.com/solana-labs/solana/blob/master/RELEASE.md)
- [Commits](https://github.com/solana-labs/solana/compare/v1.3.9...v1.3.11)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-16 09:22:53 +00:00
dependabot[bot] 6cc41494c4
Bump prettier from 2.1.1 to 2.1.2 in /token-swap/js (#449) 
Bumps [prettier](https://github.com/prettier/prettier) from 2.1.1 to 2.1.2.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.1.1...2.1.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-16 08:39:56 +00:00
dependabot[bot] 30b29320ac
Bump eslint from 7.8.1 to 7.9.0 in /token-swap/js (#445) 
Bumps [eslint](https://github.com/eslint/eslint) from 7.8.1 to 7.9.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.8.1...v7.9.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-15 08:39:47 +00:00
dependabot[bot] c3631d2592
Bump @solana/web3.js from 0.75.0 to 0.75.2 in /token-swap/js (#439) 
Bumps [@solana/web3.js](https://github.com/solana-labs/solana-web3.js) from 0.75.0 to 0.75.2.
- [Release notes](https://github.com/solana-labs/solana-web3.js/releases)
- [Commits](https://github.com/solana-labs/solana-web3.js/compare/v0.75.0...v0.75.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-14 08:50:27 +00:00
Jon Cinque 759cbb3866
Pack instructions and state more efficiently (#420) 
* Pack instructions and state more efficiently

* SwapInfo and SwapInstruction are more memory-efficient, following the
  example from SPL Token
* Remove unnecessary helper structs to make instructions clearer
* Error -> SwapError
* Update JS tests to reflect the change

* Integrate review feedback
 2020-09-11 18:19:06 +02:00
dependabot[bot] 89abd07e7a
Bump eslint from 7.7.0 to 7.8.1 in /token-swap/js (#423) 
Bumps [eslint](https://github.com/eslint/eslint) from 7.7.0 to 7.8.1.
- [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.7.0...v7.8.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-11 08:39:59 +00:00
dependabot[bot] 2ffc5289bb
Bump node-fetch from 2.6.0 to 2.6.1 in /token-swap/js (#417) 
Bumps [node-fetch](https://github.com/bitinn/node-fetch) from 2.6.0 to 2.6.1.
- [Release notes](https://github.com/bitinn/node-fetch/releases)
- [Changelog](https://github.com/node-fetch/node-fetch/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/bitinn/node-fetch/compare/v2.6.0...v2.6.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-10 18:54:56 +00:00
Jon Cinque f5e0d793a9
token-swap: Swap instruction fix and update libs for CI (#408) 
* token-swap: Fix swap instruction

* Update SDK libs and fix outstanding issues

* Run lint in token/js

* Disable CI token-swap js tests

* Update code for web3.js 0.75.0

* Update output -> destination verbiage for clarity / consistency
 2020-09-10 20:16:50 +02:00
Justin Starry 708bb430ab
Bump dependencies from 1.3.8 to 1.3.9 (#415) 2020-09-10 17:25:43 +08:00
dependabot[bot] 638f652529
Bump @solana/web3.js from 0.73.0 to 0.75.0 in /token-swap/js (#413) 
Bumps [@solana/web3.js](https://github.com/solana-labs/solana-web3.js) from 0.73.0 to 0.75.0.
- [Release notes](https://github.com/solana-labs/solana-web3.js/releases)
- [Commits](https://github.com/solana-labs/solana-web3.js/compare/v0.73.0...v0.75.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-10 08:38:20 +00:00
Greg Fitzgerald 0ca4a61e4d
Javascript -> JavaScript (#409) 2020-09-09 17:57:30 -06:00
Jon Cinque f6fc53c311
token-swap: Fix withdraw instruction (#405) 
* Include pool mint in instruction, required for burning
* Add simple Rust test
* Fix js withdraw test
 2020-09-09 18:00:03 +02:00
Jon Cinque db729af089
Fix deposit instruction (#399) 
* Fix deposit instruction

* Refactor tests for easier composibility
* Add deposit instruction and test
* Deposit JS test works again

* Fix js lint
 2020-09-09 10:59:27 +02:00
dependabot[bot] 85b28cbe82
Bump @solana/web3.js from 0.71.11 to 0.73.0 in /token-swap/js (#404) 
Bumps [@solana/web3.js](https://github.com/solana-labs/solana-web3.js) from 0.71.11 to 0.73.0.
- [Release notes](https://github.com/solana-labs/solana-web3.js/releases)
- [Commits](https://github.com/solana-labs/solana-web3.js/compare/v0.71.11...v0.73.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-09 08:59:12 +00:00
dependabot[bot] cb2370f332
Bump @babel/core from 7.11.4 to 7.11.6 in /token-swap/js (#396) 
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.11.4 to 7.11.6.
- [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.11.6/packages/babel-core)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-08 08:34:08 +00:00
dependabot[bot] cd774fc3e7
Bump @babel/plugin-transform-runtime in /token-swap/js (#394) 
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime) from 7.11.0 to 7.11.5.
- [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.11.5/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-09-07 08:36:15 +00:00
dependabot[bot] 11b1e3eefd
Bump @solana/web3.js from 0.71.10 to 0.71.11 in /token-swap/js (#392) 
Bumps [@solana/web3.js](https://github.com/solana-labs/solana-web3.js) from 0.71.10 to 0.71.11.
- [Release notes](https://github.com/solana-labs/solana-web3.js/releases)
- [Commits](https://github.com/solana-labs/solana-web3.js/compare/v0.71.10...v0.71.11)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-05 22:46:30 +00:00
Jon Cinque ac73bd2e73
Fix token-swap tests (#388) 
* Fix local token-swap tests

* Change generation of program address to use a nonce
* Accept nonce properly in initialization
* Include nonce in TokenSwap structure
* Fixup serialization with new parameter (padding used for now)
* Update dependencies

Update toml / lock files

Fix token swap initialization end-to-end

Cleanup unit test to use `find_program_address`

Add / refactor tests

Most importantly, added a special test to make sure that
token_program_id is provided at the end of CPI instructions, since
unit testing did not pick up that problem, and it was tough to debug
during end-to-end testing

* Revert some testing changes for PR

* Update token-swap/program/src/processor.rs

Co-authored-by: Tyera Eulberg <teulberg@gmail.com>

* Integrate review comments

* Fmt and clippy

* Refactor for clippy

* Fmt again

* Fix npm lint error

* Clarify signers line as requested

Co-authored-by: Tyera Eulberg <teulberg@gmail.com>
 2020-09-06 00:09:05 +02:00
Trent Nelson 9eb10d9144 Unrelated clippy... 2020-09-04 01:18:44 -06:00
Trent Nelson b15eb09cfb Bump solana crates to 1.3.8 2020-09-04 01:18:44 -06:00
Trent Nelson ddc47a6d86 Fix TokenSwap initialization test 2020-09-04 01:18:44 -06:00
dependabot[bot] a808c86df4
Bump @babel/cli from 7.10.5 to 7.11.5 in /token-swap/js (#378) 
Bumps [@babel/cli](https://github.com/babel/babel/tree/HEAD/packages/babel-cli) from 7.10.5 to 7.11.5.
- [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.11.5/packages/babel-cli)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-01 08:28:44 +00:00
Michael Vines 9e23bc94cb Update to Solana 1.3.6 2020-08-29 22:12:00 +00:00
Jack May 815cca3cb8
Don't repack if not needed (#355) 2020-08-28 12:03:10 -07:00
Michael Vines 0a47a3127c Move c header generation out of build.rs 2020-08-27 23:32:07 -07:00
Jack May 2a5acff2d8
Safer pack/unpack (#349) 
* Safer pack/unpack

* fix cli

* clippy

* fix swap

* nit

* clippy

Co-authored-by: Michael Vines <mvines@gmail.com>
 2020-08-27 21:19:15 -07:00
Tyera Eulberg 49e6e4a589
Reinstate Mint supply (#342) 
* Reinstate Mint supply, and adjust with Minto & Burn

* C headers

* Patch token-cli

* Patch token-swap
 2020-08-27 13:06:23 -06:00
dependabot[bot] d42eda8d68
Bump @babel/core from 7.11.1 to 7.11.4 in /token-swap/js (#337) 
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.11.1 to 7.11.4.
- [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.11.4/packages/babel-core)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-08-27 23:55:23 +08:00
Michael Vines c671fdcd3a Update token-swap for token2 2020-08-26 23:10:18 -07:00
dependabot[bot] 19152cfcb7
Bump prettier from 2.1.0 to 2.1.1 in /token-swap/js (#319) 
Bumps [prettier](https://github.com/prettier/prettier) from 2.1.0 to 2.1.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.1.0...2.1.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-08-26 08:34:28 +00:00
dependabot[bot] c2da3dbd48
Bump eslint from 7.6.0 to 7.7.0 in /token-swap/js (#287) 
Bumps [eslint](https://github.com/eslint/eslint) from 7.6.0 to 7.7.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.6.0...v7.7.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-08-25 16:40:30 +00:00
dependabot[bot] 6f70d642e6 Bump bn.js from 5.1.2 to 5.1.3 in /token-swap/js 
Bumps [bn.js](https://github.com/indutny/bn.js) from 5.1.2 to 5.1.3.
- [Release notes](https://github.com/indutny/bn.js/releases)
- [Changelog](https://github.com/indutny/bn.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/indutny/bn.js/compare/v5.1.2...v5.1.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-08-25 09:06:43 -07:00