Merge branch 'main' into feat/oeth-withdrawals

package.json

@@ -40,7 +40,7 @@
     "viem": "^1.10.13"
   },
   "devDependencies": {
-    "@subsquid/evm-typegen": "^4.2.0",
+    "@subsquid/evm-typegen": "^4.3.0",
     "@subsquid/typeorm-codegen": "^2.0.1",
     "@trivago/prettier-plugin-sort-imports": "^4.2.0",
     "@types/js-yaml": "^4.0.8",

schema.graphql

@@ -979,18 +979,49 @@ type OTokenActivity @entity {
   timestamp: DateTime! @index
   blockNumber: Int! @index
   txHash: String! @index
-  callDataLast4Bytes: String!
-  address: String
-  sighash: String
-
-  action: String
-  exchange: String
-  interface: String
-
-  fromSymbol: String
-  toSymbol: String
-  amount: BigInt
-}
+  type: OTokenActivityType
+  data: JSON
+}
+
+
+enum OTokenActivityType {
+  Approval
+  Bridge
+  ClaimRewards
+  DelegateVote
+  ExtendStake
+  Migrate
+  Stake
+  Transfer
+  Swap
+  Wrap
+  Unwrap
+  Mint
+  Redeem
+  Zap
+  Unstake
+  Vote
+}
+
+#type OTokenActivity @entity {
+#  id: ID!
+#  chainId: Int! @index
+#  otoken: String! @index
+#  timestamp: DateTime! @index
+#  blockNumber: Int! @index
+#  txHash: String! @index
+#  callDataLast4Bytes: String!
+#  address: String
+#  sighash: String
+#
+#  action: String
+#  exchange: String
+#  interface: String
+#
+#  fromSymbol: String
+#  toSymbol: String
+#  amount: BigInt
+#}
 """
 The Vault entity tracks the OUSD vault balance over time.
 """

schema/otoken.graphql

@@ -105,15 +105,46 @@ type OTokenActivity @entity {
   timestamp: DateTime! @index
   blockNumber: Int! @index
   txHash: String! @index
-  callDataLast4Bytes: String!
-  address: String
-  sighash: String
+  type: OTokenActivityType
+  data: JSON
+}
 
-  action: String
-  exchange: String
-  interface: String
 
-  fromSymbol: String
-  toSymbol: String
-  amount: BigInt
+enum OTokenActivityType {
+  Approval
+  Bridge
+  ClaimRewards
+  DelegateVote
+  ExtendStake
+  Migrate
+  Stake
+  Transfer
+  Swap
+  Wrap
+  Unwrap
+  Mint
+  Redeem
+  Zap
+  Unstake
+  Vote
 }
+
+#type OTokenActivity @entity {
+#  id: ID!
+#  chainId: Int! @index
+#  otoken: String! @index
+#  timestamp: DateTime! @index
+#  blockNumber: Int! @index
+#  txHash: String! @index
+#  callDataLast4Bytes: String!
+#  address: String
+#  sighash: String
+#
+#  action: String
+#  exchange: String
+#  interface: String
+#
+#  fromSymbol: String
+#  toSymbol: String
+#  amount: BigInt
+#}

src/abi/balancer-meta-pool-strategy.ts

