@ercworldio/blockchain-shared 1.0.3-dev.3-PROJ-1296.2 → 1.0.3-dev.3-PROJ-1296.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/build/contracts/contract-events/AccessControlEvents.d.ts +12 -2
  2. package/build/contracts/contract-events/AccessControlEvents.d.ts.map +1 -1
  3. package/build/contracts/contract-events/AccessControlEvents.js +25 -1
  4. package/build/services/db/roles/ContractRoles.d.ts +2 -2
  5. package/build/services/db/roles/ContractRoles.d.ts.map +1 -1
  6. package/build/services/db/roles/ContractRoles.js +6 -6
  7. package/package.json +1 -1
package/build/contracts/contract-events/AccessControlEvents.d.ts CHANGED
@@ -2,9 +2,19 @@ import { GrantRoleEventData, RevokeRoleEventData } from "./types/AccessControlEv
2
2
  declare enum Roles {
3
3
  DEFAULT_ADMIN_ROLE = "Contract Super Admin",
4
4
  OPERATOR_ROLE = "Signature Admin",
5
- WITHDRAW_ROLE = "Contract Accounting Admin"
5
+ WITHDRAW_ROLE = "Contract Accounting Admin",
6
+ ADMIN_TREASURY_MANAGER_ROLE = "",
7
+ ADMIN_TREASURY_EXECUTIVE_ROLE = "",
8
+ TREASURY_RECEIVER_ROLE = "",
9
+ TREASURY_MANAGER_ROLE = "",
10
+ TREASURY_EXECUTIVE_ROLE = "",
11
+ TREASURY_DISPATCH_ROLE = "",
12
+ CONFIG_MANAGER_ROLE = "",
13
+ CONFIG_EXECUTIVE_ROLE = "",
14
+ TIMELOCK_CONFIG_MANAGER_ROLE = "",
15
+ TIMELOCK_CONFIG_EXECUTIVE_ROLE = ""
6
16
  }
7
- type RoleName = "DEFAULT_ADMIN_ROLE" | "OPERATOR_ROLE" | "WITHDRAW_ROLE";
17
+ type RoleName = "DEFAULT_ADMIN_ROLE" | "OPERATOR_ROLE" | "WITHDRAW_ROLE" | "ADMIN_TREASURY_MANAGER_ROLE" | "ADMIN_TREASURY_EXECUTIVE_ROLE" | "TREASURY_RECEIVER_ROLE" | "TREASURY_MANAGER_ROLE" | "TREASURY_EXECUTIVE_ROLE" | "TREASURY_DISPATCH_ROLE" | "CONFIG_MANAGER_ROLE" | "CONFIG_EXECUTIVE_ROLE" | "TIMELOCK_CONFIG_MANAGER_ROLE" | "TIMELOCK_CONFIG_EXECUTIVE_ROLE";
8
18
  /**
9
19
  * Class for handling events related to the `AccessControl` contract.
10
20
  */
