From 8e29ae7372de07c5eba9ea8ecf29af26e1dbcfac Mon Sep 17 00:00:00 2001 From: nikdementev Date: Thu, 10 Jun 2021 14:39:00 +0300 Subject: [PATCH] fix: deploy & instances map --- mustache/templates/instance/create-yaml.js | 2 +- package.json | 4 ++-- src/contractsToInstances.ts | 16 ++++++++-------- src/mapping-echo-account.ts | 2 +- src/mapping-encrypted-note.ts | 2 +- src/mapping-instance.ts | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/mustache/templates/instance/create-yaml.js b/mustache/templates/instance/create-yaml.js index 276685c..2cab543 100644 --- a/mustache/templates/instance/create-yaml.js +++ b/mustache/templates/instance/create-yaml.js @@ -39,7 +39,7 @@ module.exports = { Contracts.forEach(({ address, name, amount, currency }) => { if (address != null) { - contractsToInstancesContent += `contractsToInstances.set("${address.toLowerCase()}",${space}//${space}${name}-${currency}-${amount}${newLine}${doubleSpace}"${amount}${'-'}${currency}"${newLine});${newLine}`; + contractsToInstancesContent += `contractsToInstances.set("${address.toLowerCase()}",${space}//${space}${name}-${currency}-${amount}${newLine}${doubleSpace}"${currency}${'-'}${amount}"${newLine});${newLine}`; } }); diff --git a/package.json b/package.json index c2a461e..c331f2b 100644 --- a/package.json +++ b/package.json @@ -9,8 +9,8 @@ "codegen:tornado": "yarn yaml:tornado && yarn codegen -- subgraphs/tornado-subgraph.yaml", "build": "graph build", "build:tornado": "graph build subgraphs/tornado-subgraph.yaml", - "deploy": "graph deploy --node https://api.thegraph.com/deploy/ --ipfs https://api.thegraph.com/ipfs/ $(echo $(cat .env))", - "deploy:tornado": "yarn deploy -- tornadocash/bsc-tornado-subgraph subgraphs/tornado-subgraph.yaml" + "deploy": "graph deploy --node https://api.thegraph.com/deploy/ --ipfs https://api.thegraph.com/ipfs/ --access-token TOKEN", + "deploy:tornado": "yarn deploy -- 0xzick/bsc-sub-graph subgraphs/tornado-subgraph.yaml" }, "dependencies": { "@graphprotocol/graph-cli": "0.20.0", diff --git a/src/contractsToInstances.ts b/src/contractsToInstances.ts index a48e41b..6765b4a 100644 --- a/src/contractsToInstances.ts +++ b/src/contractsToInstances.ts @@ -1,19 +1,19 @@ // this is a read only file generated by manual inputs to file mustache/templates/rates/contracts.js. export let contractsToInstances = new Map(); contractsToInstances.set( - '0x84443cfd09a48af6ef360c6976c5392ac5023a1f', // Instance-bnb-0.1 - '0.1-bnb', + '0x84443cfd09a48af6ef360c6976c5392ac5023a1f', // Instance-bnb-0.1 + 'bnb-0.1', ); contractsToInstances.set( - '0xd47438c816c9e7f2e2888e060936a499af9582b3', // Instance-bnb-1 - '1-bnb', + '0xd47438c816c9e7f2e2888e060936a499af9582b3', // Instance-bnb-1 + 'bnb-1', ); contractsToInstances.set( - '0x330bdfade01ee9bf63c209ee33102dd334618e0a', // Instance-bnb-10 - '10-bnb', + '0x330bdfade01ee9bf63c209ee33102dd334618e0a', // Instance-bnb-10 + 'bnb-10', ); contractsToInstances.set( - '0x1e34a77868e19a6647b1f2f47b51ed72dede95dd', // Instance-bnb-100 - '100-bnb', + '0x1e34a77868e19a6647b1f2f47b51ed72dede95dd', // Instance-bnb-100 + 'bnb-100', ); // this is a read only file generated by manual inputs to file mustache/templates/rates/contracts.js. diff --git a/src/mapping-echo-account.ts b/src/mapping-echo-account.ts index e45dea4..ab34f85 100644 --- a/src/mapping-echo-account.ts +++ b/src/mapping-echo-account.ts @@ -1,4 +1,4 @@ -import { Echo } from '../generated'; +import { Echo } from '../generated/Echoer/Echoer'; import { NoteAccount as NoteAccountEntity } from '../generated/schema'; export function handleEcho(event: Echo): void { diff --git a/src/mapping-encrypted-note.ts b/src/mapping-encrypted-note.ts index e5d0689..acb89e6 100644 --- a/src/mapping-encrypted-note.ts +++ b/src/mapping-encrypted-note.ts @@ -1,4 +1,4 @@ -import { EncryptedNote } from '../generated'; +import { EncryptedNote } from '../generated/Proxy/Proxy'; import { EncryptedNote as EncryptedNoteEntity } from '../generated/schema'; export function handleEncryptedNote(event: EncryptedNote): void { diff --git a/src/mapping-instance.ts b/src/mapping-instance.ts index 36912f8..82a1454 100644 --- a/src/mapping-instance.ts +++ b/src/mapping-instance.ts @@ -1,4 +1,4 @@ -import { Withdrawal, Deposit } from '../generated'; +import { Withdrawal, Deposit } from '../generated/Instance-1-bnb/Instance'; import { Withdrawal as WithdrawalEntity, Deposit as DepositEntity } from '../generated/schema'; import { contractsToInstances } from './contractsToInstances';