@sentio/sdk 2.8.0-rc.2 → 2.8.0-rc.3

package/src/eth/builtin/internal/erc20bytes-test-utils.ts

@@ -19,7 +19,7 @@ export function mockApprovalLog(
   contractAddress: string,
   event: ApprovalEventObject
 ): LogParams {
-  const contract = getERC20BytesContract(contractAddress, 1);
+  const contract = getERC20BytesContract(1, contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Approval(address,address,uint256)",
     [event.owner, event.spender, event.value]
@@ -37,7 +37,7 @@ export function mockTransferLog(
   contractAddress: string,
   event: TransferEventObject
 ): LogParams {
-  const contract = getERC20BytesContract(contractAddress, 1);
+  const contract = getERC20BytesContract(1, contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Transfer(address,address,uint256)",
     [event.from, event.to, event.value]

package/src/eth/builtin/internal/erc721-processor.ts

@@ -560,7 +560,7 @@ export class ERC721Processor extends BaseProcessor<
   };
 
   protected CreateBoundContractView(): ERC721BoundContractView {
-    const view = getERC721Contract(this.config.address, this.config.network);
+    const view = getERC721Contract(this.config.network, this.config.address);
     return new ERC721BoundContractView(this.config.address, view);
   }
 
@@ -640,8 +640,8 @@ export class ERC721ProcessorTemplate extends BaseProcessorTemplate<
 }
 
 export function getERC721Contract(
-  address: string,
-  contextOrNetwork: BaseContext | Networkish
+  contextOrNetwork: BaseContext | Networkish,
+  address: string
 ): ERC721ContractView {
   const network = getNetworkFromCtxOrNetworkish(contextOrNetwork);
   let contract = getContractByABI(

package/src/eth/builtin/internal/erc721-test-utils.ts

@@ -23,7 +23,7 @@ export function mockApprovalLog(
   contractAddress: string,
   event: ApprovalEventObject
 ): LogParams {
-  const contract = getERC721Contract(contractAddress, 1);
+  const contract = getERC721Contract(1, contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Approval(address,address,uint256)",
     [event.owner, event.approved, event.tokenId]
@@ -41,7 +41,7 @@ export function mockApprovalForAllLog(
   contractAddress: string,
   event: ApprovalForAllEventObject
 ): LogParams {
-  const contract = getERC721Contract(contractAddress, 1);
+  const contract = getERC721Contract(1, contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "ApprovalForAll(address,address,bool)",
     [event.owner, event.operator, event.approved]
@@ -59,7 +59,7 @@ export function mockTransferLog(
   contractAddress: string,
   event: TransferEventObject
 ): LogParams {
-  const contract = getERC721Contract(contractAddress, 1);
+  const contract = getERC721Contract(1, contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Transfer(address,address,uint256)",
     [event.from, event.to, event.tokenId]

package/src/eth/builtin/internal/weth9-processor.ts

@@ -403,7 +403,7 @@ export class WETH9Processor extends BaseProcessor<
   };
 
   protected CreateBoundContractView(): WETH9BoundContractView {
-    const view = getWETH9Contract(this.config.address, this.config.network);
+    const view = getWETH9Contract(this.config.network, this.config.address);
     return new WETH9BoundContractView(this.config.address, view);
   }
 
@@ -493,8 +493,8 @@ export class WETH9ProcessorTemplate extends BaseProcessorTemplate<
 }
 
 export function getWETH9Contract(
-  address: string,
-  contextOrNetwork: BaseContext | Networkish
+  contextOrNetwork: BaseContext | Networkish,
+  address: string
 ): WETH9ContractView {
   const network = getNetworkFromCtxOrNetworkish(contextOrNetwork);
   let contract = getContractByABI(

package/src/eth/builtin/internal/weth9-test-utils.ts

@@ -24,7 +24,7 @@ export function mockApprovalLog(
   contractAddress: string,
   event: ApprovalEventObject
 ): LogParams {
-  const contract = getWETH9Contract(contractAddress, 1);
+  const contract = getWETH9Contract(1, contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Approval(address,address,uint256)",
     [event.src, event.guy, event.wad]
@@ -42,7 +42,7 @@ export function mockTransferLog(
   contractAddress: string,
   event: TransferEventObject
 ): LogParams {
-  const contract = getWETH9Contract(contractAddress, 1);
+  const contract = getWETH9Contract(1, contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Transfer(address,address,uint256)",
     [event.src, event.dst, event.wad]
@@ -60,7 +60,7 @@ export function mockDepositLog(
   contractAddress: string,
   event: DepositEventObject
 ): LogParams {
-  const contract = getWETH9Contract(contractAddress, 1);
+  const contract = getWETH9Contract(1, contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Deposit(address,uint256)",
     [event.dst, event.wad]
@@ -78,7 +78,7 @@ export function mockWithdrawalLog(
   contractAddress: string,
   event: WithdrawalEventObject
 ): LogParams {
-  const contract = getWETH9Contract(contractAddress, 1);
+  const contract = getWETH9Contract(1, contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Withdrawal(address,uint256)",
     [event.src, event.wad]

package/src/eth/codegen/file.ts

@@ -62,7 +62,7 @@ export function codeGenSentioFile(contract: Contract): string {
   }
   
   protected CreateBoundContractView(): ${contract.name}BoundContractView {
-    const view = get${contract.name}Contract(this.config.address, this.config.network)
+    const view = get${contract.name}Contract(this.config.network, this.config.address)
     return new ${contract.name}BoundContractView(this.config.address, view)
   }
 
@@ -105,7 +105,7 @@ export class ${contract.name}ProcessorTemplate extends BaseProcessorTemplate<${c
     .join('\n')}
   }
 
-  export function get${contract.name}Contract(address: string, contextOrNetwork: BaseContext | Networkish): ${
+  export function get${contract.name}Contract(contextOrNetwork: BaseContext | Networkish, address: string): ${
     contract.name
   }ContractView {
     const network = getNetworkFromCtxOrNetworkish(contextOrNetwork) 
@@ -230,7 +230,7 @@ function generateMockEventLogFunction(event: EventDeclaration, contractName: str
 
   return `
     export function mock${eventName}Log(contractAddress: string, event: ${eventName}EventObject): LogParams {
-      const contract = get${contractName}Contract(contractAddress, 1)
+      const contract = get${contractName}Contract(1, contractAddress)
       const encodedLog = contract.rawContract.interface.encodeEventLog(
         '${getFullSignatureForEvent(event)}',
         [${eventArgs.join(', ')}]

package/src/utils/dex-price.ts

@@ -100,7 +100,7 @@ class DexPrice {
       }
     }
 
-    const contract = getEACAggregatorProxyContract(addr, this.chainId)
+    const contract = getEACAggregatorProxyContract(this.chainId, addr)
     try {
       const price = await contract.latestAnswer({
         blockTag: blockTag,

package/src/utils/token.ts

@@ -33,8 +33,8 @@ async function getTokenInfoPromise(
 }
 
 export async function getERC20TokenInfo(
-  tokenAddress: string,
-  contextOrNetworkish: BaseContext | Networkish
+  contextOrNetworkish: BaseContext | Networkish,
+  tokenAddress: string
 ): Promise<TokenInfo> {
   const chainId = getNetworkFromCtxOrNetworkish(contextOrNetworkish).chainId.toString()
   const key = chainId + tokenAddress
@@ -42,8 +42,8 @@ export async function getERC20TokenInfo(
   if (res) {
     return res
   }
-  const contract = getERC20Contract(tokenAddress, chainId)
-  const bytesContract = getERC20BytesContract(tokenAddress, chainId)
+  const contract = getERC20Contract(chainId, tokenAddress)
+  const bytesContract = getERC20BytesContract(chainId, tokenAddress)
 
   let name = ''
   try {
@@ -67,10 +67,10 @@ export async function getERC20TokenInfo(
 }
 
 export async function getER20NormalizedAmount(
+  contextOrNetworkish: BaseContext | Networkish,
   tokenAddress: string,
-  amount: bigint,
-  contextOrNetworkish: BaseContext | Networkish
+  amount: bigint
 ): Promise<BigDecimal> {
-  const tokenInfo = await getERC20TokenInfo(tokenAddress, contextOrNetworkish)
+  const tokenInfo = await getERC20TokenInfo(contextOrNetworkish, tokenAddress)
   return scaleDown(amount, tokenInfo.decimal)
 }