package/build/contracts/contract-events/AccessControlEvents.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"AccessControlEvents.d.ts","sourceRoot":"","sources":["../../../src/contracts/contract-events/AccessControlEvents.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAGtF,aAAK,KAAK;IACN,kBAAkB,yBAAyB;IAC3C,aAAa,oBAAoB;IACjC,aAAa,8BAA8B;CAC9C;AAED,KAAK,QAAQ,GAAG,oBAAoB,GAAG,eAAe,GAAG,eAAe,CAAC;AAEzE;;GAEG;AACH,cAAM,mBAAmB;IACrB,gDAAgD;IAChD,MAAM,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI,CAAQ;IACnD,oDAAoD;IAC7C,uBAAuB,EAAE,QAAQ,EAAE,CAA4D;IACtG,mDAAmD;IACnD,OAAO,CAAC,OAAO,CAAwB;IAEvC,OAAO;IAkBP;;;OAGG;IACH,MAAM,CAAC,WAAW;IAQlB;;;;OAIG;IACH,eAAe,CAAC,SAAS,EAAE,MAAM;IAIjC;;;;;OAKG;IACH,WAAW,CAAC,SAAS,EAAE,MAAM;IAQ7B;;;;OAIG;IACH,sBAAsB,CAAC,KAAK,EAAE,kBAAkB,GAAG,kBAAkB;IASrE;;;;OAIG;IACH,sBAAsB,CAAC,KAAK,EAAE,mBAAmB,GAAG,mBAAmB;CAQ1E;AAED,eAAe,mBAAmB,CAAC"}
1
+ {"version":3,"file":"AccessControlEvents.d.ts","sourceRoot":"","sources":["../../../src/contracts/contract-events/AccessControlEvents.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAGtF,aAAK,KAAK;IACN,kBAAkB,yBAAyB;IAC3C,aAAa,oBAAoB;IACjC,aAAa,8BAA8B;IAC3C,2BAA2B,KAAK;IAChC,6BAA6B,KAAK;IAClC,sBAAsB,KAAK;IAC3B,qBAAqB,KAAK;IAC1B,uBAAuB,KAAK;IAC5B,sBAAsB,KAAK;IAC3B,mBAAmB,KAAK;IACxB,qBAAqB,KAAK;IAC1B,4BAA4B,KAAK;IACjC,8BAA8B,KAAK;CACtC;AAED,KAAK,QAAQ,GAAG,oBAAoB,GAAG,eAAe,GAAG,eAAe,GACpE,6BAA6B,GAC7B,+BAA+B,GAC/B,wBAAwB,GACxB,uBAAuB,GACvB,yBAAyB,GACzB,wBAAwB,GACxB,qBAAqB,GACrB,uBAAuB,GACvB,8BAA8B,GAC9B,gCAAgC,CAAA;AAEpC;;GAEG;AACH,cAAM,mBAAmB;IACrB,gDAAgD;IAChD,MAAM,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI,CAAQ;IACnD,oDAAoD;IAC7C,uBAAuB,EAAE,QAAQ,EAAE,CAcxC;IAEF,mDAAmD;IACnD,OAAO,CAAC,OAAO,CAAwB;IAEvC,OAAO;IAkBP;;;OAGG;IACH,MAAM,CAAC,WAAW;IAQlB;;;;OAIG;IACH,eAAe,CAAC,SAAS,EAAE,MAAM;IAIjC;;;;;OAKG;IACH,WAAW,CAAC,SAAS,EAAE,MAAM;IAQ7B;;;;OAIG;IACH,sBAAsB,CAAC,KAAK,EAAE,kBAAkB,GAAG,kBAAkB;IASrE;;;;OAIG;IACH,sBAAsB,CAAC,KAAK,EAAE,mBAAmB,GAAG,mBAAmB;CAQ1E;AAED,eAAe,mBAAmB,CAAC"}
package/build/contracts/contract-events/AccessControlEvents.js CHANGED
@@ -6,6 +6,16 @@ var Roles;
6
6
  Roles["DEFAULT_ADMIN_ROLE"] = "Contract Super Admin";
7
7
  Roles["OPERATOR_ROLE"] = "Signature Admin";
8
8
  Roles["WITHDRAW_ROLE"] = "Contract Accounting Admin";
9
+ Roles["ADMIN_TREASURY_MANAGER_ROLE"] = "";
10
+ Roles["ADMIN_TREASURY_EXECUTIVE_ROLE"] = "";
11
+ Roles["TREASURY_RECEIVER_ROLE"] = "";
12
+ Roles["TREASURY_MANAGER_ROLE"] = "";
13
+ Roles["TREASURY_EXECUTIVE_ROLE"] = "";
14
+ Roles["TREASURY_DISPATCH_ROLE"] = "";
15
+ Roles["CONFIG_MANAGER_ROLE"] = "";
16
+ Roles["CONFIG_EXECUTIVE_ROLE"] = "";
17
+ Roles["TIMELOCK_CONFIG_MANAGER_ROLE"] = "";
18
+ Roles["TIMELOCK_CONFIG_EXECUTIVE_ROLE"] = "";
9
19
  })(Roles || (Roles = {}));
10
20
  /**
11
21
  * Class for handling events related to the `AccessControl` contract.
@@ -13,7 +23,21 @@ var Roles;
13
23
  class AccessControlEvents {
14
24
  constructor() {
15
25
  /** Array of role names supported by the contract */
