Merge pull request #209 from valory-xyz/refactor/staking

Adjust staking logic to match updated contract
valory-xyz · Jan 25, 2024 · 0cac9c7 · 0cac9c7
2 parents 70f6ddf + 42243ce
commit 0cac9c7
Show file tree

Hide file tree

Showing 15 changed files with 362 additions and 88 deletions.
diff --git a/.gitleaksignore b/.gitleaksignore
@@ -18,3 +18,4 @@ cfbec155d82abe64814af23610a4c69017d69096:packages/valory/skills/market_manager_a
 ed30ffbaaf3c10476dc642d388985c250afaeb8d:packages/valory/skills/market_manager_abci/graph_tooling/requests.py:generic-api-key:221
 ed30ffbaaf3c10476dc642d388985c250afaeb8d:packages/valory/skills/market_manager_abci/graph_tooling/requests.py:generic-api-key:222
 d004f2345bf31b27c343eb52c1bc5a2698e838d6:packages/valory/skills/market_manager_abci/graph_tooling/requests.py:generic-api-key:221
+b2c15c1a44ba680dd747a6fbdda9f2e9aced39eb:packages/valory/contracts/service_staking_token/contract.yaml:generic-api-key:10
diff --git a/packages/packages.json b/packages/packages.json
@@ -2,19 +2,19 @@
     "dev": {
         "skill/valory/market_manager_abci/0.1.0": "bafybeif23nzty3mvhvx3tphgr3mdrfo4kadxzg4zi57at2pqvml5yrb2xa",
         "skill/valory/decision_maker_abci/0.1.0": "bafybeidh3efbssuohhuku5b4go5jeqti4xv6dsdpaxm3ti4rudgqmyujpq",
-        "skill/valory/trader_abci/0.1.0": "bafybeifildb45hkpmusursxm3n7tg6bw42xfn4ssa2b7k73tu3og3nesze",
+        "skill/valory/trader_abci/0.1.0": "bafybeicqminusdi5css35dxm47s76e4prmyqz2iqfbjvp3s4wjzcanqlvi",
         "contract/valory/market_maker/0.1.0": "bafybeibgvm6jjrh26hvli3lqgi3xr7ihtjwu5pcbaeominq3w6zaksttle",
-        "agent/valory/trader/0.1.0": "bafybeihddqmhwhnelfclqocgahnbb4ipdhkatqsttl5acne62ifupfaw7i",
-        "service/valory/trader/0.1.0": "bafybeigd3mxyqb3koliro7oohkfegonqyz3bacihstytho2iazwcocahoq",
+        "agent/valory/trader/0.1.0": "bafybeih6gz36goxhz4pxvcm7mcortunojmezcokdbxq5pqynbr7ndikrru",
+        "service/valory/trader/0.1.0": "bafybeifhq2udyttnuidkc7nmtjcfzivbbnfcayixzps7fa5x3cg353bvfe",
         "contract/valory/erc20/0.1.0": "bafybeichh4vg3mav7pkv4nymw4wpnnyhd6lm2uzmjpcsrqetxi2x4g7b2m",
-        "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeiesf2zztqhie7rpsrglddc7lbjfjxtybqsqhlmtp77ukddejrmiva",
+        "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeibidfkkwafdvgbi46pxuiqod5ml65xl72dezotgtqlwckzxjlz2kq",
         "contract/valory/mech/0.1.0": "bafybeigbpvjbdnxwwxlee47thv2xuwxk4qte7k6yxzuv4qlczl5ecjh6ie",
         "contract/valory/realitio/0.1.0": "bafybeic5ie4oodetj4krdogydvbfxg4qggc3matpiflocah626tpevpreq",
         "contract/valory/realitio_proxy/0.1.0": "bafybeidx37xzjjmapwacedgzhum6grfzhp5vhouz4zu3pvpgdy5pgb2fr4",
         "contract/valory/conditional_tokens/0.1.0": "bafybeigucumqbsk74nj4rpm4p2cpiky4dj6uws7nfmgpimuviaxcamwqnu",
         "contract/valory/agent_registry/0.1.0": "bafybeifdsvdensn52cngcwdcathmlu6vhsmzcljemfrb5uozsigzgwcvuy",
-        "contract/valory/service_staking_token/0.1.0": "bafybeidzvc43ijt3rhmsbfkymtrzq6xcyo6gutp6uradivxjknlkany6xi",
-        "skill/valory/staking_abci/0.1.0": "bafybeifflsc3m5pvxrbhih4xclslhpqdnryilp72wudqffvvttyiung76u",
+        "contract/valory/service_staking_token/0.1.0": "bafybeignoz4relccwi33th35tpdstrp7gjqauev35r4s7ps2xg5lpd2n6a",
+        "skill/valory/staking_abci/0.1.0": "bafybeifytp27dswyw5qkjoobxrzegc2jdrvbnk5wcadjp4melaqn3xtnbm",
         "contract/valory/transfer_nft_condition/0.1.0": "bafybeig6j2tgy54mjpeqntrrcdzi32cogche57k4spsz6nz3yvouvb275u"
     },
     "third_party": {

diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml
@@ -26,7 +26,7 @@ contracts:
 - valory/realitio:0.1.0:bafybeic5ie4oodetj4krdogydvbfxg4qggc3matpiflocah626tpevpreq
 - valory/realitio_proxy:0.1.0:bafybeidx37xzjjmapwacedgzhum6grfzhp5vhouz4zu3pvpgdy5pgb2fr4
 - valory/agent_registry:0.1.0:bafybeifdsvdensn52cngcwdcathmlu6vhsmzcljemfrb5uozsigzgwcvuy
-- valory/service_staking_token:0.1.0:bafybeidzvc43ijt3rhmsbfkymtrzq6xcyo6gutp6uradivxjknlkany6xi
+- valory/service_staking_token:0.1.0:bafybeignoz4relccwi33th35tpdstrp7gjqauev35r4s7ps2xg5lpd2n6a
 - valory/transfer_nft_condition:0.1.0:bafybeig6j2tgy54mjpeqntrrcdzi32cogche57k4spsz6nz3yvouvb275u
 protocols:
 - open_aea/signing:1.0.0:bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi
@@ -44,11 +44,11 @@ skills:
 - valory/reset_pause_abci:0.1.0:bafybeigkf7uh6zre3wc3btm2we7xffls4e4vurvtsou2nswbn6mcc3g52a
 - valory/termination_abci:0.1.0:bafybeif7dwj4i5okp7rsyeiyvnmt5xop7njvj27bmjqdx4skmimqls7t4e
 - valory/transaction_settlement_abci:0.1.0:bafybeic3ysdc46z4ipuonc2g6vdyqaxxljvfd45cflzi2xq7o7hre6lvvy
-- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiesf2zztqhie7rpsrglddc7lbjfjxtybqsqhlmtp77ukddejrmiva
+- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeibidfkkwafdvgbi46pxuiqod5ml65xl72dezotgtqlwckzxjlz2kq
 - valory/market_manager_abci:0.1.0:bafybeif23nzty3mvhvx3tphgr3mdrfo4kadxzg4zi57at2pqvml5yrb2xa
 - valory/decision_maker_abci:0.1.0:bafybeidh3efbssuohhuku5b4go5jeqti4xv6dsdpaxm3ti4rudgqmyujpq
-- valory/trader_abci:0.1.0:bafybeifildb45hkpmusursxm3n7tg6bw42xfn4ssa2b7k73tu3og3nesze
-- valory/staking_abci:0.1.0:bafybeifflsc3m5pvxrbhih4xclslhpqdnryilp72wudqffvvttyiung76u
+- valory/trader_abci:0.1.0:bafybeicqminusdi5css35dxm47s76e4prmyqz2iqfbjvp3s4wjzcanqlvi
+- valory/staking_abci:0.1.0:bafybeifytp27dswyw5qkjoobxrzegc2jdrvbnk5wcadjp4melaqn3xtnbm
 default_ledger: ethereum
 required_ledgers:
 - ethereum
@@ -203,7 +203,7 @@ models:
         "0xc7751eff5396a846e7bc83ac31d3cb7d37cb49e4"], ["nft_amount", "1"], ["payment_token",
         "0xDDAfbb505ad214D7b80b1f830fcCc89B60fb7A83"], ["order_address", "0xc7751eff5396a846e7bc83ac31d3cb7d37cb49e4"],
         ["price", "0"]]}
-      staking_contract_address: ${str:0x5add592ce0a1B5DceCebB5Dcac086Cd9F9e3eA5C}
+      staking_contract_address: ${str:0x2Ef503950Be67a98746F484DA0bBAdA339DF3326}
       agent_balance_threshold: ${int:10000000000000000}
       refill_check_interval: ${int:10}
       tool_punishment_multiplier: ${int:1}