@audius/sdk 2.0.3-beta.7 → 2.0.3-beta.9

package/dist/services/solana/rewardsAttester.d.ts

@@ -55,12 +55,14 @@ export declare class AttestationDelayCalculator {
     solanaPollingInterval: number;
     logger: any;
     intervalHandle: NodeJS.Timer | null;
-    constructor({ libs, runBehindSec, allowedStalenessSec, solanaPollingInterval, logger }: {
+    private readonly blockOffset;
+    constructor({ libs, runBehindSec, allowedStalenessSec, blockOffset, solanaPollingInterval, logger }: {
         libs: any;
         runBehindSec: number;
         allowedStalenessSec: number;
         solanaPollingInterval?: number;
         logger: any;
+        blockOffset: number;
     });
     start(): Promise<void>;
     stop(): void;
@@ -92,6 +94,7 @@ declare type ConstructorArgs = {
     maxAggregationAttempts?: number;
     updateStateCallback?: (state: AttesterState) => Promise<void>;
     maxCooldownMsec?: number;
+    blockOffset: number;
 };
 declare type Challenge = {
     challengeId: string;
@@ -167,7 +170,7 @@ export declare class RewardsAttester {
      * Creates an instance of RewardsAttester.
      * @memberof RewardsAttester
      */
-    constructor({ libs, startingBlock, offset, parallelization, logger, quorumSize, aaoEndpoint, aaoAddress, updateValues, getStartingBlockOverride, maxRetries, reporter, challengeIdsDenyList, endpoints, runBehindSec, isSolanaChallenge, feePayerOverride, maxAggregationAttempts, updateStateCallback, maxCooldownMsec }: ConstructorArgs);
+    constructor({ libs, startingBlock, offset, parallelization, logger, quorumSize, aaoEndpoint, aaoAddress, updateValues, getStartingBlockOverride, maxRetries, reporter, challengeIdsDenyList, endpoints, runBehindSec, isSolanaChallenge, feePayerOverride, maxAggregationAttempts, updateStateCallback, maxCooldownMsec, blockOffset }: ConstructorArgs);
     /**
      * Begin attestation loop. Entry point for identity attestations
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@audius/sdk",
-  "version": "2.0.3-beta.7",
+  "version": "2.0.3-beta.9",
   "audius": {
     "releaseSHA": "0a1b8fee5de228d48f2aab265720fbaf45bda661"
   },

package/src/eth-contracts/ABIs/Wormhole.json

@@ -1,71 +1,12 @@
 {
   "contractName": "Wormhole",
   "abi": [
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "DOMAIN_SEPARATOR",
-      "outputs": [
-        {
-          "internalType": "bytes32",
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "LOCK_ASSETS_TYPEHASH",
-      "outputs": [
-        {
-          "internalType": "bytes32",
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "constant": false,
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "_tokenAddress",
-          "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "_wormholeAddress",
-          "type": "address"
-        }
-      ],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "constant": false,
-      "inputs": [],
-      "name": "initialize",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
     {
       "constant": false,
       "inputs": [
         {
           "internalType": "address",
-          "name": "from",
+          "name": "token",
           "type": "address"
         },
         {
@@ -73,82 +14,31 @@
           "name": "amount",
           "type": "uint256"
         },
+        {
+          "internalType": "uint16",
+          "name": "recipientChain",
+          "type": "uint16"
+        },
         {
           "internalType": "bytes32",
           "name": "recipient",
           "type": "bytes32"
         },
-        {
-          "internalType": "uint8",
-          "name": "targetChain",
-          "type": "uint8"
-        },
-        {
-          "internalType": "bool",
-          "name": "refundDust",
-          "type": "bool"
-        },
         {
           "internalType": "uint256",
-          "name": "deadline",
+          "name": "arbiterFee",
           "type": "uint256"
         },
-        {
-          "internalType": "uint8",
-          "name": "v",
-          "type": "uint8"
-        },
-        {
-          "internalType": "bytes32",
-          "name": "r",
-          "type": "bytes32"
-        },
-        {
-          "internalType": "bytes32",
-          "name": "s",
-          "type": "bytes32"
-        }
-      ],
-      "name": "lockAssets",
-      "outputs": [],
-      "payable": false,
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "constant": true,
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "name": "nonces",
-      "outputs": [
         {
           "internalType": "uint32",
-          "name": "",
+          "name": "nonce",
           "type": "uint32"
         }
       ],
+      "name": "transferTokens",
+      "outputs": [],
       "payable": false,
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "constant": true,
-      "inputs": [],
-      "name": "token",
-      "outputs": [
-        {
-          "internalType": "address",
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "payable": false,
-      "stateMutability": "view",
+      "stateMutability": "nonpayable",
       "type": "function"
     }
   ]

package/src/services/solana/rewardsAttester.ts

@@ -62,7 +62,7 @@ class BaseRewardsReporter {
 
 const MAX_DISBURSED_CACHE_SIZE = 100
 const SOLANA_EST_SEC_PER_SLOT = 0.5
-const POA_SEC_PER_BLOCK = 5
+const POA_SEC_PER_BLOCK = 1
 const MAX_DISCOVERY_NODE_BLOCKLIST_LEN = 10
 
 type ATTESTER_PHASE =
@@ -94,10 +94,13 @@ export class AttestationDelayCalculator {
   logger: any
   intervalHandle: NodeJS.Timer | null
 
+  private readonly blockOffset: number
+
   constructor({
     libs,
     runBehindSec,
     allowedStalenessSec,
+    blockOffset,
     solanaPollingInterval = 30,
     logger = console
   }: {
@@ -106,6 +109,7 @@ export class AttestationDelayCalculator {
     allowedStalenessSec: number
     solanaPollingInterval?: number
     logger: any
+    blockOffset: number
   }) {
     this.libs = libs
     this.solanaSecPerSlot = SOLANA_EST_SEC_PER_SLOT
@@ -116,6 +120,7 @@ export class AttestationDelayCalculator {
     this.solanaPollingInterval = solanaPollingInterval
     this.logger = logger
     this.intervalHandle = null
+    this.blockOffset = blockOffset
   }
 
   async start() {
@@ -146,9 +151,9 @@ export class AttestationDelayCalculator {
     ) {
       return this.lastPOAThreshold.threshold
     }
-    const currentBlock = await this.libs.web3Manager
-      .getWeb3()
-      .eth.getBlockNumber()
+    const currentBlock =
+      Number(await this.libs.web3Manager.getWeb3().eth.getBlockNumber()) +
+      this.blockOffset
     const threshold = currentBlock - this.runBehindSec / POA_SEC_PER_BLOCK
     this.lastPOAThreshold = {
       threshold,
@@ -205,6 +210,7 @@ type ConstructorArgs = {
   maxAggregationAttempts?: number
   updateStateCallback?: (state: AttesterState) => Promise<void>
   maxCooldownMsec?: number
+  blockOffset: number
 }
 
 type Challenge = {
@@ -338,7 +344,8 @@ export class RewardsAttester {
     feePayerOverride = null,
     maxAggregationAttempts = 20,
     updateStateCallback = async (_) => {},
-    maxCooldownMsec = 15000
+    maxCooldownMsec = 15000,
+    blockOffset
   }: ConstructorArgs) {
     this.libs = libs
     this.logger = logger
@@ -374,7 +381,8 @@ export class RewardsAttester {
       libs,
       runBehindSec,
       logger,
-      allowedStalenessSec: 5
+      allowedStalenessSec: 5,
+      blockOffset
     })
     this.isSolanaChallenge = isSolanaChallenge