16
- this.accessControlEventNames = ["DEFAULT_ADMIN_ROLE", "OPERATOR_ROLE", "WITHDRAW_ROLE"];
26
+ this.accessControlEventNames = [
27
+ "DEFAULT_ADMIN_ROLE",
28
+ "OPERATOR_ROLE",
29
+ "WITHDRAW_ROLE",
30
+ "ADMIN_TREASURY_MANAGER_ROLE",
31
+ "ADMIN_TREASURY_EXECUTIVE_ROLE",
32
+ "TREASURY_RECEIVER_ROLE",
33
+ "TREASURY_MANAGER_ROLE",
34
+ "TREASURY_EXECUTIVE_ROLE",
35
+ "TREASURY_DISPATCH_ROLE",
36
+ "CONFIG_MANAGER_ROLE",
37
+ "CONFIG_EXECUTIVE_ROLE",
38
+ "TIMELOCK_CONFIG_MANAGER_ROLE",
39
+ "TIMELOCK_CONFIG_EXECUTIVE_ROLE"
40
+ ];
17
41
  // Create a map of role hashes to role names
18
42
  this.roleMap = new Map(this.accessControlEventNames.map(name => {
19
43
  if (name.includes("DEFAULT_ADMIN_ROLE")) {
package/build/services/db/roles/ContractRoles.d.ts CHANGED
@@ -46,9 +46,9 @@ declare class ContractRolesService {
46
46
  */
47
47
  static get_role_operation_types(pool: Pool, role_id: number): Promise<RoleOperationType[]>;
48
48
  /** Records an on-chain role grant for a wallet on an escrow contract. `confirmed` indicates whether the tx was finalised. */
49
- static fn_grant_escrow_role(pool: Pool, blockchain: BlockchainType, chain_id: ChainId, contract_address: string, wallet_address: string, role_hash: string, confirmed: boolean, p_caller: string, p_sender: string, p_tx_hash: string, p_timestamp: number, p_block_number: number, gas_used: number): Promise<any>;
49
+ static fn_grant_escrow_role(pool: Pool, blockchain: BlockchainType, chain_id: ChainId, contract_address: string, wallet_address: string, role_hash: string, p_user_id: number, confirmed: boolean, p_caller: string, p_sender: string, p_tx_hash: string, p_timestamp: number, p_block_number: number, gas_used: number): Promise<any>;
50
50
  /** Records an on-chain role revocation for a wallet on an escrow contract. `confirmed` indicates whether the tx was finalised. */
51
- static fn_revoke_escrow_role(pool: Pool, blockchain: BlockchainType, chain_id: ChainId, contract_address: string, wallet_address: string, role_hash: string, confirmed: boolean, p_caller: string, p_sender: string, p_tx_hash: string, p_timestamp: number, p_block_number: number, gas_used: number): Promise<any>;
51
+ static fn_revoke_escrow_role(pool: Pool, blockchain: BlockchainType, chain_id: ChainId, contract_address: string, wallet_address: string, role_hash: string, p_user_id: number, confirmed: boolean, p_caller: string, p_sender: string, p_tx_hash: string, p_timestamp: number, p_block_number: number, gas_used: number): Promise<any>;
52
52
  }
53
53
  export default ContractRolesService;
54
54
  //# sourceMappingURL=ContractRoles.d.ts.map
package/build/services/db/roles/ContractRoles.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ContractRoles.d.ts","sourceRoot":"","sources":["../../../../src/services/db/roles/ContractRoles.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAG9D,MAAM,WAAW,aAAa;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,YAAY;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,iBAAiB;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;CACvB;AAGD;;;GAGG;AACH,cAAM,oBAAoB;IAEtB;;;;OAIG;WACU,SAAS,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAU3D;;;;;OAKG;WACU,uBAAuB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAY1E;;;;OAIG;WACU,wBAAwB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAahG,6HAA6H;WAChH,oBAAoB,CAC7B,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,cAAc,EACtC,QAAQ,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAC3C,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EACzC,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EACpC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EACnC,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAC3C,QAAQ,EAAE,MAAM;IAapB,kIAAkI;WACrH,qBAAqB,CAC9B,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,cAAc,EACtC,QAAQ,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAC3C,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EACzC,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EACpC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EACnC,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAC3C,QAAQ,EAAE,MAAM;CAcvB;AAED,eAAe,oBAAoB,CAAC"}
1
+ {"version":3,"file":"ContractRoles.d.ts","sourceRoot":"","sources":["../../../../src/services/db/roles/ContractRoles.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAG9D,MAAM,WAAW,aAAa;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,YAAY;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,iBAAiB;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;CACvB;AAGD;;;GAGG;AACH,cAAM,oBAAoB;IAEtB;;;;OAIG;WACU,SAAS,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAU3D;;;;;OAKG;WACU,uBAAuB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAY1E;;;;OAIG;WACU,wBAAwB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAahG,6HAA6H;WAChH,oBAAoB,CAC7B,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,cAAc,EACtC,QAAQ,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAC3C,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EACzC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EACrC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAClC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EACtC,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAa5C,kIAAkI;WACrH,qBAAqB,CAC9B,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,cAAc,EACtC,QAAQ,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAC3C,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EACzC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EACrC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAClC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EACtC,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;CAc/C;AAED,eAAe,oBAAoB,CAAC"}
package/build/services/db/roles/ContractRoles.js CHANGED
@@ -61,22 +61,22 @@ class ContractRolesService {
61
61
  });
62
62
  }
63
63
  /** Records an on-chain role grant for a wallet on an escrow contract. `confirmed` indicates whether the tx was finalised. */
64
- static fn_grant_escrow_role(pool, blockchain, chain_id, contract_address, wallet_address, role_hash, confirmed, p_caller, p_sender, p_tx_hash, p_timestamp, p_block_number, gas_used) {
64
+ static fn_grant_escrow_role(pool, blockchain, chain_id, contract_address, wallet_address, role_hash, p_user_id, confirmed, p_caller, p_sender, p_tx_hash, p_timestamp, p_block_number, gas_used) {
65
65
  return __awaiter(this, void 0, void 0, function* () {
66
66
  const result = yield pool.query(`
67
- SELECT multisig.fn_grant_escrow_role($1::text,$2::text,$3::text,$4::text,$5::text,$6::boolean,$7::text,$8::text,$9::text,$10::bigint,$11::bigint,$12::numeric)
68
- `, [blockchain, chain_id, contract_address, wallet_address, role_hash, confirmed, p_caller, p_sender, p_tx_hash, p_timestamp, p_block_number, gas_used]);
67
+ SELECT multisig.fn_grant_escrow_role($1::text,$2::text,$3::text,$4::text,$5::text,$6::bigint,$7::boolean,$8::text,$9::text,$10::text,$11::bigint,$12::bigint,$13::numeric)
68
+ `, [blockchain, chain_id, contract_address, wallet_address, role_hash, p_user_id, confirmed, p_caller, p_sender, p_tx_hash, p_timestamp, p_block_number, gas_used]);
69
69
  if (!result || !result.rows)
70
70
  throw new Error(`DB FN Error: multisig.fn_grant_escrow_role`);
71
71
  return result.rows[0].fn_grant_escrow_role;
72
72
  });
73
73
  }
74
74
  /** Records an on-chain role revocation for a wallet on an escrow contract. `confirmed` indicates whether the tx was finalised. */
75
- static fn_revoke_escrow_role(pool, blockchain, chain_id, contract_address, wallet_address, role_hash, confirmed, p_caller, p_sender, p_tx_hash, p_timestamp, p_block_number, gas_used) {
75
+ static fn_revoke_escrow_role(pool, blockchain, chain_id, contract_address, wallet_address, role_hash, p_user_id, confirmed, p_caller, p_sender, p_tx_hash, p_timestamp, p_block_number, gas_used) {
76
76
  return __awaiter(this, void 0, void 0, function* () {
77
77
  const result = yield pool.query(`
78
- SELECT multisig.fn_revoke_escrow_role($1::text,$2::text,$3::text,$4::text,$5::text,$6::boolean,$7::text,$8::text,$9::text,$10::bigint,$11::bigint,$12::numeric)
79
- `, [blockchain, chain_id, contract_address, wallet_address, role_hash, confirmed, p_caller, p_sender, p_tx_hash, p_timestamp, p_block_number, gas_used]);
78
+ SELECT multisig.fn_revoke_escrow_role($1::text,$2::text,$3::text,$4::text,$5::text,$6::bigint,$7::boolean,$8::text,$9::text,$10::text,$11::bigint,$12::bigint,$13::numeric)
79
+ `, [blockchain, chain_id, contract_address, wallet_address, role_hash, p_user_id, confirmed, p_caller, p_sender, p_tx_hash, p_timestamp, p_block_number, gas_used]);
80
80
  if (!result || !result.rows)
81
81
  throw new Error(`DB FN Error: multisig.fn_revoke_escrow_role`);
82
82
  return result.rows[0].fn_revoke_escrow_role;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ercworldio/blockchain-shared",
3
- "version": "1.0.3-dev.3-PROJ-1296.2",
3
+ "version": "1.0.3-dev.3-PROJ-1296.4",
4
4
  "description": "Shared library for blockchain projects",
5
5
  "main": "build/index.js",
6
6
  "types": "build/index.d.ts",