Merge pull request #68 from push-protocol/init-did-support

fix: added support for init did

.eslintignore

@@ -1,4 +1,5 @@
 node_modules
 public
 build
-dist
+dist
+# *.ts

.prettierignore

@@ -1,4 +1,5 @@
 node_modules
 public
 build
-dist
+dist
+# *.ts

Dockerfile

@@ -1,31 +1,19 @@
-FROM node:20.9.0
-WORKDIR /app
-COPY . .
+FROM node:20.9.0 as builder
+COPY ./package.json ./yarn.lock ./
+# RUN yarn install --immutable --production
 RUN yarn install
+
+
+FROM node:20.9.0 as runner
+
+# Copy in all the dependencies we need, by avoiding
+# installing them in this stage, we prevent Yarn
+# from including additional cache files, which
+# yields a slimmer image.
+COPY                ./package.json  ./
+COPY --from=builder ./node_modules/ ./node_modules/
+COPY . .
 EXPOSE 3001
 EXPOSE 3002
 EXPOSE 3003
-CMD ["yarn", "start"]
-
-# todo find an error here ; probably a package json is not copied
-# todo discuss what is the best way to build the container
-#FROM node:20.9.0
-#
-#WORKDIR /app
-#
-## Copy package.json and yarn.lock first
-#COPY yarn.lock ./
-#
-## Install dependencies
-#RUN yarn install
-#
-## Copy the rest of the application files
-#COPY . .
-#
-## Expose ports
-#EXPOSE 3001
-#EXPOSE 3002
-#EXPOSE 3003
-#
-## Start the application
-#CMD ["yarn", "start"]
+CMD ["yarn", "start"]

package.json

@@ -51,6 +51,7 @@
   },
   "homepage": "https://github.com/push-protocol/push-snode#readme",
   "dependencies": {
+    "@solana/web3.js": "^1.95.3",
     "axios": "^1.2.0",
     "chai": "^4.3.6",
     "chalk": "^4.1.2",
@@ -68,9 +69,11 @@
     "pg-promise": "^10.12.0",
     "redis": "^4.6.15",
     "reflect-metadata": "^0.1.12",
+    "starknet": "^6.11.0",
     "ts-luxon": "^4.0.1",
     "ts-proto": "^2.0.3",
     "ts-protoc-gen": "^0.15.0",
+    "tweetnacl": "^1.0.3",
     "typedi": "^0.8.0",
     "typescript": "^4.5.4",
     "uuid": "^10.0.0",

src/generated/push/v1/block_pb.d.ts → src/generated/push/block_pb.d.ts

@@ -1,5 +1,5 @@
 // package: push
-// file: push/v1/block.proto
+// file: push/block.proto
 
 import * as jspb from 'google-protobuf'
 
@@ -171,7 +171,7 @@ export namespace Block {
   }
 }
 
