An 3269/marinade unstake (#303)

* add token col

* fix null mSol amounts

* fix uncomment

data/testing__stake_pool_actions_marinade.csv

@@ -1,6 +1,6 @@
 tx_id,index,action,stake_pool,stake_pool_withdraw_authority,stake_pool_deposit_authority,address,reserve_stake_address,claim_ticket_address,amount
 3cudBDjWrhQo1AcL7kp6VYwR5FMwNaqcfSRMKxYuVLSU4En8tGcaNCefNCSm8XCcoGcsm4bkQHLhmkBVHsHKa2mk,0,deposit_stake,8szGkuLTAux9XMgZ2vtY39jVSowEcpBfFfD8hXSEqdGC,,4bZ6o3eUUNXhKuqjdCnCoPAoLgWiuLYixKaxoa8PpiKk,GNbvTVxDDC52Rc9WWMtUKF33d89EotcSw6dEKk9nh6mX,,,156049675238
-DwuAeLFnvBhg1uckZe3tAWBq2pSbAjATdhAptwpRbxALzQkNH9EiEwr985PdHqEvesaRyhPL7iV2EhmgFoBXSG9,1,order_unstake,8szGkuLTAux9XMgZ2vtY39jVSowEcpBfFfD8hXSEqdGC,,,AgaVCudHEvkayRnEZ8qTusmNAVe5Bfj3ZDtgPaYL1DDZ,,AJUJTNX7217SZSveYPZRkm7yyw7zb1ZDr5CVzMm7t1AF,
+DwuAeLFnvBhg1uckZe3tAWBq2pSbAjATdhAptwpRbxALzQkNH9EiEwr985PdHqEvesaRyhPL7iV2EhmgFoBXSG9,1,order_unstake,8szGkuLTAux9XMgZ2vtY39jVSowEcpBfFfD8hXSEqdGC,,,AgaVCudHEvkayRnEZ8qTusmNAVe5Bfj3ZDtgPaYL1DDZ,,AJUJTNX7217SZSveYPZRkm7yyw7zb1ZDr5CVzMm7t1AF,499984789
 3t9HvLgvv42CDDp4DmGFMX44CgaoTtYMfyX5kDs6z4jwEPqWAFmXQ3bKknY1oymqrTjgw9Ax7RU8kn5XdFCsyviJ,0,claim,8szGkuLTAux9XMgZ2vtY39jVSowEcpBfFfD8hXSEqdGC,,,AgaVCudHEvkayRnEZ8qTusmNAVe5Bfj3ZDtgPaYL1DDZ,Du3Ysj1wKbxPKkuPPnvzQLQh8oMSVifs3jGZjJWXFmHN,AJUJTNX7217SZSveYPZRkm7yyw7zb1ZDr5CVzMm7t1AF,501495754
 Z43TJRkym3QqKyjdqLFsHY3DSZXJeHsYJNU63hGbpcX2ERxaK5XGfjqZXEqv5x149QR2ZDTsjqdMcM4MRSF4weF,0,claim,8szGkuLTAux9XMgZ2vtY39jVSowEcpBfFfD8hXSEqdGC,,,H58zveXJ7E6oTtmSGxgKmSyxtuBsDFEekAEbseRCnJXP,Du3Ysj1wKbxPKkuPPnvzQLQh8oMSVifs3jGZjJWXFmHN,9zPpKWtn3BREDkCpurE44rKd2Fb5Vi8S4moGzjJvUq6P,2065767649593
 4xDDzJGkm6uhomMoVcGdvsPUt1sveYv7u2k6P8ocGi9ecsheACw6oGEEzpZQJdFzYm5e8r8rRjBNyqabJN63zdmM,0.1,deposit,8szGkuLTAux9XMgZ2vtY39jVSowEcpBfFfD8hXSEqdGC,,,TZ7g3id6KocGgfL7gmGPkDF4AE3NZJNnvdZz2rppkBB,Du3Ysj1wKbxPKkuPPnvzQLQh8oMSVifs3jGZjJWXFmHN,,1847770723929

models/core/core__fact_stake_pool_actions.sql

@@ -3,7 +3,7 @@
     meta ={ 'database_tags':{ 'table':{ 'PURPOSE': 'STAKING' }}}
 ) }}
 
-{% for model_suffix in ["generic","socean","lido","marinade","eversol"] %}
+{% for model_suffix in ["generic","socean","lido","eversol"] %}
 
     SELECT
         CASE
@@ -22,7 +22,8 @@
         action,
         address,
         stake_pool,
-        amount
+        amount,
+        'SOL' as token
     FROM
         {{ ref(
             'silver__stake_pool_actions_' + model_suffix
@@ -32,3 +33,20 @@
         UNION ALL
         {% endif %}
     {% endfor %}
+    UNION ALL
+    SELECT
+        'marinade' as stake_pool_name,
+        tx_id,
+        block_id,
+        block_timestamp,
+        INDEX,
+        succeeded,
+        action,
+        address,
+        stake_pool,
+        amount,
+        token
+    FROM
+        {{ ref(
+            'silver__stake_pool_actions_marinade'
+        ) }}

models/core/core__fact_stake_pool_actions.yml

@@ -43,3 +43,7 @@ models:
         description: "Amount in Lamports"
         tests:
           - dbt_expectations.expect_column_to_exist
+      - name: TOKEN
+        description: "Token utilized in the stake pool action"
+        tests:
+          - dbt_expectations.expect_column_to_exist

models/silver/staking/silver__stake_pool_actions_marinade.sql

@@ -158,6 +158,7 @@ SELECT
     NULL AS claim_ticket_address,
     i.value :parsed :info :lamports AS amount,
     e._inserted_timestamp,
+    'SOL' as token,
     concat_ws(
         '-',
         tx_id,
@@ -188,6 +189,7 @@ SELECT
     NULL AS claim_ticket_address,
     e.amount,
     e._inserted_timestamp,
+    'SOL' as token,
     concat_ws(
         '-',
         tx_id,
@@ -209,8 +211,9 @@ SELECT
     e.instruction :accounts [3] :: STRING AS address,
     NULL AS reserve_stake_address,
     e.instruction :accounts [4] :: STRING AS claim_ticket_address,
-    NULL AS amount,
+    e.inner_instruction:instructions[0]:parsed:info:amount::int as amount,
     e._inserted_timestamp,
+    'mSOL' as token,
     concat_ws(
         '-',
         tx_id,
@@ -236,6 +239,7 @@ SELECT
         i.value :parsed :info :lamports + b.pre_balances [silver.udf_get_account_balances_index( claim_ticket_address, b.account_keys)]
     ) :: NUMBER AS amount,
     e._inserted_timestamp,
+    'SOL' as token,
     concat_ws(
         '-',
         e.tx_id,