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.

Sign up for GitHub

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

feat(jellyfish-api-core): enable transferdomain gov attributes #2138

Merged
merged 28 commits into from
Aug 31, 2023
Merged

feat(jellyfish-api-core): enable transferdomain gov attributes #2138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
f7ec8f0
feat(jellyfish-api-core) enable transferdomain gov attributes
fullstackninja864 Aug 6, 2023
0f50188
fix testcase
fullstackninja864 Aug 8, 2023
326cdf3
Merge branch 'main' into harsh/set-gov-transferdomain
fullstackninja864 Aug 8, 2023
781427d
enabled evm-dvm
fullstackninja864 Aug 8, 2023
44e228d
chore
fullstackninja864 Aug 8, 2023
12e9bcb
updated dfi legacy address for transferdomain
fullstackninja864 Aug 8, 2023
45b2311
added testcase for loand and non dtoken
fullstackninja864 Aug 9, 2023
f446d4b
updated dfid binary
fullstackninja864 Aug 11, 2023
3bc05cd
Merge branch 'main' into harsh/set-gov-transferdomain
fullstackninja864 Aug 11, 2023
fe6fe1f
update all test cases
Aug 18, 2023
ac740d1
update invalid domain test cases
Aug 18, 2023
a657d5f
update to latest stable node
Aug 18, 2023
b8afc55
update to node rc
Aug 21, 2023
2904cbb
remove only and add stop on container
Aug 23, 2023
b4fd10f
Update packages/jellyfish-transaction-builder/__tests__/txn/txn_build…
fullstackninja864 Aug 23, 2023
d18604e
Merge branch 'main' into harsh/set-gov-transferdomain
fullstackninja864 Aug 23, 2023
431dc07
update node to beta10
Aug 23, 2023
3eed84e
feat(test): transfer domain for LP tokens (#2145)
chloezxyy Aug 28, 2023
483356d
Merge branch 'main' of github.com:JellyfishSDK/jellyfish into harsh/s…
fullstackninja864 Aug 28, 2023
41c178c
small fix
fullstackninja864 Aug 28, 2023
d851a14
gov test fix
fullstackninja864 Aug 28, 2023
a98ef13
updated transferdomain testcse
fullstackninja864 Aug 29, 2023
c3c0e16
Update packages/jellyfish-api-core/__tests__/category/account/transfe…
fullstackninja864 Aug 29, 2023
abd161b
Update packages/jellyfish-api-core/__tests__/category/account/transfe…
fullstackninja864 Aug 29, 2023
aaf170e
minor fix
fullstackninja864 Aug 30, 2023
4e5883e
Merge branch 'harsh/set-gov-transferdomain' of github.com:JellyfishSD…
fullstackninja864 Aug 30, 2023
e7fc70d
removed commet
fullstackninja864 Aug 30, 2023
be50db7
refine and ordering
canonbrother Aug 30, 2023
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
3 changes: 3 additions & 0 deletions apps/playground-api/__tests__/modules/PlaygroundModule.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,9 @@ it('should have gov set', async () => {
'v0/token/18/loan_minting_interest': '3',
'v0/params/feature/icx': 'true',
'v0/params/feature/evm': 'true',
'v0/transferdomain/dvm-evm/dat-enabled': 'true',
'v0/transferdomain/evm-dvm/dat-enabled': 'true',
'v0/transferdomain/evm-dvm/enabled': 'true',
'v0/params/feature/transferdomain': 'true',
'v0/params/foundation/members': [
'bcrt1qyrfrpadwgw7p5eh3e9h3jmu4kwlz4prx73cqny',
Expand Down
3 changes: 3 additions & 0 deletions apps/playground-api/src/setups/setup.gov.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,9 @@ export class SetupGov extends PlaygroundSetup<Record<string, any>> {
'v0/params/feature/evm': 'true',
'v0/params/feature/transferdomain': 'true',
'v0/transferdomain/dvm-evm/enabled': 'true',
'v0/transferdomain/evm-dvm/enabled': 'true',
'v0/transferdomain/dvm-evm/dat-enabled': 'true',
'v0/transferdomain/evm-dvm/dat-enabled': 'true',
'v0/transferdomain/dvm-evm/src-formats': ['p2pkh', 'bech32'],
'v0/transferdomain/dvm-evm/dest-formats': ['erc55'],
'v0/transferdomain/evm-dvm/src-formats': ['erc55'],
Expand Down
2 changes: 1 addition & 1 deletion apps/whale-api/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '3.7'
version: "3.7"

services:
defi-blockchain:
Expand Down
5 changes: 4 additions & 1 deletion packages/jellyfish-api-core/__tests__/category/account/getTokenBalances.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ describe('Account', () => {
'v0/params/feature/evm': 'true',
'v0/params/feature/transferdomain': 'true',
'v0/transferdomain/dvm-evm/enabled': 'true',
'v0/transferdomain/evm-dvm/enabled': 'true',
'v0/transferdomain/dvm-evm/dat-enabled': 'true',
'v0/transferdomain/evm-dvm/dat-enabled': 'true',
'v0/transferdomain/dvm-evm/src-formats': ['p2pkh', 'bech32'],
'v0/transferdomain/dvm-evm/dest-formats': ['erc55'],
'v0/transferdomain/evm-dvm/src-formats': ['erc55'],
Expand All @@ -117,7 +120,7 @@ describe('Account', () => {
})
await container.generate(2)

const dvmAddr = await container.call('getnewaddress', ['', 'bech32'])
const dvmAddr = await container.getNewAddress('dvm', 'legacy')
canonbrother marked this conversation as resolved.
Show resolved Hide resolved
const evmAddr = await container.getNewAddress('erc55', 'erc55')

await container.call('utxostoaccount', [{ [dvmAddr]: '100@0' }])
Expand Down
Loading