@@ -21,12 +21,12 @@ export const functions = {
     auraRewardPoolAddress: viewFun("0x3132a21d", "auraRewardPoolAddress()", {}, p.address),
     balancerPoolId: viewFun("0xdbbb64b9", "balancerPoolId()", {}, p.bytes32),
     balancerVault: viewFun("0x158274a5", "balancerVault()", {}, p.address),
-    "checkBalance(address)": viewFun("0x5f515226", "checkBalance(address)", {"_asset": p.address}, p.uint256),
-    "checkBalance()": viewFun("0xc71daccb", "checkBalance()", {}, p.uint256),
+    'checkBalance(address)': viewFun("0x5f515226", "checkBalance(address)", {"_asset": p.address}, p.uint256),
+    'checkBalance()': viewFun("0xc71daccb", "checkBalance()", {}, p.uint256),
     claimGovernance: fun("0x5d36b190", "claimGovernance()", {}, ),
     collectRewardTokens: fun("0x5a063f63", "collectRewardTokens()", {}, ),
-    "deposit(address,uint256)": fun("0x47e7ef24", "deposit(address,uint256)", {"_0": p.address, "_1": p.uint256}, ),
-    "deposit(address[],uint256[])": fun("0xefc908a1", "deposit(address[],uint256[])", {"_0": p.array(p.address), "_1": p.array(p.uint256)}, ),
+    'deposit(address,uint256)': fun("0x47e7ef24", "deposit(address,uint256)", {"_0": p.address, "_1": p.uint256}, ),
+    'deposit(address[],uint256[])': fun("0xefc908a1", "deposit(address[],uint256[])", {"_0": p.array(p.address), "_1": p.array(p.uint256)}, ),
     depositAll: fun("0xde5f6268", "depositAll()", {}, ),
     frxETH: viewFun("0x565d3e6e", "frxETH()", {}, p.address),
     getRewardTokenAddresses: viewFun("0xf6ca71b0", "getRewardTokenAddresses()", {}, p.array(p.address)),
@@ -52,8 +52,8 @@ export const functions = {
     transferGovernance: fun("0xd38bfff4", "transferGovernance(address)", {"_newGovernor": p.address}, ),
     transferToken: fun("0x1072cbea", "transferToken(address,uint256)", {"_asset": p.address, "_amount": p.uint256}, ),
     vaultAddress: viewFun("0x430bf08a", "vaultAddress()", {}, p.address),
-    "withdraw(address,address,uint256)": fun("0xd9caed12", "withdraw(address,address,uint256)", {"_recipient": p.address, "_strategyAsset": p.address, "_strategyAmount": p.uint256}, ),
-    "withdraw(address,address[],uint256[])": fun("0xedbd7668", "withdraw(address,address[],uint256[])", {"_recipient": p.address, "_strategyAssets": p.array(p.address), "_strategyAmounts": p.array(p.uint256)}, ),
+    'withdraw(address,address,uint256)': fun("0xd9caed12", "withdraw(address,address,uint256)", {"_recipient": p.address, "_strategyAsset": p.address, "_strategyAmount": p.uint256}, ),
+    'withdraw(address,address[],uint256[])': fun("0xedbd7668", "withdraw(address,address[],uint256[])", {"_recipient": p.address, "_strategyAssets": p.array(p.address), "_strategyAmounts": p.array(p.uint256)}, ),
     withdrawAll: fun("0x853828b6", "withdrawAll()", {}, ),
     wstETH: viewFun("0x4aa07e64", "wstETH()", {}, p.address),
 }
@@ -76,12 +76,12 @@ export class Contract extends ContractBase {
         return this.eth_call(functions.balancerVault, {})
     }
 
-    "checkBalance(address)"(_asset: CheckBalanceParams_0["_asset"]) {
-        return this.eth_call(functions["checkBalance(address)"], {_asset})
+    'checkBalance(address)'(_asset: CheckBalanceParams_0["_asset"]) {
+        return this.eth_call(functions['checkBalance(address)'], {_asset})
     }
 
-    "checkBalance()"() {
-        return this.eth_call(functions["checkBalance()"], {})
+    'checkBalance()'() {
+        return this.eth_call(functions['checkBalance()'], {})
     }
 
     frxETH() {
@@ -171,23 +171,23 @@ export type BalancerPoolIdReturn = FunctionReturn<typeof functions.balancerPoolI
 export type BalancerVaultParams = FunctionArguments<typeof functions.balancerVault>
 export type BalancerVaultReturn = FunctionReturn<typeof functions.balancerVault>
 
-export type CheckBalanceParams_0 = FunctionArguments<typeof functions["checkBalance(address)"]>
-export type CheckBalanceReturn_0 = FunctionReturn<typeof functions["checkBalance(address)"]>
+export type CheckBalanceParams_0 = FunctionArguments<typeof functions['checkBalance(address)']>
+export type CheckBalanceReturn_0 = FunctionReturn<typeof functions['checkBalance(address)']>
 
-export type CheckBalanceParams_1 = FunctionArguments<typeof functions["checkBalance()"]>
-export type CheckBalanceReturn_1 = FunctionReturn<typeof functions["checkBalance()"]>
+export type CheckBalanceParams_1 = FunctionArguments<typeof functions['checkBalance()']>
+export type CheckBalanceReturn_1 = FunctionReturn<typeof functions['checkBalance()']>
 
 export type ClaimGovernanceParams = FunctionArguments<typeof functions.claimGovernance>
 export type ClaimGovernanceReturn = FunctionReturn<typeof functions.claimGovernance>
 
 export type CollectRewardTokensParams = FunctionArguments<typeof functions.collectRewardTokens>
 export type CollectRewardTokensReturn = FunctionReturn<typeof functions.collectRewardTokens>
 
-export type DepositParams_0 = FunctionArguments<typeof functions["deposit(address,uint256)"]>
-export type DepositReturn_0 = FunctionReturn<typeof functions["deposit(address,uint256)"]>
+export type DepositParams_0 = FunctionArguments<typeof functions['deposit(address,uint256)']>
+export type DepositReturn_0 = FunctionReturn<typeof functions['deposit(address,uint256)']>
 
-export type DepositParams_1 = FunctionArguments<typeof functions["deposit(address[],uint256[])"]>
-export type DepositReturn_1 = FunctionReturn<typeof functions["deposit(address[],uint256[])"]>
+export type DepositParams_1 = FunctionArguments<typeof functions['deposit(address[],uint256[])']>
+export type DepositReturn_1 = FunctionReturn<typeof functions['deposit(address[],uint256[])']>
 
 export type DepositAllParams = FunctionArguments<typeof functions.depositAll>
 export type DepositAllReturn = FunctionReturn<typeof functions.depositAll>
@@ -264,11 +264,11 @@ export type TransferTokenReturn = FunctionReturn<typeof functions.transferToken>
 export type VaultAddressParams = FunctionArguments<typeof functions.vaultAddress>
 export type VaultAddressReturn = FunctionReturn<typeof functions.vaultAddress>
 
-export type WithdrawParams_0 = FunctionArguments<typeof functions["withdraw(address,address,uint256)"]>
-export type WithdrawReturn_0 = FunctionReturn<typeof functions["withdraw(address,address,uint256)"]>
+export type WithdrawParams_0 = FunctionArguments<typeof functions['withdraw(address,address,uint256)']>
+export type WithdrawReturn_0 = FunctionReturn<typeof functions['withdraw(address,address,uint256)']>
 
-export type WithdrawParams_1 = FunctionArguments<typeof functions["withdraw(address,address[],uint256[])"]>
-export type WithdrawReturn_1 = FunctionReturn<typeof functions["withdraw(address,address[],uint256[])"]>
+export type WithdrawParams_1 = FunctionArguments<typeof functions['withdraw(address,address[],uint256[])']>
+export type WithdrawReturn_1 = FunctionReturn<typeof functions['withdraw(address,address[],uint256[])']>
 
 export type WithdrawAllParams = FunctionArguments<typeof functions.withdrawAll>
 export type WithdrawAllReturn = FunctionReturn<typeof functions.withdrawAll>

src/abi/balancer-meta-stable-pool.ts

@@ -47,8 +47,8 @@ export const functions = {
     nonces: viewFun("0x7ecebe00", "nonces(address)", {"owner": p.address}, p.uint256),
     onExitPool: fun("0x74f3b009", "onExitPool(bytes32,address,address,uint256[],uint256,uint256,bytes)", {"poolId": p.bytes32, "sender": p.address, "recipient": p.address, "balances": p.array(p.uint256), "lastChangeBlock": p.uint256, "protocolSwapFeePercentage": p.uint256, "userData": p.bytes}, {"amountsOut": p.array(p.uint256), "dueProtocolFeeAmounts": p.array(p.uint256)}),
     onJoinPool: fun("0xd5c096c4", "onJoinPool(bytes32,address,address,uint256[],uint256,uint256,bytes)", {"poolId": p.bytes32, "sender": p.address, "recipient": p.address, "balances": p.array(p.uint256), "lastChangeBlock": p.uint256, "protocolSwapFeePercentage": p.uint256, "userData": p.bytes}, {"amountsIn": p.array(p.uint256), "dueProtocolFeeAmounts": p.array(p.uint256)}),
-    "onSwap((uint8,address,address,uint256,bytes32,uint256,address,address,bytes),uint256[],uint256,uint256)": fun("0x01ec954a", "onSwap((uint8,address,address,uint256,bytes32,uint256,address,address,bytes),uint256[],uint256,uint256)", {"request": p.struct({"kind": p.uint8, "tokenIn": p.address, "tokenOut": p.address, "amount": p.uint256, "poolId": p.bytes32, "lastChangeBlock": p.uint256, "from": p.address, "to": p.address, "userData": p.bytes}), "balances": p.array(p.uint256), "indexIn": p.uint256, "indexOut": p.uint256}, p.uint256),
-    "onSwap((uint8,address,address,uint256,bytes32,uint256,address,address,bytes),uint256,uint256)": fun("0x9d2c110c", "onSwap((uint8,address,address,uint256,bytes32,uint256,address,address,bytes),uint256,uint256)", {"request": p.struct({"kind": p.uint8, "tokenIn": p.address, "tokenOut": p.address, "amount": p.uint256, "poolId": p.bytes32, "lastChangeBlock": p.uint256, "from": p.address, "to": p.address, "userData": p.bytes}), "balanceTokenIn": p.uint256, "balanceTokenOut": p.uint256}, p.uint256),
+    'onSwap((uint8,address,address,uint256,bytes32,uint256,address,address,bytes),uint256[],uint256,uint256)': fun("0x01ec954a", "onSwap((uint8,address,address,uint256,bytes32,uint256,address,address,bytes),uint256[],uint256,uint256)", {"request": p.struct({"kind": p.uint8, "tokenIn": p.address, "tokenOut": p.address, "amount": p.uint256, "poolId": p.bytes32, "lastChangeBlock": p.uint256, "from": p.address, "to": p.address, "userData": p.bytes}), "balances": p.array(p.uint256), "indexIn": p.uint256, "indexOut": p.uint256}, p.uint256),
+    'onSwap((uint8,address,address,uint256,bytes32,uint256,address,address,bytes),uint256,uint256)': fun("0x9d2c110c", "onSwap((uint8,address,address,uint256,bytes32,uint256,address,address,bytes),uint256,uint256)", {"request": p.struct({"kind": p.uint8, "tokenIn": p.address, "tokenOut": p.address, "amount": p.uint256, "poolId": p.bytes32, "lastChangeBlock": p.uint256, "from": p.address, "to": p.address, "userData": p.bytes}), "balanceTokenIn": p.uint256, "balanceTokenOut": p.uint256}, p.uint256),
     permit: fun("0xd505accf", "permit(address,address,uint256,uint256,uint8,bytes32,bytes32)", {"owner": p.address, "spender": p.address, "value": p.uint256, "deadline": p.uint256, "v": p.uint8, "r": p.bytes32, "s": p.bytes32}, ),
     queryExit: fun("0x6028bfd4", "queryExit(bytes32,address,address,uint256[],uint256,uint256,bytes)", {"poolId": p.bytes32, "sender": p.address, "recipient": p.address, "balances": p.array(p.uint256), "lastChangeBlock": p.uint256, "protocolSwapFeePercentage": p.uint256, "userData": p.bytes}, {"bptIn": p.uint256, "amountsOut": p.array(p.uint256)}),
     queryJoin: fun("0x87ec6817", "queryJoin(bytes32,address,address,uint256[],uint256,uint256,bytes)", {"poolId": p.bytes32, "sender": p.address, "recipient": p.address, "balances": p.array(p.uint256), "lastChangeBlock": p.uint256, "protocolSwapFeePercentage": p.uint256, "userData": p.bytes}, {"bptOut": p.uint256, "amountsIn": p.array(p.uint256)}),
@@ -288,11 +288,11 @@ export type OnExitPoolReturn = FunctionReturn<typeof functions.onExitPool>
 export type OnJoinPoolParams = FunctionArguments<typeof functions.onJoinPool>
 export type OnJoinPoolReturn = FunctionReturn<typeof functions.onJoinPool>
 
-export type OnSwapParams_0 = FunctionArguments<typeof functions["onSwap((uint8,address,address,uint256,bytes32,uint256,address,address,bytes),uint256[],uint256,uint256)"]>
-export type OnSwapReturn_0 = FunctionReturn<typeof functions["onSwap((uint8,address,address,uint256,bytes32,uint256,address,address,bytes),uint256[],uint256,uint256)"]>
+export type OnSwapParams_0 = FunctionArguments<typeof functions['onSwap((uint8,address,address,uint256,bytes32,uint256,address,address,bytes),uint256[],uint256,uint256)']>
+export type OnSwapReturn_0 = FunctionReturn<typeof functions['onSwap((uint8,address,address,uint256,bytes32,uint256,address,address,bytes),uint256[],uint256,uint256)']>
 
-export type OnSwapParams_1 = FunctionArguments<typeof functions["onSwap((uint8,address,address,uint256,bytes32,uint256,address,address,bytes),uint256,uint256)"]>
-export type OnSwapReturn_1 = FunctionReturn<typeof functions["onSwap((uint8,address,address,uint256,bytes32,uint256,address,address,bytes),uint256,uint256)"]>
+export type OnSwapParams_1 = FunctionArguments<typeof functions['onSwap((uint8,address,address,uint256,bytes32,uint256,address,address,bytes),uint256,uint256)']>
+export type OnSwapReturn_1 = FunctionReturn<typeof functions['onSwap((uint8,address,address,uint256,bytes32,uint256,address,address,bytes),uint256,uint256)']>
 
 export type PermitParams = FunctionArguments<typeof functions.permit>
 export type PermitReturn = FunctionReturn<typeof functions.permit>