aboutsummaryrefslogtreecommitdiffstats
path: root/internal
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2017-06-26 18:44:35 +0800
committerGitHub <noreply@github.com>2017-06-26 18:44:35 +0800
commitfeb29327066d6076d1802cdc1492d43a39cec276 (patch)
tree93f3231648b0f225c0c8d44bf81304282f93b605 /internal
parentf321ed23fbaad8a13cc672f601b15f5272b4b2bb (diff)
parentea1d1825a8509b3353c535c9444861e15471942a (diff)
downloadgo-tangerine-feb29327066d6076d1802cdc1492d43a39cec276.tar
go-tangerine-feb29327066d6076d1802cdc1492d43a39cec276.tar.gz
go-tangerine-feb29327066d6076d1802cdc1492d43a39cec276.tar.bz2
go-tangerine-feb29327066d6076d1802cdc1492d43a39cec276.tar.lz
go-tangerine-feb29327066d6076d1802cdc1492d43a39cec276.tar.xz
go-tangerine-feb29327066d6076d1802cdc1492d43a39cec276.tar.zst
go-tangerine-feb29327066d6076d1802cdc1492d43a39cec276.zip
Merge pull request #14540 from bas-vk/whisper-api
whisperv5: integrate whisper and implement API
Diffstat (limited to 'internal')
-rw-r--r--internal/web3ext/web3ext.go62
1 files changed, 36 insertions, 26 deletions
diff --git a/internal/web3ext/web3ext.go b/internal/web3ext/web3ext.go
index e35d74ae1..948d659c2 100644
--- a/internal/web3ext/web3ext.go
+++ b/internal/web3ext/web3ext.go
@@ -527,10 +527,6 @@ web3._extend({
property: 'shh',
methods: [
new web3._extend.Method({
- name: 'info',
- call: 'shh_info'
- }),
- new web3._extend.Method({
name: 'setMaxMessageLength',
call: 'shh_setMaxMessageLength',
params: 1
@@ -541,8 +537,8 @@ web3._extend({
params: 1
}),
new web3._extend.Method({
- name: 'allowP2PMessagesFromPeer',
- call: 'shh_allowP2PMessagesFromPeer',
+ name: 'markTrustedPeer',
+ call: 'shh_markTrustedPeer',
params: 1
}),
new web3._extend.Method({
@@ -570,38 +566,38 @@ web3._extend({
params: 1
}),
new web3._extend.Method({
- name: 'generateSymmetricKey',
- call: 'shh_generateSymmetricKey',
+ name: 'newSymKey',
+ call: 'shh_newSymKey',
}),
new web3._extend.Method({
- name: 'addSymmetricKeyDirect',
- call: 'shh_addSymmetricKeyDirect',
+ name: 'addSymKey',
+ call: 'shh_addSymKey',
params: 1
}),
new web3._extend.Method({
- name: 'addSymmetricKeyFromPassword',
- call: 'shh_addSymmetricKeyFromPassword',
+ name: 'generateSymKeyFromPassword',
+ call: 'shh_generateSymKeyFromPassword',
params: 1
}),
new web3._extend.Method({
- name: 'hasSymmetricKey',
- call: 'shh_hasSymmetricKey',
+ name: 'hasSymKey',
+ call: 'shh_hasSymKey',
params: 1
}),
new web3._extend.Method({
- name: 'getSymmetricKey',
- call: 'shh_getSymmetricKey',
+ name: 'getSymKey',
+ call: 'shh_getSymKey',
params: 1
}),
new web3._extend.Method({
- name: 'deleteSymmetricKey',
- call: 'shh_deleteSymmetricKey',
+ name: 'deleteSymKey',
+ call: 'shh_deleteSymKey',
params: 1
}),
new web3._extend.Method({
name: 'subscribe',
call: 'shh_subscribe',
- params: 1
+ params: 2
}),
new web3._extend.Method({
name: 'unsubscribe',
@@ -609,18 +605,28 @@ web3._extend({
params: 1
}),
new web3._extend.Method({
- name: 'getNewSubscriptionMessages',
- call: 'shh_getNewSubscriptionMessages',
+ name: 'post',
+ call: 'shh_post',
params: 1
}),
new web3._extend.Method({
- name: 'getFloatingMessages',
- call: 'shh_getFloatingMessages',
+ name: 'publicKey',
+ call: 'shh_getPublicKey',
params: 1
}),
new web3._extend.Method({
- name: 'post',
- call: 'shh_post',
+ name: 'getFilterMessages',
+ call: 'shh_getFilterMessages',
+ params: 1
+ }),
+ new web3._extend.Method({
+ name: 'deleteMessageFilter',
+ call: 'shh_deleteMessageFilter',
+ params: 1
+ }),
+ new web3._extend.Method({
+ name: 'newMessageFilter',
+ call: 'shh_newMessageFilter',
params: 1
})
],
@@ -630,7 +636,11 @@ web3._extend({
name: 'version',
getter: 'shh_version',
outputFormatter: web3._extend.utils.toDecimal
- })
+ }),
+ new web3._extend.Property({
+ name: 'info',
+ getter: 'shh_info'
+ }),
]
});
`