latest

Author: hicetnunc2000

.serverless/cloudformation-template-update-stack.json

@@ -146,7 +146,7 @@
           "S3Bucket": {
             "Ref": "ServerlessDeploymentBucket"
           },
-          "S3Key": "serverless/hicetnunc-apiv2/dev/1616132797292-2021-03-19T05:46:37.292Z/hicetnunc-apiv2.zip"
+          "S3Key": "serverless/hicetnunc-apiv2/dev/1616180496084-2021-03-19T19:01:36.084Z/hicetnunc-apiv2.zip"
         },
         "FunctionName": "hicetnunc-apiv2-dev-handler",
         "Handler": "index.handler",
@@ -170,14 +170,14 @@
         "HandlerLogGroup"
       ]
     },
-    "HandlerLambdaVersionl43NXxTCsqpysRMWyXSvU0lsarIv6k41EVMGBVAAAI": {
+    "HandlerLambdaVersionxKXiD47XxbV8a0CrQwjITk3MONXyb5JqjEgIyp7EM": {
       "Type": "AWS::Lambda::Version",
       "DeletionPolicy": "Retain",
       "Properties": {
         "FunctionName": {
           "Ref": "HandlerLambdaFunction"
         },
-        "CodeSha256": "yP30UhwdABdpM1UtDvnZ21GW5zg9jII05figW7uS74k="
+        "CodeSha256": "nF8jqb9R6Jwn5BvBH8TIt8EhoKsJFfZyPkF8eSd4WH4="
       }
     },
     "ApiGatewayRestApi": {
@@ -389,7 +389,7 @@
         "MethodResponses": []
       }
     },
