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

Development to main #1078

Merged
merged 2 commits into from
Sep 11, 2024
Merged

Development to main #1078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
930dc3f
Update npm packages
danielailie Aug 28, 2024
56eaf98
Merge pull request #1077 from multiversx/TOOL-235-update-multiversx-s…
danielailie Aug 29, 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
11,957 changes: 8,049 additions & 3,908 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@
"@aws-sdk/lib-storage": "^3.438.0",
"@elastic/elasticsearch": "7.12.0",
"@golevelup/nestjs-rabbitmq": "4.0.0",
"@multiversx/sdk-core": "12.14.0",
"@multiversx/sdk-native-auth-server": "1.0.7",
"@multiversx/sdk-nestjs-cache": "3.4.1",
"@multiversx/sdk-nestjs-common": "3.4.1",
"@multiversx/sdk-nestjs-elastic": "3.4.1",
"@multiversx/sdk-nestjs-http": "3.4.1",
"@multiversx/sdk-nestjs-monitoring": "3.4.1",
"@multiversx/sdk-nestjs-redis": "3.4.1",
"@multiversx/sdk-network-providers": "^1.2.1",
"@multiversx/sdk-core": "13.4.2",
"@multiversx/sdk-native-auth-server": "1.0.19",
"@multiversx/sdk-nestjs-cache": "3.7.2",
"@multiversx/sdk-nestjs-common": "3.7.2",
"@multiversx/sdk-nestjs-elastic": "3.7.2",
"@multiversx/sdk-nestjs-http": "3.7.2",
"@multiversx/sdk-nestjs-monitoring": "3.7.2",
"@multiversx/sdk-nestjs-redis": "3.7.2",
"@multiversx/sdk-network-providers": "2.7.0",
"@nestjs/apollo": "12.0.7",
"@nestjs/common": "10.2.4",
"@nestjs/config": "3.0.1",
Expand All @@ -57,17 +57,17 @@
"@nestjs/microservices": "10.2.4",
"@nestjs/mongoose": "10.0.1",
"@nestjs/passport": "10.0.1",
"@nestjs/platform-express": "10.2.4",
"@nestjs/platform-express": "10.3.5",
"@nestjs/schedule": "3.0.3",
"@nestjs/typeorm": "10.0.0",
"@types/cache-manager": "3.4.0",
"agentkeepalive": "4.2.1",
"amqp-connection-manager": "3.7.0",
"amqplib": "0.8.0",
"axios": "0.21.4",
"axios-retry": "3.1.8",
"axios": "1.7.4",
"axios-retry": "4.5.0",
"bignumber.js": "9.0.1",
"clarifai-nodejs-grpc": "8.0.0",
"clarifai-nodejs-grpc": "10.7.2",
"class-transformer": "0.4.0",
"class-validator": "0.14.0",
"config": "3.3.6",
Expand All @@ -85,7 +85,7 @@
"jwks-rsa": "2.0.3",
"moment": "^2.29.4",
"mongoose": "7.5.0",
"mysql2": "2.2.5",
"mysql2": "3.9.8",
"nest-winston": "1.9.4",
"object-hash": "2.2.0",
"passport": "0.6.0",
Expand Down
8 changes: 4 additions & 4 deletions src/common/services/mx-communication/mx-api.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ export class MxApiService {
};
const httpAgent = new Agent(keepAliveOptions);
const httpsAgent = new Agent.HttpsAgent(keepAliveOptions);

this.apiProvider = new ApiNetworkProvider(process.env.ELROND_API, {
timeout: mxConfig.proxyTimeout,
httpAgent: mxConfig.keepAlive ? httpAgent : null,
httpsAgent: mxConfig.keepAlive ? httpsAgent : null,
headers: {
origin: 'NftService',
},
clientName: "nft-service",
});
}

Expand Down Expand Up @@ -394,9 +394,9 @@ export class MxApiService {
const token = await this.doGetGeneric(this.getTokenData.name, `tokens/${tokenId}?fields=identifier,name,ticker,decimals,price`);
return token
? new Token({
...token,
symbol: token.ticker,
})
...token,
symbol: token.ticker,
})
: undefined;
}