-export class AttestorReply extends jspb.Message {
+export class AttestBlockResult extends jspb.Message {
   clearAttestordataList(): void
   getAttestordataList(): Array<TxAttestorData>
   setAttestordataList(value: Array<TxAttestorData>): void
@@ -183,47 +183,133 @@ export class AttestorReply extends jspb.Message {
   setSigner(value?: Signer): void
 
   serializeBinary(): Uint8Array
-  toObject(includeInstance?: boolean): AttestorReply.AsObject
-  static toObject(includeInstance: boolean, msg: AttestorReply): AttestorReply.AsObject
+  toObject(includeInstance?: boolean): AttestBlockResult.AsObject
+  static toObject(includeInstance: boolean, msg: AttestBlockResult): AttestBlockResult.AsObject
   static extensions: { [key: number]: jspb.ExtensionFieldInfo<jspb.Message> }
   static extensionsBinary: { [key: number]: jspb.ExtensionFieldBinaryInfo<jspb.Message> }
-  static serializeBinaryToWriter(message: AttestorReply, writer: jspb.BinaryWriter): void
-  static deserializeBinary(bytes: Uint8Array): AttestorReply
+  static serializeBinaryToWriter(message: AttestBlockResult, writer: jspb.BinaryWriter): void
+  static deserializeBinary(bytes: Uint8Array): AttestBlockResult
   static deserializeBinaryFromReader(
-    message: AttestorReply,
+    message: AttestBlockResult,
     reader: jspb.BinaryReader
-  ): AttestorReply
+  ): AttestBlockResult
 }
 
-export namespace AttestorReply {
+export namespace AttestBlockResult {
   export type AsObject = {
     attestordataList: Array<TxAttestorData.AsObject>
     signer?: Signer.AsObject
   }
 }
 
-export class AttestorReplies extends jspb.Message {
+export class AttestSignaturesRequest extends jspb.Message {
   clearAttestationsList(): void
-  getAttestationsList(): Array<AttestorReply>
-  setAttestationsList(value: Array<AttestorReply>): void
-  addAttestations(value?: AttestorReply, index?: number): AttestorReply
+  getAttestationsList(): Array<AttestBlockResult>
+  setAttestationsList(value: Array<AttestBlockResult>): void
+  addAttestations(value?: AttestBlockResult, index?: number): AttestBlockResult
+
+  getInitialblockhash(): Uint8Array | string
+  getInitialblockhash_asU8(): Uint8Array
+  getInitialblockhash_asB64(): string
+  setInitialblockhash(value: Uint8Array | string): void
+
+  getFinalblockhash(): Uint8Array | string
+  getFinalblockhash_asU8(): Uint8Array
+  getFinalblockhash_asB64(): string
+  setFinalblockhash(value: Uint8Array | string): void
 
   serializeBinary(): Uint8Array
-  toObject(includeInstance?: boolean): AttestorReplies.AsObject
-  static toObject(includeInstance: boolean, msg: AttestorReplies): AttestorReplies.AsObject
+  toObject(includeInstance?: boolean): AttestSignaturesRequest.AsObject
+  static toObject(
+    includeInstance: boolean,
+    msg: AttestSignaturesRequest
+  ): AttestSignaturesRequest.AsObject
   static extensions: { [key: number]: jspb.ExtensionFieldInfo<jspb.Message> }
   static extensionsBinary: { [key: number]: jspb.ExtensionFieldBinaryInfo<jspb.Message> }
-  static serializeBinaryToWriter(message: AttestorReplies, writer: jspb.BinaryWriter): void
-  static deserializeBinary(bytes: Uint8Array): AttestorReplies
+  static serializeBinaryToWriter(message: AttestSignaturesRequest, writer: jspb.BinaryWriter): void
+  static deserializeBinary(bytes: Uint8Array): AttestSignaturesRequest
   static deserializeBinaryFromReader(
-    message: AttestorReplies,
+    message: AttestSignaturesRequest,
     reader: jspb.BinaryReader
-  ): AttestorReplies
+  ): AttestSignaturesRequest
 }
 
-export namespace AttestorReplies {
+export namespace AttestSignaturesRequest {
   export type AsObject = {
-    attestationsList: Array<AttestorReply.AsObject>
+    attestationsList: Array<AttestBlockResult.AsObject>
+    initialblockhash: Uint8Array | string
+    finalblockhash: Uint8Array | string
+  }
+}
+
+export class AttestSignaturesResponse extends jspb.Message {
+  clearAttestationsList(): void
+  getAttestationsList(): Array<AttestorReport>
+  setAttestationsList(value: Array<AttestorReport>): void
+  addAttestations(value?: AttestorReport, index?: number): AttestorReport
+
+  serializeBinary(): Uint8Array
+  toObject(includeInstance?: boolean): AttestSignaturesResponse.AsObject
+  static toObject(
+    includeInstance: boolean,
+    msg: AttestSignaturesResponse
+  ): AttestSignaturesResponse.AsObject
+  static extensions: { [key: number]: jspb.ExtensionFieldInfo<jspb.Message> }
+  static extensionsBinary: { [key: number]: jspb.ExtensionFieldBinaryInfo<jspb.Message> }
+  static serializeBinaryToWriter(message: AttestSignaturesResponse, writer: jspb.BinaryWriter): void
+  static deserializeBinary(bytes: Uint8Array): AttestSignaturesResponse
+  static deserializeBinaryFromReader(
+    message: AttestSignaturesResponse,
+    reader: jspb.BinaryReader
+  ): AttestSignaturesResponse
+}
+
+export namespace AttestSignaturesResponse {
+  export type AsObject = {
+    attestationsList: Array<AttestorReport.AsObject>
+  }
+}
+
+export class AttestorReport extends jspb.Message {
+  getNodeid(): string
+  setNodeid(value: string): void
+
+  getTransactionhash(): string
+  setTransactionhash(value: string): void
+
+  getVote(): number
+  setVote(value: number): void
+
+  getDataforsc(): Uint8Array | string
+  getDataforsc_asU8(): Uint8Array
+  getDataforsc_asB64(): string
+  setDataforsc(value: Uint8Array | string): void
+
+  getDatasigforsc(): Uint8Array | string
+  getDatasigforsc_asU8(): Uint8Array
+  getDatasigforsc_asB64(): string
+  setDatasigforsc(value: Uint8Array | string): void
+
+  serializeBinary(): Uint8Array
+  toObject(includeInstance?: boolean): AttestorReport.AsObject
+  static toObject(includeInstance: boolean, msg: AttestorReport): AttestorReport.AsObject
+  static extensions: { [key: number]: jspb.ExtensionFieldInfo<jspb.Message> }
+  static extensionsBinary: { [key: number]: jspb.ExtensionFieldBinaryInfo<jspb.Message> }
+  static serializeBinaryToWriter(message: AttestorReport, writer: jspb.BinaryWriter): void
+  static deserializeBinary(bytes: Uint8Array): AttestorReport
+  static deserializeBinaryFromReader(
+    message: AttestorReport,
+    reader: jspb.BinaryReader
+  ): AttestorReport
+}
+
+export namespace AttestorReport {
+  export type AsObject = {
+    nodeid: string
+    transactionhash: string
+    vote: number
+    dataforsc: Uint8Array | string
+    datasigforsc: Uint8Array | string
   }
 }
 
@@ -289,10 +375,80 @@ export namespace Transaction {
   }
 }
 
-export class InitDid extends jspb.Message {
-  getDid(): string
-  setDid(value: string): void
+export class EncryptedText extends jspb.Message {
+  getCiphertext(): string
+  setCiphertext(value: string): void
+
+  getSalt(): string
+  setSalt(value: string): void
 
+  getNonce(): string
+  setNonce(value: string): void
+
+  getVersion(): string
+  setVersion(value: string): void
+
+  getPrekey(): string
+  setPrekey(value: string): void
+
+  serializeBinary(): Uint8Array
+  toObject(includeInstance?: boolean): EncryptedText.AsObject
+  static toObject(includeInstance: boolean, msg: EncryptedText): EncryptedText.AsObject
+  static extensions: { [key: number]: jspb.ExtensionFieldInfo<jspb.Message> }
+  static extensionsBinary: { [key: number]: jspb.ExtensionFieldBinaryInfo<jspb.Message> }
+  static serializeBinaryToWriter(message: EncryptedText, writer: jspb.BinaryWriter): void
+  static deserializeBinary(bytes: Uint8Array): EncryptedText
+  static deserializeBinaryFromReader(
+    message: EncryptedText,
+    reader: jspb.BinaryReader
+  ): EncryptedText
+}
+
+export namespace EncryptedText {
+  export type AsObject = {
+    ciphertext: string
+    salt: string
+    nonce: string
+    version: string
+    prekey: string
+  }
+}
+
+export class WalletToEncDerivedKey extends jspb.Message {
+  hasEncderivedprivkey(): boolean
+  clearEncderivedprivkey(): void
+  getEncderivedprivkey(): EncryptedText | undefined
+  setEncderivedprivkey(value?: EncryptedText): void
+
+  getSignature(): Uint8Array | string
+  getSignature_asU8(): Uint8Array
+  getSignature_asB64(): string
+  setSignature(value: Uint8Array | string): void
+
+  serializeBinary(): Uint8Array
+  toObject(includeInstance?: boolean): WalletToEncDerivedKey.AsObject
+  static toObject(
+    includeInstance: boolean,
+    msg: WalletToEncDerivedKey
+  ): WalletToEncDerivedKey.AsObject
+  static extensions: { [key: number]: jspb.ExtensionFieldInfo<jspb.Message> }
+  static extensionsBinary: { [key: number]: jspb.ExtensionFieldBinaryInfo<jspb.Message> }
+  static serializeBinaryToWriter(message: WalletToEncDerivedKey, writer: jspb.BinaryWriter): void
+  static deserializeBinary(bytes: Uint8Array): WalletToEncDerivedKey
+  static deserializeBinaryFromReader(
+    message: WalletToEncDerivedKey,
+    reader: jspb.BinaryReader
+  ): WalletToEncDerivedKey
+}
+
+export namespace WalletToEncDerivedKey {
+  export type AsObject = {
+    encderivedprivkey?: EncryptedText.AsObject
+    signature: Uint8Array | string
+  }
+}
+
+export class InitDid extends jspb.Message {
   getMasterpubkey(): string
   setMasterpubkey(value: string): void
 
@@ -302,7 +458,7 @@ export class InitDid extends jspb.Message {
   getDerivedpubkey(): string
   setDerivedpubkey(value: string): void
 
-  getWallettoencderivedkeyMap(): jspb.Map<string, string>
+  getWallettoencderivedkeyMap(): jspb.Map<string, WalletToEncDerivedKey>
   clearWallettoencderivedkeyMap(): void
   serializeBinary(): Uint8Array
   toObject(includeInstance?: boolean): InitDid.AsObject
@@ -316,11 +472,10 @@ export class InitDid extends jspb.Message {
 
 export namespace InitDid {
   export type AsObject = {
-    did: string
     masterpubkey: string
     derivedkeyindex: number
     derivedpubkey: string
-    wallettoencderivedkeyMap: Array<[string, string]>
+    wallettoencderivedkeyMap: Array<[string, WalletToEncDerivedKey.AsObject]>
   }
 }