-    "ApiGatewayDeployment1616132791720": {
+    "ApiGatewayDeployment1616180485677": {
       "Type": "AWS::ApiGateway::Deployment",
       "Properties": {
         "RestApiId": {
@@ -451,7 +451,7 @@
     "HandlerLambdaFunctionQualifiedArn": {
       "Description": "Current Lambda function version",
       "Value": {
-        "Ref": "HandlerLambdaVersionl43NXxTCsqpysRMWyXSvU0lsarIv6k41EVMGBVAAAI"
+        "Ref": "HandlerLambdaVersionxKXiD47XxbV8a0CrQwjITk3MONXyb5JqjEgIyp7EM"
       }
     },
     "ServiceEndpoint": {

.serverless/hicetnunc-apiv2.zip

@@ -163,7 +163,7 @@
                 "S3Bucket": {
                   "Ref": "ServerlessDeploymentBucket"
                 },
-                "S3Key": "serverless/hicetnunc-apiv2/dev/1616132797292-2021-03-19T05:46:37.292Z/hicetnunc-apiv2.zip"
+                "S3Key": "serverless/hicetnunc-apiv2/dev/1616180496084-2021-03-19T19:01:36.084Z/hicetnunc-apiv2.zip"
               },
               "FunctionName": "hicetnunc-apiv2-dev-handler",
               "Handler": "index.handler",
@@ -187,14 +187,14 @@
               "HandlerLogGroup"
             ]
           },
-          "HandlerLambdaVersionl43NXxTCsqpysRMWyXSvU0lsarIv6k41EVMGBVAAAI": {
+          "HandlerLambdaVersionxKXiD47XxbV8a0CrQwjITk3MONXyb5JqjEgIyp7EM": {
             "Type": "AWS::Lambda::Version",
             "DeletionPolicy": "Retain",
             "Properties": {
               "FunctionName": {
                 "Ref": "HandlerLambdaFunction"
               },
-              "CodeSha256": "yP30UhwdABdpM1UtDvnZ21GW5zg9jII05figW7uS74k="
+              "CodeSha256": "nF8jqb9R6Jwn5BvBH8TIt8EhoKsJFfZyPkF8eSd4WH4="
             }
           },
           "ApiGatewayRestApi": {
@@ -406,7 +406,7 @@
               "MethodResponses": []
             }
           },
-          "ApiGatewayDeployment1616132791720": {
+          "ApiGatewayDeployment1616180485677": {
             "Type": "AWS::ApiGateway::Deployment",
             "Properties": {
               "RestApiId": {
@@ -468,7 +468,7 @@
           "HandlerLambdaFunctionQualifiedArn": {
             "Description": "Current Lambda function version",
             "Value": {
-              "Ref": "HandlerLambdaVersionl43NXxTCsqpysRMWyXSvU0lsarIv6k41EVMGBVAAAI"
+              "Ref": "HandlerLambdaVersionxKXiD47XxbV8a0CrQwjITk3MONXyb5JqjEgIyp7EM"
             }
           },
           "ServiceEndpoint": {
@@ -627,7 +627,7 @@
         "memory": 1024,
         "runtime": "nodejs12.x",
         "vpc": {},
-        "versionLogicalId": "HandlerLambdaVersionl43NXxTCsqpysRMWyXSvU0lsarIv6k41EVMGBVAAAI"
+        "versionLogicalId": "HandlerLambdaVersionxKXiD47XxbV8a0CrQwjITk3MONXyb5JqjEgIyp7EM"
       }
     },
     "configValidationMode": "warn",
@@ -2557,7 +2557,7 @@
           "node_modules/@types/aws-lambda/trigger/sqs.d.ts"
         ],
         "artifact": "/home/crzy/Desktop/programs/lambdas-aws/api-final/new2/hicetnunc-api/.serverless/hicetnunc-apiv2.zip",
-        "artifactDirectoryName": "serverless/hicetnunc-apiv2/dev/1616132797292-2021-03-19T05:46:37.292Z"
+        "artifactDirectoryName": "serverless/hicetnunc-apiv2/dev/1616180496084-2021-03-19T19:01:36.084Z"
       },
       "plugins": {
         "$ref": "$[\"service\"][\"plugins\"]"
@@ -2574,7 +2574,7 @@
     "artifact": "/home/crzy/Desktop/programs/lambdas-aws/api-final/new2/hicetnunc-api/.serverless/hicetnunc-apiv2.zip"
   },
   "package": {
-    "artifactDirectoryName": "serverless/hicetnunc-apiv2/dev/1616132797292-2021-03-19T05:46:37.292Z",
+    "artifactDirectoryName": "serverless/hicetnunc-apiv2/dev/1616180496084-2021-03-19T19:01:36.084Z",
     "artifact": "hicetnunc-apiv2.zip"
   }
 }

.serverless/serverless-state.json

@@ -141,7 +141,6 @@ const getArtisticUniverse = async (max_time) => {
     mintOperationQuery = conseiljs.ConseilQueryBuilder.addFields(mintOperationQuery, 'operation_group_hash');
     mintOperationQuery = conseiljs.ConseilQueryBuilder.addPredicate(mintOperationQuery, 'kind', conseiljs.ConseilOperator.EQ, ['transaction'])
     mintOperationQuery = conseiljs.ConseilQueryBuilder.addPredicate(mintOperationQuery, 'timestamp', conseiljs.ConseilOperator.AFTER, [1612240919000]) // 2021 Feb 1
-    mintOperationQuery = conseiljs.ConseilQueryBuilder.addPredicate(mintOperationQuery, 'timestamp', conseiljs.ConseilOperator.BEFORE, [max_time]) // quantized time (1min)
     mintOperationQuery = conseiljs.ConseilQueryBuilder.addPredicate(mintOperationQuery, 'status', conseiljs.ConseilOperator.EQ, ['applied'])
     mintOperationQuery = conseiljs.ConseilQueryBuilder.addPredicate(mintOperationQuery, 'destination', conseiljs.ConseilOperator.EQ, [mainnet.protocol])
     mintOperationQuery = conseiljs.ConseilQueryBuilder.addPredicate(mintOperationQuery, 'parameters_entrypoints', conseiljs.ConseilOperator.EQ, ['mint_OBJKT'])
@@ -205,14 +204,21 @@ const getArtisticUniverse = async (max_time) => {
     const objectQueries = queryChunks.map(c => makeObjectQuery(c))
 
     let universe = []
-    await Promise.all(objectQueries.map(async (q) => await conseiljs.TezosConseilClient.getTezosEntityData({ url: conseilServer, apiKey: conseilApiKey, network: 'mainnet' }, 'mainnet', 'big_map_contents', q)
-        .then(result => result.map(row => {
-            const objectId = row['value'].toString().replace(/^Pair ([0-9]{1,}) .*/, '$1')
-            const objectUrl = row['value'].toString().replace(/.* 0x([0-9a-z]{1,}) \}$/, '$1')
-            const ipfsHash = Buffer.from(objectUrl, 'hex').toString().slice(7);
-
-            universe.push({ objectId, ipfsHash, minter: artistMap[objectId], swaps: swapMap[objectId] !== undefined ? swapMap[objectId] : []})
-    }))))
+    await Promise.all(
+        objectQueries.map(async (q) =>  {
+            const r = []
+            try {
+                r = await conseiljs.TezosConseilClient.getTezosEntityData({ url: conseilServer, apiKey: conseilApiKey, network: 'mainnet' }, 'mainnet', 'big_map_contents', q)
+                    .then(result => result.map(row => {
+                        const objectId = row['value'].toString().replace(/^Pair ([0-9]{1,}) .*/, '$1')
+                        const objectUrl = row['value'].toString().replace(/.* 0x([0-9a-z]{1,}) \}$/, '$1')
+                        const ipfsHash = Buffer.from(objectUrl, 'hex').toString().slice(7);
+
+                    universe.push({ objectId, ipfsHash, minter: artistMap[objectId], swaps: swapMap[objectId] !== undefined ? swapMap[objectId] : []})
+                    })) // NOTE: it's a work in progress, this will drop failed requests and return a smaller set than expected
+            } finally {
+                return r
+            }}))
 
     return universe
 }

conseilUtil.js

@@ -135,13 +135,13 @@ const customFloor = function (value, roundTo) {
 const ONE_MINUTE_MILLIS = 60 * 1000
 
 
-const getFeed = async (counter, max_time, res) => {
+const getFeed = async (counter, res) => {
 
-    const now_time = Date.now()
+/*     const now_time = Date.now()
     const immutable = (typeof max_time !== 'undefined') && (max_time < now_time)
     max_time = (typeof max_time !== 'undefined') ? max_time : customFloor(now_time, ONE_MINUTE_MILLIS)
-
-    var arr = await conseilUtil.getArtisticUniverse(max_time)
+ */
+    var arr = await conseilUtil.getArtisticUniverse(0)
 
     var feed = offset(desc(arr), counter)
     console.log(feed)
@@ -152,18 +152,18 @@ const getFeed = async (counter, max_time, res) => {
         return e
     })
     //console.log(feed)
-    var cache_time
+ /*    var cache_time
     if (immutable) {
         cache_time = 60 * 10
     }
     else {
         cache_time = (int)(((max_time + ONE_MINUTE_MILLIS) - now_time) / 1000)
-    }
+    } */
     var promise = Promise.all(feed.map(e => e))
     promise.then(async (results) => {
         var aux_arr = results.map(e => e)
 
-        res.set('Cache-Control', `public, max-age=${cache_time}`)
+        //res.set('Cache-Control', `public, max-age=${cache_time}`)
 
         console.log(aux_arr)
         res.json({ result: aux_arr })
@@ -272,14 +272,14 @@ const app = express()
 app.use(express.json())
 app.use(cors({ origin: '*' }))
 
-app.get('/feed', async (req, res) => {
-    var counter = req.query.counter
+app.post('/feed', async (req, res) => {
+/*     var counter = req.query.counter
     var max_time = req.query.hasOwnProperty('time') ? customFloor(req.query.time, ONE_MINUTE_MILLIS) : null
     const now_time_qt = customFloor(Date.now(), ONE_MINUTE_MILLIS)
     if (max_time != null & max_time > now_time_qt) {
         max_time = null
-    }
-    await getFeed(counter, max_time, res)
+    } */
+    await getFeed(req.body.counter, res)
 })
 
 app.post('/tz', async (req, res) => {
@@ -308,8 +308,8 @@ app.post('/hdao', async (req, res) => {
     await hDAOFeed(parseInt(req.body.counter), res)
 })
 
-app.listen(3001)
-//module.exports.handler = serverless(app)
+//app.listen(3001)
+module.exports.handler = serverless(app)
 
 /* const test2 = async () => {
     await axios.get('https://raw.githubusercontent.com/hicetnunc2000/hicetnunc/main/filters/o.json').then(res => console.log(res.data))