Expand Down
1 change: 1 addition & 0 deletions src/common/services/mx-communication/mx-private-api.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export class MxPrivateApiService {
headers: {
origin: 'NftService',
},
clientName: "nft-service",
});
}

Expand Down
1 change: 1 addition & 0 deletions src/common/services/mx-communication/mx-proxy.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export class MxProxyService {
timeout: parseInt(process.env.KEEPALIVE_TIMEOUT_DOWNSTREAM),
httpAgent: mxConfig.keepAlive ? httpAgent : null,
httpsAgent: mxConfig.keepAlive ? httpsAgent : null,
clientName: "nft-service"
});
}

Expand Down
12 changes: 6 additions & 6 deletions src/modules/assets/tests/assets-transaction.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ describe('Assets Transaction Service', () => {
sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
signature: undefined,
value: '0',
version: 1,
version: 2,
};

it('returns built transaction with right arguments', async () => {
Expand Down Expand Up @@ -107,7 +107,7 @@ describe('Assets Transaction Service', () => {
sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
signature: undefined,
value: '0',
version: 1,
version: 2,
};

const result = await service.burnQuantity(ownerAddress, burnRequest);
Expand Down Expand Up @@ -149,7 +149,7 @@ describe('Assets Transaction Service', () => {
sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
signature: undefined,
value: '0',
version: 1,
version: 2,
};

const result = await service.burnQuantity(ownerAddress, burnRequest);
Expand All @@ -170,7 +170,7 @@ describe('Assets Transaction Service', () => {
sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
signature: undefined,
value: '0',
version: 1,
version: 2,
};

const result = await service.transferNft(
Expand All @@ -195,7 +195,7 @@ describe('Assets Transaction Service', () => {
sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
signature: undefined,
value: '0',
version: 1,
version: 2,
};

const result = await service.transferNft(
Expand Down Expand Up @@ -231,7 +231,7 @@ describe('Assets Transaction Service', () => {
sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
signature: undefined,
value: '0',
version: 1,
version: 2,
};

const result = await service.createNft(
Expand Down
26 changes: 13 additions & 13 deletions src/modules/auctions/tests/nft-marketplace.abi.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ describe('Nft Marketplace Abi Service', () => {
sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
signature: undefined,
value: '0',
version: 1,
version: 2,
};

it('returns built transaction with right arguments', async () => {
Expand Down Expand Up @@ -147,7 +147,7 @@ describe('Nft Marketplace Abi Service', () => {
sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
signature: undefined,
value: '0',
version: 1,
version: 2,
};
const result = await service.createAuction(ownerAddress, {
...createAuctionRequestWithEgld,
Expand Down Expand Up @@ -201,7 +201,7 @@ describe('Nft Marketplace Abi Service', () => {
sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
signature: undefined,
value: '111111111111111',
version: 1,
version: 2,
};

const result = await service.bid(ownerAddress, inputWithEgld);
Expand All @@ -226,7 +226,7 @@ describe('Nft Marketplace Abi Service', () => {
sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
signature: undefined,
value: '0',
version: 1,
version: 2,
};

const result = await service.bid(ownerAddress, inputWithEsdt);
Expand Down Expand Up @@ -264,7 +264,7 @@ describe('Nft Marketplace Abi Service', () => {
sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
signature: undefined,
value: '0',
version: 1,
version: 2,
};

const result = await service.withdraw('erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha', 1);
Expand Down Expand Up @@ -318,7 +318,7 @@ describe('Nft Marketplace Abi Service', () => {
sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
signature: undefined,
value: '111111111111111',
version: 1,
version: 2,
};

const result = await service.createOffer(ownerAddress, createOfferRequest);
Expand All @@ -343,7 +343,7 @@ describe('Nft Marketplace Abi Service', () => {
sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
signature: undefined,
value: '0',
version: 1,
version: 2,
};

const result = await service.createOffer(
Expand Down Expand Up @@ -392,7 +392,7 @@ describe('Nft Marketplace Abi Service', () => {
sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
signature: undefined,
value: '0',
version: 1,
version: 2,
};

const result = await service.withdrawOffer('erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha', 1);
Expand Down Expand Up @@ -478,7 +478,7 @@ describe('Nft Marketplace Abi Service', () => {
sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
signature: undefined,
value: '0',
version: 1,
version: 2,
};

const result = await service.acceptOffer(ownerAddress, acceptOfferWithoutAuction);
Expand Down Expand Up @@ -560,7 +560,7 @@ describe('Nft Marketplace Abi Service', () => {
sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
signature: undefined,
value: '0',
version: 1,
version: 2,
};

const result = await service.acceptOffer(ownerAddress, acceptOfferWithAuctionId);
Expand Down Expand Up @@ -588,7 +588,7 @@ describe('Nft Marketplace Abi Service', () => {
sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
signature: undefined,
value: '0',
version: 1,
version: 2,
};

const result = await service.endAuction('erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha', 1);
Expand Down Expand Up @@ -635,7 +635,7 @@ describe('Nft Marketplace Abi Service', () => {
sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
signature: undefined,
value: '1111111',
version: 1,
version: 2,
};

const result = await service.buySft(ownerAddress, buySftRequestWithEgld);
Expand All @@ -661,7 +661,7 @@ describe('Nft Marketplace Abi Service', () => {
sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
signature: undefined,
value: '0',
version: 1,
version: 2,
};

const result = await service.buySft(ownerAddress, {
Expand Down
6 changes: 3 additions & 3 deletions src/modules/campaigns/tests/nft-minter.abi.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ describe('Nft Minter Abi Service', () => {
sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
signature: undefined,
value: '50000000000000000',
version: 1,
version: 2,
};
expect(result).toMatchObject(expectedResult);
});
Expand All @@ -78,7 +78,7 @@ describe('Nft Minter Abi Service', () => {
sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
signature: undefined,
value: '10000000',
version: 1,
version: 2,
};

const result = await service.buyRandomNft(
Expand Down Expand Up @@ -117,7 +117,7 @@ describe('Nft Minter Abi Service', () => {
sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
signature: undefined,
value: '0',
version: 1,
version: 2,
};

expect(result).toMatchObject(expectedResult);
Expand Down
6 changes: 3 additions & 3 deletions src/modules/minters/tests/minters-deployer.abi.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ describe('Minters Deployer Abi Service', () => {
sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
signature: undefined,
value: '0',
version: 1,
version: 2,
};
expect(result).toMatchObject(expectedResult);
});
Expand All @@ -66,7 +66,7 @@ describe('Minters Deployer Abi Service', () => {
sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
signature: undefined,
value: '0',
version: 1,
version: 2,
};

const result = await service.pauseNftMinter(
Expand Down Expand Up @@ -95,7 +95,7 @@ describe('Minters Deployer Abi Service', () => {
sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
signature: undefined,
value: '0',
version: 1,
version: 2,
};

expect(result).toMatchObject(expectedResult);
Expand Down
10 changes: 5 additions & 5 deletions src/modules/nftCollections/tests/collections-transactions.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ describe('Collections Transactions Service', () => {
sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
signature: undefined,
value: '50000000000000000',
version: 1,
version: 2,
};

const result = await service.issueToken(
Expand Down Expand Up @@ -61,7 +61,7 @@ describe('Collections Transactions Service', () => {
sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
signature: undefined,
value: '50000000000000000',
version: 1,
version: 2,
};

const result = await service.issueToken(
Expand Down Expand Up @@ -92,7 +92,7 @@ describe('Collections Transactions Service', () => {
sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
signature: undefined,
value: '0',
version: 1,
version: 2,
};

const result = await service.stopNFTCreate(
Expand All @@ -119,7 +119,7 @@ describe('Collections Transactions Service', () => {
sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
signature: undefined,
value: '0',
version: 1,
version: 2,
};

const result = await service.transferNFTCreateRole(
Expand Down Expand Up @@ -147,7 +147,7 @@ describe('Collections Transactions Service', () => {
sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
signature: undefined,
value: '0',
version: 1,
version: 2,
};

const result = await service.setNftRoles(
Expand Down
Loading
Loading