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

Staging #73

Merged
merged 3 commits into from
Feb 23, 2024
Merged

Staging #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4410a0
fix: add member in workspace and add .env in gitignore
luisburigo Feb 23, 2024
2e3ff2d
fix(defauultvalues): default values by bsafe package
guimroque Feb 23, 2024
08ee926
Merge branch 'staging' of github.com:infinitybase/bsafe-api into staging
guimroque Feb 23, 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
38 changes: 0 additions & 38 deletions .env
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ bsafe/
pnpm-lock.yaml

#env
.env
.env.staging
.env.prod

Expand Down
7 changes: 3 additions & 4 deletions src/modules/workspace/controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import axios from 'axios';
import { Vault, defaultConfig } from 'bsafe';
import { BN, Provider, bn } from 'fuels';
import { parse } from 'path';
import { defaultConfig } from 'bsafe';
import { BN, bn } from 'fuels';

import { Predicate, User } from '@src/models';
import {
Expand Down Expand Up @@ -218,7 +217,7 @@ export class WorkspaceController {
if (!data) {
return await new UserService().create({
address: member,
provider: defaultConfig['provider'],
provider: defaultConfig['PROVIDER'],
avatar: await new UserService().randomAvatar(),
});
}
Expand Down
2 changes: 1 addition & 1 deletion src/modules/workspace/services.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ export class WorkspaceService implements IWorkspaceService {
if (!data) {
return await new UserService().create({
address: member,
provider: defaultConfig['provider'],
provider: defaultConfig['PROVIDER'],
avatar: await new UserService().randomAvatar(),
});
}
Expand Down
8 changes: 4 additions & 4 deletions src/utils/testUtils/Wallet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { defaultConfig, Vault } from 'bsafe';
import { BN, Wallet, Provider } from 'fuels';
import { BN, Wallet, Provider, bn } from 'fuels';

import { assets } from '@src/mocks/assets';

export const txParams = {
gasPrice: defaultConfig.GAS_PRICE,
gasPrice: bn(defaultConfig['GAS_PRICE']),
};

export const sendPredicateCoins = async (
Expand All @@ -15,7 +15,7 @@ export const sendPredicateCoins = async (
) => {
const wallet = Wallet.fromPrivateKey(
rootWallet,
await Provider.create(defaultConfig.PROVIDER),
await Provider.create(defaultConfig['PROVIDER']),
);
// console.log(
// '[ROOT_BALANCE]: ',
Expand All @@ -31,7 +31,7 @@ export const sendPredicateCoins = async (
};

export const signBypK = async (message: string, privateKey: string) => {
const provider = await Provider.create(defaultConfig.PROVIDER);
const provider = await Provider.create(defaultConfig['PROVIDER']);
const signer = Wallet.fromPrivateKey(privateKey, provider);
return signer.signMessage(message);
};
Loading