chore: final cleanup

aeternity · Apr 29, 2024 · c20c0f2 · c20c0f2
1 parent 3dd1a5e
commit c20c0f2
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 200 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/.travis.yml b/.travis.yml
diff --git a/aepp/Dockerfile b/aepp/Dockerfile
@@ -18,7 +18,7 @@ COPY --chown=node:node . /home/node/app
 ARG COMMAND
 RUN npm run build:$COMMAND
 
-FROM nginx:1.13.7-alpine
+FROM nginx:alpine
 COPY ./nginx/nginx.conf /etc/nginx/nginx.conf
 COPY ./nginx/default.conf /etc/nginx/conf.d/default.conf
 COPY --from=aepp-build /home/node/app/dist /usr/share/nginx/html
diff --git a/aepp/src/utils/aeternityNetwork.js b/aepp/src/utils/aeternityNetwork.js
@@ -4,7 +4,6 @@ import BlockchainUtil from '../utils/blockchainUtil'
 import config from '../config'
 import GraffitiAuctionACI from '../utils/GraffitiAuctionACI'
 
-const tempCallOptions = {gas: 100000000000};
 
 export const nodes = [
   {name: 'ae_mainnet', instance: new Node(config.nodeUrl.ae_mainnet)},
@@ -17,7 +16,6 @@ const aeternity = {
   height: null,
   networkId: null,
   static: false,
-  tempCallOptions: tempCallOptions,
 }
 
 aeternity.updateHeight = async () => {
@@ -45,6 +43,25 @@ aeternity.initProvider = async () => {
     })
 
     //debugger;
+
+      /*
+    //for out of gas failures consider using something like
+
+    class CustomNode extends Node {
+      sendOperationRequest(args, spec) {
+        if (spec.path === '/v3/dry-run') {
+          spec = {
+            ...spec,
+            path: 'http://localhost:3113/v3/debug/transactions/dry-run',
+          };
+        }
+        return super.sendOperationRequest(args, spec);
+      }
+    }
+
+    // call option:  { gasMax: 6e10 }
+    */
+
     //aeternity.client.api.protectedDryRunTxs = aeternity.client.api.dryRunTxs;
 
     return true

diff --git a/aepp/src/views/Overview.vue b/aepp/src/views/Overview.vue
@@ -154,7 +154,7 @@
             async updateSlots() {
                 try {
 
-                    const slots = await aeternity.contract.all_auction_slots(aeternity.tempCallOptions)
+                    const slots = await aeternity.contract.all_auction_slots()
 
                     const height = await aeternity.height
 

diff --git a/aepp/src/views/Slots.vue b/aepp/src/views/Slots.vue
@@ -189,7 +189,7 @@
         this.choice = this.slots.find(slot => slot.index === realIndex).id
       },
       async updateSlots () {
-        const allSlots = await aeternity.contract.all_auction_slots(aeternity.tempCallOptions)
+        const allSlots = await aeternity.contract.all_auction_slots()
 
         // For rendering purposes
         this.height = await aeternity.updateHeight()

diff --git a/aeternity-nginx.conf b/aeternity-nginx.conf
diff --git a/aeternity.yaml b/aeternity.yaml
diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/server-nginx-cors.conf b/server-nginx-cors.conf
diff --git a/server-nginx.conf b/server-nginx.conf
diff --git a/server/Dockerfile b/server/Dockerfile
@@ -1,13 +1,8 @@
 FROM node:20
 
-RUN apt update
-RUN apt install -y software-properties-common ca-certificates wget curl ssh git python build-essential
-
 WORKDIR /app
 COPY . /app
 
-RUN npm install
+RUN npm ci
 
-RUN apt purge -y software-properties-common ca-certificates wget curl ssh git python build-essential && apt autoremove -y
-ENV OPENSSL_CONF=/dev/null
 CMD ["node", "server.js"]
diff --git a/server/src/blockchain.js b/server/src/blockchain.js
@@ -35,14 +35,32 @@ blockchain.height = async () => {
 blockchain.getMetaData = async () => {
     if (!client) await blockchain.init();
 
-    const response = await contract.get_auction_metadata(tempCallOptions).catch(console.error);
+    const response = await contract.get_auction_metadata().catch(console.error);
     return response.decodedResult
 };
 
 blockchain.auctionSlots = async () => {
     if (!client) await blockchain.init();
 
-    const response = await contract.all_auction_slots(tempCallOptions).catch(console.error);
+    /*
+    //for out of gas failures consider using something like
+
+    class CustomNode extends Node {
+      sendOperationRequest(args, spec) {
+        if (spec.path === '/v3/dry-run') {
+          spec = {
+            ...spec,
+            path: 'http://localhost:3113/v3/debug/transactions/dry-run',
+          };
+        }
+        return super.sendOperationRequest(args, spec);
+      }
+    }
+
+    // call option:  { gasMax: 6e10 }
+    */
+
+    const response = await contract.all_auction_slots().catch(console.error);
     return response.decodedResult;
 };