diff --git a/iguana/exchanges/bitcoin.c b/iguana/exchanges/bitcoin.c
index e6b8df251..37918e661 100755
--- a/iguana/exchanges/bitcoin.c
+++ b/iguana/exchanges/bitcoin.c
@@ -1542,7 +1542,7 @@ uint64_t TRADE(int32_t dotrade,char **retstrp,struct exchange_info *exchange,cha
                 json = cJSON_CreateObject();
                 jaddstr(json,"BTCoffer",str);
             }
-            if ( (str= instantdex_queueaccept(myinfo,exchange,base,"BTC",price,volume,-dir,dir > 0 ? "BTC" : base,INSTANTDEX_OFFERDURATION)) != 0 )
+            if ( (str= instantdex_queueaccept(myinfo,exchange,base,"BTC",price,volume,-dir,dir > 0 ? "BTC" : base,INSTANTDEX_OFFERDURATION,myinfo->myaddr.nxt64bits)) != 0 )
             {
                 jaddstr(json,"queue",str);
                 if ( (tmp= cJSON_Parse(str)) != 0 )
diff --git a/iguana/exchanges777.h b/iguana/exchanges777.h
index e3c202fea..5b75ca01e 100755
--- a/iguana/exchanges777.h
+++ b/iguana/exchanges777.h
@@ -113,7 +113,7 @@ double truefx_price(struct exchange_info *exchange,char *base,char *rel,struct e
 double fxcm_price(struct exchange_info *exchange,char *base,char *rel,struct exchange_quote *bidasks,int32_t maxdepth,double commission,cJSON *argjson,int32_t invert);
 double instaforex_price(struct exchange_info *exchange,char *base,char *rel,struct exchange_quote *bidasks,int32_t maxdepth,double commission,cJSON *argjson,int32_t invert);
 
-char *instantdex_queueaccept(struct supernet_info *myinfo,struct exchange_info *exchange,char *base,char *rel,double price,double basevolume,int32_t acceptdir,char *mysidestr,int32_t duration);
+char *instantdex_queueaccept(struct supernet_info *myinfo,struct exchange_info *exchange,char *base,char *rel,double price,double basevolume,int32_t acceptdir,char *mysidestr,int32_t duration,uint64_t txid);
 void instantdex_update(struct supernet_info *myinfo);
 
 #endif
diff --git a/iguana/iguana_instantdex.c b/iguana/iguana_instantdex.c
index 621a82486..e15499a43 100755
--- a/iguana/iguana_instantdex.c
+++ b/iguana/iguana_instantdex.c
@@ -419,31 +419,45 @@ cJSON *instantdex_acceptsendjson(struct instantdex_accept *ap)
 
 char *instantdex_parse(struct supernet_info *myinfo,struct instantdex_msghdr *msg,cJSON *argjson,char *remoteaddr,uint64_t signerbits,uint8_t *data,int32_t datalen)
 {
-    char cmdstr[16],*traderip,*orderidstr,*retstr; struct exchange_info *exchange; uint64_t orderid;
-    struct instantdex_accept A,*ap = 0;
+    char cmdstr[16],*orderidstr,*retstr; struct exchange_info *exchange; uint64_t orderid;
+    struct instantdex_accept A,*ap = 0; bits256 traderpub;
     exchange = exchanges777_find("bitcoin");
     memset(cmdstr,0,sizeof(cmdstr)), memcpy(cmdstr,msg->cmd,sizeof(msg->cmd));
     if ( argjson != 0 )
     {
+        traderpub = jbits256(argjson,"traderpub");
         memset(&A,0,sizeof(A));
-        if ( (remoteaddr != 0 && strcmp(remoteaddr,myinfo->ipaddr) == 0) || ((traderip= jstr(argjson,"traderip")) != 0 && strcmp(traderip,myinfo->ipaddr) == 0) )
+        if ( instantdex_acceptextract(&A,argjson) < 0 )
+        {
+            printf("error setting orderid\n");
+            return(clonestr("{\"error\":\"hash txid mismatches orderid\"}"));
+        }
+        printf("A.orderid.%llu\n",(long long)A.orderid);
+        if ( bits256_cmp(traderpub,myinfo->myaddr.persistent) == 0 )
         {
             printf("got my own request.(%s)\n",jprint(argjson,0));
-            if ( instantdex_acceptextract(&A,argjson) < 0 )
-                return(clonestr("{\"error\":\"hash txid mismatches orderid\"}"));
             return(clonestr("{\"result\":\"got my own request\"}"));
         }
         if ( (orderidstr= jstr(argjson,"id")) != 0 )
         {
             orderid = calc_nxt64bits(orderidstr);
             printf("orderid.%llu\n",(long long)orderid);
+            if ( orderid != A.orderid )
+            {
+                printf("mismatched orderid %llu != %llu\n",(long long)orderid,(long long)A.orderid);
+                return(clonestr("{\"error\":\"specified orderid mismatches calculated orderid\"}"));
+            }
             if ( (ap= instantdex_acceptablefind(myinfo,exchange,0,0,orderid,"*","*")) != 0 )
             {
-                printf("found existing\n");
+                printf("found existing trade to match\n");
                 A = *ap;
             }
-        } else if ( instantdex_acceptextract(&A,argjson) < 0 )
-            return(clonestr("{\"error\":\"hash txid mismatches orderid\"}"));
+            else if ( strcmp(cmdstr+3,"offer") != 0 )
+            {
+                printf("cant find existing order.%llu that matches\n",(long long)A.orderid);
+                return(clonestr("{\"error\":\"cant find matching order\"}"));
+            }
+        }
         printf("call (%s/%s) swap baserel.%d acceptdir.%d\n",A.A.base,A.A.rel,A.A.myside,A.A.acceptdir);
         if ( strncmp(cmdstr,"BTC",3) == 0 )
             retstr = instantdex_BTCswap(myinfo,exchange,&A,cmdstr+3,msg,argjson,remoteaddr,signerbits,data,datalen);
@@ -538,7 +552,7 @@ char *InstantDEX_hexmsg(struct supernet_info *myinfo,void *ptr,int32_t len,char
     return(retstr);
 }
 
-char *instantdex_queueaccept(struct supernet_info *myinfo,struct exchange_info *exchange,char *base,char *rel,double price,double basevolume,int32_t acceptdir,char *mysidestr,int32_t duration)
+char *instantdex_queueaccept(struct supernet_info *myinfo,struct exchange_info *exchange,char *base,char *rel,double price,double basevolume,int32_t acceptdir,char *mysidestr,int32_t duration,uint64_t txid)
 {
     struct instantdex_accept *ap; int32_t myside;
     if ( exchange != 0 )
@@ -582,7 +596,7 @@ TWO_STRINGS_AND_TWO_DOUBLES(InstantDEX,maxaccept,base,rel,maxprice,basevolume)
 {
     myinfo = SuperNET_accountfind(json);
     if ( remoteaddr == 0 )
-        return(instantdex_queueaccept(myinfo,exchanges777_find("bitcoin"),base,rel,maxprice,basevolume,-1,rel,INSTANTDEX_OFFERDURATION));
+        return(instantdex_queueaccept(myinfo,exchanges777_find("bitcoin"),base,rel,maxprice,basevolume,-1,rel,INSTANTDEX_OFFERDURATION,myinfo->myaddr.nxt64bits));
     else return(clonestr("{\"error\":\"InstantDEX API request only local usage!\"}"));
 }
 
@@ -590,7 +604,7 @@ TWO_STRINGS_AND_TWO_DOUBLES(InstantDEX,minaccept,base,rel,minprice,basevolume)
 {
     myinfo = SuperNET_accountfind(json);
     if ( remoteaddr == 0 )
-        return(instantdex_queueaccept(myinfo,exchanges777_find("bitcoin"),base,rel,minprice,basevolume,1,base,INSTANTDEX_OFFERDURATION));
+        return(instantdex_queueaccept(myinfo,exchanges777_find("bitcoin"),base,rel,minprice,basevolume,1,base,INSTANTDEX_OFFERDURATION,myinfo->myaddr.nxt64bits));
     else return(clonestr("{\"error\":\"InstantDEX API request only local usage!\"}"));
 }
 
diff --git a/iguana/swaps/iguana_BTCswap.c b/iguana/swaps/iguana_BTCswap.c
index 05cfc94e3..7c49e7b18 100755
--- a/iguana/swaps/iguana_BTCswap.c
+++ b/iguana/swaps/iguana_BTCswap.c
@@ -553,7 +553,7 @@ char *instantdex_BTCswap(struct supernet_info *myinfo,struct exchange_info *exch
         else
         {
             printf("no matching trade.(%s) -> InstantDEX_minaccept\n",jprint(argjson,0));
-            retstr = instantdex_queueaccept(myinfo,exchange,A->A.base,A->A.rel,dstr(A->A.price64),dstr(A->A.basevolume64),A->A.acceptdir,A->A.myside == 0 ? A->A.base : A->A.rel,A->A.expiration);
+            retstr = instantdex_queueaccept(myinfo,exchange,A->A.base,A->A.rel,dstr(A->A.price64),dstr(A->A.basevolume64),A->A.acceptdir,A->A.myside == 0 ? A->A.base : A->A.rel,A->A.expiration,traderpub.txid);
         }
     }
     else if ( strcmp(cmdstr,"step1") == 0 && swap->state == 1 ) // either