Some fixes

dipdup-io · Sep 14, 2022 · 7052a16 · 7052a16
1 parent 84a1445
commit 7052a16
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 5 deletions.
diff --git a/build/dipdup.mainnet.yml b/build/dipdup.mainnet.yml
@@ -11,6 +11,7 @@ metadata:
         - https://ipfs.io
       fallback: ${IPFS_NODE_URI}
       bootstrap:
+        - /dnsaddr/ipfs.infura.io/tcp/5001/https
       timeout: ${IPFS_TIMEOUT:-10}
       delay: 10
     http_timeout: 5

diff --git a/build/dipdup.thumbs.yml b/build/dipdup.thumbs.yml
@@ -11,6 +11,7 @@ metadata:
         - https://ipfs.io
       fallback: ${IPFS_NODE_URI}
       bootstrap:
+        - /dnsaddr/ipfs.infura.io/tcp/5001/https
       timeout: 10
       delay: 10
 

diff --git a/build/dipdup.yml b/build/dipdup.yml
@@ -5,6 +5,7 @@ metadata:
     ipfs:
       dir: /etc/metadata/ipfs
       bootstrap:
+        - /dnsaddr/ipfs.infura.io/tcp/5001/https
       gateways:
         - https://ipfs.infura.io
         - https://dweb.link

diff --git a/cmd/metadata/contract.go b/cmd/metadata/contract.go
@@ -63,7 +63,7 @@ func (indexer *Indexer) resolveContractMetadata(ctx context.Context, cm *models.
 			indexer.logContractMetadata(*cm, "Failed", "warn")
 		}
 	} else {
-		cm.Metadata = helpers.Escape(resolved.Data)
+		// cm.Metadata = helpers.Escape(resolved.Data)
 		if utf8.Valid(cm.Metadata) {
 			cm.Status = models.StatusApplied
 			cm.Error = ""

diff --git a/cmd/metadata/models/contract_metadata.go b/cmd/metadata/models/contract_metadata.go
@@ -26,7 +26,7 @@ type ContractMetadata struct {
 	Link       string `json:"link"`
 	Status     Status `json:"status"`
 	RetryCount int8   `json:"retry_count" pg:",use_zero"`
-	Metadata   JSONB  `json:"metadata,omitempty" pg:",type:jsonb,use_zero"`
+	Metadata   JSONB  `json:"metadata,omitempty" pg:",type:json,use_zero"`
 	Error      string `json:"error,omitempty"`
 }
 

diff --git a/cmd/metadata/models/token_metadata.go b/cmd/metadata/models/token_metadata.go
@@ -27,7 +27,7 @@ type TokenMetadata struct {
 	Network        string          `json:"network" pg:",unique:token"`
 	Contract       string          `json:"contract" pg:",unique:token"`
 	Link           string          `json:"link"`
-	Metadata       JSONB           `json:"metadata,omitempty" pg:",type:jsonb,use_zero"`
+	Metadata       JSONB           `json:"metadata,omitempty" pg:",type:json,use_zero"`
 	RetryCount     int8            `json:"retry_count" pg:",use_zero"`
 	Status         Status          `json:"status"`
 	ImageProcessed bool            `json:"image_processed" pg:",use_zero,notnull"`
@@ -175,7 +175,7 @@ func (tokens *Tokens) Save(metadata []*TokenMetadata) error {
 	savings := make([]*TokenMetadata, 0)
 	has := make(map[string]struct{})
 	for i := len(metadata) - 1; i >= 0; i-- {
-		id := fmt.Sprintf("%s_%d", metadata[i].Contract, metadata[i].TokenID)
+		id := fmt.Sprintf("%s_%s", metadata[i].Contract, metadata[i].TokenID.String())
 		if _, ok := has[id]; !ok {
 			has[id] = struct{}{}
 			savings = append(savings, metadata[i])

diff --git a/cmd/metadata/token.go b/cmd/metadata/token.go
@@ -149,7 +149,7 @@ func (indexer *Indexer) resolveTokenMetadata(ctx context.Context, tm *models.Tok
 			indexer.logTokenMetadata(*tm, "failed", "warn")
 		}
 	} else {
-		resolved.Data = helpers.Escape(resolved.Data)
+		// resolved.Data = helpers.Escape(resolved.Data)
 		if utf8.Valid(resolved.Data) {
 			tm.Status = models.StatusApplied
 			tm.Error = ""