Merge pull request #5 from onflow/10-delegation-template

Update "Register Delegator" template
onflow · Nov 6, 2020 · d25f125 · d25f125
2 parents 09baace + aed13c2
commit d25f125
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/app/src/template_hashes.h b/app/src/template_hashes.h
@@ -59,8 +59,8 @@ extern "C" {
 #define TEMPLATE_HASH_TH16_REGISTER_OPERATOR_NODE_TESTNET "c29d4024aaeb71ab478182542499e0ba3d5d303ec027252e3b8333515ee3de48"
 #define TEMPLATE_HASH_TH16_REGISTER_OPERATOR_NODE_MAINNET "97b3436482c5aefc1baf8b850e92c829202e468c57241dec707b6c27bd89d15c"
 
-#define TEMPLATE_HASH_TH17_REGISTER_DELEGATOR_TESTNET "2a519aca1c9ca4568a30c893bd97580ee754f70cad65d2d2dd10abbfa31168ee"
-#define TEMPLATE_HASH_TH17_REGISTER_DELEGATOR_MAINNET "94a37cfffbd452d6139967282862be747297c60f9f0c78b1bb2c27c59cb9dbf6"
+#define TEMPLATE_HASH_TH17_REGISTER_DELEGATOR_TESTNET "824aceed5812ff9f2d800eacf92d95789d1b54e5dfb17cb521cee43a7b71a571"
+#define TEMPLATE_HASH_TH17_REGISTER_DELEGATOR_MAINNET "90068c2742d17ba5ce1b34dba02bd0e4db0c38fc943bf57008c3f973b30fbb2c"
 
 #define TEMPLATE_HASH_TH19_DELEGATE_NEW_TOKENS_TESTNET "18fad68368a4394b245db91217d7dc979e1316ab757388d416eaef831f565ab3"
 #define TEMPLATE_HASH_TH19_DELEGATE_NEW_TOKENS_MAINNET "802354d8b3e7908e584bcb5217637fb9f4ef045427c32d57d81ad4a390ed1a60"

diff --git a/tests/generate-transaction-tests/manifest.mainnet.json b/tests/generate-transaction-tests/manifest.mainnet.json
@@ -187,7 +187,7 @@
     {
       "id": "TH.17",
       "name": "Register Delegator",
-      "source": "import FlowIDTableStaking from 0x8624b52f9ddcd04a\n\ntransaction(nodeID: String) {\n\n    prepare(acct: AuthAccount) {\n\n        // Create a new delegator object for the node\n        let newDelegator \u003c- FlowIDTableStaking.registerNewDelegator(nodeID: nodeID)\n\n        // Store the delegator object\n        acct.save(\u003c-newDelegator, to: FlowIDTableStaking.DelegatorStoragePath)\n    }\n\n}",
+      "source": "import LockedTokens from 0x8d0e87b65159ae63\n\ntransaction(id: String, amount: UFix64) {\n\n    let holderRef: \u0026LockedTokens.TokenHolder\n\n    prepare(account: AuthAccount) {\n        self.holderRef = account.borrow\u003c\u0026LockedTokens.TokenHolder\u003e(from: LockedTokens.TokenHolderStoragePath) \n            ?? panic(\"TokenHolder is not saved at specified path\")\n    }\n\n    execute {\n        self.holderRef.createNodeDelegator(nodeID: id)\n\n        let delegatorProxy = self.holderRef.borrowDelegator()\n\n        delegatorProxy.delegateNewTokens(amount: amount)\n    }\n}\n",
       "arguments": [
         {
           "type": "String",
@@ -201,7 +201,7 @@
         }
       ],
       "network": "mainnet",
-      "hash": "94a37cfffbd452d6139967282862be747297c60f9f0c78b1bb2c27c59cb9dbf6"
+      "hash": "90068c2742d17ba5ce1b34dba02bd0e4db0c38fc943bf57008c3f973b30fbb2c"
     },
     {
       "id": "TH.19",

diff --git a/tests/generate-transaction-tests/manifest.testnet.json b/tests/generate-transaction-tests/manifest.testnet.json
@@ -187,7 +187,7 @@
     {
       "id": "TH.17",
       "name": "Register Delegator",
-      "source": "import FlowIDTableStaking from 0x9eca2b38b18b5dfe\n\ntransaction(nodeID: String) {\n\n    prepare(acct: AuthAccount) {\n\n        // Create a new delegator object for the node\n        let newDelegator \u003c- FlowIDTableStaking.registerNewDelegator(nodeID: nodeID)\n\n        // Store the delegator object\n        acct.save(\u003c-newDelegator, to: FlowIDTableStaking.DelegatorStoragePath)\n    }\n\n}",
+      "source": "import LockedTokens from 0x95e019a17d0e23d7\n\ntransaction(id: String, amount: UFix64) {\n\n    let holderRef: \u0026LockedTokens.TokenHolder\n\n    prepare(account: AuthAccount) {\n        self.holderRef = account.borrow\u003c\u0026LockedTokens.TokenHolder\u003e(from: LockedTokens.TokenHolderStoragePath) \n            ?? panic(\"TokenHolder is not saved at specified path\")\n    }\n\n    execute {\n        self.holderRef.createNodeDelegator(nodeID: id)\n\n        let delegatorProxy = self.holderRef.borrowDelegator()\n\n        delegatorProxy.delegateNewTokens(amount: amount)\n    }\n}\n",
       "arguments": [
         {
           "type": "String",
@@ -201,7 +201,7 @@
         }
       ],
       "network": "testnet",
-      "hash": "2a519aca1c9ca4568a30c893bd97580ee754f70cad65d2d2dd10abbfa31168ee"
+      "hash": "824aceed5812ff9f2d800eacf92d95789d1b54e5dfb17cb521cee43a7b71a571"
     },
     {
       "id": "TH.19",

diff --git a/tests/testvectors/validEnvelopeCases.json b/tests/testvectors/validEnvelopeCases.json
@@ -4477,7 +4477,7 @@
     "valid": true,
     "chainID": "Testnet",
     "envelopeMessage": {
-      "script": "import FlowIDTableStaking from 0x9eca2b38b18b5dfe\n\ntransaction(nodeID: String) {\n\n    prepare(acct: AuthAccount) {\n\n        // Create a new delegator object for the node\n        let newDelegator <- FlowIDTableStaking.registerNewDelegator(nodeID: nodeID)\n\n        // Store the delegator object\n        acct.save(<-newDelegator, to: FlowIDTableStaking.DelegatorStoragePath)\n    }\n\n}",
+      "script": "import LockedTokens from 0x95e019a17d0e23d7\n\ntransaction(id: String, amount: UFix64) {\n\n    let holderRef: &LockedTokens.TokenHolder\n\n    prepare(account: AuthAccount) {\n        self.holderRef = account.borrow<&LockedTokens.TokenHolder>(from: LockedTokens.TokenHolderStoragePath) \n            ?? panic(\"TokenHolder is not saved at specified path\")\n    }\n\n    execute {\n        self.holderRef.createNodeDelegator(nodeID: id)\n\n        let delegatorProxy = self.holderRef.borrowDelegator()\n\n        delegatorProxy.delegateNewTokens(amount: amount)\n    }\n}\n",
       "arguments": [
         {
           "type": "String",
@@ -4507,7 +4507,7 @@
         }
       ]
     },
-    "encodedTransactionEnvelopeHex": "f9022af90202b9017c696d706f727420466c6f7749445461626c655374616b696e672066726f6d203078396563613262333862313862356466650a0a7472616e73616374696f6e286e6f646549443a20537472696e6729207b0a0a202020207072657061726528616363743a20417574684163636f756e7429207b0a0a20202020202020202f2f204372656174652061206e65772064656c656761746f72206f626a65637420666f7220746865206e6f64650a20202020202020206c6574206e657744656c656761746f72203c2d20466c6f7749445461626c655374616b696e672e72656769737465724e657744656c656761746f72286e6f646549443a206e6f64654944290a0a20202020202020202f2f2053746f7265207468652064656c656761746f72206f626a6563740a2020202020202020616363742e73617665283c2d6e657744656c656761746f722c20746f3a20466c6f7749445461626c655374616b696e672e44656c656761746f7253746f7261676550617468290a202020207d0a0a7df8419f7b2274797065223a22537472696e67222c2276616c7565223a22666f6f227da07b2274797065223a22554669783634222c2276616c7565223a2231302e30227da0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a8899a8ac2c71d4f6bd040a8899a8ac2c71d4f6bdc98899a8ac2c71d4f6bde4e38004a0f7225388c1d69d57e6251c9fda50cbbf9e05131e5adb81e5aa0422402f048162"
+    "encodedTransactionEnvelopeHex": "f902d7f902afb90229696d706f7274204c6f636b6564546f6b656e732066726f6d203078393565303139613137643065323364370a0a7472616e73616374696f6e2869643a20537472696e672c20616d6f756e743a2055466978363429207b0a0a202020206c657420686f6c6465725265663a20264c6f636b6564546f6b656e732e546f6b656e486f6c6465720a0a2020202070726570617265286163636f756e743a20417574684163636f756e7429207b0a202020202020202073656c662e686f6c646572526566203d206163636f756e742e626f72726f773c264c6f636b6564546f6b656e732e546f6b656e486f6c6465723e2866726f6d3a204c6f636b6564546f6b656e732e546f6b656e486f6c64657253746f726167655061746829200a2020202020202020202020203f3f2070616e69632822546f6b656e486f6c646572206973206e6f7420736176656420617420737065636966696564207061746822290a202020207d0a0a2020202065786563757465207b0a202020202020202073656c662e686f6c6465725265662e6372656174654e6f646544656c656761746f72286e6f646549443a206964290a0a20202020202020206c65742064656c656761746f7250726f7879203d2073656c662e686f6c6465725265662e626f72726f7744656c656761746f7228290a0a202020202020202064656c656761746f7250726f78792e64656c65676174654e6577546f6b656e7328616d6f756e743a20616d6f756e74290a202020207d0a7d0af8419f7b2274797065223a22537472696e67222c2276616c7565223a22666f6f227da07b2274797065223a22554669783634222c2276616c7565223a2231302e30227da0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a8899a8ac2c71d4f6bd040a8899a8ac2c71d4f6bdc98899a8ac2c71d4f6bde4e38004a0f7225388c1d69d57e6251c9fda50cbbf9e05131e5adb81e5aa0422402f048162"
   },
   {
     "title": "TH.19 - Delegate New Locked FLOW",
@@ -5098,7 +5098,7 @@
     "valid": true,
     "chainID": "Mainnet",
     "envelopeMessage": {
-      "script": "import FlowIDTableStaking from 0x8624b52f9ddcd04a\n\ntransaction(nodeID: String) {\n\n    prepare(acct: AuthAccount) {\n\n        // Create a new delegator object for the node\n        let newDelegator <- FlowIDTableStaking.registerNewDelegator(nodeID: nodeID)\n\n        // Store the delegator object\n        acct.save(<-newDelegator, to: FlowIDTableStaking.DelegatorStoragePath)\n    }\n\n}",
+      "script": "import LockedTokens from 0x8d0e87b65159ae63\n\ntransaction(id: String, amount: UFix64) {\n\n    let holderRef: &LockedTokens.TokenHolder\n\n    prepare(account: AuthAccount) {\n        self.holderRef = account.borrow<&LockedTokens.TokenHolder>(from: LockedTokens.TokenHolderStoragePath) \n            ?? panic(\"TokenHolder is not saved at specified path\")\n    }\n\n    execute {\n        self.holderRef.createNodeDelegator(nodeID: id)\n\n        let delegatorProxy = self.holderRef.borrowDelegator()\n\n        delegatorProxy.delegateNewTokens(amount: amount)\n    }\n}\n",
       "arguments": [
         {
           "type": "String",
@@ -5128,7 +5128,7 @@
         }
       ]
     },
-    "encodedTransactionEnvelopeHex": "f9022af90202b9017c696d706f727420466c6f7749445461626c655374616b696e672066726f6d203078383632346235326639646463643034610a0a7472616e73616374696f6e286e6f646549443a20537472696e6729207b0a0a202020207072657061726528616363743a20417574684163636f756e7429207b0a0a20202020202020202f2f204372656174652061206e65772064656c656761746f72206f626a65637420666f7220746865206e6f64650a20202020202020206c6574206e657744656c656761746f72203c2d20466c6f7749445461626c655374616b696e672e72656769737465724e657744656c656761746f72286e6f646549443a206e6f64654944290a0a20202020202020202f2f2053746f7265207468652064656c656761746f72206f626a6563740a2020202020202020616363742e73617665283c2d6e657744656c656761746f722c20746f3a20466c6f7749445461626c655374616b696e672e44656c656761746f7253746f7261676550617468290a202020207d0a0a7df8419f7b2274797065223a22537472696e67222c2276616c7565223a22666f6f227da07b2274797065223a22554669783634222c2276616c7565223a2231302e30227da0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a88f19c161bc24cf4b4040a88f19c161bc24cf4b4c988f19c161bc24cf4b4e4e38004a0f7225388c1d69d57e6251c9fda50cbbf9e05131e5adb81e5aa0422402f048162"
+    "encodedTransactionEnvelopeHex": "f902d7f902afb90229696d706f7274204c6f636b6564546f6b656e732066726f6d203078386430653837623635313539616536330a0a7472616e73616374696f6e2869643a20537472696e672c20616d6f756e743a2055466978363429207b0a0a202020206c657420686f6c6465725265663a20264c6f636b6564546f6b656e732e546f6b656e486f6c6465720a0a2020202070726570617265286163636f756e743a20417574684163636f756e7429207b0a202020202020202073656c662e686f6c646572526566203d206163636f756e742e626f72726f773c264c6f636b6564546f6b656e732e546f6b656e486f6c6465723e2866726f6d3a204c6f636b6564546f6b656e732e546f6b656e486f6c64657253746f726167655061746829200a2020202020202020202020203f3f2070616e69632822546f6b656e486f6c646572206973206e6f7420736176656420617420737065636966696564207061746822290a202020207d0a0a2020202065786563757465207b0a202020202020202073656c662e686f6c6465725265662e6372656174654e6f646544656c656761746f72286e6f646549443a206964290a0a20202020202020206c65742064656c656761746f7250726f7879203d2073656c662e686f6c6465725265662e626f72726f7744656c656761746f7228290a0a202020202020202064656c656761746f7250726f78792e64656c65676174654e6577546f6b656e7328616d6f756e743a20616d6f756e74290a202020207d0a7d0af8419f7b2274797065223a22537472696e67222c2276616c7565223a22666f6f227da07b2274797065223a22554669783634222c2276616c7565223a2231302e30227da0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a88f19c161bc24cf4b4040a88f19c161bc24cf4b4c988f19c161bc24cf4b4e4e38004a0f7225388c1d69d57e6251c9fda50cbbf9e05131e5adb81e5aa0422402f048162"
   },
   {
     "title": "TH.19 - Delegate New Locked FLOW",