Skip to content

Commit

Permalink
updating master from shadow master (#415)
Browse files Browse the repository at this point in the history
* disabling the pager in my pretty printing run script

* change the elaboration of `new` and non-local Invocations to match the flat yul object style (#367)

* making a change to double check work flow

* adding a stub for computing the size of a contract; that'll be its own PR entirely one day fairly soon, but for now, we assume that we just need 32 bytes

* using hex values for some boilerplate so that it matches the docs

* reworking constructors to just allocate memory

* adding some helper functions in util. one is a renaming for transactions from child contracts; the other is basically a type-checked comment pointing out uses of some pretty substantian technical debt

* temporarily removing the code to translate child contracts. rewriting the translation of Invocations to remap everything to local invocations instead, into the names that will be created in the flat yul object

* removing an assertion and adding translation of string literals

* whitespace, scala style

* utility function for undoing the transaction renaming

* generate flat yul object from child contracts (#369)

* rename, add boolean for main-ness in translate decl

* changing signature of translateDeclaration to remove a return that doesn't do anything

* whitespace, scala style

* comments

* scraps; adding an assert

* changing how child contracts are processed

* rewrite of translateTransaction

* chainging signature of translateStatement

* more threading through inMain

* whitespace, scala style

* adding some docs

* removing the nicer output for typed names in favor of a bland one, per solc's current limitations. adding a comment about why.

* adding a temporary fix to the top of the dispatch table pending talking with MC"

* removing a stale comment

* comments

* adding missing declarations to invocations

* cleaning up comments and some messy logic around temporary variables

* removing comment

* more hacks for specific tests in advance of type info

* changing hardcoded value in the mustache file for this to be the current contract address

* adding a couple of args to get this to typecheck

* use type annotations in Yul codegen (#377)

* removing a util function to rename functions in the dispatch table; that no longer makes sense with the solution for flattening that we've settled on for now

* adding comments; expanding getcontractname

* ripping out some code, adding comments

* adding a comment that may help to locate a bug later

* moving comment closer to the source and updating it

* comments

* scraps; this change seemed likely but breaks a bunch of tests

* quick function to traverse over an expression and check a given predicate on all the annotations

* fixing some import dependencies

* traversal of a program rather than just an expression; i sure hope i don't have to come back and make this the fully polymorphic map reduce but i bet i will

* adding updates to the expression returned in the checker from just the ReferenceIdentifier cases, after some debugging with @mcoblenz

* adding additional ParserUtil.updateExprType uses as seems right. bunch of tests fail, some of which i expected some i didn't, and i don't know how to fix a lot of them

* updating width calculation to actually inspect the type, now that we know it

* removing an assert that caused a bunch of false negatives.

* small changes per PR comments

* copying a slightly cut down version of linked lists, but this needs to be edited down even more to be the right goal for a demo.

* compute the sizes of contracts for allocation (#378)

* copying a slightly cut down version of linked lists, but this needs to be edited down even more to be the right goal for a demo.

* computing sizes of types recursively

* adding some simple hard coded unit tests

* copying over a helper from type checker tests to test on actual contracts in files

* adding more general tests; it doesn't work but i think i know why

* scraps and printlines from trying to debug sizes

* changing the type of the size computation function so it has enough information, per MC. reworking tests

* renaming size function; fixing the main test

* adding some comments and a variable for pointer sizes

* formatting, reworking base test

* removing the two simpler unit tests. it is hard and somewhat pointless to be the parser and create a contract table by hand, the existing test is informative enough

* fixing type checker errors (#380)

* debugging scraps

* copying a slightly cut down version of linked lists, but this needs to be edited down even more to be the right goal for a demo.

* commenting out spammy prints

* patch from MC

* updating override syntax to not introduce a new field

* updating expr type update to set the location and use the one field rather than build new ones

* removing printlines

* updating logged errors in a few places; this fixes some but not all of #379

* error in resourcesTest was in the test itself; it was incorrectly looking for m to be at int

* formatting, whitespace

* fixed permission passing test; also errors in the definition of the test, not the checker

* fixing all permowned error

* scala style, whitespace

* scraps

* adding a comment, removing a comment, removing an assert

* compute offsets, store fields in memory (#384)

* fixing a bug in computing sizes by translating from set to list; adding an assert; whitespace and style

* adding helper to compute offsets

* typoe and adding a test to demonstrate that the bug computing sizes is gone

* adding a sandbox test case file

* adding a traversal of the declarations sequence in the contract rather than relying on the toList of an unordered collection; using that helper function both in computing sizes and offsets

* refactoring tests for util functions to reuse the code to produce a symbol table; adding tests for computing offests

* style, whitespace

* a couple more tests for offsets

* a couple more tests for offsets

* updating tests, adding comments for myself

* helper to wrap call to field offsets, changing sload and sstore to m*

* updating test to show that fields get overwritten; adding json so it gets run because it passes

* messing with test files

* changing the ganache test script to use the test skipping checking script that i think works across platforms, per #361

* adding sort, per #631

* scala style, fussy fixes to doc strings etc

* scala style, fussy fixes to doc strings etc

* scala style, fussy fixes to doc strings etc

* scala style, fussy fixes to doc strings etc

* some house keeping to clean up a util function, removing a source of bugs related to computing sizes

* refactoring to change the definition of typed name to have an actual type in it, not just its string representation

* adding clause to type name helper for contracts

* whitespace in obsidian files

* housekeeping, adding docs and removing stale todos

* Adding another passing test

* updating travis test script to work with solc 0.8.10

* iterating on travis script

* allocate fields with pointers, rewrite yulobject and mustache interaction to reflect current object layout (#388)

* adding test case for nonprimitive fields in the main contract

* adding an ownership to the test field to make it valid obsidian

* removing some dead code

* removing unused childContracts argument from YulObject

* scraps

* new test

* fixing local util script for new version of solc, adding a little code for #389 but not a complete idea yet

* scraps

* rewriting yulobject to take an optional int to indicate the size of the main contract and if the contract being elaborated is the main one (if it has as size). this is temporary and not going to last

* removing what i am nearly positive is dead code

* first half of a big rewrite of the YulObject class

* back half of the refactor to update code generation

* adding some todos and notes

* scraps, scala style and whitespace

* scraps

* updating the implementation of switch toString to not print out invalid switches with no branches. this fixes the emptycontract dispatch table.

* scraps

* add the this argument uniformly in codegen not printing, and only remove it for the hashed dispatch table entries

* pulling the body of local invocation out into a helper so that it can get called in both places with different  arguments

* documentation, cleaning up todos

* scraps

* adding a little more documentation

* functions with arguments (#394)

* adding test case for nonprimitive fields in the main contract

* adding an ownership to the test field to make it valid obsidian

* removing some dead code

* removing unused childContracts argument from YulObject

* scraps

* new test

* fixing local util script for new version of solc, adding a little code for #389 but not a complete idea yet

* scraps

* rewriting yulobject to take an optional int to indicate the size of the main contract and if the contract being elaborated is the main one (if it has as size). this is temporary and not going to last

* removing what i am nearly positive is dead code

* first half of a big rewrite of the YulObject class

* back half of the refactor to update code generation

* adding some todos and notes

* scraps, scala style and whitespace

* scraps

* updating the implementation of switch toString to not print out invalid switches with no branches. this fixes the emptycontract dispatch table.

* scraps

* add the this argument uniformly in codegen not printing, and only remove it for the hashed dispatch table entries

* pulling the body of local invocation out into a helper so that it can get called in both places with different  arguments

* documentation, cleaning up todos

* scraps

* renaming some files

* removing half baked linked list test

* typo

* adding json so this test gets run in Travis

* translate constrctors to transactions on the flattened object (#396)

* updating test case so that it compiled and hits missing code

* Adding new test cases

* adding code so that constructors get emitted, named with a hash of their arguments so that objecst with multiple consturctors can call whichever one

* fixed constructors with arguments

* updating ganache test suite with a few constructor examples

* adding code to constructor elaboration to not generate a call to a constructor that doesn't exist

* monkeying around with the install script

* monkeying around with the install script

* monkeying around with the install script

* monkeying around with the install script

* monkeying with travis more

* adding version info to output

* Adding debugging output

* debugging output

* monkeying with the host name

* test script

* trying running ganache on localhost directly

* following some shellcheck fixes

* moving npm commands around

* checking for ganache in the processes

* unhiding ganache output

* downgrading node to LTS version 16

* moving some install commands around, trying to get a lower version of node

* adding possible node work around

* env vars

* undoing env vars, since the 16 now got picked up

* removing debug messages

* removing the ganache install script since that's in travis.yml now

* scraps

* support integer arguments to the main function (#400)

* adding a test case to show that an old bug got fixed. closes #334

* adding a new test case to show that arguments are not currently passed to main

* adding a different presentation of the tests info while i'm thinking of it

* fixing a bad change to IDE settings

* adding a yul statement for comments

* adding helpers to compute abi decoder functions and insert them into the dispatch table and emit them in the body of the object

* updating test cases

* removing old test

* removing old test

* code to decode individual ints, using that to decode tuples, emitting it in the output file

* i forget to change the name of the contract every single time i copy a test

* traveseing the params not the returns

* renaming, scraps

* fixing an error in the ABI names we map to

* removing a todo
"

* scraps, scala style

* adding parameters to the json for the two tests that use them; the technical debt here is quickly becoming too much but i want to make sure this works before doing a pass at rewriting the test harness

* removing duplicate decoders from output, only assigning params to locals if there are more than 0 of them. this should make the old tests pass again

* using distinct instead of hard to read translations to and from set

* Adding some documentation and removing some todos

* fixing json for mainargs1, updating test script to read json for the two new tests in a slightly hacky and specific way

* increasing the padding size on arguments

* test.json is kind of part of a rewrite of the test infrastructure and not really part of this PR. so it doesn't belong in this branch anyway AND is breaking the tests

* removing some dead boilerplate

* updating the padding to the right length in the test script; removing a dead call to decode

* scala style and whitespace

* scraps, comments

* adding a case class for yul types (#403)

* working on #401, this is kind of experimental

* adding a case for user defied types

* adding documentation

* updates to the testing harness (#408)

* adding a test case to show that an old bug got fixed. closes #334

* adding a new test case to show that arguments are not currently passed to main

* adding a different presentation of the tests info while i'm thinking of it

* fixing a bad change to IDE settings

* adding a yul statement for comments

* adding helpers to compute abi decoder functions and insert them into the dispatch table and emit them in the body of the object

* updating test cases

* removing old test

* removing old test

* code to decode individual ints, using that to decode tuples, emitting it in the output file

* i forget to change the name of the contract every single time i copy a test

* traveseing the params not the returns

* renaming, scraps

* fixing an error in the ABI names we map to

* removing a todo
"

* scraps, scala style

* adding parameters to the json for the two tests that use them; the technical debt here is quickly becoming too much but i want to make sure this works before doing a pass at rewriting the test harness

* removing duplicate decoders from output, only assigning params to locals if there are more than 0 of them. this should make the old tests pass again

* using distinct instead of hard to read translations to and from set

* Adding some documentation and removing some todos

* fixing json for mainargs1, updating test script to read json for the two new tests in a slightly hacky and specific way

* increasing the padding size on arguments

* test.json is kind of part of a rewrite of the test infrastructure and not really part of this PR. so it doesn't belong in this branch anyway AND is breaking the tests

* removing some dead boilerplate

* updating the padding to the right length in the test script; removing a dead call to decode

* scala style and whitespace

* scraps, comments

* removing old json in favor of one flat file with less redundancy

* python version of travis script

* more testing script rewrite

* yaml farming

* yaml farming

* yaml farming

* test script rewrite progress

* adding a make target to build a jar quickly, without doing all the test suite

* test script rewrite progress

* test script rewrite progress

* yaml farming, test script work

* finally reworked account polling

* yaml farming, transactions

* updating tests format a little, more testing script updates

* yaml farming, more test script updates

* adding transaction names for primops tests, more verbose output

* removing 2s complement script since it's now in the testing script

* Adding decoding from bytearrays and arguments for the two tests that expect args to main

* add a script to kill stray ganache instances, update return2 test so it passes

* removing the deprecated bash travis script for running ganache tests

* making verbose flag toggle output from ganache-cli as well

* fussing with test script

* pulling magic constants for port and host name out, fixing a typo

* whitesapce, pystyle

* documenting, taking out a couple todos

* quick fix

* emit tracers for each contract (#404)

* new test case

* adding field to yul object for tracers

* emitting tracers per contract, but it's per instance of contract so it's not unique. this isn't the right way to do this

* removing duplicates in a hamfisted way

* log calls and leave

* updating tracing test case

* updates from flat alloc into master (#409)

* disabling the pager in my pretty printing run script

* change the elaboration of `new` and non-local Invocations to match the flat yul object style (#367)

* making a change to double check work flow

* adding a stub for computing the size of a contract; that'll be its own PR entirely one day fairly soon, but for now, we assume that we just need 32 bytes

* using hex values for some boilerplate so that it matches the docs

* reworking constructors to just allocate memory

* adding some helper functions in util. one is a renaming for transactions from child contracts; the other is basically a type-checked comment pointing out uses of some pretty substantian technical debt

* temporarily removing the code to translate child contracts. rewriting the translation of Invocations to remap everything to local invocations instead, into the names that will be created in the flat yul object

* removing an assertion and adding translation of string literals

* whitespace, scala style

* utility function for undoing the transaction renaming

* generate flat yul object from child contracts (#369)

* rename, add boolean for main-ness in translate decl

* changing signature of translateDeclaration to remove a return that doesn't do anything

* whitespace, scala style

* comments

* scraps; adding an assert

* changing how child contracts are processed

* rewrite of translateTransaction

* chainging signature of translateStatement

* more threading through inMain

* whitespace, scala style

* adding some docs

* removing the nicer output for typed names in favor of a bland one, per solc's current limitations. adding a comment about why.

* adding a temporary fix to the top of the dispatch table pending talking with MC"

* removing a stale comment

* comments

* adding missing declarations to invocations

* cleaning up comments and some messy logic around temporary variables

* removing comment

* more hacks for specific tests in advance of type info

* changing hardcoded value in the mustache file for this to be the current contract address

* adding a couple of args to get this to typecheck

* use type annotations in Yul codegen (#377)

* removing a util function to rename functions in the dispatch table; that no longer makes sense with the solution for flattening that we've settled on for now

* adding comments; expanding getcontractname

* ripping out some code, adding comments

* adding a comment that may help to locate a bug later

* moving comment closer to the source and updating it

* comments

* scraps; this change seemed likely but breaks a bunch of tests

* quick function to traverse over an expression and check a given predicate on all the annotations

* fixing some import dependencies

* traversal of a program rather than just an expression; i sure hope i don't have to come back and make this the fully polymorphic map reduce but i bet i will

* adding updates to the expression returned in the checker from just the ReferenceIdentifier cases, after some debugging with @mcoblenz

* adding additional ParserUtil.updateExprType uses as seems right. bunch of tests fail, some of which i expected some i didn't, and i don't know how to fix a lot of them

* updating width calculation to actually inspect the type, now that we know it

* removing an assert that caused a bunch of false negatives.

* small changes per PR comments

* copying a slightly cut down version of linked lists, but this needs to be edited down even more to be the right goal for a demo.

* compute the sizes of contracts for allocation (#378)

* copying a slightly cut down version of linked lists, but this needs to be edited down even more to be the right goal for a demo.

* computing sizes of types recursively

* adding some simple hard coded unit tests

* copying over a helper from type checker tests to test on actual contracts in files

* adding more general tests; it doesn't work but i think i know why

* scraps and printlines from trying to debug sizes

* changing the type of the size computation function so it has enough information, per MC. reworking tests

* renaming size function; fixing the main test

* adding some comments and a variable for pointer sizes

* formatting, reworking base test

* removing the two simpler unit tests. it is hard and somewhat pointless to be the parser and create a contract table by hand, the existing test is informative enough

* fixing type checker errors (#380)

* debugging scraps

* copying a slightly cut down version of linked lists, but this needs to be edited down even more to be the right goal for a demo.

* commenting out spammy prints

* patch from MC

* updating override syntax to not introduce a new field

* updating expr type update to set the location and use the one field rather than build new ones

* removing printlines

* updating logged errors in a few places; this fixes some but not all of #379

* error in resourcesTest was in the test itself; it was incorrectly looking for m to be at int

* formatting, whitespace

* fixed permission passing test; also errors in the definition of the test, not the checker

* fixing all permowned error

* scala style, whitespace

* scraps

* adding a comment, removing a comment, removing an assert

* compute offsets, store fields in memory (#384)

* fixing a bug in computing sizes by translating from set to list; adding an assert; whitespace and style

* adding helper to compute offsets

* typoe and adding a test to demonstrate that the bug computing sizes is gone

* adding a sandbox test case file

* adding a traversal of the declarations sequence in the contract rather than relying on the toList of an unordered collection; using that helper function both in computing sizes and offsets

* refactoring tests for util functions to reuse the code to produce a symbol table; adding tests for computing offests

* style, whitespace

* a couple more tests for offsets

* a couple more tests for offsets

* updating tests, adding comments for myself

* helper to wrap call to field offsets, changing sload and sstore to m*

* updating test to show that fields get overwritten; adding json so it gets run because it passes

* messing with test files

* changing the ganache test script to use the test skipping checking script that i think works across platforms, per #361

* adding sort, per #631

* scala style, fussy fixes to doc strings etc

* scala style, fussy fixes to doc strings etc

* scala style, fussy fixes to doc strings etc

* scala style, fussy fixes to doc strings etc

* some house keeping to clean up a util function, removing a source of bugs related to computing sizes

* refactoring to change the definition of typed name to have an actual type in it, not just its string representation

* adding clause to type name helper for contracts

* whitespace in obsidian files

* housekeeping, adding docs and removing stale todos

* Adding another passing test

* updating travis test script to work with solc 0.8.10

* iterating on travis script

* allocate fields with pointers, rewrite yulobject and mustache interaction to reflect current object layout (#388)

* adding test case for nonprimitive fields in the main contract

* adding an ownership to the test field to make it valid obsidian

* removing some dead code

* removing unused childContracts argument from YulObject

* scraps

* new test

* fixing local util script for new version of solc, adding a little code for #389 but not a complete idea yet

* scraps

* rewriting yulobject to take an optional int to indicate the size of the main contract and if the contract being elaborated is the main one (if it has as size). this is temporary and not going to last

* removing what i am nearly positive is dead code

* first half of a big rewrite of the YulObject class

* back half of the refactor to update code generation

* adding some todos and notes

* scraps, scala style and whitespace

* scraps

* updating the implementation of switch toString to not print out invalid switches with no branches. this fixes the emptycontract dispatch table.

* scraps

* add the this argument uniformly in codegen not printing, and only remove it for the hashed dispatch table entries

* pulling the body of local invocation out into a helper so that it can get called in both places with different  arguments

* documentation, cleaning up todos

* scraps

* adding a little more documentation

* functions with arguments (#394)

* adding test case for nonprimitive fields in the main contract

* adding an ownership to the test field to make it valid obsidian

* removing some dead code

* removing unused childContracts argument from YulObject

* scraps

* new test

* fixing local util script for new version of solc, adding a little code for #389 but not a complete idea yet

* scraps

* rewriting yulobject to take an optional int to indicate the size of the main contract and if the contract being elaborated is the main one (if it has as size). this is temporary and not going to last

* removing what i am nearly positive is dead code

* first half of a big rewrite of the YulObject class

* back half of the refactor to update code generation

* adding some todos and notes

* scraps, scala style and whitespace

* scraps

* updating the implementation of switch toString to not print out invalid switches with no branches. this fixes the emptycontract dispatch table.

* scraps

* add the this argument uniformly in codegen not printing, and only remove it for the hashed dispatch table entries

* pulling the body of local invocation out into a helper so that it can get called in both places with different  arguments

* documentation, cleaning up todos

* scraps

* renaming some files

* removing half baked linked list test

* typo

* adding json so this test gets run in Travis

* translate constrctors to transactions on the flattened object (#396)

* updating test case so that it compiled and hits missing code

* Adding new test cases

* adding code so that constructors get emitted, named with a hash of their arguments so that objecst with multiple consturctors can call whichever one

* fixed constructors with arguments

* updating ganache test suite with a few constructor examples

* adding code to constructor elaboration to not generate a call to a constructor that doesn't exist

* monkeying around with the install script

* monkeying around with the install script

* monkeying around with the install script

* monkeying around with the install script

* monkeying with travis more

* adding version info to output

* Adding debugging output

* debugging output

* monkeying with the host name

* test script

* trying running ganache on localhost directly

* following some shellcheck fixes

* moving npm commands around

* checking for ganache in the processes

* unhiding ganache output

* downgrading node to LTS version 16

* moving some install commands around, trying to get a lower version of node

* adding possible node work around

* env vars

* undoing env vars, since the 16 now got picked up

* removing debug messages

* removing the ganache install script since that's in travis.yml now

* scraps

* support integer arguments to the main function (#400)

* adding a test case to show that an old bug got fixed. closes #334

* adding a new test case to show that arguments are not currently passed to main

* adding a different presentation of the tests info while i'm thinking of it

* fixing a bad change to IDE settings

* adding a yul statement for comments

* adding helpers to compute abi decoder functions and insert them into the dispatch table and emit them in the body of the object

* updating test cases

* removing old test

* removing old test

* code to decode individual ints, using that to decode tuples, emitting it in the output file

* i forget to change the name of the contract every single time i copy a test

* traveseing the params not the returns

* renaming, scraps

* fixing an error in the ABI names we map to

* removing a todo
"

* scraps, scala style

* adding parameters to the json for the two tests that use them; the technical debt here is quickly becoming too much but i want to make sure this works before doing a pass at rewriting the test harness

* removing duplicate decoders from output, only assigning params to locals if there are more than 0 of them. this should make the old tests pass again

* using distinct instead of hard to read translations to and from set

* Adding some documentation and removing some todos

* fixing json for mainargs1, updating test script to read json for the two new tests in a slightly hacky and specific way

* increasing the padding size on arguments

* test.json is kind of part of a rewrite of the test infrastructure and not really part of this PR. so it doesn't belong in this branch anyway AND is breaking the tests

* removing some dead boilerplate

* updating the padding to the right length in the test script; removing a dead call to decode

* scala style and whitespace

* scraps, comments

* adding a case class for yul types (#403)

* working on #401, this is kind of experimental

* adding a case for user defied types

* adding documentation

* updates to the testing harness (#408)

* adding a test case to show that an old bug got fixed. closes #334

* adding a new test case to show that arguments are not currently passed to main

* adding a different presentation of the tests info while i'm thinking of it

* fixing a bad change to IDE settings

* adding a yul statement for comments

* adding helpers to compute abi decoder functions and insert them into the dispatch table and emit them in the body of the object

* updating test cases

* removing old test

* removing old test

* code to decode individual ints, using that to decode tuples, emitting it in the output file

* i forget to change the name of the contract every single time i copy a test

* traveseing the params not the returns

* renaming, scraps

* fixing an error in the ABI names we map to

* removing a todo
"

* scraps, scala style

* adding parameters to the json for the two tests that use them; the technical debt here is quickly becoming too much but i want to make sure this works before doing a pass at rewriting the test harness

* removing duplicate decoders from output, only assigning params to locals if there are more than 0 of them. this should make the old tests pass again

* using distinct instead of hard to read translations to and from set

* Adding some documentation and removing some todos

* fixing json for mainargs1, updating test script to read json for the two new tests in a slightly hacky and specific way

* increasing the padding size on arguments

* test.json is kind of part of a rewrite of the test infrastructure and not really part of this PR. so it doesn't belong in this branch anyway AND is breaking the tests

* removing some dead boilerplate

* updating the padding to the right length in the test script; removing a dead call to decode

* scala style and whitespace

* scraps, comments

* removing old json in favor of one flat file with less redundancy

* python version of travis script

* more testing script rewrite

* yaml farming

* yaml farming

* yaml farming

* test script rewrite progress

* adding a make target to build a jar quickly, without doing all the test suite

* test script rewrite progress

* test script rewrite progress

* yaml farming, test script work

* finally reworked account polling

* yaml farming, transactions

* updating tests format a little, more testing script updates

* yaml farming, more test script updates

* adding transaction names for primops tests, more verbose output

* removing 2s complement script since it's now in the testing script

* Adding decoding from bytearrays and arguments for the two tests that expect args to main

* add a script to kill stray ganache instances, update return2 test so it passes

* removing the deprecated bash travis script for running ganache tests

* making verbose flag toggle output from ganache-cli as well

* fussing with test script

* pulling magic constants for port and host name out, fixing a typo

* whitesapce, pystyle

* documenting, taking out a couple todos

* quick fix

* removing deprecated indiviual test json files

* updating tests json

* removing trace this test because it seems to take an unbounded amount of gas

* fix broken nested intcontinater test (#411)

* new tests case & scraps

* adding a docker running check to save me a local annoyance; pushing it to git to make sure it doesn't break travis

* docs

* logging scraps

* partial rewrite to using pyweb3

* yaml farming

* adding exception handling around the web3 calls

* restored functionality with web3, no logs yet, pushing to travis to make sure it works there on all the tests

* cleaning up a little bit, adding log calls

* using Web3's hash implementation

* yaml farming

* using web3 solidity abi encoder which uses a packed representation that may still work

* removing trial with packed abi representation

* scraps

* tracethis seems to take a ton of gas, so i'm going to leave that test failing in this branch but remove it from shadowmaster

* moving test json around

* updating the nested example so that it compiles

* renaming test

* Adding test case

* removing TraceThis test definition because that doesn't work yet

* Flat readlogs (#412)

* adding a docker running check to save me a local annoyance; pushing it to git to make sure it doesn't break travis

* docs

* logging scraps

* partial rewrite to using pyweb3

* yaml farming

* adding exception handling around the web3 calls

* restored functionality with web3, no logs yet, pushing to travis to make sure it works there on all the tests

* cleaning up a little bit, adding log calls

* using Web3's hash implementation

* yaml farming

* using web3 solidity abi encoder which uses a packed representation that may still work

* removing trial with packed abi representation

* scraps

* tracethis seems to take a ton of gas, so i'm going to leave that test failing in this branch but remove it from shadowmaster

* adding a --stash option to the commandline for obsidianc, threading it through to codegen'

* new test case

* adding dispatch table and decode entries to make the stash-getter visible

* removing a warning, [warn] Ignored unknown package option FixedTimestamp(None)

* updating test case

* removing calls to log0 in favor of stashing, updating the implemtation of stash to advance through storage

* typo

* Adding a bit of a hack to get the tracer called

* scraps

* scraps

* updating travis yaml and options for new ganache version

* removing getstash implementation and the junk in the dispatch table generation that opened it up

* invoke and deploy sends

* .idea directory changes because i added some python support and also updated to the most recent version of intellij

* scraps

* writing to 4 adjacent places in storage

* adding proof that logs are also present and i can detect them

* removing stash commandline arg from compiler and everything it percolates down to

* updating test case name and test harness to check the logs instead of a stashing address

* cleaning up for a PR; hacks on hacks

* fixing a test case

* call tracers after every constructor call (#413)

* scala style

* adding emitted code to tracers to copy from memory to storage

* scraps

* removing hacky dispatch table entry code that manually triggers a trace; this breaks at least one test, maybe more. adding a new test for a contract that has a field so that its trace is not trivial and also calls the constructor

* hacking on the example

* add a trace after every constructor call

* updating test definition with a better name and without a comment to myself

* changing how constructor are called to be sensitive to whether its from the main contract or not

* generate tracers for every contract, not just the ones that are used in fields in the main contract.

* updating the description of the SetGetLogs tests to that it passes and the text is more descriptive about what it actually tests

* scraps, scala style

* fixing aggressive search-replace

* adding a logging field to the latest test; it does emit things, they are currently not meaningful
  • Loading branch information
ivoysey committed Feb 15, 2022
1 parent 4033149 commit 4626c1c
Show file tree
Hide file tree
Showing 4 changed files with 79 additions and 35 deletions.
28 changes: 28 additions & 0 deletions resources/tests/GanacheTests/SetGetConstructorField.obs
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
contract IntContainer{
int x;

IntContainer@Owned(int init) {
x = init;
}

transaction set(int value) {
x = value;
}
transaction get() returns int{
return x;
}
}

main contract SetGetConstructorField{
IntContainer@Owned ic;

SetGetConstructorField@Owned(){
ic = new IntContainer(5);
}

transaction main() returns int{
SetGetConstructorField local = new SetGetConstructorField();
ic.set(12);
return (ic.get());
}
}
11 changes: 9 additions & 2 deletions resources/tests/GanacheTests/tests.json
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,15 @@
"file": "SetGetLogs.obs",
"expected": "15",
"trans" : "main_sgl",
"logged" : [320,320,320,320],
"shows_that_we_support": "simple set-get with tracers that emit logged values"
"logged" : [256, 288, 320],
"shows_that_we_support": "simple set-get with tracers that emit values to the logs. this shows that the harness can read logs; the values logged are immaterial"
},
{
"file": "SetGetConstructorField.obs",
"expected": "12",
"trans" : "main",
"logged" : [224, 224, 224],
"shows_that_we_support": "set-get with a field so that the emitted tracer is not trivial, and that uses the constructor for that field "
}
]
}
63 changes: 42 additions & 21 deletions src/main/scala/edu/cmu/cs/obsidian/codegen/CodeGenYul.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package edu.cmu.cs.obsidian.codegen

import edu.cmu.cs.obsidian.CompilerOptions
import edu.cmu.cs.obsidian.typecheck.{ContractReferenceType, NonPrimitiveType, ObsidianType, UnitType}
import edu.cmu.cs.obsidian.typecheck._

import java.io.{File, FileWriter}
import java.nio.file.{Files, Path, Paths}
Expand Down Expand Up @@ -85,33 +85,34 @@ object CodeGenYul extends CodeGenerator {
def translateNonMains(c: Contract): Seq[YulStatement] = {
c match {
case _: ObsidianContractImpl =>
if (!c.modifiers.contains(IsMain()) && c.name != ContractType.topContractName) {
if (!c.modifiers.contains(IsMain())) {
c.declarations.flatMap(d => translateDeclaration(d, c.name, checkedTable, inMain = false))
} else {
// skip the main and the self contracts
// skip the main contract
Seq()
}
case _: JavaFFIContractImpl =>
throw new RuntimeException("Java contract not supported in yul translation")
}
}

val real_contracts = program.contracts.filter(c => c.name != ContractType.topContractName)

// nb: we do not process imports
YulObject(contractName = mainContract.name,
data = Seq(),
mainContractTransactions = mainContract.declarations.flatMap(d => translateDeclaration(d, mainContract.name, checkedTable, inMain = true)),
mainContractSize = sizeOfContractST(mainContract.name, checkedTable),
otherTransactions = program.contracts.flatMap(translateNonMains),
tracers = writeTracers(checkedTable, mainContract.name)
otherTransactions = real_contracts.flatMap(translateNonMains),
tracers = real_contracts.flatMap(c => writeTracers(checkedTable, c.name)).distinctBy(fd => fd.name)
)
}

def nameTracer(name: String): String = {
s"trace_$name"
}

def writeTracers(ct : SymbolTable, name: String): Seq[FunctionDefinition] = {
def writeTracers(ct: SymbolTable, name: String): Seq[FunctionDefinition] = {
val c: Contract = ct.contract(name) match {
case Some(value) => value.contract
case None => throw new RuntimeException()
Expand All @@ -120,27 +121,39 @@ object CodeGenYul extends CodeGenerator {
var body: Seq[YulStatement] = Seq()
var others: Seq[FunctionDefinition] = Seq()

for(d <- c.declarations){
for (d <- c.declarations) {
d match {
case Field(_, typ, fname, _) => typ match {
case t : NonPrimitiveType => t match {
case ContractReferenceType(contractType, _, _) =>
body = body :+ ExpressionStatement(apply(nameTracer(contractType.contractName), fieldFromThis(ct.contractLookup(name),fname)))
others = others ++ writeTracers(ct, contractType.contractName)
case Field(_, typ, fname, _) =>
val loc = fieldFromThis(ct.contractLookup(name), fname)
typ match {
case t: NonPrimitiveType => t match {
case ContractReferenceType(contractType, _, _) =>
body = body ++ Seq(
//sstore(add(this,offset), mload(add(this,offset)))
ExpressionStatement(apply("sstore", loc, apply("mload", loc))),
ExpressionStatement(apply(nameTracer(contractType.contractName), loc))
)
// todo: this recursive call may not be needed if we generate tracers
// for every contract in the program
others = others ++ writeTracers(ct, contractType.contractName)
case _ => Seq()
}
case _: PrimitiveType =>
body = body :+
//sstore(add(this,offset), mload(add(this,offset)))
ExpressionStatement(apply("sstore", loc, apply("mload", loc)))
case _ => Seq()
}
case _ => Seq()
}
case _ => Seq()
}
}

FunctionDefinition(name = nameTracer(name),
parameters = Seq(TypedName("this",YATAddress())),
returnVariables = Seq(),
body = Block(Seq(
ExpressionStatement(apply("log0",intlit(64),intlit(32)))
) ++ body :+ Leave())
parameters = Seq(TypedName("this", YATAddress())),
returnVariables = Seq(),
body = Block(Seq(
ExpressionStatement(apply("log0", intlit(64), intlit(32)))
) ++ body :+ Leave())
) +: others.distinctBy(fd => fd.name)
}

Expand Down Expand Up @@ -544,12 +557,20 @@ object CodeGenYul extends CodeGenerator {
case _ => false
}

// the constructor(s) for the main contract are not prefixed with the name of the contract.
val invoke_name =
if (checkedTable.contractLookup(contractType.contractName).contract.isMain) {
contractType.contractName + hashOfFunctionName(contractType.contractName, typeNames)
} else {
transactionNameMapping(contractType.contractName, contractType.contractName) + hashOfFunctionName(contractType.contractName, typeNames)
}

// check to to see if there is a constructor to call, and if so translate the
// arguments and invoke the constructor as normal transaction with the hash appended
// to the name to call the right one
val conCall =
if (checkedTable.contract(contractType.contractName).get.contract.declarations.exists(d => isMatchingConstructor(d))) {
translateInvocation(name = transactionNameMapping(contractType.contractName, contractType.contractName) + hashOfFunctionName(contractType.contractName, typeNames),
translateInvocation(name = invoke_name,
args = args,
obstype = Some(UnitType()),
thisID = id_memaddr,
Expand All @@ -562,7 +583,7 @@ object CodeGenYul extends CodeGenerator {
decl_1exp(id_memaddr, apply("allocate_memory", intlit(sizeOfContractST(contractType.contractName, checkedTable)))),

// return the address that the space starts at
assign1(retvar, id_memaddr)) ++ conCall
assign1(retvar, id_memaddr)) ++ conCall :+ ExpressionStatement(apply(nameTracer(contractType.contractName), Identifier("this")))


case StateInitializer(stateName, fieldName, obstype) =>
Expand Down
12 changes: 0 additions & 12 deletions src/main/scala/edu/cmu/cs/obsidian/codegen/yulAST.scala
Original file line number Diff line number Diff line change
Expand Up @@ -337,17 +337,6 @@ case class YulObject(contractName: String,

val mp_id: Identifier = Identifier("memPos")

// this is a hack to get the tracer to be run on the main call of the specific test that
// is in SetGetLogs.
// todo remove this once tracers get called on-demand
// todo this is a way to make exactly one test work but produces bizarre output on anything else
val maybe_trace : YulStatement =
if(f.name == "main_sgl") {
ExpressionStatement(apply("trace_SetGetLogs", Identifier("this")))
} else {
LineComment("do not trace")
}

Seq(
LineComment(s"entry for ${f.name}"),
// if callvalue() { revert(0, 0) }
Expand All @@ -363,7 +352,6 @@ case class YulObject(contractName: String,
// nb: the code for these is written dynamically below so we can assume that they exist before they do
decl_1exp(Identifier("memEnd"), apply(abi_encode_name(returns_from_call.length), mp_id +: returns_from_call: _*)),
// return(memPos, sub(memEnd, memPos))
maybe_trace,
codegen.ExpressionStatement(apply("return", mp_id, apply("sub", Identifier("memEnd"), mp_id)))
)
}
Expand Down

0 comments on commit 4626c1c

Please sign in to comment.