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

Dev #448

Merged
merged 42 commits into from
Nov 8, 2024
Merged

Dev #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
daa37fc
feat: okx bridge
zk-robin Nov 6, 2024
132e6c0
Merge pull request #429 from zkLinkProtocol/okxbri2
zk-robin Nov 6, 2024
0cf853e
fix url.
robert-zklink Nov 6, 2024
47350ee
Merge branch 'feat-aibot-2024-11-05' of github.com:zkLinkProtocol/zkl…
robert-zklink Nov 6, 2024
3c67582
Merge branch 'dev' into feat-aibot-2024-11-05
robert-zklink Nov 6, 2024
0dce1a7
Merge pull request #430 from zkLinkProtocol/feat-aibot-2024-11-05
robert-zklink Nov 6, 2024
0569b25
fix bridge result
zk-robin Nov 6, 2024
cc987eb
Merge pull request #431 from zkLinkProtocol/bridge3
zk-robin Nov 6, 2024
db36c12
add btn index.
robert-zklink Nov 6, 2024
50bd5f0
Merge branch 'dev' into feat-addBtnIndex-2024-11-05
robert-zklink Nov 6, 2024
9d91768
Merge pull request #433 from zkLinkProtocol/feat-addBtnIndex-2024-11-05
robert-zklink Nov 6, 2024
9315e7a
Merge branch 'dev' into feat-recover
robert-zklink Nov 7, 2024
1330d34
Merge pull request #435 from zkLinkProtocol/feat-recover
robert-zklink Nov 7, 2024
e42a0fc
feat: add dx.fun
zk-robin Nov 7, 2024
c704093
Merge branch 'dev' into dxfun
zk-robin Nov 7, 2024
79d14e4
Merge pull request #437 from zkLinkProtocol/dxfun
zk-robin Nov 7, 2024
700e747
remove unused code
zk-robin Nov 7, 2024
4e89ea9
fix: add buy me coffee display info
xsteadybcgo Nov 7, 2024
4e1ccef
Merge pull request #438 from zkLinkProtocol/rmde
zk-robin Nov 7, 2024
fd74c76
recover magicNews
robert-zklink Nov 7, 2024
a0cb128
Merge branch 'feat-recover' of github.com:zkLinkProtocol/zklink-inten…
robert-zklink Nov 7, 2024
ba8663f
Merge branch 'dev' into feat-recover
robert-zklink Nov 7, 2024
bc3bee9
Merge pull request #439 from zkLinkProtocol/feat-recover
robert-zklink Nov 7, 2024
dea24e2
fix: dx.fun transaction
zk-robin Nov 7, 2024
d2387a9
Merge pull request #440 from zkLinkProtocol/dxfunV2
zk-robin Nov 7, 2024
b2baf9e
fix: fix bigint amount
zk-robin Nov 7, 2024
cddcd14
Merge pull request #441 from zkLinkProtocol/fixfun
zk-robin Nov 7, 2024
e7819d7
fix: add shredContent in record
xsteadybcgo Nov 7, 2024
5514619
fix: invoke createfun
zk-robin Nov 7, 2024
bc8a18d
Merge pull request #442 from zkLinkProtocol/dxfunV3
zk-robin Nov 7, 2024
077acc3
fix: query records by statuses
xsteadybcgo Nov 7, 2024
2ddd71b
Merge branch 'dev' into fix-some-review-issue
xsteadybcgo Nov 7, 2024
eb94662
Merge pull request #443 from zkLinkProtocol/fix-some-review-issue
xsteadybcgo Nov 7, 2024
92969cc
feat: dx.fun add mint fee
zk-robin Nov 7, 2024
bc1abe5
Merge pull request #444 from zkLinkProtocol/funfee
zk-robin Nov 7, 2024
cfba8a8
commission address transfer
robert-zklink Nov 7, 2024
dbc4950
fix.
robert-zklink Nov 7, 2024
d4cb5f1
fix
robert-zklink Nov 7, 2024
14f6ab7
Merge pull request #446 from zkLinkProtocol/feat-commissionTransfer-2…
robert-zklink Nov 7, 2024
fbae23e
fix can not find intention by code.
robert-zklink Nov 7, 2024
729d3f1
Merge branch 'dev' into feat-commissionTransfer-2024-11-07
robert-zklink Nov 7, 2024
86598b8
Merge pull request #447 from zkLinkProtocol/feat-commissionTransfer-2…
robert-zklink Nov 7, 2024
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
Binary file added assets/logos/dx-fun.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/logos/okx-bridge.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 12 additions & 1 deletion libs/buy-me-a-coffee/src/buy-me-a-coffee.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,18 @@ export class BuyMeACoffeeService extends ActionDto<FieldTypes> {
},
];
}
return { transactions: [tx] };
return {
transactions: [tx],
displayInfo: {
tokens: [
{
tokenAddress: token,
amount: value,
direction: 'from',
},
],
},
};
}

public async reloadAdvancedInfo(
Expand Down
14 changes: 14 additions & 0 deletions libs/dx-fun/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "dx-fun",
"version": "1.0.0",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "",
"license": "ISC",
"description": "",
"dependencies": {
"ethers": "^6.13.2"
}
}
Loading
Loading