Improve txProposed event (#34)

Update TransactionProposed event in contract
protofire · Aug 28, 2023 · 540d87e · 540d87e
1 parent 3378e43
commit 540d87e
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 5 deletions.
diff --git a/artifacts/multisig/multisig.contract b/artifacts/multisig/multisig.contract
diff --git a/artifacts/multisig/multisig.json b/artifacts/multisig/multisig.json
@@ -1,6 +1,6 @@
 {
   "source": {
-    "hash": "0x928c62eb71af918e760c538669a2577216a971a611aa5f78f062210e2a3a07a7",
+    "hash": "0xc93664205f298556415eae3f4e37ed7e585a03ca641b9f725ad235646c182688",
     "language": "ink! 4.2.0",
     "compiler": "rustc 1.69.0-nightly",
     "build_info": {
@@ -265,6 +265,19 @@
               ],
               "type": 9
             }
+          },
+          {
+            "docs": [
+              " Address of the transaction proposer"
+            ],
+            "indexed": false,
+            "label": "proposer",
+            "type": {
+              "displayName": [
+                "AccountId"
+              ],
+              "type": 1
+            }
           }
         ],
         "docs": [

diff --git a/contracts/multisig/lib.rs b/contracts/multisig/lib.rs
@@ -105,6 +105,8 @@ mod multisig {
         gas_limit: u64,
         /// Allow reentry flag of the call
         allow_reentry: bool,
+        /// Address of the transaction proposer
+        proposer: AccountId,
     }
 
     /// Emmited when a transaction is approved
@@ -354,6 +356,7 @@ mod multisig {
                     transferred_value: tx.transferred_value,
                     gas_limit: tx.gas_limit,
                     allow_reentry: tx.allow_reentry,
+                    proposer: self.env().caller(),
                 }),
             );
 

