From d0165b1f4a7b96880ad5d1332ea12245f219bf10 Mon Sep 17 00:00:00 2001 From: "fateme.r" Date: Sat, 19 Oct 2024 15:02:06 +0330 Subject: [PATCH 1/2] Add eRSN token info to database and apis --- .changeset/empty-ladybugs-attack.md | 5 +++++ src/api/address.ts | 3 +++ src/jobs/tokenName.ts | 1 + 3 files changed, 9 insertions(+) create mode 100644 .changeset/empty-ladybugs-attack.md diff --git a/.changeset/empty-ladybugs-attack.md b/.changeset/empty-ladybugs-attack.md new file mode 100644 index 0000000..d8b561d --- /dev/null +++ b/.changeset/empty-ladybugs-attack.md @@ -0,0 +1,5 @@ +--- +'@rosen-bridge/watcher': patch +--- + +Add eRSN token info to assets and revenue apis diff --git a/src/api/address.ts b/src/api/address.ts index 18080e4..6fef651 100644 --- a/src/api/address.ts +++ b/src/api/address.ts @@ -41,6 +41,9 @@ addressRouter.get('/assets', async (req: Request, res: Response) => { if (!tokens.some((item) => item.tokenId === getConfig().rosen.RSN)) { tokens.push({ amount: 0n, tokenId: getConfig().rosen.RSN }); } + if (!tokens.some((item) => item.tokenId === getConfig().rosen.eRSN)) { + tokens.push({ amount: 0n, tokenId: getConfig().rosen.eRSN }); + } tokens = await ErgoUtils.fillTokensDetails(tokens); tokens.push({ amount: balance.nanoErgs, diff --git a/src/jobs/tokenName.ts b/src/jobs/tokenName.ts index 86c1283..057e074 100644 --- a/src/jobs/tokenName.ts +++ b/src/jobs/tokenName.ts @@ -32,6 +32,7 @@ export const tokenNameJobFunction = async ( const boxesTokenIds = ErgoUtils.getBoxAssetsSum(newErgoBoxes).map( (token) => token.tokenId ); + boxesTokenIds.push(getConfig().rosen.eRSN); const tokensInfo = await watcherDatabase.getTokenEntity(boxesTokenIds); const tokensInfoMap = new Map(); tokensInfo.forEach((token) => { From e84d1d852e05b2358e13f2c6d1e7cfae5b6ea5cc Mon Sep 17 00:00:00 2001 From: "fateme.r" Date: Sat, 19 Oct 2024 15:43:28 +0330 Subject: [PATCH 2/2] Fix related unit tests --- tests/config/contracts-ergo-mainnet.json | 1 + tests/database/mockedData.ts | 2 ++ tests/database/watcherDatabase.ts | 1 + 3 files changed, 4 insertions(+) diff --git a/tests/config/contracts-ergo-mainnet.json b/tests/config/contracts-ergo-mainnet.json index bb64a91..99a39df 100644 --- a/tests/config/contracts-ergo-mainnet.json +++ b/tests/config/contracts-ergo-mainnet.json @@ -17,6 +17,7 @@ "RepoNFT": "a29d9bb0d622eb8b4f83a34c4ab1b7d3f18aaaabc3aa6876912a3ebaf0da1018", "GuardNFT": "a6ac381e6fa99929fd1477b3ba9499790a775e91d4c14c5aa86e9a118dfac853", "RSN": "a2a6c892c38d508a659caf857dbe29da4343371e597efd42e40f9bc99099a516", + "ERSN": "a2a6c892c38d508a659caf857dbe29da4343371e597efd42e40f9bc99099a516", "RSNRatioNFT": "c597eac4db28f62419eab5639122f2bc4955dfedf958e7cdba5248ba2a81210a", "CleanupNFT": "5b81c74b04b7eed17bd1e3d37c990003183601951f22a3360a8bc5c848a32006", "RWTId": "497287b9a1eff643791277744a74b7d598b834dc613f2ebc972e33767c61ac2b", diff --git a/tests/database/mockedData.ts b/tests/database/mockedData.ts index 30188bb..538371b 100644 --- a/tests/database/mockedData.ts +++ b/tests/database/mockedData.ts @@ -738,6 +738,8 @@ export const generalInfo = { address: '9eYicprScbobMdmWYRHwbYiM3g19EQ3iAK24FconvXFVfaEooVH', rsnTokenId: 'a2a6c892c38d508a659caf857dbe29da4343371e597efd42e40f9bc99099a516', + eRsnTokenId: + 'a2a6c892c38d508a659caf857dbe29da4343371e597efd42e40f9bc99099a516', collateral: { erg: 20, rsn: 10, diff --git a/tests/database/watcherDatabase.ts b/tests/database/watcherDatabase.ts index 581055b..b0ddb1a 100644 --- a/tests/database/watcherDatabase.ts +++ b/tests/database/watcherDatabase.ts @@ -208,6 +208,7 @@ export const fillORM = async ( firstPermit, secondPermit, ]); + await ORM.tokenRepo.save(validRSNTokenRecord); const UTXOArray = [plainBox, spentPlainBox]; if (pushExtraUtxo) UTXOArray.push(addressValidBox); await ORM.boxRepo.save(UTXOArray);