kamikazechaser/cic-internal-integration
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Node atomicity rehabilitated

Browse Source
This commit is contained in:
nolash 2021-03-29 11:35:41 +02:00
parent bd9070ae44
commit 1047a1a487
Signed by untrusted user who does not match committer: lash
GPG Key ID: 21D2E7BB88C2A746
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/cic-eth/cic_eth/db/models/nonce.py
View File

@ -55,6 +55,20 @@ class Nonce(SessionBase):
conn.execute("UPDATE nonce set nonce = {} WHERE address_hex = '{}'".format(nonce, address)) conn.execute("UPDATE nonce set nonce = {} WHERE address_hex = '{}'".format(nonce, address))
@staticmethod
def __inc(conn, address):
#conn.execute("UPDATE nonce set nonce = nonce + 1 WHERE address_hex = '{}'".format(address))
q = conn.query(Nonce)
q = q.filter(Nonce.address_hex==address)
q = q.with_for_update()
o = q.first()
nonce = o.nonce
o.nonce += 1
conn.add(o)
conn.flush()
return nonce
@staticmethod @staticmethod
def __init(conn, address, nonce): def __init(conn, address, nonce):
conn.execute("INSERT INTO nonce (nonce, address_hex) VALUES ({}, '{}')".format(nonce, address)) conn.execute("INSERT INTO nonce (nonce, address_hex) VALUES ({}, '{}')".format(nonce, address))
@ -107,7 +121,7 @@ class Nonce(SessionBase):
#Nonce.__init(conn, address, nonce) #Nonce.__init(conn, address, nonce)
Nonce.__init(session, address, nonce) Nonce.__init(session, address, nonce)
#Nonce.__set(conn, address, nonce+1) #Nonce.__set(conn, address, nonce+1)
Nonce.__set(session, address, nonce + 1) nonce = Nonce.__inc(session, address)
#if Nonce.transactional: #if Nonce.transactional:
#conn.execute('COMMIT') #conn.execute('COMMIT')
# logg.debug('unlocking nonce table for address {}'.format(address)) # logg.debug('unlocking nonce table for address {}'.format(address))

4
apps/cic-eth/tests/unit/db/test_nonce_db.py
View File

@ -48,7 +48,7 @@ def test_nonce_reserve(
uu = uuid.uuid4() uu = uuid.uuid4()
nonce = NonceReservation.next(eth_empty_accounts[0], str(uu), session=init_database) nonce = NonceReservation.next(eth_empty_accounts[0], str(uu), session=init_database)
init_database.commit() init_database.commit()
assert nonce == 42 assert nonce == (str(uu), 42)
q = init_database.query(Nonce) q = init_database.query(Nonce)
q = q.filter(Nonce.address_hex==eth_empty_accounts[0]) q = q.filter(Nonce.address_hex==eth_empty_accounts[0])
@ -57,7 +57,7 @@ def test_nonce_reserve(
nonce = NonceReservation.release(eth_empty_accounts[0], str(uu)) nonce = NonceReservation.release(eth_empty_accounts[0], str(uu))
init_database.commit() init_database.commit()
assert nonce == 42 assert nonce == (str(uu), 42)
q = init_database.query(NonceReservation) q = init_database.query(NonceReservation)
q = q.filter(NonceReservation.key==str(uu)) q = q.filter(NonceReservation.key==str(uu))