aboutsummaryrefslogtreecommitdiffstats
path: root/contracts
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2972 from Arachnid/ensFelix Lange2016-09-012-5/+26
|\ | | | | contracts/ens: Replace setOwner with setSubnodeOwner per EIP137
| * contracts/ens: Replace setOwner with setSubnodeOwner in accordance with EIP137Nick Johnson2016-09-012-5/+26
| |
* | swarm: plan bee for content storage and distribution on web3ΞTHΞЯSPHΞЯΞ2016-08-311-4/+3
|/ | | | | | | | | | | | | | | | | | | | | | | This change imports the Swarm protocol codebase. Compared to the 'swarm' branch, a few mostly cosmetic changes had to be made: * The various redundant log message prefixes are gone. * All files now have LGPLv3 license headers. * Minor code changes were needed to please go vet and make the tests pass on Windows. * Further changes were required to adapt to the go-ethereum develop branch and its new Go APIs. Some code has not (yet) been brought over: * swarm/cmd/bzzhash: will reappear as cmd/bzzhash later * swarm/cmd/bzzup.sh: will be reimplemented in cmd/bzzup * swarm/cmd/makegenesis: will reappear somehow * swarm/examples/album: will move to a separate repository * swarm/examples/filemanager: ditto * swarm/examples/files: will not be merged * swarm/test/*: will not be merged * swarm/services/swear: will reappear as contracts/swear when needed
* Merge pull request #2962 from fjl/release-moveFelix Lange2016-08-314-0/+1207
|\ | | | | contracts/release: move package release to contracts/
| * contracts/release: move package release to contracts/Felix Lange2016-08-304-0/+1207
| | | | | | | | | | | | This change also deletes generator.go, moving the only interesting line in it into release.go. The binding has been regenerated with abigen from develop and solc v0.3.6.
* | Merge pull request #2963 from fjl/ens-solc-0.3.6Felix Lange2016-08-313-12/+12
|\ \ | | | | | | contracts/ens: regenerate binding with solc v0.3.6
| * | contracts/ens: regenerate binding with solc v0.3.6Felix Lange2016-08-303-12/+12
| |/
* / contracts/chequebook/contract: fix possible reentrancy bug in chequebook.solDaniel A. Nagy2016-08-314-39/+10
|/
* Merge pull request #2952 from Arachnid/ensFelix Lange2016-08-305-0/+1391
|\ | | | | contracts/ens: Add ENS contract binding
| * contracts/ens: Add ENS contract bindingNick Johnson2016-08-305-0/+1391
|
* contracts/chequebook: add chequebook contract wrapperViktor Trón2016-08-297-0/+1930
The wrapper code is adapted from the swarm/services/chequebook package with the following mostly cosmetic changes: * The code now uses the new Go API interfaces to query balances. Some minor functional changes were required to make this work. * The package no longer depends on swarm/services/swap/swap. References to swap.Promise are replaced by interface{}, the base type of Promise. This is temporary. * The contract wrapper has been regenerated with latest abigen and solc v0.3.6. * There is a new generator that creates the 'deployed code' variable. * Documentation comments now follow the recommended godoc style. * [CHEQUEBOOK] log prefixes are gone. * LGPL license headers have been added to all files.