Skip to content

Commit

Permalink
Merge pull request #759 from EYBlockchain/westlad/pausable
Browse files Browse the repository at this point in the history
Implement admin container and pausable contracts
  • Loading branch information
Ilyas Ridhuan authored Jun 20, 2022
2 parents 17eedb8 + 958e3c9 commit 0bbb499
Show file tree
Hide file tree
Showing 30 changed files with 7,233 additions and 115 deletions.
24 changes: 24 additions & 0 deletions admin.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
FROM node:14.17

WORKDIR /app
COPY common-files common-files
COPY cli cli
WORKDIR /app/common-files
RUN npm ci
WORKDIR /app/cli
RUN npm ci

WORKDIR /app/admin
COPY config/default.js config/default.js
RUN apt-get update -y
RUN apt-get install -y netcat-openbsd
COPY nightfall-administrator/src src
COPY nightfall-administrator/docker-entrypoint.sh nightfall-administrator/package*.json nightfall-administrator/admin ./

# websocket port 8080
# EXPOSE 8080

RUN npm ci
ENTRYPOINT ["/app/admin/docker-entrypoint.sh"]

CMD ["sleep", "infinity"]
14 changes: 8 additions & 6 deletions cli/lib/nf3.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -295,12 +295,12 @@ class Nf3 {
}

/**
Determines if a Nightfall_3 server is running and healthy.
@method
@async
@param {string} server - The name of the server being checked ['client', 'optimist']
@returns {Promise} This will resolve into a boolean - true if the healthcheck passed.
*/
Determines if a Nightfall_3 server is running and healthy.
@method
@async
@param {string} server - The name of the server being checked ['client', 'optimist']
@returns {Promise} This will resolve into a boolean - true if the healthcheck passed.
*/
async healthcheck(server) {
let url;
switch (server) {
Expand Down Expand Up @@ -380,6 +380,7 @@ class Nf3 {
!!this.ethereumSigningKey,
);
} catch (err) {
logger.error(`Approve transaction failed`);
throw new Error(err);
}
if (txDataToSign) {
Expand All @@ -406,6 +407,7 @@ class Nf3 {
);
resolve(receipt);
} catch (err) {
logger.error('Deposit transaction failed');
reject(err);
}
});
Expand Down
Loading

0 comments on commit 0bbb499

Please sign in to comment.