Mike/141 movement with sim #304
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…movement-with-sim # Conflicts: # examples/fungible-token/res/fungible_token.wasm # near-contract-standards/src/fungible_token/implementation.rs
mikedotexe
requested review from
evgenykuzyakov,
frol and
willemneal
as code owners
chadoh
reviewed
Mar 2, 2021
| @@ -201,57 +198,52 @@ impl FungibleTokenResolver for FungibleToken { | |||
| } | |||
| } | |||
| } | |||
| amount.into() | |||
| PromiseOrValue::Value(U128::from(amount)).into() | |||
There was a problem hiding this comment.
Does this need PromiseOrValue::Value and into()?
…en into mike/141-movement-with-sim
…near-bindgen into mike/141-movement-with-sim
…en into mike/141-movement-with-sim
evgenykuzyakov
pushed a commit
that referenced
this pull request
Mar 3, 2021
* refactor: add more simulation tests to ft example Co-authored-by: Willem Wyndham <willem@cs.umd.edu> * update directory structure for sim tests * clean up fungible-token/Cargo.toml * examples/ft: whitelist members again * Mike/141 movement with sim (#304) * implement account registration and don't use storage for fungible token * update sim tests * ft_resolve_transfer should just return U128, ar_is_registered view only * final change with use bytes for deposit * Cargo.toml changes * Reworking DeFi test example * Working again, except no force closing of the account * Add extra callbacks Co-authored-by: Evgeny Kuzyakov <ek@nearprotocol.com> Co-authored-by: Willem Wyndham <willem@cs.umd.edu> Co-authored-by: Mike Purvis <mikedotexe@gmail.com> Co-authored-by: Evgeny Kuzyakov <ek@nearprotocol.com>
evgenykuzyakov
pushed a commit
that referenced
this pull request
Mar 4, 2021
…more tools (#275) * Adding near-std library * Return back near_bindgen marco call on trait * Rename near-std to near-lib * fix: allow trait methods in generated impl * Rename near lib to near contract standards. Move all utils into sdk. * Revert accidental change in cargo.toml * Disable sim test for FT until #276 is resolved * feat(contract-standards) Switch contract standards to use NEP-141 for FungibleToken * Change LookupMap name to 'a' to be compatible with wNEAR implementation * Bring back sim tests in fungible-token * Refactor standards * Fix log tests * Fix tests and compilation * Fix tests * Bumping to exact version of =3.0.0.pre.2 * Fix macro bug in impl_token * update fungible token readme to stop describing NEP-21 * Introducing Base58CryptoHash and moving metadata implementation to the FT example contract * Remove globals from gitignore * Update tests * refactor: add more simulation tests to ft example (#297) * refactor: add more simulation tests to ft example Co-authored-by: Willem Wyndham <willem@cs.umd.edu> * update directory structure for sim tests * clean up fungible-token/Cargo.toml * examples/ft: whitelist members again * Mike/141 movement with sim (#304) * implement account registration and don't use storage for fungible token * update sim tests * ft_resolve_transfer should just return U128, ar_is_registered view only * final change with use bytes for deposit * Cargo.toml changes * Reworking DeFi test example * Working again, except no force closing of the account * Add extra callbacks Co-authored-by: Evgeny Kuzyakov <ek@nearprotocol.com> Co-authored-by: Willem Wyndham <willem@cs.umd.edu> Co-authored-by: Mike Purvis <mikedotexe@gmail.com> Co-authored-by: Evgeny Kuzyakov <ek@nearprotocol.com> * Fix cross-contract lazy static imports * ft receiver returns PromiseOrValue<U128> * update to test and ft wasm files * Address review comments * Fix for a nearcore master CI Co-authored-by: Willem Wyndham <willem@cs.umd.edu> Co-authored-by: Evgeny Kuzyakov <ek@nearprotocol.com> Co-authored-by: Mike Purvis <mikedotexe@gmail.com> Co-authored-by: Chad Ostrowski <221614+chadoh@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
mike is hurrying