diff --git a/typed_contracts/multisig/contract-info/multisig.ts b/typed_contracts/multisig/contract-info/multisig.ts
diff --git a/typed_contracts/multisig/event-data/multisig.json b/typed_contracts/multisig/event-data/multisig.json
@@ -1,3 +1,3 @@
 {
-"ThresholdChanged": {"name":"ThresholdChanged","body":{"threshold":{"name":"number","isResult":false,"isPrimitive":true,"isConvertable":false}},"isResult":false,"isPrimitive":false,"isConvertable":false},"OwnerAdded": {"name":"OwnerAdded","body":{"owner":{"name":"AccountId","body":"string | number[]","isResult":false,"isPrimitive":true,"isConvertable":false}},"isResult":false,"isPrimitive":false,"isConvertable":false},"OwnerRemoved": {"name":"OwnerRemoved","body":{"owner":{"name":"AccountId","body":"string | number[]","isResult":false,"isPrimitive":true,"isConvertable":false}},"isResult":false,"isPrimitive":false,"isConvertable":false},"TransactionProposed": {"name":"TransactionProposed","body":{"txId":{"name":"ReturnNumber","isResult":false,"isPrimitive":false,"isConvertable":true},"contractAddress":{"name":"AccountId","body":"string | number[]","isResult":false,"isPrimitive":true,"isConvertable":false},"selector":{"name":"Array","body":{"0":{"name":"number","isResult":false,"isPrimitive":true,"isConvertable":false}},"isResult":false,"isPrimitive":false,"isConvertable":false},"input":{"name":"Array","body":{"0":{"name":"number","isResult":false,"isPrimitive":true,"isConvertable":false}},"isResult":false,"isPrimitive":false,"isConvertable":false},"transferredValue":{"name":"ReturnNumber","isResult":false,"isPrimitive":false,"isConvertable":true},"gasLimit":{"name":"number","isResult":false,"isPrimitive":true,"isConvertable":false},"allowReentry":{"name":"boolean","isResult":false,"isPrimitive":true,"isConvertable":false}},"isResult":false,"isPrimitive":false,"isConvertable":false},"Approve": {"name":"Approve","body":{"txId":{"name":"ReturnNumber","isResult":false,"isPrimitive":false,"isConvertable":true},"owner":{"name":"AccountId","body":"string | number[]","isResult":false,"isPrimitive":true,"isConvertable":false}},"isResult":false,"isPrimitive":false,"isConvertable":false},"Reject": {"name":"Reject","body":{"txId":{"name":"ReturnNumber","isResult":false,"isPrimitive":false,"isConvertable":true},"owner":{"name":"AccountId","body":"string | number[]","isResult":false,"isPrimitive":true,"isConvertable":false}},"isResult":false,"isPrimitive":false,"isConvertable":false},"TransactionExecuted": {"name":"TransactionExecuted","body":{"txId":{"name":"ReturnNumber","isResult":false,"isPrimitive":false,"isConvertable":true},"result":{"name":"TxResult","body":{"success":{"name":"Array","body":{"0":{"name":"number","isResult":false,"isPrimitive":true,"isConvertable":false}},"isResult":false,"isPrimitive":false,"isConvertable":false},"failed":{"name":"MultisigError","body":{"envExecutionFailed":{"name":"string","isResult":false,"isPrimitive":true,"isConvertable":false},"langExecutionFailed":{"name":"LangError","body":{"CouldNotReadInput":null},"isResult":false,"isPrimitive":false,"isConvertable":false},"ownersCantBeEmpty":null,"thresholdGreaterThanOwners":null,"thresholdCantBeZero":null,"unauthorized":null,"maxOwnersReached":null,"ownerAlreadyExists":null,"notOwner":null,"maxTransactionsReached":null,"txIdOverflow":null,"alreadyVoted":null,"invalidTxId":null,"transferFailed":null},"isResult":false,"isPrimitive":false,"isConvertable":false}},"isResult":false,"isPrimitive":false,"isConvertable":false}},"isResult":false,"isPrimitive":false,"isConvertable":false},"TransactionCancelled": {"name":"TransactionCancelled","body":{"txId":{"name":"ReturnNumber","isResult":false,"isPrimitive":false,"isConvertable":true}},"isResult":false,"isPrimitive":false,"isConvertable":false},"TransactionRemoved": {"name":"TransactionRemoved","body":{"txId":{"name":"ReturnNumber","isResult":false,"isPrimitive":false,"isConvertable":true}},"isResult":false,"isPrimitive":false,"isConvertable":false},"Transfer": {"name":"Transfer","body":{"to":{"name":"AccountId","body":"string | number[]","isResult":false,"isPrimitive":true,"isConvertable":false},"value":{"name":"ReturnNumber","isResult":false,"isPrimitive":false,"isConvertable":true}},"isResult":false,"isPrimitive":false,"isConvertable":false}
+"ThresholdChanged": {"name":"ThresholdChanged","body":{"threshold":{"name":"number","isResult":false,"isPrimitive":true,"isConvertable":false}},"isResult":false,"isPrimitive":false,"isConvertable":false},"OwnerAdded": {"name":"OwnerAdded","body":{"owner":{"name":"AccountId","body":"string | number[]","isResult":false,"isPrimitive":true,"isConvertable":false}},"isResult":false,"isPrimitive":false,"isConvertable":false},"OwnerRemoved": {"name":"OwnerRemoved","body":{"owner":{"name":"AccountId","body":"string | number[]","isResult":false,"isPrimitive":true,"isConvertable":false}},"isResult":false,"isPrimitive":false,"isConvertable":false},"TransactionProposed": {"name":"TransactionProposed","body":{"txId":{"name":"ReturnNumber","isResult":false,"isPrimitive":false,"isConvertable":true},"contractAddress":{"name":"AccountId","body":"string | number[]","isResult":false,"isPrimitive":true,"isConvertable":false},"selector":{"name":"Array","body":{"0":{"name":"number","isResult":false,"isPrimitive":true,"isConvertable":false}},"isResult":false,"isPrimitive":false,"isConvertable":false},"input":{"name":"Array","body":{"0":{"name":"number","isResult":false,"isPrimitive":true,"isConvertable":false}},"isResult":false,"isPrimitive":false,"isConvertable":false},"transferredValue":{"name":"ReturnNumber","isResult":false,"isPrimitive":false,"isConvertable":true},"gasLimit":{"name":"number","isResult":false,"isPrimitive":true,"isConvertable":false},"allowReentry":{"name":"boolean","isResult":false,"isPrimitive":true,"isConvertable":false},"proposer":{"name":"AccountId","body":"string | number[]","isResult":false,"isPrimitive":true,"isConvertable":false}},"isResult":false,"isPrimitive":false,"isConvertable":false},"Approve": {"name":"Approve","body":{"txId":{"name":"ReturnNumber","isResult":false,"isPrimitive":false,"isConvertable":true},"owner":{"name":"AccountId","body":"string | number[]","isResult":false,"isPrimitive":true,"isConvertable":false}},"isResult":false,"isPrimitive":false,"isConvertable":false},"Reject": {"name":"Reject","body":{"txId":{"name":"ReturnNumber","isResult":false,"isPrimitive":false,"isConvertable":true},"owner":{"name":"AccountId","body":"string | number[]","isResult":false,"isPrimitive":true,"isConvertable":false}},"isResult":false,"isPrimitive":false,"isConvertable":false},"TransactionExecuted": {"name":"TransactionExecuted","body":{"txId":{"name":"ReturnNumber","isResult":false,"isPrimitive":false,"isConvertable":true},"result":{"name":"TxResult","body":{"success":{"name":"Array","body":{"0":{"name":"number","isResult":false,"isPrimitive":true,"isConvertable":false}},"isResult":false,"isPrimitive":false,"isConvertable":false},"failed":{"name":"MultisigError","body":{"envExecutionFailed":{"name":"string","isResult":false,"isPrimitive":true,"isConvertable":false},"langExecutionFailed":{"name":"LangError","body":{"CouldNotReadInput":null},"isResult":false,"isPrimitive":false,"isConvertable":false},"ownersCantBeEmpty":null,"thresholdGreaterThanOwners":null,"thresholdCantBeZero":null,"unauthorized":null,"maxOwnersReached":null,"ownerAlreadyExists":null,"notOwner":null,"maxTransactionsReached":null,"txIdOverflow":null,"alreadyVoted":null,"invalidTxId":null,"transferFailed":null},"isResult":false,"isPrimitive":false,"isConvertable":false}},"isResult":false,"isPrimitive":false,"isConvertable":false}},"isResult":false,"isPrimitive":false,"isConvertable":false},"TransactionCancelled": {"name":"TransactionCancelled","body":{"txId":{"name":"ReturnNumber","isResult":false,"isPrimitive":false,"isConvertable":true}},"isResult":false,"isPrimitive":false,"isConvertable":false},"TransactionRemoved": {"name":"TransactionRemoved","body":{"txId":{"name":"ReturnNumber","isResult":false,"isPrimitive":false,"isConvertable":true}},"isResult":false,"isPrimitive":false,"isConvertable":false},"Transfer": {"name":"Transfer","body":{"to":{"name":"AccountId","body":"string | number[]","isResult":false,"isPrimitive":true,"isConvertable":false},"value":{"name":"ReturnNumber","isResult":false,"isPrimitive":false,"isConvertable":true}},"isResult":false,"isPrimitive":false,"isConvertable":false}
 }
diff --git a/typed_contracts/multisig/event-types/multisig.ts b/typed_contracts/multisig/event-types/multisig.ts
@@ -21,6 +21,7 @@ export interface TransactionProposed {
 	transferredValue: ReturnNumber;
 	gasLimit: number;
 	allowReentry: boolean;
+	proposer: ReturnTypes.AccountId;
 }
 
 export interface Approve {