Commit Graph

97 Commits

Author SHA1 Message Date
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
dependabot[bot] 036cca36b6 Bump solana-sdk from 1.3.2 to 1.3.4
Bumps [solana-sdk](https://github.com/solana-labs/solana) from 1.3.2 to 1.3.4.
- [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.2...v1.3.4)

Signed-off-by: dependabot[bot] <support@github.com>
2020-08-25 09:05:29 -07:00
dependabot[bot] b9265b450c
Bump prettier from 2.0.5 to 2.1.0 in /token-swap/js (#313)
Bumps [prettier](https://github.com/prettier/prettier) from 2.0.5 to 2.1.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.0.5...2.1.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25 08:29:56 +00:00
Jack May 65aeff5b0b
Use deprecated bpf loader (#307)
* Use deprecated bpf loader

* bump web3.js to pick up fixed flow defs
2020-08-24 14:19:46 -07:00
dependabot[bot] d4a526a90b
Bump @solana/web3.js from 0.68.0 to 0.71.1 in /token-swap/js (#278)
Bumps [@solana/web3.js](https://github.com/solana-labs/solana-web3.js) from 0.68.0 to 0.71.1.
- [Release notes](https://github.com/solana-labs/solana-web3.js/releases)
- [Commits](https://github.com/solana-labs/solana-web3.js/compare/v0.68.0...v0.71.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-14 22:28:27 +00:00
Michael Vines 77e43016f1 clippy 2020-08-14 01:22:11 +00:00
Michael Vines b9bb2f2c48 Adapt to create_program_address changes 2020-08-14 01:22:11 +00:00
Michael Vines d87d056e61 Bump testnetDefaultChannel 2020-08-14 01:22:11 +00:00
dependabot[bot] 0cb64c8c67
Bump @solana/web3.js from 0.66.3 to 0.68.0 in /token-swap/js (#266)
Bumps [@solana/web3.js](https://github.com/solana-labs/solana-web3.js) from 0.66.3 to 0.68.0.
- [Release notes](https://github.com/solana-labs/solana-web3.js/releases)
- [Commits](https://github.com/solana-labs/solana-web3.js/compare/v0.66.3...v0.68.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-12 09:28:34 +00:00
dependabot[bot] bbbc9044e1
Bump @solana/web3.js from 0.64.0 to 0.66.3 in /token-swap/js (#256)
Bumps [@solana/web3.js](https://github.com/solana-labs/solana-web3.js) from 0.64.0 to 0.66.3.
- [Release notes](https://github.com/solana-labs/solana-web3.js/releases)
- [Commits](https://github.com/solana-labs/solana-web3.js/compare/v0.64.0...v0.66.3)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-10 08:42:43 +00:00
Michael Vines d37626e360 Move program READMEs back 2020-08-08 23:04:16 +00:00
Michael Vines a22908bbd9 Relocate js 2020-08-08 15:25:47 -07:00
Michael Vines 26ab9bb26a Reorganize crates based on program 2020-08-08 15:25:47 -07:00
Michael Vines 48b11fc01c Move up to v1.3.1 2020-08-08 08:05:00 -07:00
Michael Vines a8c995bc79 Fix up target/ location 2020-08-08 08:05:00 -07:00
Michael Vines 2d4782b713 Add create_program_address stub for non-bpf targets 2020-08-08 08:05:00 -07:00
Michael Vines 20c7bd1611 Adapt to workspace crate 2020-08-08 08:05:00 -07:00
Michael Vines c6042f68f7 Add top-level workspace 2020-08-08 08:05:00 -07:00
Michael Vines 735eafb7e0 Avoid generating header files when they already exist 2020-08-07 18:44:00 -07:00
dependabot[bot] 4afde65d44
Bump flow-bin from 0.130.0 to 0.131.0 in /token-swap/js (#233)
Bumps [flow-bin](https://github.com/flowtype/flow-bin) from 0.130.0 to 0.131.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-08-07 09:27:29 +00:00