Skip to content

Commit

Permalink
update fleet and handle breaking changes
Browse files Browse the repository at this point in the history
  • Loading branch information
capt-nemo429 committed Oct 13, 2022
1 parent e353811 commit 332a8fa
Show file tree
Hide file tree
Showing 6 changed files with 68 additions and 86 deletions.
116 changes: 46 additions & 70 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
"typescript": "^4.7.4"
},
"dependencies": {
"@fleet-sdk/core": "^0.1.0-alpha.1",
"@mando75/typeorm-graphql-loader": "^1.7.5",
"@nautilus-js/fleet": "^0.0.5",
"apollo-server": "^3.9.0",
"apollo-server-cache-redis": "^3.3.1",
"apollo-server-plugin-response-cache": "^3.6.1",
Expand Down
14 changes: 9 additions & 5 deletions src/context/box-repository.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Address } from "@nautilus-js/fleet";
import { ErgoAddress } from "@fleet-sdk/core";
import { isEmpty, unionBy } from "lodash";
import { AssetEntity, BoxEntity, HeaderEntity, InputEntity, TokenEntity } from "../entities";
import { removeUndefined } from "../utils";
Expand Down Expand Up @@ -44,13 +44,13 @@ export class BoxRepository extends BaseRepository<BoxEntity> {
}

if (options.where?.address) {
ergoTrees.push(Address.fromBase58(options.where.address).ergoTree);
ergoTrees.push(ErgoAddress.fromBase58(options.where.address).ergoTree);
delete options.where.address;
}

if (addresses) {
for (const address of addresses) {
ergoTrees.push(Address.fromBase58(address).ergoTree);
ergoTrees.push(ErgoAddress.fromBase58(address).ergoTree);
}
}

Expand Down Expand Up @@ -147,7 +147,9 @@ export class BoxRepository extends BaseRepository<BoxEntity> {
.groupBy("box.address")
.setParameters(
removeUndefined({
ergoTrees: options.where.addresses.map((address) => Address.fromBase58(address).ergoTree)
ergoTrees: options.where.addresses.map(
(address) => ErgoAddress.fromBase58(address).ergoTree
)
})
);

Expand Down Expand Up @@ -215,7 +217,9 @@ export class BoxRepository extends BaseRepository<BoxEntity> {
return baseQuery
.setParameters(
removeUndefined({
ergoTrees: options.where.addresses.map((address) => Address.fromBase58(address).ergoTree)
ergoTrees: options.where.addresses.map(
(address) => ErgoAddress.fromBase58(address).ergoTree
)
})
)
.getRawMany();
Expand Down
8 changes: 4 additions & 4 deletions src/context/transactions-repository.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Address } from "@nautilus-js/fleet";
import { ErgoAddress } from "@fleet-sdk/core";
import { MINER_FEE_ERGO_TREE } from "../consts";
import { BoxEntity, InputEntity, TransactionEntity } from "../entities";
import { getArgumentValue } from "../graphql/resolvers/utils";
Expand All @@ -25,14 +25,14 @@ export class TransactionRepository extends BaseRepository<TransactionEntity> {
public override async find(options: TransactionFindOptions): Promise<TransactionEntity[]> {
const { minHeight, maxHeight, address, addresses, transactionIds } = options;
const ergoTrees = addresses
? addresses.map((address) => Address.fromBase58(address).ergoTree)
? addresses.map((address) => ErgoAddress.fromBase58(address).ergoTree)
: [];

return this.findBase(
options,
(filterQuery) => {
if (address) {
ergoTrees.push(Address.fromBase58(address).ergoTree);
ergoTrees.push(ErgoAddress.fromBase58(address).ergoTree);
}
if (ergoTrees.length > 0) {
const inputQuery = this.createInputQuery(maxHeight);
Expand Down Expand Up @@ -120,7 +120,7 @@ export class TransactionRepository extends BaseRepository<TransactionEntity> {
.where(`${this.alias}.mainChain = true`)
.setParameters(
removeUndefined({
ergoTree: Address.fromBase58(options.where.address).ergoTree,
ergoTree: ErgoAddress.fromBase58(options.where.address).ergoTree,
height: options.where.maxHeight
})
)
Expand Down
8 changes: 5 additions & 3 deletions src/context/unconfirmed-box-repository.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Address } from "@nautilus-js/fleet";
import { ErgoAddress } from "@fleet-sdk/core";
import { unionBy } from "lodash";
import {
TokenEntity,
Expand All @@ -21,7 +21,7 @@ export class UnconfirmedBoxRepository extends BaseRepository<UnconfirmedBoxEntit
public override find(options: UnconfirmedBoxFindOptions): Promise<UnconfirmedBoxEntity[]> {
const { tokenId } = options;
if (options.where?.address) {
options.where.ergoTree = Address.fromBase58(options.where.address).ergoTree;
options.where.ergoTree = ErgoAddress.fromBase58(options.where.address).ergoTree;
delete options.where.address;
}

Expand All @@ -48,7 +48,9 @@ export class UnconfirmedBoxRepository extends BaseRepository<UnconfirmedBoxEntit
.andWhere("input.boxId IS NULL")
.groupBy("box.address")
.setParameters({
ergoTrees: options.where.addresses.map((address) => Address.fromBase58(address).ergoTree)
ergoTrees: options.where.addresses.map(
(address) => ErgoAddress.fromBase58(address).ergoTree
)
});

const nanoErgs = options.include.nanoErgs
Expand Down
6 changes: 3 additions & 3 deletions src/context/unconfirmed-transactions-repository.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Address } from "@nautilus-js/fleet";
import { ErgoAddress } from "@fleet-sdk/core";
import {
UnconfirmedBoxEntity,
UnconfirmedInputEntity,
Expand All @@ -23,11 +23,11 @@ export class UnconfirmedTransactionRepository extends BaseRepository<Unconfirmed
): Promise<UnconfirmedTransactionEntity[]> {
const { address, addresses, transactionIds } = options;
const ergoTrees = addresses
? addresses.map((address) => Address.fromBase58(address).ergoTree)
? addresses.map((address) => ErgoAddress.fromBase58(address).ergoTree)
: [];
return this.findBase(options, (filterQuery) => {
if (address) {
ergoTrees.push(Address.fromBase58(address).ergoTree);
ergoTrees.push(ErgoAddress.fromBase58(address).ergoTree);
}

if (ergoTrees.length > 0) {
Expand Down

0 comments on commit 332a8fa

Please sign in to comment.