|
|
|
@ -1,69 +1,41 @@ |
|
|
|
eth = web3.eth; |
|
|
|
env = web3.env; |
|
|
|
|
|
|
|
var configSource = |
|
|
|
"{"+ |
|
|
|
" [[69]] (caller)"+ |
|
|
|
" (returnlll {"+ |
|
|
|
" (when (&& (= (calldatasize) 64) (= (caller) @@69))"+ |
|
|
|
" (for {} (< @i (calldatasize)) [i](+ @i 64)"+ |
|
|
|
" [[ (calldataload @i) ]] (calldataload (+ @i 32))"+ |
|
|
|
" )"+ |
|
|
|
" )"+ |
|
|
|
" (return @@ $0)"+ |
|
|
|
" })"+ |
|
|
|
"}"; |
|
|
|
|
|
|
|
console.log('Creating Config...') |
|
|
|
var config = eth.lll(configSource); |
|
|
|
config = config.then(function (configCode) { console.log('Config code: ' + configCode); return eth.transact({ 'code': configCode }); }); |
|
|
|
config.then(function(configAddress) { console.log('Config at address ' + configAddress); config = configAddress; return configAddress; }); |
|
|
|
|
|
|
|
// marek: TODO
|
|
|
|
var compile = function(name) { return web3.eth.lll(env.contents("../../dapp-bin/" + name + "/" + name + ".lll")); }; |
|
|
|
var create = function(code) { return web3.eth.transact({ 'code': code }); }; |
|
|
|
var send = function(from, val, to) { return web3.eth.transact({ 'from': from, 'value': val, 'to': to }); }; |
|
|
|
var initService = function(name, index, dep) { return dep.then(function(){ var ret = compile(name).then(create); register(ret, index); return ret; }); }; |
|
|
|
|
|
|
|
var config = compile("config").then(create); |
|
|
|
var register = function(address, index) { return web3.eth.transact({ 'to': config, 'gas': '10000', 'data': [index + '', address] }); }; |
|
|
|
var nameReg = initService("namereg", 0, config); |
|
|
|
var regName = function(account, name) { return web3.eth.transact({ 'from': account, 'to': nameReg, 'gas': '10000', 'data': [ web3.fromAscii('register'), web3.fromAscii(name) ] }); }; |
|
|
|
var coins = initService("coins", 1, nameReg); |
|
|
|
var coin = initService("coin", 2, coins); |
|
|
|
var approve = function(account, approvedAddress) { web3.eth.transact({ 'from': account, 'to': coin, 'gas': '10000', 'data': [ web3.fromAscii('approve'), approvedAddress ] }); }; |
|
|
|
var exchange = initService("exchange", 3, coin); |
|
|
|
var offer = function(account, haveCoin, haveVal, wantCoin, wantVal) { web3.eth.transact({ 'from': account, 'to': exchange, 'gas': '10000', 'data': [web3.fromAscii('new'), haveCoin, haveVal, wantCoin, wantVal] }); }; |
|
|
|
|
|
|
|
config.then(function() { |
|
|
|
web3.eth.accounts.then(function(accounts) |
|
|
|
{ |
|
|
|
var funded = send(accounts[0], '100000000000000000000', accounts[1]); |
|
|
|
funded.then(function(){ env.note("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); regName(accounts[1], 'Gav Would'); env.note("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); approve(accounts[1], exchange); }); |
|
|
|
regName(accounts[0], 'Gav'); |
|
|
|
approve(accounts[0], exchange).then(function(){ offer(accounts[0], coin, '5000', '0', '5000000000000000000'); }); |
|
|
|
|
|
|
|
// TODO: once we have a new implementation of DNSReg.
|
|
|
|
// env.note('Register gav.eth...')
|
|
|
|
// eth.transact({ 'to': dnsReg, 'data': [web3.fromAscii('register'), web3.fromAscii('gav'), web3.fromAscii('opensecrecy.com')] });
|
|
|
|
}); |
|
|
|
}); |
|
|
|
|
|
|
|
// TODO
|
|
|
|
/* |
|
|
|
|
|
|
|
var nameRegCode = eth.lll(" |
|
|
|
{ |
|
|
|
[[(address)]] 'NameReg |
|
|
|
[['NameReg]] (address) |
|
|
|
[[config]] 'Config |
|
|
|
[['Config]] config |
|
|
|
[[69]] (caller) |
|
|
|
(returnlll { |
|
|
|
(when (= $0 'register) { |
|
|
|
(when @@ $32 (stop)) |
|
|
|
(when @@(caller) [[@@(caller)]] 0) |
|
|
|
[[$32]] (caller) |
|
|
|
[[(caller)]] $32 |
|
|
|
(stop) |
|
|
|
}) |
|
|
|
(when (&& (= $0 'unregister) @@(caller)) { |
|
|
|
[[@@(caller)]] 0 |
|
|
|
[[(caller)]] 0 |
|
|
|
(stop) |
|
|
|
}) |
|
|
|
(when (&& (= $0 'kill) (= (caller) @@69)) (suicide (caller))) |
|
|
|
(return @@ $0) |
|
|
|
}) |
|
|
|
} |
|
|
|
"); |
|
|
|
env.note('NameReg code: ' + nameRegCode) |
|
|
|
|
|
|
|
var nameReg; |
|
|
|
|
|
|
|
env.note('Create NameReg...') |
|
|
|
eth.transact({ 'code': nameRegCode }, function(a) { nameReg = a; }); |
|
|
|
|
|
|
|
env.note('Register NameReg...') |
|
|
|
eth.transact({ 'to': config, 'data': ['0', nameReg] }); |
|
|
|
|
|
|
|
var nameRegJeff; |
|
|
|
|
|
|
|
env.note('Create NameRegJeff...') |
|
|
|
eth.transact({ 'code': nameRegCode }, function(a) { nameRegJeff = a; }); |
|
|
|
|
|
|
|
env.note('Register NameRegJeff...') |
|
|
|
eth.transact({ 'to': config, 'data': ['4', nameReg] }); |
|
|
|
eth.transact({ 'to': config, 'data': ['4', nameRegJeff] }); |
|
|
|
|
|
|
|
var dnsRegCode = '0x60006000546000600053602001546000600053604001546020604060206020600073661005d2720d855f1d9976f88bb10c1a3398c77f6103e8f17f7265676973746572000000000000000000000000000000000000000000000000600053606001600060200201547f446e735265670000000000000000000000000000000000000000000000000000600053606001600160200201546000600060006000604060606000600053604001536103e8f1327f6f776e65720000000000000000000000000000000000000000000000000000005761011663000000e46000396101166000f20060006000547f72656769737465720000000000000000000000000000000000000000000000006000602002350e0f630000006d596000600160200235560e0f630000006c59600032560e0f0f6300000057596000325657600260200235600160200235576001602002353257007f64657265676973746572000000000000000000000000000000000000000000006000602002350e0f63000000b95960016020023532560e0f63000000b959600032576000600160200235577f6b696c6c000000000000000000000000000000000000000000000000000000006000602002350e0f630000011559327f6f776e6572000000000000000000000000000000000000000000000000000000560e0f63000001155932ff00'; |
|
|
|
|
|
|
|
@ -75,240 +47,6 @@ env.note('DnsReg at address ' + dnsReg) |
|
|
|
|
|
|
|
env.note('Register DnsReg...') |
|
|
|
eth.transact({ 'to': config, 'data': ['4', dnsReg] }); |
|
|
|
|
|
|
|
var coinRegCode = eth.lll(" |
|
|
|
{ |
|
|
|
(regname 'CoinReg) |
|
|
|
(returnlll { |
|
|
|
(def 'name $0) |
|
|
|
(def 'denom $32) |
|
|
|
(def 'address (caller)) |
|
|
|
(when (|| (& 0xffffffffffffffffffffffffff name) @@name) (stop)) |
|
|
|
(set 'n (+ @@0 1)) |
|
|
|
[[0]] @n |
|
|
|
[[@n]] name |
|
|
|
[[name]] address |
|
|
|
[[(sha3 name)]] denom |
|
|
|
}) |
|
|
|
} |
|
|
|
"); |
|
|
|
|
|
|
|
var coinReg; |
|
|
|
env.note('Create CoinReg...') |
|
|
|
eth.transact({ 'code': coinRegCode }, function(a) { coinReg = a; }); |
|
|
|
|
|
|
|
env.note('Register CoinReg...') |
|
|
|
eth.transact({ 'to': config, 'data': ['1', coinReg] }); |
|
|
|
|
|
|
|
var gavCoinCode = eth.lll(" |
|
|
|
{ |
|
|
|
[[ (caller) ]] 0x1000000 |
|
|
|
[[ 0x69 ]] (caller) |
|
|
|
[[ 0x42 ]] (number) |
|
|
|
|
|
|
|
(regname 'GavCoin) |
|
|
|
(regcoin 'GAV 1000) |
|
|
|
|
|
|
|
(returnlll { |
|
|
|
(when (&& (= $0 'kill) (= (caller) @@0x69)) (suicide (caller))) |
|
|
|
(when (= $0 'balance) (return @@$32)) |
|
|
|
(when (= $0 'approved) (return @@ (sha3pair (if (= (calldatasize) 64) (caller) $64) $32)) ) |
|
|
|
|
|
|
|
(when (= $0 'approve) { |
|
|
|
[[(sha3pair (caller) $32)]] $32 |
|
|
|
(stop) |
|
|
|
}) |
|
|
|
|
|
|
|
(when (= $0 'send) { |
|
|
|
(set 'fromVar (if (= (calldatasize) 96) |
|
|
|
(caller) |
|
|
|
{ |
|
|
|
(when (! @@ (sha3pair (origin) (caller))) (return 0)) |
|
|
|
(origin) |
|
|
|
} |
|
|
|
)) |
|
|
|
(def 'to $32) |
|
|
|
(def 'value $64) |
|
|
|
(def 'from (get 'fromVar)) |
|
|
|
(set 'fromBal @@from) |
|
|
|
(when (< @fromBal value) (return 0)) |
|
|
|
[[ from ]]: (- @fromBal value) |
|
|
|
[[ to ]]: (+ @@to value) |
|
|
|
(return 1) |
|
|
|
}) |
|
|
|
|
|
|
|
(set 'n @@0x42) |
|
|
|
(when (&& (|| (= $0 'mine) (! (calldatasize))) (> (number) @n)) { |
|
|
|
(set 'b (- (number) @n)) |
|
|
|
[[(coinbase)]] (+ @@(coinbase) (* 1000 @b)) |
|
|
|
[[(caller)]] (+ @@(caller) (* 1000 @b)) |
|
|
|
[[0x42]] (number) |
|
|
|
(return @b) |
|
|
|
}) |
|
|
|
|
|
|
|
(return @@ $0) |
|
|
|
}) |
|
|
|
} |
|
|
|
"); |
|
|
|
|
|
|
|
var gavCoin; |
|
|
|
env.note('Create GavCoin...') |
|
|
|
eth.transact({ 'code': gavCoinCode }, function(a) { gavCoin = a; }); |
|
|
|
|
|
|
|
env.note('Register GavCoin...') |
|
|
|
eth.transact({ 'to': config, 'data': ['2', gavCoin] }); |
|
|
|
|
|
|
|
|
|
|
|
var exchangeCode = eth.lll(" |
|
|
|
{ |
|
|
|
(regname 'Exchange) |
|
|
|
|
|
|
|
(def 'min (a b) (if (< a b) a b)) |
|
|
|
|
|
|
|
(def 'head (_list) @@ _list) |
|
|
|
(def 'next (_item) @@ _item) |
|
|
|
(def 'inc (itemref) [itemref]: (next @itemref)) |
|
|
|
(def 'rateof (_item) @@ (+ _item 1)) |
|
|
|
(def 'idof (_item) @@ (+ _item 2)) |
|
|
|
(def 'wantof (_item) @@ (+ _item 3)) |
|
|
|
(def 'newitem (rate who want list) { |
|
|
|
(set 'pos (sha3trip rate who list)) |
|
|
|
[[ (+ @pos 1) ]] rate |
|
|
|
[[ (+ @pos 2) ]] who |
|
|
|
[[ (+ @pos 3) ]] want |
|
|
|
@pos |
|
|
|
}) |
|
|
|
(def 'stitchitem (parent pos) { |
|
|
|
[[ pos ]] @@ parent |
|
|
|
[[ parent ]] pos |
|
|
|
}) |
|
|
|
(def 'addwant (_item amount) [[ (+ _item 3) ]] (+ @@ (+ _item 3) amount)) |
|
|
|
(def 'deductwant (_item amount) [[ (+ _item 3) ]] (- @@ (+ _item 3) amount)) |
|
|
|
|
|
|
|
(def 'xfer (contract to amount) |
|
|
|
(if contract { |
|
|
|
[0] 'send |
|
|
|
[32] to |
|
|
|
[64] amount |
|
|
|
(msg allgas contract 0 0 96) |
|
|
|
} |
|
|
|
(send to amount) |
|
|
|
) |
|
|
|
) |
|
|
|
|
|
|
|
(def 'fpdiv (a b) (/ (+ (/ b 2) (* a (exp 2 128))) b)) |
|
|
|
(def 'fpmul (a b) (/ (* a b) (exp 2 128)) ) |
|
|
|
|
|
|
|
(returnlll { |
|
|
|
(when (= $0 'new) { |
|
|
|
(set 'offer $32) |
|
|
|
(set 'xoffer (if @offer $64 (callvalue))) |
|
|
|
(set 'want $96) |
|
|
|
(set 'xwant $128) |
|
|
|
(set 'rate (fpdiv @xoffer @xwant)) |
|
|
|
(set 'irate (fpdiv @xwant @xoffer)) |
|
|
|
|
|
|
|
(unless (&& @rate @irate @xoffer @xwant) (stop)) |
|
|
|
|
|
|
|
(when @offer { |
|
|
|
(set 'arg1 'send) |
|
|
|
(set 'arg2 (address)) |
|
|
|
(set 'arg3 @xoffer) |
|
|
|
(set 'arg4 (caller)) |
|
|
|
(unless (msg allgas @offer 0 arg1 128) (stop)) |
|
|
|
}) |
|
|
|
(set 'list (sha3pair @offer @want)) |
|
|
|
(set 'ilist (sha3pair @want @offer)) |
|
|
|
|
|
|
|
(set 'last @ilist) |
|
|
|
(set 'item @@ @last) |
|
|
|
|
|
|
|
(for {} (&& @item (>= (rateof @item) @irate)) {} { |
|
|
|
(set 'offerA (min @xoffer (wantof @item))) |
|
|
|
(set 'wantA (fpmul @offerA (rateof @item))) |
|
|
|
|
|
|
|
(set 'xoffer (- @xoffer @offerA)) |
|
|
|
(set 'xwant (- @xwant @wantA)) |
|
|
|
|
|
|
|
(deductwant @item @offerA) |
|
|
|
|
|
|
|
(xfer @offer (idof @item) @offerA) |
|
|
|
(xfer @want (caller) @wantA) |
|
|
|
|
|
|
|
(unless @xoffer (stop)) |
|
|
|
|
|
|
|
(set 'item @@ @item) |
|
|
|
[[ @last ]] @item |
|
|
|
}) |
|
|
|
|
|
|
|
(set 'last @list) |
|
|
|
(set 'item @@ @last) |
|
|
|
|
|
|
|
(set 'newpos (newitem @rate (caller) @xwant @list)) |
|
|
|
|
|
|
|
(for {} (&& @item (!= @item @newpos) (>= (rateof @item) @rate)) { (set 'last @item) (inc item) } {}) |
|
|
|
(if (= @item @newpos) |
|
|
|
(addwant @item @wantx) |
|
|
|
(stitchitem @last @newpos) |
|
|
|
) |
|
|
|
(stop) |
|
|
|
}) |
|
|
|
(when (= $0 'delete) { |
|
|
|
(set 'offer $32) |
|
|
|
(set 'want $64) |
|
|
|
(set 'rate $96) |
|
|
|
(set 'list (sha3pair @offer @want)) |
|
|
|
(set 'last @list) |
|
|
|
(set 'item @@ @last) |
|
|
|
(for {} (&& @item (!= (idof @item) (caller)) (!= (rateof @item) @rate)) { (set 'last @item) (inc item) } {}) |
|
|
|
(when @item { |
|
|
|
(set 'xoffer (fpmul (wantof @item) (rateof @item))) |
|
|
|
[[ @last ]] @@ @item |
|
|
|
(xfer @offer (caller) @xoffer) |
|
|
|
}) |
|
|
|
(stop) |
|
|
|
}) |
|
|
|
(when (= $0 'price) { |
|
|
|
(set 'offer $32) |
|
|
|
(set 'want $96) |
|
|
|
(set 'item (head (sha3pair @offer @want))) |
|
|
|
(return (if @item (rateof @list) 0)) |
|
|
|
}) |
|
|
|
}) |
|
|
|
} |
|
|
|
"); |
|
|
|
|
|
|
|
var exchange; |
|
|
|
env.note('Create Exchange...') |
|
|
|
eth.transact({ 'code': exchangeCode }, function(a) { exchange = a; }); |
|
|
|
|
|
|
|
env.note('Register Exchange...') |
|
|
|
eth.transact({ 'to': config, 'data': ['3', exchange] }); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
env.note('Register my name...') |
|
|
|
eth.transact({ 'to': nameReg, 'data': [ web3.fromAscii('register'), web3.fromAscii('Gav') ] }); |
|
|
|
|
|
|
|
env.note('Dole out ETH to other address...') |
|
|
|
eth.transact({ 'value': '100000000000000000000', 'to': eth.accounts[1] }); |
|
|
|
|
|
|
|
env.note('Register my other name...') |
|
|
|
eth.transact({ 'from': eth.keys[1], 'to': nameReg, 'data': [ web3.fromAscii('register'), web3.fromAscii("Gav Would") ] }); |
|
|
|
|
|
|
|
env.note('Approve Exchange...') |
|
|
|
eth.transact({ 'to': gavCoin, 'data': [ web3.fromAscii('approve'), exchange ] }); |
|
|
|
|
|
|
|
env.note('Approve Exchange on other address...') |
|
|
|
eth.transact({ 'from': eth.keys[1], 'to': gavCoin, 'data': [ web3.fromAscii('approve'), exchange ] }); |
|
|
|
|
|
|
|
env.note('Make offer 5000GAV/5ETH...') |
|
|
|
eth.transact({ 'to': exchange, 'data': [web3.fromAscii('new'), gavCoin, '5000', '0', '5000000000000000000'] }); |
|
|
|
|
|
|
|
env.note('Register gav.eth...') |
|
|
|
eth.transact({ 'to': dnsReg, 'data': [web3.fromAscii('register'), web3.fromAscii('gav'), web3.fromAscii('opensecrecy.com')] }); |
|
|
|
*/ |
|
|
|
env.note('All done.') |
|
|
|
|
|
|
|
// env.load('/home/gav/Eth/cpp-ethereum/stdserv.js')
|
|
|
|
|
Gav Wood
10 years ago