Skip to content

Commit 3ff7022

Browse files
andkononykhinandkononykhin
committed
Merge remote-tracking branch 'upstream/master' into issue-238-ceremony-verification
Signed-off-by: Andrey Kononykhin <andkononykhin@gmail.com>
2 parents b839793 + 9d12ffb commit 3ff7022

File tree

76 files changed

+2460
-553
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+2460
-553
lines changed

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ LICENSED_FILES = $(shell find . -type f -not -path '*/.*' -not -name '*.md' -not
9090

9191
MK_TEST = "Makefile.test"
9292
LOCALNET_TARGETS = image localnet_init localnet_start localnet_stop localnet_clean localnet_export localnet_reset localnet_rebuild
93-
TEST_DEPLOY_TARGETS = test_deploy_image test_deploy_env_build test_deploy_env_clean
93+
TEST_DEPLOY_TARGETS = test_deploy_image test_deploy_env_build make test_deploy_genesis_env_build test_deploy_env_clean
9494
TEST_TARGETS= ${LOCALNET_TARGETS} ${TEST_DEPLOY_TARGETS}
9595

9696
all: install

‎deployment/persistent_chains/testnet-2.0/testnet-2.0-launch.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ The following steps are expected to be done **before** the ceremony.
115115

116116
6. **[Optional] Configure ON Nodes**
117117

118-
Do steps 1.1 - 1.6 for all ON Nodes.
118+
Do steps 1.1 - 1.7 for all ON Nodes.
119119

120120
7. [CSA Only] Create `persistent_peers.txt` file containing `<node1-ID>@<node1-IP>:26656,...` for all VNs. Share in Slack/doc.
121121

‎docs/static/openapi.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -2001,7 +2001,7 @@ paths:
20012001
items:
20022002
type: object
20032003
properties:
2004-
address:
2004+
account:
20052005
type: object
20062006
properties:
20072007
baseAccount:
@@ -2508,7 +2508,7 @@ paths:
25082508
pendingAccount:
25092509
type: object
25102510
properties:
2511-
address:
2511+
account:
25122512
type: object
25132513
properties:
25142514
baseAccount:
@@ -8124,7 +8124,7 @@ definitions:
81248124
zigbeealliance.distributedcomplianceledger.dclauth.PendingAccount:
81258125
type: object
81268126
properties:
8127-
address:
8127+
account:
81288128
type: object
81298129
properties:
81308130
baseAccount:
@@ -8613,7 +8613,7 @@ definitions:
86138613
items:
86148614
type: object
86158615
properties:
8616-
address:
8616+
account:
86178617
type: object
86188618
properties:
86198619
baseAccount:
@@ -9139,7 +9139,7 @@ definitions:
91399139
pendingAccount:
91409140
type: object
91419141
properties:
9142-
address:
9142+
account:
91439143
type: object
91449144
properties:
91459145
baseAccount:

‎docs/transactions.md

+18-9
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,8 @@ The certificate is immutable. It can only be revoked by either the owner or a qu
634634
635635
- Parameters:
636636
- cert: `string` - PEM encoded certificate (string or path to file containing data)
637-
- info: `optional(string)` - information/notes for approval, proposal or revocation
637+
- info: `optional(string)` - information/notes for the proposal
638+
- time: `optional(int64)` - proposal time (number of nanoseconds elapsed since January 1, 1970 UTC). CLI uses the current time for that field.
638639
- In State: `pki/ProposedCertificate/value/<Certificate's Subject>/<Certificate's Subject Key ID>`
639640
- Who can send:
640641
- Any role
@@ -660,7 +661,8 @@ The certificate is not active until sufficient number of Trustees approve it.
660661
- Parameters:
661662
- subject: `string` - proposed certificates's `Subject`
662663
- subject_key_id: `string` - proposed certificates's `Subject Key Id`
663-
- info: `optional(string)` - information/notes for approval, proposal or revocation
664+
- info: `optional(string)` - information/notes for the approval
665+
- time: `optional(int64)` - approval time (number of nanoseconds elapsed since January 1, 1970 UTC). CLI uses the current time for that field.
664666
- In State: `pki/ApprovedCertificates/value/<Certificate's Subject>/<Certificate's Subject Key ID>`
665667
- Who can send:
666668
- Trustee
@@ -712,7 +714,8 @@ Root certificates can not be revoked this way, use `PROPOSE_X509_CERT_REVOC` an
712714
- Parameters:
713715
- subject: `string` - certificates's `Subject`
714716
- subject_key_id: `string` - certificates's `Subject Key Id`
715-
- info: `optional(string)` - information/notes for approval, proposal or revocation
717+
- info: `optional(string)` - information/notes for the revocation
718+
- time: `optional(int64)` - revocation time (number of nanoseconds elapsed since January 1, 1970 UTC). CLI uses the current time for that field.
716719
- In State: `pki/RevokedCertificates/value/<Certificate's Subject>/<Certificate's Subject Key ID>`
717720
- Who can send:
718721
- Any role; owner
@@ -732,7 +735,8 @@ then the certificate will be in a pending state until sufficient number of other
732735
- Parameters:
733736
- subject: `string` - certificates's `Subject`
734737
- subject_key_id: `string` - certificates's `Subject Key Id`
735-
- info: `optional(string)` - information/notes for approval, proposal or revocation
738+
- info: `optional(string)` - information/notes for the revocation proposal
739+
- time: `optional(int64)` - revocation proposal time (number of nanoseconds elapsed since January 1, 1970 UTC). CLI uses the current time for that field.
736740
- In State: `pki/ProposedCertificateRevocation/value/<Certificate's Subject>/<Certificate's Subject Key ID>`
737741
- Who can send:
738742
- Trustee
@@ -752,7 +756,8 @@ The revocation is not applied until sufficient number of Trustees approve it.
752756
- Parameters:
753757
- subject: `string` - certificates's `Subject`
754758
- subject_key_id: `string` - certificates's `Subject Key Id`
755-
- info: `optional(string)` - information/notes for approval, proposal or revocation
759+
- info: `optional(string)` - information/notes for the revocation approval
760+
- time: `optional(int64)` - revocation approval time (number of nanoseconds elapsed since January 1, 1970 UTC). CLI uses the current time for that field.
756761
- In State: `pki/RevokedCertificates/value/<Certificate's Subject>/<Certificate's Subject Key ID>`
757762
- Who can send:
758763
- Trustee
@@ -946,7 +951,8 @@ will be in a pending state until sufficient number of approvals is received.
946951
- pub_key: `string` - account's Protobuf JSON encoded public key
947952
- vid: `optional(uint16)` - vendor id (only needed for vendor role)
948953
- roles: `array<string>` - the list of roles, comma-separated, assigning to the account. Supported roles: `Vendor`, `TestHouse`, `CertificationCenter`, `Trustee`, `NodeAdmin`.
949-
- info: `optional(string)` - information/notes for approval, proposal or revocation
954+
- info: `optional(string)` - information/notes for the proposal
955+
- time: `optional(int64)` - proposal time (number of nanoseconds elapsed since January 1, 1970 UTC). CLI uses the current time for that field.
950956
- In State: `dclauth/PendingAccount/value/<address>`
951957
- Who can send:
952958
- Trustee
@@ -962,7 +968,8 @@ The account is not active until sufficient number of Trustees approve it.
962968
963969
- Parameters:
964970
- address: `string` - account address; Bench32 encoded
965-
- info: `optional(string)` - information/notes for approval, proposal or revocation
971+
- info: `optional(string)` - information/notes for the approval
972+
- time: `optional(int64)` - approval time (number of nanoseconds elapsed since January 1, 1970 UTC). CLI uses the current time for that field.
966973
- In State: `dclauth/Account/value/<address>`
967974
- Who can send:
968975
- Trustee
@@ -982,7 +989,8 @@ will be in a pending state until sufficient number of approvals is received.
982989
983990
- Parameters:
984991
- address: `string` - account address; Bench32 encoded
985-
- info: `optional(string)` - information/notes for approval, proposal or revocation
992+
- info: `optional(string)` - information/notes for the revocation proposal
993+
- time: `optional(int64)` - revocation proposal time (number of nanoseconds elapsed since January 1, 1970 UTC). CLI uses the current time for that field.
986994
- In State: `dclauth/Account/value/<address>`
987995
- Who can send:
988996
- Trustee
@@ -998,7 +1006,8 @@ The account is not revoked until sufficient number of Trustees approve it.
9981006
9991007
- Parameters:
10001008
- address: `string` - account address; Bench32 encoded
1001-
- info: `optional(string)` - information/notes for approval, proposal or revocation
1009+
- info: `optional(string)` - information/notes for the revocation approval
1010+
- time: `optional(int64)` - revocation approval time (number of nanoseconds elapsed since January 1, 1970 UTC). CLI uses the current time for that field.
10021011
- In State: `dclauth/Account/value/<address>`
10031012
- Who can send:
10041013
- Trustee

‎proto/dclauth/pending_account.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ message PendingAccount {
1111
// option (gogoproto.goproto_getters) = false;
1212
// option (gogoproto.goproto_stringer) = false;
1313

14-
Account address = 1 [(gogoproto.embed) = true];
14+
Account account = 1 [(gogoproto.embed) = true];
1515
}

‎vue/src/store/generated/zigbee-alliance/distributed-compliance-ledger/zigbeealliance.distributedcomplianceledger.dclauth/index.d.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { Account } from "./module/types/dclauth/account";
22
import { AccountStat } from "./module/types/dclauth/account_stat";
3+
import { Grant } from "./module/types/dclauth/grant";
34
import { PendingAccount } from "./module/types/dclauth/pending_account";
45
import { PendingAccountRevocation } from "./module/types/dclauth/pending_account_revocation";
5-
export { Account, AccountStat, PendingAccount, PendingAccountRevocation };
6+
export { Account, AccountStat, Grant, PendingAccount, PendingAccountRevocation };
67
declare const _default;
78
export default _default;

‎vue/src/store/generated/zigbee-alliance/distributed-compliance-ledger/zigbeealliance.distributedcomplianceledger.dclauth/index.js

+33-31
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ import { txClient, queryClient, MissingWalletError, registry } from './module';
33
import { SpVuexError } from '@starport/vuex';
44
import { Account } from "./module/types/dclauth/account";
55
import { AccountStat } from "./module/types/dclauth/account_stat";
6+
import { Grant } from "./module/types/dclauth/grant";
67
import { PendingAccount } from "./module/types/dclauth/pending_account";
78
import { PendingAccountRevocation } from "./module/types/dclauth/pending_account_revocation";
8-
export { Account, AccountStat, PendingAccount, PendingAccountRevocation };
9+
export { Account, AccountStat, Grant, PendingAccount, PendingAccountRevocation };
910
async function initTxClient(vuexGetters) {
1011
return await txClient(vuexGetters['common/wallet/signer'], {
1112
addr: vuexGetters['common/env/apiTendermint']
@@ -49,6 +50,7 @@ const getDefaultState = () => {
4950
_Structure: {
5051
Account: getStructure(Account.fromPartial({})),
5152
AccountStat: getStructure(AccountStat.fromPartial({})),
53+
Grant: getStructure(Grant.fromPartial({})),
5254
PendingAccount: getStructure(PendingAccount.fromPartial({})),
5355
PendingAccountRevocation: getStructure(PendingAccountRevocation.fromPartial({})),
5456
},
@@ -261,23 +263,6 @@ export default {
261263
throw new SpVuexError('QueryClient:QueryAccountStat', 'API Node Unavailable. Could not perform query: ' + e.message);
262264
}
263265
},
264-
async sendMsgApproveRevokeAccount({ rootGetters }, { value, fee = [], memo = '' }) {
265-
try {
266-
const txClient = await initTxClient(rootGetters);
267-
const msg = await txClient.msgApproveRevokeAccount(value);
268-
const result = await txClient.signAndBroadcast([msg], { fee: { amount: fee,
269-
gas: "200000" }, memo });
270-
return result;
271-
}
272-
catch (e) {
273-
if (e == MissingWalletError) {
274-
throw new SpVuexError('TxClient:MsgApproveRevokeAccount:Init', 'Could not initialize signing client. Wallet is required.');
275-
}
276-
else {
277-
throw new SpVuexError('TxClient:MsgApproveRevokeAccount:Send', 'Could not broadcast Tx: ' + e.message);
278-
}
279-
}
280-
},
281266
async sendMsgProposeRevokeAccount({ rootGetters }, { value, fee = [], memo = '' }) {
282267
try {
283268
const txClient = await initTxClient(rootGetters);
@@ -295,20 +280,20 @@ export default {
295280
}
296281
}
297282
},
298-
async sendMsgProposeAddAccount({ rootGetters }, { value, fee = [], memo = '' }) {
283+
async sendMsgApproveRevokeAccount({ rootGetters }, { value, fee = [], memo = '' }) {
299284
try {
300285
const txClient = await initTxClient(rootGetters);
301-
const msg = await txClient.msgProposeAddAccount(value);
286+
const msg = await txClient.msgApproveRevokeAccount(value);
302287
const result = await txClient.signAndBroadcast([msg], { fee: { amount: fee,
303288
gas: "200000" }, memo });
304289
return result;
305290
}
306291
catch (e) {
307292
if (e == MissingWalletError) {
308-
throw new SpVuexError('TxClient:MsgProposeAddAccount:Init', 'Could not initialize signing client. Wallet is required.');
293+
throw new SpVuexError('TxClient:MsgApproveRevokeAccount:Init', 'Could not initialize signing client. Wallet is required.');
309294
}
310295
else {
311-
throw new SpVuexError('TxClient:MsgProposeAddAccount:Send', 'Could not broadcast Tx: ' + e.message);
296+
throw new SpVuexError('TxClient:MsgApproveRevokeAccount:Send', 'Could not broadcast Tx: ' + e.message);
312297
}
313298
}
314299
},
@@ -329,18 +314,20 @@ export default {
329314
}
330315
}
331316
},
332-
async MsgApproveRevokeAccount({ rootGetters }, { value }) {
317+
async sendMsgProposeAddAccount({ rootGetters }, { value, fee = [], memo = '' }) {
333318
try {
334319
const txClient = await initTxClient(rootGetters);
335-
const msg = await txClient.msgApproveRevokeAccount(value);
336-
return msg;
320+
const msg = await txClient.msgProposeAddAccount(value);
321+
const result = await txClient.signAndBroadcast([msg], { fee: { amount: fee,
322+
gas: "200000" }, memo });
323+
return result;
337324
}
338325
catch (e) {
339326
if (e == MissingWalletError) {
340-
throw new SpVuexError('TxClient:MsgApproveRevokeAccount:Init', 'Could not initialize signing client. Wallet is required.');
327+
throw new SpVuexError('TxClient:MsgProposeAddAccount:Init', 'Could not initialize signing client. Wallet is required.');
341328
}
342329
else {
343-
throw new SpVuexError('TxClient:MsgApproveRevokeAccount:Create', 'Could not create message: ' + e.message);
330+
throw new SpVuexError('TxClient:MsgProposeAddAccount:Send', 'Could not broadcast Tx: ' + e.message);
344331
}
345332
}
346333
},
@@ -359,18 +346,18 @@ export default {
359346
}
360347
}
361348
},
362-
async MsgProposeAddAccount({ rootGetters }, { value }) {
349+
async MsgApproveRevokeAccount({ rootGetters }, { value }) {
363350
try {
364351
const txClient = await initTxClient(rootGetters);
365-
const msg = await txClient.msgProposeAddAccount(value);
352+
const msg = await txClient.msgApproveRevokeAccount(value);
366353
return msg;
367354
}
368355
catch (e) {
369356
if (e == MissingWalletError) {
370-
throw new SpVuexError('TxClient:MsgProposeAddAccount:Init', 'Could not initialize signing client. Wallet is required.');
357+
throw new SpVuexError('TxClient:MsgApproveRevokeAccount:Init', 'Could not initialize signing client. Wallet is required.');
371358
}
372359
else {
373-
throw new SpVuexError('TxClient:MsgProposeAddAccount:Create', 'Could not create message: ' + e.message);
360+
throw new SpVuexError('TxClient:MsgApproveRevokeAccount:Create', 'Could not create message: ' + e.message);
374361
}
375362
}
376363
},
@@ -389,5 +376,20 @@ export default {
389376
}
390377
}
391378
},
379+
async MsgProposeAddAccount({ rootGetters }, { value }) {
380+
try {
381+
const txClient = await initTxClient(rootGetters);
382+
const msg = await txClient.msgProposeAddAccount(value);
383+
return msg;
384+
}
385+
catch (e) {
386+
if (e == MissingWalletError) {
387+
throw new SpVuexError('TxClient:MsgProposeAddAccount:Init', 'Could not initialize signing client. Wallet is required.');
388+
}
389+
else {
390+
throw new SpVuexError('TxClient:MsgProposeAddAccount:Create', 'Could not create message: ' + e.message);
391+
}
392+
}
393+
},
392394
}
393395
};

0 commit comments

Comments
 (0)