forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-21 12:16:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge dda91ab706 into 639ac5c3da

Browse source
This commit is contained in:
Fabian Vogelsteller 2015-02-19 23:47:51 +00:00
commit 73bbfcafb5
22 changed files with 592 additions and 592 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cmd/mist/assets/examples/whisper.html
View file

@ -40,23 +40,23 @@
document.querySelector("#id").innerHTML = id;
document.querySelector("#known").innerHTML = shh.haveIdentity(id);
var watch = shh.watch({topics: ["test"]})
var watch = shh.watch({topic: ["test"]})
watch.arrived(function(message) {
document.querySelector("#table").innerHTML += "<tr><td colspan='2'>"+JSON.stringify(message)+"</td></tr>";
});
var selfWatch = shh.watch({to: id, topics: ["test"]})
var selfWatch = shh.watch({to: id, topic: ["test"]})
selfWatch.arrived(function(message) {
document.querySelector("#table").innerHTML += "<tr><td>To me</td><td>"+JSON.stringify(message)+"</td></tr>";
});
function test() {
shh.post({topics: ["test"], payload: web3.fromAscii("test it")});
shh.post({topic: ["test"], payload: web3.fromAscii("test it")});
count();
}
function test2() {
shh.post({to: id, topics: ["test"], payload: web3.fromAscii("Private")});
shh.post({to: id, topic: ["test"], payload: web3.fromAscii("Private")});
count();
}

4
cmd/mist/assets/qml/depricated_browser.qml
View file

@ -384,11 +384,11 @@ Rectangle {
params[fields[i]] = params[fields[i]] || "";
}
if(typeof params.payload !== "object") { params.payload = [params.payload]; } //params.payload = params.payload.join(""); }
params.topics = params.topics || [];
params.topic = params.topic || [];
params.priority = params.priority || 1000;
params.ttl = params.ttl || 100;
shh.post(params.payload, params.to, params.from, params.topics, params.priority, params.ttl);
shh.post(params.payload, params.to, params.from, params.topic, params.priority, params.ttl);
break;

4
cmd/mist/assets/qml/views/whisper.qml
View file

@ -44,13 +44,13 @@ Rectangle {
placeholderText: "Data"
}
TextField {
id: topics
id: topic
placeholderText: "topic1, topic2, topic3, ..."
}
Button {
text: "Send"
onClicked: {
shh.post([eth.toHex(data.text)], "", identity, topics.text.split(","), 500, 50)
shh.post([eth.toHex(data.text)], "", identity, topic.text.split(","), 500, 50)
}
}
}

14
core/filter.go
View file

