Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Prototype] Fungible Tokens & Direct Tipping #810

Closed
wants to merge 49 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
612722d
prototype for aex-9 tipping on testnet with local backend
thepiwo Jun 22, 2020
d5dff0b
consistently use amount_AE
thepiwo Jun 24, 2020
5f8322d
prototype retip and show tips with tokens
thepiwo Jun 25, 2020
42f81aa
fix atoms to ae
thepiwo Jun 25, 2020
d7aea56
adjust tokenInfo route
thepiwo Jun 29, 2020
ec51019
create or change allowance fix
thepiwo Jul 1, 2020
cfcc191
fix change allowance
thepiwo Jul 1, 2020
d8ad2ea
show tokenBalances for user in sidebar
thepiwo Jul 1, 2020
52afbbd
show all tokens for tip
thepiwo Jul 1, 2020
8e66d41
fixed token balances vuex usage
thepiwo Jul 2, 2020
358b8ed
linter fixes
thepiwo Jul 6, 2020
20caa2b
replace local contract with github version
thepiwo Jul 6, 2020
9bf0e0a
replace local contract with github version
thepiwo Jul 6, 2020
7cf0c09
fixes after rebase
thepiwo Jul 22, 2020
bc3951a
update contract
thepiwo Jul 24, 2020
85e9ab4
show direct tip receiver
thepiwo Jul 24, 2020
c29a588
fixed topics amount
thepiwo Jul 27, 2020
4b0c51b
show tokens amount only without iframe wallet
thepiwo Jul 27, 2020
149fe2b
show dropdown token selector
thepiwo Jul 27, 2020
f9c7a88
comments after rebase
thepiwo Jul 27, 2020
e0d0f8c
fix show token amount after rebase
thepiwo Jul 27, 2020
17fd852
various tip with token fixes
thepiwo Jul 27, 2020
72a327b
fungible token fixes after rebase
thepiwo Jul 28, 2020
7abc10a
fixed token amount display for tips without ae
thepiwo Jul 29, 2020
7180f33
fix tip input styling
thepiwo Jul 30, 2020
13e6a0c
persist token information in state
thepiwo Jul 30, 2020
82b3a3e
fix input styles
thepiwo Jul 30, 2020
dc06a8d
reload token balances on event
thepiwo Jul 30, 2020
74e1eaf
linter fixes
thepiwo Jul 30, 2020
141078f
fixed usage of px
thepiwo Jul 31, 2020
9375a4c
prepare for simultaneous v1, v2 contract use
thepiwo Aug 14, 2020
53f6f66
adjust for duplicate tip ids
thepiwo Aug 14, 2020
14a70b2
use suffixed tip id from util
thepiwo Aug 17, 2020
5d8c622
retip on correct contract version
thepiwo Aug 17, 2020
5c71ac0
adjust tip handling
thepiwo Aug 19, 2020
28a5931
fix tip amount input width
thepiwo Aug 19, 2020
a0108db
disable iframe wallet
thepiwo Aug 19, 2020
cc0a202
fix direct tip amount display
thepiwo Aug 20, 2020
90caa09
update to current tipping contract version
thepiwo Aug 20, 2020
fb2cbb2
squashed adjustments for codereview, thanks @davidyuk
thepiwo Aug 20, 2020
3ed754b
fix tests
thepiwo Aug 20, 2020
ecb4095
fix send tip
thepiwo Aug 21, 2020
c80f9d8
fix tip input reset token
thepiwo Aug 21, 2020
e82d642
adjust tipId type
thepiwo Aug 24, 2020
02de78a
adjustments from code review
thepiwo Aug 25, 2020
296a5da
Fixed rebase inconsistencies
stanislav-slavov Sep 21, 2020
cd1e760
featureflag in constants
thepiwo Oct 7, 2020
2c24a2a
only show token features if v2 contract is available
thepiwo Oct 7, 2020
29f914b
Merge pull request #832 from aeternity/feature/fungible-token-feature…
mradkov Oct 13, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
featureflag in constants
thepiwo committed Oct 7, 2020
commit cd1e760781a4432183c154e79b2c3ee73e424473
18 changes: 0 additions & 18 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 8 additions & 4 deletions src/config/constants.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
export const BACKEND_URL = typeof Cypress !== 'undefined' ? 'https://testnet.superhero.aeternity.art' : 'https://test-tipping.aeternity.art';
export const MIDDLEWARE_URL = 'https://testnet.aeternity.io/';
export const BACKEND_URL = typeof Cypress !== 'undefined'
? 'https://testnet.superhero.aeternity.art'
: 'https://test-tipping.aeternity.art';

export const EXPLORER_URL = 'https://testnet.aeternal.io/';
export const COMPILER_URL = 'https://latest.compiler.aepps.com';
export const NODE_URL = 'https://testnet.aeternity.io';
@@ -9,5 +11,7 @@ export const CONTRACT_V1_ADDRESS = window.Cypress
: 'ct_2Cvbf3NYZ5DLoaNYAU71t67DdXLHeSXhodkSNifhgd7Xsw28Xd';

export const CONTRACT_V2_ADDRESS = window.Cypress
? 'ct_2GRP3xp7KWrKtZSnYfdcLnreRWrntWf5aTsxtLqpBHp71EFc3i'
: 'ct_2ZEoCKcqXkbz2uahRrsWeaPooZs9SdCv6pmC4kc55rD4MhqYSu';
? null
: null;

export const TOKEN_TIPPING_ENABLED = false;
2 changes: 1 addition & 1 deletion src/utils/aeternity.js
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ const initTippingContractIfNeeded = async () => {
contractV1 = await client
.getContractInstance(TIPPING_V1_INTERFACE, { contractAddress: CONTRACT_V1_ADDRESS });
}
if (!contractV2) {
if (!contractV2 && CONTRACT_V2_ADDRESS) {
contractV2 = await client
.getContractInstance(TIPPING_V2_INTERFACE, { contractAddress: CONTRACT_V2_ADDRESS });
}