From fc50f97525f7c4bfd174236dacfef25836e06c0d Mon Sep 17 00:00:00 2001 From: Jonathan Zernik Date: Sun, 5 Jul 2020 17:48:47 -0700 Subject: [PATCH] Use version 0.3.2 of squeaklib (#67) --- requirements-itest.txt | 2 +- requirements.txt | 2 +- squeakserver/server/postgres_db.py | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements-itest.txt b/requirements-itest.txt index ead1688e..edbf4da3 100644 --- a/requirements-itest.txt +++ b/requirements-itest.txt @@ -1,5 +1,5 @@ importlib_resources==1.4.0 -squeaklib==0.3.1 +squeaklib==0.3.2 argparse googleapis-common-protos grpcio diff --git a/requirements.txt b/requirements.txt index 8d155053..df086451 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ importlib_resources==1.4.0 -squeaklib==0.3.1 +squeaklib==0.3.2 argparse googleapis-common-protos grpcio diff --git a/squeakserver/server/postgres_db.py b/squeakserver/server/postgres_db.py index 349c7945..5e6146eb 100644 --- a/squeakserver/server/postgres_db.py +++ b/squeakserver/server/postgres_db.py @@ -66,11 +66,11 @@ class PostgresDb(): squeak.nBlockHeight, squeak.vchScriptPubKey, squeak.vchEncryptionKey, - squeak.vchEncDatakey.hex(), + squeak.encDatakey.hex(), squeak.vchIv.hex(), squeak.nTime, squeak.nNonce, - bytes(squeak.encContent.vchEncContent).hex(), + squeak.encContent.hex(), squeak.vchScriptSig, str(squeak.GetAddress()), squeak.vchDecryptionKey, @@ -98,11 +98,11 @@ class PostgresDb(): nBlockHeight=row[6], vchScriptPubKey=row[7], vchEncryptionKey=row[8], - vchEncDatakey=bytes.fromhex(row[9]), + encDatakey=bytes.fromhex(row[9]), vchIv=bytes.fromhex((row[10])), nTime=row[11], nNonce=row[12], - encContent=CSqueakEncContent(bytes.fromhex((row[13]))), + encContent=bytes.fromhex((row[13])), vchScriptSig=row[14], vchDecryptionKey=row[16], )