@ -31,7 +31,7 @@ type Filter struct {
skip int
address [][]byte
max int
topics [][]byte
topic [][]byte
BlockCallback func(*types.Block)
PendingCallback func(*types.Block)
@ -50,7 +50,7 @@ func (self *Filter) SetOptions(options FilterOptions) {
self.skip = options.Skip
self.max = options.Max
self.address = options.Address
self.topics = options.Topics
self.topic = options.Topics
}
@ -69,8 +69,8 @@ func (self *Filter) SetAddress(addr [][]byte) {
self.address = addr
}
func (self *Filter) SetTopics(topics [][]byte) {
self.topics = topics
func (self *Filter) SetTopics(topic [][]byte) {
self.topic = topic
}
func (self *Filter) SetMax(max int) {
@ -150,9 +150,9 @@ Logs:
continue
}
max := int(math.Min(float64(len(self.topics)), float64(len(log.Topics()))))
max := int(math.Min(float64(len(self.topic)), float64(len(log.Topics()))))
for i := 0; i < max; i++ {
if !bytes.Equal(log.Topics()[i], self.topics[i]) {
if !bytes.Equal(log.Topics()[i], self.topic[i]) {
continue Logs
}
}
@ -178,7 +178,7 @@ func (self *Filter) bloomFilter(block *types.Block) bool {
}
}
for _, topic := range self.topics {
for _, topic := range self.topic {
if !types.BloomLookup(block.Bloom(), topic) {
return false
}

2
javascript/types.go
View file

@ -40,7 +40,7 @@ func (self *JSBlock) GetTransaction(hash string) otto.Value {
type JSLog struct {
Address string `json:address`
Topics []string `json:topics`
Topics []string `json:topic`
Number int32 `json:number`
Data string `json:data`
}

2
rpc/util.go
View file

@ -80,7 +80,7 @@ type RpcServer interface {
type Log struct {
Address string `json:"address"`
Topics []string `json:"topics"`
Topics []string `json:"topic"`
Data string `json:"data"`
}

14
state/log.go
View file

@ -16,12 +16,12 @@ type Log interface {
type StateLog struct {
address []byte
topics [][]byte
topic [][]byte
data []byte
}
func NewLog(address []byte, topics [][]byte, data []byte) *StateLog {
return &StateLog{address, topics, data}
func NewLog(address []byte, topic [][]byte, data []byte) *StateLog {
return &StateLog{address, topic, data}
}
func (self *StateLog) Address() []byte {
@ -29,7 +29,7 @@ func (self *StateLog) Address() []byte {
}
func (self *StateLog) Topics() [][]byte {
return self.topics
return self.topic
}
func (self *StateLog) Data() []byte {
@ -44,18 +44,18 @@ func NewLogFromValue(decoder *ethutil.Value) *StateLog {
it := decoder.Get(1).NewIterator()
for it.Next() {
log.topics = append(log.topics, it.Value().Bytes())
log.topic = append(log.topic, it.Value().Bytes())
}
return log
}
func (self *StateLog) RlpData() interface{} {
return []interface{}{self.address, ethutil.ByteSliceToInterface(self.topics), self.data}
return []interface{}{self.address, ethutil.ByteSliceToInterface(self.topic), self.data}
}
func (self *StateLog) String() string {
return fmt.Sprintf(`log: %x %x %x`, self.address, self.topics, self.data)
return fmt.Sprintf(`log: %x %x %x`, self.address, self.topic, self.data)
}
type Logs []Log

66
tests/files/StateTests/stLogTests.json
View file

@ -13,7 +13,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000000000000000000000000000000000000000000000000000000000000000000000000",
"data" : "0x",
"topics" : [
"topic" : [
]
}
],
@ -246,7 +246,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000000000000000000000000000000000000000000000000000000000000000000000000",
"data" : "0x",
"topics" : [
"topic" : [
]
}
],
@ -329,7 +329,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000000000000000000000000000000000000000000000000000000000000000000000000",
"data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"topics" : [
"topic" : [
]
}
],
@ -412,7 +412,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000000000000000000000000000000000000000000000000000000000000000000000000",
"data" : "0xaa",
"topics" : [
"topic" : [
]
}
],
@ -495,7 +495,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000000000000000000000000000000000000000000000000000000000000000000000000",
"data" : "0xdd",
"topics" : [
"topic" : [
]
}
],
@ -578,7 +578,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000002880000000000000000000010000004000000000000000000000000000000000000000000000",
"data" : "0xff00000000000000000000000000000000000000000000000000000000000000",
"topics" : [
"topic" : [
"000000000000000000000000095e7baea6a6c7c4c2dfeb977efac326af552d87"
]
}
@ -662,7 +662,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000200000800000000000000000000000000000000880000000000000000000000000000000000000000000000010000000000000000000000020",
"data" : "0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd",
"topics" : [
"topic" : [
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
]
}
@ -746,7 +746,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0x",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000"
]
}
@ -980,7 +980,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0x",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000"
]
}
@ -1064,7 +1064,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000"
]
}
@ -1148,7 +1148,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0xaa",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000"
]
}
@ -1232,7 +1232,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0xdd",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000"
]
}
@ -1316,7 +1316,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000002880000020000000000002010000004000000000080000000000000000000000000000000000",
"data" : "0xff00000000000000000000000000000000000000000000000000000000000000",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"000000000000000000000000095e7baea6a6c7c4c2dfeb977efac326af552d87"
]
@ -1401,7 +1401,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000200000800000000000000000000000000000000880000000000000000000000000000000000000000000000010000000000000000000000020",
"data" : "0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd",
"topics" : [
"topic" : [
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
]
@ -1486,7 +1486,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0x",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000"
]
@ -1721,7 +1721,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0x",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000"
]
@ -1806,7 +1806,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000"
]
@ -1891,7 +1891,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0xaa",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000"
]
@ -1976,7 +1976,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0xdd",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000"
]
@ -2061,7 +2061,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000002880000020000000000002010000004000000000080000000000000000000000000000000000",
"data" : "0xff00000000000000000000000000000000000000000000000000000000000000",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",
"000000000000000000000000095e7baea6a6c7c4c2dfeb977efac326af552d87"
@ -2147,7 +2147,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000200000800000000000000000000000000000000880000000000000000000000000000000000000000000000010000000000000000000000020",
"data" : "0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd",
"topics" : [
"topic" : [
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
@ -2233,7 +2233,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00003004000000000000800000000010000008000000000000000980000000000000000000000000000000000000000000001000000400000000000800000000",
"data" : "0xff00000000000000000000000000000000000000000000000000000000000000",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000007",
"0000000000000000000000000000000000000000000000000000000000000006",
"0000000000000000000000000000000000000000000000000000000000000005"
@ -2319,7 +2319,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0x",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000"
@ -2555,7 +2555,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0x",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000"
@ -2641,7 +2641,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000"
@ -2727,7 +2727,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0xaa",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000"
@ -2813,7 +2813,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0xdd",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000"
@ -2975,7 +2975,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000200000800000000000000000000000000000000880000000000000000000000000000000000000000000000010000000000000000000000020",
"data" : "0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd",
"topics" : [
"topic" : [
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
@ -3138,7 +3138,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0x",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",
@ -3375,7 +3375,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0x",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",
@ -3462,7 +3462,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",
@ -3549,7 +3549,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0xaa",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",
@ -3636,7 +3636,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0xdd",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",

936
tests/files/StateTests/stSystemOperationsTest.json
View file

File diff suppressed because it is too large Load diff

2
tests/files/VMTests/RandomTests/goFail3.json
View file

@ -26,7 +26,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000000000000000000000000000000000000000000000000000000000000000000000000",
"data" : "0x",
"topics" : [
"topic" : [
]
}
],

70
tests/files/VMTests/vmLogTest.json
View file

@ -26,7 +26,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000000000000000000000000000000000000000000000000000000000000000000000000",
"data" : "0x",
"topics" : [
"topic" : [
]
}
],
@ -135,7 +135,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000000000000000000000000000000000000000000000000000000000000000000000000",
"data" : "0x",
"topics" : [
"topic" : [
]
}
],
@ -186,7 +186,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000000000000000000000000000000000000000000000000000000000000000000000000",
"data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"topics" : [
"topic" : [
]
}
],
@ -237,7 +237,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000000000000000000000000000000000000000000000000000000000000000000000000",
"data" : "0xaa",
"topics" : [
"topic" : [
]
}
],
@ -288,7 +288,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000000000000000000000000000000000000000000000000000000000000000000000000",
"data" : "0xdd",
"topics" : [
"topic" : [
]
}
],
@ -339,7 +339,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000008000000808100000000000000000000000000000880000000000000000000000000000000000000000000000000000000000000000000000000",
"data" : "0xff00000000000000000000000000000000000000000000000000000000000000",
"topics" : [
"topic" : [
"000000000000000000000000cd1722f3947def4cf144679da39c4c32bdc35681"
]
}
@ -391,7 +391,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000200000800000000000000000000000000000000880000000000000000000000000000000000000000000000010000000000000000000000020",
"data" : "0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd",
"topics" : [
"topic" : [
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
]
}
@ -443,7 +443,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0x",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000"
]
}
@ -553,7 +553,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0x",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000"
]
}
@ -605,7 +605,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000"
]
}
@ -657,7 +657,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0xaa",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000"
]
}
@ -709,7 +709,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0xdd",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000"
]
}
@ -761,7 +761,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000008000000808100000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0xff00000000000000000000000000000000000000000000000000000000000000",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"000000000000000000000000cd1722f3947def4cf144679da39c4c32bdc35681"
]
@ -814,7 +814,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000200000800000000000000000000000000000000880000000000000000000000000000000000000000000000010000000000000000000000020",
"data" : "0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd",
"topics" : [
"topic" : [
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
]
@ -867,7 +867,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0x",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000"
]
@ -978,7 +978,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0x",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000"
]
@ -1031,7 +1031,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000"
]
@ -1084,7 +1084,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0xaa",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000"
]
@ -1137,7 +1137,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0xdd",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000"
]
@ -1190,7 +1190,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000008000000808100000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0xff00000000000000000000000000000000000000000000000000000000000000",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",
"000000000000000000000000cd1722f3947def4cf144679da39c4c32bdc35681"
@ -1244,7 +1244,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000200000800000000000000000000000000000000880000000000000000000000000000000000000000000000010000000000000000000000020",
"data" : "0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd",
"topics" : [
"topic" : [
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
@ -1298,7 +1298,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00003004000000000000800000000010000008000000000000000980000000000000000000000000000000000000000000001000000400000000000800000000",
"data" : "0xff00000000000000000000000000000000000000000000000000000000000000",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000007",
"0000000000000000000000000000000000000000000000000000000000000006",
"0000000000000000000000000000000000000000000000000000000000000005"
@ -1352,7 +1352,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0x",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000"
@ -1464,7 +1464,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0x",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000"
@ -1518,7 +1518,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000"
@ -1572,7 +1572,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0xaa",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000"
@ -1626,7 +1626,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0xdd",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000"
@ -1724,7 +1724,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000200000800000000000000000000000000000000880000000000000000000000000000000000000000000000010000000000000000000000020",
"data" : "0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd",
"topics" : [
"topic" : [
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
@ -1823,7 +1823,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0x",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",
@ -1936,7 +1936,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0x",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",
@ -1991,7 +1991,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",
@ -2046,7 +2046,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0xaa",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",
@ -2101,7 +2101,7 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000020000000000002000000000000000000080000000000000000000000000000000000",
"data" : "0xdd",
"topics" : [
"topic" : [
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",
"0000000000000000000000000000000000000000000000000000000000000000",
@ -2156,14 +2156,14 @@
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000000000000000000000000000000000000000000000000000000000000000000000000",
"data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"topics" : [
"topic" : [
]
},
{
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"bloom" : "00000000000000000000800000000000000000000000000000000880000000000000000000000000000000000000000000000000000000000000000000000000",
"data" : "0xffffffffffffffffffffffffffffffff",
"topics" : [
"topic" : [
]
}
],

2
tests/vm/gh_test.go
View file

@ -24,7 +24,7 @@ type Account struct {
type Log struct {
AddressF string `json:"address"`
DataF string `json:"data"`
TopicsF []string `json:"topics"`
TopicsF []string `json:"topic"`
BloomF string `json:"bloom"`
}

4
ui/filter.go
View file

@ -43,8 +43,8 @@ func NewFilterFromMap(object map[string]interface{}, eth core.Backend) *core.Fil
filter.SetSkip(int(val.Uint()))
}
if object["topics"] != nil {
filter.SetTopics(MakeTopics(object["topics"]))
if object["topic"] != nil {
filter.SetTopics(MakeTopics(object["topic"]))
}
return filter

4
ui/qt/filter.go
View file

@ -9,8 +9,8 @@ import (
func NewFilterFromMap(object map[string]interface{}, eth core.Backend) *core.Filter {
filter := ui.NewFilterFromMap(object, eth)
if object["topics"] != nil {
filter.SetTopics(makeTopics(object["topics"]))
if object["topic"] != nil {
filter.SetTopics(makeTopics(object["topic"]))
}
return filter

12
ui/qt/qwhisper/whisper.go
View file

@ -36,7 +36,7 @@ func (self *Whisper) SetView(view qml.Object) {
self.view = view
}
func (self *Whisper) Post(payload []string, to, from string, topics []string, priority, ttl uint32) {
func (self *Whisper) Post(payload []string, to, from string, topic []string, priority, ttl uint32) {
var data []byte
for _, d := range payload {
data = append(data, fromHex(d)...)
@ -49,7 +49,7 @@ func (self *Whisper) Post(payload []string, to, from string, topics []string, pr
Ttl: time.Duration(ttl) * time.Second,
To: crypto.ToECDSAPub(fromHex(to)),
From: key,
Topics: whisper.TopicsFromString(topics...),
Topics: whisper.TopicsFromString(topic...),
})
if err != nil {
@ -111,10 +111,10 @@ func filterFromMap(opts map[string]interface{}) (f whisper.Filter) {
if from, ok := opts["from"].(string); ok {
f.From = crypto.ToECDSAPub(fromHex(from))
}
if topicList, ok := opts["topics"].(*qml.List); ok {
var topics []string
topicList.Convert(&topics)
f.Topics = whisper.TopicsFromString(topics...)
if topicList, ok := opts["topic"].(*qml.List); ok {
var topic []string
topicList.Convert(&topic)
f.Topics = whisper.TopicsFromString(topic...)
}
return

8
vm/environment.go
View file

@ -52,7 +52,7 @@ func Transfer(from, to Account, amount *big.Int) error {
type Log struct {
address []byte
topics [][]byte
topic [][]byte
data []byte
}
@ -61,7 +61,7 @@ func (self *Log) Address() []byte {
}
func (self *Log) Topics() [][]byte {
return self.topics
return self.topic
}
func (self *Log) Data() []byte {
@ -69,9 +69,9 @@ func (self *Log) Data() []byte {
}
func (self *Log) RlpData() interface{} {
return []interface{}{self.address, ethutil.ByteSliceToInterface(self.topics), self.data}
return []interface{}{self.address, ethutil.ByteSliceToInterface(self.topic), self.data}
}
func (self *Log) String() string {
return fmt.Sprintf("[A=%x T=%x D=%x]", self.address, self.topics, self.data)
return fmt.Sprintf("[A=%x T=%x D=%x]", self.address, self.topic, self.data)
}

6
vm/vm.go
View file

@ -571,14 +571,14 @@ func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.I
self.Printf(" => [%d] %x [0] %x", n, x.Bytes(), y.Bytes())
case LOG0, LOG1, LOG2, LOG3, LOG4:
n := int(op - LOG0)
topics := make([][]byte, n)
topic := make([][]byte, n)
mSize, mStart := stack.Popn()
for i := 0; i < n; i++ {
topics[i] = ethutil.LeftPadBytes(stack.Pop().Bytes(), 32)
topic[i] = ethutil.LeftPadBytes(stack.Pop().Bytes(), 32)
}
data := mem.Get(mStart.Int64(), mSize.Int64())
log := &Log{context.Address(), topics, data}
log := &Log{context.Address(), topic, data}
self.env.AddLog(log)
self.Printf(" => %v", log)

12
vm/vm_jit.go
View file

@ -344,21 +344,21 @@ func env_log(_vm unsafe.Pointer, dataPtr unsafe.Pointer, dataLen uint64, _topic1
data := C.GoBytes(dataPtr, C.int(dataLen))
topics := make([][]byte, 0, 4)
topic := make([][]byte, 0, 4)
if _topic1 != nil {
topics = append(topics, llvm2hash((*i256)(_topic1)))
topic = append(topic, llvm2hash((*i256)(_topic1)))
}
if _topic2 != nil {
topics = append(topics, llvm2hash((*i256)(_topic2)))
topic = append(topic, llvm2hash((*i256)(_topic2)))
}
if _topic3 != nil {
topics = append(topics, llvm2hash((*i256)(_topic3)))
topic = append(topic, llvm2hash((*i256)(_topic3)))
}
if _topic4 != nil {
topics = append(topics, llvm2hash((*i256)(_topic4)))
topic = append(topic, llvm2hash((*i256)(_topic4)))
}
vm.Env().AddLog(state.NewLog(vm.me.Address(), topics, data))
vm.Env().AddLog(state.NewLog(vm.me.Address(), topic, data))
}
//export env_extcode

4
whisper/envelope.go
View file

@ -34,10 +34,10 @@ func (self *Envelope) Hash() Hash {
return self.hash
}
func NewEnvelope(ttl time.Duration, topics [][]byte, data *Message) *Envelope {
func NewEnvelope(ttl time.Duration, topic [][]byte, data *Message) *Envelope {
exp := time.Now().Add(ttl)
return &Envelope{uint32(exp.Unix()), uint32(ttl.Seconds()), topics, data.Bytes(), 0, Hash{}}
return &Envelope{uint32(exp.Unix()), uint32(ttl.Seconds()), topic, data.Bytes(), 0, Hash{}}
}
func (self *Envelope) Seal(pow time.Duration) {

2
whisper/util.go
View file

@ -8,7 +8,7 @@ func hashTopic(topic []byte) []byte {
// NOTE this isn't DRY, but I don't want to iterate twice.
// Returns a formatted topics byte slice.
// Returns a formatted topic byte slice.
// data: unformatted data (e.g., no hashes needed)
func Topics(data [][]byte) [][]byte {
d := make([][]byte, len(data))

4
whisper/whisper.go
View file

@ -269,9 +269,9 @@ func (self *Whisper) Protocol() p2p.Protocol {
return self.protocol
}
func createFilter(message *Message, topics [][]byte, key *ecdsa.PrivateKey) filter.Filter {
func createFilter(message *Message, topic [][]byte, key *ecdsa.PrivateKey) filter.Filter {
return filter.Generic{
Str1: string(crypto.FromECDSAPub(&key.PublicKey)), Str2: string(crypto.FromECDSAPub(message.Recover())),
Data: bytesToMap(topics),
Data: bytesToMap(topic),
}
}

4
xeth/whisper.go
View file

@ -19,7 +19,7 @@ func NewWhisper(w *whisper.Whisper) *Whisper {
return &Whisper{w}
}
func (self *Whisper) Post(payload string, to, from string, topics []string, priority, ttl uint32) error {
func (self *Whisper) Post(payload string, to, from string, topic []string, priority, ttl uint32) error {
if priority == 0 {
priority = 1000
}
@ -35,7 +35,7 @@ func (self *Whisper) Post(payload string, to, from string, topics []string, prio
Ttl: time.Duration(ttl) * time.Second,
To: crypto.ToECDSAPub(fromHex(to)),
From: key,
Topics: whisper.TopicsFromString(topics...),
Topics: whisper.TopicsFromString(topic...),
})
if err != nil {